diff --git a/example/generator/bundle.json b/example/generator/bundle.json
index 6c019593c1..fdfad67dc1 100644
--- a/example/generator/bundle.json
+++ b/example/generator/bundle.json
@@ -29,6 +29,7 @@
                     {
                         "name": "Period",
                         "control": "textfield",
+                        "cssclass": "l-small l-numeric",
                         "key": "period",
                         "required": true,
                         "property": [ "telemetry", "period" ],
diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html
index 89fdc122b2..54ccbae8a7 100644
--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@@ -19,7 +19,7 @@
                  mct-drag-down="splitter.startMove()"
                  mct-drag="splitter.move(delta[0])"></div>
             <div class='split-pane-component items pane'
-                 ng-style="{ left: splitter.state() + 'px', right: '0px' }">
+                 ng-style="{ left: (splitter.state()+4) + 'px', right: '0px' }">
                 <div class='holder abs' id='content-area'>
                     <mct-representation mct-object="navigatedObject" key="'browse-object'">
                     </mct-representation>
diff --git a/platform/commonUI/edit/bundle.json b/platform/commonUI/edit/bundle.json
index fca0e2cf72..eccaeaf787 100644
--- a/platform/commonUI/edit/bundle.json
+++ b/platform/commonUI/edit/bundle.json
@@ -56,7 +56,8 @@
                 "implementation": "actions/SaveAction.js",
                 "name": "Save",
                 "description": "Save changes made to these objects.",
-                "depends": [ "$location" ]
+                "depends": [ "$location" ],
+                "priority": "mandatory"
             },
             {
                 "key": "cancel",
diff --git a/platform/commonUI/edit/res/templates/edit-object.html b/platform/commonUI/edit/res/templates/edit-object.html
index 662a77008a..f6fdbdf14a 100644
--- a/platform/commonUI/edit/res/templates/edit-object.html
+++ b/platform/commonUI/edit/res/templates/edit-object.html
@@ -7,8 +7,11 @@
                  structure="toolbar.structure"
                  ng-model="toolbar.state">
     </mct-toolbar>
-    <div class='split-layout vertical contents abs work-area'>
-        <div class='abs pane left edit-main'>
+    <div class='split-layout vertical contents abs work-area' ng-controller="SplitPaneController as vSplitter">
+        <div
+            class='abs pane left edit-main'
+            ng-style="{ right: (vSplitter.state()+5) + 'px'}"
+            >
             <div class='holder abs object-holder'>
                 <mct-representation key="representation.selected.key"
                                     toolbar="toolbar"
@@ -16,24 +19,54 @@
                 </mct-representation>
             </div>
         </div>
-        <div class="splitter"></div>
-        <div class='abs pane right edit-objects menus-to-left'>
-            <div class='holder abs split-layout horizontal'
-                 ng-controller='EditPanesController as editPanes'>
-	            <div class="abs pane top accordion" ng-controller="ToggleController as toggle">
-                <mct-container key="accordion" title="Library">
-                    <mct-representation key="'tree'"
-                                        alias="foo1"
-                                        mct-object="editPanes.getRoot()">
-                    </mct-representation>
-                </mct-container>
+
+        <!-- MAIN VERTICAL SPLITTER -->
+        <div
+            class="splitter"
+            ng-style="{ right: vSplitter.state() + 'px'}"
+            mct-drag-down="vSplitter.startMove()"
+            mct-drag="vSplitter.move(-delta[0], 100, 1000)"
+            ></div>
+
+
+        <div
+            class='abs pane right edit-objects menus-to-left'
+            ng-controller='EditPanesController as editPanes'
+            ng-style="{ width: (vSplitter.state()-4) + 'px', right: '0px'}"
+            >
+            <div
+                class='holder abs split-layout horizontal'
+                ng-controller="SplitPaneController as hSplitter"
+                >
+	            <div
+                    class="abs pane top accordion"
+                    ng-style="{ bottom: (hSplitter.state()+8) + 'px', top: '0px' }"
+                    ng-controller="ToggleController as toggle"
+                    >
+                    <mct-container key="accordion" title="Library">
+                        <mct-representation key="'tree'"
+                                            alias="foo1"
+                                            mct-object="editPanes.getRoot()">
+                        </mct-representation>
+                    </mct-container>
 		        </div>
-	            <div class="splitter"></div>
-	            <div class="abs pane bottom accordion" ng-controller="ToggleController as toggle">
-                <mct-container key="accordion" title="Elements">
-                    <mct-representation key="'edit-elements'" mct-object="domainObject">
-                    </mct-representation>
-                </mct-container>
+                <!-- HORZ SPLITTER -->
+                <div
+                        class="splitter"
+                        ng-style="{ bottom: hSplitter.state() + 'px', top: 'auto' }"
+                        mct-drag-down="hSplitter.startMove()"
+                        mct-drag="hSplitter.move(-delta[1], 120, 1000)"
+                        >
+                </div>
+	            <div
+                    class="abs pane bottom accordion"
+                    ng-style="{ bottom: '0px', height: (hSplitter.state()-4) + 'px'}"
+                    ng-controller="ToggleController as toggle"
+                    >
+                    <mct-container key="accordion" title="Elements">
+                        <mct-representation key="'edit-elements'" mct-object="domainObject">
+                        </mct-representation>
+                    </mct-container>
 				</div>
             </div>
         </div>
diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css
index 2e89cb40c4..f3ab0c7cf3 100644
--- a/platform/commonUI/general/res/css/forms.css
+++ b/platform/commonUI/general/res/css/forms.css
@@ -27,7 +27,7 @@
   padding: 5px;
   position: relative; }
   /* line 24, ../sass/forms/_elems.scss */
-  .form .form-row:first-child {
+  .form .form-row.first {
     border-top: none; }
   /* line 29, ../sass/forms/_elems.scss */
   .form .form-row .label,
@@ -41,45 +41,62 @@
     font-size: 0.75rem;
     line-height: 22px;
     min-height: 22px; }
-  /* line 38, ../sass/forms/_elems.scss */
+  /* line 39, ../sass/forms/_elems.scss */
   .form .form-row > .label {
     float: left;
     position: relative;
     white-space: nowrap;
     width: 20%; }
