diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html
index 89fdc122b2..83d4db88db 100644
--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@@ -4,7 +4,7 @@
         <div class='split-layout vertical contents abs'
              ng-controller="SplitPaneController as splitter">
             <div class='split-pane-component treeview pane'
-                 ng-style="{ width: splitter.state() + 'px'}">
+                 ng-style="{ width: (splitter.state() - 8) + 'px'}">
                 <mct-representation key="'create-button'" mct-object="navigatedObject">
                 </mct-representation>
                 <div class='holder tree-holder abs'>
diff --git a/platform/commonUI/edit/res/templates/edit-object.html b/platform/commonUI/edit/res/templates/edit-object.html
index 2ff322e37c..008cf6f895 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(200) - 8) + 'px'}"
+            >
             <div class='holder abs object-holder'>
                 <mct-representation key="representation.selected.key"
                                     toolbar="toolbar"
@@ -16,21 +19,51 @@
                 </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'>
-	            <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="context.getRoot()">
-                    </mct-representation>
-                </mct-container>
+
+        <!-- MAIN VERTICAL SPLITTER -->
+        <div
+            class="splitter"
+            ng-style="{ right: (Splitter.state()-8) + 'px'}"
+            mct-drag-down="vSplitter.startMove()"
+            mct-drag="vSplitter.move(-delta[0], 300, 500)"
+            ></div>
+
+
+        <div
+            class='abs pane right edit-objects menus-to-left'
+            ng-style="{ width: vSplitter.state() + '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(400) + 8) + 'px', top: '0px' }"
+                    ng-controller="ToggleController as toggle"
+                    >
+                    <mct-container key="accordion" title="Library">
+                        <mct-representation key="'tree'" alias="foo1" mct-object="context.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()) + '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/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css
index b5bcea11cd..bbdc8ba099 100644
--- a/platform/commonUI/general/res/css/theme-espresso.css
+++ b/platform/commonUI/general/res/css/theme-espresso.css
@@ -2725,12 +2725,10 @@ 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;
diff --git a/platform/commonUI/general/res/sass/forms/_selects.scss b/platform/commonUI/general/res/sass/forms/_selects.scss
index eaa8f2b318..21cf610a2d 100644
--- a/platform/commonUI/general/res/sass/forms/_selects.scss
+++ b/platform/commonUI/general/res/sass/forms/_selects.scss
@@ -26,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/helpers/_splitter.scss b/platform/commonUI/general/res/sass/helpers/_splitter.scss
index b8d6996867..ac1f7cdbae 100644
--- a/platform/commonUI/general/res/sass/helpers/_splitter.scss
+++ b/platform/commonUI/general/res/sass/helpers/_splitter.scss
@@ -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 {