diff --git a/dashboard-ui/bower_components/emby-apiclient/.bower.json b/dashboard-ui/bower_components/emby-apiclient/.bower.json
index 1a3df41565..39b3ac8daa 100644
--- a/dashboard-ui/bower_components/emby-apiclient/.bower.json
+++ b/dashboard-ui/bower_components/emby-apiclient/.bower.json
@@ -16,12 +16,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.1.107",
-  "_release": "1.1.107",
+  "version": "1.1.108",
+  "_release": "1.1.108",
   "_resolution": {
     "type": "version",
-    "tag": "1.1.107",
-    "commit": "82a9be9ffc4359043cbbae83031491dc4d2182cc"
+    "tag": "1.1.108",
+    "commit": "ff2072d7422bd9e216a23e667c8fe08910c43265"
   },
   "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
   "_target": "^1.1.51",
diff --git a/dashboard-ui/bower_components/emby-apiclient/apiclientex.js b/dashboard-ui/bower_components/emby-apiclient/apiclientex.js
new file mode 100644
index 0000000000..ab5fafcb58
--- /dev/null
+++ b/dashboard-ui/bower_components/emby-apiclient/apiclientex.js
@@ -0,0 +1,450 @@
+define(['apiclientcore', 'localassetmanager', 'events'], function (apiclientcorefactory, localassetmanager, events) {
+    'use strict';
+
+    var localPrefix = 'local:';
+    var localViewPrefix = 'localview:';
+
+    /**
+     * Creates a new api client instance
+     * @param {String} serverAddress
+     * @param {String} clientName s
+     * @param {String} applicationVersion 
+     */
+    return function (serverAddress, clientName, applicationVersion, deviceName, deviceId, devicePixelRatio) {
+
+        var apiclientcore = new apiclientcorefactory(serverAddress, clientName, applicationVersion, deviceName, deviceId, devicePixelRatio);
+
+        events.on(apiclientcore, 'websocketmessage', onWebSocketMessage);
+
+        var self = this;
+
+
+        function getUserViews(userId) {
+
+            return apiclientcore.getUserViews(userId).then(function (result) {
+
+                var serverInfo = apiclientcore.serverInfo();
+
+                if (serverInfo) {
+
+                    return getLocalView(serverInfo.Id, userId).then(function (localView) {
+
+                        if (localView) {
+
+                            result.Items.push(localView);
+                            result.TotalRecordCount++;
+                        }
+
+                        return Promise.resolve(result);
+                    });
+                }
+
+                return Promis.resolve(result);
+            });
+        }
+
+        function getLocalView(serverId, userId) {
+
+            return localassetmanager.getViews(serverId, userId).then(function (views) {
+
+                var localView = null;
+
+                if (views.length > 0) {
+
+                    localView = {
+                        Name: 'Offline Items',
+                        ServerId: serverId,
+                        Id: 'localview',
+                        Type: 'localview'
+                    };
+                }
+
+                return Promise.resolve(localView);
+            });
+        }
+
+        function getItems(userId, options) {
+
+            var serverInfo = apiclientcore.serverInfo();
+
+            if (serverInfo && options.ParentId === 'localview') {
+
+                return localassetmanager.getViews(serverInfo.Id, userId).then(function (items) {
+                    var result = {
+                        Items: items,
+                        TotalRecordCount: items.length
+                    };
+
+                    return Promise.resolve(result);
+                });
+
+            } else if (serverInfo && options && startsWith(options.ParentId, localViewPrefix)) {
+
+                return localassetmanager.getViewItems(serverInfo.Id, userId, options.ParentId).then(function (items) {
+
+                    items.forEach(function (item) {
+                        item.Id = localPrefix + item.Id;
+                    });
+
+                    var result = {
+                        Items: items,
+                        TotalRecordCount: items.length
+                    };
+
+                    return Promise.resolve(result);
+                });
+            } else if (options && options.ExcludeItemIds && options.ExcludeItemIds.length) {
+
+                var exItems = options.ExcludeItemIds;
+
+                for (var i = 0; i < exItems.length; i++) {
+                    if (startsWith(exItems[i], localPrefix)) {
+                        return Promise.resolve(this.createEmptyList());
+                    }
+                }
+            }
+
+            return apiclientcore.getItems(userId, options);
+        }
+
+        function getItem(userId, itemId) {
+
+            if (itemId) {
+                itemId = itemId.toString();
+            }
+
+            if (startsWith(itemId, localViewPrefix)) {
+
+                var serverInfo = apiclientcore.serverInfo();
+
+                if (serverInfo) {
+                    return localassetmanager.getViews(serverInfo.Id, userId).then(function (items) {
+
+                        var views = items.filter(function (item) {
+                            return item.Id === itemId;
+                        });
+
+                        if (views.length > 0) {
+                            return Promise.resolve(views[0]);
+                        }
+
+                        // TODO: Test consequence of this
+                        return Promise.reject();
+                    });
+                }
+            }
+
+            if (startsWith(itemId, localPrefix)) {
+
+                var serverInfo = apiclientcore.serverInfo();
+
+                if (serverInfo) {
+                    return localassetmanager.getLocalItem(serverInfo.Id, stripStart(itemId, localPrefix)).then(function (item) {
+
+                        item.Item.Id = localPrefix + item.Item.Id;
+
+                        return Promise.resolve(item.Item);
+                    });
+                }
+            }
+
+            return apiclientcore.getItem(userId, itemId);
+        }
+
+        function getThemeMedia(userId, itemId, inherit) {
+
+            if (startsWith(itemId, localViewPrefix) || startsWith(itemId, localPrefix)) {
+                return Promise.reject();
+            }
+
+            return apiclientcore.getThemeMedia(userId, itemId, inherit);
+        }
+
+        function getSimilarItems(itemId, options) {
+
+            if (startsWith(itemId, localPrefix)) {
+                return Promise.resolve(createEmptyList());
+            }
+
+            return apiclientcore.getSimilarItems(itemId, options);
+        }
+
+        function updateFavoriteStatus(userId, itemId, isFavorite) {
+
+            if (startsWith(itemId, localPrefix)) {
+                return Promise.resolve();
+            }
+
+            return apiclientcore.updateFavoriteStatus(userId, itemId, isFavorite);
+        }
+
+        function getScaledImageUrl(itemId, options) {
+
+            if (startsWith(itemId, localPrefix)) {
+
+                var serverInfo = apiclientcore.serverInfo();
+                var id = stripStart(itemId, localPrefix);
+
+                return localassetmanager.getImageUrl(serverInfo.Id, id, options.type, 0);
+            }
+
+
+            return apiclientcore.getScaledImageUrl(itemId, options);
+        }
+
+        function onWebSocketMessage(e, msg) {
+
+            events.trigger(self, 'websocketmessage', [msg]);
+        }
+
+        // **************** Helper functions
+
+        function startsWith(str, find) {
+
+            if (str && find && str.length > find.length) {
+                if (str.indexOf(find) === 0) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        function stripStart(str, find) {
+            if (startsWith(str, find)) {
+                return str.substr(find.length);
+            }
+
+            return str;
+        }
+
+        function createEmptyList() {
+            var result = {
+                Items: new Array(),
+                TotalRecordCount: 0
+            }
+
+            return result;
+        }
+
+        // "Override" methods
+        self.getUserViews = getUserViews;
+        self.getItems = getItems;
+        self.getItem = getItem;
+        self.getThemeMedia = getThemeMedia;
+        self.getSimilarItems = getSimilarItems;
+        self.updateFavoriteStatus = updateFavoriteStatus;
+        self.getScaledImageUrl = getScaledImageUrl;
+
+        // Map "base" methods
+        self.serverAddress = apiclientcore.serverAddress;
+        self.serverInfo = apiclientcore.serverInfo;
+        self.serverId = apiclientcore.serverId;
+        self.getCurrentUser = apiclientcore.getCurrentUser;
+        self.isLoggedIn = apiclientcore.isLoggedIn;
+        self.getCurrentUserId = apiclientcore.getCurrentUserId;
+        self.accessToken = apiclientcore.accessToken;
+        self.deviceName = apiclientcore.deviceName;
+        self.deviceId = apiclientcore.deviceId;
+        self.appName = apiclientcore.appName;
+        self.appVersion = apiclientcore.appVersion;
+        self.clearAuthenticationInfo = apiclientcore.clearAuthenticationInfo;
+        self.setAuthenticationInfo = apiclientcore.setAuthenticationInfo;
+        self.encodeName = apiclientcore.encodeName;
+        self.setRequestHeaders = apiclientcore.setRequestHeaders;
+        self.ajax = apiclientcore.ajax;
+        self.fetch = apiclientcore.fetch;
+        self.getJSON = apiclientcore.getJSON;
+        self.fetchWithFailover = apiclientcore.fetchWithFailover;
+        self.get = apiclientcore.get;
+        self.getUrl = apiclientcore.getUrl;
+        self.updateServerInfo = apiclientcore.updateServerInfo;
+        self.isWebSocketSupported = apiclientcore.isWebSocketSupported;
+        self.ensureWebSocket = apiclientcore.ensureWebSocket;
+        self.openWebSocket = apiclientcore.openWebSocket;
+        self.closeWebSocket = apiclientcore.closeWebSocket;
+        self.sendWebSocketMessage = apiclientcore.sendWebSocketMessage;
+        self.isWebSocketOpen = apiclientcore.isWebSocketOpen;
+        self.isWebSocketOpenOrConnecting = apiclientcore.isWebSocketOpenOrConnecting;
+        self.getProductNews = apiclientcore.getProductNews;
+        self.getDownloadSpeed = apiclientcore.getDownloadSpeed;
+        self.detectBitrate = apiclientcore.detectBitrate;
+        //self.getItem = apiclientcore.getItem;
+        self.getRootFolder = apiclientcore.getRootFolder;
+        self.getNotificationSummary = apiclientcore.getNotificationSummary;
+        self.getNotifications = apiclientcore.getNotifications;
+        self.markNotificationsRead = apiclientcore.markNotificationsRead;
+        self.logout = apiclientcore.logout;
+        self.getRemoteImageProviders = apiclientcore.getRemoteImageProviders;
+        self.getAvailableRemoteImages = apiclientcore.getAvailableRemoteImages;
+        self.downloadRemoteImage = apiclientcore.downloadRemoteImage;
+        self.getLiveTvInfo = apiclientcore.getLiveTvInfo;
+        self.getLiveTvGuideInfo = apiclientcore.getLiveTvGuideInfo;
+        self.getLiveTvChannel = apiclientcore.getLiveTvChannel;
+        self.getLiveTvChannels = apiclientcore.getLiveTvChannels;
+        self.getLiveTvPrograms = apiclientcore.getLiveTvPrograms;
+        self.getLiveTvRecommendedPrograms = apiclientcore.getLiveTvRecommendedPrograms;
+        self.getLiveTvRecordings = apiclientcore.getLiveTvRecordings;
+        self.getLiveTvRecordingSeries = apiclientcore.getLiveTvRecordingSeries;
+        self.getLiveTvRecordingGroups = apiclientcore.getLiveTvRecordingGroups;
+        self.getLiveTvRecordingGroup = apiclientcore.getLiveTvRecordingGroup;
+        self.getLiveTvRecording = apiclientcore.getLiveTvRecording;
+        self.getLiveTvProgram = apiclientcore.getLiveTvProgram;
+        self.deleteLiveTvRecording = apiclientcore.deleteLiveTvRecording;
+        self.cancelLiveTvTimer = apiclientcore.cancelLiveTvTimer;
+        self.getLiveTvTimers = apiclientcore.getLiveTvTimers;
+        self.getLiveTvTimer = apiclientcore.getLiveTvTimer;
+        self.getNewLiveTvTimerDefaults = apiclientcore.getNewLiveTvTimerDefaults;
+        self.createLiveTvTimer = apiclientcore.createLiveTvTimer;
+        self.updateLiveTvTimer = apiclientcore.updateLiveTvTimer;
+        self.resetLiveTvTuner = apiclientcore.resetLiveTvTuner;
+        self.getLiveTvSeriesTimers = apiclientcore.getLiveTvSeriesTimers;
+        self.getFileOrganizationResults = apiclientcore.getFileOrganizationResults;
+        self.deleteOriginalFileFromOrganizationResult = apiclientcore.deleteOriginalFileFromOrganizationResult;
+        self.clearOrganizationLog = apiclientcore.clearOrganizationLog;
+        self.performOrganization = apiclientcore.performOrganization;
+        self.performEpisodeOrganization = apiclientcore.performEpisodeOrganization;
+        self.getLiveTvSeriesTimer = apiclientcore.getLiveTvSeriesTimer;
+        self.cancelLiveTvSeriesTimer = apiclientcore.cancelLiveTvSeriesTimer;
+        self.createLiveTvSeriesTimer = apiclientcore.createLiveTvSeriesTimer;
+        self.updateLiveTvSeriesTimer = apiclientcore.updateLiveTvSeriesTimer;
+        self.getRegistrationInfo = apiclientcore.getRegistrationInfo;
+        self.getSystemInfo = apiclientcore.getSystemInfo;
+        self.getPublicSystemInfo = apiclientcore.getPublicSystemInfo;
+        self.getInstantMixFromItem = apiclientcore.getInstantMixFromItem;
+        self.getEpisodes = apiclientcore.getEpisodes;
+        self.getDisplayPreferences = apiclientcore.getDisplayPreferences;
+        self.updateDisplayPreferences = apiclientcore.updateDisplayPreferences;
+        self.getSeasons = apiclientcore.getSeasons;
+        //self.getSimilarItems = apiclientcore.getSimilarItems;
+        self.getCultures = apiclientcore.getCultures;
+        self.getCountries = apiclientcore.getCountries;
+        self.getPluginSecurityInfo = apiclientcore.getPluginSecurityInfo;
+        self.getDirectoryContents = apiclientcore.getDirectoryContents;
+        self.getNetworkShares = apiclientcore.getNetworkShares;
+        self.getParentPath = apiclientcore.getParentPath;
+        self.getDrives = apiclientcore.getDrives;
+        self.getNetworkDevices = apiclientcore.getNetworkDevices;
+        self.cancelPackageInstallation = apiclientcore.cancelPackageInstallation;
+        self.refreshItem = apiclientcore.refreshItem;
+        self.installPlugin = apiclientcore.installPlugin;
+        self.restartServer = apiclientcore.restartServer;
+        self.shutdownServer = apiclientcore.shutdownServer;
+        self.getPackageInfo = apiclientcore.getPackageInfo;
+        self.getAvailableApplicationUpdate = apiclientcore.getAvailableApplicationUpdate;
+        self.getAvailablePluginUpdates = apiclientcore.getAvailablePluginUpdates;
+        self.getVirtualFolders = apiclientcore.getVirtualFolders;
+        self.getPhysicalPaths = apiclientcore.getPhysicalPaths;
+        self.getServerConfiguration = apiclientcore.getServerConfiguration;
+        self.getDevicesOptions = apiclientcore.getDevicesOptions;
+        self.getContentUploadHistory = apiclientcore.getContentUploadHistory;
+        self.getNamedConfiguration = apiclientcore.getNamedConfiguration;
+        self.getScheduledTasks = apiclientcore.getScheduledTasks;
+        self.startScheduledTask = apiclientcore.startScheduledTask;
+        self.getScheduledTask = apiclientcore.getScheduledTask;
+        self.getNextUpEpisodes = apiclientcore.getNextUpEpisodes;
+        self.stopScheduledTask = apiclientcore.stopScheduledTask;
+        self.getPluginConfiguration = apiclientcore.getPluginConfiguration;
+        self.getAvailablePlugins = apiclientcore.getAvailablePlugins;
+        self.uninstallPlugin = apiclientcore.uninstallPlugin;
+        self.removeVirtualFolder = apiclientcore.removeVirtualFolder;
+        self.addVirtualFolder = apiclientcore.addVirtualFolder;
+        self.updateVirtualFolderOptions = apiclientcore.updateVirtualFolderOptions;
+        self.renameVirtualFolder = apiclientcore.renameVirtualFolder;
+        self.addMediaPath = apiclientcore.addMediaPath;
+        self.updateMediaPath = apiclientcore.updateMediaPath;
+        self.removeMediaPath = apiclientcore.removeMediaPath;
+        self.deleteUser = apiclientcore.deleteUser;
+        self.deleteUserImage = apiclientcore.deleteUserImage;
+        self.deleteItemImage = apiclientcore.deleteItemImage;
+        self.deleteItem = apiclientcore.deleteItem;
+        self.stopActiveEncodings = apiclientcore.stopActiveEncodings;
+        self.reportCapabilities = apiclientcore.reportCapabilities;
+        self.updateItemImageIndex = apiclientcore.updateItemImageIndex;
+        self.getItemImageInfos = apiclientcore.getItemImageInfos;
+        self.getCriticReviews = apiclientcore.getCriticReviews;
+        self.getSessions = apiclientcore.getSessions;
+        self.uploadUserImage = apiclientcore.uploadUserImage;
+        self.uploadItemImage = apiclientcore.uploadItemImage;
+        self.getInstalledPlugins = apiclientcore.getInstalledPlugins;
+        self.getUser = apiclientcore.getUser;
+        self.getOfflineUser = apiclientcore.getOfflineUser;
+        self.getStudio = apiclientcore.getStudio;
+        self.getGenre = apiclientcore.getGenre;
+        self.getMusicGenre = apiclientcore.getMusicGenre;
+        self.getGameGenre = apiclientcore.getGameGenre;
+        self.getArtist = apiclientcore.getArtist;
+        self.getPerson = apiclientcore.getPerson;
+        self.getPublicUsers = apiclientcore.getPublicUsers;
+        self.getUsers = apiclientcore.getUsers;
+        self.getParentalRatings = apiclientcore.getParentalRatings;
+        self.getDefaultImageQuality = apiclientcore.getDefaultImageQuality;
+        self.getUserImageUrl = apiclientcore.getUserImageUrl;
+        self.getImageUrl = apiclientcore.getImageUrl;
+        //self.getScaledImageUrl = apiclientcore.getScaledImageUrl;
+        self.getThumbImageUrl = apiclientcore.getThumbImageUrl;
+        self.authenticateUserByName = apiclientcore.authenticateUserByName;
+        self.updateUserPassword = apiclientcore.updateUserPassword;
+        self.updateEasyPassword = apiclientcore.updateEasyPassword;
+        self.resetUserPassword = apiclientcore.resetUserPassword;
+        self.resetEasyPassword = apiclientcore.resetEasyPassword;
+        self.updateServerConfiguration = apiclientcore.updateServerConfiguration;
+        self.updateNamedConfiguration = apiclientcore.updateNamedConfiguration;
+        self.updateItem = apiclientcore.updateItem;
+        self.updatePluginSecurityInfo = apiclientcore.updatePluginSecurityInfo;
+        self.createUser = apiclientcore.createUser;
+        self.updateUser = apiclientcore.updateUser;
+        self.updateUserPolicy = apiclientcore.updateUserPolicy;
+        self.updateUserConfiguration = apiclientcore.updateUserConfiguration;
+        self.updateScheduledTaskTriggers = apiclientcore.updateScheduledTaskTriggers;
+        self.updatePluginConfiguration = apiclientcore.updatePluginConfiguration;
+        self.getAncestorItems = apiclientcore.getAncestorItems;
+        //self.getItems = apiclientcore.getItems;
+        self.getMovieRecommendations = apiclientcore.getMovieRecommendations;
+        self.getUpcomingEpisodes = apiclientcore.getUpcomingEpisodes;
+        self.getChannels = apiclientcore.getChannels;
+        self.getLatestChannelItems = apiclientcore.getLatestChannelItems;
+        //self.getUserViews = apiclientcore.getUserViews;
+        self.getArtists = apiclientcore.getArtists;
+        self.getAlbumArtists = apiclientcore.getAlbumArtists;
+        self.getGenres = apiclientcore.getGenres;
+        self.getMusicGenres = apiclientcore.getMusicGenres;
+        self.getGameGenres = apiclientcore.getGameGenres;
+        self.getPeople = apiclientcore.getPeople;
+        self.getStudios = apiclientcore.getStudios;
+        self.getLocalTrailers = apiclientcore.getLocalTrailers;
+        self.getGameSystems = apiclientcore.getGameSystems;
+        self.getAdditionalVideoParts = apiclientcore.getAdditionalVideoParts;
+        //self.getThemeMedia = apiclientcore.getThemeMedia;
+        self.getSearchHints = apiclientcore.getSearchHints;
+        self.getSpecialFeatures = apiclientcore.getSpecialFeatures;
+        self.getDateParamValue = apiclientcore.getDateParamValue;
+        self.markPlayed = apiclientcore.markPlayed;
+        self.markUnplayed = apiclientcore.markUnplayed;
+        //self.updateFavoriteStatus = apiclientcore.updateFavoriteStatus;
+        self.updateUserItemRating = apiclientcore.updateUserItemRating;
+        self.getItemCounts = apiclientcore.getItemCounts;
+        self.clearUserItemRating = apiclientcore.clearUserItemRating;
+        self.reportPlaybackStart = apiclientcore.reportPlaybackStart;
+        self.reportPlaybackProgress = apiclientcore.reportPlaybackProgress;
+        self.reportOfflineActions = apiclientcore.reportOfflineActions;
+        self.syncData = apiclientcore.syncData;
+        self.getReadySyncItems = apiclientcore.getReadySyncItems;
+        self.reportSyncJobItemTransferred = apiclientcore.reportSyncJobItemTransferred;
+        self.cancelSyncItems = apiclientcore.cancelSyncItems;
+        self.reportPlaybackStopped = apiclientcore.reportPlaybackStopped;
+        self.sendPlayCommand = apiclientcore.sendPlayCommand;
+        self.sendCommand = apiclientcore.sendCommand;
+        self.sendMessageCommand = apiclientcore.sendMessageCommand;
+        self.sendPlayStateCommand = apiclientcore.sendPlayStateCommand;
+        self.createPackageReview = apiclientcore.createPackageReview;
+        self.getPackageReviews = apiclientcore.getPackageReviews;
+        self.getSmartMatchInfos = apiclientcore.getSmartMatchInfos;
+        self.deleteSmartMatchEntries = apiclientcore.deleteSmartMatchEntries;
+        self.createPin = apiclientcore.createPin;
+        self.getPinStatus = apiclientcore.getPinStatus;
+        self.exchangePin = apiclientcore.exchangePin;
+
+    }
+
+});
\ No newline at end of file
diff --git a/dashboard-ui/components/playerselection.js b/dashboard-ui/components/playerselection.js
new file mode 100644
index 0000000000..d6f8e24615
--- /dev/null
+++ b/dashboard-ui/components/playerselection.js
@@ -0,0 +1,217 @@
+define(['appSettings', 'events', 'browser', 'libraryMenu', 'loading'], function (appSettings, events, browser, libraryMenu, loading) {
+    'use strict';
+
+    var currentDisplayInfo;
+
+    function mirrorItem(info) {
+
+        var item = info.item;
+
+        MediaController.getCurrentPlayer().displayContent({
+
+            ItemName: item.Name,
+            ItemId: item.Id,
+            ItemType: item.Type,
+            Context: info.context
+        });
+    }
+
+    function mirrorIfEnabled(info) {
+
+        info = info || currentDisplayInfo;
+
+        if (info && MediaController.enableDisplayMirroring()) {
+
+            var player = MediaController.getPlayerInfo();
+
+            if (!player.isLocalPlayer && player.supportedCommands.indexOf('DisplayContent') != -1) {
+                mirrorItem(info);
+            }
+        }
+    }
+
+    function showPlayerSelection(button, enableHistory) {
+
+        var playerInfo = MediaController.getPlayerInfo();
+
+        if (!playerInfo.isLocalPlayer) {
+            showActivePlayerMenu(playerInfo);
+            return;
+        }
+
+        loading.show();
+
+        MediaController.getTargets().then(function (targets) {
+
+            var menuItems = targets.map(function (t) {
+
+                var name = t.name;
+
+                if (t.appName && t.appName != t.name) {
+                    name += " - " + t.appName;
+                }
+
+                return {
+                    name: name,
+                    id: t.id,
+                    selected: playerInfo.id == t.id
+                };
+
+            });
+
+            require(['actionsheet'], function (actionsheet) {
+
+                loading.hide();
+
+                var menuOptions = {
+                    title: Globalize.translate('HeaderSelectPlayer'),
+                    items: menuItems,
+                    positionTo: button,
+
+                    resolveOnClick: true
+
+                };
+
+                // Unfortunately we can't allow the url to change or chromecast will throw a security error
+                // Might be able to solve this in the future by moving the dialogs to hashbangs
+                if (!((enableHistory !== false && !browser.chrome) || AppInfo.isNativeApp)) {
+                    menuOptions.enableHistory = false;
+                }
+
+                actionsheet.show(menuOptions).then(function (id) {
+
+                    var target = targets.filter(function (t) {
+                        return t.id == id;
+                    })[0];
+
+                    MediaController.trySetActivePlayer(target.playerName, target);
+
+                    mirrorIfEnabled();
+
+                });
+            });
+        });
+    }
+
+    function showActivePlayerMenu(playerInfo) {
+
+        require(['dialogHelper', 'dialog', 'emby-checkbox', 'emby-button'], function (dialogHelper) {
+            showActivePlayerMenuInternal(dialogHelper, playerInfo);
+        });
+    }
+
+    function showActivePlayerMenuInternal(dialogHelper, playerInfo) {
+
+        var html = '';
+
+        var dialogOptions = {
+            removeOnClose: true
+        };
+
+        dialogOptions.modal = false;
+        dialogOptions.entryAnimationDuration = 160;
+        dialogOptions.exitAnimationDuration = 160;
+        dialogOptions.autoFocus = false;
+
+        var dlg = dialogHelper.createDialog(dialogOptions);
+
+        dlg.classList.add('promptDialog');
+
+        html += '<div class="promptDialogContent" style="padding:1.5em;">';
+        html += '<h2 style="margin-top:.5em;">';
+        html += (playerInfo.deviceName || playerInfo.name);
+        html += '</h2>';
+
+        html += '<div>';
+
+        if (playerInfo.supportedCommands.indexOf('DisplayContent') != -1) {
+
+            html += '<label class="checkboxContainer">';
+            var checkedHtml = MediaController.enableDisplayMirroring() ? ' checked' : '';
+            html += '<input type="checkbox" is="emby-checkbox" class="chkMirror"' + checkedHtml + '/>';
+            html += '<span>' + Globalize.translate('OptionEnableDisplayMirroring') + '</span>';
+            html += '</label>';
+        }
+
+        html += '</div>';
+
+        html += '<div style="margin-top:1em;display:flex;justify-content: flex-end;">';
+
+        html += '<button is="emby-button" type="button" class="button-flat button-accent-flat btnRemoteControl promptDialogButton">' + Globalize.translate('ButtonRemoteControl') + '</button>';
+        html += '<button is="emby-button" type="button" class="button-flat button-accent-flat btnDisconnect promptDialogButton ">' + Globalize.translate('ButtonDisconnect') + '</button>';
+        html += '<button is="emby-button" type="button" class="button-flat button-accent-flat btnCancel promptDialogButton">' + Globalize.translate('ButtonCancel') + '</button>';
+        html += '</div>';
+
+        html += '</div>';
+        dlg.innerHTML = html;
+
+        var chkMirror = dlg.querySelector('.chkMirror');
+
+        if (chkMirror) {
+            chkMirror.addEventListener('change', onMirrorChange);
+        }
+
+        var destination = '';
+
+        var btnRemoteControl = dlg.querySelector('.btnRemoteControl');
+        if (btnRemoteControl) {
+            btnRemoteControl.addEventListener('click', function () {
+                destination = 'nowplaying.html';
+                dialogHelper.close(dlg);
+            });
+        }
+
+        dlg.querySelector('.btnDisconnect').addEventListener('click', function () {
+            MediaController.disconnectFromPlayer();
+            dialogHelper.close(dlg);
+        });
+
+        dlg.querySelector('.btnCancel').addEventListener('click', function () {
+            dialogHelper.close(dlg);
+        });
+
+        dialogHelper.open(dlg).then(function () {
+            if (destination) {
+                Dashboard.navigate(destination);
+            }
+        });
+    }
+
+    function onMirrorChange() {
+        MediaController.enableDisplayMirroring(this.checked);
+    }
+
+    function onCastButtonClicked() {
+
+        showPlayerSelection(this);
+    }
+
+    function bindCastButton() {
+        var btnCast = document.querySelector('.headerButton-btnCast');
+
+        if (btnCast) {
+            btnCast.removeEventListener('click', onCastButtonClicked);
+            btnCast.addEventListener('click', onCastButtonClicked);
+        }
+    }
+
+    document.addEventListener('headercreated', bindCastButton);
+    bindCastButton();
+
+    pageClassOn('pagebeforeshow', "page", function () {
+
+        var page = this;
+
+        currentDisplayInfo = null;
+    });
+
+    pageClassOn('displayingitem', "libraryPage", function (e) {
+
+        var info = e.detail;
+        mirrorIfEnabled(info);
+    });
+
+    return {
+        show: showPlayerSelection
+    };
+});
\ No newline at end of file
diff --git a/dashboard-ui/components/remotecontrol.js b/dashboard-ui/components/remotecontrol.js
index 9ea80c70ba..54cf846430 100644
--- a/dashboard-ui/components/remotecontrol.js
+++ b/dashboard-ui/components/remotecontrol.js
@@ -748,7 +748,9 @@
             context.querySelector('.typeTextForm').addEventListener('submit', onSendStringSubmit);
 
             context.querySelector('.nowPlayingCastIcon').addEventListener('click', function () {
-                MediaController.showPlayerSelection();
+                require(['playerSelectionMenu'], function (playerSelectionMenu) {
+                    playerSelectionMenu.show();
+                });
             });
 
             context.querySelector('.btnExitRemoteControl').addEventListener('click', function () {
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 8808f8fe80..da2784635c 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -27,7 +27,7 @@
         html += '<div class="viewMenuSecondary">';
 
         html += '<span class="headerSelectedPlayer"></span>';
-        html += '<button is="paper-icon-button-light" class="btnCast headerButton headerButtonRight hide autoSize"><i class="md-icon">cast</i></button>';
+        html += '<button is="paper-icon-button-light" class="btnCast headerButton-btnCast headerButton headerButtonRight hide autoSize"><i class="md-icon">cast</i></button>';
 
         html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonRight headerSearchButton hide autoSize"><i class="md-icon">search</i></button>';
 
diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index 73e7dfaccb..27d3b421c4 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -1,36 +1,8 @@
 define(['appSettings', 'events', 'browser'], function (appSettings, events, browser) {
     'use strict';
 
-    var currentDisplayInfo;
     var datetime;
 
-    function mirrorItem(info) {
-
-        var item = info.item;
-
-        MediaController.getCurrentPlayer().displayContent({
-
-            ItemName: item.Name,
-            ItemId: item.Id,
-            ItemType: item.Type,
-            Context: info.context
-        });
-    }
-
-    function mirrorIfEnabled(info) {
-
-        info = info || currentDisplayInfo;
-
-        if (info && MediaController.enableDisplayMirroring()) {
-
-            var player = MediaController.getPlayerInfo();
-
-            if (!player.isLocalPlayer && player.supportedCommands.indexOf('DisplayContent') != -1) {
-                mirrorItem(info);
-            }
-        }
-    }
-
     function monitorPlayer(player) {
 
         events.on(player, 'playbackstart', function (e, state) {
@@ -67,157 +39,6 @@
         });
     }
 
-    function showPlayerSelection(button, enableHistory) {
-
-        var playerInfo = MediaController.getPlayerInfo();
-
-        if (!playerInfo.isLocalPlayer) {
-            showActivePlayerMenu(playerInfo);
-            return;
-        }
-
-        Dashboard.showLoadingMsg();
-
-        MediaController.getTargets().then(function (targets) {
-
-            var menuItems = targets.map(function (t) {
-
-                var name = t.name;
-
-                if (t.appName && t.appName != t.name) {
-                    name += " - " + t.appName;
-                }
-
-                return {
-                    name: name,
-                    id: t.id,
-                    selected: playerInfo.id == t.id
-                };
-
-            });
-
-            require(['actionsheet'], function (actionsheet) {
-
-                Dashboard.hideLoadingMsg();
-
-                var menuOptions = {
-                    title: Globalize.translate('HeaderSelectPlayer'),
-                    items: menuItems,
-                    positionTo: button,
-
-                    resolveOnClick: true
-
-                };
-
-                // Unfortunately we can't allow the url to change or chromecast will throw a security error
-                // Might be able to solve this in the future by moving the dialogs to hashbangs
-                if (!((enableHistory !== false && !browser.chrome) || AppInfo.isNativeApp)) {
-                    menuOptions.enableHistory = false;
-                }
-
-                actionsheet.show(menuOptions).then(function (id) {
-
-                    var target = targets.filter(function (t) {
-                        return t.id == id;
-                    })[0];
-
-                    MediaController.trySetActivePlayer(target.playerName, target);
-
-                    mirrorIfEnabled();
-
-                });
-            });
-        });
-    }
-
-    function showActivePlayerMenu(playerInfo) {
-
-        require(['dialogHelper', 'dialog', 'emby-checkbox', 'emby-button'], function (dialogHelper) {
-            showActivePlayerMenuInternal(dialogHelper, playerInfo);
-        });
-    }
-
-    function showActivePlayerMenuInternal(dialogHelper, playerInfo) {
-
-        var html = '';
-
-        var dialogOptions = {
-            removeOnClose: true
-        };
-
-        dialogOptions.modal = false;
-        dialogOptions.entryAnimationDuration = 160;
-        dialogOptions.exitAnimationDuration = 160;
-        dialogOptions.autoFocus = false;
-
-        var dlg = dialogHelper.createDialog(dialogOptions);
-
-        dlg.classList.add('promptDialog');
-
-        html += '<div class="promptDialogContent" style="padding:1.5em;">';
-        html += '<h2 style="margin-top:.5em;">';
-        html += (playerInfo.deviceName || playerInfo.name);
-        html += '</h2>';
-
-        html += '<div>';
-
-        if (playerInfo.supportedCommands.indexOf('DisplayContent') != -1) {
-
-            html += '<label class="checkboxContainer">';
-            var checkedHtml = MediaController.enableDisplayMirroring() ? ' checked' : '';
-            html += '<input type="checkbox" is="emby-checkbox" class="chkMirror"' + checkedHtml + '/>';
-            html += '<span>' + Globalize.translate('OptionEnableDisplayMirroring') + '</span>';
-            html += '</label>';
-        }
-
-        html += '</div>';
-
-        html += '<div style="margin-top:1em;display:flex;justify-content: flex-end;">';
-
-        html += '<button is="emby-button" type="button" class="button-flat button-accent-flat btnRemoteControl promptDialogButton">' + Globalize.translate('ButtonRemoteControl') + '</button>';
-        html += '<button is="emby-button" type="button" class="button-flat button-accent-flat btnDisconnect promptDialogButton ">' + Globalize.translate('ButtonDisconnect') + '</button>';
-        html += '<button is="emby-button" type="button" class="button-flat button-accent-flat btnCancel promptDialogButton">' + Globalize.translate('ButtonCancel') + '</button>';
-        html += '</div>';
-
-        html += '</div>';
-        dlg.innerHTML = html;
-
-        var chkMirror = dlg.querySelector('.chkMirror');
-
-        if (chkMirror) {
-            chkMirror.addEventListener('change', onMirrorChange);
-        }
-
-        var destination = '';
-
-        var btnRemoteControl = dlg.querySelector('.btnRemoteControl');
-        if (btnRemoteControl) {
-            btnRemoteControl.addEventListener('click', function () {
-                destination = 'nowplaying.html';
-                dialogHelper.close(dlg);
-            });
-        }
-
-        dlg.querySelector('.btnDisconnect').addEventListener('click', function () {
-            MediaController.disconnectFromPlayer();
-            dialogHelper.close(dlg);
-        });
-
-        dlg.querySelector('.btnCancel').addEventListener('click', function () {
-            dialogHelper.close(dlg);
-        });
-
-        dialogHelper.open(dlg).then(function () {
-            if (destination) {
-                Dashboard.navigate(destination);
-            }
-        });
-    }
-
-    function onMirrorChange() {
-        MediaController.enableDisplayMirroring(this.checked);
-    }
-
     function mediaController() {
 
         var self = this;
@@ -1021,8 +842,6 @@
                 }
             });
         };
-
-        self.showPlayerSelection = showPlayerSelection;
     }
 
     window.MediaController = new mediaController();
@@ -1057,30 +876,4 @@
             initializeApiClient(apiClient);
         });
     };
