diff --git a/src/Orchard.Web/Core/Shapes/CoreShapes.cs b/src/Orchard.Web/Core/Shapes/CoreShapes.cs
index 20b83ac46..82d778753 100644
--- a/src/Orchard.Web/Core/Shapes/CoreShapes.cs
+++ b/src/Orchard.Web/Core/Shapes/CoreShapes.cs
@@ -34,7 +34,7 @@ namespace Orchard.Core.Shapes {
             // and has an automatic zone creating behavior
             builder.Describe("Layout")
                 .Configure(descriptor => descriptor.Wrappers.Add("Document"))
-                .OnCreating(creating => creating.Behaviors.Add(new ZoneHoldingBehavior(name => CreateZone(creating, name))))
+                .OnCreating(creating => creating.Behaviors.Add(new ZoneHoldingBehavior(name => CreateZone(creating))))
                 .OnCreated(created => {
                     var layout = created.Shape;
                     layout.Head = created.New.DocumentZone();
@@ -48,21 +48,21 @@ namespace Orchard.Core.Shapes {
 
             // 'Zone' shapes are built on the Zone base class
             builder.Describe("Zone")
-                .OnCreating(creating => creating.BaseType = typeof (Zone));
-                //.OnDisplaying(displaying => {
-                //                  var name = displaying.Shape.ZoneName.ToLower();
-                //                  var zone = displaying.Shape;
-                //                  zone.Classes.Add("zone-" + name);
-                //                  zone.Classes.Add("zone");
-                //              });
+                .OnCreating(creating => creating.BaseType = typeof (Zone))
+                .OnDisplaying(displaying => {
+                                  var name = displaying.Shape.ZoneName.ToLower();
+                                  var zone = displaying.Shape;
+                                  zone.Classes.Add("zone-" + name);
+                                  zone.Classes.Add("zone");
+                              });
 
-            //builder.Describe("menu")
-            //    .OnDisplaying(displaying => {
-            //                      var name = displaying.Shape.MenuName.ToLower();
-            //                      var menu = displaying.Shape;
-            //                      menu.Classes.Add("menu-" + name);
-            //                      menu.Classes.Add("menu");
-            //                  });
+            builder.Describe("Menu")
+                .OnDisplaying(displaying => {
+                    var name = displaying.Shape.MenuName.ToLower();
+                    var menu = displaying.Shape;
+                    menu.Classes.Add("menu-" + name);
+                    menu.Classes.Add("menu");
+                });
 
             // 'List' shapes start with several empty collections
             builder.Describe("List")
@@ -73,12 +73,8 @@ namespace Orchard.Core.Shapes {
                 });
         }
 
-        private object CreateZone(ShapeCreatingContext context, string zoneName) {
-            var name = zoneName.ToLower();
-            var zone = context.New.Zone();
-            zone.Id = "zone-" + name;
-            zone.Classes.Add("zone");
-            return zone;
+        static object CreateZone(ShapeCreatingContext context) {
+            return context.New.Zone();
         }
 
         static TagBuilder GetTagBuilder(string tagName, string id, IEnumerable<string> classes, IDictionary<string, string> attributes) {