diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css
index 8974544893..81d757d7c7 100644
--- a/dashboard-ui/css/card.css
+++ b/dashboard-ui/css/card.css
@@ -129,7 +129,7 @@
     right: 0;
 }
 
-    .cardContent:hover .cardImage {
+    .cardContent:not(.noHoverEffect):hover .cardImage {
         opacity: .5;
     }
 
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 4e1f636c61..64e4528c5d 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -2382,7 +2382,7 @@
             }
         },
 
-        renderGenres: function (elem, item, context) {
+        renderGenres: function (elem, item, context, limit) {
 
             var html = '';
 
@@ -2390,6 +2390,10 @@
 
             for (var i = 0, length = genres.length; i < length; i++) {
 
+                if (limit && i >= limit) {
+                    break;
+                }
+
                 if (i > 0) {
                     html += '<span>&nbsp;&nbsp;/&nbsp;&nbsp;</span>';
                 }
diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js
index 0931599205..a57d927c71 100644
--- a/dashboard-ui/scripts/livetvguide.js
+++ b/dashboard-ui/scripts/livetvguide.js
@@ -531,7 +531,7 @@
             $(this).off("popupafterclose").off("mouseenter").off("mouseleave").remove();
         });
 
-        LibraryBrowser.renderGenres($('.itemGenres', popup), item, 'livetv');
+        LibraryBrowser.renderGenres($('.itemGenres', popup), item, 'livetv', 3);
         LiveTvHelpers.renderMiscProgramInfo($('.miscTvProgramInfo', popup), item);
 
         popup.parents().prev('.ui-popup-screen').remove();
diff --git a/dashboard-ui/scripts/pluginspage.js b/dashboard-ui/scripts/pluginspage.js
index 7978a537e4..566484f874 100644
--- a/dashboard-ui/scripts/pluginspage.js
+++ b/dashboard-ui/scripts/pluginspage.js
@@ -37,8 +37,11 @@
 
         var html = '';
 
-        var href = configPage && !Dashboard.isConnectMode() ?
-            Dashboard.getConfigurationPageUrl(configPage.Name) :
+        var isConnectMode = Dashboard.isConnectMode();
+        var configPageUrl = configPage ? Dashboard.getConfigurationPageUrl(configPage.Name) : null;
+
+        var href = configPage && !isConnectMode ?
+            configPageUrl :
             null;
 
         html += "<div data-id='" + plugin.Id + "' data-name='" + plugin.Name + "' class='card backdropCard alternateHover bottomPaddedCard'>";
@@ -50,7 +53,14 @@
 
         if (href) {
             html += '<a class="cardContent" href="' + href + '">';
-        } else {
+        }
+        else if (!configPageUrl) {
+            html += '<div class="cardContent noConfigPluginCard noHoverEffect">';
+        }
+        else if (isConnectMode) {
+            html += '<div class="cardContent connectModePluginCard">';
+        }
+        else {
             html += '<div class="cardContent">';
         }
 
@@ -125,11 +135,11 @@
 
             var elem = $('.installedPlugins', page).html(html).trigger('create');
 
-            $('.btnNoConfig', elem).on('click', function () {
+            $('.noConfigPluginCard', elem).on('click', function () {
                 showNoConfigurationMessage();
             });
 
-            $('.btnConnectPlugin', elem).on('click', function () {
+            $('.connectModePluginCard', elem).on('click', function () {
                 showConnectMessage();
             });