diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
index 03de8af21e..be06f44ff7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
@@ -10,11 +10,14 @@ function ContentEditController($scope, $rootScope, $routeParams, $q, $timeout, $
 
     //setup scope vars
     $scope.defaultButton = null;
-    $scope.subButtons = [];    
-    $scope.currentSection = appState.getSectionState("currentSection");
-    $scope.currentNode = null; //the editors affiliated node
+    $scope.subButtons = [];
     $scope.isNew = $routeParams.create;
-    
+
+    $scope.page = {};
+    $scope.page.menu = {};
+    $scope.page.menu.currentNode = null;
+    $scope.page.menu.currentSection = appState.getSectionState("currentSection");
+
     function init(content) {
 
         var buttons = contentEditingHelper.configureContentEditorButtons({
@@ -48,7 +51,7 @@ function ContentEditController($scope, $rootScope, $routeParams, $q, $timeout, $
 
         if (!$scope.content.isChildOfListView) {
             navigationService.syncTree({ tree: "content", path: path.split(","), forceReload: initialLoad !== true }).then(function (syncArgs) {
-                $scope.currentNode = syncArgs.node;
+                $scope.page.menu.currentNode = syncArgs.node;
             });
         }
         else if (initialLoad === true) {
@@ -61,7 +64,7 @@ function ContentEditController($scope, $rootScope, $routeParams, $q, $timeout, $
             umbRequestHelper.resourcePromise(
                 $http.get(content.treeNodeUrl),
                 'Failed to retrieve data for child node ' + content.id).then(function (node) {
-                    $scope.currentNode = node;
+                    $scope.page.menu.currentNode = node;
                 });
         }
     }
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
index d6050dbcb1..609b1db602 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
@@ -1,89 +1,81 @@
-<form novalidate name="contentForm"
-    ng-controller="Umbraco.Editors.Content.EditController"
-    ng-show="loaded"
-    ng-submit="save()"
-    val-form-manager>
-    
-    <umb-panel umb-tabs ng-class="{'editor-breadcrumb': ancestors && ancestors.length > 0}">
-        <umb-header tabs="content.tabs">
+<form name="contentForm"
+   ng-controller="Umbraco.Editors.Content.EditController"
+   ng-show="loaded"
+   ng-submit="save()"
+   novalidate
+   val-form-manager>
 
-            <div class="span7">
-                <umb-content-name placeholder="@placeholders_entername"
-                                  ng-model="content.name" />
-            </div>
+   <umb-editor-view umb-tabs>
 
-            <div class="span5">
-                <div class="btn-toolbar pull-right umb-btn-toolbar">
-                    <div class="btn-group" ng-animate="'fade'" ng-show="formStatus">
-                        <p class="btn btn-link umb-status-label">{{formStatus}}</p>
-                    </div>
-
-                    <umb-options-menu ng-show="currentNode"
-                                      current-node="currentNode"
-                                      current-section="{{currentSection}}"> 
-                    </umb-options-menu>
-
-                </div>
-            </div>
-        </umb-header>
-
-        <umb-tab-view>
-            <umb-tab id="tab{{tab.id}}" rel="{{tab.id}}" ng-repeat="tab in content.tabs">
-                <div class="umb-pane">
-                    <umb-property property="property"
-                                  ng-repeat="property in tab.properties">
-                        <umb-editor model="property"></umb-editor>
-                    </umb-property>
+      <umb-editor-header
+         menu="page.menu"
+         name="content.name"
+         tabs="content.tabs">
+      </umb-editor-header>
 
 
-                    <div class="umb-tab-buttons" detect-fold ng-class="{'umb-dimmed': busy}">
+      <umb-editor-container>
 
-                        <div class="btn-group" ng-show="listViewPath">
-                            <a class="btn" href="#{{listViewPath}}">
-                                <localize key="buttons_returnToList">Return to list</localize>
-                            </a>
-                        </div>
+         <umb-tabs-content class="form-horizontal" view="true">
+            <umb-tab id="tab{{tab.id}}" ng-repeat="tab in content.tabs" rel="{{tab.id}}">
 
-                        <div class="btn-group" ng-show="!isNew">
-                            <a class="btn" ng-click="preview(content)">
-                                <localize key="buttons_showPage">Preview page</localize>
-                            </a>
-                        </div>
+               <umb-property ng-repeat="property in tab.properties" property="property">
+                  <umb-editor model="property"></umb-editor>
+               </umb-property>
 
-                        <div class="btn-group dropup" ng-if="defaultButton">
-                            <!-- primary button -->
-                            <a class="btn btn-success" href="#" ng-click="performAction(defaultButton)" prevent-default>
-                                <localize key="{{defaultButton.labelKey}}">{{defaultButton.labelKey}}</localize>
-                            </a>
-
-                            <a class="btn btn-success dropdown-toggle" data-toggle="dropdown" ng-if="subButtons.length > 0">
-                                <span class="caret"></span>
-                            </a>
-
-                            <a href="#">Return to list</a>
-
-                            <!-- sub buttons -->
-                            <ul class="dropdown-menu bottom-up" role="menu" aria-labelledby="dLabel" ng-if="subButtons.length > 0">
-                                <li ng-repeat="btn in subButtons">
-                                    <a href="#" ng-click="performAction(btn)" prevent-default>
-                                        <localize key="{{btn.labelKey}}">{{btn.labelKey}}</localize>
-                                    </a>
-                                </li>
-                            </ul>
-
-                        </div>
-                    </div>
-                </div>
             </umb-tab>
-        </umb-tab-view>
+         </umb-tabs-content>
+
+      </umb-editor-container>
 
 
-        <ul class="umb-panel-footer-nav nav nav-pills" ng-if="ancestors && ancestors.length > 0">
-            <li ng-repeat="ancestor in ancestors">
-                <a href="#/content/content/edit/{{ancestor.id}}">{{ancestor.name}}</a>
-            </li>
-            <li></li>
-        </ul>
+      <umb-editor-footer>
+
+         <umb-editor-footer-content-left>
+            <umb-breadcrumbs ancestors="ancestors" ng-if="ancestors && ancestors.length > 0"></umb-breadcrumbs>
+         </umb-editor-footer-content-left>
+
+
+         <umb-editor-footer-content-right ng-class="{'umb-dimmed': busy}">
+
+            <div class="btn-group" ng-show="listViewPath">
+               <a class="btn" href="#{{listViewPath}}">
+                  <localize key="buttons_returnToList">Return to list</localize>
+               </a>
+            </div>
+
+            <div class="btn-group" ng-show="!isNew">
+               <a class="btn" ng-click="preview(content)">
+                  <localize key="buttons_showPage">Preview page</localize>
+               </a>
+            </div>
+
+            <div class="btn-group dropup" ng-if="defaultButton">
+
+               <a class="btn btn-success" href="#" ng-click="performAction(defaultButton)" prevent-default>
+                  <localize key="{{defaultButton.labelKey}}">{{defaultButton.labelKey}}</localize>
+               </a>
+
+               <a class="btn btn-success dropdown-toggle" data-toggle="dropdown" ng-if="subButtons.length > 0">
+                  <span class="caret"></span>
+               </a>
+
+               <a href="#">Return to list</a>
+
+               <ul aria-labelledby="dLabel" class="dropdown-menu bottom-up" ng-if="subButtons.length > 0" role="menu">
+                  <li ng-repeat="btn in subButtons">
+                     <a href="#" ng-click="performAction(btn)" prevent-default>
+                        <localize key="{{btn.labelKey}}">{{btn.labelKey}}</localize>
+                     </a>
+                  </li>
+               </ul>
+
+            </div>
+
+         </umb-editor-footer-content-right>
+
+      </umb-editor-footer>
+
+   </umb-editor-view>
 
-    </umb-panel>
 </form>