diff --git a/dashboard-ui/channels.html b/dashboard-ui/channels.html
index 8a4bd375f8..ef26c643d8 100644
--- a/dashboard-ui/channels.html
+++ b/dashboard-ui/channels.html
@@ -1,4 +1,4 @@
-<div id="channelsPage" data-role="page" data-dom-cache="true" class="page libraryPage channelsPage pageWithAbsoluteTabs" data-contextname="${HeaderChannels}" data-require="scripts/channels,scripts/channelslatest,scripts/sections">
+<div id="channelsPage" data-role="page" data-dom-cache="true" class="page libraryPage channelsPage" data-contextname="${HeaderChannels}" data-require="scripts/channels,scripts/channelslatest,scripts/sections">
 
     <div class="libraryViewNav">
         <button class="pageTabButton is-active" data-index="0">${TabLatest}</button>
diff --git a/dashboard-ui/home.html b/dashboard-ui/home.html
index 69c00b884d..3473e329da 100644
--- a/dashboard-ui/home.html
+++ b/dashboard-ui/home.html
@@ -1,4 +1,4 @@
-<div id="indexPage" style="outline: none;" data-role="page" data-dom-cache="true" class="page homePage libraryPage allLibraryPage backdropPage pageWithAbsoluteTabs" data-title="${ButtonHome}" data-backdroptype="movie,series,game,book">
+<div id="indexPage" style="outline: none;" data-role="page" data-dom-cache="true" class="page homePage libraryPage allLibraryPage backdropPage" data-title="${ButtonHome}" data-backdroptype="movie,series,game,book">
 
     <div class="libraryViewNav">
         <button class="pageTabButton is-active" data-index="0">${TabHome}</button>
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index ee2607ae03..fdbbf787fa 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -1,4 +1,4 @@
-<div id="moviesPage" data-role="page" data-dom-cache="true" class="page libraryPage backdropPage pageWithAbsoluteTabs collectionEditorPage" data-backdroptype="movie">
+<div id="moviesPage" data-role="page" data-dom-cache="true" class="page libraryPage backdropPage collectionEditorPage" data-backdroptype="movie">
 
     <div class="libraryViewNav">
         <button class="pageTabButton is-active" data-index="0">${TabSuggestions}</button>
