diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Create.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Create.ascx
index 1688489eb..a26214f0b 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Create.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Create.ascx
@@ -4,5 +4,5 @@
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.ValidationSummary() %>
     <%=Html.EditorForItem(vm => vm.Blog) %>
-    <fieldset><input class="button" type="submit" value="<%=_Encoded("Create") %>" /></fieldset><%
+    <fieldset><input class="button primaryAction" type="submit" value="<%=_Encoded("Create") %>" /></fieldset><%
    } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Edit.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Edit.ascx
index d90e5fafe..f5b97391a 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Edit.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Edit.ascx
@@ -6,5 +6,5 @@
     <%=Html.EditorForItem(m => m.Blog) %>
     <%=Html.EditorFor(m => m.PromoteToHomePage) %>
     <label for="PromoteToHomePage" class="forcheckbox"><%=_Encoded("Set as home page") %></label>
-    <fieldset><input class="button" type="submit" value="<%=_Encoded("Save") %>" /></fieldset><%
+    <fieldset><input class="button primaryAction" type="submit" value="<%=_Encoded("Save") %>" /></fieldset><%
    } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx
index c91cbaa95..967267e84 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx
@@ -72,7 +72,7 @@
                 <td>
                     <ul class="actions">
                         <li class="construct">
-                            <a href="<%=Url.Action("Edit", new {commentEntry.Comment.Id}) %>" class="ibutton edit" title="<%=_Encoded("Edit Comment")%>"><%=_Encoded("Edit Comment")%></a>
+                            <a href="<%=Url.Action("Edit", new {commentEntry.Comment.Id}) %>" title="<%=_Encoded("Edit")%>"><%=_Encoded("Edit")%></a>
                         </li>
                         <li class="destruct">
 <%-- a form in a form doesn't quite work                            <% using (Html.BeginFormAntiForgeryPost(Url.Action("Delete", new {id = commentEntry.Comment.Id, redirectToAction = "Details"}), FormMethod.Post, new { @class = "inline" })) { %>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx
index 58151a6f3..1fb37f2ff 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.aspx
@@ -3,6 +3,7 @@
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
 <h1><%=Html.TitleForPage(T("Add Media").ToString()) %></h1>
