diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html
index 10a491d652..3b20e5e29d 100644
--- a/platform/commonUI/browse/res/templates/browse-object.html
+++ b/platform/commonUI/browse/res/templates/browse-object.html
@@ -51,11 +51,11 @@
     </div>
 
     <div class="l-object-wrapper"
-         ng-class="{ active:editMode, 'not-active':!editMode }">
+         ng-class="{ active:editMode }">
         <div class="l-object-wrapper-inner l-flex flex-col">
             <!-- Toolbar and Save/Cancel buttons -->
             <div class="l-edit-controls flex-elem l-flex flex-row"
-                 ng-if="editMode">
+                 ng-class="{ active:editMode }">
                 <mct-toolbar name="mctToolbar"
                              structure="toolbar.structure"
                              ng-model="toolbar.state"
diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss
index 0b707d6137..22d83dd3df 100644
--- a/platform/commonUI/general/res/sass/_mixins.scss
+++ b/platform/commonUI/general/res/sass/_mixins.scss
@@ -62,7 +62,7 @@
 }
 
 @mixin trans-prop-nice-resize($t: 0.5s, $tf: ease-in-out) {
-    @include transition-property(height, width, top, right, bottom, left);
+    @include transition-property(height, width, top, right, bottom, left, opacity);
     @include transition-duration($t);
     @include transition-timing-function($tf);
 }
diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss
index 8d22cf7394..80f42a5731 100644
--- a/platform/commonUI/general/res/sass/user-environ/_layout.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss
@@ -288,7 +288,7 @@
 }
 
 .object-holder {
-    @include trans-prop-nice-resize(0.3s);
+    @include trans-prop-nice-resize(0.25s);
     overflow: hidden; // Contained objects need to handle their own overflow now
     > ng-include {
         @include absPosDefault(0, auto);
@@ -318,13 +318,19 @@
 .l-object-wrapper-inner {
     @extend .abs;
     @include display-flex(column nowrap);
-    @include trans-prop-nice-resize(0.5s);
+    @include trans-prop-nice-resize(0.25s);
 }
 
 .l-edit-controls {
-    border-bottom: 1px solid $colorInteriorBorder;
-    height: $ueEditToolBarH + $interiorMargin;
-    line-height: $ueEditToolBarH;
+    @include trans-prop-nice-resize(0.25s);
+    height: 0;
+    opacity: 0;
+    &.active {
+        border-bottom: 1px solid $colorInteriorBorder;
+        height: $ueEditToolBarH + $interiorMargin;
+        line-height: $ueEditToolBarH;
+        opacity: 1;
+    }
 }
 
 .object-browse-bar .s-btn,
@@ -367,19 +373,19 @@
     @include display-flex;
     &.flex-row {
         @include flex-flow(row nowrap);
-        .flex-elem {
-            margin-left: $interiorMargin;
-            &:first-child {
-                margin-left: 0;
+        .flex-elem.active {
+            margin-right: $interiorMargin;
+            &:last-child {
+                margin-right: 0;
             }
         }
     }
     &.flex-col {
         @include flex-flow(column nowrap);
-        .flex-elem {
-            margin-top: $interiorMarginLg;
-            &:first-child {
-                margin-top: 0;
+        .flex-elem.active {
+            margin-bottom: $interiorMarginLg;
+            &:last-child {
+                margin-bottom: 0;
             }
         }
     }
diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css
index d1a834ba30..f8532a3c3f 100644
--- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css
+++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css
@@ -3602,14 +3602,14 @@ span.req {
 
 /* line 290, ../../../../general/res/sass/user-environ/_layout.scss */
 .object-holder {
-  -moz-transition-property: height, width, top, right, bottom, left;
-  -o-transition-property: height, width, top, right, bottom, left;
-  -webkit-transition-property: height, width, top, right, bottom, left;
-  transition-property: height, width, top, right, bottom, left;
-  -moz-transition-duration: 0.3s;
-  -o-transition-duration: 0.3s;
-  -webkit-transition-duration: 0.3s;
-  transition-duration: 0.3s;
+  -moz-transition-property: height, width, top, right, bottom, left, opacity;
+  -o-transition-property: height, width, top, right, bottom, left, opacity;
+  -webkit-transition-property: height, width, top, right, bottom, left, opacity;
+  transition-property: height, width, top, right, bottom, left, opacity;
+  -moz-transition-duration: 0.25s;
+  -o-transition-duration: 0.25s;
+  -webkit-transition-duration: 0.25s;
+  transition-duration: 0.25s;
   -moz-transition-timing-function: ease-in-out;
   -o-transition-timing-function: ease-in-out;
   -webkit-transition-timing-function: ease-in-out;
@@ -3681,14 +3681,14 @@ span.req {
 .l-object-wrapper-inner {
   display: -webkit-column nowrap;
   display: column nowrap;
-  -moz-transition-property: height, width, top, right, bottom, left;
-  -o-transition-property: height, width, top, right, bottom, left;
-  -webkit-transition-property: height, width, top, right, bottom, left;
-  transition-property: height, width, top, right, bottom, left;
-  -moz-transition-duration: 0.5s;
-  -o-transition-duration: 0.5s;
-  -webkit-transition-duration: 0.5s;
-  transition-duration: 0.5s;
+  -moz-transition-property: height, width, top, right, bottom, left, opacity;
+  -o-transition-property: height, width, top, right, bottom, left, opacity;
+  -webkit-transition-property: height, width, top, right, bottom, left, opacity;
+  transition-property: height, width, top, right, bottom, left, opacity;
+  -moz-transition-duration: 0.25s;
+  -o-transition-duration: 0.25s;
+  -webkit-transition-duration: 0.25s;
+  transition-duration: 0.25s;
   -moz-transition-timing-function: ease-in-out;
   -o-transition-timing-function: ease-in-out;
   -webkit-transition-timing-function: ease-in-out;
@@ -3696,11 +3696,28 @@ span.req {
 
 /* line 324, ../../../../general/res/sass/user-environ/_layout.scss */
 .l-edit-controls {
-  border-bottom: 1px solid rgba(153, 153, 153, 0.1);
-  height: 30px;
-  line-height: 25px; }
+  -moz-transition-property: height, width, top, right, bottom, left, opacity;
+  -o-transition-property: height, width, top, right, bottom, left, opacity;
+  -webkit-transition-property: height, width, top, right, bottom, left, opacity;
+  transition-property: height, width, top, right, bottom, left, opacity;
+  -moz-transition-duration: 0.25s;
+  -o-transition-duration: 0.25s;
+  -webkit-transition-duration: 0.25s;
+  transition-duration: 0.25s;
+  -moz-transition-timing-function: ease-in-out;
+  -o-transition-timing-function: ease-in-out;
+  -webkit-transition-timing-function: ease-in-out;
+  transition-timing-function: ease-in-out;
+  height: 0;
+  opacity: 0; }
+  /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */
+  .l-edit-controls.active {
+    border-bottom: 1px solid rgba(153, 153, 153, 0.1);
+    height: 30px;
+    line-height: 25px;
+    opacity: 1; }
 
-/* line 330, ../../../../general/res/sass/user-environ/_layout.scss */
+/* line 336, ../../../../general/res/sass/user-environ/_layout.scss */
 .object-browse-bar .s-btn, .object-browse-bar .s-menu-btn,
 .top-bar .buttons-main .s-btn,
 .top-bar .buttons-main .s-menu-btn,
@@ -3712,12 +3729,12 @@ span.req {
   line-height: 25px;
   vertical-align: top; }
 
-/* line 343, ../../../../general/res/sass/user-environ/_layout.scss */
+/* line 349, ../../../../general/res/sass/user-environ/_layout.scss */
 .object-browse-bar .view-switcher,
 .top-bar .view-switcher {
   margin-right: 20px; }
 
-/* line 348, ../../../../general/res/sass/user-environ/_layout.scss */
+/* line 354, ../../../../general/res/sass/user-environ/_layout.scss */
 .object-browse-bar {
   overflow: visible;
   position: absolute;
@@ -3733,49 +3750,49 @@ span.req {
   height: 24px;
   line-height: 24px;
   white-space: nowrap; }
-  /* line 356, ../../../../general/res/sass/user-environ/_layout.scss */
+  /* line 362, ../../../../general/res/sass/user-environ/_layout.scss */
   .object-browse-bar .left {
     padding-right: 20px; }
-    /* line 358, ../../../../general/res/sass/user-environ/_layout.scss */
+    /* line 364, ../../../../general/res/sass/user-environ/_layout.scss */
     .object-browse-bar .left .l-back {
       display: inline-block;
       float: left;
       margin-right: 10px; }
 
-/* line 366, ../../../../general/res/sass/user-environ/_layout.scss */
+/* line 372, ../../../../general/res/sass/user-environ/_layout.scss */
 .l-flex {
   display: -webkit-flex;
   display: flex; }
-  /* line 368, ../../../../general/res/sass/user-environ/_layout.scss */
+  /* line 374, ../../../../general/res/sass/user-environ/_layout.scss */
   .l-flex.flex-row {
     -webkit-flex-flow: row nowrap;
     flex-flow: row nowrap; }
-    /* line 370, ../../../../general/res/sass/user-environ/_layout.scss */
-    .l-flex.flex-row .flex-elem {
-      margin-left: 5px; }
-      /* line 372, ../../../../general/res/sass/user-environ/_layout.scss */
-      .l-flex.flex-row .flex-elem:first-child {
-        margin-left: 0; }
-  /* line 377, ../../../../general/res/sass/user-environ/_layout.scss */
+    /* line 376, ../../../../general/res/sass/user-environ/_layout.scss */
+    .l-flex.flex-row .flex-elem.active {
+      margin-right: 5px; }
+      /* line 378, ../../../../general/res/sass/user-environ/_layout.scss */
+      .l-flex.flex-row .flex-elem.active:last-child {
+        margin-right: 0; }
+  /* line 383, ../../../../general/res/sass/user-environ/_layout.scss */
   .l-flex.flex-col {
     -webkit-flex-flow: column nowrap;
     flex-flow: column nowrap; }
-    /* line 379, ../../../../general/res/sass/user-environ/_layout.scss */
-    .l-flex.flex-col .flex-elem {
-      margin-top: 10px; }
-      /* line 381, ../../../../general/res/sass/user-environ/_layout.scss */
-      .l-flex.flex-col .flex-elem:first-child {
-        margin-top: 0; }
-  /* line 386, ../../../../general/res/sass/user-environ/_layout.scss */
+    /* line 385, ../../../../general/res/sass/user-environ/_layout.scss */
+    .l-flex.flex-col .flex-elem.active {
+      margin-bottom: 10px; }
+      /* line 387, ../../../../general/res/sass/user-environ/_layout.scss */
+      .l-flex.flex-col .flex-elem.active:last-child {
+        margin-bottom: 0; }
+  /* line 392, ../../../../general/res/sass/user-environ/_layout.scss */
   .l-flex .flex-elem {
     -webkit-flex: 0 1;
     flex: 0 1;
     position: relative; }
-    /* line 390, ../../../../general/res/sass/user-environ/_layout.scss */
+    /* line 396, ../../../../general/res/sass/user-environ/_layout.scss */
     .l-flex .flex-elem.grow {
       -webkit-flex: 1 1;
       flex: 1 1; }
-  /* line 394, ../../../../general/res/sass/user-environ/_layout.scss */
+  /* line 400, ../../../../general/res/sass/user-environ/_layout.scss */
   .l-flex .left {
     -webkit-flex: 1 1 0;
     flex: 1 1 0;
diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css
index 96832eaa6b..41f85b3c40 100644
--- a/platform/commonUI/themes/snow/res/css/theme-snow.css
+++ b/platform/commonUI/themes/snow/res/css/theme-snow.css
@@ -3549,14 +3549,14 @@ span.req {
 
 /* line 290, ../../../../general/res/sass/user-environ/_layout.scss */
 .object-holder {
-  -moz-transition-property: height, width, top, right, bottom, left;
-  -o-transition-property: height, width, top, right, bottom, left;
-  -webkit-transition-property: height, width, top, right, bottom, left;
-  transition-property: height, width, top, right, bottom, left;
-  -moz-transition-duration: 0.3s;
-  -o-transition-duration: 0.3s;
-  -webkit-transition-duration: 0.3s;
-  transition-duration: 0.3s;
+  -moz-transition-property: height, width, top, right, bottom, left, opacity;
+  -o-transition-property: height, width, top, right, bottom, left, opacity;
+  -webkit-transition-property: height, width, top, right, bottom, left, opacity;
+  transition-property: height, width, top, right, bottom, left, opacity;
+  -moz-transition-duration: 0.25s;
+  -o-transition-duration: 0.25s;
+  -webkit-transition-duration: 0.25s;
+  transition-duration: 0.25s;
   -moz-transition-timing-function: ease-in-out;
   -o-transition-timing-function: ease-in-out;
   -webkit-transition-timing-function: ease-in-out;
@@ -3628,14 +3628,14 @@ span.req {
 .l-object-wrapper-inner {
   display: -webkit-column nowrap;
   display: column nowrap;
-  -moz-transition-property: height, width, top, right, bottom, left;
-  -o-transition-property: height, width, top, right, bottom, left;
-  -webkit-transition-property: height, width, top, right, bottom, left;
-  transition-property: height, width, top, right, bottom, left;
-  -moz-transition-duration: 0.5s;
-  -o-transition-duration: 0.5s;
-  -webkit-transition-duration: 0.5s;
-  transition-duration: 0.5s;
+  -moz-transition-property: height, width, top, right, bottom, left, opacity;
+  -o-transition-property: height, width, top, right, bottom, left, opacity;
+  -webkit-transition-property: height, width, top, right, bottom, left, opacity;
+  transition-property: height, width, top, right, bottom, left, opacity;
+  -moz-transition-duration: 0.25s;
+  -o-transition-duration: 0.25s;
+  -webkit-transition-duration: 0.25s;
+  transition-duration: 0.25s;
   -moz-transition-timing-function: ease-in-out;
   -o-transition-timing-function: ease-in-out;
   -webkit-transition-timing-function: ease-in-out;
@@ -3643,11 +3643,28 @@ span.req {
 
 /* line 324, ../../../../general/res/sass/user-environ/_layout.scss */
 .l-edit-controls {
-  border-bottom: 1px solid rgba(102, 102, 102, 0.2);
-  height: 30px;
-  line-height: 25px; }
+  -moz-transition-property: height, width, top, right, bottom, left, opacity;
+  -o-transition-property: height, width, top, right, bottom, left, opacity;
+  -webkit-transition-property: height, width, top, right, bottom, left, opacity;
+  transition-property: height, width, top, right, bottom, left, opacity;
+  -moz-transition-duration: 0.25s;
+  -o-transition-duration: 0.25s;
+  -webkit-transition-duration: 0.25s;
+  transition-duration: 0.25s;
+  -moz-transition-timing-function: ease-in-out;
+  -o-transition-timing-function: ease-in-out;
+  -webkit-transition-timing-function: ease-in-out;
+  transition-timing-function: ease-in-out;
+  height: 0;
+  opacity: 0; }
+  /* line 328, ../../../../general/res/sass/user-environ/_layout.scss */
+  .l-edit-controls.active {
+    border-bottom: 1px solid rgba(102, 102, 102, 0.2);
+    height: 30px;
+    line-height: 25px;
+    opacity: 1; }
 
-/* line 330, ../../../../general/res/sass/user-environ/_layout.scss */
+/* line 336, ../../../../general/res/sass/user-environ/_layout.scss */
 .object-browse-bar .s-btn, .object-browse-bar .s-menu-btn,
 .top-bar .buttons-main .s-btn,
 .top-bar .buttons-main .s-menu-btn,
@@ -3659,12 +3676,12 @@ span.req {
   line-height: 25px;
   vertical-align: top; }
 
-/* line 343, ../../../../general/res/sass/user-environ/_layout.scss */
+/* line 349, ../../../../general/res/sass/user-environ/_layout.scss */
 .object-browse-bar .view-switcher,
 .top-bar .view-switcher {
   margin-right: 20px; }
 
-/* line 348, ../../../../general/res/sass/user-environ/_layout.scss */
+/* line 354, ../../../../general/res/sass/user-environ/_layout.scss */
 .object-browse-bar {
   overflow: visible;
   position: absolute;
@@ -3680,49 +3697,49 @@ span.req {
   height: 24px;
   line-height: 24px;
   white-space: nowrap; }
-  /* line 356, ../../../../general/res/sass/user-environ/_layout.scss */
+  /* line 362, ../../../../general/res/sass/user-environ/_layout.scss */
   .object-browse-bar .left {
     padding-right: 20px; }
-    /* line 358, ../../../../general/res/sass/user-environ/_layout.scss */
+    /* line 364, ../../../../general/res/sass/user-environ/_layout.scss */
     .object-browse-bar .left .l-back {
       display: inline-block;
       float: left;
       margin-right: 10px; }
 
-/* line 366, ../../../../general/res/sass/user-environ/_layout.scss */
+/* line 372, ../../../../general/res/sass/user-environ/_layout.scss */
 .l-flex {
   display: -webkit-flex;
   display: flex; }
-  /* line 368, ../../../../general/res/sass/user-environ/_layout.scss */
+  /* line 374, ../../../../general/res/sass/user-environ/_layout.scss */
   .l-flex.flex-row {
     -webkit-flex-flow: row nowrap;
     flex-flow: row nowrap; }
-    /* line 370, ../../../../general/res/sass/user-environ/_layout.scss */
-    .l-flex.flex-row .flex-elem {
-      margin-left: 5px; }
-      /* line 372, ../../../../general/res/sass/user-environ/_layout.scss */
-      .l-flex.flex-row .flex-elem:first-child {
-        margin-left: 0; }
-  /* line 377, ../../../../general/res/sass/user-environ/_layout.scss */
+    /* line 376, ../../../../general/res/sass/user-environ/_layout.scss */
+    .l-flex.flex-row .flex-elem.active {
+      margin-right: 5px; }
+      /* line 378, ../../../../general/res/sass/user-environ/_layout.scss */
+      .l-flex.flex-row .flex-elem.active:last-child {
+        margin-right: 0; }
+  /* line 383, ../../../../general/res/sass/user-environ/_layout.scss */
   .l-flex.flex-col {
     -webkit-flex-flow: column nowrap;
     flex-flow: column nowrap; }
-    /* line 379, ../../../../general/res/sass/user-environ/_layout.scss */
-    .l-flex.flex-col .flex-elem {
-      margin-top: 10px; }
-      /* line 381, ../../../../general/res/sass/user-environ/_layout.scss */
-      .l-flex.flex-col .flex-elem:first-child {
-        margin-top: 0; }
-  /* line 386, ../../../../general/res/sass/user-environ/_layout.scss */
+    /* line 385, ../../../../general/res/sass/user-environ/_layout.scss */
+    .l-flex.flex-col .flex-elem.active {
+      margin-bottom: 10px; }
+      /* line 387, ../../../../general/res/sass/user-environ/_layout.scss */
+      .l-flex.flex-col .flex-elem.active:last-child {
+        margin-bottom: 0; }
+  /* line 392, ../../../../general/res/sass/user-environ/_layout.scss */
   .l-flex .flex-elem {
     -webkit-flex: 0 1;
     flex: 0 1;
     position: relative; }
-    /* line 390, ../../../../general/res/sass/user-environ/_layout.scss */
+    /* line 396, ../../../../general/res/sass/user-environ/_layout.scss */
     .l-flex .flex-elem.grow {
       -webkit-flex: 1 1;
       flex: 1 1; }
-  /* line 394, ../../../../general/res/sass/user-environ/_layout.scss */
+  /* line 400, ../../../../general/res/sass/user-environ/_layout.scss */
   .l-flex .left {
     -webkit-flex: 1 1 0;
     flex: 1 1 0;