diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css
index 146170023..d050c3ad6 100644
--- a/src/Orchard.Web/Content/Admin/css/base.css
+++ b/src/Orchard.Web/Content/Admin/css/base.css
@@ -151,7 +151,7 @@ h3 { font-size:2.1em; } /* 21px */
 h4 { font-size:1.8em; } /* 18px */
 h5 { font-size:1.6em; } /* 16px */
 
-h6, p, label, input, select, .button, .cancel /* todo: (heskew) need to do something better with cancel */,
+h6, p, legend, label, input, select, .button, .cancel /* todo: (heskew) need to do something better with cancel */,
 .message, th, td { font-size:1.5em; line-height:1.5em; } /* 15px */
 p .button,
 td *, .mceLayout td { font-size:inherit; }
@@ -304,20 +304,20 @@ span.message {
 }
 
 .confirmation.message {
-	background:#e6f1c9;
+	background:#e6f1c9; /* green */
 	border:1px solid #cfe493;
 }
 .warning.message {
-	background:#fdf5bc;
+	background:#fdf5bc; /* yellow */
 	border:1px solid #ffea9b;
 }
 .critical.message {
-	background:#e68585;
+	background:#e68585; /* red */
 	border:1px solid #990808;
 	color:#fff;
 }
 .info.message {
-    background:#fff;
+    background:#fff; /* orange :P */
 	border:1px dashed #D2D6C6;
 }
 .debug.message {
@@ -355,7 +355,6 @@ label input {
 
 /* todo: (heskew) try to get .text on stuff like #PublishLaterDate and .text-box */
 select, textarea, input.text, input.text-box, #PublishLaterDate {
-	margin:3px 4px 4px;
 	padding:2px;
 	border:1px solid #d2d6c6;
 	color:#5a5b32;
@@ -377,15 +376,15 @@ textarea {
     min-height:8em;
 }
 .primary input.large.text, .primary textarea {
-    margin:.613% 0 .613% .613%;
+    margin:0;
     padding:4px;
-    width:98.161%;
+    width:98%;
 }
 
 /* todo: (heskew) move editor specific style elsewhere */
 .primary .mceEditor {
     display:block;
-    margin:.613% 0 .613% .613%;
+    margin:0;
 }
 .secondary fieldset {
     margin:.446% 0 .446% .446%;
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 102fa1dff..e9c863f5c 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -178,11 +178,10 @@
     <Content Include="Content\Site3.css" />
     <Content Include="Views\Shared\AdminHead.aspx" />
     <Content Include="Views\Shared\AdminFoot.aspx" />
-    <Content Include="Views\Admin\Messages.ascx" />
+    <Content Include="Views\Shared\Messages.ascx" />
     <Content Include="Views\Shared\ExtraUserControl.ascx" />
     <Content Include="Views\Shared\Footer.ascx" />
     <Content Include="Views\Shared\Header.ascx" />
-    <Content Include="Views\Shared\Messages.ascx" />
     <Content Include="Views\Shared\Navigation.ascx" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs b/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs
index 04953fc94..00ef04906 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs
@@ -70,7 +70,11 @@ namespace Orchard.Blogs.Controllers {
             if (blog == null)
                 return new NotFoundResult();
 
-            return View(new CreateBlogPostViewModel { Blog = blog, ItemView = _contentManager.GetEditorViewModel(_contentManager.New("blogpost"), null) });
+            var model = new CreateBlogPostViewModel {
+                Blog = blog,
+                ItemView = _contentManager.GetEditorViewModel(_contentManager.New("blogpost"), null)
+            };
+            return View(model);
         }
 
         [HttpPost]
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj
index 833e5edc0..baebd5ac5 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Orchard.Blogs.csproj
@@ -123,7 +123,6 @@
     <Content Include="Views\Blog\EditorTemplates\CreateBlogViewModel.ascx" />
     <Content Include="Views\Blog\Item.aspx" />
     <Content Include="Views\Shared\DisplayTemplates\BlogPostPreviewForAdmin.ascx" />
-    <Content Include="Views\Shared\Messages.ascx" />
     <Content Include="Web.config" />
     <Content Include="Views\Web.config" />
   </ItemGroup>
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogEditViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogEditViewModel.ascx
index f3a44963f..e651d2811 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogEditViewModel.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogEditViewModel.ascx
@@ -1,11 +1,11 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BlogEditViewModel>" %>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
 <fieldset>
-    <label for="Name">Blog Name:</label>
+    <label for="Name">Blog Name</label>
     <%=Html.EditorFor(m => m.Name) %>
 </fieldset>
 <%=Html.EditorFor(m => m.Slug, "BlogPermalink") %>
 <fieldset>
-    <label for="Description">Description:</label>
+    <label for="Description">Description</label>
     <%=Html.TextAreaFor(m => m.Description, 5, 60, null) %>
 </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogPermalink.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogPermalink.ascx
index 170c3da7f..3ca2b1635 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogPermalink.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/BlogPermalink.ascx
@@ -2,5 +2,5 @@
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <fieldset>
     <label class="sub" for="permalink">Permalink: <span><%=Request.Url.ToRootString() %>/</span></label>
-    <span><%=Html.TextBox("", Model, new { id = "permalink", @class = "text" })%> <span> &laquo; How to write a permalink. &raquo; </span></span>
+    <span><%=Html.TextBox("", Model, new { id = "permalink", @class = "text" })%></span>
 </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/CreateBlogViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/CreateBlogViewModel.ascx
index 3bc93b0f7..e617832cf 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/CreateBlogViewModel.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Blog/EditorTemplates/CreateBlogViewModel.ascx
@@ -1,11 +1,11 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<CreateBlogViewModel>" %>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
 <fieldset>
-    <label for="">Blog Name:</label>
+    <label for="Name">Blog Name</label>
     <%=Html.EditorFor(m => m.Name) %>
 </fieldset>
 <%=Html.EditorFor(m => m.Slug, "BlogPermalink") %>
 <fieldset>
-    <label for="">Description:</label>
+    <label for="Description">Description</label>
     <%=Html.TextAreaFor(m => m.Description, 5, 60, null) %>
 </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx
index af837d50d..972b73d33 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/Create.aspx
@@ -8,13 +8,5 @@
     <%using (Html.BeginForm()) { %>
         <%= Html.ValidationSummary() %>
         <%= Html.EditorForModel() %>
-        <%foreach (var editor in Model.ItemView.Editors) { %>
-        <%-- TODO: why is Body in editors? --%>
-        <%-- TODO: because any content type using the body editor doesn't need
-        to re-implement the rich editor, media extensions, format filter chain selection, etc --%>
-            <% if (!String.Equals(editor.Prefix, "Body")) { %>
-                <%=Html.EditorFor(m=>editor.Model, editor.TemplateName, editor.Prefix) %>
-            <% } %>
-        <%} %>
     <% } %>
 <% Html.Include("AdminFoot"); %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/BlogPostEditViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/BlogPostEditViewModel.ascx
index b2c5bc833..3160aaf39 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/BlogPostEditViewModel.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/BlogPostEditViewModel.ascx
@@ -3,20 +3,19 @@
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
 <div class="sections">
     <div class="primary">
-        <h3>Content</h3>
         <%-- todo: (heskew) thin out the fieldsets if they become overkill --%>
         <fieldset>
-            <label for="title">Title:</label>
+            <label for="title">Title</label>
             <span><%=Html.TextBoxFor(m => m.Title, new { id = "title", @class = "large text" })%></span>
         </fieldset>
         <fieldset>
             <label class="sub" for="permalink">Permalink: <span><%=Request.Url.ToRootString() %>/<%=Model.Blog.Slug %>/</span></label>
-            <span><%=Html.TextBoxFor(m => m.Slug, new { id = "permalink", @class = "text" })%> <span> &laquo; How to write a permalink. &raquo; </span></span>
+            <span><%=Html.TextBoxFor(m => m.Slug, new { id = "permalink", @class = "text" })%></span>
         </fieldset>
         <fieldset>
-            <%--<label for="body">Excerpt:</label>
+            <%--<label for="body">Excerpt</label>
             <span>[still needed]</span>--%>
-            <label for="body">Body:</label>
+            <label for="body">Body</label>
             <span><%=Html.TextAreaFor(m => m.Body, new { id = "body", @class = "html" })%></span>
         </fieldset>
         <% foreach (var e in Model.ItemView.Editors) {
@@ -30,7 +29,11 @@
            } %>
     </div>
     <div class="secondary">
-        <h3>Publish Settings</h3>
+        <fieldset>
+            <legend>Publish Settings</legend>
+            <label for="Command_SaveDraft"><%=Html.RadioButton("Command", "SaveDraft", true, new { id = "Command_SaveDraft" }) %> Save Draft</label><br />
+            <input class="button" type="submit" name="submit.Save" value="Save"/>
+        </fieldset>
         <%--<fieldset>
             <label for="Command_PublishNow"><%=Html.RadioButton("Command", "PublishNow", new { id = "Command_PublishNow" }) %> Publish Now</label>
         </fieldset>
@@ -38,11 +41,5 @@
             <label for="Command_PublishLater"><%=Html.RadioButton("Command", "PublishLater", new { id = "Command_PublishLater" }) %> Publish Later</label>
             <%=Html.EditorFor(m => m.Published) %>
         </fieldset>--%>
-        <fieldset>
-            <label for="Command_SaveDraft"><%=Html.RadioButton("Command", "SaveDraft", true, new { id = "Command_SaveDraft" }) %> Save Draft</label>
-        </fieldset>
-        <fieldset>
-            <input class="button" type="submit" name="submit.Save" value="Save"/>
-        </fieldset>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/CreateBlogPostViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/CreateBlogPostViewModel.ascx
index 946f5f0e3..1098102e2 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/CreateBlogPostViewModel.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/BlogPost/EditorTemplates/CreateBlogPostViewModel.ascx
@@ -1,26 +1,39 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<CreateBlogPostViewModel>" %>
+<%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.ViewModels"%>
 <div class="sections">
     <div class="primary">
-        <h3>Content</h3>
         <%-- todo: (heskew) thin out the fieldsets if they become overkill --%>
         <fieldset>
-            <label for="title">Title:</label>
-            <span><%=Html.TextBoxFor(m => m.Title, new { id = "title", @class = "text" })%></span>
+            <label for="title">Title</label>
+            <span><%=Html.TextBoxFor(m => m.Title, new { id = "title", @class = "large text" })%></span>
         </fieldset>
         <fieldset>
-            <label class="sub" for="permalink">Permalink: <span>http://localhost/<%=Model.Blog.Slug %>/</span></label>
-            <span><%=Html.TextBoxFor(m => m.Slug, new { id = "permalink", @class = "text" })%> <span> &laquo; How to write a permalink. &raquo; </span></span>
+            <label class="sub" for="permalink">Permalink: <span><%=Request.Url.ToRootString() %>/<%=Model.Blog.Slug %>/</span></label>
+            <span><%=Html.TextBoxFor(m => m.Slug, new { id = "permalink", @class = "text" })%></span>
         </fieldset>
         <fieldset>
-            <%--<label for="body">Excerpt:</label>
+            <%--<label for="body">Excerpt</label>
             <span>[still needed]</span>--%>
-            <label for="body">Body:</label>
+            <label for="body">Body</label>
             <span><%=Html.TextAreaFor(m => m.Body, new { id = "body", @class = "html" })%></span>
         </fieldset>
+        <% foreach (var e in Model.ItemView.Editors) {
+            var editor = e;
+            // TODO: why is Body in editors?
+            // TODO: because any content type using the body editor doesn't need
+            //  to re-implement the rich editor, media extensions, format filter chain selection, etc
+            if (!String.Equals(editor.Prefix, "Body")) {
+                %><%=Html.EditorFor(m=>editor.Model, editor.TemplateName, editor.Prefix) %>
+            <% }
+           } %>
     </div>
     <div class="secondary">
-        <h3>Publish Settings</h3>
+        <fieldset>
+            <legend>Publish Settings</legend>
+            <label for="Command_SaveDraft"><%=Html.RadioButton("Command", "SaveDraft", true, new { id = "Command_SaveDraft" }) %> Save Draft</label><br />
+            <input class="button" type="submit" name="submit.Save" value="Save"/>
+        </fieldset>
         <%--<fieldset>
             <label for="Command_PublishNow"><%=Html.RadioButton("Command", "PublishNow", new { id = "Command_PublishNow" }) %> Publish Now</label>
         </fieldset>
@@ -28,11 +41,6 @@
             <label for="Command_PublishLater"><%=Html.RadioButton("Command", "PublishLater", new { id = "Command_PublishLater" }) %> Publish Later</label>
             <%=Html.EditorFor(m => m.Published) %>
         </fieldset>--%>
-        <fieldset>
-            <label for="Command_SaveDraft"><%=Html.RadioButton("Command", "SaveDraft", true, new { id = "Command_SaveDraft" }) %> Save Draft</label></li>
-        </fieldset>
-        <fieldset>
-            <input class="button" type="submit" name="submit.Save" value="Save"/>
-        </fieldset>
+
     </div>
 </div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/Messages.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/Messages.ascx
deleted file mode 100644
index 79120e6af..000000000
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/Messages.ascx
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IEnumerable<NotifyEntry>>" %>
-<%@ Import Namespace="Orchard.UI.Notify"%>
-
-<script runat="server">
-string CssClassName(NotifyType type) {
-    switch(type) {
-        case NotifyType.Error:
-            return "critical";
-        case NotifyType.Warning:
-            return "warning";
-    }
-    return "informational";
-}</script>
-
-<% foreach (var item in Model) { %>
-<div class="<%=CssClassName(item.Type) %> message"><%=Html.Encode(item.Message) %></div>
-<% } %>
diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/HasComments.ascx b/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/HasComments.ascx
index 7439deab5..d187e1171 100644
--- a/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/HasComments.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Comments/Views/Models/EditorTemplates/HasComments.ascx
@@ -1,18 +1,14 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<HasComments>" %>
 <%@ Import Namespace="Orchard.Comments.Models"%>
-<% if (Model.ContentItem.Id != 0) { %>
-<h3>Comments</h3>
-<div class="meta">
-    <% var commentCount = Model.Comments.Count(); %>
+<fieldset>
+    <legend>Comments<% if (Model.ContentItem.Id != 0) { %>: <% var commentCount = Model.Comments.Count(); %>
     <%=Html.ActionLink(
             string.Format("{0} comment{1}", commentCount, commentCount == 1 ? "" : "s"),
             "Details",
             new { Area = "Orchard.Comments", Controller = "Admin", id = Model.ContentItem.Id, returnUrl = Context.Request.Url }
             ) %>
-    / <a href="#">0 pending</a>
-</div>
-<fieldset>
-    <label for="Closed"><%=Html.CheckBox("Allow comments", Model.Closed, new { id = "Closed" }) %> Close comments</label>
+    - <a href="#">0 pending</a><% } %></legend>
+    <label for="Closed"><%=Html.EditorFor(hc => hc.Closed) %> Close comments</label>
 </fieldset>
 <%--
 todo: (heskew) would be better to have a ↑ checkbox ↑ instead of a ↓ button ↓
@@ -34,4 +30,3 @@ todo: (heskew) shouldn't have comments when editing a content item. besides bein
     </li>
     <% } %>
 </ol>--%>
-<% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/EditorTemplates/ShowDebugLink.ascx b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/EditorTemplates/ShowDebugLink.ascx
index 77afe4cd5..d77a8dc90 100644
--- a/src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/EditorTemplates/ShowDebugLink.ascx
+++ b/src/Orchard.Web/Packages/Orchard.DevTools/Views/Models/EditorTemplates/ShowDebugLink.ascx
@@ -1,5 +1,7 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ShowDebugLink>" %>
 <%@ Import Namespace="Orchard.DevTools.Models" %>
+<% if (Model.ContentItem.Id > 0) { %>
 <div class="debug message">
     DevTools: editing
     <%= Html.ActionLink(Model.ContentItem.ContentType + " #" + Model.ContentItem.Id, "details", "content", new { area = "Orchard.DevTools", Model.ContentItem.Id }, new { })%></div>
+<% } %>
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs b/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs
index b604d21ed..ba2ac1841 100644
--- a/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs
@@ -40,7 +40,7 @@ namespace Orchard.Tags.Models {
             if (context.ContentItem.Has<HasTags>() == false) {
                 return;
             }
-            context.AddEditor(new TemplateViewModel(context.ContentItem.Get<HasTags>()));
+            context.AddEditor(new TemplateViewModel(context.ContentItem.Get<HasTags>()) { Position = "0" });
         }
 
         protected override void UpdateEditorViewModel(UpdateEditorViewModelContext context) {
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/EditorTemplates/HasTags.ascx b/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/EditorTemplates/HasTags.ascx
index 092769100..b429bd034 100644
--- a/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/EditorTemplates/HasTags.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Views/Models/EditorTemplates/HasTags.ascx
@@ -1,9 +1,8 @@
 <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<HasTags>" %>
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Tags.Models"%>
-<h3>Tags</h3>
 <formset>
-    <label for="Tags">Tag names:</label>
+    <label for="Tags">Tags</label>
     <input class="large text" id="Tags" name="Tags" type="text" value="<%=string.Join(", ", Model.CurrentTags.Select((t, i) => t.TagName).ToArray()) %>" />
 </formset>
 <%--<% Html.BeginForm("Update", "Home", new { area = "Orchard.Tags" }); %>--%>
\ No newline at end of file
diff --git a/src/Orchard.Web/Views/Admin/Messages.ascx b/src/Orchard.Web/Views/Admin/Messages.ascx
deleted file mode 100644
index 79120e6af..000000000
--- a/src/Orchard.Web/Views/Admin/Messages.ascx
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IEnumerable<NotifyEntry>>" %>
-<%@ Import Namespace="Orchard.UI.Notify"%>
-
-<script runat="server">
-string CssClassName(NotifyType type) {
-    switch(type) {
-        case NotifyType.Error:
-            return "critical";
-        case NotifyType.Warning:
-            return "warning";
-    }
-    return "informational";
-}</script>
-
-<% foreach (var item in Model) { %>
-<div class="<%=CssClassName(item.Type) %> message"><%=Html.Encode(item.Message) %></div>
-<% } %>
diff --git a/src/Orchard.Web/Views/Shared/AdminHead.aspx b/src/Orchard.Web/Views/Shared/AdminHead.aspx
index d1e981339..de6ff60ff 100644
--- a/src/Orchard.Web/Views/Shared/AdminHead.aspx
+++ b/src/Orchard.Web/Views/Shared/AdminHead.aspx
@@ -28,7 +28,7 @@ todo: (heskew) rework how/what pages are assembled when we get into theming --%>
             theme_advanced_buttons2: "",
             theme_advanced_buttons3: ""
             });
-     </script>
+        </script>
 </head>
 <body>
     <div id="header" role="banner">
diff --git a/src/Orchard.Web/Views/Shared/Messages.ascx b/src/Orchard.Web/Views/Shared/Messages.ascx
index 87120fde8..3e19f19dc 100644
--- a/src/Orchard.Web/Views/Shared/Messages.ascx
+++ b/src/Orchard.Web/Views/Shared/Messages.ascx
@@ -5,13 +5,13 @@
 string CssClassName(NotifyType type) {
     switch(type) {
         case NotifyType.Error:
-            return "validation-summary-errors";
+            return "critical";
         case NotifyType.Warning:
-            return "validation-summary-errors";
+            return "warning";
     }
-    return "validation-summary-errors";
+    return "info";
 }</script>
 
-<%if (Model != null){ foreach (var item in Model) { %>
+<% foreach (var item in Model) { %>
 <div class="<%=CssClassName(item.Type) %> message"><%=Html.Encode(item.Message) %></div>
-<% }} %>
+<% } %>