thingsboard-developers

diff --git a/ui/src/app/components/details-sidenav.scss b/ui/src/app/components/details-sidenav.scss
index 80257b8..54a029d 100644
--- a/ui/src/app/components/details-sidenav.scss
+++ b/ui/src/app/components/details-sidenav.scss
@@ -45,15 +45,12 @@ md-sidenav.tb-sidenav-details {
   width: 100% !important;
   max-width: 100% !important;
   z-index: 59 !important;
-  @media (min-width: $layout-breakpoint-sm) {
+  @media (min-width: $layout-breakpoint-gt-sm) {
     width: 80% !important;
   }
-  @media (min-width: $layout-breakpoint-md) {
+  @media (min-width: $layout-breakpoint-gt-md) {
     width: 65% !important;
   }
-  @media (min-width: $layout-breakpoint-lg) {
-    width: 45% !important;
-  }
   tb-dashboard {
     md-content {
       background-color: $primary-hue-3;

diff --git a/ui/src/app/components/react/json-form-ace-editor.jsx b/ui/src/app/components/react/json-form-ace-editor.jsx
index 5a63790..f1db764 100644
--- a/ui/src/app/components/react/json-form-ace-editor.jsx
+++ b/ui/src/app/components/react/json-form-ace-editor.jsx
@@ -120,7 +120,7 @@ class ThingsboardAceEditor extends React.Component {
                                name={this.props.form.title}
                                value={this.state.value}
                                readOnly={this.props.form.readonly}
-                               editorProps={{$blockScrolling: true}}
+                               editorProps={{$blockScrolling: Infinity}}
                                enableBasicAutocompletion={true}
                                enableSnippets={true}
                                enableLiveAutocompletion={true}

diff --git a/ui/src/scss/constants.scss b/ui/src/scss/constants.scss
index 802b2c5..0b31c43 100644
--- a/ui/src/scss/constants.scss
+++ b/ui/src/scss/constants.scss
@@ -37,3 +37,9 @@ $layout-breakpoint-sm: 960px !default;
 $layout-breakpoint-md: 1280px !default;
 $layout-breakpoint-xmd: 1600px !default;
 $layout-breakpoint-lg: 1920px !default;
+
+$layout-breakpoint-gt-xs: 601px !default;
+$layout-breakpoint-gt-sm: 961px !default;
+$layout-breakpoint-gt-md: 1281px !default;
+$layout-breakpoint-gt-xmd: 1601px !default;
+$layout-breakpoint-gt-lg: 1921px !default;