diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/chaptercardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/chaptercardbuilder.js
index 6d53561450..37c621882b 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/chaptercardbuilder.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/chaptercardbuilder.js
@@ -1,4 +1,4 @@
-define(['datetime', 'imageLoader', 'connectionManager'], function (datetime, imageLoader, connectionManager) {
+define(['datetime', 'imageLoader', 'connectionManager', 'itemShortcuts'], function (datetime, imageLoader, connectionManager, itemShortcuts) {
 
     function buildChapterCardsHtml(item, chapters, options) {
 
@@ -121,6 +121,9 @@ define(['datetime', 'imageLoader', 'connectionManager'], function (datetime, ima
         options.itemsContainer.innerHTML = html;
 
         imageLoader.lazyChildren(options.itemsContainer);
+
+        itemShortcuts.off(options.itemsContainer);
+        itemShortcuts.on(options.itemsContainer);
     }
 
     return {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js b/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js
index ae75eab55b..80d3db2dd5 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js
@@ -121,7 +121,9 @@
             searchImages[i].addEventListener('click', onSearchImageClick);
         }
 
-        focusManager.autoFocus(identificationSearchResults);
+        if (layoutManager.tv) {
+            focusManager.autoFocus(identificationSearchResults);
+        }
     }
 
     function finishFindNewDialog(dlg, identifyResult) {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html b/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html
index c5213f6e96..62c27f7b72 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html
@@ -30,7 +30,7 @@
         <div class="identificationSearchResults hide">
 
             <h1>${SearchResults}</h1>
-            <div class="identificationSearchResultList itemsContainer vertical-wrap centered"></div>
+            <div class="identificationSearchResultList itemsContainer vertical-wrap"></div>
         </div>
 
         <form class="identifyOptionsForm hide" style="margin:auto;">
diff --git a/dashboard-ui/css/tileitem.css b/dashboard-ui/css/tileitem.css
deleted file mode 100644
index 0f7e94ad84..0000000000
--- a/dashboard-ui/css/tileitem.css
+++ /dev/null
@@ -1,80 +0,0 @@
-.tileItem {
-    padding: 5px 7px 5px 0;
-    font-weight: normal !important;
-    display: block;
-    position: relative;
-    -webkit-transition: all 500ms ease;
-    -moz-transition: all 500ms ease;
-    -o-transition: all 500ms ease;
-    -ms-transition: all 500ms ease;
-    transition: all 500ms ease;
-    color: inherit!important;
-}
-
-    .tileItem .starRating {
-        width: 16px;
-        height: 14px;
-    }
-
-    .tileItem .rottentomatoesicon {
-        height: 14px;
-        width: 14px;
-    }
-
-    .tileItem .criticRating {
-        position: relative;
-        top: -2px;
-    }
-
-.tileImage {
-    display: inline-block;
-    background-size: contain;
-    background-repeat: no-repeat;
-    background-position: center top;
-}
-
-.defaultTileImage {
-    background-color: #555;
-}
-
-.tileItem p {
-    margin: 1em 0 0;
-}
-
-.tileContent {
-    display: inline-block;
-    padding-left: 10px;
-    text-align: left;
-    vertical-align: top;
-    overflow: hidden;
-}
-
-.smallPosterTileItem .tileImage {
-    height: 150px;
-    width: 35%;
-}
-
-.smallPosterTileItem .tileContent {
-    width: 60%;
-}
-
-@media all and (min-width: 540px) {
-
-    .tileItem {
-        display: inline-block;
-        margin-left: 3px;
-        margin-right: 3px;
-    }
-
-    .smallPosterTileItem {
-        width: 46%;
-        display: inline-block;
-    }
-}
-
-@media all and (min-width: 750px) {
-
-    .smallPosterTileItem {
-        width: 30.5%;
-    }
-}
\ No newline at end of file
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 68d71979ab..69ce28a9eb 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -154,7 +154,7 @@
                         <button is="paper-icon-button-light" class="autoSize"><i class="md-icon">settings</i></button>
                     </a>
                 </h1>
-                <div is="emby-itemscontainer" id="scenesContent" class="itemsContainer"></div>
+                <div id="scenesContent" class="itemsContainer"></div>
                 <button is="emby-button" type="button" class="raised more moreScenes hide">${ButtonMore}</button>
             </div>
             <div id="themeSongsCollapsible" class="detailSection hide">
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index c170cef3f3..32dd07f445 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1856,7 +1856,6 @@ var AppInfo = {};
 
         define("livetvcss", ['css!css/livetv.css']);
         define("detailtablecss", ['css!css/detailtable.css']);
-        define("tileitemcss", ['css!css/tileitem.css']);
 
         define("buttonenabled", ["legacy/buttonenabled"]);
 
@@ -2204,7 +2203,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/itemdetails.html',
-            dependencies: ['emby-button', 'tileitemcss', 'scripts/livetvcomponents', 'paper-icon-button-light', 'emby-itemscontainer'],
+            dependencies: ['emby-button', 'scripts/livetvcomponents', 'paper-icon-button-light', 'emby-itemscontainer'],
             controller: 'scripts/itemdetailpage',
             autoFocus: false,
             transition: 'fade'
diff --git a/dashboard-ui/shared.html b/dashboard-ui/shared.html
index 7680a5bf1f..3d5ffcfd90 100644
--- a/dashboard-ui/shared.html
+++ b/dashboard-ui/shared.html
@@ -1,4 +1,4 @@
-<div id="publicSharedItemPage" data-role="page" class="page standalonePage noSecondaryNavPage" data-theme="b" data-require="scripts/shared,scripts/itemdetailpage,tileitemcss,scripts/livetvcomponents">
+<div id="publicSharedItemPage" data-role="page" class="page standalonePage noSecondaryNavPage" data-theme="b" data-require="scripts/shared,scripts/itemdetailpage,scripts/livetvcomponents">
 
     <style>
         #publicSharedItemPage .header {