diff --git a/src/ext/UWContent.ts b/src/ext/UWContent.ts
index 08e4261..1001979 100644
--- a/src/ext/UWContent.ts
+++ b/src/ext/UWContent.ts
@@ -1,14 +1,14 @@
-import Debug from './conf/Debug';
-import Settings from './module/settings/Settings';
-import CommsClient from './module/comms/CommsClient';
-import PageInfo from './module/video-data/PageInfo';
-import EventBus from './module/EventBus';
-import KeyboardHandler from './module/kbm/KeyboardHandler';
-import { SiteSettings } from './module/settings/SiteSettings';
-import UI from './module/uwui/UI';
-import { BLANK_LOGGER_CONFIG, LogAggregator } from './module/logging/LogAggregator';
-import { ComponentLogger } from './module/logging/ComponentLogger';
-import { getIframeParentHost, setupHostnameReporting } from './util/getHost';
+import Debug from '@src/ext/conf/Debug';
+import CommsClient from '@src/ext/module/comms/CommsClient';
+import EventBus from '@src/ext/module/EventBus';
+import KeyboardHandler from '@src/ext/module/kbm/KeyboardHandler';
+import { ComponentLogger } from '@src/ext/module/logging/ComponentLogger';
+import { BLANK_LOGGER_CONFIG, LogAggregator } from '@src/ext/module/logging/LogAggregator';
+import Settings from '@src/ext/module/settings/Settings';
+import { SiteSettings } from '@src/ext/module/settings/SiteSettings';
+import UI from '@src/ext/module/uwui/UI';
+import PageInfo from '@src/ext/module/video-data/PageInfo';
+import { getIframeParentHost, setupHostnameReporting } from '@src/ext/util/getHost';
 
 export default class UWContent {
   pageInfo: PageInfo;
diff --git a/src/ext/UWServer.ts b/src/ext/UWServer.ts
index 1b02dd5..16d7a70 100644
--- a/src/ext/UWServer.ts
+++ b/src/ext/UWServer.ts
@@ -1,12 +1,9 @@
-import Debug from './conf/Debug.js';
-import BrowserDetect from './conf/BrowserDetect';
-import CommsServer from './module/comms/CommsServer.js';
-import Settings from './module/settings/Settings.js';
-import { sleep } from '../common/js/utils';
-import { ComponentLogger } from './module/logging/ComponentLogger.js';
-import { BLANK_LOGGER_CONFIG, LogAggregator } from './module/logging/LogAggregator.js';
 import { Runtime } from 'chrome';
-import EventBus from '@src/ext/module/EventBus.js';
+import EventBus from '@src/ext/module/EventBus';
+import Settings from '@src/ext/module/settings/Settings';
+import { ComponentLogger } from '@src/ext/module/logging/ComponentLogger';
+import { BLANK_LOGGER_CONFIG, LogAggregator } from '@src/ext/module/logging/LogAggregator';
+import CommsServer from '@src/ext/module/comms/CommsServer';
 
 
 const BASE_LOGGING_STYLES = {
diff --git a/src/ext/conf/ExtConfPatches.ts b/src/ext/conf/ExtConfPatches.ts
index 306a7b2..ee2da73 100644
--- a/src/ext/conf/ExtConfPatches.ts
+++ b/src/ext/conf/ExtConfPatches.ts
@@ -1,20 +1,15 @@
 // How to use:
 // version: {ExtensionConf object, but only properties that get overwritten}
-import StretchType from '../../common/enums/StretchType.enum';
-// import ExtensionMode from '../../common/enums/ExtensionMode.enum';
-import VideoAlignmentType from '../../common/enums/VideoAlignmentType.enum';
-import BrowserDetect from './BrowserDetect';
-import SettingsInterface, { SiteSettingsInterface } from '../../common/interfaces/SettingsInterface';
-import { _cp } from '../../common/js/utils';
-import CropModePersistence from '../../common/enums/CropModePersistence.enum';
-import AspectRatioType from '../../common/enums/AspectRatioType.enum';
+import AspectRatioType from '@src/common/enums/AspectRatioType.enum';
+import CropModePersistence from '@src/common/enums/CropModePersistence.enum';
+import EmbeddedContentSettingsOverridePolicy from '@src/common/enums/EmbeddedContentSettingsOverridePolicy.enum';
+import ExtensionMode from '@src/common/enums/ExtensionMode.enum';
+import { InputHandlingMode } from '@src/common/enums/InputHandlingMode.enum';
+import LegacyExtensionMode from '@src/common/enums/LegacyExtensionMode.enum';
+import { PlayerDetectionMode } from '@src/common/enums/PlayerDetectionMode.enum';
+import { SiteSupportLevel } from '@src/common/enums/SiteSupportLevel.enum';
+import SettingsInterface from '@src/common/interfaces/SettingsInterface';
 import { update } from 'lodash';
-import EmbeddedContentSettingsOverridePolicy from '../../common/enums/EmbeddedContentSettingsOverridePolicy.enum';
-import LegacyExtensionMode from '../../common/enums/LegacyExtensionMode.enum';
-import ExtensionMode from '../../common/enums/ExtensionMode.enum';
-import { PlayerDetectionMode } from '../../common/enums/PlayerDetectionMode.enum';
-import { SiteSupportLevel } from '../../common/enums/SiteSupportLevel.enum';
-import { InputHandlingMode } from '../../common/enums/InputHandlingMode.enum';
 
 
 const ExtensionConfPatch = Object.freeze([
diff --git a/src/ext/conf/ExtensionConf.ts b/src/ext/conf/ExtensionConf.ts
index 58ecf88..38655a5 100644
--- a/src/ext/conf/ExtensionConf.ts
+++ b/src/ext/conf/ExtensionConf.ts
@@ -1,20 +1,16 @@
-import Debug from './Debug';
-import currentBrowser from './BrowserDetect';
-import VideoAlignmentType from '../../common/enums/VideoAlignmentType.enum';
-import StretchType from '../../common/enums/StretchType.enum';
-import ExtensionMode from '../../common/enums/ExtensionMode.enum';
-import AntiGradientMode from '../../common/enums/AntiGradientMode.enum';
-import AspectRatioType from '../../common/enums/AspectRatioType.enum';
-import CropModePersistence from '../../common/enums/CropModePersistence.enum';
-import SettingsInterface from '../../common/interfaces/SettingsInterface';
-import BrowserDetect from './BrowserDetect';
-import { Extension } from 'typescript';
-import EmbeddedContentSettingsOverridePolicy from '../../common/enums/EmbeddedContentSettingsOverridePolicy.enum';
-import { AardPollingOptions } from '../module/aard/enums/aard-polling-options.enum';
-import { AardSubtitleCropMode } from '../module/aard/enums/aard-subtitle-crop-mode.enum';
-import { SiteSupportLevel } from '../../common/enums/SiteSupportLevel.enum';
-import { PlayerDetectionMode } from '../../common/enums/PlayerDetectionMode.enum';
-import { InputHandlingMode } from '../../common/enums/InputHandlingMode.enum';
+import AspectRatioType from '@src/common/enums/AspectRatioType.enum';
+import CropModePersistence from '@src/common/enums/CropModePersistence.enum';
+import EmbeddedContentSettingsOverridePolicy from '@src/common/enums/EmbeddedContentSettingsOverridePolicy.enum';
+import ExtensionMode from '@src/common/enums/ExtensionMode.enum';
+import { InputHandlingMode } from '@src/common/enums/InputHandlingMode.enum';
+import { PlayerDetectionMode } from '@src/common/enums/PlayerDetectionMode.enum';
+import { SiteSupportLevel } from '@src/common/enums/SiteSupportLevel.enum';
+import StretchType from '@src/common/enums/StretchType.enum';
+import VideoAlignmentType from '@src/common/enums/VideoAlignmentType.enum';
+import SettingsInterface from '@src/common/interfaces/SettingsInterface';
+import Debug from '@src/ext/conf/Debug';
+import { AardPollingOptions } from '@src/ext/module/aard/enums/aard-polling-options.enum';
+import { AardSubtitleCropMode } from '@src/ext/module/aard/enums/aard-subtitle-crop-mode.enum';
 
 if(Debug.debug)
   console.log("Loading: ExtensionConf.js");
diff --git a/src/ext/uw.js b/src/ext/uw.js
index 84acf75..b518ec1 100644
--- a/src/ext/uw.js
+++ b/src/ext/uw.js
@@ -2,7 +2,7 @@
  * NOTE: we cannot get rid of this js file. I tried for 30 seconds and I couldn't get
  * extension to work unless I kept this part of extension out of the ts file.
  */
-import UWContent from './UWContent';
+import UWContent from '@src/ext/UWContent';
 
 if(process.env.CHANNEL !== 'stable'){
 
diff --git a/src/ui/components/SettingsWindowContent.vue b/src/ui/components/SettingsWindowContent.vue
index 1a031f1..021ed65 100644
--- a/src/ui/components/SettingsWindowContent.vue
+++ b/src/ui/components/SettingsWindowContent.vue
@@ -275,7 +275,7 @@ const TAB_LOADOUT = {
     'import-export-settings',
     'debugging',
   ],
-  'ui': [
+  'ui-window': [
     'window.site-extension-settings',
     'window.player-element-settings',
     'autodetectionSettings',
@@ -337,7 +337,6 @@ export default defineComponent({
       selectedTab: undefined,
       BrowserDetect: BrowserDetect,
       preventClose: false,
-      siteSettings: null,
       globalSettings: null,
     }
   },
@@ -345,6 +344,7 @@ export default defineComponent({
     'role',
     'initialPath',
     'settings',
+    'siteSettings',
     'eventBus',
     'logger',
     'inPlayer',
@@ -367,31 +367,22 @@ export default defineComponent({
     },
   },
   created() {
-    this.generateTabs();
-    this.settings.listenAfterChange(this.setDebugTabVisibility);
+    try {
+      this.generateTabs();
+      this.settings.listenAfterChange(this.setDebugTabVisibility);
 
-    this.setInitialPath();
-    const changelogTab  = this.tabs.find(x => x.id === 'changelog');
-    if (changelogTab) {
-      changelogTab.highlight = !this.settings.active?.whatsNewChecked;
-    }
-
-    this.globalSettings = this.settings.getSiteSettings({site: '@global'});
-    if (this.site) {
-      this.siteSettings = this.settings.getSiteSettings({site: this.site});
-    }
-    this.eventBus?.subscribe(
-      'uw-show-ui',
-      {
-        source: this,
-        function: () => {
-          if (this.inPlayer) {
-            return; // show-ui is only intended for global overlay
-          }
-        },
+      this.setInitialPath();
+      const changelogTab  = this.tabs.find(x => x.id === 'changelog');
+      if (changelogTab) {
+        changelogTab.highlight = !this.settings.active?.whatsNewChecked;
       }
-    )
-    this.setDebugTabVisibility();
+
+      this.globalSettings = this.settings.getSiteSettings({site: '@global'});
+      this.setDebugTabVisibility();
+    } catch (e) {
+      console.error(`[ultrawidify|SettingsWindowContent.vue] created() crashed. Error:`, e);
+    }
+
   },
   destroyed() {
     this.settings.removeListenerAfterChange(this.setDebugTabVisibility);
@@ -399,11 +390,9 @@ export default defineComponent({
   },
   methods: {
     /**
-     * Regenerates this.siteSettings
+     * Regenerates relevant tabs
      */
     updateSite(newSite: {host: string, hostnames: string[],}) {
-      this.siteSettings = this.settings.getSiteSettings({site: newSite.host});
-
       this.generateTabs(newSite);
 
       this.$nextTick( () => this.$forceUpdate());
diff --git a/src/ui/pages/settings/App.vue b/src/ui/pages/settings/App.vue
index 42ab2ea..9e0955c 100644
--- a/src/ui/pages/settings/App.vue
+++ b/src/ui/pages/settings/App.vue
@@ -388,13 +388,6 @@ export default defineComponent({
             comms: {forwardTo: 'active'}
           }
         );
-        this.eventBus.sendToTunnel(
-          'get-current-site',
-          {},
-          {
-            comms: {forwardTo: 'active'}
-          }
-        );
       } catch (e) {
         this.logger.log('error','popup','[popup::getSite] sending get-current-site failed for some reason. Reason:', e);
       }
diff --git a/src/uw-bg.js b/src/uw-bg.js
index 9559d29..db35121 100644
--- a/src/uw-bg.js
+++ b/src/uw-bg.js
@@ -3,7 +3,7 @@
  * extension to work unless I kept this part of extension out of the ts file.
  */
 
-import UWServer from './ext/UWServer';
+import UWServer from '@src/ext/UWServer';
 
 var BgVars = {
   arIsActive: true,