diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 64e22d5d1..c68317c91 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{50B779EA-EC00-4699-84C0-03B395C365D2}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -203,7 +203,9 @@
     <Content Include="Themes\Green\Views\DisplayTemplates\Parts\Comments.HasComments.ascx" />
     <Content Include="Themes\Green\Views\footer.ascx" />
     <Content Include="Themes\Green\Views\layout.ascx" />
+    <Content Include="Themes\Green\Views\ListOfComments.ascx" />
     <Content Include="Themes\Green\Views\menu.ascx" />
+    <Content Include="Themes\Green\Views\user.ascx" />
     <Content Include="Themes\Orange\Views\Orchard.Blogs\BlogPost\Item.ascx" />
     <Content Include="Themes\Orchard\Content\Images\background_content.jpg" />
     <Content Include="Themes\Orchard\Content\Images\background_footer.jpg" />
@@ -261,9 +263,6 @@
           <IISUrl>
           </IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/src/Orchard.Web/Themes/Classic/Styles/blog.css b/src/Orchard.Web/Themes/Classic/Styles/blog.css
index 97555a622..d0cdbed15 100644
--- a/src/Orchard.Web/Themes/Classic/Styles/blog.css
+++ b/src/Orchard.Web/Themes/Classic/Styles/blog.css
@@ -1,13 +1,16 @@
 /*Blog specific styles
 ----------------------------------------------------------*/
 
-.meta, .manage, .posted {
+.posted {
     margin: 8px 0;
     font-size:105%;
+    font-weight:600;
 }
 
 .meta, .manage {
+    font-size:105%;
     float:right;
+    margin:-23px 0 0 0;
 }
 
 .blogdescription, .postsummary {
diff --git a/src/Orchard.Web/Themes/Classic/Styles/site.css b/src/Orchard.Web/Themes/Classic/Styles/site.css
index d6da316c7..0d2bcfff3 100644
--- a/src/Orchard.Web/Themes/Classic/Styles/site.css
+++ b/src/Orchard.Web/Themes/Classic/Styles/site.css
@@ -151,7 +151,7 @@ input[type="submit"], input[type="button"], .button {
 }
 
 #sidebar h3 {
-	border-bottom:1px solid #f1f1f1;
+	border-bottom:1px dotted #e5e5e5;
 }
 
 
diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
index eb7aa6eaf..c5952fce6 100644
--- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
+++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx
@@ -2,6 +2,7 @@
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
+
 <h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.Blog(Model.Item.Slug)) %></h3>
 <div class="blog meta"><a href="<%=Url.Blog(Model.Item.Slug) %>"><%=_Encoded("{0} post{1}", Model.Item.PostCount, Model.Item.PostCount == 1 ? "" : "s")%></a></div>
-<div class="blogdescription"><p><%=Html.Encode(Model.Item.Description) %></p></div>
\ No newline at end of file
+<div class="blogdescription"><p><%=Html.Encode(Model.Item.Description) %></p></div>
diff --git a/src/Orchard.Web/Themes/Green/Styles/blog.css b/src/Orchard.Web/Themes/Green/Styles/blog.css
index 89d8f5631..3641a98d2 100644
--- a/src/Orchard.Web/Themes/Green/Styles/blog.css
+++ b/src/Orchard.Web/Themes/Green/Styles/blog.css
@@ -7,19 +7,12 @@
 
 .meta, .manage {
     float:right;
-    margin:6px 6px 0 0;
-}
-
-.manage {
-    margin:12px 6px 0 0;
-}
-
-.bloginfo h1 ,.blogPosts h3, .blogs h3 {
-    float:left;
+    margin:-16px 6px 0 0;
 }
 
 .blogdescription, .postsummary {
     clear:both;
+    border-bottom:1px solid #cacec6;
  }
  
  .comments li {
diff --git a/src/Orchard.Web/Themes/Green/Styles/site.css b/src/Orchard.Web/Themes/Green/Styles/site.css
index 6eb487370..58f262617 100644
--- a/src/Orchard.Web/Themes/Green/Styles/site.css
+++ b/src/Orchard.Web/Themes/Green/Styles/site.css
@@ -66,8 +66,7 @@ input[type="text"], textarea, #password {
 }
 
 fieldset {
-    margin: 20px 20px 20px 10px;
-    border:1px solid #CACEC6;
+    margin: 4px 20px 20px 10px;
     -moz-border-radius:6px;
 	-webkit-border-radius:6px;
     }
