diff --git a/dashboard-ui/apiclient/apiclient.js b/dashboard-ui/apiclient/apiclient.js
index ee97b79e78..0b699b697c 100644
--- a/dashboard-ui/apiclient/apiclient.js
+++ b/dashboard-ui/apiclient/apiclient.js
@@ -1800,7 +1800,7 @@
        * Adds a virtual folder
        * @param {String} name
        */
-        self.addVirtualFolder = function (name, type, refreshLibrary, initialPath) {
+        self.addVirtualFolder = function (name, type, refreshLibrary, initialPaths) {
 
             if (!name) {
                 throw new Error("null name");
@@ -1822,9 +1822,10 @@
             return self.ajax({
                 type: "POST",
                 url: url,
-                data: {
-                    Path: initialPath
-                }
+                data: JSON.stringify({
+                    Paths: initialPaths
+                }),
+                contentType: 'application/json'
             });
         };
 
diff --git a/dashboard-ui/components/imagedownloader/imagedownloader.js b/dashboard-ui/components/imagedownloader/imagedownloader.js
index 45c3ca5f89..61b46ca8c1 100644
--- a/dashboard-ui/components/imagedownloader/imagedownloader.js
+++ b/dashboard-ui/components/imagedownloader/imagedownloader.js
@@ -106,7 +106,7 @@
             html += '<div data-role="controlgroup" data-type="horizontal" style="display:inline-block;">';
 
             html += '<paper-icon-button icon="arrow-back" title="' + Globalize.translate('ButtonPreviousPage') + '" class="btnPreviousPage" ' + (startIndex ? '' : 'disabled') + '></paper-icon-button>';
-            html += '<paper-icon-button icon="arrow-forward" title="' + Globalize.translate('ButtonNextPage') + '" class="btnNextPage" ' + (startIndex + limit > totalRecordCount ? 'disabled' : '') + '></paper-icon-button>';
+            html += '<paper-icon-button icon="arrow-forward" title="' + Globalize.translate('ButtonNextPage') + '" class="btnNextPage" ' + (startIndex + limit >= totalRecordCount ? 'disabled' : '') + '></paper-icon-button>';
             html += '</div>';
         }
 
diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
index b7f3789dbd..7614d08019 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
@@ -3,21 +3,28 @@
     var currentDeferred;
     var hasChanges;
     var currentOptions;
+    var paths = [];
 
     function onSubmit() {
 
+        if (paths.length == 0) {
+            Dashboard.alert({
+                message: Globalize.translate('PleaseAddAtLeastOneFolder')
+            });
+            return false;
+        }
+
         var form = this;
         var dlg = $(form).parents('paper-dialog')[0];
 
         var name = $('#txtValue', form).val();
         var type = $('#selectCollectionType', form).val();
-        var path = $('#txtPath', form).val();
 
         if (type == 'mixed') {
             type = null;
         }
 
-        ApiClient.addVirtualFolder(name, type, currentOptions.refresh, path).done(function () {
+        ApiClient.addVirtualFolder(name, type, currentOptions.refresh, paths).done(function () {
 
             hasChanges = true;
             PaperDialogHelper.close(dlg);
@@ -74,26 +81,90 @@
             }
         });
 
-        $('#btnSelectPath').on('click', function () {
+        $('.btnAddFolder', page).on('click', onAddButtonClick);
+        $('form', page).off('submit', onSubmit).on('submit', onSubmit);
+    }
 
-            require(['directorybrowser'], function (directoryBrowser) {
+    function onAddButtonClick() {
 
-                var picker = new directoryBrowser();
+        var page = $(this).parents('.editorContent')[0];
 
-                picker.show({
+        require(['directorybrowser'], function (directoryBrowser) {
 
-                    callback: function (path) {
-                        if (path) {
-                            $('#txtPath', page).val(path);
-                        }
-                        picker.close();
+            var picker = new directoryBrowser();
+
+            picker.show({
+
+                callback: function (path) {
+
+                    if (path) {
+                        addMediaLocation(page, path);
                     }
+                    picker.close();
+                }
 
-                });
             });
         });
+    }
 
-        $('form', page).off('submit', onSubmit).on('submit', onSubmit);
+    function getFolderHtml(path, index) {
+
+        var html = '';
+
+        html += '<paper-icon-item role="menuitem" class="lnkPath">';
+
+        html += '<paper-fab class="listAvatar" style="background:#52B54B;" icon="folder" item-icon></paper-fab>';
+
+        html += '<paper-item-body>';
+        html += path;
+        html += '</paper-item-body>';
+
+        html += '<paper-icon-button icon="remove-circle" class="btnRemovePath" data-index="' + index + '"></paper-icon-button>';
+
+        html += '</paper-icon-item>';
+
+        return html;
+    }
+
+    function renderPaths(page) {
+        var foldersHtml = paths.map(getFolderHtml).join('');
+
+        var folderList = page.querySelector('.folderList');
+        folderList.innerHTML = foldersHtml;
+
+        if (foldersHtml) {
+            folderList.classList.remove('hide');
+        } else {
+            folderList.classList.add('hide');
+        }
+
+        $(page.querySelectorAll('.btnRemovePath')).on('click', onRemoveClick);
+    }
+
+    function addMediaLocation(page, path) {
+
+        if (paths.filter(function (p) {
+
+            return p.toLowerCase() == path.toLowerCase();
+
+        }).length == 0) {
+            paths.push(path);
+            renderPaths(page);
+        }
+    }
+
+    function onRemoveClick() {
+
+        var button = this;
+        var index = parseInt(button.getAttribute('data-index'));
+
+        var location = paths[index];
+        paths = paths.filter(function (p) {
+
+            return p.toLowerCase() != location.toLowerCase();
+        });
+        var page = $(this).parents('.editorContent')[0];
+        renderPaths(page);
     }
 
     function onDialogClosed() {
@@ -156,6 +227,8 @@
 
                         PaperDialogHelper.close(dlg);
                     });
+
+                    renderPaths(editorContent);
                 });
 
             });
diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
index d6b39c0f36..921666e3bd 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
@@ -9,11 +9,16 @@
     <div>
         <paper-input type="text" id="txtValue" required="required" label="${LabelDisplayName}"></paper-input>
     </div>
+    <br />
     <div>
-        <paper-input type="text" id="txtPath" required="required" label="${LabelFolder}" style="display: inline-block;width:84%;"></paper-input>
-        <paper-icon-button id="btnSelectPath" icon="search"></paper-icon-button>
-        <div class="fieldDescription">${LabelAdditionalFoldersCanBeAddedHelp}</div>
+        <h1 style="display:inline-block;vertical-align:middle;">${HeadersFolders}</h1>
+        <paper-button raised class="btnAddFolder submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+            <iron-icon icon="add"></iron-icon>
+            <span>${ButtonAdd}</span>
+        </paper-button>
     </div>
+    <div class="paperList folderList hide" style="padding: .7em 0;"></div>
+
     <br />
     <div>
         <button type="submit" class="clearButton" data-role="none">
diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css
index ca787fb0d4..237ceecccb 100644
--- a/dashboard-ui/css/card.css
+++ b/dashboard-ui/css/card.css
@@ -200,6 +200,10 @@
         background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,0.75) 100%) !important; /* W3C */
     }
 