diff --git a/dashboard-ui/music.html b/dashboard-ui/music.html
index f2067c60f9..17a95fd960 100644
--- a/dashboard-ui/music.html
+++ b/dashboard-ui/music.html
@@ -1,4 +1,4 @@
-<div id="musicRecommendedPage" data-dom-cache="true" data-role="page" class="page libraryPage backdropPage pageWithAbsoluteTabs" data-backdroptype="musicartist">
+<div id="musicRecommendedPage" data-dom-cache="true" data-role="page" class="page libraryPage backdropPage" data-backdroptype="musicartist">
 
     <div class="libraryViewNav">
         <button class="pageTabButton is-active" data-index="0">${TabSuggestions}</button>
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 7d3d2797c6..9557fdf117 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -1,4 +1,4 @@
-define(['appSettings', 'datetime', 'jQuery', 'mediaInfo', 'scrollStyles', 'paper-icon-button-light'], function (appSettings, datetime, $, mediaInfo) {
+define(['appSettings', 'datetime', 'mediaInfo', 'jQuery', 'scrollStyles', 'paper-icon-button-light'], function (appSettings, datetime, mediaInfo, $) {
 
     function createVideoPlayer(self) {
 
@@ -42,8 +42,12 @@
                 self.exitFullScreen();
             }
 
-            fadeOut(document.querySelector('#videoPlayer'));
-            $('#videoPlayer').removeClass('fullscreenVideo').removeClass('idlePlayer');
+            var videoPlayerElement = document.querySelector('#videoPlayer');
+
+            fadeOut(videoPlayerElement);
+            videoPlayerElement.classList.remove('fullscreenVideo');
+            videoPlayerElement.classList.remove('idlePlayer');
+
             $('.hiddenOnIdle').removeClass("inactive");
             $("video").remove();
 
@@ -64,7 +68,7 @@
                 document.msExitFullscreen();
             }
 
-            $('#videoPlayer').removeClass('fullscreenVideo');
+            document.querySelector('#videoPlayer').classList.remove('fullscreenVideo');
         };
 
         self.isFullScreen = function () {
@@ -127,7 +131,7 @@
                     items: menuItems,
                     // history.back() will cause the video player to stop
                     enableHistory: false,
-                    positionTo: $('.videoSubtitleButton')[0],
+                    positionTo: document.querySelector('.videoSubtitleButton'),
                     callback: function (id) {
 
                         var index = parseInt(id);
@@ -180,7 +184,7 @@
                     items: menuItems,
                     // history.back() will cause the video player to stop
                     enableHistory: false,
-                    positionTo: $('.videoQualityButton')[0],
+                    positionTo: document.querySelector('.videoQualityButton'),
                     callback: function (id) {
 
                         var bitrate = parseInt(id);
@@ -246,7 +250,7 @@
                     items: menuItems,
                     // history.back() will cause the video player to stop
                     enableHistory: false,
-                    positionTo: $('.videoAudioButton')[0],
+                    positionTo: document.querySelector('.videoAudioButton'),
                     callback: function (id) {
 
                         var index = parseInt(id);
@@ -853,6 +857,7 @@
 
         function onPopState() {
             // Stop playback on browser back button nav
+            window.removeEventListener("popstate", onPopState);
             self.stop();
             return;
         }
@@ -904,15 +909,15 @@
                 }
             }
 
-            $(document).on('webkitfullscreenchange', onFullScreenChange);
-            $(document).on('mozfullscreenchange', onFullScreenChange);
-            $(document).on('msfullscreenchange', onFullScreenChange);
-            $(document).on('fullscreenchange', onFullScreenChange);
+            document.addEventListener('webkitfullscreenchange', onFullScreenChange);
+            document.addEventListener('mozfullscreenchange', onFullScreenChange);
+            document.addEventListener('msfullscreenchange', onFullScreenChange);
+            document.addEventListener('fullscreenchange', onFullScreenChange);
 
-            $(window).one("popstate", onPopState);
+            window.addEventListener("popstate", onPopState);
 
             if (hideElementsOnIdle) {
-                $(document.body).on("mousemove", onMouseMove);
+                document.body.addEventListener("mousemove", onMouseMove);
             }
         }
 
@@ -928,15 +933,15 @@
             Events.off(mediaRenderer, 'click', onClick);
             Events.off(mediaRenderer, 'dblclick', onDoubleClick);
 
-            $(document).off('webkitfullscreenchange', onFullScreenChange);
-            $(document).off('mozfullscreenchange', onFullScreenChange);
-            $(document).off('msfullscreenchange', onFullScreenChange);
-            $(document).off('fullscreenchange', onFullScreenChange);
+            document.removeEventListener('webkitfullscreenchange', onFullScreenChange);
+            document.removeEventListener('mozfullscreenchange', onFullScreenChange);
+            document.removeEventListener('msfullscreenchange', onFullScreenChange);
+            document.removeEventListener('fullscreenchange', onFullScreenChange);
 
             // Stop playback on browser back button nav
-            $(window).off("popstate", onPopState);
+            window.removeEventListener("popstate", onPopState);
 
-            $(document.body).off("mousemove", onMouseMove);
+            document.body.removeEventListener("mousemove", onMouseMove);
 
             var itemVideo = document.querySelector('.itemVideo');
             if (itemVideo) {
@@ -1066,8 +1071,6 @@
             $('#video-pauseButton', videoControls).show();
             $('.videoTrackControl').addClass('hide');
 
-            var videoElement = $('#videoElement', mediaPlayerContainer);
-
             $('.videoQualityButton', videoControls).show();
 
             if (mediaStreams.filter(function (s) {
diff --git a/dashboard-ui/tv.html b/dashboard-ui/tv.html
index 35581be1fc..52ca2a7779 100644
--- a/dashboard-ui/tv.html
+++ b/dashboard-ui/tv.html
@@ -1,4 +1,4 @@
-<div id="tvRecommendedPage" data-dom-cache="true" data-role="page" class="page libraryPage backdropPage pageWithAbsoluteTabs" data-backdroptype="series">
+<div id="tvRecommendedPage" data-dom-cache="true" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series">
 
     <div class="libraryViewNav">
         <button class="pageTabButton is-active" data-index="0">${TabSuggestions}</button>