some bug fixes after master rebase

src/components/appRouter.js

@@ -310,17 +310,6 @@ class AppRouter {
             url = route.contentPath || route.path;
         }
 
-        if (url.includes('configurationpage')) {
-            url = ApiClient.getUrl('/web' + url);
-        } else if (url.indexOf('://') === -1) {
-            // Put a slash at the beginning but make sure to avoid a double slash
-            if (url.indexOf('/') !== 0) {
-                url = '/' + url;
-            }
-
-            url = this.baseUrl() + url;
-        }
-
         if (ctx.querystring && route.enableContentQueryString) {
             url += '?' + ctx.querystring;
         }

src/components/layoutManager.js

@@ -1,7 +1,7 @@
 
 import { appHost } from './apphost';
 import browser from '../scripts/browser';
-import { set, get } from '../scripts/settings/appSettings';
+import appSettings from '../scripts/settings/appSettings';
 import { Events } from 'jellyfin-apiclient';
 
 function setLayout(instance, layout, selectedLayout) {
@@ -20,7 +20,7 @@ class LayoutManager {
             this.autoLayout();
 
             if (save !== false) {
-                set('layout', '');
+                appSettings.set('layout', '');
             }
         } else {
             setLayout(this, 'mobile', layout);
@@ -28,7 +28,7 @@ class LayoutManager {
             setLayout(this, 'desktop', layout);
 
             if (save !== false) {
-                set('layout', layout);
+                appSettings.set('layout', layout);
             }
         }
 
@@ -36,7 +36,7 @@ class LayoutManager {
     }
 
     getSavedLayout() {
-        return get('layout');
+        return appSettings.get('layout');
     }
 
     autoLayout() {