diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index 59733694a..9181ae191 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -16,7 +16,8 @@
     left: 0;
     right: 0;
     bottom: 0;
-    z-index: 1000;
+    /* If this is raised, make sure it does not overlap bottom footer */
+    z-index: 1;
     margin: 0 !important;
     width: 100% !important;
     /* Page needs to supply padding */
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index 327aa508d..05ab5985d 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -249,7 +249,7 @@
 
         var viewTabs = view.querySelector('.libraryViewNav');
 
-        libraryBrowser.configurePaperLibraryTabs(view, viewTabs, view.querySelectorAll('.pageTabContent'), [0, 1, 2, 3]);
+        libraryBrowser.configurePaperLibraryTabs(view, viewTabs, view.querySelectorAll('.pageTabContent'), [0, 1, 2, 3], AppInfo.enableHomeTabs);
 
         var tabControllers = [];
         var renderedTabs = [];
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 511e8a019..fb2150ed6 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -150,9 +150,9 @@
                 });
             },
 
-            configurePaperLibraryTabs: function (ownerpage, tabs, panels, animateTabs) {
+            configurePaperLibraryTabs: function (ownerpage, tabs, panels, animateTabs, enableSwipe) {
 
-                if (!browser.safari) {
+                if (!browser.safari && enableSwipe !== false) {
                     LibraryBrowser.configureSwipeTabs(ownerpage, tabs);
                 }
 
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 0183d1a74..af0364deb 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -143,14 +143,10 @@ div.dialogHeader {
 }
 
 .ui-body-b div.formDialogHeader {
-    background-color: #101010;
+    background-color: #222326;
 }
 
 .formDialogHeader button {
     margin-top: 0;
     margin-bottom: 0;
-}
-
-.formDialog.background-theme-b {
-    background-color: #181818;
-}
+}
\ No newline at end of file