diff --git a/src/controllers/dashboard/plugins/available/index.js b/src/controllers/dashboard/plugins/available/index.js
index 473b1b8961..274cde8824 100644
--- a/src/controllers/dashboard/plugins/available/index.js
+++ b/src/controllers/dashboard/plugins/available/index.js
@@ -1,7 +1,7 @@
 define(['loading', 'libraryMenu', 'globalize', 'cardStyle', 'emby-button', 'emby-checkbox', 'emby-select'], function (loading, libraryMenu, globalize) {
     'use strict';
 
-    libraryMenu = LibraryMenu.default || libraryMenu;
+    libraryMenu = libraryMenu.default || libraryMenu;
 
     function reloadList(page) {
         loading.show();
diff --git a/src/controllers/dashboard/plugins/installed/index.js b/src/controllers/dashboard/plugins/installed/index.js
index 014fbf16c2..02fd954620 100644
--- a/src/controllers/dashboard/plugins/installed/index.js
+++ b/src/controllers/dashboard/plugins/installed/index.js
@@ -1,7 +1,7 @@
 define(['loading', 'libraryMenu', 'dom', 'globalize', 'cardStyle', 'emby-button'], function (loading, libraryMenu, dom, globalize) {
     'use strict';
 
-    libraryMenu = LibraryMenu.default || libraryMenu;
+    libraryMenu = libraryMenu.default || libraryMenu;
 
     function deletePlugin(page, uniqueid, name) {
         var msg = globalize.translate('UninstallPluginConfirmation', name);
diff --git a/src/controllers/home.js b/src/controllers/home.js
index 392da0e2d2..bfee2c50fb 100644
--- a/src/controllers/home.js
+++ b/src/controllers/home.js
@@ -4,67 +4,65 @@ import 'emby-tabs';
 import 'emby-button';
 import 'emby-scroller';
 
-function getTabs() {
-    return [{
-        name: globalize.translate('Home')
-    }, {
-        name: globalize.translate('Favorites')
-    }];
-}
-
-function getDefaultTabIndex() {
-    return 0;
-}
-
-function getTabController(index) {
-    if (null == index) {
-        throw new Error('index cannot be null');
-    }
-
-    let depends = '';
-
-    switch (index) {
-        case 0:
-            depends = 'controllers/hometab';
-            break;
-
-        case 1:
-            depends = 'controllers/favorites';
-    }
-
-    const instance = this;
-    return import(depends).then(({ default: controllerFactory }) => {
-        let controller = instance.tabControllers[index];
-
-        if (!controller) {
-            controller = new controllerFactory(instance.view.querySelector(".tabContent[data-index='" + index + "']"), instance.params);
-            instance.tabControllers[index] = controller;
-        }
-
-        return controller;
-    });
-}
-
-class HomeView {
+class HomeView extends TabbedView {
     constructor(view, params) {
-        TabbedView.call(this, view, params);
+        super(view, params);
     }
+
     setTitle() {
         Emby.Page.setTitle(null);
     }
+
     onPause() {
-        TabbedView.prototype.onPause.call(this);
+        super.onPause(this);
         document.querySelector('.skinHeader').classList.remove('noHomeButtonHeader');
     }
+
     onResume(options) {
-        TabbedView.prototype.onResume.call(this, options);
+        super.onResume(this, options);
         document.querySelector('.skinHeader').classList.add('noHomeButtonHeader');
     }
+
+    getDefaultTabIndex() {
+        return 0;
+    }
+
+    getTabs() {
+        return [{
+            name: globalize.translate('Home')
+        }, {
+            name: globalize.translate('Favorites')
+        }];
+    }
+
+    getTabController(index) {
+        if (null == index) {
+            throw new Error('index cannot be null');
+        }
+
+        let depends = '';
+
+        switch (index) {
+            case 0:
+                depends = 'controllers/hometab';
+                break;
+
+            case 1:
+                depends = 'controllers/favorites';
+        }
+
+        const instance = this;
+        return import(depends).then(({ default: controllerFactory }) => {
+            let controller = instance.tabControllers[index];
+
+            if (!controller) {
+                controller = new controllerFactory(instance.view.querySelector(".tabContent[data-index='" + index + "']"), instance.params);
+                instance.tabControllers[index] = controller;
+            }
+
+            return controller;
+        });
+    }
 }
 
-Object.assign(HomeView.prototype, TabbedView.prototype);
-HomeView.prototype.getTabs = getTabs;
-HomeView.prototype.getDefaultTabIndex = getDefaultTabIndex;
-HomeView.prototype.getTabController = getTabController;
-
 export default HomeView;
diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index 49412c4ac4..d02268b9d4 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -1,7 +1,7 @@
 define(['loading', 'appRouter', 'layoutManager', 'connectionManager', 'userSettings', 'cardBuilder', 'datetime', 'mediaInfo', 'backdrop', 'listView', 'itemContextMenu', 'itemHelper', 'dom', 'indicators', 'imageLoader', 'libraryMenu', 'globalize', 'browser', 'events', 'playbackManager', 'scrollStyles', 'emby-itemscontainer', 'emby-checkbox', 'emby-button', 'emby-playstatebutton', 'emby-ratingbutton', 'emby-scroller', 'emby-select'], function (loading, appRouter, layoutManager, connectionManager, userSettings, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, dom, indicators, imageLoader, libraryMenu, globalize, browser, events, playbackManager) {
     'use strict';
 
-    libraryMenu = LibraryMenu.default || libraryMenu;
+    libraryMenu = libraryMenu.default || libraryMenu;
 
     function getPromise(apiClient, params) {
         var id = params.id;
diff --git a/src/controllers/movies/moviesrecommended.js b/src/controllers/movies/moviesrecommended.js
index 96e98452db..09ecd3c034 100644
--- a/src/controllers/movies/moviesrecommended.js
+++ b/src/controllers/movies/moviesrecommended.js
@@ -1,7 +1,7 @@
 define(['events', 'layoutManager', 'inputManager', 'userSettings', 'libraryMenu', 'mainTabsManager', 'cardBuilder', 'dom', 'imageLoader', 'playbackManager', 'globalize', 'emby-scroller', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (events, layoutManager, inputManager, userSettings, libraryMenu, mainTabsManager, cardBuilder, dom, imageLoader, playbackManager, globalize) {
     'use strict';
 
-    libraryMenu = LibraryMenu.default || libraryMenu;
+    libraryMenu = libraryMenu.default || libraryMenu;
 
     function enableScrollX() {
         return !layoutManager.desktop;