diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html
index 068e51ce0b..85d977ec73 100644
--- a/platform/commonUI/browse/res/templates/browse-object.html
+++ b/platform/commonUI/browse/res/templates/browse-object.html
@@ -23,10 +23,9 @@
     
     <div class="object-browse-bar bar abs">
         
-        <div class="ui-symbol left-pane-tabs"
+        <div class="pane-tabs left"
              ng-class="{inactivePane: !ngModel.leftPane, activePane: ngModel.leftPane}"
              ng-click="ngModel.leftPane = !ngModel.leftPane">
-            
         </div>
         
         <div class="items-select left abs">
@@ -46,6 +45,11 @@
             </mct-representation>
         </div>
         
+        <div class="pane-tabs right"
+             ng-class="{inactivePane: !ngModel.rightPane, activePane: ngModel.rightPane}"
+             ng-click="ngModel.rightPane = !ngModel.rightPane">
+        </div>
+        
     </div>
 
     <div class='object-holder abs vscroll'>
diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html
index d7d74e9c33..1ed260c265 100644
--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@@ -52,7 +52,7 @@
             </mct-splitter>
             
             <div class='split-pane-component secondary-split pane right'
-                 ng-class='{leftInactive: !paneModel.leftPane}'>
+                 ng-class='{leftInactive: !paneModel.leftPane, rightInactive: !paneModel.rightPane}'>
                 <mct-split-pane class='contents abs'
                                 anchor='right'>
                     
@@ -67,10 +67,11 @@
                     </div>
                     
                     <mct-splitter class="splitter-bar right"
-                                  ng-class="{inactive: !paneModel.leftPane}">
+                                  ng-class="{inactive: !paneModel.rightPane}">
                     </mct-splitter>
                     
-                    <div class='split-pane-component object-inspector pane right'>
+                    <div class='split-pane-component object-inspector pane right'
+                         ng-class='{inactive: !paneModel.rightPane}'>
                         <div class='holder inspector-holder abs'>
                             <mct-representation key="'object-inspector'"
                                                 mct-object="domainObject"
diff --git a/platform/commonUI/browse/src/BrowseObjectController.js b/platform/commonUI/browse/src/BrowseObjectController.js
index 3f450e9352..499ac26a12 100644
--- a/platform/commonUI/browse/src/BrowseObjectController.js
+++ b/platform/commonUI/browse/src/BrowseObjectController.js
@@ -74,6 +74,9 @@ define(
                 $scope.ngModel.leftPane = true;
             }
             
+            // The object inspector by default always starts closed
+            $scope.ngModel.rightPane = false;
+            
             $scope.$watch('domainObject', setViewForDomainObject);
             $scope.$watch('representation.selected.key', updateQueryParam);
         }
diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css
index 524fe902e6..05c582f183 100644
--- a/platform/commonUI/general/res/css/theme-espresso.css
+++ b/platform/commonUI/general/res/css/theme-espresso.css
@@ -5155,120 +5155,145 @@ input[type="text"] {
     .pane.left .create-btn.major.inactivePane span {
       display: none; }
 
-/* line 74, ../sass/tree/_pane.scss */
-.splitter-bar.left {
+/* line 72, ../sass/tree/_pane.scss */
+.splitter-bar.splitter {
   opacity: 1;
   transition: opacity 0.35s, visibility 0.35s;
   top: 0; }
-  /* line 81, ../sass/tree/_pane.scss */
-  .splitter-bar.left.inactive {
+  /* line 79, ../sass/tree/_pane.scss */
+  .splitter-bar.splitter.inactive {
     visibility: hidden;
-    opacity: 0;
-    transition: opacity 0s, visibility 0s; }
-    /* line 87, ../sass/tree/_pane.scss */
-    .splitter-bar.left.inactive:before {
+    opacity: 0; }
+    /* line 83, ../sass/tree/_pane.scss */
+    .splitter-bar.splitter.inactive:before {
       border-width: 0; }
 
-/* line 94, ../sass/tree/_pane.scss */
+/* line 91, ../sass/tree/_pane.scss */
+.splitter-bar.left.splitter.inactive {
+  transition: opacity 0s, visibility 0s; }
+
+/* line 97, ../sass/tree/_pane.scss */
 .split-pane-component.secondary-split.pane.right {
-  transition: left 0.35s;
+  transition: left 0.35s, right 0.35s;
   transition-timing-function: ease-out; }
-  /* line 98, ../sass/tree/_pane.scss */
+  /* line 101, ../sass/tree/_pane.scss */
   .split-pane-component.secondary-split.pane.right.leftInactive {
     left: 0 !important; }
-  /* line 102, ../sass/tree/_pane.scss */
-  .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane {
-    right: auto; }
-    /* line 106, ../sass/tree/_pane.scss */
-    .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar {
-      position: relative; }
-      /* line 109, ../sass/tree/_pane.scss */
-      .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .left-pane-tabs {
-        position: relative;
-        cursor: pointer;
+  /* line 105, ../sass/tree/_pane.scss */
+  .split-pane-component.secondary-split.pane.right.rightInactive {
+    right: 0 !important; }
+    /* line 107, ../sass/tree/_pane.scss */
+    .split-pane-component.secondary-split.pane.right.rightInactive .items.pane {
+      width: 100%; }
+  /* line 114, ../sass/tree/_pane.scss */
+  .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar {
+    position: relative; }
+    /* line 117, ../sass/tree/_pane.scss */
+    .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .pane-tabs {
+      position: relative;
+      cursor: pointer;
+      font-family: symbolsfont;
+      background-color: #595959;
+      width: 11px !important;
+      height: 16px;
+      line-height: 16px;
+      font-size: 10px; }
+      /* line 130, ../sass/tree/_pane.scss */
+      .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .pane-tabs.left {
         left: -10px;
-        width: 11px;
-        height: 16px;
-        line-height: 16px;
-        font-size: 10px;
         top: 3px;
         border-top-right-radius: 2px;
-        border-bottom-right-radius: 2px;
-        background-color: #595959; }
-        /* line 126, ../sass/tree/_pane.scss */
-        .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .left-pane-tabs.inactivePane {
+        border-bottom-right-radius: 2px; }
+        /* line 138, ../sass/tree/_pane.scss */
+        .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .pane-tabs.left.inactivePane {
           left: -15px; }
-          /* line 129, ../sass/tree/_pane.scss */
-          .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .left-pane-tabs.inactivePane:after {
+          /* line 140, ../sass/tree/_pane.scss */
+          .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .pane-tabs.left.inactivePane:after {
             content: '>'; }
-        /* line 133, ../sass/tree/_pane.scss */
-        .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .left-pane-tabs.activePane:after {
+        /* line 144, ../sass/tree/_pane.scss */
+        .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .pane-tabs.left.activePane:after {
           content: '<'; }
-      /* line 138, ../sass/tree/_pane.scss */
-      .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .items-select {
-        margin-left: 10px; }
-  /* line 144, ../sass/tree/_pane.scss */
-  .split-pane-component.secondary-split.pane.right .splitter-bar.right {
-    top: 0; }
-  /* line 149, ../sass/tree/_pane.scss */
+      /* line 150, ../sass/tree/_pane.scss */
+      .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .pane-tabs.right {
+        float: right;
+        right: -8px;
+        top: -13px;
+        border-top-left-radius: 2px;
+        border-bottom-left-radius: 2px; }
+        /* line 161, ../sass/tree/_pane.scss */
+        .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .pane-tabs.right.inactivePane:after {
+          content: '<'; }
+        /* line 165, ../sass/tree/_pane.scss */
+        .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .pane-tabs.right.activePane:after {
+          content: '>'; }
+    /* line 173, ../sass/tree/_pane.scss */
+    .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .items-select {
+      margin-left: 10px; }
+    /* line 177, ../sass/tree/_pane.scss */
+    .split-pane-component.secondary-split.pane.right .split-pane-component.items.pane .object-browse-bar .btn-bar.right {
+      margin-right: 10px; }
+  /* line 183, ../sass/tree/_pane.scss */
   .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right {
     min-width: 150px; }
-    /* line 154, ../sass/tree/_pane.scss */
+    /* line 186, ../sass/tree/_pane.scss */
+    .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right.inactive {
+      min-width: 0 !important;
+      width: 0 !important;
+      visibility: hidden; }
+    /* line 194, ../sass/tree/_pane.scss */
     .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder .info-icon {
       color: #0099cc; }
-    /* line 158, ../sass/tree/_pane.scss */
-    .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul {
-      font-size: 0.9em; }
-      /* line 161, ../sass/tree/_pane.scss */
-      .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li {
-        padding: 2px 0px;
-        margin: 2px 0px;
-        border-top: solid 1px grey; }
-        /* line 166, ../sass/tree/_pane.scss */
-        .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li:first-child {
-          border-top-width: 0px; }
-        /* line 171, ../sass/tree/_pane.scss */
-        .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li em {
-          font-weight: bold; }
-          /* line 174, ../sass/tree/_pane.scss */
-          .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li em:after {
-            content: '\A';
-            white-space: pre; }
-        /* line 181, ../sass/tree/_pane.scss */
-        .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location {
+    /* line 198, ../sass/tree/_pane.scss */
+    .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li {
+      font-size: 0.9em;
+      padding: 2px 0px;
+      margin: 2px 0px;
+      border-top: solid 1px grey; }
+      /* line 205, ../sass/tree/_pane.scss */
+      .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li:first-child {
+        border-top-width: 0px; }
+      /* line 210, ../sass/tree/_pane.scss */
+      .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li em {
+        font-weight: bold; }
+        /* line 213, ../sass/tree/_pane.scss */
+        .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li em:after {
+          content: '\A';
+          white-space: pre; }
+      /* line 220, ../sass/tree/_pane.scss */
+      .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location {
+        display: inline-block; }
+        /* line 223, ../sass/tree/_pane.scss */
+        .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location .label {
+          cursor: pointer;
+          display: inline-block;
+          white-space: nowrap;
+          transition: background-color 0.2s;
+          border-radius: 4px;
+          padding: 3px;
+          padding-bottom: 0;
+          margin: 2px;
+          line-height: 15px; }
+          /* line 230, ../sass/tree/_pane.scss */
+          .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location .label:hover {
+            background-color: #404040; }
+          /* line 241, ../sass/tree/_pane.scss */
+          .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location .label .icon.type-icon {
+            font-size: 14px; }
+            /* line 244, ../sass/tree/_pane.scss */
+            .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location .label .icon.type-icon .l-icon-link {
+              color: #49dedb;
+              font-size: 6px;
+              margin-left: -22px;
+              margin-right: 4px;
+              text-shadow: black 0 1px 2px;
+              z-index: 2; }
+        /* line 258, ../sass/tree/_pane.scss */
+        .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location:after {
+          content: '>';
+          font-family: symbolsfont;
+          font-size: 8px;
+          margin-left: -6px; }
+        /* line 264, ../sass/tree/_pane.scss */
+        .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location:last-child:after {
+          content: '';
           display: inline-block; }
-          /* line 184, ../sass/tree/_pane.scss */
-          .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location .label {
-            cursor: pointer;
-            display: inline-block;
-            white-space: nowrap;
-            transition: background-color 0.2s;
-            border-radius: 4px;
-            padding: 3px;
-            padding-bottom: 0;
-            margin: 2px;
-            line-height: 15px; }
-            /* line 192, ../sass/tree/_pane.scss */
-            .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location .label:hover {
-              background-color: #404040; }
-            /* line 204, ../sass/tree/_pane.scss */
-            .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location .label .icon.type-icon {
-              font-size: 14px; }
-              /* line 207, ../sass/tree/_pane.scss */
-              .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location .label .icon.type-icon .l-icon-link {
-                color: #49dedb;
-                font-size: 6px;
-                margin-left: -22px;
-                margin-right: 4px;
-                text-shadow: black 0 1px 2px;
-                z-index: 2; }
-          /* line 221, ../sass/tree/_pane.scss */
-          .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location:after {
-            content: '>';
-            font-family: symbolsfont;
-            font-size: 8px;
-            margin-left: -6px; }
-          /* line 227, ../sass/tree/_pane.scss */
-          .split-pane-component.secondary-split.pane.right .split-pane-component.object-inspector.pane.right .holder.inspector-holder ul li .inspector-location:last-child:after {
-            content: '';
-            display: inline-block; }
diff --git a/platform/commonUI/general/res/sass/tree/_pane.scss b/platform/commonUI/general/res/sass/tree/_pane.scss
index bac9684e65..29416106ad 100644
--- a/platform/commonUI/general/res/sass/tree/_pane.scss
+++ b/platform/commonUI/general/res/sass/tree/_pane.scss
@@ -68,10 +68,8 @@ $transitionTime: 0.35s; // For the left menu open/close
     }
 }
 
-// Hide the splitter bar when the left pane is closed
-// Fade the splitter bar in when opening menu, but immediately fade
-//   out when closing menu 
-.splitter-bar.left {
+// Hide a splitter bar when the corresponding pane is inactive
+.splitter-bar.splitter {
     opacity: 1;
     transition: opacity $transitionTime, visibility $transitionTime;
     
@@ -82,152 +80,190 @@ $transitionTime: 0.35s; // For the left menu open/close
         visibility: hidden;
         opacity: 0;
         
-        transition: opacity 0s, visibility 0s;
-        
         &:before {
             border-width: 0;
         }
     }
 }
+// Fade the splitter bar in when opening treeview, but immediately fade
+//   out when closing treeview
+.splitter-bar.left.splitter {
+    &.inactive {
+        transition: opacity 0s, visibility 0s;
+    }
+}
 
 // The main view needs to align left when the left pane is moving around
 .split-pane-component.secondary-split.pane.right {
-    transition: left $transitionTime;
+    transition: left $transitionTime, right $transitionTime;
     transition-timing-function: ease-out;
     
     &.leftInactive {
         left: 0 !important;
     }
     
+    &.rightInactive {
+        right: 0 !important;
+        .items.pane {
+            width: 100%;
+        }
+    }
+    
     .split-pane-component.items.pane {
-        right: auto;
-        
         // Move left tab buttons close to the left splitter bar 
         .object-browse-bar {
             position: relative;
             
-            .left-pane-tabs {
+            .pane-tabs {
                 position: relative;
                 cursor: pointer;
-
-                left: -10px;
-                width: 11px;
+                font-family: symbolsfont;
+                
+                background-color: darken($colorBodyFg, 25%);
+                
+                width: 11px !important;
                 height: 16px;
                 line-height: 16px;
                 font-size: 10px;
-                top: 3px;
+                
+                // Open and closes treeview
+                &.left {
+                    left: -10px;
+                    top: 3px;
 
-                //border-radius: 2px;
-                border-top-right-radius: 2px;
-                border-bottom-right-radius: 2px;
-                background-color: darken($colorBodyFg, 25%);
+                    border-top-right-radius: 2px;
+                    border-bottom-right-radius: 2px;
 
-                // Change button icon depending on state
-                &.inactivePane {
-                    left: -15px;
-
-                    &:after {
-                        content: '>';//'F';
+                    // Change button icon depending on state
+                    &.inactivePane {
+                        left: -15px;
+                        &:after {
+                            content: '>';//'F';
+                        }
+                    }
+                    &.activePane:after {
+                        content: '<';
                     }
                 }
-                &.activePane:after {
-                    content: '<';
+                
+                // Open and closes object inspector 
+                &.right {
+                    float: right;
+                    right: -8px;
+                    top: -13px;// 14px;
+
+                    border-top-left-radius: 2px;
+                    border-bottom-left-radius: 2px;
+                    
+                    // Change button icon depending on state
+                    &.inactivePane {
+                        //left: -15px;
+                        &:after {
+                            content: '<';
+                        }
+                    }
+                    &.activePane:after {
+                        content: '>';
+                    }
                 }
             }
             
+            // Move domain object title to the right some to make room 
+            //   for treeview collapser button
             .items-select {
                 margin-left: 10px;
             }
+            // Similarly move the top button bar for the object inspector
+            .btn-bar.right {
+                margin-right: 10px;
+            }
         }
     }
     
-    .splitter-bar.right {
-        // Make the splitter bar vertically span to the top
-        top: 0;
-    }
-    
     .split-pane-component.object-inspector.pane.right {
         min-width: 150px;
         
-        .holder.inspector-holder {
+        &.inactive {
+            min-width: 0 !important;
+            width: 0 !important;
             
+            visibility: hidden;
+        }
+        
+        .holder.inspector-holder {
             .info-icon {
                 color: $colorKey;
             }
             
-            ul {
+            ul li {
                 font-size: 0.9em;
-                
-                li {
-                    // Add spacing between items
-                    padding: 2px 0px;
-                    margin: 2px 0px;
-                    border-top: solid 1px grey;
-                    &:first-child {
-                        border-top-width: 0px;
+
+                // Add spacing between items
+                padding: 2px 0px;
+                margin: 2px 0px;
+                border-top: solid 1px grey;
+                &:first-child {
+                    border-top-width: 0px;
+                }
+
+                // Style the titles
+                em {
+                    font-weight: bold;
+
+                    &:after {
+                        content: '\A';
+                        white-space: pre;
                     }
-                    
-                    // Style the titles
-                    em {
-                        font-weight: bold;
-                        
-                        &:after {
-                            content: '\A';
-                            white-space: pre;
-                        }
-                    }
-                    
-                    // Style object labels 
-                    .inspector-location {
+                }
+
+                // Style object labels 
+                .inspector-location {
+                    display: inline-block;
+
+                    .label {
+                        cursor: pointer;
                         display: inline-block;
-                        
-                        .label {
-                            cursor: pointer;
-                            display: inline-block;
-                            white-space: nowrap;
-                            
-                            // Colors
-                            transition: background-color 0.2s;
-                            //background-color: lighten($colorBodyBg, 10%);
-                            &:hover {
-                                //background-color: lighten($colorBodyBg, 15%);
-                                background-color: lighten($colorBodyBg, 5%);
-                            }
-                            
-                            // Sizing and spacing 
-                            border-radius: 4px;
-                            padding: 3px;
-                            padding-bottom: 0;
-                            margin: 2px;
-                            line-height: 15px;
-                            
-                            .icon.type-icon {
-                                font-size: 14px;
-                                
-                                .l-icon-link {
-                                    color: $colorIconLink;
-                                    
-                                    font-size: 6px;
-                                    margin-left: -22px;
-                                    margin-right: 4px;
-                                    
-                                    @include txtShdwSubtle(1);
-                                    z-index: 2;
-                                }
+                        white-space: nowrap;
+
+                        // Colors
+                        transition: background-color 0.2s;
+                        &:hover {
+                            background-color: lighten($colorBodyBg, 5%);
+                        }
+
+                        // Sizing and spacing 
+                        border-radius: 4px;
+                        padding: 3px;
+                        padding-bottom: 0;
+                        margin: 2px;
+                        line-height: 15px;
+
+                        .icon.type-icon {
+                            font-size: 14px;
+
+                            .l-icon-link {
+                                color: $colorIconLink;
+
+                                font-size: 6px;
+                                margin-left: -22px;
+                                margin-right: 4px;
+
+                                @include txtShdwSubtle(1);
+                                z-index: 2;
                             }
                         }
-                        
-                        // Add arrows to indicate tree heirarchy 
-                        &:after {
-                            content: '>';
-                            font-family: symbolsfont;
-                            font-size: 8px;
-                            margin-left: -6px;
-                        }
-                        &:last-child:after {
-                            content: '';
-                            display: inline-block;
-                        }
+                    }
+
+                    // Add arrows to indicate tree heirarchy 
+                    &:after {
+                        content: '>';
+                        font-family: symbolsfont;
+                        font-size: 8px;
+                        margin-left: -6px;
+                    }
+                    &:last-child:after {
+                        content: '';
+                        display: inline-block;
                     }
                 }
             }