diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index f841987eb1..54faa0e2ab 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -102,9 +102,6 @@
         </div>
     </div>
     <div class="pageTabContent ehsContent fullWidth" id="genresTab" data-index="4">
-        <div style="text-align: center; display: flex; flex-wrap: wrap; align-items: center; justify-content: center;padding:0 .5em;">
-            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button>
-        </div>
         <div id="items"></div>
     </div>
     <div class="pageTabContent ehsContent" id="studiosTab" data-index="5">
diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js
index dc085bc3ce..cde733049d 100644
--- a/dashboard-ui/scripts/moviegenres.js
+++ b/dashboard-ui/scripts/moviegenres.js
@@ -242,16 +242,5 @@
             self.preRender();
             self.renderTab();
         }
-
-        var btnSelectView = tabContent.querySelector('.btnSelectView');
-        btnSelectView.addEventListener('click', function (e) {
-
-            libraryBrowser.showLayoutMenu(e.target, self.getCurrentViewStyle(), self.getViewStyles());
-        });
-
-        btnSelectView.addEventListener('layoutchange', function (e) {
-
-            self.setCurrentViewStyle(e.detail.viewStyle);
-        });
     };
 });
\ No newline at end of file
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index cf3bbe4270..57be1e7a05 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -1,4 +1,4 @@
-define(['libraryBrowser', 'components/categorysyncbuttons', 'cardBuilder', 'dom', 'scrollStyles', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (libraryBrowser, categorysyncbuttons, cardBuilder, dom) {
+define(['libraryBrowser', 'components/categorysyncbuttons', 'cardBuilder', 'dom', 'apphost', 'scrollStyles', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (libraryBrowser, categorysyncbuttons, cardBuilder, dom, appHost) {
     'use strict';
 
     function enableScrollX() {
@@ -72,13 +72,21 @@
             var allowBottomPadding = !enableScrollX();
 
             var container = page.querySelector('#resumableItems');
+
+            var supportsImageAnalysis = appHost.supports('imageanalysis');
+            var cardLayout = appHost.preferVisualCards;
+
             cardBuilder.buildCards(result.Items, {
                 itemsContainer: container,
                 preferThumb: true,
                 shape: getThumbShape(),
                 scalable: true,
                 overlayPlayButton: true,
-                allowBottomPadding: allowBottomPadding
+                allowBottomPadding: allowBottomPadding,
+                cardLayout: cardLayout,
+                vibrant: cardLayout && supportsImageAnalysis,
+                showTitle: cardLayout,
+                showYear: cardLayout
             });
 
         });
diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js
index 5d52377e7c..fb2faa8279 100644
--- a/dashboard-ui/scripts/sections.js
+++ b/dashboard-ui/scripts/sections.js
@@ -448,9 +448,15 @@
 
         var screenWidth = dom.getWindowSize().innerWidth;
 
-        var limit = screenWidth >= 1920 ? 8 : (screenWidth >= 1600 ? 8 : (screenWidth >= 1200 ? 9 : 6));
+        var limit;
 
-        if (!enableScrollX()) {
+        if (enableScrollX()) {
+
+            limit = 12;
+
+        } else {
+
+            limit = screenWidth >= 1920 ? 8 : (screenWidth >= 1600 ? 8 : (screenWidth >= 1200 ? 9 : 6));
             limit = Math.min(limit, 5);
         }
 
@@ -481,6 +487,10 @@
                 } else {
                     html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap">';
                 }
+
+                var supportsImageAnalysis = appHost.supports('imageanalysis');
+                var cardLayout = appHost.preferVisualCards;
+
                 html += cardBuilder.getCardsHtml({
                     items: result.Items,
                     preferThumb: true,
@@ -492,8 +502,12 @@
                     showDetailsMenu: true,
                     overlayPlayButton: true,
                     context: 'home',
-                    centerText: true,
-                    allowBottomPadding: false
+                    centerText: !cardLayout,
+                    allowBottomPadding: false,
+                    cardLayout: cardLayout,
+                    showYear: true,
+                    lines: 2,
+                    vibrant: cardLayout && supportsImageAnalysis
                 });
                 html += '</div>';
             }
diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js
index 5dd93245bc..dc11fe8fa5 100644
--- a/dashboard-ui/scripts/tvgenres.js
+++ b/dashboard-ui/scripts/tvgenres.js
@@ -242,16 +242,5 @@
             self.preRender();
             self.renderTab();
         }
-
-        var btnSelectView = tabContent.querySelector('.btnSelectView');
-        btnSelectView.addEventListener('click', function (e) {
-
-            libraryBrowser.showLayoutMenu(e.target, self.getCurrentViewStyle(), self.getViewStyles());
-        });
-
-        btnSelectView.addEventListener('layoutchange', function (e) {
-
-            self.setCurrentViewStyle(e.detail.viewStyle);
-        });
     };
 });
\ No newline at end of file
diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js
index 7e9b3a41ee..a0c484e083 100644
--- a/dashboard-ui/scripts/tvrecommended.js
+++ b/dashboard-ui/scripts/tvrecommended.js
@@ -35,7 +35,6 @@
                 }
 
                 var container = view.querySelector('#nextUpItems');
-
                 var supportsImageAnalysis = appHost.supports('imageanalysis');
 
                 cardBuilder.buildCards(result.Items, {
@@ -99,6 +98,7 @@
 
                 var container = view.querySelector('#resumableItems');
 
+                var supportsImageAnalysis = appHost.supports('imageanalysis');
                 var cardLayout = appHost.preferVisualCards;
 
                 cardBuilder.buildCards(result.Items, {
@@ -112,7 +112,8 @@
                     centerText: !cardLayout,
                     overlayPlayButton: true,
                     allowBottomPadding: allowBottomPadding,
-                    cardLayout: cardLayout
+                    cardLayout: cardLayout,
+                    vibrant: supportsImageAnalysis
                 });
             });
         }
diff --git a/dashboard-ui/tv.html b/dashboard-ui/tv.html
index 02c4e7743f..e6a7b7e684 100644
--- a/dashboard-ui/tv.html
+++ b/dashboard-ui/tv.html
@@ -88,9 +88,6 @@
         </div>
     </div>
     <div class="pageTabContent ehsContent fullWidth" id="genresTab" data-index="4">
-        <div style="text-align: center; display: flex; align-items: center; justify-content: center;">
-            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button>
-        </div>
         <div id="items"></div>
     </div>
     <div class="pageTabContent ehsContent" id="studiosTab" data-index="5">