diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css
index 5fa66b174c..e3d74bf009 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css
@@ -10,11 +10,6 @@
     flex-shrink: 0;
 }
 
-    .tvGuideHeader.headroom--unpinned {
-        -webkit-transform: translateY(-98px);
-        transform: translateY(-98px);
-    }
-
 .tvProgramSectionHeader {
     margin: 0;
 }
diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js
index b09fa127e1..f608a62615 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js
@@ -16,6 +16,8 @@
             items = {};
         };
 
+        self.options = options;
+
         // 30 mins
         var cellCurationMinutes = 30;
         var cellDurationMs = cellCurationMinutes * 60 * 1000;
@@ -623,6 +625,8 @@
             createVerticalScroller(context, self);
             itemShortcuts.on(context);
 
+            events.trigger(self, 'load');
+
             self.refresh();
         }
 
diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index fd032ff7ea..9f957ee487 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -1,4 +1,4 @@
-<div id="cinemaModeConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Cinema-Mode" data-require="scripts/cinemamodeconfiguration,paper-checkbox,paper-input">
+<div id="cinemaModeConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Cinema-Mode" data-require="scripts/cinemamodeconfiguration,paper-checkbox,paper-input,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/connectlogin.html b/dashboard-ui/connectlogin.html
index 62ec41cdbc..92d01730fa 100644
--- a/dashboard-ui/connectlogin.html
+++ b/dashboard-ui/connectlogin.html
@@ -1,4 +1,4 @@
-<div id="connectLoginPage" data-role="page" class="page standalonePage connectLoginPage" data-theme="b" data-require="scripts/connectlogin,paper-input">
+<div id="connectLoginPage" data-role="page" class="page standalonePage connectLoginPage" data-theme="b" data-require="scripts/connectlogin,paper-input,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index d5f7b96465..93e1cbd5fe 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -66,14 +66,6 @@
     padding-top: 10px;
 }
 
-.absolutePageTabContent {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-}
-
 /*.pageWithAbsoluteTabs .pageTabContent {
     padding-left: .5em !important;
     padding-right: .5em !important;
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index d3cd621df2..240504c176 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -11,12 +11,24 @@
 }
 
 .absolutePageTabContent {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1000;
     margin: 0 !important;
     width: 100% !important;
     /* Page needs to supply padding */
     top: 92px !important;
+    transition: transform 200ms ease-out;
 }
 
