diff --git a/dashboard-ui/channelsettings.html b/dashboard-ui/channelsettings.html
index adfaed4dc9..28320706ca 100644
--- a/dashboard-ui/channelsettings.html
+++ b/dashboard-ui/channelsettings.html
@@ -47,6 +47,11 @@
                                 <button id="btnSelectCachePath" type="button" data-icon="search" data-iconpos="notext" data-inline="true">${ButtonSelectDirectory}</button>
                                 <div class="fieldDescription">${LabelChannelDownloadPathHelp}</div>
                             </li>
+                            <li>
+                                <label for="txtDownloadSizeLimit">${LabelChannelDownloadSizeLimit}</label>
+                                <input type="number" id="txtDownloadSizeLimit" pattern="[0-9]*" min="0.1" step=".1" data-mini="true" />
+                                <div class="fieldDescription">${LabelChannelDownloadSizeLimitHelp}</div>
+                            </li>
                             <li>
                                 <label for="txtDownloadAge">${LabelChannelDownloadAge}</label>
                                 <input type="number" id="txtDownloadAge" pattern="[0-9]*" min="1" data-mini="true" />
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 6b330cbd51..1ddcd415a0 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -121,7 +121,7 @@
 @media all and (min-width: 1600px) {
 
     .ehsContent {
-        width: 1440px;
+        width: 1500px;
     }
 }
 
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index 5f53956af5..629b34cb83 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -245,7 +245,7 @@
     background-image: url(images/items/folders/homevideos.png);
 }
 
