diff --git a/web/rollup.config.js b/web/rollup.config.js
index e86f10842a..84045077dd 100644
--- a/web/rollup.config.js
+++ b/web/rollup.config.js
@@ -65,7 +65,7 @@ export default [
     },
     // Main Application
     {
-        input: "./src/main.ts",
+        input: "./src/interfaces/AdminInterface.ts",
         output: [
             {
                 format: "es",
@@ -92,7 +92,7 @@ export default [
     },
     // Flow executor
     {
-        input: "./src/flow.ts",
+        input: "./src/interfaces/FlowInterface.ts",
         output: [
             {
                 format: "es",
diff --git a/web/src/flow.ts b/web/src/flow.ts
deleted file mode 100644
index 9fe22476c2..0000000000
--- a/web/src/flow.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import "construct-style-sheets-polyfill";
-
-import "./elements/messages/MessageContainer";
-import "./flows/FlowExecutor";
diff --git a/web/src/interfaces/AdminInterface.ts b/web/src/interfaces/AdminInterface.ts
index a31b5b48ad..0418c459e5 100644
--- a/web/src/interfaces/AdminInterface.ts
+++ b/web/src/interfaces/AdminInterface.ts
@@ -1,3 +1,9 @@
+import "construct-style-sheets-polyfill";
+
+// Elements that are used by SiteShell pages
+// And can't dynamically be imported
+import "../elements/CodeMirror";
+import "../elements/messages/MessageContainer";
 import { customElement } from "lit-element";
 import { me } from "../api/Users";
 import { SidebarItem } from "../elements/sidebar/Sidebar";
diff --git a/web/src/interfaces/FlowInterface.ts b/web/src/interfaces/FlowInterface.ts
new file mode 100644
index 0000000000..9ba725a8cb
--- /dev/null
+++ b/web/src/interfaces/FlowInterface.ts
@@ -0,0 +1,4 @@
+import "construct-style-sheets-polyfill";
+
+import "../elements/messages/MessageContainer";
+import "../flows/FlowExecutor";
diff --git a/web/src/main.ts b/web/src/main.ts
deleted file mode 100644
index f57e822083..0000000000
--- a/web/src/main.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import "construct-style-sheets-polyfill";
-
-// Elements that are used by SiteShell pages
-// And can't dynamically be imported
-import "./elements/buttons/ActionButton";
-import "./elements/buttons/Dropdown";
-import "./elements/buttons/ModalButton";
-import "./elements/buttons/SpinnerButton";
-import "./elements/CodeMirror";
-
-import "./pages/tokens/UserTokenList";
-import "./pages/generic/SiteShell";
-import "./interfaces/AdminInterface";
-import "./elements/messages/MessageContainer";
diff --git a/web/src/pages/users/UserSettingsPage.ts b/web/src/pages/users/UserSettingsPage.ts
index eefdae2077..d6590324ee 100644
--- a/web/src/pages/users/UserSettingsPage.ts
+++ b/web/src/pages/users/UserSettingsPage.ts
@@ -48,13 +48,7 @@ export class UserSettingsPage extends LitElement {
                 return html`<ak-user-settings-authenticator-static objectId=${stage.objectUid}>
                 </ak-user-settings-authenticator-static>`;
             default:
-                return html`<div class="pf-u-display-flex pf-u-justify-content-center">
-                    <div class="pf-u-w-75">
-                        <ak-site-shell url="${ifDefined(stage.component)}">
-                            <div slot="body"></div>
-                        </ak-site-shell>
-                    </div>
-                </div>`;
+                return html`<p>unsupported component ${stage.component}</p>`;
         }
     }
 
@@ -64,13 +58,7 @@ export class UserSettingsPage extends LitElement {
                 return html`<ak-user-settings-source-oauth objectId=${source.objectUid}>
                 </ak-user-settings-source-oauth>`;
             default:
-                return html`<div class="pf-u-display-flex pf-u-justify-content-center">
-                    <div class="pf-u-w-75">
-                        <ak-site-shell url="${ifDefined(source.component)}">
-                            <div slot="body"></div>
-                        </ak-site-shell>
-                    </div>
-                </div>`;
+                return html`<p>unsupported component ${source.component}</p>`;
         }
     }