+        .cardContent .cardFooter:not(.fullCardFooter) {
+            background: rgba(0, 0, 0, .5) !important;
+        }
+
 .lightCardFooter {
     background: -moz-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,0.7) 100%) !important; /* FF3.6+ */
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,0)), color-stop(100%,rgba(0,0,0,0.7))) !important; /* Chrome,Safari4+ */
@@ -247,7 +251,7 @@
 }
 
 .cardContent .cardFooter .cardText {
-    font-size: 14px;
+    font-size: 16px;
 }
 
 .cardOverlayInner {
diff --git a/dashboard-ui/scripts/backdrops.js b/dashboard-ui/scripts/backdrops.js
index f43a4c5b11..f52733bd33 100644
--- a/dashboard-ui/scripts/backdrops.js
+++ b/dashboard-ui/scripts/backdrops.js
@@ -240,7 +240,8 @@
 
         setBackdrops: setBackdrops,
         setBackdropUrl: setBackdropUrl,
-        setDefault: setDefault
+        setDefault: setDefault,
+        clear: clearBackdrop
     };
 
 })(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js
index e2f491ce92..3f845af7ea 100644
--- a/dashboard-ui/scripts/itemlistpage.js
+++ b/dashboard-ui/scripts/itemlistpage.js
@@ -1,7 +1,5 @@
 (function ($, document) {
 
-    var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
-
     var currentItem;
 
     var data = {};
@@ -25,7 +23,7 @@
 
             pageData.query.Filters = "";
             pageData.query.NameStartsWithOrGreater = '';
-            pageData.view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
+            pageData.view = LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
 
             pageData.query.ParentId = getParameterByName('parentId');
             LibraryBrowser.loadSavedQueryValues(key, pageData.query);
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index e413a9c93b..8b63d742ad 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -2048,7 +2048,7 @@
 
             html += '<div class="cardOverlayTarget"></div>';
 
-            if (item.LocationType == "Offline" || item.LocationType == "Virtual") {
+            if (item.LocationType == "Virtual") {
                 if (options.showLocationTypeIndicator !== false) {
                     html += LibraryBrowser.getOfflineIndicatorHtml(item);
                 }
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index 7295ac313c..4a3a9e3f13 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -125,7 +125,7 @@
                     preferThumb: true,
                     shape: getThumbShape(),
                     overlayText: true,
-                    showTitle: true,
+                    showTitle: false,
                     lazy: true,
                     showDetailsMenu: true,
                     overlayPlayButton: true
diff --git a/dashboard-ui/scripts/photos.js b/dashboard-ui/scripts/photos.js
index 4222cc3b67..a577adb191 100644
--- a/dashboard-ui/scripts/photos.js
+++ b/dashboard-ui/scripts/photos.js
@@ -60,7 +60,7 @@
                     items: result.Items,
                     shape: "square",
                     context: getParameterByName('context') || 'photos',
-                    overlayText: tabIndex != 0,
+                    overlayText: true,
                     lazy: true,
                     coverImage: true,
                     showTitle: tabIndex == 0,
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index bd9af86347..68002782a8 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -244,6 +244,7 @@ var Dashboard = {
 
     importCss: function (url) {
 
+        var originalUrl = url;
         url += "?v=" + window.dashboardVersion;
 
         if (!Dashboard.importedCss) {
@@ -261,12 +262,21 @@ var Dashboard = {
         } else {
             var link = document.createElement('link');
             link.setAttribute('rel', 'stylesheet');
+            link.setAttribute('data-url', originalUrl);
             link.setAttribute('type', 'text/css');
             link.setAttribute('href', url);
             document.head.appendChild(link);
         }
     },
 
+    removeStylesheet: function (url) {
+
+        var elem = document.querySelector('link[data-url=\'' + url + '\']');
+        if (elem) {
+            elem.parentNode.removeChild(elem);
+        }
+    },
+
     showError: function (message) {
 
         Dashboard.alert(message);
diff --git a/dashboard-ui/scripts/userlibraryaccess.js b/dashboard-ui/scripts/userlibraryaccess.js
index 87496e655d..dbe30512ee 100644
--- a/dashboard-ui/scripts/userlibraryaccess.js
+++ b/dashboard-ui/scripts/userlibraryaccess.js
@@ -90,6 +90,12 @@
         $('.deviceAccess', page).show().html(html).trigger('create');
 
         $('#chkEnableAllDevices', page).checked(user.Policy.EnableAllDevices).checkboxradio('refresh').trigger('change');
+
+        if (user.Policy.IsAdministrator) {
+            page.querySelector('.deviceAccessContainer').classList.add('hide');
+        } else {
+            page.querySelector('.deviceAccessContainer').classList.remove('hide');
+        }
     }
 
     function loadUser(page, user, loggedInUser, mediaFolders, channels, devices) {
diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json
index 1aaa552893..f850ced555 100644
--- a/dashboard-ui/strings/html/server.json
+++ b/dashboard-ui/strings/html/server.json
@@ -1539,7 +1539,6 @@
     "ButtonClear": "Clear",
     "ButtonEditImages": "Edit Images",
     "LabelFolder": "Folder:",
-    "LabelAdditionalFoldersCanBeAddedHelp": "Additional folders can be added to this library after setting it up.",
     "HeadersFolders": "Folders",
     "LabelDisplayName": "Display name:"
 }
diff --git a/dashboard-ui/strings/javascript/javascript.json b/dashboard-ui/strings/javascript/javascript.json
index 109b82688a..50b0485142 100644
--- a/dashboard-ui/strings/javascript/javascript.json
+++ b/dashboard-ui/strings/javascript/javascript.json
@@ -397,7 +397,7 @@
     "LabelPremiereProgram": "PREMIERE",
     "LabelHDProgram": "HD",
     "HeaderChangeFolderType": "Change Content Type",
-    "HeaderChangeFolderTypeHelp": "To change the type, please remove and rebuild the folder with the new type.",
+    "HeaderChangeFolderTypeHelp": "To change the type, please remove and rebuild the library with the new type.",
     "HeaderAlert": "Alert",
     "MessagePleaseRestart": "Please restart to finish updating.",
     "ButtonRestart": "Restart",
@@ -921,5 +921,6 @@
     "TryDragAndDropMessage": "To re-arrange playlist items, just drag and drop. Try it!",
     "HeaderTryMicrosoftEdge": "Try Microsoft Edge",
     "MessageTryMicrosoftEdge": "For a better experience on Windows 10, try the new Microsoft Edge Browser.",
-    "ErrorAddingListingsToSchedulesDirect": "There was an error adding the lineup to your Schedules Direct account. Schedules Direct only allows a limited number of lineups per account. You may need to log into the Schedules Direct website and remove others listings from your account before proceeeding."
+    "ErrorAddingListingsToSchedulesDirect": "There was an error adding the lineup to your Schedules Direct account. Schedules Direct only allows a limited number of lineups per account. You may need to log into the Schedules Direct website and remove others listings from your account before proceeeding.",
+    "PleaseAddAtLeastOneFolder": "Please add at least one folder to this library by clicking the Add button."
 }
diff --git a/dashboard-ui/themes/halloween/style.css b/dashboard-ui/themes/halloween/style.css
index a4b522850c..60fb7ebc1a 100644
--- a/dashboard-ui/themes/halloween/style.css
+++ b/dashboard-ui/themes/halloween/style.css
@@ -2,7 +2,7 @@
     color: #FF9100;
 }
 
-.viewMenuBar {
+.viewMenuBar, .halloweenInfoButton {
     color: #FF9100 !important;
 }
 
diff --git a/dashboard-ui/themes/halloween/theme.js b/dashboard-ui/themes/halloween/theme.js
index 98aa48da18..61d56cc446 100644
--- a/dashboard-ui/themes/halloween/theme.js
+++ b/dashboard-ui/themes/halloween/theme.js
@@ -1,26 +1,97 @@
 (function () {
 
-    Dashboard.importCss('themes/halloween/style.css');
-
     var lastSound = 0;
+    var iconCreated;
+    var destroyed;
+    var currentSound;
+    var cancelKey = 'cancelHalloween';
+    var cancelValue = '5';
 
     function onPageShow() {
         var page = this;
 
-        if (!$.browser.mobile) {
+        if (!destroyed) {
 
-            if (!page.classList.contains('itemDetailPage')) {
-                Backdrops.setBackdropUrl(page, 'themes/halloween/bg.jpg');
+            if (appStorage.getItem(cancelKey) == cancelValue) {
+
+                destroyed = true;
+                return;
             }
 
-            if (lastSound == 0) {
-                playSound('http://github.com/MediaBrowser/Emby.Resources/raw/master/themes/halloween/monsterparadefade.mp3', .1);
-            } else if ((new Date().getTime() - lastSound) > 30000) {
-                playSound('http://github.com/MediaBrowser/Emby.Resources/raw/master/themes/halloween/howl.wav');
+            Dashboard.importCss('themes/halloween/style.css');
+
+            if (!$.browser.mobile) {
+
+                if (!page.classList.contains('itemDetailPage')) {
+                    Backdrops.setBackdropUrl(page, 'themes/halloween/bg.jpg');
+                }
+
+                if (lastSound == 0) {
+                    playSound('http://github.com/MediaBrowser/Emby.Resources/raw/master/themes/halloween/monsterparadefade.mp3', .1);
+                } else if ((new Date().getTime() - lastSound) > 30000) {
+                    playSound('http://github.com/MediaBrowser/Emby.Resources/raw/master/themes/halloween/howl.wav');
+                }
             }
+
+            addIcon();
         }
     }
 
+    function addIcon() {
+
+        if (iconCreated) {
+            return;
+        }
+
+        iconCreated = true;
+
+        var elem = document.createElement('paper-icon-button');
+        elem.icon = 'info';
+        elem.classList.add('halloweenInfoButton');
+        $(elem).on('click', onIconClick);
+
+        var viewMenuSecondary = document.querySelector('.viewMenuSecondary');
+
+        if (viewMenuSecondary) {
+            viewMenuSecondary.insertBefore(elem, viewMenuSecondary.childNodes[0]);
+        }
+    }
+
+    function onIconClick() {
+
+        Dashboard.dialog({
+
+            title: "Happy Halloween",
+            message: "Happy Halloween from the Emby Team. We hope your Halloween is spooktacular! Would you like to allow the Halloween theme to continue?",
+            callback: function (result) {
+
+                if (result == 1) {
+                    destroyTheme();
+                }
+            },
+
+            buttons: [Globalize.translate('ButtonYes'), Globalize.translate('ButtonNo')]
+        });
+    }
+
+    function destroyTheme() {
+
+        destroyed = true;
+
+        var halloweenInfoButton = document.querySelector('.halloweenInfoButton');
+        if (halloweenInfoButton) {
+            halloweenInfoButton.parentNode.removeChild(halloweenInfoButton);
+        }
+
+        if (currentSound) {
+            currentSound.stop();
+        }
+
+        Dashboard.removeStylesheet('themes/halloween/style.css');
+        Backdrops.clear();
+        appStorage.setItem(cancelKey, cancelValue);
+    }
+
     pageClassOn('pageshow', "libraryPage", onPageShow);
 
     if ($($.mobile.activePage)[0].classList.contains('libraryPage')) {
@@ -37,6 +108,7 @@
             });
 
             sound.play();
+            currentSound = sound;
             lastSound = new Date().getTime();
         });
     }
diff --git a/dashboard-ui/userlibraryaccess.html b/dashboard-ui/userlibraryaccess.html
index a8b4460bf5..c67f264b83 100644
--- a/dashboard-ui/userlibraryaccess.html
+++ b/dashboard-ui/userlibraryaccess.html
@@ -45,8 +45,8 @@
                         </div>
                     </div>
                     <br />
-                    <br />
-                    <div>
+                    <div class="deviceAccessContainer hide">
+                        <br />
                         <div class="ui-controlgroup-label">${HeaderDeviceAccess}</div>
                         <div>
                             <label for="chkEnableAllDevices">${OptionEnableAccessFromAllDevices}</label>