+    .absolutePageTabContent.headroomUnpinned {
+        transform: translateY(-92px);
+        bottom: -92px!important;
+    }
+
 .sidebarDivider {
     height: 1px;
     background: #eaeaea;
diff --git a/dashboard-ui/css/livetv.css b/dashboard-ui/css/livetv.css
index 71e44e5d78..8e450cd859 100644
--- a/dashboard-ui/css/livetv.css
+++ b/dashboard-ui/css/livetv.css
@@ -10,3 +10,8 @@
 .guideVerticalScroller {
     padding-bottom: 160px;
 }
+
+.tvGuideHeader.headroom--unpinned {
+    -webkit-transform: none;
+    transform: none;
+}
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index 893f15fa9d..de388a8433 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -1,4 +1,4 @@
-<div id="dashboardPage" data-role="page" class="page type-interior dashboardHomePage" data-require="scripts/dashboardpage,humanedate,buttonenabled,paper-icon-item,paper-item-body,paper-fab,emby-collapsible">
+<div id="dashboardPage" data-role="page" class="page type-interior dashboardHomePage" data-require="scripts/dashboardpage,humanedate,buttonenabled,paper-icon-item,paper-item-body,paper-fab,emby-collapsible,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/dashboardhosting.html b/dashboard-ui/dashboardhosting.html
index 0cc32dd957..dad51165c3 100644
--- a/dashboard-ui/dashboardhosting.html
+++ b/dashboard-ui/dashboardhosting.html
@@ -1,4 +1,4 @@
-<div id="dashboardHostingPage" data-role="page" class="page type-interior advancedConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Hosting%20Settings" data-require="scripts/dashboardhosting,paper-checkbox,paper-input">
+<div id="dashboardHostingPage" data-role="page" class="page type-interior advancedConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Hosting%20Settings" data-require="scripts/dashboardhosting,paper-checkbox,paper-input,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/device.html b/dashboard-ui/device.html
index f9cfdb8d07..e3ef050961 100644
--- a/dashboard-ui/device.html
+++ b/dashboard-ui/device.html
@@ -1,4 +1,4 @@
-<div id="devicePage" data-role="page" class="page type-interior devicesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Devices" data-require="scripts/device,paper-input">
+<div id="devicePage" data-role="page" class="page type-interior devicesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Devices" data-require="scripts/device,paper-input,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/devicesupload.html b/dashboard-ui/devicesupload.html
index adf38fb8b8..5ebae7b7ce 100644
--- a/dashboard-ui/devicesupload.html
+++ b/dashboard-ui/devicesupload.html
@@ -1,4 +1,4 @@
-<div id="devicesUploadPage" data-role="page" class="page type-interior devicesPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Camera%20upload" data-require="scripts/devicesupload,paper-input,paper-checkbox">
+<div id="devicesUploadPage" data-role="page" class="page type-interior devicesPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Camera%20upload" data-require="scripts/devicesupload,paper-input,paper-checkbox,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index bc93fb803d..39e5bda870 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -1,4 +1,4 @@
-<div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="jqmcollapsible,jqmpopup,scripts/dlnaprofile,jqmcheckbox">
+<div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="jqmcollapsible,jqmpopup,scripts/dlnaprofile,jqmcheckbox,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/dlnaprofiles.html b/dashboard-ui/dlnaprofiles.html
index 2f9efc4591..89a573ee88 100644
--- a/dashboard-ui/dlnaprofiles.html
+++ b/dashboard-ui/dlnaprofiles.html
@@ -1,4 +1,4 @@
-<div id="dlnaProfilesPage" data-role="page" class="page type-interior dlnaPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="scripts/dlnaprofiles">
+<div id="dlnaProfilesPage" data-role="page" class="page type-interior dlnaPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="scripts/dlnaprofiles,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/dlnasettings.html b/dashboard-ui/dlnasettings.html
index 9a2360d793..107929d486 100644
--- a/dashboard-ui/dlnasettings.html
+++ b/dashboard-ui/dlnasettings.html
@@ -1,4 +1,4 @@
-<div id="dlnaSettingsPage" data-role="page" class="page type-interior withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Play%20to" data-require="scripts/dlnasettings,paper-input,paper-checkbox">
+<div id="dlnaSettingsPage" data-role="page" class="page type-interior withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Play%20to" data-require="scripts/dlnasettings,paper-input,paper-checkbox,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index 594f84b2ca..e0a144e54d 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -1,4 +1,4 @@
-<div id="encodingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Transcoding" data-require="scripts/encodingsettings,paper-input,paper-checkbox">
+<div id="encodingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Transcoding" data-require="scripts/encodingsettings,paper-input,paper-checkbox,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/forgotpassword.html b/dashboard-ui/forgotpassword.html
index 7c7a14a5f7..8e3b658c92 100644
--- a/dashboard-ui/forgotpassword.html
+++ b/dashboard-ui/forgotpassword.html
@@ -1,4 +1,4 @@
-<div data-role="page" id="forgotPasswordPage" class="page standalonePage forgotPasswordPage" data-theme="b" data-require="scripts/forgotpassword,paper-input">
+<div data-role="page" id="forgotPasswordPage" class="page standalonePage forgotPasswordPage" data-theme="b" data-require="scripts/forgotpassword,paper-input,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/forgotpasswordpin.html b/dashboard-ui/forgotpasswordpin.html
index f519af49d8..f8a7d6f865 100644
--- a/dashboard-ui/forgotpasswordpin.html
+++ b/dashboard-ui/forgotpasswordpin.html
@@ -1,4 +1,4 @@
-<div data-role="page" class="page standalonePage forgotPasswordPinPage" data-theme="b" data-require="scripts/forgotpasswordpin,paper-input">
+<div data-role="page" class="page standalonePage forgotPasswordPinPage" data-theme="b" data-require="scripts/forgotpasswordpin,paper-input,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index d94bf269ad..df378ae204 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -1,4 +1,4 @@
-<div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage noSecondaryNavPage selfBackdropPage" data-theme="b" data-require="scripts/itemdetailpage,tileitemcss,scripts/livetvcomponents,paper-fab,paper-item-body,paper-icon-item">
+<div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage noSecondaryNavPage selfBackdropPage" data-theme="b" data-require="scripts/itemdetailpage,tileitemcss,scripts/livetvcomponents,paper-fab,paper-item-body,paper-icon-item,paper-button">
 
     <div id="itemBackdrop" class="itemBackdrop noBackdrop">
         <div class="itemBackdropContent">
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index cf88f129a6..a8062db154 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -1,4 +1,4 @@
-<div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage withTabs" data-require="emby-collapsible,scripts/librarysettings,paper-input,paper-checkbox">
+<div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage withTabs" data-require="emby-collapsible,scripts/librarysettings,paper-input,paper-checkbox,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/livetv.html b/dashboard-ui/livetv.html
index 5cd9b808f8..9f463d2649 100644
--- a/dashboard-ui/livetv.html
+++ b/dashboard-ui/livetv.html
@@ -1,4 +1,4 @@
-<div id="liveTvSuggestedPage" data-dom-cache="true" data-role="page" class="page libraryPage liveTvPage pageWithAbsoluteTabs" data-contextname="${HeaderLiveTv}" data-backdroptype="series,movie" data-require="scripts/livetvsuggested,livetvcss,scripts/livetvcomponents,paper-tabs,paper-checkbox">
+<div id="liveTvSuggestedPage" data-dom-cache="true" data-role="page" class="page libraryPage liveTvPage pageWithAbsoluteTabs" data-contextname="${HeaderLiveTv}" data-backdroptype="series,movie" data-require="scripts/livetvsuggested,livetvcss,scripts/livetvcomponents,paper-tabs,paper-checkbox,paper-button">
 
     <div class="libraryViewNav libraryViewNavWithMinHeight">
         <paper-tabs hidescrollbuttons noink>
diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html
index 629d3eddd8..a35b124409 100644
--- a/dashboard-ui/livetvseriestimer.html
+++ b/dashboard-ui/livetvseriestimer.html
@@ -1,4 +1,4 @@
-<div id="liveTvSeriesTimerPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-contextname="${HeaderLiveTv}" data-require="jqmcheckbox,jqmcontrolgroup,jqmcollapsible,scripts/livetvcomponents,scripts/livetvseriestimer,livetvcss,paper-checkbox,paper-input" data-backbutton="true" data-menubutton="false">
+<div id="liveTvSeriesTimerPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-contextname="${HeaderLiveTv}" data-require="jqmcheckbox,jqmcontrolgroup,paper-button,jqmcollapsible,scripts/livetvcomponents,scripts/livetvseriestimer,livetvcss,paper-checkbox,paper-input" data-backbutton="true" data-menubutton="false">
 
     <div data-role="content">
         <form class="liveTvSeriesTimerForm" style="margin: 0 auto; max-width: 720px;">
diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html
index d77c532373..c3aa6b247f 100644
--- a/dashboard-ui/livetvsettings.html
+++ b/dashboard-ui/livetvsettings.html
@@ -1,4 +1,4 @@
-<div id="liveTvSettingsPage" data-role="page" class="page type-interior liveTvPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvsettings,paper-checkbox,paper-input,emby-collapsible">
+<div id="liveTvSettingsPage" data-role="page" class="page type-interior liveTvPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvsettings,paper-checkbox,paper-input,emby-collapsible,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html
index 0d51446950..196d48103a 100644
--- a/dashboard-ui/livetvstatus.html
+++ b/dashboard-ui/livetvstatus.html
@@ -1,4 +1,4 @@
-<div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvstatus,scripts/taskbutton,paper-fab,paper-item-body,paper-icon-item,paper-checkbox">
+<div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvstatus,scripts/taskbutton,paper-fab,paper-item-body,paper-icon-item,paper-checkbox,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/livetvtimer.html b/dashboard-ui/livetvtimer.html
index 993ae84d1d..77a80613b1 100644
--- a/dashboard-ui/livetvtimer.html
+++ b/dashboard-ui/livetvtimer.html
@@ -1,4 +1,4 @@
-<div id="liveTvTimerPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-contextname="${HeaderLiveTv}" data-require="jqmcollapsible,scripts/livetvcomponents,scripts/livetvtimer,livetvcss,paper-input" data-backbutton="true" data-menubutton="false">
+<div id="liveTvTimerPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-contextname="${HeaderLiveTv}" data-require="jqmcollapsible,scripts/livetvcomponents,scripts/livetvtimer,livetvcss,paper-input,paper-button" data-backbutton="true" data-menubutton="false">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/livetvtunerprovider-hdhomerun.html b/dashboard-ui/livetvtunerprovider-hdhomerun.html
index 09210b0de2..2c7c9c29f0 100644
--- a/dashboard-ui/livetvtunerprovider-hdhomerun.html
+++ b/dashboard-ui/livetvtunerprovider-hdhomerun.html
@@ -1,4 +1,4 @@
-<div id="liveTvTunerProviderHdHomerunPage" data-role="page" class="page type-interior liveTvSettingsPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvtunerprovider-hdhomerun,paper-input,paper-checkbox">
+<div id="liveTvTunerProviderHdHomerunPage" data-role="page" class="page type-interior liveTvSettingsPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvtunerprovider-hdhomerun,paper-input,paper-checkbox,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/livetvtunerprovider-m3u.html b/dashboard-ui/livetvtunerprovider-m3u.html
index 2dff46883a..67bcd09aa4 100644
--- a/dashboard-ui/livetvtunerprovider-m3u.html
+++ b/dashboard-ui/livetvtunerprovider-m3u.html
@@ -1,4 +1,4 @@
-<div id="liveTvTunerProviderM3UPage" data-role="page" class="page type-interior liveTvSettingsPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvtunerprovider-m3u,paper-input">
+<div id="liveTvTunerProviderM3UPage" data-role="page" class="page type-interior liveTvSettingsPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvtunerprovider-m3u,paper-input,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/login.html b/dashboard-ui/login.html
index 1d37d270cd..488ac4dcc7 100644
--- a/dashboard-ui/login.html
+++ b/dashboard-ui/login.html
@@ -1,4 +1,4 @@
-<div id="loginPage" data-role="page" class="page standalonePage" data-theme="b" data-require="scripts/loginpage,humanedate,paper-input">
+<div id="loginPage" data-role="page" class="page standalonePage" data-theme="b" data-require="scripts/loginpage,humanedate,paper-input,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index eabd7e657c..dac8ed6fa5 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -1,4 +1,4 @@
-<div id="metadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="scripts/metadataconfigurationpage,paper-checkbox">
+<div id="metadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="scripts/metadataconfigurationpage,paper-checkbox,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index 09ce52a901..9c94c3f77c 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -1,4 +1,4 @@
-<div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="emby-collapsible,scripts/metadataimagespage,paper-checkbox,paper-input,paper-fab,paper-icon-item,paper-item-body">
+<div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="emby-collapsible,scripts/metadataimagespage,paper-checkbox,paper-input,paper-fab,paper-icon-item,paper-item-body,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/metadatanfo.html b/dashboard-ui/metadatanfo.html
index 11c9c465e9..cba52e027e 100644
--- a/dashboard-ui/metadatanfo.html
+++ b/dashboard-ui/metadatanfo.html
@@ -1,4 +1,4 @@
-<div id="metadataNfoPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="scripts/metadatanfo,paper-checkbox">
+<div id="metadataNfoPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="scripts/metadatanfo,paper-checkbox,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/metadatasubtitles.html b/dashboard-ui/metadatasubtitles.html
index 3df928af7c..a3370d520b 100644
--- a/dashboard-ui/metadatasubtitles.html
+++ b/dashboard-ui/metadatasubtitles.html
@@ -1,4 +1,4 @@
-<div id="metadataSubtitlesPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadatasubtitles,paper-input,paper-checkbox">
+<div id="metadataSubtitlesPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadatasubtitles,paper-input,paper-checkbox,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index b9344c7cd7..cc5304cae7 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -1,4 +1,4 @@
-<div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderDisplaySettings}" data-require="scripts/mypreferencesdisplay,paper-checkbox" data-backbutton="true" data-menubutton="false">
+<div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderDisplaySettings}" data-require="scripts/mypreferencesdisplay,paper-checkbox,paper-button" data-backbutton="true" data-menubutton="false">
     <div data-role="content">
         <form class="displayPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
             <div class="detailSection languageSection">
diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html
index 12267f66c2..2da602b1c6 100644
--- a/dashboard-ui/mypreferenceshome.html
+++ b/dashboard-ui/mypreferenceshome.html
@@ -1,4 +1,4 @@
-<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-require="scripts/mypreferenceshome,paper-checkbox,paper-fab,paper-item-body,paper-icon-item" data-backbutton="true" data-menubutton="false">
+<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-require="scripts/mypreferenceshome,paper-checkbox,paper-fab,paper-item-body,paper-icon-item,paper-button" data-backbutton="true" data-menubutton="false">
 
     <div data-role="content">
         <form class="homeScreenPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html
index 8fccd405cf..93b89e3ab3 100644
--- a/dashboard-ui/mypreferenceslanguages.html
+++ b/dashboard-ui/mypreferenceslanguages.html
@@ -1,4 +1,4 @@
-<div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderPlaybackSettings}" data-require="scripts/mypreferenceslanguages,paper-checkbox" data-backbutton="true" data-menubutton="false">
+<div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderPlaybackSettings}" data-require="scripts/mypreferenceslanguages,paper-checkbox,paper-button" data-backbutton="true" data-menubutton="false">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html
index 3c2f477236..135e8af39e 100644
--- a/dashboard-ui/myprofile.html
+++ b/dashboard-ui/myprofile.html
@@ -1,4 +1,4 @@
-<div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${HeaderProfile}" data-require="jqmcollapsible,scripts/myprofile,paper-checkbox,paper-input" data-backbutton="true" data-menubutton="false">
+<div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${HeaderProfile}" data-require="jqmcollapsible,scripts/myprofile,paper-checkbox,paper-input,paper-button" data-backbutton="true" data-menubutton="false">
 
     <div data-role="content">
         <br />
