diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj b/src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj
index 02943e426..620b023e2 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Orchard.Experimental.csproj
@@ -107,6 +107,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\DisplayTemplates\Parts\Experimental.ShowDebugLink.ascx" />
+    <Content Include="Views\DumpShapeTable.cshtml" />
     <None Include="Views\HackScript.cshtml" />
     <None Include="Views\HackStyle.cshtml" />
     <None Include="Views\ThinBorder.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Shapes.cs b/src/Orchard.Web/Modules/Orchard.Experimental/Shapes.cs
index b2ec4b240..d343bc32d 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Shapes.cs
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Shapes.cs
@@ -7,12 +7,16 @@ namespace Orchard.Experimental {
         }
 
         public void Created(ShapeCreatedContext context) {
-            if (context.ShapeType != "Layout" && context.ShapeType != "DocumentZone")
+            if (context.ShapeType != "Layout" && context.ShapeType != "DocumentZone") {
                 context.Shape.Metadata.Wrappers.Add("ThinBorder");
+            }
             if (context.ShapeType == "Header") {
                 context.Shape.Metadata.Wrappers.Add("HackScript");
                 context.Shape.Metadata.Wrappers.Add("HackStyle");
             }
+            if (context.ShapeType == "Layout") {
+                context.Shape.Metadata.Wrappers.Add("DumpShapeTable");
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/DumpShapeTable.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml
similarity index 87%
rename from src/Orchard.Web/Themes/TheAdmin/Views/DumpShapeTable.cshtml
rename to src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml
index 24f145784..e3b0999e7 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Views/DumpShapeTable.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml
@@ -1,9 +1,10 @@
 @using Orchard;
 @using Orchard.DisplayManagement.Descriptors;
+@Display(Model.Metadata.ChildContent)
 @{
 	var workContext = ViewContext.GetWorkContext();
 	var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.ThemeName);
-    
+<!--    
 	<ul>
 		@foreach(var descriptor in shapeTable.Descriptors) {
 			<li>@descriptor.Key : @descriptor.Value.BindingSource 
@@ -15,4 +16,5 @@
 			</li>
 		}
 	</ul>
-}
+-->
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index ab2ce8eb1..d8c8f2137 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -311,7 +311,6 @@
     <Content Include="Themes\TheAdmin\Styles\images\backgroundHeader.gif" />
     <Content Include="Themes\TheAdmin\Styles\images\orchardLogo.gif" />
     <Content Include="Themes\TheAdmin\Theme.png" />
-    <Content Include="Themes\TheAdmin\Views\DumpShapeTable.cshtml" />
     <Content Include="Themes\TheAdmin\Views\User.cshtml" />
     <Content Include="Themes\TheAdmin\Views\Header.cshtml" />
     <Content Include="Themes\Web.config" />
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
index c6040ef15..16f1be5b9 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
+++ b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
@@ -38,11 +38,4 @@
         @Display(Model.Navigation)</div>
 </div>
 <div id="footer" role="contentinfo">
-    @Display(Model.Footer)</div>
-
-@* tmp *@
-<!--
-<div style="background:#666;color:#daf2f6;margin:10px;padding:10px;font:12px/18px Consolas,'Lucida Console','Bitstream Vera Sans Mono','DejaVu Sans Mono',monospace;">
-@Display.DumpShapeTable()
-</div>
--->
\ No newline at end of file
+    @Display(Model.Footer)</div>
\ No newline at end of file