diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
index e5ec9172c6..911b561ff3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
@@ -27,10 +27,13 @@
 
         function init(content) {
 
+            // set first app to active
+            content.apps[0].active = true;
+
             if (infiniteMode) {
                 createInfiniteModeButtons(content);
             } else {
-                createButtons(content);
+                createButtons(content, content.apps[0]);
             }
 
             editorState.set($scope.content);
@@ -135,7 +138,22 @@
 
         }
 
-        function createButtons(content) {
+        /**
+         * Create the save/publish/preview buttons for the view
+         * @param {any} content the content node
+         * @param {any} app the active content app
+         */
+        function createButtons(content, app) {
+
+            // only create the save/publish/preview buttons if the 
+            // content app is "Conent"
+            if(app && app.alias !== "umbContent" && app.alias !== "umbInfo") {
+                $scope.defaultButton = null;
+                $scope.subButtons = null;
+                $scope.page.showPreviewButton = false;
+                return;
+            }
+
             $scope.page.buttonGroupState = "init";
             var buttons = contentEditingHelper.configureContentEditorButtons({
                 create: $scope.page.isNew,
@@ -147,9 +165,10 @@
                     unPublish: $scope.unPublish
                 }
             });
-
+            
             $scope.defaultButton = buttons.defaultButton;
             $scope.subButtons = buttons.subButtons;
+            $scope.page.showPreviewButton = true;
 
         }
 
@@ -555,6 +574,14 @@
             });
         };
 
