diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html
index 2131abc38c..34d6534e4b 100644
--- a/platform/commonUI/browse/res/templates/browse-object.html
+++ b/platform/commonUI/browse/res/templates/browse-object.html
@@ -47,16 +47,21 @@
 
     <div class="l-object-wrapper edit-main"
          ng-class="{ active:editMode }">
+        <div style="text-align: right;">
+        <mct-representation key="'edit-action-buttons'"
+                            mct-object="domainObject"
+                            class='flex-elem conclude-editing'></div>
+        </mct-representation>
         <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-class="{ active:editMode }">
                 
-                <mct-toolbar name="mctToolbar"
+                <!--<mct-toolbar name="mctToolbar"
                              structure="toolbar.structure"
                              ng-model="toolbar.state"
                              class="flex-elem grow">
-                </mct-toolbar>
+                </mct-toolbar> -->
                 <!-- from toolbar.html -->
                 <!--<mct-toolbar-x class="flex-elem grow">
                     <form novalidate>
@@ -69,13 +74,6 @@
                     </form>
                 </mct-toolbar-x> -->
 
-
-
-
-                <!--<mct-representation key="'edit-action-buttons'"
-                                    mct-object="domainObject"
-                                    class='flex-elem conclude-editing'>
-                </mct-representation> -->
                 <!-- from edit-action-buttons.html -->
                <!--<span>
                     <span ng-repeat="btn in editBtns">
diff --git a/platform/commonUI/browse/src/BrowseObjectController.js b/platform/commonUI/browse/src/BrowseObjectController.js
index 85f4d6f0d8..9e4323802b 100644
--- a/platform/commonUI/browse/src/BrowseObjectController.js
+++ b/platform/commonUI/browse/src/BrowseObjectController.js
@@ -72,7 +72,7 @@ define(
                 if (editMode){
                     $scope.domainObject = domainObject && new EditableDomainObject(domainObject, $q);
                 } else {
-                    $scope.domainObject = (domainObject.getDomainObject && domainObject.getDomainObject) || domainObject;
+                    $scope.domainObject = (domainObject.getDomainObject && domainObject.getDomainObject()) || domainObject;
                 }
             }