@@ -82,15 +81,15 @@ legend {
 
 label {
     display: block;
-    margin:8px 0 2px 16px;
+    margin:8px 0 2px 0px;
     font-size:105%;
     }
 
 input[type="text"], textarea, #password {
     border-color:#cacec6;
     padding:2px;
-    margin:2px 0 4px 16px;
-    width:90%;
+    margin:2px 0 4px 0px;
+    width:100%;
     }
 
 input[type="checkbox"] {
@@ -100,7 +99,7 @@ input[type="checkbox"] {
 input[type="submit"], input[type="button"] {
     padding:2px 14px;
     display: block;
-    margin:2px 0 20px 10px;
+    margin:2px 0 20px 0px;
     font-weight:600;
     }
   
@@ -174,7 +173,7 @@ colgroup
 #bd {
     min-height:500px;
     background:#fff;
-    padding: 20px 16px;
+    padding: 20px;
     -webkit-border-top-left-radius: 6px;    /* for Safari */
     -webkit-border-top-right-radius: 6px;
 	-moz-border-radius-topleft: 6px;       /* for Firefox */
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
new file mode 100644
index 000000000..30ea909c5
--- /dev/null
+++ b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Pages.Page.ascx
@@ -0,0 +1,12 @@
+<%@ 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 {pageSlug = Model.Item.Slug}) %>" 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/Parts/Comments.HasComments.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Comments.HasComments.ascx
index eb7615b57..d97d5770b 100644
--- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Comments.HasComments.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Comments.HasComments.ascx
@@ -8,8 +8,9 @@ if (Model.CommentsActive == false) { %>
     <%-- todo: (heskew) need a comment form for the authenticated user... --%>
     <% using(Html.BeginForm("Create", "Admin", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment" })) { %>
         <%=Html.ValidationSummary() %>
+        <h2>Add a Comment</h2>
         <fieldset class="who">
-        <legend>Leave your comment</legend>
+
             <%=Html.Hidden("CommentedOn", Model.ContentItem.Id) %>
             <%=Html.Hidden("ReturnUrl", Context.Request.Url) %>
             <div>
@@ -29,6 +30,7 @@ if (Model.CommentsActive == false) { %>
                 <label for="CommentText"><%=_Encoded("Comment") %></label>
                 <textarea id="CommentText" rows="10" cols="30" name="CommentText"></textarea>
             </div>
+       
             <div>
                 <input type="submit" class="button" value="<%=_Encoded("Submit Comment") %>" />
 		        <%=Html.AntiForgeryTokenOrchard() %>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/icons.png b/src/Orchard.Web/Themes/TheAdmin/Styles/images/icons.png
index 9db203a53..b115f24f4 100644
Binary files a/src/Orchard.Web/Themes/TheAdmin/Styles/images/icons.png and b/src/Orchard.Web/Themes/TheAdmin/Styles/images/icons.png differ
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/images/icons.psd b/src/Orchard.Web/Themes/TheAdmin/Styles/images/icons.psd
index ea412b1df..047460f1e 100644
Binary files a/src/Orchard.Web/Themes/TheAdmin/Styles/images/icons.psd and b/src/Orchard.Web/Themes/TheAdmin/Styles/images/icons.psd differ
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index f910a4b90..1ea69ee73 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -143,7 +143,7 @@ h1, h2, h3, h4, h5, legend {
     font-style: normal;
     font-weight:normal;
 }
-h1 { font-size:2.4em; } /* 24px */
+h1 { font-size:2.6em; } /* 26px */
 h2 { font-size:2.1em; } /* 21px */
 h2 span { font-size:.57em; } /* 12px */
 h3 { font-size:1.8em; } /* 18px */
@@ -298,10 +298,7 @@ a:hover, a:active, a:focus {
 #main form.inline {
     margin:0;
 }
-#main h1 {
-    border-bottom:1px dashed #e4e7dc;
-}
-#main h2 {
+#main h1, #main h2 {
     border-bottom:1px solid #e4e7dc;
 }