diff --git a/src/Orchard.Web/Core/Shapes/CoreShapes.cs b/src/Orchard.Web/Core/Shapes/CoreShapes.cs
index 7fa145711..aa9af9be7 100644
--- a/src/Orchard.Web/Core/Shapes/CoreShapes.cs
+++ b/src/Orchard.Web/Core/Shapes/CoreShapes.cs
@@ -12,6 +12,7 @@ using Orchard.Settings;
 using Orchard.UI;
 using Orchard.UI.Resources;
 using Orchard.UI.Zones;
+using Orchard.Utility.Extensions;
 
 // ReSharper disable InconsistentNaming
 
@@ -51,17 +52,19 @@ namespace Orchard.Core.Shapes {
                 .OnCreating(creating => creating.BaseType = typeof(Zone))
                 .OnDisplaying(displaying => {
                     var zone = displaying.Shape;
-                    zone.Classes.Add("zone-" + zone.ZoneName.HtmlClassify());
+                    string zoneName = zone.ZoneName;
+                    zone.Classes.Add("zone-" + zoneName.HtmlClassify());
                     zone.Classes.Add("zone");
-                    zone.Metadata.Alternates.Add("Zone__" + zone.ZoneName);
+                    zone.Metadata.Alternates.Add("Zone__" + zoneName);
                 });
 
             builder.Describe("Menu")
                 .OnDisplaying(displaying => {
                     var menu = displaying.Shape;
-                    menu.Classes.Add("menu-" + menu.MenuName.HtmlClassify());
+                    string menuName = menu.MenuName;
+                    menu.Classes.Add("menu-" + menuName.HtmlClassify());
                     menu.Classes.Add("menu");
-                    menu.Metadata.Alternates.Add("Menu__" + menu.MenuName);
+                    menu.Metadata.Alternates.Add("Menu__" + menuName);
                 });
 
             builder.Describe("MenuItem")
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
index c763dcbb7..9366e4e86 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
@@ -23,6 +23,8 @@ namespace Orchard.Widgets {
             _contentManager.Publish(authenticatedLayer.ContentItem);
             IContent anonymousLayer = _contentManager.Create<LayerPart>("Layer", t => { t.Record.Name = "Anonymous"; t.Record.LayerRule = "not authenticated"; });
             _contentManager.Publish(anonymousLayer.ContentItem);
+            IContent disabledLayer = _contentManager.Create<LayerPart>("Layer", t => { t.Record.Name = "Disabled"; t.Record.LayerRule = "false"; });
+            _contentManager.Publish(disabledLayer.ContentItem);
         }
     }
 
diff --git a/src/Orchard.Web/Themes/Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj
index 40f645e0d..53a1759f2 100644
--- a/src/Orchard.Web/Themes/Themes.csproj
+++ b/src/Orchard.Web/Themes/Themes.csproj
@@ -97,7 +97,6 @@
     <Content Include="TheThemeMachine\Views\Layout.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="TheThemeMachine\Views\Fields\" />
     <Folder Include="TheThemeMachine\Views\Parts\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />