diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css b/src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css
index d8edd8638..13c700198 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css
@@ -1,31 +1,23 @@
-#currentTheme .themePreviewImage {
+/*button[title="Disable"], button[title="Enable"]
+{
+    display:none;
+}*/
+#currentTheme .themePreviewImage {
     float: left;
     margin-right: 20px;
 }
 #installedBar {
     clear: both;
-    border-bottom-width: thin;
-    border-bottom-style: solid;
-    border-bottom-color: #E4E5E6;
-    height: 50px;
+    border-bottom:1px solid #E4E5E6;
+    height: 36px;
     margin: 10px 0 10px 0;
 }
-#otherActionsBar {
-    clear: both;
-    border-top-width: thin;
-    border-top-style: solid;
-    border-top-color: #E4E5E6;
-    margin: 10px 0 0;
-    padding: 10px 0 0;
-}
 #installedBar h3 {
     float: left;
-    padding-top: 10px;
 }
-#installedBar p a {
-    color: #3A822E;
+#installedBar a {
     float: right;
-    padding-top: 20px;
+    padding-top: 10px;
 }
 .templates li {
     margin:.8em;
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml
index 16f8ce77f..687bb9d20 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml
@@ -18,8 +18,11 @@
     @Display.ThemeEntry_Current(ContentPart: Model.CurrentTheme)
 }
 
-<div id="installedBar">
+<div id="installedBar" class="group">
     <h3>@T("Available")</h3>
+    @if (Model.InstallThemes) {
+    @Html.ActionLink(T("Install a theme from my computer").ToString(), "AddTheme", "PackagingServices", new { area = "Orchard.Packaging", returnUrl = HttpContext.Current.Request.RawUrl }, null)
+}
 </div>
 
 @if (Model.Themes == null || Model.Themes.Count() <= 0) {
@@ -30,8 +33,4 @@
             <li>@Display.ThemeEntry(ContentPart: themeEntry)</li>
         }
     </ul>
-}
-
-@if (Model.InstallThemes) {
-    <p id="otherActionsBar">@Html.ActionLink(T("Upload a theme").ToString(), "AddTheme", "PackagingServices", new { area = "Orchard.Packaging", returnUrl = HttpContext.Current.Request.RawUrl }, null)</p>
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/ThemeEntry.cshtml b/src/Orchard.Web/Modules/Orchard.Themes/Views/ThemeEntry.cshtml
index f33e0d8a5..86fd8b200 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Views/ThemeEntry.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/ThemeEntry.cshtml
@@ -38,13 +38,13 @@
     @if (Model.ContentPart.Enabled) {
         using (Html.BeginFormAntiForgeryPost(Url.Action("Disable"), FormMethod.Post, new { @class = "inline link" })) {
             @Html.Hidden("themeName", (string)Model.ContentPart.Descriptor.Id)
-            <button type="submit" title="Disable">@T("Disable")</button>
+            <button type="submit" class="disable" title="Disable">@T("Disable")</button>
         }
     }
 	else {
         using (Html.BeginFormAntiForgeryPost(Url.Action("Enable"), FormMethod.Post, new { @class = "inline link" })) {
             @Html.Hidden("themeName", (string)Model.ContentPart.Descriptor.Id)
-            <button type="submit" title="Enable">@T("Enable")</button>
+            <button type="submit" class="enable" title="Enable">@T("Enable")</button>
         }
 	}
 
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 3c81a2edb..489c03610 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -158,8 +158,8 @@ hr {border:0; height:1px; color:#e4e5e6; background-color:#e4e5e6;}
     min-height:100%;
 }
 #layout-main {
-    display:inline;
-    overflow:auto;
+    /*display:inline;
+    overflow:auto;*/
     float:right;
     margin-left:-240px;
     width:100%;
@@ -168,6 +168,7 @@ hr {border:0; height:1px; color:#e4e5e6; background-color:#e4e5e6;}
 #main {
     margin-left:260px;
     margin-right:20px;
+    clear:both;
 }
 #menu {
     background:#323232;
@@ -382,7 +383,7 @@ ul.menuItems {margin:6px 0 0 0;}
 #content {
     background-color: #fff;
     padding: 16px 24px;
-    margin:8px 0 0 0;
+    margin-top:8px;
     border: 1px solid #e4e5e6;
     clear:both;