+<div class="breadCrumbs">
 <p><%=Html.ActionLink(T("Media Folders").ToString(), "Index") %> &#62; 
     <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) { %>
         <%=Html.ActionLink(navigation.FolderName, "Edit",
@@ -10,6 +11,8 @@
 	    
     <% } %>
     <%=_Encoded("Add Media") %></p>
+</div>
+
 <% using (Html.BeginForm("Add", "Admin", FormMethod.Post, new { enctype = "multipart/form-data" })) { %>
     <%= Html.ValidationSummary() %>
     <fieldset>
@@ -20,7 +23,7 @@
         <input type="hidden" id="MediaPath" name="MediaPath" value="<%=Html.Encode(Model.MediaPath) %>" />
     </fieldset>
     <fieldset>
-		<input type="submit" class="button" value="<%=_Encoded("Upload") %>" />
+		<input type="submit" class="button primaryAction" value="<%=_Encoded("Upload") %>" />
 		<%=Html.AntiForgeryTokenOrchard() %>
 	</fieldset>
 <% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx
index d92a212fc..60dcd8fb4 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.aspx
@@ -3,18 +3,23 @@
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
 <h1><%=Html.TitleForPage(T("Add a Folder").ToString()) %></h1>
+<div class="breadCrumbs">
 <p><%=Html.ActionLink(T("Media Folders").ToString(), "Index") %> &#62; 
 		<%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) { %>
 		    <%=Html.ActionLink(navigation.FolderName, "Edit",
                       new {name = navigation.FolderName, mediaPath = navigation.FolderPath}) %> &#62;
 		<% } %>
 		<%=_Encoded("Add a Folder") %></p>
+</div> 
+			
 <%using (Html.BeginFormAntiForgeryPost()) { %>
     <%= Html.ValidationSummary() %>
     <fieldset>
         <label for="Name"><%=_Encoded("Folder Name") %></label>
-		<input id="Name" class="text" name="Name" type="text" />
-		<input type="hidden" id="MediaPath" name="MediaPath" value="<%=Html.Encode(Model.MediaPath) %>" />
-	    <input type="submit" class="button" value="<%=_Encoded("Save") %>" />
+		<input id="Name" class="textMedium" name="Name" type="text" />
+	    <input type="hidden" id="MediaPath" name="MediaPath" value="<%=Html.Encode(Model.MediaPath) %>" />
+    </fieldset>
+	<fieldset>
+	    <input type="submit" class="button primaryAction" value="<%=_Encoded("Save") %>" />
     </fieldset>
  <% } %>
\ 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 588a44e26..22701c26f 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.aspx
@@ -3,7 +3,11 @@
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
 <h1><%=Html.TitleForPage(T("Manage Folder").ToString())%></h1>
-<div class="manage"><%=Html.ActionLink(T("Folder Properties").ToString(), "EditProperties", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button"})%></div>
+
+
+<%--<div class="manage"><%=Html.ActionLink(T("Folder Properties").ToString(), "EditProperties", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button"})%></div>--%>
+
+<div class="breadCrumbs">
 <p><%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> &#62; 
     <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
         <%=Html.ActionLink(navigation.FolderName, "Edit",
@@ -11,16 +15,23 @@
 	    
     <% } %>
     <%=_Encoded("Manage Folder")%></p>
+</div> 
+<div class="folderProperties">
+<p><%=Html.ActionLink(T("Folder Properties").ToString(), "EditProperties", new { folderName = Model.FolderName, mediaPath = Model.MediaPath })%></p>
+</div> 
+<div class="clearBoth"></div>   
+    
+    
 <% using(Html.BeginFormAntiForgeryPost()) { %>
     <fieldset class="actions bulk">
         <label for="publishActions"><%=_Encoded("Actions:")%></label>
 		<select id="Select1" name="publishActions">
 		    <option value="1"><%=_Encoded("Delete")%></option>
 		</select>
-		<input class="button roundCorners" type="submit" value="<%=_Encoded("Apply") %>" />
+		<input class="button" type="submit" value="<%=_Encoded("Apply") %>" />
 	</fieldset>
 	<div class="manage">
-	    <%=Html.ActionLink(T("Add media").ToString(), "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%>
+	    <%=Html.ActionLink(T("Add media").ToString(), "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button primaryAction" })%>
 		<%=Html.ActionLink(T("Add a folder").ToString(), "Create", new { Model.MediaPath }, new { @class = "button" })%>
     </div>
     <fieldset>
@@ -83,7 +94,7 @@
         </table>
     </fieldset>
 	<div class="manage">
-	    <%=Html.ActionLink(T("Add media").ToString(), "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button" })%>
+	    <%=Html.ActionLink(T("Add media").ToString(), "Add", new { folderName = Model.FolderName, mediaPath = Model.MediaPath }, new { @class = "button primaryAction" })%>
 		<%=Html.ActionLink(T("Add a folder").ToString(), "Create", new { Model.MediaPath }, new { @class = "button" })%>
     </div>
 <% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx
index 4b91106c0..53a003a97 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.aspx
@@ -3,13 +3,17 @@
 <%@ Import Namespace="Orchard.Media.Helpers"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
 <h1><%=Html.TitleForPage(T("Edit Media - {0}", Model.Name).ToString())%></h1>
+
+<div class="breadCrumbs">
 <p><%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> &#62; 
     <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
         <%=Html.ActionLink(navigation.FolderName, "Edit",
                   new {name = navigation.FolderName, mediaPath = navigation.FolderPath})%> &#62;
     <% } %>
     <%=_Encoded("Edit Media")%></p>
-<div class="sections">
+ </div>   
+    
+<div class="sections clearBoth">
 	<%using (Html.BeginFormAntiForgeryPost()) { %>
         <%= Html.ValidationSummary() %>
         <div class="primary">
@@ -31,7 +35,7 @@
 			    </div>
 		    </fieldset>
 		    <fieldset>
-			    <input type="submit" class="button" name="submit.Save" value="<%=_Encoded("Save") %>" />
+			    <input type="submit" class="button primaryAction" name="submit.Save" value="<%=_Encoded("Save") %>" />
 			    <%--<input type="submit" class="button" name="submit.Delete" value="<%=_Encoded("Delete") %>" />--%>
             </fieldset>
 	    </div>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx
index be605be30..3dd66a5d1 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.aspx
@@ -3,6 +3,7 @@
 <%@ Import Namespace="Orchard.Media.Models"%>
 <%@ Import Namespace="Orchard.Media.ViewModels"%>
 <h1><%=Html.TitleForPage(T("Folder Properties").ToString())%></h1>
+<div class="breadCrumbs">
 <p><%=Html.ActionLink(T("Media Folders").ToString(), "Index")%> &#62; 
     <%foreach (FolderNavigation navigation in MediaHelpers.GetFolderNavigationHierarchy(Model.MediaPath)) {%>
         <%=Html.ActionLink(navigation.FolderName, "Edit",
@@ -10,13 +11,17 @@
 	    
     <% } %>
     <%=_Encoded("Folder Properties")%></p>
+</div>    
+    
 <% using (Html.BeginFormAntiForgeryPost()) { %>
     <%=Html.ValidationSummary() %>
     <fieldset>
         <label for="Name"><%=_Encoded("Folder Name:") %></label>
 		<input id="MediaPath" name="MediaPath" type="hidden" value="<%=Html.Encode(Model.MediaPath) %>" />
-		<input id="Name" class="text" name="Name" type="text" value="<%=Html.Encode(Model.Name) %>" />
-		<input type="submit" class="button" name="submit.Save" value="<%=_Encoded("Save") %>" />
+		<input id="Name" class="textMedium" name="Name" type="text" value="<%=Html.Encode(Model.Name) %>" />
+    </fieldset>
+    <fieldset>		
+		<input type="submit" class="button primaryAction" name="submit.Save" value="<%=_Encoded("Save") %>" />
 		<%--<input type="submit" class="button buttonFocus roundCorners" name="submit.Delete" value="<%=_Encoded("Delete") %>" />--%>
     </fieldset>
 <% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.aspx
index 09122a0b9..2b33d0d1f 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.aspx
@@ -10,7 +10,7 @@
 		</select>
 		<input class="button roundCorners" type="submit" value="<%=_Encoded("Apply") %>" />
     </fieldset>
-    <div class="manage"><%=Html.ActionLink(T("Add a folder").ToString(), "Create", new {}, new { @class = "button"}) %></div>
+    <div class="manage"><%=Html.ActionLink(T("Add a folder").ToString(), "Create", new { }, new { @class = "button primaryAction" })%></div>
     <fieldset>
 	    <table class="items" summary="<%=_Encoded("This is a table of the media folders currently available for use in your application.") %>">
 		    <colgroup>
@@ -48,5 +48,5 @@
             <%}%>
         </table>
     </fieldset>
-    <div class="manage"><%=Html.ActionLink(T("Add a folder").ToString(), "Create", new {}, new { @class = "button"}) %></div>
+    <div class="manage"><%=Html.ActionLink(T("Add a folder").ToString(), "Create", new { }, new { @class = "button primaryAction" })%></div>
 <% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx
index 263a72eb9..fab40301d 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.aspx
@@ -11,7 +11,7 @@
         </select>
         <input class="button" type="submit" name="submit.BulkEdit" value="<%=_Encoded("Apply") %>" />
     </fieldset>
-    <div class="manage"><%=Html.ActionLink(T("Add a tag").ToString(), "Create", new { }, new { @class = "button" })%></div>
+    <div class="manage"><%=Html.ActionLink(T("Add a tag").ToString(), "Create", new { }, new { @class = "button primaryAction" })%></div>
 	<fieldset>
 	    <table class="items" summary="<%=_Encoded("This is a table of the tags in your application") %>">
 		    <colgroup>
@@ -46,5 +46,5 @@
             <% tagIndex++; } %>
         </table>
     </fieldset>
-    <div class="manage"><%=Html.ActionLink(T("Add a tag").ToString(), "Create", new { }, new { @class = "button" })%></div>
+    <div class="manage"><%=Html.ActionLink(T("Add a tag").ToString(), "Create", new { }, new { @class = "button primaryAction" })%></div>
 <% } %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 603ed0f24..488e5e807 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -816,4 +816,19 @@ table.items, textarea, input.text, input.text-box,
 }
 .properties h3 {
     display:inline;
+}
+
+/* Added classes for media
+---------------------------------------------------------- */  
+.breadCrumbs, .folderProperties {
+    float:left;
+    margin:-2em 0 0 0;
+}
+.folderProperties {
+    float:right;
+}
+/* ---------- Generic ---------- */
+
+.clearBoth {
+	clear:both;
 }
\ No newline at end of file