-
-    function onCastButtonClicked() {
-
-        showPlayerSelection(this);
-    }
-
-    document.addEventListener('headercreated', function () {
-
-        var btnCast = document.querySelector('.viewMenuBar .btnCast');
-        btnCast.removeEventListener('click', onCastButtonClicked);
-        btnCast.addEventListener('click', onCastButtonClicked);
-    });
-
-    pageClassOn('pagebeforeshow', "page", function () {
-
-        var page = this;
-
-        currentDisplayInfo = null;
-    });
-
-    pageClassOn('displayingitem', "libraryPage", function (e) {
-
-        var info = e.detail;
-        mirrorIfEnabled(info);
-    });
-
 });
\ No newline at end of file
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index e33ac6d98b..3291d91b85 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -727,7 +727,7 @@
             html += '<input type="range" is="emby-slider" pin step="1" min="0" max="100" value="0" class="videoVolumeSlider"/>';
             html += '</div>'; // guide
 
-            html += '<button is="paper-icon-button-light" class="mediaButton castButton autoSize" onclick="MediaController.showPlayerSelection(this, false);"><i class="md-icon">cast</i></button>';
+            html += '<button is="paper-icon-button-light" class="mediaButton castButton autoSize" onclick="MediaPlayer.showPlayerSelection(this);"><i class="md-icon">cast</i></button>';
             html += '<button is="paper-icon-button-light" class="mediaButton fullscreenButton autoSize" onclick="MediaPlayer.toggleFullscreen();" id="video-fullscreenButton"><i class="md-icon">fullscreen</i></button>';
             html += '<button is="paper-icon-button-light" class="mediaButton infoButton autoSize" onclick="MediaPlayer.toggleInfo();"><i class="md-icon">info</i></button>';
 
@@ -941,6 +941,12 @@
             }
         }
 
+        self.showPlayerSelection = function (button) {
+            require(['playerSelectionMenu'], function (playerSelectionMenu) {
+                playerSelectionMenu.show(button, false);
+            });
+        };
+
         // Replace audio version
         self.cleanup = function (mediaRenderer) {
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index d2d077b221..0106f21ffe 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1239,6 +1239,7 @@ var AppInfo = {};
         define("directorybrowser", ["components/directorybrowser/directorybrowser"], returnFirstDependency);
         define("metadataEditor", [embyWebComponentsBowerPath + "/metadataeditor/metadataeditor"], returnFirstDependency);
         define("personEditor", [embyWebComponentsBowerPath + "/metadataeditor/personeditor"], returnFirstDependency);
+        define("playerSelectionMenu", ["components/playerselection"], returnFirstDependency);
 
         define("libraryMenu", ["scripts/librarymenu"], returnFirstDependency);
 
@@ -2731,6 +2732,8 @@ var AppInfo = {};
                 }
             }
 
+            postInitDependencies.push('playerSelectionMenu');
+
             require(postInitDependencies);
             upgradeLayouts();
             initAutoSync();