diff --git a/docs/components.md b/docs/components.md
index 545c9adb..46b129ec 100644
--- a/docs/components.md
+++ b/docs/components.md
@@ -81,7 +81,7 @@ Three slots are available. Besides the main slot for the content there is a name
 
 The component exports two properties to determine its behavior. `collapsible` is a boolean describing wether the component should behave like a collapsible in the first place. `open` is a boolean as well and if set true shows the full content of the body on mount.
 
-## Spinner
+## Spinner (OBSOLETE)
 
 A small component showing an animated spinner which can be used while waiting for data.
 
diff --git a/docs/stores.md b/docs/stores.md
index 49fbdce2..00568b5e 100644
--- a/docs/stores.md
+++ b/docs/stores.md
@@ -63,3 +63,4 @@ It exposes an array of the following properties you can subscribe to:
 | `$analytics.core_temp`      | `Number` | Core temperature (on some chips)               |
 
 By default there is one data point every 2 seconds.
+
diff --git a/factory_settings.ini b/factory_settings.ini
index d373cdc9..1afb46fc 100644
--- a/factory_settings.ini
+++ b/factory_settings.ini
@@ -57,7 +57,7 @@ build_flags =
   -D FACTORY_JWT_SECRET=\"#{random}-#{random}\" ; supports placeholders
 
   ; Deep Sleep Configuration
-  -D WAKEUP_PIN_NUMBER=1 ; pin number to wake up the ESP
-  -D WAKEUP_SIGNAL=1 ; 1 for wakeup on HIGH, 0 for wakeup on LOW
+  -D WAKEUP_PIN_NUMBER=38 ; pin number to wake up the ESP
+  -D WAKEUP_SIGNAL=0 ; 1 for wakeup on HIGH, 0 for wakeup on LOW
 
 
diff --git a/interface/package-lock.json b/interface/package-lock.json
index ea41596f..42bae2e2 100644
--- a/interface/package-lock.json
+++ b/interface/package-lock.json
@@ -2008,12 +2008,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/globalyzer": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz",
-			"integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==",
-			"dev": true
-		},
 		"node_modules/globby": {
 			"version": "11.1.0",
 			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -2034,12 +2028,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/globrex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
-			"integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
-			"dev": true
-		},
 		"node_modules/graceful-fs": {
 			"version": "4.2.11",
 			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -3668,16 +3656,6 @@
 				"node": ">=0.8"
 			}
 		},
-		"node_modules/tiny-glob": {
-			"version": "0.2.9",
-			"resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz",
-			"integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==",
-			"dev": true,
-			"dependencies": {
-				"globalyzer": "0.1.0",
-				"globrex": "^0.1.2"
-			}
-		},
 		"node_modules/to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
diff --git a/interface/src/routes/+layout.svelte b/interface/src/routes/+layout.svelte
index 9979c550..ac78686f 100644
--- a/interface/src/routes/+layout.svelte
+++ b/interface/src/routes/+layout.svelte
@@ -31,6 +31,10 @@
 		NotificationSource?.close();
 	});
 
+	onDestroy(() => {
+		NotificationSource.close();
+	});
+
 	async function validateUser(userdata: userProfile) {
 		try {
 			const response = await fetch('/rest/verifyAuthorization', {
@@ -167,6 +171,7 @@
 		}
 		connectionLost = true;
 	}
+
 </script>
 
 <svelte:head>
diff --git a/interface/vite.config.ts b/interface/vite.config.ts
index d82d8e65..c9f3e274 100644
--- a/interface/vite.config.ts
+++ b/interface/vite.config.ts
@@ -16,7 +16,12 @@ const config: UserConfig = {
 		proxy: {
 			// Proxying REST: http://localhost:5173/rest/bar -> http://192.168.1.83/rest/bar
 			'/rest': {
-				target: 'http://192.168.1.89',
+				target: 'http://192.168.1.83',
+				changeOrigin: true
+			},
+			// Proxying REST: http://localhost:5173/rest/bar -> http://192.168.1.83/rest/bar
+			'/events': {
+				target: 'http://192.168.1.83',
 				changeOrigin: true
 			},
 			// Proxying REST: http://localhost:5173/rest/bar -> http://192.168.1.83/rest/bar
@@ -26,7 +31,7 @@ const config: UserConfig = {
 			},
 			// Proxying websockets ws://localhost:5173/ws -> ws://192.168.1.83/ws
 			'/ws': {
-				target: 'ws://192.168.1.89',
+				target: 'ws://192.168.1.83',
 				changeOrigin: true,
 				ws: true
 			}