+        /**
+         * Call back when a content app changes
+         * @param {any} app
+         */
+        $scope.appChanged = function(app) {
+            createButtons($scope.content, app);
+        };
+
         function moveNode(node, target) {
 
             contentResource.move({ "parentId": target.id, "id": node.id })
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
index 062a7e2877..7c5cdc8857 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
@@ -315,7 +315,7 @@
             // load audit trail when on the info tab
             evts.push(eventsService.on("app.tabChange", function (event, args) {
                 $timeout(function(){
-                    if (args.alias === "info") {
+                    if (args.alias === "umbInfo") {
                         isInfoTab = true;
                         loadAuditTrail();
                     } else {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
index 5ad7a9079a..8545854992 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontent.directive.js
@@ -28,12 +28,23 @@
 
         var vm = this;
 
+        vm.$onInit = onInit;
         vm.$postLink = postLink;
         vm.$onDestroy = onDestroy;
 
         vm.selectVariant = selectVariant;
         vm.openSplitView = openSplitView;
         vm.selectApp = selectApp;
+
+        function onInit() {
+            // disable the name field if the active content app is not "Content"
+            vm.nameDisabled = false;
+            angular.forEach(vm.editor.content.apps, function(app){
+                if(app.active && app.alias !== "umbContent" && app.alias !== "umbInfo") {
+                    vm.nameDisabled = true;
+                }
+            });
+        }
         
         /** Called when the component has linked all elements, this is when the form controller is available */
         function postLink() {
@@ -67,6 +78,12 @@
          * @param {any} item
          */
         function selectApp(item) {
+            // disable the name field if the active content app is not "Content" or "Info"
+            vm.nameDisabled = false;
+            if(item && item.alias !== "umbContent" && item.alias !== "umbInfo") {
+                vm.nameDisabled = true;
+            }
+            // call the callback if any is registered
             if(vm.onSelectApp) {
                 vm.onSelectApp({"app": item});
             }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
index 4902d943a7..46d0a1c5c1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
@@ -9,7 +9,8 @@
         bindings: {
             page: "<",
             content: "<", //TODO: Not sure if this should be = since we are changing the 'active' property of a variant
-            culture: "<"
+            culture: "<",
+            onSelectApp: "&?"
         },
         controllerAs: 'vm',
         controller: umbVariantContentEditorsController
@@ -39,8 +40,6 @@
 
         /** Called when the component initializes */
         function onInit() {
-            // set first app to active
-            vm.content.apps[0].active = true;
             prevContentDateUpdated = angular.copy(vm.content.updateDate);
             setActiveCulture();
         }
@@ -192,7 +191,7 @@
 
             //then assign the variant to a view model to the content app
             var contentApp = _.find(variant.apps, function (a) {
-                return a.alias === "content";
+                return a.alias === "umbContent";
             });
             contentApp.viewModel = variant;
 
@@ -222,7 +221,7 @@
                 var editor = vm.editors[e];
                 for (var i = 0; i < editor.content.apps.length; i++) {
                     var app = editor.content.apps[i];
-                    if (app.alias === "content") {
+                    if (app.alias === "umbContent") {
                         app.active = true;
                     }
                     else {
@@ -312,6 +311,9 @@
             if(app && app.alias) {
                 activeAppAlias = app.alias;
             }
+            if(vm.onSelectApp) {
+                vm.onSelectApp({"app": app});
+            }
         }
 
     }
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
index 3cdcd5b12a..0d78aab0eb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
@@ -97,7 +97,7 @@
             templateUrl: 'views/components/editor/umb-editor-content-header.html',
             scope: {
                 name: "=",
-                nameLocked: "=",
+                nameDisabled: "<?",
                 menu: "=",
                 hideMenu: "<?",
                 variants: "=",
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
index 2e4f106898..f045b0adca 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -102,8 +102,14 @@ input.umb-editor-header__name-input {
 	background: @white;
 	border: 1px solid @gray-8;
 	&:hover {
-		background-color: @gray-10;
-		border: 1px solid @gray-8;
+		border-color: @turquoise-d1;
+	}
+}
+
+input.umb-editor-header__name-input:disabled {
+	background-color: @gray-10;
+	&:hover{
+		border-color: @gray-8;
 	}
 }
 
@@ -248,15 +254,17 @@ a.umb-variant-switcher__toggle {
 	height: @editorFooterHeight;
 	padding: 10px 20px;
 	background: @white;
-	// box-shadow: 0 -1px 3px 0 rgba(0, 0, 0, 0.16);
 	border-top: 1px solid @gray-9;
 	z-index: 1;
 	bottom: 0;
+	display: flex;
+	align-items: center;
 }
 
 .umb-editor-footer-content {
 	display: flex;
 	align-items: center;
+	flex: 1 1 auto;
 }
   
 .umb-editor-footer-content__right-side {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
index f7eaedf3be..ace41d7e94 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
@@ -9,7 +9,8 @@
             <umb-variant-content-editors 
                 page="page"
                 content="content"
-                culture="culture">
+                culture="culture"
+                on-select-app="appChanged(app)">
             </umb-variant-content-editors>
 
             <umb-editor-footer>
@@ -37,14 +38,14 @@
 
                     <umb-button 
                         alias="preview" 
-                        ng-if="!page.isNew && content.allowPreview"
+                        ng-if="!page.isNew && content.allowPreview && page.showPreviewButton"
                         type="button" 
                         button-style="info" 
                         action="preview(content)"
                         label="Preview page" 
                         label-key="buttons_showPage">
                     </umb-button>
-
+                    
                     <umb-button-group 
                         ng-if="defaultButton && !content.trashed && !infiniteModel.infiniteMode" 
                         button-style="success"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
index 408f640c01..b125457ab0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
@@ -14,5 +14,12 @@
             </div>
 
         </div>
+
+        <umb-empty-state
+            ng-if="content.tabs.length === 0"
+            position="center">
+            <localize key="content_noProperties"></localize>
+        </umb-empty-state>
+
     </ng-form>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
index 19e741ee29..c03b017a82 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-variant-content.html
@@ -10,6 +10,7 @@
                 menu="vm.page.menu"
                 hide-menu="vm.page.hideActionsMenu"
                 name="vm.editor.content.name"
+                name-disabled="vm.nameDisabled"
                 navigation="vm.editor.content.apps"
                 on-select-navigation-item="vm.selectApp(item)"
                 variants="vm.editor.content.variants"
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
index bc20745018..149fccd00a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
@@ -13,19 +13,20 @@
             <div id="nameField" style="flex: 1 1 auto;">
                 <div class="umb-editor-header__name-wrapper">
                     <ng-form name="headerNameForm">
-                        <input data-element="editor-name-field"
-                                type="text"
-                                class="umb-editor-header__name-input"
-                                localize="placeholder"
-                                placeholder="@placeholders_entername"
-                                name="headerName"
-                                ng-show="!nameLocked"
-                                ng-model="name"
-                                ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}"
-                                umb-auto-focus
-                                val-server-field="{{serverValidationNameField}}"
-                                required
-                                autocomplete="off" />
+                        <input 
+                            data-element="editor-name-field"
+                            type="text"
+                            class="umb-editor-header__name-input"
+                            localize="placeholder"
+                            placeholder="@placeholders_entername"
+                            name="headerName"
+                            ng-model="name"
+                            ng-class="{'name-is-empty': $parent.name===null || $parent.name===''}"
+                            ng-disabled="nameDisabled"
+                            umb-auto-focus
+                            val-server-field="{{serverValidationNameField}}"
+                            required
+                            autocomplete="off" />
                     </ng-form>
 
                     <a ng-if="variants.length > 0 && hideChangeVariant !== true" class="umb-variant-switcher__toggle" href="" ng-click="vm.dropdownOpen = !vm.dropdownOpen">
@@ -49,8 +50,6 @@
 
                 </div>
 
-                <div class="umb-panel-header-name" ng-if="nameLocked">{{ name }}</div>
-
             </div>
 
         </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
index c3d4a96a58..f750d43f94 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -211,7 +211,7 @@
         <key alias="lastPublished">Last published</key>
         <key alias="noItemsToShow">There are no items to show</key>
         <key alias="listViewNoItems" version="7.1.5">There are no items to show in the list.</key>
-        <key alias="listViewNoContent">No content has been added</key>
+        <key alias="listViewNoContent">No child items have been added</key>
         <key alias="listViewNoMembers">No members have been added</key>
         <key alias="mediatype">Media Type</key>
         <key alias="mediaLinks">Link to media item(s)</key>
@@ -222,6 +222,7 @@
         <key alias="noDate">No date chosen</key>
         <key alias="nodeName">Page title</key>
         <key alias="noMediaLink">This media item has no link</key>
+        <key alias="noProperties">No content can be added for this item</key>
         <key alias="otherElements">Properties</key>
         <key alias="parentNotPublished">This document is published but is not visible because the parent '%0%' is unpublished</key>
         <key alias="parentCultureNotPublished">This culture is published but is not visible because it is unpublished on parent '%0%'</key>
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index b08d8826eb..31d0ac0640 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -359,7 +359,7 @@ namespace Umbraco.Web.Editors
             var mapped = MapToDisplay(emptyContent);
 
             //remove the listview app if it exists
-            mapped.ContentApps = mapped.ContentApps.Where(x => x.Alias != "childItems").ToList();
+            mapped.ContentApps = mapped.ContentApps.Where(x => x.Alias != "umbListView").ToList();
             
             return mapped;
         }
@@ -380,7 +380,7 @@ namespace Umbraco.Web.Editors
             var mapped = Mapper.Map<ContentItemDisplay>(blueprint);
 
             //remove the listview app if it exists
-            mapped.ContentApps = mapped.ContentApps.Where(x => x.Alias != "childItems").ToList();
+            mapped.ContentApps = mapped.ContentApps.Where(x => x.Alias != "umbListView").ToList();
 
             return mapped;
         }
diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index 70aa7e4da8..e44228a022 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -85,7 +85,7 @@ namespace Umbraco.Web.Editors
             var mapped = Mapper.Map<MediaItemDisplay>(emptyContent);
 
             //remove the listview app if it exists
-            mapped.ContentApps = mapped.ContentApps.Where(x => x.Alias != "childItems").ToList();
+            mapped.ContentApps = mapped.ContentApps.Where(x => x.Alias != "umbListView").ToList();
 
             return mapped;
         }
diff --git a/src/Umbraco.Web/Models/Mapping/ContentAppResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentAppResolver.cs
index 3821a56129..cebbe81500 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentAppResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentAppResolver.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Web.Models.Mapping
     {
         private readonly ContentApp _contentApp = new ContentApp
         {
-            Alias = "content",
+            Alias = "umbContent",
             Name = "Content",
             Icon = "icon-document",
             View = "views/content/apps/content/content.html"
@@ -21,7 +21,7 @@ namespace Umbraco.Web.Models.Mapping
 
         private readonly ContentApp _infoApp = new ContentApp
         {
-            Alias = "info",
+            Alias = "umbInfo",
             Name = "Info",
             Icon = "icon-info",
             View = "views/content/apps/info/info.html"
diff --git a/src/Umbraco.Web/Models/Mapping/ContentAppResolverExtensions.cs b/src/Umbraco.Web/Models/Mapping/ContentAppResolverExtensions.cs
index 8fc77beb6b..ad3fe041c7 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentAppResolverExtensions.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentAppResolverExtensions.cs
@@ -21,7 +21,7 @@ namespace Umbraco.Web.Models.Mapping
         {
             var listViewApp = new ContentApp
             {
-                Alias = "childItems",
+                Alias = "umbListView",
                 Name = "Child items",
                 Icon = "icon-list",
                 View = "views/content/apps/listview/listview.html"
diff --git a/src/Umbraco.Web/Models/Mapping/MediaAppResolver.cs b/src/Umbraco.Web/Models/Mapping/MediaAppResolver.cs
index 6880aff9a8..9cbc6bfeea 100644
--- a/src/Umbraco.Web/Models/Mapping/MediaAppResolver.cs
+++ b/src/Umbraco.Web/Models/Mapping/MediaAppResolver.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Models.Mapping
     {
         private static readonly ContentApp _contentApp = new ContentApp
         {
-            Alias = "content",
+            Alias = "umbContent",
             Name = "Content",
             Icon = "icon-document",
             View = "views/media/apps/content/content.html"
@@ -20,7 +20,7 @@ namespace Umbraco.Web.Models.Mapping
 
         private static readonly ContentApp _infoApp = new ContentApp
         {
-            Alias = "info",
+            Alias = "umbInfo",
             Name = "Info",
             Icon = "icon-info",
             View = "views/media/apps/info/info.html"