diff --git a/apps/wisekeep/apps/web/src/lib/stores/auth.svelte.ts b/apps/wisekeep/apps/web/src/lib/stores/auth.svelte.ts
index 39d73edb0..df368e32d 100644
--- a/apps/wisekeep/apps/web/src/lib/stores/auth.svelte.ts
+++ b/apps/wisekeep/apps/web/src/lib/stores/auth.svelte.ts
@@ -5,10 +5,9 @@
 
 import { browser } from '$app/environment';
 import { initializeWebAuth, type UserData } from '@manacore/shared-auth';
-import { PUBLIC_MANA_CORE_AUTH_URL } from '$env/static/public';
 
 // Initialize Mana Core Auth only on the client side
-const MANA_AUTH_URL = PUBLIC_MANA_CORE_AUTH_URL || 'http://localhost:3001';
+const MANA_AUTH_URL = 'http://localhost:3001';
 
 // Lazy initialization to avoid SSR issues with localStorage
 let _authService: ReturnType<typeof initializeWebAuth>['authService'] | null = null;
@@ -68,6 +67,7 @@ export const authStore = {
 		} catch (error) {
 			console.error('Failed to initialize auth:', error);
 			user = null;
+			initialized = true;
 		} finally {
 			loading = false;
 		}
diff --git a/apps/wisekeep/apps/web/src/lib/stores/jobs.ts b/apps/wisekeep/apps/web/src/lib/stores/jobs.ts
index 7d921f036..2db854157 100644
--- a/apps/wisekeep/apps/web/src/lib/stores/jobs.ts
+++ b/apps/wisekeep/apps/web/src/lib/stores/jobs.ts
@@ -1,9 +1,9 @@
 import { writable, derived, type Writable } from 'svelte/store';
 import { browser } from '$app/environment';
 import type { TranscriptionJob } from '$lib/api/client';
-import { PUBLIC_API_URL } from '$env/static/public';
 
-const WS_URL = (PUBLIC_API_URL || 'http://localhost:3006').replace('http', 'ws');
+const API_URL = 'http://localhost:3006';
+const WS_URL = API_URL.replace('http', 'ws');
 
 export const jobs: Writable<Map<string, TranscriptionJob>> = writable(new Map());
 export const isConnected = writable(false);
diff --git a/apps/wisekeep/apps/web/src/routes/(protected)/+layout.svelte b/apps/wisekeep/apps/web/src/routes/(protected)/+layout.svelte
index d30ed0e71..1c6a73a05 100644
--- a/apps/wisekeep/apps/web/src/routes/(protected)/+layout.svelte
+++ b/apps/wisekeep/apps/web/src/routes/(protected)/+layout.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { onMount, onDestroy } from 'svelte';
+	import { onMount } from 'svelte';
 	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
 	import { authStore } from '$lib/stores/auth.svelte';
@@ -11,22 +11,31 @@
 	let isChecking = $state(true);
 
 	// Check auth on mount and redirect if not authenticated
-	onMount(async () => {
-		await authStore.initialize();
+	onMount(() => {
+		const init = async () => {
+			try {
+				await authStore.initialize();
+			} catch (e) {
+				console.error('Auth init failed:', e);
+			}
 
-		if (!authStore.isAuthenticated) {
-			const redirectTo = encodeURIComponent(data.pathname || '/');
-			goto(`/login?redirectTo=${redirectTo}`);
-			return;
-		}
+			if (!authStore.isAuthenticated) {
+				const redirectTo = encodeURIComponent(data.pathname || '/dashboard');
+				goto(`/login?redirectTo=${redirectTo}`);
+				return;
+			}
 
-		// Initialize WebSocket after auth check
-		initWebSocket();
-		isChecking = false;
-	});
+			// Initialize WebSocket after auth check
+			initWebSocket();
+			isChecking = false;
+		};
 
-	onDestroy(() => {
-		cleanup();
+		init();
+
+		// Return cleanup function
+		return () => {
+			cleanup();
+		};
 	});
 
 	async function handleSignOut() {
@@ -44,11 +53,11 @@
 	<div class="min-h-screen flex flex-col">
 		<header class="bg-white shadow-sm border-b">
 			<div class="max-w-7xl mx-auto px-4 py-4 flex items-center justify-between">
-				<a href="/" class="text-xl font-bold text-purple-600">Wisekeep</a>
+				<a href="/dashboard" class="text-xl font-bold text-purple-600">Wisekeep</a>
 				<nav class="flex items-center gap-6">
 					<a
-						href="/"
-						class="transition-colors {$page.url.pathname === '/'
+						href="/dashboard"
+						class="transition-colors {$page.url.pathname === '/dashboard'
 							? 'text-purple-600 font-medium'
 							: 'text-gray-600 hover:text-gray-900'}"
 					>
diff --git a/apps/wisekeep/apps/web/src/routes/(protected)/+page.svelte b/apps/wisekeep/apps/web/src/routes/(protected)/dashboard/+page.svelte
similarity index 100%
rename from apps/wisekeep/apps/web/src/routes/(protected)/+page.svelte
rename to apps/wisekeep/apps/web/src/routes/(protected)/dashboard/+page.svelte
diff --git a/apps/wisekeep/apps/web/src/routes/+layout.svelte b/apps/wisekeep/apps/web/src/routes/+layout.svelte
index b93e9bae5..745adae17 100644
--- a/apps/wisekeep/apps/web/src/routes/+layout.svelte
+++ b/apps/wisekeep/apps/web/src/routes/+layout.svelte
@@ -4,4 +4,6 @@
 	let { children } = $props();
 </script>
 
-{@render children()}
+<div class="min-h-screen bg-gray-50">
+	{@render children()}
+</div>
diff --git a/apps/wisekeep/apps/web/src/routes/+page.svelte b/apps/wisekeep/apps/web/src/routes/+page.svelte
new file mode 100644
index 000000000..e38b7fdce
--- /dev/null
+++ b/apps/wisekeep/apps/web/src/routes/+page.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+
+	async function checkAuthAndRedirect() {
+		const { authStore } = await import('$lib/stores/auth.svelte');
+		await authStore.initialize();
+
+		if (authStore.isAuthenticated) {
+			goto('/dashboard', { replaceState: true });
+		} else {
+			goto('/login', { replaceState: true });
+		}
+	}
+
+	if (browser) {
+		checkAuthAndRedirect();
+	}
+</script>
+
+<svelte:head>
+	<title>Wisekeep - AI Wisdom Extraction</title>
+</svelte:head>
+
+<div class="flex items-center justify-center min-h-screen">
+	<div class="text-center">
+		<div
+			class="animate-spin w-10 h-10 border-4 border-purple-500 border-r-transparent rounded-full mx-auto"
+		></div>
+		<p class="mt-4 text-gray-600">Wird geladen...</p>
+	</div>
+</div>