diff --git a/src/Orchard.Web/Core/Navigation/Drivers/MenuPartDriver.cs b/src/Orchard.Web/Core/Navigation/Drivers/MenuPartDriver.cs
index 74c057ec0..21c7cfa71 100644
--- a/src/Orchard.Web/Core/Navigation/Drivers/MenuPartDriver.cs
+++ b/src/Orchard.Web/Core/Navigation/Drivers/MenuPartDriver.cs
@@ -1,7 +1,9 @@
-using JetBrains.Annotations;
+using System;
+using JetBrains.Annotations;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Core.Navigation.Models;
+using Orchard.Localization;
 using Orchard.Security;
 using Orchard.UI.Navigation;
 using Orchard.Utility;
@@ -15,9 +17,11 @@ namespace Orchard.Core.Navigation.Drivers {
         public MenuPartDriver(IAuthorizationService authorizationService, INavigationManager navigationManager) {
             _authorizationService = authorizationService;
             _navigationManager = navigationManager;
+            T = NullLocalizer.Instance;
         }
 
         public virtual IUser CurrentUser { get; set; }
+        private Localizer T { get; set; }
 
         protected override DriverResult Editor(MenuPart part) {
             if (!_authorizationService.TryCheckAccess(Permissions.ManageMainMenu, CurrentUser, part))
@@ -34,6 +38,9 @@ namespace Orchard.Core.Navigation.Drivers {
                 part.MenuPosition = Position.GetNext(_navigationManager.BuildMenu("main"));
 
             updater.TryUpdateModel(part, Prefix, null, null);
+            if (part.OnMainMenu && String.IsNullOrEmpty(part.MenuText)) {
+                updater.AddModelError("MenuText", T("The MenuText field is required"));
+            }
             return ContentPartTemplate(part, "Parts/Navigation.EditMenuPart").Location("primary", "9");
         }
     }
diff --git a/src/Orchard.Web/Core/Navigation/Models/MenuPart.cs b/src/Orchard.Web/Core/Navigation/Models/MenuPart.cs
index 120eb2f42..952f7c160 100644
--- a/src/Orchard.Web/Core/Navigation/Models/MenuPart.cs
+++ b/src/Orchard.Web/Core/Navigation/Models/MenuPart.cs
@@ -13,7 +13,6 @@ namespace Orchard.Core.Navigation.Models {
             set { Record.OnMainMenu = value; }
         }
 
-        [Required]
         public string MenuText {
             get { return Record.MenuText; }
             set { Record.MenuText = value; }
diff --git a/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx b/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx
index 36802991e..dbdf3db42 100644
--- a/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Core/Themes/Views/Admin/Index.aspx
@@ -9,15 +9,16 @@
    } else {
     %><h3><%=_Encoded("Current Theme")%> - <%=Html.Encode(Model.CurrentTheme.DisplayName) %></h3>
 
-        <%=Html.Image(Html.ThemePath(Model.CurrentTheme, "/Theme.png"), Html.Encode(Model.CurrentTheme.DisplayName), null)%>
+        <%=Html.Image(Html.ThemePath(Model.CurrentTheme, "/Theme.png"), Html.Encode(Model.CurrentTheme.DisplayName), new { @class = "themePreviewImage" })%>
         <h5><%=_Encoded("By") %> <%=Html.Encode(Model.CurrentTheme.Author) %></h5>
         
         <p>
         <%=_Encoded("Version:") %> <%=Html.Encode(Model.CurrentTheme.Version) %><br />
         <%=Html.Encode(Model.CurrentTheme.Description) %><br />
-        <%=Html.Encode(Model.CurrentTheme.HomePage) %><br />
-        <%=Html.ActionLink(T("Install a new Theme").ToString(), "Install") %>
-     </p>
+        <%=Html.Encode(Model.CurrentTheme.HomePage) %>
+        </p>
+        <%=Html.ActionLink(T("Install a new Theme").ToString(), "Install", null, new { @class = "button primaryAction" })%>
+     
 <% } %>
 <h2><%=_Encoded("Available Themes")%></h2>
 <ul class="templates">
diff --git a/src/Orchard.Web/Media/OrchardLogo.png b/src/Orchard.Web/Media/OrchardLogo.png
new file mode 100644
index 000000000..f6caf5ca5
Binary files /dev/null and b/src/Orchard.Web/Media/OrchardLogo.png differ
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogDriver.cs
index d0498a5bb..2a0f64fdd 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogDriver.cs
@@ -81,6 +81,9 @@ namespace Orchard.Blogs.Controllers {
 
             return Combined(
                 ContentItemTemplate("Items/Blogs.Blog").LongestMatch(displayType, "Summary", "DetailAdmin", "SummaryAdmin"),
+                ContentPartTemplate(blog, "Parts/Blogs.Blog.Manage").Location("primary:manage"),
+                ContentPartTemplate(blog, "Parts/Blogs.Blog.Metadata").Location("primary:metadata"),
+                ContentPartTemplate(blog, "Parts/Blogs.Blog.Description").Location("primary"),
                 blogPosts == null ? null : ContentPartTemplate(blogPosts, "Parts/Blogs.BlogPost.List", "").Location("primary"));
         }
 
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostDriver.cs
index ed18cba56..41493b9a2 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostDriver.cs
@@ -64,7 +64,10 @@ namespace Orchard.Blogs.Controllers {
         }
 
         protected override DriverResult Display(BlogPost post, string displayType) {
-            return ContentItemTemplate("Items/Blogs.BlogPost").LongestMatch(displayType, "Summary", "SummaryAdmin");
+            return Combined(
+                ContentItemTemplate("Items/Blogs.BlogPost").LongestMatch(displayType, "Summary", "SummaryAdmin"),
+                ContentPartTemplate(post, "Parts/Blogs.BlogPost.Manage").Location("primary:manage"),
+                ContentPartTemplate(post, "Parts/Blogs.BlogPost.Metadata").Location("primary:metadata"));
         }
 
         protected override DriverResult Editor(BlogPost post) {
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index 3f361a599..8188b4adb 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{63FBD4D9-E1DA-4A7B-AA6A-D6074FE50867}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -155,6 +155,11 @@
     <Content Include="Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
     <Content Include="Views\DisplayTemplates\Parts\Blogs.BlogPost.List.ascx" />
     <Content Include="Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
+    <Content Include="Views\DisplayTemplates\Parts\Blogs.BlogPost.Manage.ascx" />
+    <Content Include="Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
+    <Content Include="Views\DisplayTemplates\Parts\Blogs.Blog.Manage.ascx" />
+    <Content Include="Views\DisplayTemplates\Parts\Blogs.Blog.Description.ascx" />
+    <Content Include="Views\DisplayTemplates\Parts\Blogs.Blog.Metadata.ascx" />
     <Content Include="Views\EditorTemplates\Parts\Blogs.BlogPost.Publish.ascx" />
     <Content Include="Views\BlogPost\Item.ascx" />
     <Content Include="Views\BlogAdmin\Create.ascx" />
@@ -201,6 +206,9 @@
           <IISUrl>
           </IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.ascx
index 3f91a7f6f..803508baf 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.ascx
@@ -1,10 +1,6 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Blog>>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
-<%-- todo: (heskew) selectively display to those who have access --%>
 <h1><%=Html.TitleForPage(Model.Item.Name) %></h1>
-<div class="manage"><a href="<%=Url.BlogEdit(Model.Item.Slug) %>" class="ibutton edit"><%=_Encoded("edit") %></a></div>
-<p><%=Html.Encode(Model.Item.Description) %></p>
-<% Html.Zone("primary");
+<% Html.Zone("primary", ":manage :metadata");
    Html.ZonesAny(); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx
index 738470580..6a62a7c92 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx
@@ -1,13 +1,6 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<BlogPost>>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <h1><%=Html.TitleForPage(Model.Item.Title)%></h1>
-<div class="manage"><a href="<%=Url.BlogPostEdit(Model.Item.Blog.Slug, Model.Item.Id) %>" class="ibutton edit"><%=_Encoded("Edit") %></a></div>
-<div class="metadata">
-    <% if (Model.Item.Creator != null) { 
-       %><div class="posted"><%=_Encoded("Posted by {0} {1}", Model.Item.Creator.UserName, Html.PublishedWhen(Model.Item)) %></div><%
-       } %>
-</div>
-<% Html.Zone("primary");
+<% Html.Zone("primary", ":manage :metadata");
    Html.ZonesAny(); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx
new file mode 100644
index 000000000..a79b21067
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.ascx
@@ -0,0 +1,5 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Blog>" %>
+<%@ Import Namespace="Orchard.Blogs.Models"%>
+<div class="blogdescription">
+    <p><%=Html.Encode(Model.Description) %></p>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.ascx
new file mode 100644
index 000000000..908c21e94
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.ascx
@@ -0,0 +1,6 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Blog>" %>
+<%@ Import Namespace="Orchard.Blogs.Extensions"%>
+<%@ Import Namespace="Orchard.Blogs.Models"%>
+<div class="manage">
+    <a href="<%=Url.BlogEdit(Model.Slug) %>" class="edit"><%=_Encoded("Edit") %></a>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Metadata.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Metadata.ascx
new file mode 100644
index 000000000..ecd331b26
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Metadata.ascx
@@ -0,0 +1,2 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Blog>" %>
+<%@ Import Namespace="Orchard.Blogs.Models"%>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Manage.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Manage.ascx
new file mode 100644
index 000000000..43f3a2823
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Manage.ascx
@@ -0,0 +1,6 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BlogPost>" %>
+<%@ Import Namespace="Orchard.Blogs.Extensions"%>
+<%@ Import Namespace="Orchard.Blogs.Models"%>
+<div class="manage">
+    <a href="<%=Url.BlogPostEdit(Model.Blog.Slug, Model.Id) %>" class="edit"><%=_Encoded("Edit") %></a>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx
new file mode 100644
index 000000000..921c1f183
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx
@@ -0,0 +1,8 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BlogPost>" %>
+<%@ Import Namespace="Orchard.Blogs.Extensions"%>
+<%@ Import Namespace="Orchard.Blogs.Models"%>
+<div class="metadata"><%
+    if (Model.Creator != null) { 
+       %><div class="posted"><%=_Encoded("Posted by {0} {1}", Model.Creator.UserName, Html.PublishedWhen(Model)) %></div><%
+    } %>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx
index 32f41367d..588a44e26 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx
@@ -48,7 +48,7 @@
             <tr>
                 <td>
                     <input type="checkbox" value="true" name="<%=_Encoded("Checkbox.File.{0}", mediaFile.Name)  %>"/>
-                    <input type="hidden" value="<%=_Encoded("Model.MediaPath") %>" name="<%=_Encoded("mediaFile.Name") %>" />
+                    <input type="hidden" value="<%=_Encoded(Model.MediaPath) %>" name="<%=_Encoded(mediaFile.Name) %>" />
                 </td>
                 <td>
                     <%=Html.ActionLink(mediaFile.Name, "EditMedia", new { name = mediaFile.Name, 
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs
index f7d4bf322..b693610d9 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Controllers/AdminController.cs
@@ -132,6 +132,7 @@ namespace Orchard.Pages.Controllers {
             }
 
             Services.ContentManager.Create(model.Page.Item.ContentItem, VersionOptions.Draft);
+            Services.ContentManager.UpdateEditorModel(page, this);
 
             // Execute publish command
             switch (Request.Form["Command"]) {
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Controllers/PageDriver.cs b/src/Orchard.Web/Modules/Orchard.Pages/Controllers/PageDriver.cs
index 1ad21020b..c06ec861f 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Controllers/PageDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Controllers/PageDriver.cs
@@ -60,7 +60,10 @@ namespace Orchard.Pages.Controllers {
         }
 
         protected override DriverResult Display(Page page, string displayType) {
-            return ContentItemTemplate("Items/Pages.Page").LongestMatch(displayType, "Summary", "SummaryAdmin");
+            return Combined(
+                ContentItemTemplate("Items/Pages.Page").LongestMatch(displayType, "Summary", "SummaryAdmin"),
+                ContentPartTemplate(page, "Parts/Pages.Page.Manage").Location("primary:manage"),
+                ContentPartTemplate(page, "Parts/Pages.Page.Metadata").Location("primary:metadata"));
         }
 
         protected override DriverResult Editor(Page page) {
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj
index be6647bda..9aa51df97 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj
@@ -119,6 +119,8 @@
     <Content Include="Styles\ui.timepickr.css" />
     <Content Include="Views\DisplayTemplates\Items\Pages.Page.ascx" />
     <Content Include="Views\DisplayTemplates\Items\Pages.Page.Summary.ascx" />
+    <Content Include="Views\DisplayTemplates\Parts\Pages.Page.Metadata.ascx" />
+    <Content Include="Views\DisplayTemplates\Parts\Pages.Page.Manage.ascx" />
     <Content Include="Views\EditorTemplates\Items\Pages.Page.ascx" />
     <Content Include="Views\EditorTemplates\Parts\Pages.Page.Publish.ascx" />
     <Content Include="Views\Admin\Create.ascx" />
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.ascx b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.ascx
index 000afe5a3..2a735a486 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Items/Pages.Page.ascx
@@ -1,10 +1,6 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Orchard.Pages.Models.Page>>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<div class="manage"><a href="<%=Url.Action(T("Edit").ToString(), "Admin", new {id = Model.Item.Id, area = "Orchard.Pages"}) %>" class="ibutton edit"><%=_Encoded("edit")%></a></div>
 <h1><%=Html.TitleForPage(Model.Item.Title)%></h1>
-<div class="metadata">
-    <div class="posted">Published by <%=Model.Item.Creator != null ? Html.Encode(Model.Item.Creator.UserName) : _Encoded("nobody(?)").ToString()%></div>
-</div>
-<% Html.Zone("primary");
+<% Html.Zone("primary", ":manage :metadata");
    Html.ZonesAny(); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Parts/Pages.Page.Manage.ascx b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Parts/Pages.Page.Manage.ascx
new file mode 100644
index 000000000..15a9f3dc0
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Parts/Pages.Page.Manage.ascx
@@ -0,0 +1,6 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Pages.Models.Page>" %>
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
+<%@ Import Namespace="Orchard.Mvc.Html" %>
+<div class="manage">
+    <a href="<%=Url.Action("Edit", "Admin", new {id = Model.Id, area = "Orchard.Pages"}) %>" class="edit"><%=_Encoded("Edit")%></a>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx
new file mode 100644
index 000000000..09b1438cb
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/DisplayTemplates/Parts/Pages.Page.Metadata.ascx
@@ -0,0 +1,5 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Pages.Models.Page>" %>
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
+<div class="metadata">
+    <div class="posted"><%=_Encoded("Published by {0}", Model.Creator != null ? Model.Creator.UserName : T("nobody(?)"))%></div>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/Page/Item.ascx b/src/Orchard.Web/Modules/Orchard.Pages/Views/Page/Item.ascx
index aa21b0278..2e9c113fc 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Views/Page/Item.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/Page/Item.ascx
@@ -1,4 +1,4 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<PageViewModel>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Pages.ViewModels"%>
-<%=Html.DisplayForItem(m=>m.Page) %>
+<%=Html.DisplayForItem(m=>m.Page) %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
index 144fb71eb..450a52095 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
@@ -33,6 +33,7 @@ using (Html.BeginFormAntiForgeryPost()) { %>
         <span>
             <label for="DatabaseConnectionString"><%=_Encoded("Connection string") %></label>
             <%=Html.EditorFor(svm => svm.DatabaseConnectionString)%>
+            <i class="hint"><%=_Encoded("Example: Data Source=sqlServerName;Initial Catalog=dbName;Persist Security Info=True;User ID=userName;Password=password") %></i>
         </span>
     </div>
 </fieldset>
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index b41cab248..184187747 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -174,7 +174,6 @@
     <Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
     <Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.BlogPost.ascx" />
     <Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
-    <Content Include="Themes\Classic\Views\DisplayTemplates\Items\Pages.Page.ascx" />
     <Content Include="Themes\Classic\Views\DisplayTemplates\Parts\Blogs.BlogPost.List.ascx" />
     <Content Include="Themes\Classic\Views\Footer.ascx" />
     <Content Include="Themes\Classic\Views\Layout.ascx" />
@@ -196,7 +195,6 @@
     <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
     <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
     <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
-    <Content Include="Themes\Green\Views\DisplayTemplates\Items\Pages.Page.ascx" />
     <Content Include="Themes\Green\Views\Footer.ascx" />
     <Content Include="Themes\Green\Views\Layout.ascx" />
     <Content Include="Themes\Green\Views\ListOfComments.ascx" />
diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx
index 4bbd140d3..e384ea728 100644
--- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx
+++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx
@@ -3,7 +3,5 @@
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <h2><%=Html.TitleForPage(Model.Item.Name) %></h2>
-<div class="manage"><a href="<%=Url.BlogEdit(Model.Item.Slug) %>" class="ibutton edit"><%=_Encoded("Edit") %></a></div>
-<div class="blogdescription"><p><%=Html.Encode(Model.Item.Description) %></p></div>
-<% Html.Zone("primary");
+<% Html.Zone("primary", ":manage :metadata");
    Html.ZonesAny(); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Pages.Page.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Pages.Page.ascx
deleted file mode 100644
index 83539088d..000000000
--- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Pages.Page.ascx
+++ /dev/null
@@ -1,12 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Orchard.Pages.Models.Page>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<h1><%=Html.TitleForPage(Model.Item.Title)%></h1>
-<div class="manage"><a href="<%=Url.Action(T("Edit").ToString(), "Admin", new {id = Model.Item.Id, area = "Orchard.Pages"}) %>" class="ibutton edit"><%=_Encoded("Edit")%></a></div>
-<div class="metadata">
-    <div class="posted">Published by <%=Model.Item.Creator != null ? Html.Encode(Model.Item.Creator.UserName) : _Encoded("nobody(?)").ToString()%></div>
-</div>
-<% Html.Zone("primary");
-   Html.ZonesAny(); %>
-
-   
diff --git a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.ascx
index 4111fe8b9..f5f2d260e 100644
--- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.ascx
@@ -1,20 +1,8 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Blog>>" %>
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
-
 <div class="bloginfo">
     <h1><%=Html.TitleForPage(Model.Item.Name) %></h1>
-    <div class="manage">
-        <a href="<%=Url.BlogEdit(Model.Item.Slug) %>" class="ibutton edit"><%=_Encoded("Edit") %></a>
-    </div>
-    <div class="blogdescription">
-        <p><%=Html.Encode(Model.Item.Description) %></p>
-    </div>
 </div>
-
-<% Html.Zone("primary");
-   Html.ZonesAny(); %>
-   
-   
- 
\ No newline at end of file
+<% Html.Zone("primary", ":manage :metadata");
+   Html.ZonesAny(); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Pages.Page.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Pages.Page.ascx
deleted file mode 100644
index 83539088d..000000000
--- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Pages.Page.ascx
+++ /dev/null
@@ -1,12 +0,0 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel<Orchard.Pages.Models.Page>>" %>
-<%@ Import Namespace="Orchard.Mvc.Html"%>
-<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
-<h1><%=Html.TitleForPage(Model.Item.Title)%></h1>
-<div class="manage"><a href="<%=Url.Action(T("Edit").ToString(), "Admin", new {id = Model.Item.Id, area = "Orchard.Pages"}) %>" class="ibutton edit"><%=_Encoded("Edit")%></a></div>
-<div class="metadata">
-    <div class="posted">Published by <%=Model.Item.Creator != null ? Html.Encode(Model.Item.Creator.UserName) : _Encoded("nobody(?)").ToString()%></div>
-</div>
-<% Html.Zone("primary");
-   Html.ZonesAny(); %>
-
-   
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 0845c7d48..744a9b5b2 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -701,7 +701,7 @@ todo: (heskew) pull out into relevant modules where appropriate
 .templates p {
     overflow:hidden;
 }
-.templates img {
+.templates img, .themePreviewImage {
 	border:1px solid #e8e8e8;
     height:200px;
     margin:.27em 0 .93em 0;
@@ -712,6 +712,12 @@ todo: (heskew) pull out into relevant modules where appropriate
 	height:70%;
 	width:70%;
 }
+.themes #main h2 {
+    margin:1em 0 0 0;
+}
+.themePreviewImage {
+	height:300px;
+}
 
 /* Rounded borders and other "works in some browsers" additions
 ----------------------------------------------------------
diff --git a/src/Orchard/ContentManagement/ContentExtensions.cs b/src/Orchard/ContentManagement/ContentExtensions.cs
index 139cfd870..1449c2aa4 100644
--- a/src/Orchard/ContentManagement/ContentExtensions.cs
+++ b/src/Orchard/ContentManagement/ContentExtensions.cs
@@ -166,15 +166,25 @@ namespace Orchard.ContentManagement {
         /* Display and editor convenience extension methods */
 
         public static ContentItemViewModel<T> BuildDisplayModel<T>(this IContentManager manager, int id, string displayType) where T : class, IContent {
-            return manager.BuildDisplayModel(manager.Get<T>(id), displayType);
+            var content = manager.Get<T>(id);
+            if (content == null)
+                return null;
+            return manager.BuildDisplayModel(content, displayType);
         }
 
         public static ContentItemViewModel<T> BuildEditorModel<T>(this IContentManager manager, int id) where T : class, IContent {
-            return manager.BuildEditorModel(manager.Get<T>(id));
+            var content = manager.Get<T>(id);
+            if (content == null)
+                return null;
+            return manager.BuildEditorModel(content);
+
         }
 
         public static ContentItemViewModel<T> UpdateEditorModel<T>(this IContentManager manager, int id, IUpdateModel updater) where T : class, IContent {
-            return manager.UpdateEditorModel(manager.Get<T>(id), updater);
+            var content = manager.Get<T>(id);
+            if (content == null)
+                return null;
+            return manager.UpdateEditorModel(content, updater);
         }
 
 
diff --git a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
index a6bdf2b1c..5420aae4d 100644
--- a/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
+++ b/src/Orchard/Mvc/Html/HtmlHelperExtensions.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Web.Mvc;
 using System.Web.Mvc.Html;
 using System.Web.Routing;