diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 9da63d813f..083b2d3e90 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -12,4 +12,4 @@ using System.Resources;
 [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyFileVersion("7.10.0")]
-[assembly: AssemblyInformationalVersion("7.10.0-beta004")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("7.10.0-beta005")]
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index 556d4ff0c1..71e9ff36c9 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -1,5 +1,7 @@
 ﻿@inherits System.Web.Mvc.WebViewPage<Umbraco.Web.Models.ContentEditing.BackOfficePreview>
-
+@{
+    var disableDevicePreview = Model.DisableDevicePreview.ToString().ToLowerInvariant();
+}
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -9,15 +11,17 @@
     <link href="../lib/jquery-ui/jquery-ui-1.10.4.custom.min.css" type="text/css" rel="stylesheet" />
 </head>
 <body id="canvasdesignerPanel" ng-mouseover="outlinePositionHide()" ng-class="{ leftOpen: (showStyleEditor || showPalettePicker) && !showDevicesPreview }" ng-controller="Umbraco.canvasdesignerController">
-    @if (string.IsNullOrWhiteSpace(Model.PreviewExtendedView) == false)
-    {
-        @Html.Partial(Model.PreviewExtendedView)
-    }
     <div class="wait" ng-show="!frameLoaded"></div>
+
+    @if (string.IsNullOrWhiteSpace(Model.PreviewExtendedHeaderView) == false)
+    {
+        @Html.Partial(Model.PreviewExtendedHeaderView)
+    }
+
     <div id="demo-iframe-wrapper" ng-show="frameLoaded" class="{{previewDevice.css}}">
         <iframe id="resultFrame" ng-src="{{pageUrl}}" frameborder="0" iframe-is-loaded></iframe>
     </div>
-    <div class="canvasdesigner" ng-init="showDevicesPreview = true; showDevices = !@Model.DisableDevicePreview; showPalettePicker = true" ng-mouseenter="positionSelectedHide()">
+    <div class="canvasdesigner" ng-init="showDevicesPreview = true; showDevices = !@(disableDevicePreview); showPalettePicker = true" ng-mouseenter="positionSelectedHide()">
         <div class="fix-left-menu selected">
             <div class="avatar">
                 <img ng-src="../assets/img/application/logo.png"
diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs
index 0f4f4e978a..488272153a 100644
--- a/src/Umbraco.Web/Editors/PreviewController.cs
+++ b/src/Umbraco.Web/Editors/PreviewController.cs
@@ -18,15 +18,15 @@ namespace Umbraco.Web.Editors
             var model = new BackOfficePreview
             {
                 DisableDevicePreview = FeaturesResolver.Current.Features.Disabled.DisableDevicePreview,
-                PreviewExtendedView = FeaturesResolver.Current.Features.Enabled.PreviewExtendedView
+                PreviewExtendedHeaderView = FeaturesResolver.Current.Features.Enabled.PreviewExtendedView
             };
 
-            if (model.PreviewExtendedView.IsNullOrWhiteSpace() == false)
+            if (model.PreviewExtendedHeaderView.IsNullOrWhiteSpace() == false)
             {
-                var viewEngineResult = ViewEngines.Engines.FindPartialView(ControllerContext, model.PreviewExtendedView);
+                var viewEngineResult = ViewEngines.Engines.FindPartialView(ControllerContext, model.PreviewExtendedHeaderView);
                 if (viewEngineResult.View == null)
                 {
-                    throw new InvalidOperationException("Could not find the view " + model.PreviewExtendedView + ", the following locations were searched: " + Environment.NewLine + string.Join(Environment.NewLine, viewEngineResult.SearchedLocations));
+                    throw new InvalidOperationException("Could not find the view " + model.PreviewExtendedHeaderView + ", the following locations were searched: " + Environment.NewLine + string.Join(Environment.NewLine, viewEngineResult.SearchedLocations));
                 }
             }
 
diff --git a/src/Umbraco.Web/Models/ContentEditing/BackOfficePreview.cs b/src/Umbraco.Web/Models/ContentEditing/BackOfficePreview.cs
index aa2cee57b9..ed2e623226 100644
--- a/src/Umbraco.Web/Models/ContentEditing/BackOfficePreview.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/BackOfficePreview.cs
@@ -5,7 +5,8 @@
     /// </summary>
     public class BackOfficePreview
     {
-        public string PreviewExtendedView { get; set; }
+        public string PreviewExtendedHeaderView { get; set; }
+        //TODO: We could potentially have a 'footer' view
         public bool DisableDevicePreview { get; set; }
     }
 }
