diff --git a/app/javascript/flavours/glitch/api.ts b/app/javascript/flavours/glitch/api.ts
index de597a3e3b..73a4c6567a 100644
--- a/app/javascript/flavours/glitch/api.ts
+++ b/app/javascript/flavours/glitch/api.ts
@@ -47,6 +47,11 @@ const authorizationHeaderFromState = (getState?: GetState) => {
   } as RawAxiosRequestHeaders;
 };
 
+const baseUrlFromState = (getState?: GetState) => {
+  const baseUrl = getState && getState().meta.get('base_url');
+  return `${baseUrl}`;
+};
+
 // eslint-disable-next-line import/no-default-export
 export default function api(getState: GetState) {
   return axios.create({
@@ -55,6 +60,8 @@ export default function api(getState: GetState) {
       ...authorizationHeaderFromState(getState),
     },
 
+    baseURL: baseUrlFromState(getState),
+
     transformResponse: [
       function (data: unknown) {
         try {
diff --git a/app/javascript/flavours/glitch/components/router.tsx b/app/javascript/flavours/glitch/components/router.tsx
index fd3f9c6f4d..56b552436f 100644
--- a/app/javascript/flavours/glitch/components/router.tsx
+++ b/app/javascript/flavours/glitch/components/router.tsx
@@ -23,7 +23,6 @@ type LocationState = MastodonLocationState | null | undefined;
 type HistoryPath = Path | LocationDescriptor<LocationState>;
 
 const browserHistory = createBrowserHistory<LocationState>();
-const originalPush = browserHistory.push.bind(browserHistory);
 const originalReplace = browserHistory.replace.bind(browserHistory);
 
 export function useAppHistory() {
@@ -49,11 +48,7 @@ function normalizePath(
     );
   }
 
-  if (layoutFromWindow() === 'multi-column' && !path.startsWith('/deck')) {
-    originalPush(`/deck${path}`, state);
-  } else {
-    originalPush(path, state);
-  }
+  return location;
 }
 
 browserHistory.replace = (path: HistoryPath, state?: MastodonLocationState) => {
diff --git a/package.json b/package.json
index ca0e435e2b..2064597214 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "streaming"
   ],
   "scripts": {
+    "watch": "cross-env NODE_ENV=development webpack --config config/webpack/development.js --watch",
     "build:development": "cross-env NODE_ENV=development webpack --config config/webpack/development.js",
     "build:production": "cross-env NODE_ENV=production webpack --config config/webpack/production.js",
     "build": "cross-env NODE_ENV=production webpack --config config/webpack/production.js",
diff --git a/public/index.html b/public/index.html
index abf9880378..dceaac5446 100644
--- a/public/index.html
+++ b/public/index.html
@@ -9,22 +9,19 @@
     <meta name="theme-color" content="#282c37" />
     <meta content='/getting-started' name='initialPath' />
 
-    <link rel='preload' as='script' href='/packs/js/locales/glitch/en-json.js' />
-    <link rel='preload' as='script' href='/packs/js/flavours/glitch/async/getting_started.js' />
-    <link rel='preload' as='script' href='/packs/js/flavours/glitch/async/compose.js' />
-    <link rel='preload' as='script' href='/packs/js/flavours/glitch/async/home_timeline.js' />
-    <link rel='preload' as='script' href='/packs/js/flavours/glitch/async/notifications.js' />
     <script id='initial-state' type='application/json'>{}</script>
 
+    <link rel="stylesheet" href="/packs/css/core/common.css" />
+    <link rel="stylesheet" href="/packs/css/flavours/glitch/common.css" />
+    <link rel="stylesheet" href="/packs/css/skins/glitch/modern-dark.css" />
+    <link rel="stylesheet" href="/packs/css/flavours/glitch/inert.css" />
+
     <script src="/verify-state.js"></script>
+
     <script src="/packs/js/common.js"></script>
-    <script src="/packs/js/core/common.js"></script>
-    <link rel="stylesheet" media="all" href="/packs/css/core/common.css" />
-
+    <script src="/packs/js/locales/glitch/en-json.js"></script>
     <script src="/packs/js/flavours/glitch/common.js"></script>
-    <link rel="stylesheet" media="all" href="/packs/css/flavours/glitch/common.css" />
-
-    <script src="/packs/js/flavours/glitch/home.js"></script>
+    <script src="/packs/js/flavours/glitch/application.js"></script>
 </head>
 <body class='app-body no-reduce-motion system-font'>
 <div class='app-holder' data-props='{&quot;locale&quot;:&quot;en&quot;}' id='mastodon'>