diff --git a/src/Orchard.Web/Content/Admin/css/base.css b/src/Orchard.Web/Content/Admin/css/base.css
index ac8b8d943..c91e8684a 100644
--- a/src/Orchard.Web/Content/Admin/css/base.css
+++ b/src/Orchard.Web/Content/Admin/css/base.css
@@ -131,7 +131,8 @@ number of columns: 24; actual width: 946; column width: 26; gutter width:14
     width:74.543%;
 }
 .sections .secondary {
-    float:right;
+    float:left;
+    margin-left:1.71%;
     width:23.629%;
 }
 
@@ -149,12 +150,13 @@ h2 { font-size:2.4em; } /* 24px */
 h3 { font-size:2.1em; } /* 21px */
 h4 { font-size:1.8em; } /* 18px */
 h5 { font-size:1.6em; } /* 16px */
-h6, p, label, input, .button, .cancel, select, th, td { font-size:1.5em; } /* 15px */
+h6, p, label, input, select, .button, .cancel /* todo: (heskew) need to do something better with cancel */,
+.message, th, td { font-size:1.5em; } /* 15px */
 
 h3 span { font-size:.57em; }
 
 /* ---------- Links ---------- */
-a, a:link {
+a, a:link, a:visited {
     color:#1e5d7d;
     text-decoration:none;
 }
@@ -275,23 +277,26 @@ a.linkButton, a.linkButton:visited {
 
 /* Confirmations;
 ----------------------------------------------------------*/
-
-div.confirmation, div.warning, div.critical {
+.message {
+	margin:10px 0 4px 0;
     padding:4px;
-	margin: 10px 0 4px 0;
+}
+span.message {
+    display:block;
+	margin:4px 0 4px 4px;
 }
 
-.confirmation {
+.confirmation.message {
 	background:#e6f1c9;
 	border:1px solid #cfe493;
 }
 
-.warning {
+.warning.message {
 	background:#fdf5bc;
 	border:1px solid #ffea9b;
 }
 
-.critical {
+.critical.message {
 	background:#e68585;
 	border:1px solid #990808;
 	color:#fff;
@@ -356,7 +361,7 @@ textarea {
 margin:0 6px 0 0;
 }
 
-button, .button {
+button, .button, .button:link, .button:visited {
 	background:#dddfcb url(images/tableHeaderBackground.gif) repeat-x top left;
 	border:1px solid #d2d6c6;
 	color:#5a5b32;
@@ -375,6 +380,9 @@ button:focus, .button:focus {
 .button {
     line-height:26px;
 }
+.delete.button {
+    float:right;
+}
 .cancel {
     margin:0 0 0 .93em;
 }
@@ -556,8 +564,8 @@ ul.horizontal li a, ul.horizontal li a:visited, ul.horizontal li a:active, ol.ho
 /*TODO - Remove roundCorners class*/
 #content, #navigation li,
 table, textarea, .button, input.text, .inputTextLarge,
-.inputTextPermalink, .linkButton, div.confirmation,
-div.warning, div.critical, .roundCorners {
+.inputTextPermalink, .linkButton, .confirmation.message,
+.warning.message, .critical.message, .roundCorners {
 	-moz-border-radius:4px;
 	-webkit-border-top-radius:4px;
 	border-radius:4px;
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/Messages.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/Messages.ascx
index 469863ae8..79120e6af 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/Messages.ascx
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Shared/Messages.ascx
@@ -13,5 +13,5 @@ string CssClassName(NotifyType type) {
 }</script>
 
 <% foreach (var item in Model) { %>
-<div class="<%=CssClassName(item.Type) %>"><%=Html.Encode(item.Message) %></div>
+<div class="<%=CssClassName(item.Type) %> message"><%=Html.Encode(item.Message) %></div>
 <% } %>
diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx
index 8a7f08078..cf6b0fb8d 100644
--- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx
@@ -16,7 +16,7 @@
                 %><fieldset>
                 <label for="<%="Revision.Contents[" + content.ZoneName + "].Content" %>"><%=_Encoded("Zone Name") %>: <%= content.ZoneName %></label>
                 <% if (Model.Template != null && Model.Template.Zones.Contains(content.ZoneName) == false) {
-                    %><span class="warning">These contents are assigned to a zone that does not exist in the current template. Please delete it or copy it to another zone.</span><%
+                    %><span class="warning message">These contents are assigned to a zone that does not exist in the current template. Please delete it or copy it to another zone.</span><%
                    } %>
                 <%= Html.TextArea("Revision.Contents[" + content.ZoneName + "].Content", content.Content) %>
             </fieldset><%
@@ -42,7 +42,7 @@
             </fieldset>
             <fieldset>
                 <input class="button" type="submit" name="submit.Save" value="Save"/>
-                <input class="button" type="submit" name="submit.DeleteDraft" value="Delete Draft" <%=Model.CanDeleteDraft ? "" : "disabled" %>/>
+                <input class="delete button" type="submit" name="submit.DeleteDraft" value="Delete Draft" <%=Model.CanDeleteDraft ? "" : "disabled" %>/>
             </fieldset>
         </div>
         <%}/*EndForm*/%>
diff --git a/src/Orchard.Web/Views/Admin/Messages.ascx b/src/Orchard.Web/Views/Admin/Messages.ascx
index 469863ae8..79120e6af 100644
--- a/src/Orchard.Web/Views/Admin/Messages.ascx
+++ b/src/Orchard.Web/Views/Admin/Messages.ascx
@@ -13,5 +13,5 @@ string CssClassName(NotifyType type) {
 }</script>
 
 <% foreach (var item in Model) { %>
-<div class="<%=CssClassName(item.Type) %>"><%=Html.Encode(item.Message) %></div>
+<div class="<%=CssClassName(item.Type) %> message"><%=Html.Encode(item.Message) %></div>
 <% } %>
diff --git a/src/Orchard.Web/Views/Shared/Messages.ascx b/src/Orchard.Web/Views/Shared/Messages.ascx
index ef06fd775..7d684faf9 100644
--- a/src/Orchard.Web/Views/Shared/Messages.ascx
+++ b/src/Orchard.Web/Views/Shared/Messages.ascx
@@ -13,5 +13,5 @@ string CssClassName(NotifyType type) {
 }</script>
 
 <% foreach (var item in Model) { %>
-<div class="<%=CssClassName(item.Type) %>"><%=Html.Encode(item.Message) %></div>
+<div class="<%=CssClassName(item.Type) %> message"><%=Html.Encode(item.Message) %></div>
 <% } %>