diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx b/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx
index 92deb3ffa..096432d18 100644
--- a/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx
+++ b/src/Orchard.Web/Core/Settings/Views/Admin/Index.ascx
@@ -7,7 +7,7 @@
     <legend><%=_Encoded("Global Settings")%></legend>
     <div>
         <label for="SiteName"><%=_Encoded("Site name") %></label>
-        <%=Html.EditorFor(m => m.SiteName) %>
+        <%=Html.EditorFor(m => m.SiteName)%>
         <%=Html.ValidationMessage("SiteName", "*") %>
     </div>
     <div>
@@ -26,4 +26,4 @@
     <%=Html.EditorFor(s => s.Id) %>
     <input class="button primaryAction" type="submit" value="<%=_Encoded("Save") %>" />
 </fieldset>
-<% } %>
\ No newline at end of file
+<% } %>
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx b/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx
index 0bc3fbd50..ce8827252 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/EditorTemplates/Parts/Roles.UserRoles.ascx
@@ -7,8 +7,10 @@
            foreach (var entry in Model.Roles) {%>
     <%=Html.Hidden("Roles[" + index + "].RoleId", entry.RoleId)%>
     <%=Html.Hidden("Roles[" + index + "].Name", entry.Name)%>
+    <div>
     <%=Html.CheckBox("Roles[" + index + "].Granted", entry.Granted)%>
     <label class="forcheckbox" for="<%="Roles[" + index + "]_Granted"%>"><%=Html.Encode(entry.Name) %></label>
+    </div>
     <%++index;
         }
        }
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.aspx b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.aspx
index 99d5bd35f..a8d80f094 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.aspx
@@ -3,12 +3,12 @@
 <h1><%=Html.TitleForPage(T("Add User").ToString()) %></h1>
 <%using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.ValidationSummary() %>
-    <%=Html.EditorFor(m=>m.UserName, "inputTextLarge") %>
+    <%=Html.EditorFor(m=>m.UserName, "inputTextLarge")%>
     <%=Html.EditorFor(m=>m.Email, "inputTextLarge") %>
     <%=Html.EditorFor(m=>m.Password, "inputPasswordLarge") %>
     <%=Html.EditorFor(m=>m.ConfirmPassword, "inputPasswordLarge") %>
     <%=Html.EditorForItem(Model.User) %>
     <fieldset>
-        <input class="button" type="submit" value="<%=_Encoded("Create") %>" />
+        <input class="button primaryAction" type="submit" value="<%=_Encoded("Create") %>" />
     </fieldset>
 <% } %>
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/EditorTemplates/inputPasswordLarge.ascx b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/EditorTemplates/inputPasswordLarge.ascx
index 2603310ae..3378bcb33 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/EditorTemplates/inputPasswordLarge.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/EditorTemplates/inputPasswordLarge.ascx
@@ -1,6 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
 <fieldset>
     <%=Html.LabelForModel() %>
-    <%=Html.Password("", Model, new { @class = "text" }) %>
+    <%=Html.Password("", Model, new { @class = "textMedium" })%>
     <%=Html.ValidationMessage("", "*") %>
 </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/EditorTemplates/inputTextLarge.ascx b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/EditorTemplates/inputTextLarge.ascx
index e55755fc7..68f26c8a2 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/EditorTemplates/inputTextLarge.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/EditorTemplates/inputTextLarge.ascx
@@ -1,6 +1,6 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
 <fieldset>
     <%=Html.LabelForModel() %>
-    <%=Html.TextBox("", Model, new { @class = "text" }) %>
+    <%=Html.TextBox("", Model, new { @class = "textMedium" })%>
     <%=Html.ValidationMessage("", "*") %>
 </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 184187747..8efcadefa 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>
@@ -174,6 +174,7 @@
     <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" />
@@ -255,9 +256,6 @@
           <IISUrl>
           </IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index df6e7f2c5..6a8658e0c 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -384,13 +384,16 @@ label input {
     text-indent:3ex; /* todo: (heskew) this might look out of place */
 }
 /* todo: (heskew) try to get .text on stuff like .text-box */
-select, textarea, input.text, input.text-box {
+select, textarea, input.text, input.textMedium, input.text-box {
 	padding:2px;
 	border:1px solid #bdbcbc;
 }
-input.text, input.text-box {
+input.text, input.textMedium, input.text-box {
     line-height:1.2em;
 }
+input.textMedium {
+    width:26em;
+}
 select:focus, textarea:focus, input.text:focus, input.text-box:focus {
 	border-color:#666d51;
 }
@@ -428,6 +431,7 @@ fieldset {
 .settings legend {
     margin:0 0 -.4em 0;
 }
+/* todo: This style is the same as textMedium. Consolidate if possible */
 .settings input.text, .settings input.text-box {
     width:26em;
 }