-.generalViewMenu, .boxsetsViewMenu, .playlistsViewMenu {
+.generalViewMenu, .boxsetsViewMenu, .playlistsViewMenu, .foldersViewMenu {
     background-image: url(images/items/folders/folder.png);
 }
 
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index bac2762283..fd969a9738 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -156,7 +156,7 @@
 
                     <div class="readOnlyContent dashboardHomeRightColumn firstDashboardHomeRightColumn">
                         <div data-role="collapsible" data-collapsed="false">
-                            <h3>${HeaderActivity}</h3>
+                            <h3>${HeaderRecentActivity}</h3>
                             <div class="activityItems">
                             </div>
                         </div>
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index 187d273d51..803f7f3aad 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -139,6 +139,16 @@
                                         <input type="number" id="txtMaxStaticBitrate" pattern="[0-9]*" min="1" data-mini="true" />
                                         <div class="fieldDescription">${LabelMaxStaticBitrateHelp}</div>
                                     </li>
+                                    <li>
+                                        <label for="txtMusicStreamingTranscodingBitrate">${LabelMusicStreamingTranscodingBitrate}</label>
+                                        <input type="number" id="txtMusicStreamingTranscodingBitrate" pattern="[0-9]*" min="1" data-mini="true" />
+                                        <div class="fieldDescription">${LabelMusicStreamingTranscodingBitrateHelp}</div>
+                                    </li>
+                                    <li>
+                                        <label for="txtMusicStaticBitrate">${LabelMusicStaticBitrate}</label>
+                                        <input type="number" id="txtMusicStaticBitrate" pattern="[0-9]*" min="1" data-mini="true" />
+                                        <div class="fieldDescription">${LabelMusicStaticBitrateHelp}</div>
+                                    </li>
                                     <li>
                                         <label for="chkIgnoreTranscodeByteRangeRequests">${OptionIgnoreTranscodeByteRangeRequests}</label>
                                         <input type="checkbox" id="chkIgnoreTranscodeByteRangeRequests" data-mini="true" />
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 0fa6419c0c..0bbbd4dd06 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -126,10 +126,10 @@
                             <p class="itemGenres desktopGenres"></p>
                             <p class="itemOverview desktopOverview"></p>
                             <div class="detailButtonsContainer desktopDetailButtons" style="text-align: left;">
-                                <span class="missingIndicator" style="margin-left: .5em; display: none;">
+                                <span class="missingIndicator" style="margin: 0 .5em; display: none;">
                                     <span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">${LabelMissing}</span>
                                 </span>
-                                <span class="offlineIndicator" style="margin-left: .5em; display: none;">
+                                <span class="offlineIndicator" style="margin: 0 .5em; display: none;">
                                     <span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">${LabelOffline}</span>
                                 </span>
                                 <button class="btnPlay hide" type="button" data-icon="play" data-inline="true" data-mini="true">${ButtonPlay}</button>
@@ -143,10 +143,10 @@
                     </tr>
                 </table>
                 <div class="detailButtonsContainer mobileDetailButtons">
-                    <span class="missingIndicator" style="margin-left: .5em; display: none;">
+                    <span class="missingIndicator" style="margin: 0 .5em; display: none;">
                         <span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">${LabelMissing}</span>
                     </span>
-                    <span class="offlineIndicator" style="margin-left: .5em; display: none;">
+                    <span class="offlineIndicator" style="margin: 0 .5em; display: none;">
                         <span style="background: #cc3333; padding: 5px 1em; border-radius: 5px;">${LabelOffline}</span>
                     </span>
                     <button class="btnPlay hide" type="button" data-icon="play" data-inline="true" data-mini="true">${ButtonPlay}</button>
diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html
index d2af63adb4..c1e86681ef 100644
--- a/dashboard-ui/metadataadvanced.html
+++ b/dashboard-ui/metadataadvanced.html
@@ -56,7 +56,7 @@
                     <div data-role="collapsible">
                         <h2>${HeaderChapters}</h2>
                         <div>
-                            <br/>
+                            <br />
                             <div style="display: none;">
                                 <p>${HeaderChapterDownloadingHelp}</p>
 
@@ -98,7 +98,42 @@
                             </ul>
                         </div>
                     </div>
-                    <br/><br />
+
+                    <div data-role="collapsible">
+                        <h2>${HeaderPeople}</h2>
+                        <div>
+                            <br />
+                            <ul data-role="listview" class="ulForm">
+                                <li>
+                                    <label>${HeaderDownloadPeopleMetadataFor}</label>
+                                    <div data-role="controlgroup">
+                                        <input type="checkbox" data-mini="true" id="chkPeopleActors" />
+                                        <label for="chkPeopleActors">${OptionActors}</label>
+
+                                        <input type="checkbox" data-mini="true" id="chkPeopleComposers" />
+                                        <label for="chkPeopleComposers">${OptionComposers}</label>
+
+                                        <input type="checkbox" data-mini="true" id="chkPeopleDirectors" />
+                                        <label for="chkPeopleDirectors">${OptionDirectors}</label>
+
+                                        <input type="checkbox" data-mini="true" id="chkPeopleGuestStars" />
+                                        <label for="chkPeopleGuestStars">${OptionGuestStars}</label>
+
+                                        <input type="checkbox" data-mini="true" id="chkPeopleProducers" />
+                                        <label for="chkPeopleProducers">${OptionProducers}</label>
+
+                                        <input type="checkbox" data-mini="true" id="chkPeopleWriters" />
+                                        <label for="chkPeopleWriters">${OptionWriters}</label>
+
+                                        <input type="checkbox" data-mini="true" id="chkPeopleOthers" />
+                                        <label for="chkPeopleOthers">${OptionOthers}</label>
+                                        <div class="fieldDescription">${HeaderDownloadPeopleMetadataForHelp}</div>
+                                    </div>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                    <br /><br />
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <button type="submit" data-theme="b" data-icon="check" data-mini="true">
diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index f0ecc4be8c..1736be01ba 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -24,13 +24,16 @@
                 <div class="fieldDescription">${LabelSelectFolderGroupsHelp}</div>
             </div>
             <br />
-            
-            <div style="margin: 0 1em;">
-                <label for="chkDisplayCollectionView">${LabelDisplayCollectionsView}</label>
-                <input id="chkDisplayCollectionView" type="checkbox" data-mini="true" />
-            </div>
 
             <br />
+            <div style="margin: 0 1em;" data-role="controlgroup">
+                <label for="chkDisplayCollectionView">${LabelDisplayCollectionsView}</label>
+                <input id="chkDisplayCollectionView" type="checkbox" data-mini="true" />
+                <label for="chkDisplayFolderView">${LabelDisplayFoldersView}</label>
+                <input id="chkDisplayFolderView" type="checkbox" data-mini="true" />
+            </div>
+
+            <br /><br />
             <div style="margin: 0 1em;">
                 <p>${LabelGroupChannelsIntoViews}</p>
                 <div class="channelGroupList"></div>
diff --git a/dashboard-ui/playlists.html b/dashboard-ui/playlists.html
index fdd06b51a8..e76b57482f 100644
--- a/dashboard-ui/playlists.html
+++ b/dashboard-ui/playlists.html
@@ -23,6 +23,12 @@
             </div>
         </div>
 
+        <div data-role="popup" class="popupLoading" data-overlay-theme="b" data-theme="b" data-dismissible="false" data-history="false" data-positionto="window">
+            <div style="padding: .5em 1.5em;">
+                <p style="color: #eee;">${MessageLoadingContent}</p>
+            </div>
+        </div>
+
         <div data-role="panel" class="viewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
             <form>
 
diff --git a/dashboard-ui/scripts/channelsettings.js b/dashboard-ui/scripts/channelsettings.js
index d3a11e933d..75084e53c3 100644
--- a/dashboard-ui/scripts/channelsettings.js
+++ b/dashboard-ui/scripts/channelsettings.js
@@ -47,6 +47,7 @@
             .selectmenu("refresh");
 
         $('#txtDownloadAge', page).val(config.MaxDownloadAge || '');
+        $('#txtDownloadSizeLimit', page).val(config.DownloadSizeLimit || '');
 
         $('#txtCachePath', page).val(config.DownloadPath || '');
 
@@ -108,6 +109,7 @@
             // This should be null if empty
             config.PreferredStreamingWidth = $('#selectChannelResolution', form).val() || null;
             config.MaxDownloadAge = $('#txtDownloadAge', form).val() || null;
+            config.DownloadSizeLimit = $('#txtDownloadSizeLimit', form).val() || null;
 
             config.DownloadPath = $('#txtCachePath', form).val() || null;
 
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 13dcfbb0cf..ddd7c93b12 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -1145,10 +1145,15 @@ $(document).on('pagebeforeshow', "#dashboardPage", DashboardPage.onPageShow)
 
         limit = limit || parseInt(elem.getAttribute('data-activitylimit') || '7');
 
+        // Show last 24 hours
+        var minDate = new Date();
+        minDate.setTime(minDate.getTime() - 86400000);
+
         ApiClient.getJSON(ApiClient.getUrl('System/ActivityLog/Entries', {
 
             startIndex: startIndex,
-            limit: limit
+            limit: limit,
+            minDate: minDate.toISOString()
 
         })).done(function (result) {
 
diff --git a/dashboard-ui/scripts/dlnaprofile.js b/dashboard-ui/scripts/dlnaprofile.js
index 859e129c45..b9a0dbf25a 100644
--- a/dashboard-ui/scripts/dlnaprofile.js
+++ b/dashboard-ui/scripts/dlnaprofile.js
@@ -78,6 +78,9 @@
         $('#txtMaxAllowedBitrate', page).val(profile.MaxStreamingBitrate || '');
         $('#txtMaxStaticBitrate', page).val(profile.MaxStaticBitrate || '');
 
+        $('#txtMusicStreamingTranscodingBitrate', page).val(profile.MusicStreamingTranscodingBitrate || '');
+        $('#txtMusicStaticBitrate', page).val(profile.MusicSyncBitrate || '');
+
         $('#chkRequiresPlainFolders', page).checked(profile.RequiresPlainFolders).checkboxradio('refresh');
         $('#chkRequiresPlainVideoItems', page).checked(profile.RequiresPlainVideoItems).checkboxradio('refresh');
 
@@ -785,6 +788,9 @@
         profile.MaxStreamingBitrate = $('#txtMaxAllowedBitrate', page).val();
         profile.MaxStaticBitrate = $('#LabelMaxStaticBitrateHelp', page).val();
 
+        profile.MusicStreamingTranscodingBitrate = $('#txtMusicStreamingTranscodingBitrate', page).val();
+        profile.MusicSyncBitrate = $('#txtMusicStaticBitrate', page).val();
+
         profile.ProtocolInfo = $('#txtProtocolInfo', page).val();
         profile.XDlnaCap = $('#txtXDlnaCap', page).val();
         profile.XDlnaDoc = $('#txtXDlnaDoc', page).val();
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index ffdecf604c..36bc41ed1b 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -130,8 +130,7 @@
 
             Limit: screenWidth >= 2400 ? 24 : (screenWidth >= 1600 ? 20 : (screenWidth >= 1440 ? 12 : (screenWidth >= 800 ? 9 : 8))),
             Fields: "PrimaryImageAspectRatio",
-            IsPlayed: false,
-            IsFolder: false
+            IsPlayed: false
         };
 
         ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).done(function (items) {
diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js
index cc20edb36e..4b47c91d69 100644
--- a/dashboard-ui/scripts/itemlistpage.js
+++ b/dashboard-ui/scripts/itemlistpage.js
@@ -37,6 +37,12 @@
 
             updateFilterControls(page);
 
+            var context = getParameterByName('context');
+
+            if (context == 'home') {
+                context = 'folders';
+            }
+
             if (view == "Backdrop") {
 
                 html = LibraryBrowser.getPosterViewHtml({
@@ -44,7 +50,8 @@
                     shape: "smallBackdrop",
                     showTitle: true,
                     centerText: true,
-                    preferBackdrop: true
+                    preferBackdrop: true,
+                    context: context
                 });
             }
             else if (view == "Poster") {
@@ -52,7 +59,8 @@
                     items: result.Items,
                     shape: "auto",
                     showTitle: true,
-                    centerText: true
+                    centerText: true,
+                    context: context
                 });
             }
 
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index a21e05240f..cb7b59c1f6 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -370,7 +370,7 @@
 
                 $(this).off("popupafterclose").remove();
 
-            }).parents(".ui-popup-container").css("margin-left", 55);
+            }).parents(".ui-popup-container").css("margin-left", 30);
         },
 
         closePlayMenu: function () {
@@ -426,7 +426,7 @@
 
         getHref: function (item, context, topParentId) {
 
-            var href = LibraryBrowser.getHrefInternal(item);
+            var href = LibraryBrowser.getHrefInternal(item, context);
 
             if (context) {
                 href += href.indexOf('?') == -1 ? "?context=" : "&context=";
@@ -445,7 +445,7 @@
             return href;
         },
 
-        getHrefInternal: function (item) {
+        getHrefInternal: function (item, context) {
 
             if (!item) {
                 throw new Error('item cannot be null');
@@ -466,35 +466,37 @@
                 return 'channelslatest.html';
             }
 
-            if (item.CollectionType == 'movies') {
-                return 'movieslatest.html?topParentId=' + item.Id;
-            }
+            if (context != 'folders') {
+                if (item.CollectionType == 'movies') {
+                    return 'movieslatest.html?topParentId=' + item.Id;
+                }
 
-            if (item.CollectionType == 'boxsets') {
-                return 'collections.html?topParentId=' + item.Id;
-            }
+                if (item.CollectionType == 'boxsets') {
+                    return 'collections.html?topParentId=' + item.Id;
+                }
 
-            if (item.CollectionType == 'trailers') {
-                return 'movietrailers.html?topParentId=' + item.Id;
-            }
+                if (item.CollectionType == 'trailers') {
+                    return 'movietrailers.html?topParentId=' + item.Id;
+                }
 
-            if (item.CollectionType == 'movies') {
-                return 'movieslatest.html?topParentId=' + item.Id;
-            }
+                if (item.CollectionType == 'movies') {
+                    return 'movieslatest.html?topParentId=' + item.Id;
+                }
 
-            if (item.CollectionType == 'tvshows') {
-                return 'tvrecommended.html?topParentId=' + item.Id;
-            }
+                if (item.CollectionType == 'tvshows') {
+                    return 'tvrecommended.html?topParentId=' + item.Id;
+                }
 
-            if (item.CollectionType == 'music') {
-                return 'musicrecommended.html?topParentId=' + item.Id;
-            }
+                if (item.CollectionType == 'music') {
+                    return 'musicrecommended.html?topParentId=' + item.Id;
+                }
 
-            if (item.CollectionType == 'games') {
-                return 'gamesrecommended.html?topParentId=' + item.Id;
-            }
-            if (item.CollectionType == 'playlists') {
-                return 'playlists.html?topParentId=' + item.Id;
+                if (item.CollectionType == 'games') {
+                    return 'gamesrecommended.html?topParentId=' + item.Id;
+                }
+                if (item.CollectionType == 'playlists') {
+                    return 'playlists.html?topParentId=' + item.Id;
+                }
             }
             if (item.Type == 'CollectionFolder') {
                 return 'itemlist.html?topParentId=' + item.Id + '&parentid=' + item.Id;
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index d2fdcd4d81..f4540646c3 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -381,7 +381,6 @@
             Limit: parseInt($('.playedIndicator', card).html() || '10'),
             Fields: "PrimaryImageAspectRatio,DateCreated",
             ParentId: itemId,
-            IsFolder: false,
             GroupItems: false
         };
 
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 77fce9ac53..edbcbecff5 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -1253,7 +1253,7 @@
                     errorMsg += '</p>';
                 }
 
-                if ($.browser.msie && !$.browser.mobile) {
+                if ($.browser.msie && !$.browser.mobile && !self.canPlayWebm()) {
                     errorMsg += '<p>';
                     errorMsg += '<a href="https://tools.google.com/dlpage/webmmf/" target="_blank">';
                     errorMsg += Globalize.translate('MessageInternetExplorerWebm');
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 7134d3393f..9dcd0c981c 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -84,7 +84,7 @@
             }
 
             // Chrome or IE with plugin installed
-            if (canPlayWebm()) {
+            if (self.canPlayWebm()) {
                 return '.webm';
             }
 
@@ -139,7 +139,7 @@
                     if (finalParams.isStatic) {
                         currentSrc = currentSrc.replace('.webm', '.mp4').replace('.m3u8', '.mp4');
                     } else {
-                        currentSrc = currentSrc.replace('.mp4', transcodingExtension).replace('.m4v', transcodingExtension);
+                        currentSrc = currentSrc.replace('.mp4', transcodingExtension).replace('.m4v', transcodingExtension).replace('.mkv', transcodingExtension);
                     }
 
                     currentSrc = replaceQueryString(currentSrc, 'AudioBitrate', finalParams.audioBitrate);
@@ -289,7 +289,7 @@
                 //return false;
             }
 
-            if (extension == 'm4v') {
+            if (extension == 'm4v' || extension == 'mkv') {
                 return $.browser.chrome;
             }
 
@@ -1094,7 +1094,7 @@
             $(self).trigger('volumechange', [state]);
         };
 
-        self.cleanup = function() {
+        self.cleanup = function () {
 
         };
 
@@ -1167,10 +1167,10 @@
             }
         }
 
-        function canPlayWebm() {
+        self.canPlayWebm = function() {
 
             return testableVideoElement.canPlayType('video/webm').replace(/no/, '');
-        }
+        };
 
         self.canAutoPlayAudio = function () {
 
diff --git a/dashboard-ui/scripts/metadataadvanced.js b/dashboard-ui/scripts/metadataadvanced.js
index 025ddb1d53..7b6081f102 100644
--- a/dashboard-ui/scripts/metadataadvanced.js
+++ b/dashboard-ui/scripts/metadataadvanced.js
@@ -7,6 +7,14 @@
         $('#chkEnableFanartUpdates', page).checked(config.EnableFanArtUpdates).checkboxradio("refresh");
         $('#txtMetadataPath', page).val(config.MetadataPath || '');
 
+        $('#chkPeopleActors', page).checked(config.PeopleMetadataOptions.DownloadActorMetadata).checkboxradio("refresh");
+        $('#chkPeopleComposers', page).checked(config.PeopleMetadataOptions.DownloadComposerMetadata).checkboxradio("refresh");
+        $('#chkPeopleDirectors', page).checked(config.PeopleMetadataOptions.DownloadDirectorMetadata).checkboxradio("refresh");
+        $('#chkPeopleProducers', page).checked(config.PeopleMetadataOptions.DownloadProducerMetadata).checkboxradio("refresh");
+        $('#chkPeopleWriters', page).checked(config.PeopleMetadataOptions.DownloadWriterMetadata).checkboxradio("refresh");
+        $('#chkPeopleOthers', page).checked(config.PeopleMetadataOptions.DownloadOtherPeopleMetadata).checkboxradio("refresh");
+        $('#chkPeopleGuestStars', page).checked(config.PeopleMetadataOptions.DownloadGuestStarMetadata).checkboxradio("refresh");
+
         Dashboard.hideLoadingMsg();
     }
 
@@ -171,6 +179,14 @@
             config.EnableFanArtUpdates = $('#chkEnableFanartUpdates', form).checked();
             config.MetadataPath = $('#txtMetadataPath', form).val();
 
+            config.PeopleMetadataOptions.DownloadActorMetadata = $('#chkPeopleActors', form).checked();
+            config.PeopleMetadataOptions.DownloadComposerMetadata = $('#chkPeopleComposers', form).checked();
+            config.PeopleMetadataOptions.DownloadDirectorMetadata = $('#chkPeopleDirectors', form).checked();
+            config.PeopleMetadataOptions.DownloadGuestStarMetadata = $('#chkPeopleGuestStars', form).checked();
+            config.PeopleMetadataOptions.DownloadProducerMetadata = $('#chkPeopleProducers', form).checked();
+            config.PeopleMetadataOptions.DownloadWriterMetadata = $('#chkPeopleWriters', form).checked();
+            config.PeopleMetadataOptions.DownloadOtherPeopleMetadata = $('#chkPeopleOthers', form).checked();
+
             ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
         });
     }
diff --git a/dashboard-ui/scripts/mypreferencesdisplay.js b/dashboard-ui/scripts/mypreferencesdisplay.js
index 84f5f018d6..608b435ba0 100644
--- a/dashboard-ui/scripts/mypreferencesdisplay.js
+++ b/dashboard-ui/scripts/mypreferencesdisplay.js
@@ -7,6 +7,7 @@
 
         $('#chkGroupMoviesIntoCollections', page).checked(user.Configuration.GroupMoviesIntoBoxSets || false).checkboxradio("refresh");
         $('#chkDisplayCollectionView', page).checked(user.Configuration.DisplayCollectionsView || false).checkboxradio("refresh");
+        $('#chkDisplayFolderView', page).checked(user.Configuration.DisplayFoldersView || false).checkboxradio("refresh");
 
         ApiClient.getItems(user.Id, {}).done(function (result) {
 
@@ -77,6 +78,7 @@
         user.Configuration.GroupMoviesIntoBoxSets = $('#chkGroupMoviesIntoCollections', page).checked();
 
         user.Configuration.DisplayCollectionsView = $('#chkDisplayCollectionView', page).checked();
+        user.Configuration.DisplayFoldersView = $('#chkDisplayFolderView', page).checked();
 
         user.Configuration.ExcludeFoldersFromGrouping = $(".chkGroupFolder:not(:checked)", page).get().map(function (i) {
 
diff --git a/dashboard-ui/scripts/playlistmanager.js b/dashboard-ui/scripts/playlistmanager.js
index 706214e325..19b5292447 100644
--- a/dashboard-ui/scripts/playlistmanager.js
+++ b/dashboard-ui/scripts/playlistmanager.js
@@ -33,6 +33,7 @@
 
     function getNewPlaylistPanel() {
 
+        Dashboard.showLoadingMsg();
         $('.newPlaylistPanel').panel('destroy').remove();
 
         var html = '<div data-role="panel" data-position="right" data-display="overlay" class="newPlaylistPanel" data-position-fixed="true" data-theme="a">';
@@ -103,6 +104,7 @@
             select.html(selectHtml).selectmenu('refresh');
             
             select.val(lastPlaylistId || '').selectmenu('refresh').trigger('change');
+            Dashboard.hideLoadingMsg();
         });
 
         $('form', elem).on('submit', onAddToPlaylistFormSubmit);
diff --git a/dashboard-ui/scripts/playlists.js b/dashboard-ui/scripts/playlists.js
index da40fb406e..2e6de83008 100644
--- a/dashboard-ui/scripts/playlists.js
+++ b/dashboard-ui/scripts/playlists.js
@@ -18,9 +18,18 @@
         return 'playlists' + (query.ParentId || '');
     }
 
+    function showLoadingMessage(page) {
+
+        $('.popupLoading', page).popup('open');
+    }
+
+    function hideLoadingMessage(page) {
+        $('.popupLoading', page).popup('close');
+    }
+
     function reloadItems(page) {
 
-        Dashboard.showLoadingMsg();
+        showLoadingMessage(page);
 
         var promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query);
         var promise2 = Dashboard.getCurrentUser();
@@ -91,7 +100,7 @@
 
             LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
 
-            Dashboard.hideLoadingMsg();
+            hideLoadingMessage(page);
         });
     }