-  /* line 46, ../sass/forms/_elems.scss */
+  /* line 47, ../sass/forms/_elems.scss */
   .form .form-row .value {
     color: #cccccc; }
-  /* line 50, ../sass/forms/_elems.scss */
+  /* line 51, ../sass/forms/_elems.scss */
   .form .form-row .controls {
     float: left;
     position: relative;
-    width: 79%; }
-    /* line 55, ../sass/forms/_elems.scss */
-    .form .form-row .controls .l-composite-control {
-      display: inline-block; }
-      /* line 57, ../sass/forms/_elems.scss */
-      .form .form-row .controls .l-composite-control.l-checkbox {
-        line-height: 14px;
-        margin-right: 5px; }
-    /* line 65, ../sass/forms/_elems.scss */
+    width: 79.9%; }
+    /* line 58, ../sass/forms/_elems.scss */
+    .form .form-row .controls .l-composite-control.l-checkbox {
+      display: inline-block;
+      line-height: 14px;
+      margin-right: 5px; }
+    /* line 67, ../sass/forms/_elems.scss */
+    .form .form-row .controls input[type="text"] {
+      height: 22px;
+      line-height: 22px;
+      margin-top: -4px;
+      vertical-align: baseline; }
+    /* line 74, ../sass/forms/_elems.scss */
+    .form .form-row .controls .l-med input[type="text"] {
+      width: 200px; }
+    /* line 78, ../sass/forms/_elems.scss */
+    .form .form-row .controls .l-small input[type="text"] {
+      width: 50px; }
+    /* line 82, ../sass/forms/_elems.scss */
+    .form .form-row .controls .l-numeric input[type="text"] {
+      text-align: right; }
+    /* line 86, ../sass/forms/_elems.scss */
     .form .form-row .controls .select {
       margin-right: 5px; }
-  /* line 70, ../sass/forms/_elems.scss */
+  /* line 91, ../sass/forms/_elems.scss */
   .form .form-row .field-hints {
     color: #666666; }
-  /* line 74, ../sass/forms/_elems.scss */
+  /* line 95, ../sass/forms/_elems.scss */
   .form .form-row .selector-list {
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     -ms-border-radius: 3px;
     -o-border-radius: 3px;
     border-radius: 3px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
     background: rgba(0, 0, 0, 0.2);
+    padding: 5px;
     position: relative;
     height: 150px;
-    max-width: 50%; }
-    /* line 82, ../sass/forms/_elems.scss */
+    overflow: auto; }
+    /* line 106, ../sass/forms/_elems.scss */
     .form .form-row .selector-list .wrapper {
       overflow-y: auto;
       position: absolute;
@@ -88,24 +105,24 @@
       bottom: 5px;
       left: 5px; }
 
-/* line 96, ../sass/forms/_elems.scss */
+/* line 120, ../sass/forms/_elems.scss */
 label.form-control.checkbox input {
   margin-right: 5px;
   vertical-align: top; }
 
-/* line 103, ../sass/forms/_elems.scss */
+/* line 127, ../sass/forms/_elems.scss */
 .hint,
 .s-hint {
   font-size: 0.9em; }
 
-/* line 107, ../sass/forms/_elems.scss */
+/* line 131, ../sass/forms/_elems.scss */
 .l-result {
   display: inline-block;
   min-width: 32px;
   min-height: 32px;
   position: relative;
   vertical-align: top; }
-  /* line 114, ../sass/forms/_elems.scss */
+  /* line 138, ../sass/forms/_elems.scss */
   .l-result div.s-hint {
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
@@ -133,16 +150,16 @@ label.form-control.checkbox input {
   -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
   -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
   box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
-  background: #666666;
+  background: rgba(255, 255, 255, 0.1);
   border: none;
-  border-bottom: 1px solid #999999;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.1);
   color: #cccccc;
   outline: none;
   padding: 5px;
   position: absolute;
   height: 100%;
   width: 100%; }
-  /* line 11, ../sass/forms/_mixins.scss */
+  /* line 12, ../sass/forms/_mixins.scss */
   .edit-main textarea.error {
     background: rgba(255, 0, 0, 0.5); }
 
@@ -162,19 +179,16 @@ input[type="text"] {
   -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
   -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
   box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
-  background: #666666;
+  background: rgba(255, 255, 255, 0.1);
   border: none;
-  border-bottom: 1px solid #999999;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.1);
   color: #cccccc;
   outline: none;
-  padding: 0 3px;
-  height: 22px;
-  line-height: 22px;
-  vertical-align: middle; }
-  /* line 11, ../sass/forms/_mixins.scss */
+  padding: 0 3px; }
+  /* line 12, ../sass/forms/_mixins.scss */
   input[type="text"].error {
     background: rgba(255, 0, 0, 0.5); }
-  /* line 11, ../sass/forms/_text-input.scss */
+  /* line 8, ../sass/forms/_text-input.scss */
   input[type="text"].numeric {
     text-align: right; }
 
