diff --git a/platform/features/layout/res/templates/frame.html b/platform/features/layout/res/templates/frame.html
index 8346615505..cf4149947f 100644
--- a/platform/features/layout/res/templates/frame.html
+++ b/platform/features/layout/res/templates/frame.html
@@ -13,7 +13,7 @@
         </div>
     </div>
     <div class="abs object-holder">
-        <mct-representation key="switcher.key"
+        <mct-representation key="representation.selected.key"
                             mct-object="domainObject">
         </mct-representation>
     </div>
diff --git a/platform/features/layout/res/templates/layout.html b/platform/features/layout/res/templates/layout.html
index 39d529a643..57dcf984b1 100644
--- a/platform/features/layout/res/templates/layout.html
+++ b/platform/features/layout/res/templates/layout.html
@@ -11,7 +11,8 @@
             </mct-representation>
         </div>
 
-        <span class="layout-drag-handles" ng-show="domainObject.hasCapability('editor')">
+        <!-- Drag handles -->
+        <span ng-show="domainObject.hasCapability('editor')">
             <span style="position: absolute; left: 12px; right: 12px; top: 12px; bottom: 12px; cursor: move;"
                   mct-drag-down="controller.startDrag(childObject.getId(), [1,1], [0,0])"
                   mct-drag="controller.continueDrag(delta)"
@@ -60,8 +61,6 @@
                   mct-drag="controller.continueDrag(delta)"
                   mct-drag-up="controller.endDrag()">
             </span>
-
-
         </span>
 
     </div>