diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index 76599c16ad..798c58202f 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -25,7 +25,14 @@
             </div>
 
             <br />
+            <div style="margin: 0 1em;">
+                <p>${LabelGroupChannelsIntoViews}</p>
+                <div class="channelGroupList"></div>
+                <div class="fieldDescription">${LabelGroupChannelsIntoViewsHelp}</div>
+            </div>
             <br />
+            <br />
+
             <div class="detailSectionHeader" style="margin: 0 .5em;">
                 ${HeaderOtherDisplaySettings}
             </div>
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index 034ffe98cf..3866bf9aa8 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -219,7 +219,8 @@
                     shape: shape,
                     showTitle: true,
                     centerText: true,
-                    lazy: true
+                    lazy: true,
+                    preferThumb: true
                 });
                 html += '</div>';
             }
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index d0331edcff..4b6f3d1aab 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -374,7 +374,6 @@
         var page = this;
 
         hideSelections(page);
-
     });
 
     function renderUserDataChanges(posterItem, userData) {
@@ -387,11 +386,11 @@
 
                 $(html).insertAfter($('.posterItemOverlayTarget', posterItem));
             }
-            
+
         } else {
             $('.playedIndicator', posterItem).remove();
         }
-        
+
         // TODO: Handle progress bar
         // $('.posterItemProgressContainer').remove();
     }
diff --git a/dashboard-ui/scripts/mypreferencesdisplay.js b/dashboard-ui/scripts/mypreferencesdisplay.js
index c313f3c6bb..8771333a0b 100644
--- a/dashboard-ui/scripts/mypreferencesdisplay.js
+++ b/dashboard-ui/scripts/mypreferencesdisplay.js
@@ -36,6 +36,37 @@
             Dashboard.hideLoadingMsg();
         });
 
+        $.getJSON(ApiClient.getUrl("Channels", {
+
+            UserId: user.Id
+
+        })).done(function (result) {
+
+            var folderHtml = '';
+
+            folderHtml += '<div data-role="controlgroup">';
+            folderHtml += result.Items.map(function (i) {
+
+                var currentHtml = '';
+
+                var id = 'chkGroupChannel' + i.Id;
+
+                currentHtml += '<label for="' + id + '">' + i.Name + '</label>';
+
+                var isChecked = user.Configuration.DisplayChannelsWithinViews.indexOf(i.Id) != -1;
+                var checkedHtml = isChecked ? ' checked="checked"' : '';
+
+                currentHtml += '<input class="chkGroupChannel" data-channelid="' + i.Id + '" type="checkbox" data-mini="true" id="' + id + '"' + checkedHtml + ' />';
+
+                return currentHtml;
+
+            }).join('');
+
+            folderHtml += '</div>';
+
+            $('.channelGroupList', page).html(folderHtml).trigger('create');
+        });
+
     }
 
     function saveUser(page, user) {
@@ -49,6 +80,11 @@
             return i.getAttribute('data-folderid');
         });
 
+        user.Configuration.DisplayChannelsWithinViews = $(".chkGroupChannel:checked", page).get().map(function (i) {
+
+            return i.getAttribute('data-channelid');
+        });
+
         ApiClient.updateUser(user).done(function () {
             Dashboard.alert(Globalize.translate('SettingsSaved'));
         });