diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index 80d74da6bf..b94e6c0ecc 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -204,7 +204,6 @@
 
 .musicViewMenu {
     background-image: url(images/items/folders/music.png);
-    background-position: 14px 8px;
 }
 
 .homeViewMenu {
diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html
index cf3862050d..dc9753d6d9 100644
--- a/dashboard-ui/index.html
+++ b/dashboard-ui/index.html
@@ -15,7 +15,7 @@
 
         <div data-role="content">
 
-            <div class="ui-bar-b readOnlyContent welcomeMessage" style="display: none; padding: 2em; border-radius: 10px; margin: 1em auto; font-weight: normal;">
+            <div class="ui-bar-b readOnlyContent welcomeMessage" style="display: none; padding: 2em; border-radius: 10px; margin: 2em auto; font-weight: normal;">
                 <h1 style="margin-top: 0;">${HeaderWelcomeToMediaBrowserWebClient}</h1>
                 <p>${MessageLearnHowToCustomize}</p>
                 <p>
diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index b6ff36e3ad..d462fddaa7 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -14,6 +14,22 @@
 
         <br />
         <form class="displayPreferencesForm" style="margin: 0 auto;">
+
+            <div class="detailSectionHeader" style="margin: 0 .5em;">
+                ${HeaderLibraryViews}
+            </div>
+            <div style="margin: 0 1em;">
+                <p>${LabelSelectFolderGroups}</p>
+                <div class="folderGroupList"></div>
+                <div class="fieldDescription">${LabelSelectFolderGroupsHelp}</div>
+            </div>
+
+            <br />
+            <br />
+            <div class="detailSectionHeader" style="margin: 0 .5em;">
+                ${HeaderOtherDisplaySettings}
+            </div>
+
             <ul data-role="listview" class="ulForm">
                 <li>
                     <input type="checkbox" id="chkDisplayMissingEpisodes" data-mini="true" />
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index ffe4d1a44b..c4e3f410a6 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -102,13 +102,7 @@
 
     function loadlibraryButtons(elem, userId, index) {
 
-        var options = {
-
-            SortBy: "SortName",
-            Fields: "PrimaryImageAspectRatio"
-        };
-
-        var promise1 = ApiClient.getItems(userId, options);
+        var promise1 = ApiClient.getUserViews(userId);
 
         var promise2 = ApiClient.getLiveTvInfo();
 
@@ -210,13 +204,7 @@
 
     function loadLibraryTiles(elem, userId) {
 
-        var options = {
-
-            SortBy: "SortName",
-            Fields: "PrimaryImageAspectRatio"
-        };
-
-        ApiClient.getItems(userId, options).done(function (result) {
+        ApiClient.getUserViews(userId).done(function (result) {
 
             var html = '';
 
@@ -338,11 +326,13 @@
         });
     }
 
+    var homePageDismissValue = '2';
+    
     function dismissWelcome(page, userId) {
 
         ApiClient.getDisplayPreferences('home', userId, 'webclient').done(function (result) {
 
-            result.CustomPrefs.homePageWelcomeDismissed = '1';
+            result.CustomPrefs.homePageWelcomeDismissed = homePageDismissValue;
             ApiClient.updateDisplayPreferences('home', result, userId, 'webclient').done(function() {
                 
                 $('.welcomeMessage', page).hide();
@@ -369,7 +359,7 @@
 
         ApiClient.getDisplayPreferences('home', userId, 'webclient').done(function (result) {
 
-            if (result.CustomPrefs.homePageWelcomeDismissed) {
+            if (result.CustomPrefs.homePageWelcomeDismissed == homePageDismissValue) {
                 $('.welcomeMessage', page).hide();
             } else {
                 $('.welcomeMessage', page).show();
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index b0dab5eba3..8b0a216449 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -97,11 +97,7 @@
 
         var userId = Dashboard.getCurrentUserId();
 
-        ApiClient.getItems(userId, {
-
-            SortBy: "SortName"
-
-        }).done(function (result) {
+        ApiClient.getUserViews(userId).done(function (result) {
 
             var items = result.Items;
 
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index cc0136746d..ad4d890e76 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -80,8 +80,7 @@
             userId: Dashboard.getCurrentUserId(),
             categoryLimit: screenWidth >= 1200 ? 6 : 3,
             itemLimit: screenWidth >= 1920 ? 8 : (screenWidth >= 1440 ? 8 : 6),
-            Fields: "PrimaryImageAspectRatio",
-            ParentId: parentId
+            Fields: "PrimaryImageAspectRatio"
         });
 
         $.getJSON(url).done(function (recommendations) {
diff --git a/dashboard-ui/scripts/musicvideos.js b/dashboard-ui/scripts/musicvideos.js
index ced2dc98d9..b9a64f3738 100644
--- a/dashboard-ui/scripts/musicvideos.js
+++ b/dashboard-ui/scripts/musicvideos.js
@@ -215,7 +215,7 @@
 
     }).on('pagebeforeshow', "#musicVideosPage", function () {
 
-        //query.ParentId = LibraryMenu.getTopParentId();
+        query.ParentId = LibraryMenu.getTopParentId();
 
         var limit = LibraryBrowser.getDefaultPageSize();
 
diff --git a/dashboard-ui/scripts/mypreferencesdisplay.js b/dashboard-ui/scripts/mypreferencesdisplay.js
index b74df3d3b8..c313f3c6bb 100644
--- a/dashboard-ui/scripts/mypreferencesdisplay.js
+++ b/dashboard-ui/scripts/mypreferencesdisplay.js
@@ -7,7 +7,35 @@
 
         $('#chkGroupMoviesIntoCollections', page).checked(user.Configuration.GroupMoviesIntoBoxSets || false).checkboxradio("refresh");
 
-        Dashboard.hideLoadingMsg();
+        ApiClient.getItems(user.Id, {}).done(function (result) {
+
+            var folderHtml = '';
+
+            folderHtml += '<div data-role="controlgroup">';
+            folderHtml += result.Items.map(function (i) {
+
+                var currentHtml = '';
+
+                var id = 'chkGroupFolder' + i.Id;
+
+                currentHtml += '<label for="' + id + '">' + i.Name + '</label>';
+
+                var isChecked = user.Configuration.ExcludeFoldersFromGrouping.indexOf(i.Id) == -1;
+                var checkedHtml = isChecked ? ' checked="checked"' : '';
+
+                currentHtml += '<input class="chkGroupFolder" data-folderid="' + i.Id + '" type="checkbox" data-mini="true" id="' + id + '"' + checkedHtml + ' />';
+
+                return currentHtml;
+
+            }).join('');
+
+            folderHtml += '</div>';
+
+            $('.folderGroupList', page).html(folderHtml).trigger('create');
+
+            Dashboard.hideLoadingMsg();
+        });
+
     }
 
     function saveUser(page, user) {
@@ -16,6 +44,11 @@
         user.Configuration.DisplayUnairedEpisodes = $('#chkDisplayUnairedEpisodes', page).checked();
         user.Configuration.GroupMoviesIntoBoxSets = $('#chkGroupMoviesIntoCollections', page).checked();
 
+        user.Configuration.ExcludeFoldersFromGrouping = $(".chkGroupFolder:not(:checked)", page).get().map(function (i) {
+
+            return i.getAttribute('data-folderid');
+        });
+
         ApiClient.updateUser(user).done(function () {
             Dashboard.alert(Globalize.translate('SettingsSaved'));
         });
@@ -30,9 +63,9 @@
         var userId = getParameterByName('userId') || Dashboard.getCurrentUserId();
 
         ApiClient.getUser(userId).done(function (result) {
-            
+
             saveUser(page, result);
-            
+
         });
 
         // Disable default form submission
@@ -57,7 +90,7 @@
             loadForm(page, user);
 
         });
-        
+
     }).on('pageshow', ".userPreferencesPage", function () {
 
         var page = this;
diff --git a/dashboard-ui/thirdparty/mediabrowser.apiclient.js b/dashboard-ui/thirdparty/mediabrowser.apiclient.js
index 85e53d8970..954df7a30a 100644
--- a/dashboard-ui/thirdparty/mediabrowser.apiclient.js
+++ b/dashboard-ui/thirdparty/mediabrowser.apiclient.js
@@ -2552,6 +2552,23 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
             });
         };
 
+        self.getUserViews = function (userId, options) {
+
+            if (!userId) {
+                throw new Error("null userId");
+            }
+
+            options = options || {};
+
+            var url = self.getUrl("Users/" + userId + "/Views", options);
+
+            return self.ajax({
+                type: "GET",
+                url: url,
+                dataType: "json"
+            });
+        };
+
         /**
             Gets artists from an item
         */