@@ -203,6 +217,7 @@ input[type="text"] {
   cursor: pointer;
   display: inline-block;
   margin: 0 0 2px 2px;
+  overflow: hidden;
   position: relative; }
   /* line 127, ../sass/_mixins.scss */
   .form-control.select:not(.disabled):hover {
@@ -211,7 +226,7 @@ input[type="text"] {
     background-image: -moz-linear-gradient(#666666, #4d4d4d);
     background-image: -o-linear-gradient(#666666, #4d4d4d);
     background-image: linear-gradient(#666666, #4d4d4d); }
-  /* line 7, ../sass/forms/_selects.scss */
+  /* line 8, ../sass/forms/_selects.scss */
   .form-control.select select {
     -webkit-appearance: none;
     -moz-appearance: none;
@@ -223,8 +238,12 @@ input[type="text"] {
     color: #999999;
     border: none !important;
     cursor: pointer;
-    padding: 4px 25px 2px 5px; }
-  /* line 16, ../sass/forms/_selects.scss */
+    padding: 4px 25px 2px 5px;
+    width: 120%; }
+    /* line 17, ../sass/forms/_selects.scss */
+    .form-control.select select option {
+      margin: 5px 0; }
+  /* line 21, ../sass/forms/_selects.scss */
   .form-control.select:after {
     color: #0099cc;
     content: "v";
@@ -255,9 +274,9 @@ input[type="text"] {
   -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
   -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
   box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
-  background: #666666;
+  background: rgba(255, 255, 255, 0.1);
   border: none;
-  border-bottom: 1px solid #999999;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.1);
   color: #cccccc;
   outline: none;
   padding: 0 3px;
@@ -267,7 +286,7 @@ input[type="text"] {
   max-height: 400px;
   overflow: auto;
   padding: 5px; }
-  /* line 11, ../sass/forms/_mixins.scss */
+  /* line 12, ../sass/forms/_mixins.scss */
   .channel-selector .treeview.error {
     background: rgba(255, 0, 0, 0.5); }
 /* line 15, ../sass/forms/_channel-selector.scss */
diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css
index cb6d166e5e..617c49f6aa 100644
--- a/platform/commonUI/general/res/css/theme-espresso.css
+++ b/platform/commonUI/general/res/css/theme-espresso.css
@@ -138,7 +138,7 @@ span {
   */ }
 
 /* line 51, ../sass/_global.scss */
-.abs {
+.abs, .btn-menu span.l-click-area {
   position: absolute;
   top: 0;
   right: 0;
@@ -255,24 +255,27 @@ span {
 .bar .icon.major {
   margin-right: 5px; }
 /* line 80, ../sass/user-environ/_layout.scss */
-.bar.abs {
+.bar.abs, .btn-menu span.bar.l-click-area {
   text-wrap: none;
   white-space: nowrap; }
   /* line 84, ../sass/user-environ/_layout.scss */
-  .bar.abs.left,
-  .bar.abs .left {
+  .bar.abs.left, .btn-menu span.bar.left.l-click-area,
+  .bar.abs .left,
+  .btn-menu span.bar.l-click-area .left {
     width: 45%;
     right: auto; }
   /* line 89, ../sass/user-environ/_layout.scss */
-  .bar.abs.right,
-  .bar.abs .right {
+  .bar.abs.right, .btn-menu span.bar.right.l-click-area,
+  .bar.abs .right,
+  .btn-menu span.bar.l-click-area .right {
     width: 45%;
     left: auto;
     right: 0;
     text-align: right; }
     /* line 94, ../sass/user-environ/_layout.scss */
-    .bar.abs.right .icon.major,
-    .bar.abs .right .icon.major {
+    .bar.abs.right .icon.major, .btn-menu span.bar.right.l-click-area .icon.major,
+    .bar.abs .right .icon.major,
+    .btn-menu span.bar.l-click-area .right .icon.major {
       margin-left: 15px; }
 
 /* line 104, ../sass/user-environ/_layout.scss */
@@ -343,24 +346,24 @@ span {
 /* line 182, ../sass/user-environ/_layout.scss */
 .split-layout.horizontal > .pane {
   margin-top: 5px; }
-  /* line 184, ../sass/user-environ/_layout.scss */
+  /* line 185, ../sass/user-environ/_layout.scss */
   .split-layout.horizontal > .pane:first-child {
     margin-top: 0; }
-/* line 191, ../sass/user-environ/_layout.scss */
+/* line 192, ../sass/user-environ/_layout.scss */
 .split-layout.vertical > .pane {
   margin-left: 5px; }
-  /* line 193, ../sass/user-environ/_layout.scss */
+  /* line 194, ../sass/user-environ/_layout.scss */
   .split-layout.vertical > .pane > .holder {
     left: 0;
     right: 0; }
-  /* line 197, ../sass/user-environ/_layout.scss */
+  /* line 198, ../sass/user-environ/_layout.scss */
   .split-layout.vertical > .pane:first-child {
     margin-left: 0; }
-    /* line 199, ../sass/user-environ/_layout.scss */
+    /* line 200, ../sass/user-environ/_layout.scss */
     .split-layout.vertical > .pane:first-child .holder {
       right: 5px; }
 
-/* line 208, ../sass/user-environ/_layout.scss */
+/* line 209, ../sass/user-environ/_layout.scss */
 .vscroll {
   overflow-y: auto; }
 
@@ -497,7 +500,7 @@ span {
     color: #fff;
     font-weight: normal !important; }
   /* line 29, ../sass/_about.scss */
-  .t-about.l-about.abs {
+  .t-about.l-about.abs, .btn-menu span.t-about.l-about.l-click-area {
     overflow: auto; }
   /* line 34, ../sass/_about.scss */
   .t-about .l-logo-holder {
@@ -1314,37 +1317,40 @@ label.checkbox.custom {
     background-image: linear-gradient(#666666, #4d4d4d); }
   /* line 303, ../sass/controls/_controls.scss */
   .btn-menu.dropdown {
-    padding-right: 7px; }
-  /* line 308, ../sass/controls/_controls.scss */
+    padding-left: 5px;
+    padding-right: 5px; }
+  /* line 309, ../sass/controls/_controls.scss */
   .btn-menu:not(.disabled):hover {
     color: #cccccc; }
-  /* line 312, ../sass/controls/_controls.scss */
+  /* line 313, ../sass/controls/_controls.scss */
   .btn-menu.btn-invoke-menu {
     color: #0099cc;
     padding: 0 5px; }
-    /* line 316, ../sass/controls/_controls.scss */
+    /* line 317, ../sass/controls/_controls.scss */
     .btn-menu.btn-invoke-menu:hover {
       color: deepskyblue; }
-  /* line 325, ../sass/controls/_controls.scss */
+  /* line 327, ../sass/controls/_controls.scss */
   .btn-menu .type-icon {
     margin-right: 5px; }
-  /* line 328, ../sass/controls/_controls.scss */
+  /* line 330, ../sass/controls/_controls.scss */
   .btn-menu .menu {
+    position: absolute;
+    left: 0;
     text-align: left; }
-    /* line 331, ../sass/controls/_controls.scss */
+    /* line 335, ../sass/controls/_controls.scss */
     .btn-menu .menu .ui-symbol.icon {
       width: 12px; }
 
-/* line 337, ../sass/controls/_controls.scss */
+/* line 341, ../sass/controls/_controls.scss */
 .top-bar .btn-menu {
   height: 35px;
   line-height: 35px;
   padding-right: 10px; }
-  /* line 345, ../sass/controls/_controls.scss */
+  /* line 349, ../sass/controls/_controls.scss */
   .top-bar .btn-menu.browse-btn {
     margin-right: 5px;
     padding-left: 35px; }
-    /* line 348, ../sass/controls/_controls.scss */
+    /* line 352, ../sass/controls/_controls.scss */
     .top-bar .btn-menu.browse-btn .badge {
       -webkit-border-radius: 4.5px;
       -moz-border-radius: 4.5px;
@@ -1363,30 +1369,30 @@ label.checkbox.custom {
       height: auto; }
 
 /******************************************************** OBJECT-HEADER */
-/* line 365, ../sass/controls/_controls.scss */
+/* line 369, ../sass/controls/_controls.scss */
 .object-header {
   display: inline-block;
   font-size: 1em; }
-  /* line 368, ../sass/controls/_controls.scss */
+  /* line 372, ../sass/controls/_controls.scss */
   .object-header .title {
     color: white; }
-  /* line 371, ../sass/controls/_controls.scss */
+  /* line 375, ../sass/controls/_controls.scss */
   .object-header .type-icon {
     font-size: 1.5em;
     margin-right: 5px;
     vertical-align: middle; }
 
-/* line 380, ../sass/controls/_controls.scss */
+/* line 384, ../sass/controls/_controls.scss */
 .top-bar .object-header,
 .object-browse-bar .object-header {
   font-size: 1.1em; }
-  /* line 382, ../sass/controls/_controls.scss */
+  /* line 386, ../sass/controls/_controls.scss */
   .top-bar .object-header span,
   .object-browse-bar .object-header span {
     display: inline-block; }
 
 /******************************************************** VIEW-CONTROLS */
-/* line 391, ../sass/controls/_controls.scss */
+/* line 395, ../sass/controls/_controls.scss */
 .view-controls .view-type {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
@@ -1400,16 +1406,16 @@ label.checkbox.custom {
   line-height: 20px;
   padding-left: 5px;
   padding-right: 5px; }
-  /* line 402, ../sass/controls/_controls.scss */
+  /* line 406, ../sass/controls/_controls.scss */
   .view-controls .view-type.cur {
     background: #666666; }
 
-/* line 407, ../sass/controls/_controls.scss */
+/* line 411, ../sass/controls/_controls.scss */
 .edit-mode .top-bar .control-set.edit-view-controls {
   margin-right: 50px; }
 
 /******************************************************** SLIDERS */
-/* line 418, ../sass/controls/_controls.scss */
+/* line 422, ../sass/controls/_controls.scss */
 .slider .slot {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -1432,7 +1438,7 @@ label.checkbox.custom {
   right: 0;
   bottom: auto;
   left: 0; }
-/* line 429, ../sass/controls/_controls.scss */
+/* line 433, ../sass/controls/_controls.scss */
 .slider .knob {
   background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040));
   background-image: -webkit-linear-gradient(#4d4d4d, #404040);
@@ -1483,12 +1489,12 @@ label.checkbox.custom {
   /* line 120, ../sass/_mixins.scss */
   .slider .knob:not(.disabled):hover:before {
     border-color: rgba(0, 153, 204, 0.9); }
-  /* line 440, ../sass/controls/_controls.scss */
+  /* line 444, ../sass/controls/_controls.scss */
   .slider .knob:before {
     top: 1px;
     bottom: 3px;
     left: 5px; }
-/* line 447, ../sass/controls/_controls.scss */
+/* line 451, ../sass/controls/_controls.scss */
 .slider .range {
   background: rgba(0, 153, 204, 0.6);
   cursor: ew-resize;
@@ -1499,12 +1505,12 @@ label.checkbox.custom {
   left: auto;
   height: auto;
   width: auto; }
-  /* line 457, ../sass/controls/_controls.scss */
+  /* line 461, ../sass/controls/_controls.scss */
   .slider .range:hover {
     background: rgba(0, 153, 204, 0.7); }
 
 /******************************************************** BROWSER ELEMENTS */
-/* line 465, ../sass/controls/_controls.scss */
+/* line 469, ../sass/controls/_controls.scss */
 ::-webkit-scrollbar {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -1523,7 +1529,7 @@ label.checkbox.custom {
   height: 10px;
   width: 10px; }
 
-/* line 471, ../sass/controls/_controls.scss */
+/* line 475, ../sass/controls/_controls.scss */
 ::-webkit-scrollbar-thumb {
   background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #666666), color-stop(100%, #595959));
   background-image: -webkit-linear-gradient(#666666, #595959 20px);
@@ -1542,7 +1548,7 @@ label.checkbox.custom {
   -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
   box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
   border-top: 1px solid gray; }
-  /* line 478, ../sass/controls/_controls.scss */
+  /* line 482, ../sass/controls/_controls.scss */
   ::-webkit-scrollbar-thumb:hover {
     background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #808080), color-stop(100%, #737373));
     background-image: -webkit-linear-gradient(#808080, #737373 20px);
@@ -1550,7 +1556,7 @@ label.checkbox.custom {
     background-image: -o-linear-gradient(#808080, #737373 20px);
     background-image: linear-gradient(#808080, #737373 20px); }
 
-/* line 483, ../sass/controls/_controls.scss */
+/* line 487, ../sass/controls/_controls.scss */
 ::-webkit-scrollbar-corner {
   background: rgba(0, 0, 0, 0.4); }
 
@@ -1793,7 +1799,7 @@ label.checkbox.custom {
   padding: 5px;
   position: relative; }
   /* line 24, ../sass/forms/_elems.scss */
-  .form .form-row:first-child {
+  .form .form-row.first {
     border-top: none; }
   /* line 29, ../sass/forms/_elems.scss */
   .form .form-row .label,
@@ -1807,45 +1813,62 @@ label.checkbox.custom {
     font-size: 0.75rem;
     line-height: 22px;
     min-height: 22px; }
-  /* line 38, ../sass/forms/_elems.scss */
+  /* line 39, ../sass/forms/_elems.scss */
   .form .form-row > .label {
     float: left;
     position: relative;
     white-space: nowrap;
     width: 20%; }
-  /* line 46, ../sass/forms/_elems.scss */
+  /* line 47, ../sass/forms/_elems.scss */
   .form .form-row .value {
     color: #cccccc; }
-  /* line 50, ../sass/forms/_elems.scss */
+  /* line 51, ../sass/forms/_elems.scss */
   .form .form-row .controls {
     float: left;
     position: relative;
-    width: 79%; }
-    /* line 55, ../sass/forms/_elems.scss */
-    .form .form-row .controls .l-composite-control {
-      display: inline-block; }
-      /* line 57, ../sass/forms/_elems.scss */
-      .form .form-row .controls .l-composite-control.l-checkbox {
-        line-height: 14px;
-        margin-right: 5px; }
-    /* line 65, ../sass/forms/_elems.scss */
+    width: 79.9%; }
+    /* line 58, ../sass/forms/_elems.scss */
+    .form .form-row .controls .l-composite-control.l-checkbox {
+      display: inline-block;
+      line-height: 14px;
+      margin-right: 5px; }
+    /* line 67, ../sass/forms/_elems.scss */
+    .form .form-row .controls input[type="text"] {
+      height: 22px;
+      line-height: 22px;
+      margin-top: -4px;
+      vertical-align: baseline; }
+    /* line 74, ../sass/forms/_elems.scss */
+    .form .form-row .controls .l-med input[type="text"] {
+      width: 200px; }
+    /* line 78, ../sass/forms/_elems.scss */
+    .form .form-row .controls .l-small input[type="text"] {
+      width: 50px; }
+    /* line 82, ../sass/forms/_elems.scss */
+    .form .form-row .controls .l-numeric input[type="text"] {
+      text-align: right; }
+    /* line 86, ../sass/forms/_elems.scss */
     .form .form-row .controls .select {
       margin-right: 5px; }
-  /* line 70, ../sass/forms/_elems.scss */
+  /* line 91, ../sass/forms/_elems.scss */
   .form .form-row .field-hints {
     color: #666666; }
-  /* line 74, ../sass/forms/_elems.scss */
+  /* line 95, ../sass/forms/_elems.scss */
   .form .form-row .selector-list {
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     -ms-border-radius: 3px;
     -o-border-radius: 3px;
     border-radius: 3px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
     background: rgba(0, 0, 0, 0.2);
+    padding: 5px;
     position: relative;
     height: 150px;
-    max-width: 50%; }
-    /* line 82, ../sass/forms/_elems.scss */
+    overflow: auto; }
+    /* line 106, ../sass/forms/_elems.scss */
     .form .form-row .selector-list .wrapper {
       overflow-y: auto;
       position: absolute;
@@ -1854,24 +1877,24 @@ label.checkbox.custom {
       bottom: 5px;
       left: 5px; }
 
-/* line 96, ../sass/forms/_elems.scss */
+/* line 120, ../sass/forms/_elems.scss */
 label.form-control.checkbox input {
   margin-right: 5px;
   vertical-align: top; }
 
-/* line 103, ../sass/forms/_elems.scss */
+/* line 127, ../sass/forms/_elems.scss */
 .hint,
 .s-hint {
   font-size: 0.9em; }
 
-/* line 107, ../sass/forms/_elems.scss */
+/* line 131, ../sass/forms/_elems.scss */
 .l-result {
   display: inline-block;
   min-width: 32px;
   min-height: 32px;
   position: relative;
   vertical-align: top; }
-  /* line 114, ../sass/forms/_elems.scss */
+  /* line 138, ../sass/forms/_elems.scss */
   .l-result div.s-hint {
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
@@ -1933,19 +1956,16 @@ input[type="text"] {
   -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
   -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
   box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
-  background: #666666;
+  background: rgba(255, 255, 255, 0.1);
   border: none;
-  border-bottom: 1px solid #999999;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.1);
   color: #cccccc;
   outline: none;
-  padding: 0 3px;
-  height: 22px;
-  line-height: 22px;
-  vertical-align: middle; }
-  /* line 11, ../sass/forms/_mixins.scss */
+  padding: 0 3px; }
+  /* line 12, ../sass/forms/_mixins.scss */
   input[type="text"].error {
     background: rgba(255, 0, 0, 0.5); }
-  /* line 11, ../sass/forms/_text-input.scss */
+  /* line 8, ../sass/forms/_text-input.scss */
   input[type="text"].numeric {
     text-align: right; }
 
@@ -1974,6 +1994,7 @@ input[type="text"] {
   cursor: pointer;
   display: inline-block;
   margin: 0 0 2px 2px;
+  overflow: hidden;
   position: relative; }
   /* line 127, ../sass/_mixins.scss */
   .form-control.select:not(.disabled):hover {
@@ -1982,7 +2003,7 @@ input[type="text"] {
     background-image: -moz-linear-gradient(#666666, #4d4d4d);
     background-image: -o-linear-gradient(#666666, #4d4d4d);
     background-image: linear-gradient(#666666, #4d4d4d); }
-  /* line 7, ../sass/forms/_selects.scss */
+  /* line 8, ../sass/forms/_selects.scss */
   .form-control.select select {
     -webkit-appearance: none;
     -moz-appearance: none;
@@ -1994,8 +2015,12 @@ input[type="text"] {
     color: #999999;
     border: none !important;
     cursor: pointer;
-    padding: 4px 25px 2px 5px; }
-  /* line 16, ../sass/forms/_selects.scss */
+    padding: 4px 25px 2px 5px;
+    width: 120%; }
+    /* line 17, ../sass/forms/_selects.scss */
+    .form-control.select select option {
+      margin: 5px 0; }
+  /* line 21, ../sass/forms/_selects.scss */
   .form-control.select:after {
     color: #0099cc;
     content: "v";
@@ -2026,9 +2051,9 @@ input[type="text"] {
   -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
   -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
   box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
-  background: #666666;
+  background: rgba(255, 255, 255, 0.1);
   border: none;
-  border-bottom: 1px solid #999999;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.1);
   color: #cccccc;
   outline: none;
   padding: 0 3px;
@@ -2038,7 +2063,7 @@ input[type="text"] {
   max-height: 400px;
   overflow: auto;
   padding: 5px; }
-  /* line 11, ../sass/forms/_mixins.scss */
+  /* line 12, ../sass/forms/_mixins.scss */
   .channel-selector .treeview.error {
     background: rgba(255, 0, 0, 0.5); }
 /* line 15, ../sass/forms/_channel-selector.scss */
@@ -2092,15 +2117,15 @@ input[type="text"] {
   -webkit-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
   -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
   box-shadow: inset rgba(0, 0, 0, 0.5) 0 1px 5px;
-  background: #666666;
+  background: rgba(255, 255, 255, 0.1);
   border: none;
-  border-bottom: 1px solid #999999;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.1);
   color: #cccccc;
   outline: none;
   padding: 0 3px;
   background: #3b3b3b;
   border-bottom: 1px solid #4d4d4d; }
-  /* line 11, ../sass/forms/_mixins.scss */
+  /* line 12, ../sass/forms/_mixins.scss */
   .filter input.filter.error,
   .filter input.t-filter-input.error,
   .t-filter input.filter.error,
@@ -2456,17 +2481,20 @@ input[type="text"] {
     left: 25px; }
 /* line 29, ../sass/overlay/_overlay.scss */
 .overlay .title {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
   font-size: 1.3em; }
-/* line 33, ../sass/overlay/_overlay.scss */
+/* line 34, ../sass/overlay/_overlay.scss */
 .overlay .top-bar {
   height: 60px; }
-/* line 37, ../sass/overlay/_overlay.scss */
+/* line 38, ../sass/overlay/_overlay.scss */
 .overlay .editor {
   top: 70px;
   bottom: 50px;
   left: 0;
   right: 0; }
-/* line 43, ../sass/overlay/_overlay.scss */
+/* line 44, ../sass/overlay/_overlay.scss */
 .overlay .bottom-bar {
   top: auto;
   right: 0;
@@ -2475,10 +2503,10 @@ input[type="text"] {
   font-size: 1em;
   height: 40px;
   text-align: right; }
-  /* line 48, ../sass/overlay/_overlay.scss */
+  /* line 49, ../sass/overlay/_overlay.scss */
   .overlay .bottom-bar .btn {
     margin-left: 10px; }
-/* line 52, ../sass/overlay/_overlay.scss */
+/* line 53, ../sass/overlay/_overlay.scss */
 .overlay .contents.l-dialog {
   overflow: auto; }
 
@@ -2489,15 +2517,15 @@ input[type="text"] {
   /* line 7, ../sass/user-environ/_frame.scss */
   .frame.child-frame.panel:hover {
     border-color: #666666; }
-/* line 11, ../sass/user-environ/_frame.scss */
-.frame > .object-header.abs {
+/* line 14, ../sass/user-environ/_frame.scss */
+.frame > .object-header.abs, .btn-menu .frame > span.object-header.l-click-area {
   font-size: 0.75em;
   height: 20px; }
-/* line 15, ../sass/user-environ/_frame.scss */
-.frame > .object-holder.abs {
+/* line 18, ../sass/user-environ/_frame.scss */
+.frame > .object-holder.abs, .btn-menu .frame > span.object-holder.l-click-area {
   top: 23px; }
 
-/* line 21, ../sass/user-environ/_frame.scss */
+/* line 24, ../sass/user-environ/_frame.scss */
 .edit-main .frame.child-frame.panel:hover {
   border-color: #0099cc;
   -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
@@ -2530,7 +2558,7 @@ input[type="text"] {
 .edit-mode .top-bar .buttons-main {
   white-space: nowrap; }
   /* line 37, ../sass/user-environ/_top-bar.scss */
-  .edit-mode .top-bar .buttons-main.abs {
+  .edit-mode .top-bar .buttons-main.abs, .edit-mode .top-bar .btn-menu span.buttons-main.l-click-area, .btn-menu .edit-mode .top-bar span.buttons-main.l-click-area {
     bottom: auto;
     left: auto; }
 
@@ -2685,21 +2713,17 @@ input[type="text"] {
     right: 0; }
     /* line 21, ../sass/helpers/_splitter.scss */
     .split-layout.horizontal .pane.top {
-      bottom: auto;
-      height: 70%; }
+      bottom: auto; }
     /* line 25, ../sass/helpers/_splitter.scss */
     .split-layout.horizontal .pane.bottom {
-      top: auto;
-      height: 30%; }
+      top: auto; }
   /* line 30, ../sass/helpers/_splitter.scss */
   .split-layout.horizontal > .splitter {
     cursor: row-resize;
     left: 0;
     right: 0;
     width: auto;
-    height: 5px;
-    margin-top: -7px;
-    top: 70%; }
+    height: 5px; }
     /* line 99, ../sass/_mixins.scss */
     .split-layout.horizontal > .splitter:before {
       content: '';
@@ -2720,19 +2744,15 @@ input[type="text"] {
   bottom: 0; }
   /* line 45, ../sass/helpers/_splitter.scss */
   .split-layout.vertical .pane.left {
-    right: auto;
-    width: 84%; }
+    right: auto; }
   /* line 49, ../sass/helpers/_splitter.scss */
   .split-layout.vertical .pane.right {
-    left: auto;
-    width: 15%; }
+    left: auto; }
 /* line 54, ../sass/helpers/_splitter.scss */
 .split-layout.vertical > .splitter {
   bottom: 0;
   cursor: col-resize;
-  width: 5px;
-  margin-left: -7px;
-  left: 85%; }
+  width: 5px; }
   /* line 99, ../sass/_mixins.scss */
   .split-layout.vertical > .splitter:before {
     content: '';
diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss
index 89c7ded8af..3aec688f64 100644
--- a/platform/commonUI/general/res/sass/controls/_controls.scss
+++ b/platform/commonUI/general/res/sass/controls/_controls.scss
@@ -295,13 +295,14 @@ label.checkbox.custom {
 
 .btn-menu {
 	$h: 20px;
-	$p: 7px;
+	$p: $interiorMargin;
 	$c: $colorBodyFg;
 	@include btnSubtle($colorBodyBg);
 	height: $h;
 	line-height: $h;
 	&.dropdown {
 		//		padding-left: $p;
+		padding-left: $p;
 		padding-right: $p;
 	}
 
@@ -318,8 +319,9 @@ label.checkbox.custom {
 		}
 	}
 
-    .l-click-area {
-//        @include test();
+    span.l-click-area {
+	    // In markup, this element should not enclose anything.
+	    @extend .abs;
     }
 
 	.type-icon {
@@ -327,6 +329,8 @@ label.checkbox.custom {
 	}
 	.menu {
 		//		margin-left: (-1 * $p);
+		position: absolute;
+		left: 0;
 		text-align: left;
 		.ui-symbol.icon {
 			width: 12px;
diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss
index e2ab6e6c3b..6d01e30792 100644
--- a/platform/commonUI/general/res/sass/forms/_elems.scss
+++ b/platform/commonUI/general/res/sass/forms/_elems.scss
@@ -21,12 +21,13 @@
 		margin-top: $interiorMargin;
 		padding: $interiorMargin;
 		position: relative;
-		&:first-child {
+		&.first {
 			border-top: none;
 		}
 
 		.label,
 		.controls {
+//			@include test(orange);
 			@include box-sizing(border-box);
 			@include clearfix;
 			box-sizing: border-box;
@@ -50,18 +51,38 @@
 		.controls {
 			float: left;
             position: relative;
-			width: 99% - $formLabelW; // Start with less than 100% for Firefox
+			width: 99.9% - $formLabelW; // Start with less than 100% for Firefox
 
 			.l-composite-control {
-				display: inline-block;
+//				display: inline-block;
 				&.l-checkbox {
 //					@include test();
 //					height: $formRowCtrlsH;
+					display: inline-block;
 					line-height: $formRowCtrlsH;
 					margin-right: 5px;
 				}
 			}
 
+			input[type="text"] {
+				height: $formInputH;
+				line-height: $formInputH;
+				margin-top: -4px;
+				vertical-align: baseline;
+			}
+
+			.l-med input[type="text"] {
+				width: 200px;
+			}
+
+			.l-small input[type="text"] {
+				width: 50px;
+			}
+
+			.l-numeric input[type="text"] {
+				text-align: right;
+			}
+
 			.select {
 				margin-right: $interiorMargin;
 			}
@@ -75,10 +96,13 @@
 			// Used in create overlay to display tree view
 			$h: 150px;
 			@include border-radius($basicCr);
+			@include box-sizing(border-box);
 			background: rgba(black, 0.2);
+			padding: $interiorMargin;
 			position: relative;
 			height: $h;
-			max-width: 50%;
+			overflow: auto;
+//			max-width: 50%;
 			.wrapper {
 				$p: $interiorMargin;
 				overflow-y: auto;
diff --git a/platform/commonUI/general/res/sass/forms/_mixins.scss b/platform/commonUI/general/res/sass/forms/_mixins.scss
index 25e894abe6..08f7c74fb8 100644
--- a/platform/commonUI/general/res/sass/forms/_mixins.scss
+++ b/platform/commonUI/general/res/sass/forms/_mixins.scss
@@ -3,9 +3,10 @@
 	@include border-radius($controlCr);
 	@include box-sizing(border-box);
 	@include box-shadow(inset rgba(black, 0.5) 0 1px 5px);
-	background: lighten($bg, 20%);
+//	background: lighten($bg, 20%);
+	background: rgba(#fff, 0.1);
 	border: none;
-	border-bottom: 1px solid lighten($bg, 40%);
+	border-bottom: 1px solid rgba(#fff, 0.1);
 	color: lighten($fg, 20%);
 	outline: none;
 	&.error {
diff --git a/platform/commonUI/general/res/sass/forms/_selects.scss b/platform/commonUI/general/res/sass/forms/_selects.scss
index b72f416de2..21cf610a2d 100644
--- a/platform/commonUI/general/res/sass/forms/_selects.scss
+++ b/platform/commonUI/general/res/sass/forms/_selects.scss
@@ -3,6 +3,7 @@
 	cursor: pointer;
 	display: inline-block;
 	margin: 0 0 2px 2px; // Needed to avoid dropshadow from being clipped by parent containers
+    overflow: hidden;
 	position: relative;
 	select {
 		@include appearance(none);
@@ -12,6 +13,10 @@
 		border: none !important;
 		cursor: pointer;
 		padding: 4px 25px 2px 5px;
+        width: 120%;
+        option {
+            margin: $interiorMargin 0; // Firefox
+        }
 	}
 	&:after {
 		color: $colorKey;
@@ -21,6 +26,5 @@
 		pointer-events: none;
 		position: absolute;
 		right: $interiorMargin; top: 0;
-//		z-index: 2;
 	}
 }
\ No newline at end of file
diff --git a/platform/commonUI/general/res/sass/forms/_text-input.scss b/platform/commonUI/general/res/sass/forms/_text-input.scss
index 3346bd1396..6ec94d836c 100644
--- a/platform/commonUI/general/res/sass/forms/_text-input.scss
+++ b/platform/commonUI/general/res/sass/forms/_text-input.scss
@@ -1,8 +1,5 @@
 input[type="text"] {
 	@include nice-input();
-	height: $formInputH;
-	line-height: $formInputH;
-	vertical-align: middle;
     &.filter {
         &.ng-dirty {
 //            background: red;
diff --git a/platform/commonUI/general/res/sass/helpers/_splitter.scss b/platform/commonUI/general/res/sass/helpers/_splitter.scss
index b8d6996867..0a4909630f 100644
--- a/platform/commonUI/general/res/sass/helpers/_splitter.scss
+++ b/platform/commonUI/general/res/sass/helpers/_splitter.scss
@@ -20,11 +20,11 @@
 			right: 0;
 			&.top {
 				bottom: auto;
-				height: $splitT;
+//				height: $splitT;
 			}
 			&.bottom {
 				top: auto;
-				height: 100% - $splitT;
+//				height: 100% - $splitT;
 			}
 		}
 		>.splitter {
@@ -33,8 +33,8 @@
 			left: 0; right: 0;
 			width: auto;
 			height: $splitterD;
-			margin-top: ($splitterD + 2) * -1;
-			top: $splitT;
+//			margin-top: ($splitterD + 2) * -1;  // Controlled by splitter
+//			top: $splitT;  // Controlled by splitter
 		}
 	}
 	&.vertical {
@@ -44,11 +44,11 @@
 			bottom: 0;
 			&.left {
 				right: auto;
-				width: $splitL - 1%;
+//				width: $splitL - 1%; // Controlled by splitter
 			}
 			&.right {
 				left: auto;
-				width: 100% - $splitL;
+//				width: 100% - $splitL; // Controlled by splitter
 			}
 		}
 		>.splitter {
@@ -56,8 +56,8 @@
 			bottom: 0;
 			cursor: col-resize;
 			width: $splitterD;
-			margin-left: ($splitterD + 2) * -1;
-			left: $splitL;
+//			margin-left: ($splitterD + 2) * -1;  // Controlled by splitter
+//			left: $splitL;  // Controlled by splitter
 		}
 	}
 }
diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss
index e2ed6887b8..1ea122d838 100644
--- a/platform/commonUI/general/res/sass/overlay/_overlay.scss
+++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss
@@ -27,6 +27,7 @@
         }
 	}
     .title {
+	    @include ellipsize();
         font-size: 1.3em;
     }
     
diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss
index e12d7df992..9f9a6409f4 100644
--- a/platform/commonUI/general/res/sass/user-environ/_frame.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss
@@ -7,6 +7,9 @@
 		&:hover {
 			border-color: lighten($bc, 10%);
 		}
+		.contents {
+//			overflow: hidden;
+		}
 	}
 	>.object-header.abs {
 		font-size: 0.75em;
diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss
index 15355ab024..0c7918b400 100644
--- a/platform/commonUI/general/res/sass/user-environ/_layout.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss
@@ -180,6 +180,7 @@
 	&.horizontal {
 		// Slides up and down
 		>.pane {
+//			@include test();
 			margin-top: $interiorMargin;
 			&:first-child {
 				margin-top: 0;
diff --git a/platform/commonUI/general/res/templates/controls/switcher.html b/platform/commonUI/general/res/templates/controls/switcher.html
index 276e66ff66..38f08daea2 100644
--- a/platform/commonUI/general/res/templates/controls/switcher.html
+++ b/platform/commonUI/general/res/templates/controls/switcher.html
@@ -4,11 +4,12 @@
          ng-if="view.length > 1"
          ng-controller="ClickAwayController as toggle">
 
-        <span ng-click="toggle.toggle()">
-            <span class="ui-symbol icon type-icon">{{ngModel.selected.glyph}}</span>
-            <span>{{ngModel.selected.name}}</span>
-            <span class='ui-symbol icon invoke-menu'>v</span>
-        </span>
+        <span class="l-click-area" ng-click="toggle.toggle()"></span>
+
+        <span class="ui-symbol icon type-icon">{{ngModel.selected.glyph}}</span>
+        <span>{{ngModel.selected.name}}</span>
+        <span class='ui-symbol icon invoke-menu'>v</span>
+
 
         <div class="menu dropdown" ng-show="toggle.isActive()">
             <ul>
diff --git a/platform/commonUI/general/src/controllers/SplitPaneController.js b/platform/commonUI/general/src/controllers/SplitPaneController.js
index b5ead00cd0..b1f8e0305e 100644
--- a/platform/commonUI/general/src/controllers/SplitPaneController.js
+++ b/platform/commonUI/general/src/controllers/SplitPaneController.js
@@ -58,6 +58,8 @@ define(
                         maximum,
                         Math.max(minimum, start + delta)
                     );
+
+	                //console.log(current + "; minimum: " + minimum + "; max: " + maximum);
                 }
             };
         }
diff --git a/platform/core/bundle.json b/platform/core/bundle.json
index c986bc8a74..86e7d22935 100644
--- a/platform/core/bundle.json
+++ b/platform/core/bundle.json
@@ -104,7 +104,8 @@
                         "key": "name",
                         "property": "name",
                         "pattern": "\\S+",
-                        "required": true
+                        "required": true,
+                        "cssclass": "l-med"
                     },
                     {
                         "control": "checkbox",
diff --git a/platform/features/layout/bundle.json b/platform/features/layout/bundle.json
index 86ccb54ff5..61c5a87fd2 100644
--- a/platform/features/layout/bundle.json
+++ b/platform/features/layout/bundle.json
@@ -204,26 +204,19 @@
                 "model": { "composition": [] },
                 "properties": [
                     {
-                        "name": "Preferred Size",
-                        "control": "select",
-                        "options": [
-                            { "name": "Fit to Window", "value": "FIT" },
-                            { "name": "Fixed Size", "value": "FIXED" }
-                        ],
-                        "key": "preferredSize"
-                    },
-                    {
-                        "label": "Layout Grid",
+                        "name": "Layout Grid",
                         "control": "composite",
                         "pattern": "^(\\d*[1-9]\\d*)?$",
                         "items": [
                             {
                                 "name": "Horizontal grid (px)",
-                                "control": "textfield"
+                                "control": "textfield",
+                                "cssclass": "l-small l-numeric"
                             },
                             {
                                 "name": "Vertical grid (px)",
-                                "control": "textfield"
+                                "control": "textfield",
+                                "cssclass": "l-small l-numeric"
                             }
                         ],
                         "key": "layoutGrid",
@@ -240,34 +233,19 @@
                 "features": "creation",
                 "model": { "composition": [] },
                 "properties": [
-                    {
-                        "name": "Preferred Size",
-                        "control": "composite",
-                        "items": [
-                            {
-                                "name": "Width (px)",
-                                "control": "textfield"
-                            },
-                            {
-                                "name": "Height (px)",
-                                "control": "textfield"
-                            }
-                        ],
-                        "pattern": "^(\\d*[1-9]\\d*)?$",
-                        "property": "preferredSize",
-                        "conversion": "number[]"
-                    },
                     {
                         "name": "Layout Grid",
                         "control": "composite",
                         "items": [
                             {
                                 "name": "Horizontal grid (px)",
-                                "control": "textfield"
+                                "control": "textfield",
+                                "cssclass": "l-small l-numeric"
                             },
                             {
                                 "name": "Vertical grid (px)",
-                                "control": "textfield"
+                                "control": "textfield",
+                                "cssclass": "l-small l-numeric"
                             }
                         ],
                         "pattern": "^(\\d*[1-9]\\d*)?$",
diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html
index 1f88ff9dd6..0e504ba5b0 100644
--- a/platform/features/plot/res/templates/plot.html
+++ b/platform/features/plot/res/templates/plot.html
@@ -91,11 +91,11 @@
                          ng-if="plot.getModeOptions().length > 1"
                          ng-controller="ClickAwayController as toggle">
 
-                        <span ng-click="toggle.toggle()">
-                            <span class="ui-symbol icon type-icon">{{plot.getMode().glyph}}</span>
-                            <span>{{plot.getMode().name}}</span>
-                            <span class='ui-symbol icon invoke-menu'>v</span>
-                        </span>
+                        <span class="l-click-area" ng-click="toggle.toggle()"></span>
+
+                        <span class="ui-symbol icon type-icon">{{plot.getMode().glyph}}</span>
+                        <span>{{plot.getMode().name}}</span>
+                        <span class='ui-symbol icon invoke-menu'>v</span>
 
                         <div class="menu dropdown" ng-show="toggle.isActive()">
                             <ul>
diff --git a/platform/forms/res/templates/controls/color.html b/platform/forms/res/templates/controls/color.html
index c4684a773d..3d2bb0b606 100644
--- a/platform/forms/res/templates/controls/color.html
+++ b/platform/forms/res/templates/controls/color.html
@@ -3,13 +3,14 @@
     ng-controller="ClickAwayController as toggle"
 	>
 
-    <span ng-click="toggle.toggle()">
-        <span class="ui-symbol icon">{{structure.glyph}}</span>
-        <span class="title-label" ng-if="structure.text">
-            {{structure.text}}
-        </span>
-        <span class='ui-symbol icon invoke-menu' ng-if="!structure.text">v</span>
+    <span class="l-click-area" ng-click="toggle.toggle()"></span>
+
+    <span class="ui-symbol icon">{{structure.glyph}}</span>
+    <span class="title-label" ng-if="structure.text">
+        {{structure.text}}
     </span>
+    <span class='ui-symbol icon invoke-menu' ng-if="!structure.text">v</span>
+
 
     <div
 	    class="menu dropdown l-color-palette"
diff --git a/platform/forms/res/templates/controls/composite.html b/platform/forms/res/templates/controls/composite.html
index 3de753d6f9..d1480056b8 100644
--- a/platform/forms/res/templates/controls/composite.html
+++ b/platform/forms/res/templates/controls/composite.html
@@ -1,6 +1,6 @@
 <span ng-controller="CompositeController as compositeCtrl">
     <ng-form name="mctFormItem" ng-repeat="item in structure.items">
-	    <div class="l-composite-control l-{{item.control}}">
+	    <div class="l-composite-control l-{{item.control}} {{item.cssclass}}">
 	        <mct-control key="item.control"
 	                     ng-model="ngModel[field]"
 	                     ng-required="ngRequired || compositeCtrl.isNonEmpty(ngModel[field])"
diff --git a/platform/forms/res/templates/controls/menu-button.html b/platform/forms/res/templates/controls/menu-button.html
index 53a2d81faf..2d89a7a311 100644
--- a/platform/forms/res/templates/controls/menu-button.html
+++ b/platform/forms/res/templates/controls/menu-button.html
@@ -1,15 +1,15 @@
 <div class="t-btn l-btn s-btn s-icon-btn s-very-subtle btn-menu menu-element dropdown click-invoke"
      ng-controller="ClickAwayController as toggle">
 
-    <span class="l-click-area" ng-click="toggle.toggle()">
-        <span class="ui-symbol icon">{{structure.glyph}}</span>
-        <span class="title-label" ng-if="structure.text">
-            {{structure.text}}
-        </span>
-        <span class='ui-symbol icon invoke-menu'
-              ng-if="!structure.text">
-            v
-        </span>
+    <span class="l-click-area" ng-click="toggle.toggle()"></span>
+
+    <span class="ui-symbol icon">{{structure.glyph}}</span>
+    <span class="title-label" ng-if="structure.text">
+        {{structure.text}}
+    </span>
+    <span class='ui-symbol icon invoke-menu'
+          ng-if="!structure.text">
+        v
     </span>
 
     <div class="menu dropdown" ng-show="toggle.isActive()">
diff --git a/platform/forms/res/templates/controls/textfield.html b/platform/forms/res/templates/controls/textfield.html
index 148f9e7005..5aa0f77d59 100644
--- a/platform/forms/res/templates/controls/textfield.html
+++ b/platform/forms/res/templates/controls/textfield.html
@@ -1,5 +1,5 @@
 <span class='form-control shell'>
-    <span class='field control'>
+    <span class='field control {{structure.cssclass}}'>
         <input type="text"
                ng-required="ngRequired"
                ng-model="ngModel[field]"
diff --git a/platform/forms/res/templates/form.html b/platform/forms/res/templates/form.html
index e2d6868263..d894ff31cc 100644
--- a/platform/forms/res/templates/form.html
+++ b/platform/forms/res/templates/form.html
@@ -11,7 +11,8 @@
                      ng-class="{
                                req: row.required,
                                valid: mctFormInner.$dirty && mctFormInner.$valid,
-                               invalid: mctFormInner.$dirty && !mctFormInner.$valid
+                               invalid: mctFormInner.$dirty && !mctFormInner.$valid,
+                               first: $index < 1
                                }">
 
                     <div class='label' title="{{row.description}}">