diff --git a/platform/commonUI/edit/bundle.json b/platform/commonUI/edit/bundle.json
index df6732ceaa..8e4ec2e18a 100644
--- a/platform/commonUI/edit/bundle.json
+++ b/platform/commonUI/edit/bundle.json
@@ -63,10 +63,6 @@
             }
         ],
         "templates": [
-            {
-                "key": "topbar-edit",
-                "templateUrl": "templates/topbar-edit.html"
-            },
             {
                 "key": "edit-library",
                 "templateUrl": "templates/library.html"
@@ -88,6 +84,10 @@
                 "templateUrl": "templates/elements.html",
                 "uses": [ "composition" ],
                 "gestures": [ "drop" ]
+            },
+            {
+                "key": "topbar-edit",
+                "templateUrl": "templates/topbar-edit.html"
             }
         ]
     }
diff --git a/platform/commonUI/edit/res/templates/edit-object.html b/platform/commonUI/edit/res/templates/edit-object.html
index 82267f7c0b..c017759cf1 100644
--- a/platform/commonUI/edit/res/templates/edit-object.html
+++ b/platform/commonUI/edit/res/templates/edit-object.html
@@ -1,22 +1,23 @@
-<span ng-controller="ViewSwitcherController">
-<mct-include key="'topbar-edit'"
-             parameters="{ switcher: switcher, object: domainObject }">
-</mct-include>
+<mct-representation key="'topbar-edit'"
+                    mct-object="domainObject"
+                    ng-model="representation">
+</mct-representation>
 <div class="holder edit-area outline abs">
     <!-- edit toolbar goes here -->
     <div class='split-layout vertical contents abs work-area'>
         <div class='split-pane-component edit-main pane' style="right: 200px; left: 0px;">
             <div class='holder abs object-holder'>
-                <mct-representation key="switcher.selected.key" mct-object="domainObject">
+                <mct-representation key="representation.selected.key"
+                                    mct-object="domainObject">
                 </mct-representation>
             </div>
         </div>
         <div class="splitter" style="right: 200px"></div>
         <div class='split-pane-component edit-objects pane menus-to-left'
-                style="right: 0px; width: 200px">
+             style="right: 0px; width: 200px">
             <div class='holder abs split-layout horizontal'>
 
-                <mct-container key="accordion" title="Library" style="position: relative; top: 0px;">
+                <mct-container key="accordion" title="Library" style="position: relative; top: 0px; height: 200px;">
                     <mct-representation key="'tree'" mct-object="context.getRoot()">
                     </mct-representation>
                 </mct-container>
@@ -30,4 +31,3 @@
         </div>
     </div>
 </div>
-</span>
\ No newline at end of file
diff --git a/platform/commonUI/edit/res/templates/topbar-edit.html b/platform/commonUI/edit/res/templates/topbar-edit.html
index 54a6101d12..cd8bb6ed12 100644
--- a/platform/commonUI/edit/res/templates/topbar-edit.html
+++ b/platform/commonUI/edit/res/templates/topbar-edit.html
@@ -1,17 +1,19 @@
 <div class='top-bar edit abs'>
-    <mct-representation key="'object-header'" mct-object="parameters.object" parameters="{ mode: 'Edit' }">
+    <mct-representation key="'object-header'"
+                        mct-object="domainObject"
+                        parameters="{ mode: 'Edit' }">
     </mct-representation>
     <div class='buttons-main btn-bar buttons abs'>
-        <mct-include key="'switcher'"
-                     ng-model="parameters.switcher"
-                     ng-if="parameters.switcher.options.length > 0">
-        </mct-include>
+        <mct-representation key="'switcher'"
+                            mct-object="domainObject"
+                            ng-model="ngModel">
+        </mct-representation>
+
         <mct-representation key="'edit-action-buttons'"
-                            mct-object="parameters.object"
+                            mct-object="domainObject"
                             class='conclude-editing'>
 		<!--a class='btn major' href=''>Save<span id='save-actions-menu' class='ui-symbol invoke-menu'>v</span></a>
 		<a class='btn subtle' href=''>Cancel</a-->
-
         </mct-representation>
     </div>
 </div>
\ No newline at end of file
diff --git a/platform/commonUI/general/res/templates/containers/accordion.html b/platform/commonUI/general/res/templates/containers/accordion.html
index c39719f77d..deac7d0edb 100644
--- a/platform/commonUI/general/res/templates/containers/accordion.html
+++ b/platform/commonUI/general/res/templates/containers/accordion.html
@@ -3,7 +3,7 @@
         {{container.title}}
     </div>
     <div class="accordion-contents"
-         ng-show="toggle.isActive()"
+         ng-show="!toggle.isActive()"
          style="height: 180px;"
          ng-transclude>
     </div>