diff --git a/dashboard-ui/bower_components/iron-flex-layout/.bower.json b/dashboard-ui/bower_components/iron-flex-layout/.bower.json
index 90b7b9e929..6533803466 100644
--- a/dashboard-ui/bower_components/iron-flex-layout/.bower.json
+++ b/dashboard-ui/bower_components/iron-flex-layout/.bower.json
@@ -23,14 +23,14 @@
     "paper-styles": "polymerelements/paper-styles#^1.0.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "homepage": "https://github.com/polymerelements/iron-flex-layout",
+  "homepage": "https://github.com/PolymerElements/iron-flex-layout",
   "_release": "1.0.3",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.3",
     "commit": "e6c2cfec18354973ac03e70dcd8afcc3c72d09b9"
   },
-  "_source": "git://github.com/polymerelements/iron-flex-layout.git",
+  "_source": "git://github.com/PolymerElements/iron-flex-layout.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-flex-layout"
+  "_originalSource": "PolymerElements/iron-flex-layout"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/neon-animation/.bower.json b/dashboard-ui/bower_components/neon-animation/.bower.json
index ef68d27d08..16a4ffdfce 100644
--- a/dashboard-ui/bower_components/neon-animation/.bower.json
+++ b/dashboard-ui/bower_components/neon-animation/.bower.json
@@ -54,7 +54,7 @@
     "tag": "v1.0.6",
     "commit": "ec51bf68f05c40373536cc726ca674e4549b7db2"
   },
-  "_source": "git://github.com/polymerelements/neon-animation.git",
+  "_source": "git://github.com/PolymerElements/neon-animation.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/neon-animation"
+  "_originalSource": "PolymerElements/neon-animation"
 }
\ No newline at end of file
diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css
index 85d8dc5561..2a5a276a5c 100644
--- a/dashboard-ui/css/card.css
+++ b/dashboard-ui/css/card.css
@@ -662,17 +662,24 @@
     }
 }
 
-@media all and (min-width: 1100px) {
+@media all and (min-width: 800px) {
 
     .homePageSmallBackdropCard {
         width: 20%;
     }
 }
 
+@media all and (min-width: 1100px) {
+
+    .homePageSmallBackdropCard {
+        width: 16.66666666666667%;
+    }
+}
+
 @media all and (min-width: 1440px) {
 
     .homePageSmallBackdropCard {
-        width: 14.285714285714285714285714285714%;
+        width: 12.5%;
     }
 }
 
diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css
index 13e8200de4..74adec32eb 100644
--- a/dashboard-ui/css/mediaplayer-video.css
+++ b/dashboard-ui/css/mediaplayer-video.css
@@ -208,9 +208,9 @@
 
 @media all and (max-width: 1400px), all and (max-height: 900px) {
 
-    /*#mediaPlayer .nowPlayingInfo {
+    .mediaButton.infoButton {
         display: none !important;
-    }*/
+    }
 }
 
 @media all and (max-width: 555px) {
diff --git a/dashboard-ui/scripts/backdrops.js b/dashboard-ui/scripts/backdrops.js
index f90cde66dd..40762c719e 100644
--- a/dashboard-ui/scripts/backdrops.js
+++ b/dashboard-ui/scripts/backdrops.js
@@ -110,7 +110,7 @@
     function setDefault(page) {
 
         getElement().style.backgroundImage = "url(css/images/splash.jpg)";
-
+        page = $(page)[0];
         page.classList.add('backdropPage');
         page.classList.add('staticBackdropPage');
     }
diff --git a/dashboard-ui/scripts/edititemimages.js b/dashboard-ui/scripts/edititemimages.js
index 3a2c25bb8c..720688d20b 100644
--- a/dashboard-ui/scripts/edititemimages.js
+++ b/dashboard-ui/scripts/edititemimages.js
@@ -52,7 +52,6 @@
     }
 
     function renderRemoteImages(page, item, imagesResult, imageType, startIndex, limit) {
-
         $('.availableImagesPaging', page).html(getPagingHtml(startIndex, limit, imagesResult.TotalRecordCount)).trigger('create');
 
         var html = '';
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 91e350923c..dfd06700f3 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -811,14 +811,22 @@
 
         var title = page.getAttribute('data-title') || page.getAttribute('data-contextname');
 
-        if (title) {
-            LibraryMenu.setTitle(title);
+        if (!title) {
+            var titleKey = getParameterByName('titlekey');
+
+            if (titleKey) {
+                title = Globalize.translate(titleKey);
+            }
         }
 
-        var titleKey = getParameterByName('titlekey');
+        if (!title) {
+            if (page.classList.contains('type-interior')) {
+                title = Globalize.translate('ButtonHome');
+            }
+        }
 
-        if (titleKey) {
-            LibraryMenu.setTitle(Globalize.translate(titleKey));
+        if (title) {
+            LibraryMenu.setTitle(title);
         }
 
         var mainDrawerButton = document.querySelector('.mainDrawerButton');
diff --git a/dashboard-ui/scripts/selectserver.js b/dashboard-ui/scripts/selectserver.js
index be526b3532..811744eba5 100644
--- a/dashboard-ui/scripts/selectserver.js
+++ b/dashboard-ui/scripts/selectserver.js
@@ -67,8 +67,8 @@
         } else {
             html += '<div class="cardImage" style="text-align:center;">';
 
-            var icon = server.Id == 'new' ? 'plus-circle' : 'server';
-            html += '<i class="fa fa-' + icon + '" style="color:#fff;vertical-align:middle;font-size:100px;margin-top:40px;"></i>';
+            var icon = server.Id == 'new' ? 'add' : 'wifi';
+            html += '<iron-icon icon="' + icon + '" style="color:#fff;vertical-align:middle;margin-top:30%;height:64px;width:64px;"></iron-icon>';
         }
 
         html += "</div>";
@@ -298,7 +298,7 @@
         html += '<a class="cardContent" href="' + href + '">';
 
         html += '<div class="cardImage" style="text-align:center;">';
-        html += '<i class="fa fa-globe" style="color:#fff;vertical-align:middle;font-size:100px;margin-top:40px;"></i>';
+        html += '<iron-icon icon="wifi" style="color:#fff;vertical-align:middle;margin-top:30%;height:64px;width:64px;"></iron-icon>';
         html += "</div>";
 
         // cardContent
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 4940a31c38..ae989c75d1 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2087,7 +2087,7 @@ var AppInfo = {};
             capabilities.DeviceProfile = MediaPlayer.getDeviceProfile(Math.max(screen.height, screen.width));
             createConnectionManager(capabilities).done(function () { onConnectionManagerCreated(deferred); });
 
-            //$(document.body).append('<div style="background:#009688;position:fixed;z-index:999999;top:0;right:0;left:0;bottom:0;padding:50px;"><iron-icon icon="queue-music" style="width:640px;height:640px;color:#fff;"></iron-icon></div>');
+            //$(document.body).append('<div style="background:#3F51B5;position:fixed;z-index:999999;top:1px;left:1px;width:800px;height:450px;display:flex;align-items:center;justify-content:center;"><iron-icon icon="live-tv" style="width:320px;height:320px;color:#fff;"></iron-icon></div>');
         });
     }
 
diff --git a/dashboard-ui/selectserver.html b/dashboard-ui/selectserver.html
index 788ea8fb67..b9483f116a 100644
--- a/dashboard-ui/selectserver.html
+++ b/dashboard-ui/selectserver.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-theme="b" data-require="scripts/selectserver,fontawesome">
+    <div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-theme="b" data-require="scripts/selectserver">
 
         <div data-role="content">