diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index ecf013e80e..f8b018cf7a 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -15,12 +15,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.3.98",
-  "_release": "1.3.98",
+  "version": "1.3.99",
+  "_release": "1.3.99",
   "_resolution": {
     "type": "version",
-    "tag": "1.3.98",
-    "commit": "f4b1f61aa32d6266aa63b151e10d773201870ba4"
+    "tag": "1.3.99",
+    "commit": "7d4af256dfc6ba03b587ae34ed567557c441f2c1"
   },
   "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "^1.2.0",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css
index f5e4fd8854..d309157716 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css
@@ -148,6 +148,7 @@
     text-decoration: none;
     /* Needed in firefox */
     text-align: left;
+    contain: strict;
 }
 
 @media all and (min-width: 500px) {
@@ -300,6 +301,7 @@
     align-items: center;
     /* Needed for Firefox */
     text-align: left;
+    contain: strict;
 }
 
 .timeslotCellInner {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js b/dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js
index 1dcb2a5d1d..dbc8d88969 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js
@@ -56,13 +56,14 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser
     var wheelEvent = (document.implementation.hasFeature('Event.wheel', '3.0') ? 'wheel' : 'mousewheel');
     var self = {};
 
+    var enableFade = browser.animate && !browser.mobile;
     function fillImage(elem, source, enableEffects) {
 
         if (!source) {
             source = elem.getAttribute('data-src');
         }
         if (source) {
-            if (self.enableFade && enableEffects !== false) {
+            if (enableFade && enableEffects !== false) {
                 imageFetcher.loadImage(elem, source).then(fadeIn);
             } else {
                 imageFetcher.loadImage(elem, source);
@@ -73,10 +74,12 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser
 
     function fadeIn(elem) {
 
+        var duration = layoutManager.tv ? 200 : 300;
+
         var keyframes = [
           { opacity: '0', offset: 0 },
           { opacity: '1', offset: 1 }];
-        var timing = { duration: 300, iterations: 1 };
+        var timing = { duration: duration, iterations: 1 };
         elem.animate(keyframes, timing);
     }
 
diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json
index 955c9dc566..01c5a1084b 100644
--- a/dashboard-ui/bower_components/iron-selector/.bower.json
+++ b/dashboard-ui/bower_components/iron-selector/.bower.json
@@ -36,7 +36,7 @@
     "tag": "v1.5.2",
     "commit": "18e8e12dcd9a4560de480562f65935feed334b86"
   },
-  "_source": "git://github.com/PolymerElements/iron-selector.git",
+  "_source": "git://github.com/polymerelements/iron-selector.git",
   "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/iron-selector"
+  "_originalSource": "polymerelements/iron-selector"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json
index 3e8a4009a3..bbad7fe7ba 100644
--- a/dashboard-ui/bower_components/polymer/.bower.json
+++ b/dashboard-ui/bower_components/polymer/.bower.json
@@ -34,6 +34,6 @@
     "commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514"
   },
   "_source": "git://github.com/Polymer/polymer.git",
-  "_target": "^1.0.0",
+  "_target": "^1.1.0",
   "_originalSource": "Polymer/polymer"
 }
\ No newline at end of file
diff --git a/dashboard-ui/components/ironcardlist/ironcardlist.js b/dashboard-ui/components/ironcardlist/ironcardlist.js
deleted file mode 100644
index 42f7bf8c5e..0000000000
--- a/dashboard-ui/components/ironcardlist/ironcardlist.js
+++ /dev/null
@@ -1,32 +0,0 @@
-define(['iron-list', 'lazyload-image'], function () {
-
-    function getTemplate(scrollTarget) {
-
-        var maxPhysical = 200;
-
-        // is="lazyload-image" 
-
-        return new Promise(function (resolve, reject) {
-
-            var xhr = new XMLHttpRequest();
-            xhr.open('GET', 'components/ironcardlist/ironcardlist.template.html', true);
-
-            xhr.onload = function (e) {
-
-                var html = this.response;
-
-                html = html.replace('${maxphysical}', maxPhysical);
-                html = html.replace('${scrolltarget}', scrollTarget);
-
-                resolve(html);
-            }
-
-            xhr.send();
-        });
-    }
-
-    return {
-        getTemplate: getTemplate
-    };
-
-});
\ No newline at end of file
diff --git a/dashboard-ui/components/ironcardlist/ironcardlist.template.html b/dashboard-ui/components/ironcardlist/ironcardlist.template.html
deleted file mode 100644
index fb57d480e3..0000000000
--- a/dashboard-ui/components/ironcardlist/ironcardlist.template.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<template is="dom-bind">
-    <iron-list as="item" id="ironList" scroll-target="${scrolltarget}" max-physical-count="${maxphysical}" style="width:96%;" grid>
-        <template>
-            <div class$="{{item.elemClass}}" data-action$="{{item.defaultAction}}" data-itemid$="{{item.data-itemid}}" data-commands$="{{item.data-commands}}" data-context$="{{item.data-context}}" data-isfolder$="{{item.data-isfolder}}" data-itemtype$="{{item.data-itemtype}}" data-mediatype$="{{item.data-mediatype}}" data-positionticks$="{{item.data-positionticks}}" data-playaccess$="{{item.data-playaccess}}" data-locationtype$="{{item.data-locationtype}}" data-index$="{{item.data-index}}" data-albumid$="{{item.data-albumid}}" data-channelid$="{{item.data-channelid}}" data-artistid$="{{item.data-artistid}}">
-                <div class$="{{item.cardBoxClass}}">
-                    <div class="cardScalable">
-                        <div class="cardPadder"></div>
-                        <a onclick$="{{item.onclick}}" data-action$="{{item.defaultAction}}" class$="{{item.anchorClass}}" href$="{{item.href}}">
-                            <img is="lazyload-image" class$="{{item.imageClass}}" src$="{{item.imgUrl}}" />
-                            <div inner-h-t-m-l="{{item.overlayHtml}}"></div>
-                        </a>
-                    </div>
-                    <div inner-h-t-m-l="{{item.footerHtml}}"></div>
-                </div>
-            </div>
-        </template>
-    </iron-list>
-</template>
\ No newline at end of file
diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css
index 4620a765f3..5aa973d880 100644
--- a/dashboard-ui/css/card.css
+++ b/dashboard-ui/css/card.css
@@ -2,12 +2,23 @@
     display: inline-block;
     text-align: left;
     position: relative;
+    contain: style;
 }
 
-iron-list .card {
-    display: block;
+/*.itemsContainer .card {
+    contain: layout style;
 }
 
+.itemsContainer {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+
+    .itemsContainer.smoothScrollX, .itemsContainer.hiddenScrollX {
+        display: block;
+    }*/
+
 .card, .card a {
     text-decoration: none;
     font-weight: 400 !important;
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 60ce8cde5e..ff4da505c8 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -62,6 +62,10 @@
     padding-bottom: 0;
 }
 
+.pageTabContent {
+    contain: style;
+}
+
 .pageWithAbsoluteTabs .pageTabContent, .libraryPage > .ui-content {
     padding-top: 10px;
 }
@@ -1166,13 +1170,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
     }
 }
 
-@media all and (min-height: 480px) and (max-width: 800px) {
-
-    .absolutePageTabContent .itemsContainerWithAlphaPicker iron-list {
-        width: 99.5% !important;
-    }
-}
-
 @media all and (min-height: 500px) {
 
     .alphabetPicker {
diff --git a/dashboard-ui/home.html b/dashboard-ui/home.html
index 552a441e38..69c00b884d 100644
--- a/dashboard-ui/home.html
+++ b/dashboard-ui/home.html
@@ -31,7 +31,7 @@
         <div class="favoriteSections"></div>
     </div>
     <div class="pageTabContent ehsContent" id="upcomingTab" data-index="3">
-        <div id="upcomingItems" class="itemsContainer">
+        <div id="upcomingItems">
         </div>
         <div class="noItemsMessage hide">
             <p>${MessageNothingHere}</p>
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 5901d92c44..e8adaa46c8 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -3125,7 +3125,6 @@ var AppInfo = {};
 
             console.log('Loaded dependencies in onAppReady');
 
-            imageLoader.enableFade = browserInfo.animate && !browserInfo.mobile;
             window.ImageLoader = imageLoader;
 
             layoutManager.init();