diff --git a/dashboard-ui/mysync.html b/dashboard-ui/mysync.html
index 5b2b4c4f77..73486bd133 100644
--- a/dashboard-ui/mysync.html
+++ b/dashboard-ui/mysync.html
@@ -1,4 +1,4 @@
-<div id="mySyncActivityPage" data-role="page" class="page libraryPage syncActivityPage mySyncPage noSecondaryNavPage" data-contextname="${TitleSync}" data-require="scripts/syncactivity,scripts/taskbutton,scripts/mysync,paper-spinner,paper-fab">
+<div id="mySyncActivityPage" data-role="page" class="page libraryPage syncActivityPage mySyncPage noSecondaryNavPage" data-contextname="${TitleSync}" data-require="scripts/syncactivity,scripts/taskbutton,scripts/mysync,paper-spinner,paper-fab,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/mysyncsettings.html b/dashboard-ui/mysyncsettings.html
index aab3c95ad6..fddbbcbcf9 100644
--- a/dashboard-ui/mysyncsettings.html
+++ b/dashboard-ui/mysyncsettings.html
@@ -1,4 +1,4 @@
-<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-require="scripts/mysyncsettings,paper-checkbox,paper-input" data-backbutton="true" data-menubutton="false">
+<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-require="scripts/mysyncsettings,paper-checkbox,paper-input,paper-button" data-backbutton="true" data-menubutton="false">
 
     <div data-role="content">
         <form class="userProfileSettingsForm" style="margin: 0 auto;">
diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html
index f8a0fb8083..cff8791385 100644
--- a/dashboard-ui/notificationsetting.html
+++ b/dashboard-ui/notificationsetting.html
@@ -1,4 +1,4 @@
-<div id="notificationSettingPage" data-role="page" class="page type-interior notificationConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Notifications" data-require="scripts/notificationsetting,paper-input,paper-checkbox">
+<div id="notificationSettingPage" data-role="page" class="page type-interior notificationConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Notifications" data-require="scripts/notificationsetting,paper-input,paper-checkbox,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html
index 35118c2af6..f1e45087a3 100644
--- a/dashboard-ui/nowplaying.html
+++ b/dashboard-ui/nowplaying.html
@@ -1,4 +1,4 @@
-<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage selfBackdropPage" data-contextname="${TitleRemoteControl}" data-theme="b" data-require="scripts/nowplayingpage,paper-tabs,paper-icon-button,paper-slider">
+<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage selfBackdropPage" data-contextname="${TitleRemoteControl}" data-theme="b" data-require="scripts/nowplayingpage,paper-tabs,paper-icon-button,paper-slider,paper-button">
 
     <div class="remoteControlContent">
 
diff --git a/dashboard-ui/playbackconfiguration.html b/dashboard-ui/playbackconfiguration.html
index a9c5f7964e..16f210d4f4 100644
--- a/dashboard-ui/playbackconfiguration.html
+++ b/dashboard-ui/playbackconfiguration.html
@@ -1,4 +1,4 @@
-<div id="playbackConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-require="scripts/playbackconfiguration,paper-input">
+<div id="playbackConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-require="scripts/playbackconfiguration,paper-input,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/scheduledtask.html b/dashboard-ui/scheduledtask.html
index cbfe07a05f..769f47e478 100644
--- a/dashboard-ui/scheduledtask.html
+++ b/dashboard-ui/scheduledtask.html
@@ -1,4 +1,4 @@
-<div id="scheduledTaskPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Scheduled%20tasks" data-require="jqmpopup,scripts/scheduledtaskpage,paper-input">
+<div id="scheduledTaskPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Scheduled%20tasks" data-require="jqmpopup,scripts/scheduledtaskpage,paper-input,paper-button">
     <div data-role="content">
         <div class="content-primary">
 
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 68893fae80..9fc341cd6a 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -3419,10 +3419,6 @@
                     html += '</paper-radio-group>';
                     html += '</div>';
 
-                    //html += '<div class="buttons">';
-                    //html += '<paper-button dialog-dismiss>' + Globalize.translate('ButtonClose') + '</paper-button>';
-                    //html += '</div>';
-
                     dlg.innerHTML = html;
                     document.body.appendChild(dlg);
 
diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js
index bdbf482d8e..80f3fc448b 100644
--- a/dashboard-ui/scripts/livetvguide.js
+++ b/dashboard-ui/scripts/livetvguide.js
@@ -1,4 +1,28 @@
-define(['tvguide', 'embyRouter'], function (tvguide, embyRouter) {
+define(['tvguide', 'events'], function (tvguide, events) {
+
+    function onGuideLoaded() {
+
+        var context = this.options.element;
+
+        require(["headroom"], function () {
+
+            // construct an instance of Headroom, passing the element
+            var headroom = new Headroom(context.querySelector('.tvGuideHeader'), {
+                // or scroll tolerance per direction
+                scroller: context.querySelector('.guideVerticalScroller'),
+
+                onPin: function () {
+                    context.classList.remove('headroomUnpinned');
+                },
+                // callback when unpinned, `this` is headroom object
+                onUnpin: function () {
+                    context.classList.add('headroomUnpinned');
+                }
+            });
+            // initialise
+            headroom.init();
+        });
+    }
 
     window.LiveTvPage.initGuideTab = function (page, tabContent) {
 
@@ -6,15 +30,14 @@
 
     window.LiveTvPage.renderGuideTab = function (page, tabContent) {
 
-        if (page.guideInstance) {
-            if (LibraryBrowser.needsRefresh(tabContent)) {
-                page.guideInstance.refresh();
-            }
-        } else {
+        if (!page.guideInstance) {
+
             page.guideInstance = new tvguide({
-                element: tabContent,
-                enableHeadRoom: true
+                element: tabContent
             });
+
+            events.on(page.guideInstance, 'load', onGuideLoaded);
+
         }
     };
 
diff --git a/dashboard-ui/scripts/registrationservices.js b/dashboard-ui/scripts/registrationservices.js
index 42a16e2047..87355cf2d7 100644
--- a/dashboard-ui/scripts/registrationservices.js
+++ b/dashboard-ui/scripts/registrationservices.js
@@ -97,7 +97,7 @@
 
     function showPlaybackOverlay(resolve, reject) {
 
-        require(['dialogHelper', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function (dialogHelper) {
+        require(['dialogHelper', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'paper-button'], function (dialogHelper) {
 
             var dlg = dialogHelper.createDialog({
                 size: 'fullscreen-border'
diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js
index f42b4be80e..54a98cbf3e 100644
--- a/dashboard-ui/scripts/sections.js
+++ b/dashboard-ui/scripts/sections.js
@@ -1,4 +1,4 @@
-define(['libraryBrowser', 'jQuery', 'appSettings', 'scrollStyles'], function (LibraryBrowser, $, appSettings) {
+define(['libraryBrowser', 'jQuery', 'appSettings', 'scrollStyles', 'paper-button'], function (LibraryBrowser, $, appSettings) {
 
     function getUserViews(userId) {
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index fabdfbad4f..97722b31a1 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -2545,7 +2545,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/movies.html',
-            dependencies: ['paper-tabs', 'paper-checkbox', 'paper-fab', 'scripts/alphapicker'],
+            dependencies: ['paper-tabs', 'paper-checkbox', 'paper-fab', 'scripts/alphapicker', 'paper-button'],
             autoFocus: false,
             controller: 'scripts/moviesrecommended'
         });
diff --git a/dashboard-ui/scripts/syncjob.js b/dashboard-ui/scripts/syncjob.js
index 668242da17..5f10d02ac7 100644
--- a/dashboard-ui/scripts/syncjob.js
+++ b/dashboard-ui/scripts/syncjob.js
@@ -1,4 +1,4 @@
-define(['jQuery', 'paper-progress', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'paper-icon-button'], function ($) {
+define(['jQuery', 'paper-progress', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'paper-icon-button', 'paper-button'], function ($) {
 
     function renderJob(page, job, dialogOptions) {
 
diff --git a/dashboard-ui/scripts/taskbutton.js b/dashboard-ui/scripts/taskbutton.js
index c5cf48bf3b..2e4311f419 100644
--- a/dashboard-ui/scripts/taskbutton.js
+++ b/dashboard-ui/scripts/taskbutton.js
@@ -1,4 +1,4 @@
-define(['appStorage', 'jQuery'], function (appStorage, $) {
+define(['appStorage', 'jQuery', 'paper-button'], function (appStorage, $) {
 
     $.fn.taskButton = function (options) {
 
diff --git a/dashboard-ui/selectserver.html b/dashboard-ui/selectserver.html
index 349eb4783d..43a4bb9388 100644
--- a/dashboard-ui/selectserver.html
+++ b/dashboard-ui/selectserver.html
@@ -1,4 +1,4 @@
-<div id="selectServerPage" data-role="page" class="page noSecondaryNavPage standalonePage" data-theme="b" data-require="scripts/selectserver,paper-fab,paper-item-body,paper-icon-item">
+<div id="selectServerPage" data-role="page" class="page noSecondaryNavPage standalonePage" data-theme="b" data-require="scripts/selectserver,paper-fab,paper-item-body,paper-icon-item,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/serversecurity.html b/dashboard-ui/serversecurity.html
index d1e4dc16ba..c9e67a85c0 100644
--- a/dashboard-ui/serversecurity.html
+++ b/dashboard-ui/serversecurity.html
@@ -1,4 +1,4 @@
-<div id="serverSecurityPage" data-role="page" class="page type-interior advancedConfigurationPage withTabs" data-require="jqmtable,scripts/serversecurity,detailtablecss">
+<div id="serverSecurityPage" data-role="page" class="page type-interior advancedConfigurationPage withTabs" data-require="jqmtable,scripts/serversecurity,detailtablecss,paper-button">
     <div data-role="content">
         <div class="content-primary">
             <div class="detailSectionHeader">
diff --git a/dashboard-ui/streamingsettings.html b/dashboard-ui/streamingsettings.html
index 42c6164454..4409dc5295 100644
--- a/dashboard-ui/streamingsettings.html
+++ b/dashboard-ui/streamingsettings.html
@@ -1,4 +1,4 @@
-<div id="streamingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Streaming" data-require="scripts/streamingsettings,paper-input">
+<div id="streamingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Streaming" data-require="scripts/streamingsettings,paper-input,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/supporterkey.html b/dashboard-ui/supporterkey.html
index 7d7b175b39..c271da2af6 100644
--- a/dashboard-ui/supporterkey.html
+++ b/dashboard-ui/supporterkey.html
@@ -1,4 +1,4 @@
-<div id="supporterKeyPage" data-role="page" class="page type-interior withTabs" data-require="jqmcollapsible,scripts/supporterkeypage,paper-input">
+<div id="supporterKeyPage" data-role="page" class="page type-interior withTabs" data-require="jqmcollapsible,scripts/supporterkeypage,paper-input,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/syncactivity.html b/dashboard-ui/syncactivity.html
index e43aec1f38..6405bc9b89 100644
--- a/dashboard-ui/syncactivity.html
+++ b/dashboard-ui/syncactivity.html
@@ -1,4 +1,4 @@
-<div id="syncActivityPage" data-role="page" class="page type-interior syncConfigurationPage syncActivityPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="scripts/syncactivity,scripts/taskbutton">
+<div id="syncActivityPage" data-role="page" class="page type-interior syncConfigurationPage syncActivityPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="scripts/syncactivity,scripts/taskbutton,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/syncsettings.html b/dashboard-ui/syncsettings.html
index 819222dd7c..194028ad05 100644
--- a/dashboard-ui/syncsettings.html
+++ b/dashboard-ui/syncsettings.html
@@ -1,4 +1,4 @@
-<div id="syncSettingsPage" data-role="page" class="page type-interior withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="scripts/syncsettings,paper-checkbox,paper-input">
+<div id="syncSettingsPage" data-role="page" class="page type-interior withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="scripts/syncsettings,paper-checkbox,paper-input,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html
index 14d563e492..00dd6a8871 100644
--- a/dashboard-ui/useredit.html
+++ b/dashboard-ui/useredit.html
@@ -1,4 +1,4 @@
-<div id="editUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmcollapsible,scripts/useredit,paper-input,paper-checkbox">
+<div id="editUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmcollapsible,scripts/useredit,paper-input,paper-checkbox,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/userlibraryaccess.html b/dashboard-ui/userlibraryaccess.html
index 8c4e20d8de..84bfd7496b 100644
--- a/dashboard-ui/userlibraryaccess.html
+++ b/dashboard-ui/userlibraryaccess.html
@@ -1,4 +1,4 @@
-<div id="userLibraryAccessPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/userlibraryaccess,paper-checkbox">
+<div id="userLibraryAccessPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/userlibraryaccess,paper-checkbox,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/usernew.html b/dashboard-ui/usernew.html
index 33f26f7de8..c5f22bcd13 100644
--- a/dashboard-ui/usernew.html
+++ b/dashboard-ui/usernew.html
@@ -1,4 +1,4 @@
-<div id="newUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/usernew,paper-input,paper-checkbox">
+<div id="newUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/usernew,paper-input,paper-checkbox,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index d3d2ff90ba..2c6a023d38 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -1,4 +1,4 @@
-<div id="userParentalControlPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmpopup,jqmcollapsible,scripts/userparentalcontrol,paper-checkbox">
+<div id="userParentalControlPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmpopup,jqmcollapsible,scripts/userparentalcontrol,paper-checkbox,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/userpassword.html b/dashboard-ui/userpassword.html
index d370c4ff2c..6e53658297 100644
--- a/dashboard-ui/userpassword.html
+++ b/dashboard-ui/userpassword.html
@@ -1,4 +1,4 @@
-<div id="userPasswordPage" data-role="page" class="page type-interior userProfilesPage userPasswordPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/myprofile,scripts/userpassword,paper-checkbox,paper-input">
+<div id="userPasswordPage" data-role="page" class="page type-interior userProfilesPage userPasswordPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/myprofile,scripts/userpassword,paper-checkbox,paper-input,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/userprofiles.html b/dashboard-ui/userprofiles.html
index 8119cea82e..72793aa7d7 100644
--- a/dashboard-ui/userprofiles.html
+++ b/dashboard-ui/userprofiles.html
@@ -1,4 +1,4 @@
-<div id="userProfilesPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/userprofilespage">
+<div id="userProfilesPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/userprofilespage,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
diff --git a/dashboard-ui/voice/voicedialog.js b/dashboard-ui/voice/voicedialog.js
index bc5904943b..093c2f4cf4 100644
--- a/dashboard-ui/voice/voicedialog.js
+++ b/dashboard-ui/voice/voicedialog.js
@@ -1,4 +1,4 @@
-define(['dialogHelper', 'jQuery'], function (dialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'paper-button'], function (dialogHelper, $) {
 
     var currentRecognition;
     var lang = 'en-US';
diff --git a/dashboard-ui/wizardagreement.html b/dashboard-ui/wizardagreement.html
index f48791e90a..9060e7d819 100644
--- a/dashboard-ui/wizardagreement.html
+++ b/dashboard-ui/wizardagreement.html
@@ -1,4 +1,4 @@
-<div id="wizardAgreementPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardagreement,paper-checkbox">
+<div id="wizardAgreementPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardagreement,paper-checkbox,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/wizardfinish.html b/dashboard-ui/wizardfinish.html
index 5258ff3f60..454a5d47c3 100644
--- a/dashboard-ui/wizardfinish.html
+++ b/dashboard-ui/wizardfinish.html
@@ -1,4 +1,4 @@
-<div id="wizardFinishPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardfinishpage">
+<div id="wizardFinishPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardfinishpage,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html
index db3d5275df..f203683f91 100644
--- a/dashboard-ui/wizardlibrary.html
+++ b/dashboard-ui/wizardlibrary.html
@@ -1,4 +1,4 @@
-<div id="wizardLibraryPage" data-role="page" class="page standalonePage wizardPage mediaLibraryPage" data-require="scripts/medialibrarypage,scripts/taskbutton">
+<div id="wizardLibraryPage" data-role="page" class="page standalonePage wizardPage mediaLibraryPage" data-require="scripts/medialibrarypage,scripts/taskbutton,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/wizardlivetvguide.html b/dashboard-ui/wizardlivetvguide.html
index e288e32b77..4a0cfdfe69 100644
--- a/dashboard-ui/wizardlivetvguide.html
+++ b/dashboard-ui/wizardlivetvguide.html
@@ -1,4 +1,4 @@
-<div id="wizardGuidePage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardlivetvguide">
+<div id="wizardGuidePage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardlivetvguide,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/wizardlivetvtuner.html b/dashboard-ui/wizardlivetvtuner.html
index 587665b342..3b6c0b5b3c 100644
--- a/dashboard-ui/wizardlivetvtuner.html
+++ b/dashboard-ui/wizardlivetvtuner.html
@@ -1,4 +1,4 @@
-<div id="wizardTunerPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardlivetvtuner,paper-input">
+<div id="wizardTunerPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardlivetvtuner,paper-input,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/wizardservice.html b/dashboard-ui/wizardservice.html
index 9f87349de0..97c9b31fba 100644
--- a/dashboard-ui/wizardservice.html
+++ b/dashboard-ui/wizardservice.html
@@ -1,4 +1,4 @@
-<div id="wizardServicePage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardservice">
+<div id="wizardServicePage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardservice,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/wizardsettings.html b/dashboard-ui/wizardsettings.html
index b167e40c46..98985fa42f 100644
--- a/dashboard-ui/wizardsettings.html
+++ b/dashboard-ui/wizardsettings.html
@@ -1,4 +1,4 @@
-<div id="wizardSettingsPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardsettings,paper-checkbox">
+<div id="wizardSettingsPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardsettings,paper-checkbox,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/wizardstart.html b/dashboard-ui/wizardstart.html
index f20eb1f0eb..4e6f52f20a 100644
--- a/dashboard-ui/wizardstart.html
+++ b/dashboard-ui/wizardstart.html
@@ -1,4 +1,4 @@
-<div id="wizardStartPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardstartpage">
+<div id="wizardStartPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardstartpage,paper-button">
 
     <div data-role="content">
 
diff --git a/dashboard-ui/wizarduser.html b/dashboard-ui/wizarduser.html
index d9106ca613..2a104f59a6 100644
--- a/dashboard-ui/wizarduser.html
+++ b/dashboard-ui/wizarduser.html
@@ -1,4 +1,4 @@
-<div id="wizardUserPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizarduserpage,paper-input">
+<div id="wizardUserPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizarduserpage,paper-input,paper-button">
 
     <div data-role="content">