diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css
index 6d5fb5b8d1..b4525de5f6 100644
--- a/dashboard-ui/css/card.css
+++ b/dashboard-ui/css/card.css
@@ -338,15 +338,17 @@
 }
 
 @media all and (min-width: 700px) {
-    .backdropCard {
-        width: 33.3%;
-    }
-
     .bannerCard {
         width: 50%;
     }
 }
 
+@media all and (min-width: 770px) {
+    .backdropCard {
+        width: 33.3%;
+    }
+}
+
 @media all and (min-width: 800px) {
 
     .squareCard {
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 25b8a34dbd..715e3d9c80 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -1,6 +1,6 @@
 (function (window, document, $, devicePixelRatio) {
 
-    function renderHeader(user) {
+    function renderHeader() {
 
         var html = '<div class="viewMenuBar ui-bar-b">';
 
@@ -22,29 +22,61 @@
 
         html += '<div class="viewMenuSecondary">';
 
-        var btnCastVisible = user.localUser ? '' : 'visibility:hidden;';
-
         if (!AppInfo.enableHeaderImages) {
-            html += '<button id="btnCast" class="btnCast btnCastIcon btnDefaultCast headerButton headerButtonRight" type="button" data-role="none" style="' + btnCastVisible + '">';
+            html += '<button id="btnCast" class="btnCast btnCastIcon btnDefaultCast headerButton headerButtonRight" type="button" data-role="none" style="display:none;">';
             html += '<div class="headerSelectedPlayer"></div><i class="fa fa-wifi"></i>';
             html += '</button>';
         } else {
-            html += '<button id="btnCast" class="btnCast btnDefaultCast headerButton headerButtonRight" type="button" data-role="none" style="' + btnCastVisible + '"><div class="headerSelectedPlayer"></div><div class="btnCastImage"></div></button>';
+            html += '<button id="btnCast" class="btnCast btnDefaultCast headerButton headerButtonRight" type="button" data-role="none" style="display:none;"><div class="headerSelectedPlayer"></div><div class="btnCastImage"></div></button>';
         }
 
+        html += '<button onclick="Search.showSearchPanel($.mobile.activePage);" type="button" data-role="none" class="headerButton headerButtonRight headerSearchButton" style="display:none;"><div class="fa fa-search" style="font-size:21px;"></div></button>';
+
+        html += '<div class="viewMenuSearch hide"><form class="viewMenuSearchForm">';
+        html += '<input type="text" data-role="none" data-type="search" class="headerSearchInput" autocomplete="off" spellcheck="off" />';
+        html += '<div class="searchInputIcon fa fa-search"></div>';
+        html += '<button data-role="none" type="button" data-iconpos="notext" class="imageButton btnCloseSearch"><i class="fa fa-close"></i></button>';
+        html += '</form></div>';
+
+        html += '<button class="headerButton headerButtonRight headerUserButton" type="button" data-role="none" onclick="Dashboard.showUserFlyout(this);">';
+
+        html += '<div class="fa fa-user"></div>';
+
+        html += '</button>';
+
+        html += '<a href="dashboard.html" class="headerButton headerButtonRight dashboardEntryHeaderButton" style="display:none;"><div class="fa fa-cog"></div></a>';
+
+        html += '</div>';
+
+        html += '</div>';
+
+        $(document.body).prepend(html);
+        $('.viewMenuBar').trigger('create').lazyChildren();
+
+        $(document).trigger('headercreated');
+        bindMenuEvents();
+    }
+
+    function addUserToHeader(user) {
+
+        var header = $('.viewMenuBar');
+
         if (user.localUser) {
-            html += '<button onclick="Search.showSearchPanel($.mobile.activePage);" type="button" data-role="none" class="headerButton headerButtonRight headerSearchButton"><div class="fa fa-search" style="font-size:21px;"></div></button>';
-
-            html += '<div class="viewMenuSearch hide"><form class="viewMenuSearchForm">';
-            html += '<input type="text" data-role="none" data-type="search" class="headerSearchInput" autocomplete="off" spellcheck="off" />';
-            html += '<div class="searchInputIcon fa fa-search"></div>';
-            html += '<button data-role="none" type="button" data-iconpos="notext" class="imageButton btnCloseSearch"><i class="fa fa-close"></i></button>';
-            html += '</form></div>';
+            $('.btnCast', header).show();
+            $('.headerSearchButton', header).show();
+        } else {
+            $('.btnCast', header).hide();
+            $('.headerSearchButton', header).hide();
         }
 
-        if (user.name) {
+        if (user.canManageServer) {
+            $('.dashboardEntryHeaderButton', header).show();
+        } else {
+            $('.dashboardEntryHeaderButton', header).hide();
+        }
 
-            html += '<button class="headerButton headerButtonRight headerUserButton" type="button" data-role="none" onclick="Dashboard.showUserFlyout(this);">';
+        var userButtonHtml = '';
+        if (user.name) {
 
             if (user.imageUrl && AppInfo.enableUserImage) {
 
@@ -56,27 +88,12 @@
                     url += "&height=" + (userButtonHeight * Math.max(devicePixelRatio || 1, 2));
                 }
 
-                html += '<div class="lazy headerUserImage" data-src="' + url + '" style="width:' + userButtonHeight + 'px;height:' + userButtonHeight + 'px;"></div>';
+                userButtonHtml += '<div class="lazy headerUserImage" data-src="' + url + '" style="width:' + userButtonHeight + 'px;height:' + userButtonHeight + 'px;"></div>';
             } else {
-                html += '<div class="fa fa-user"></div>';
+                userButtonHtml += '<div class="fa fa-user"></div>';
             }
-
-            html += '</button>';
+            $('.headerUserButton', header).html(userButtonHtml).lazyChildren();
         }
-
-        if (user.canManageServer) {
-            html += '<a href="dashboard.html" class="headerButton headerButtonRight dashboardEntryHeaderButton"><div class="fa fa-cog"></div></a>';
-        }
-
-        html += '</div>';
-
-        html += '</div>';
-
-        $(document.body).prepend(html);
-        $('.viewMenuBar').trigger('create').lazyChildren();
-
-        $(document).trigger('headercreated');
-        bindMenuEvents();
     }
 
     function bindMenuEvents() {
@@ -505,17 +522,17 @@
         var viewMenuBar = $('.viewMenuBar');
         if (!$('.viewMenuBar').length) {
 
-            ConnectionManager.user(window.ApiClient).done(function (user) {
+            renderHeader();
+            updateViewMenuBarHeadroom(page, $('.viewMenuBar'));
 
-                renderHeader(user);
-                updateViewMenuBarHeadroom(page, $('.viewMenuBar'));
+            updateCastIcon();
 
-                updateCastIcon();
+            updateLibraryNavLinks(page);
+            updateContextText(page);
+            requiresViewMenuRefresh = false;
+
+            ConnectionManager.user(window.ApiClient).done(addUserToHeader);
 
-                updateLibraryNavLinks(page);
-                updateContextText(page);
-                requiresViewMenuRefresh = false;
-            });
         } else {
             updateContextText(page);
             updateLibraryNavLinks(page);
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 72df535014..46a5659b73 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -633,50 +633,62 @@ var Dashboard = {
 
     showUserFlyout: function (context) {
 
-        ConnectionManager.user(window.ApiClient).done(function (user) {
+        var html = '<div data-role="panel" data-position="right" data-display="overlay" id="userFlyout" data-position-fixed="true" data-theme="a">';
 
-            var html = '<div data-role="panel" data-position="right" data-display="overlay" id="userFlyout" data-position-fixed="true" data-theme="a">';
+        html += '<h3 class="userHeader">';
 
-            html += '<h3>';
+        html += '</h3>';
 
-            var imgWidth = 48;
+        html += '<form>';
 
-            if (user.imageUrl && AppInfo.enableUserImage) {
-                var url = user.imageUrl;
+        html += '<p class="preferencesContainer"></p>';
 
-                if (user.supportsImageParams) {
-                    url += "&width=" + (imgWidth * Math.max(window.devicePixelRatio || 1, 2));
-                }
+        if (Dashboard.isConnectMode()) {
+            html += '<p><a data-mini="true" data-role="button" href="selectserver.html" data-icon="cloud">' + Globalize.translate('ButtonSelectServer') + '</button></a>';
+        }
 
-                html += '<div class="lazy" data-src="' + url + '" style="width:' + imgWidth + 'px;height:' + imgWidth + 'px;background-size:contain;background-repeat:no-repeat;background-position:center center;border-radius:1000px;vertical-align:middle;margin-right:.8em;display:inline-block;"></div>';
-            }
-            html += user.name;
-            html += '</h3>';
+        html += '<p><button data-mini="true" type="button" onclick="Dashboard.logout();" data-icon="lock">' + Globalize.translate('ButtonSignOut') + '</button></p>';
 
-            html += '<form>';
+        html += '</form>';
+        html += '</div>';
 
-            var isConnectMode = Dashboard.isConnectMode();
+        $(document.body).append(html);
 
-            if (user.localUser && user.localUser.Policy.EnableUserPreferenceAccess) {
-                html += '<p><a data-mini="true" data-role="button" href="mypreferencesdisplay.html?userId=' + user.localUser.Id + '" data-icon="gear">' + Globalize.translate('ButtonMyPreferences') + '</button></a>';
-            }
+        var elem = $('#userFlyout').panel({}).lazyChildren().trigger('create').panel("open").on("panelclose", function () {
 
-            if (isConnectMode) {
-                html += '<p><a data-mini="true" data-role="button" href="selectserver.html" data-icon="cloud">' + Globalize.translate('ButtonSelectServer') + '</button></a>';
-            }
-
-            html += '<p><button data-mini="true" type="button" onclick="Dashboard.logout();" data-icon="lock">' + Globalize.translate('ButtonSignOut') + '</button></p>';
-
-            html += '</form>';
-            html += '</div>';
-
-            $(document.body).append(html);
-
-            var elem = $('#userFlyout').panel({}).lazyChildren().trigger('create').panel("open").on("panelclose", function () {
-
-                $(this).off("panelclose").remove();
-            });
+            $(this).off("panelclose").remove();
         });
+
+        ConnectionManager.user(window.ApiClient).done(function (user) {
+            Dashboard.updateUserFlyout(elem, user);
+        });
+    },
+
+    updateUserFlyout: function (elem, user) {
+
+        var html = '';
+        var imgWidth = 48;
+
+        if (user.imageUrl && AppInfo.enableUserImage) {
+            var url = user.imageUrl;
+
+            if (user.supportsImageParams) {
+                url += "&width=" + (imgWidth * Math.max(window.devicePixelRatio || 1, 2));
+            }
+
+            html += '<div class="lazy" data-src="' + url + '" style="width:' + imgWidth + 'px;height:' + imgWidth + 'px;background-size:contain;background-repeat:no-repeat;background-position:center center;border-radius:1000px;vertical-align:middle;margin-right:.8em;display:inline-block;"></div>';
+        }
+        html += user.name;
+
+        $('.userHeader', elem).html(html).lazyChildren();
+
+        html = '';
+
+        if (user.localUser && user.localUser.Policy.EnableUserPreferenceAccess) {
+            html += '<p><a data-mini="true" data-role="button" href="mypreferencesdisplay.html?userId=' + user.localUser.Id + '" data-icon="gear">' + Globalize.translate('ButtonMyPreferences') + '</button></a>';
+        }
+
+        $('.preferencesContainer', elem).html(html).trigger('create');
     },
 
     getPluginSecurityInfo: function () {
@@ -1568,38 +1580,33 @@ var AppInfo = {};
 
         window.ConnectionManager = new MediaBrowser.ConnectionManager(Logger, credentialProvider, appInfo.appName, appInfo.appVersion, appInfo.deviceName, appInfo.deviceId, capabilities);
 
-        $(ConnectionManager).on('apiclientcreated', function (e, apiClient) {
+        $(ConnectionManager).on('apiclientcreated', function (e, newApiClient) {
 
-            initializeApiClient(apiClient);
+            initializeApiClient(newApiClient);
         });
 
-        var lastApiClient = ConnectionManager.getLastUsedApiClient();
+        var apiClient;
 
         if (Dashboard.isConnectMode()) {
 
+            apiClient = ConnectionManager.getLastUsedApiClient();
+
             if (!Dashboard.isServerlessPage()) {
 
-                if (lastApiClient && lastApiClient.serverAddress() && lastApiClient.getCurrentUserId() && lastApiClient.accessToken()) {
-
-                    window.ApiClient = lastApiClient;
-
-                    initializeApiClient(lastApiClient);
-
-                    //ConnectionManager.addApiClient(lastApiClient, true).fail(Dashboard.logout);
+                if (apiClient && apiClient.serverAddress() && apiClient.getCurrentUserId() && apiClient.accessToken()) {
 
+                    initializeApiClient(apiClient);
                 }
             }
 
         } else {
 
-            if (!lastApiClient) {
-                lastApiClient = new MediaBrowser.ApiClient(Logger, Dashboard.serverAddress(), appInfo.appName, appInfo.appVersion, appInfo.deviceName, appInfo.deviceId);
-                ConnectionManager.addApiClient(lastApiClient);
-            }
-
-            window.ApiClient = lastApiClient;
+            apiClient = new MediaBrowser.ApiClient(Logger, Dashboard.serverAddress(), appInfo.appName, appInfo.appVersion, appInfo.deviceName, appInfo.deviceId);
+            ConnectionManager.addApiClient(apiClient);
         }
 
+        window.ApiClient = apiClient;
+
         if (window.ApiClient) {
             ApiClient.getDefaultImageQuality = Dashboard.getDefaultImageQuality;
             ApiClient.normalizeImageOptions = Dashboard.normalizeImageOptions;
diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js
index 2a7a4f7416..1a988b6a13 100644
--- a/dashboard-ui/scripts/sync.js
+++ b/dashboard-ui/scripts/sync.js
@@ -365,7 +365,7 @@
 
         var apiClient = window.ApiClient;
 
-        if (!apiClient) {
+        if (!apiClient || !apiClient.getCurrentUserId()) {
             return;
         }
 
@@ -400,7 +400,7 @@
             onCategorySyncButtonClick(page, this);
         });
 
-    }).on('pagebeforeshowready', ".libraryPage", function () {
+    }).on('pageshowready', ".libraryPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
index 88aa267a71..041859ab42 100644
--- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js
+++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
@@ -122,6 +122,19 @@
 
             apiClients.push(apiClient);
 
+            var existingServer = credentialProvider.credentials().servers.filter(function (s) {
+
+                return stringEqualsIgnoreCase(s.ManualAddress, apiClient.serverAddress());
+
+            })[0];
+
+            if (existingServer) {
+                
+                existingServer.DateLastAccessed = new Date().getTime();
+                existingServer.LastConnectionMode = MediaBrowser.ConnectionMode.Manual;
+                apiClient.serverInfo(existingServer);
+            }
+
             Events.on(apiClient, 'authenticated', function (e, result) {
                 onAuthenticated(this, result, {}, true);
             });
@@ -130,7 +143,9 @@
 
             return apiClient.getPublicSystemInfo().done(function (systemInfo) {
 
-                var server = credentialProvider.credentials().servers.filter(function (s) {
+                var credentials = credentialProvider.credentials();
+
+                var server = credentials.servers.filter(function (s) {
 
                     return s.Id == systemInfo.Id;
 
@@ -138,7 +153,14 @@
 
                 updateServerInfo(server, systemInfo);
 
+                server.DateLastAccessed = new Date().getTime();
+                server.LastConnectionMode = MediaBrowser.ConnectionMode.Manual;
+                server.ManualAddress = apiClient.serverAddress();
+
                 apiClient.serverInfo(server);
+
+                credentialProvider.addOrUpdateServer(credentials.servers, server);
+                credentialProvider.credentials(credentials);
             });
         };