diff --git a/apps/web/package.json b/apps/web/package.json
index 4361bd5..8dbdbde 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -30,6 +30,7 @@
 	},
 	"type": "module",
 	"dependencies": {
+		"jwt-decode": "^3.1.2",
 		"sugar": "^2.0.6",
 		"tailwind-preset-base": "workspace:^",
 		"ui": "workspace:^"
diff --git a/apps/web/src/lib/components/layout/NavBar.svelte b/apps/web/src/lib/components/layout/NavBar.svelte
index 0fd3428..7372028 100644
--- a/apps/web/src/lib/components/layout/NavBar.svelte
+++ b/apps/web/src/lib/components/layout/NavBar.svelte
@@ -1,11 +1,18 @@
-<script>
+<script lang="ts">
 	import { Link } from 'ui/link';
 	import { Button } from 'ui/button';
 	import { env } from '$env/dynamic/public';
 	import { isAuthenticated, user } from '$lib/stores/user';
+	import { onMount } from 'svelte';
+	import jwt_decode from 'jwt-decode';
 
-	$: isAuthenticated;
-	$: user;
+	onMount(() => {
+		const cookie = document.cookie.split(';').find((cookie) => cookie.startsWith('auth='))?.split('=')[1]
+		if (cookie) {
+			$isAuthenticated = true
+			$user = jwt_decode(cookie)
+		}
+	})
 </script>
 
 <div class="beatforge-page-navbar flex w-full items-center py-8 px-4 mx-auto max-w-7xl z-[100] text-sm font-bold">
@@ -19,8 +26,8 @@
 		</Link>
 		{#if $isAuthenticated}
 			<Link variant="secondary" href="/dashboard">
-				{user.username}
-				<img slot="trailing" alt="user icon" src={user.avatar} draggable="false" class="w-10 h-10 rounded-full">
+				{$user.user.username}
+				<img alt="user icon" src={$user.user.avatar} draggable="false" class="w-10 h-10 rounded-full">
 			</Link>
 		{:else}
 			<Link variant="text" href="https://discord.gg/HTVrjFENaZ" external>
diff --git a/apps/web/src/lib/stores/user.ts b/apps/web/src/lib/stores/user.ts
index bc71e09..985c0e6 100644
--- a/apps/web/src/lib/stores/user.ts
+++ b/apps/web/src/lib/stores/user.ts
@@ -1,4 +1,5 @@
 import { writable } from "svelte/store";
 
 export const isAuthenticated = writable(false);
-export const user = writable(null);
\ No newline at end of file
+export const user = writable(null);
+export const jwtKey = writable(null);
\ No newline at end of file
diff --git a/apps/web/src/routes/callback/github/+page.svelte b/apps/web/src/routes/callback/github/+page.svelte
index f02f0f8..2207746 100644
--- a/apps/web/src/routes/callback/github/+page.svelte
+++ b/apps/web/src/routes/callback/github/+page.svelte
@@ -1,3 +1,18 @@
+<script lang="ts">
+    import { onMount } from 'svelte';
+    import { goto } from '$app/navigation';
+    import { isAuthenticated, user, jwtKey } from '$lib/stores/user';
+    import jwt_decode from 'jwt-decode';
+
+    onMount(() => {
+        document.cookie = `auth=${$jwtKey}; path=/; expires=${new Date(Date.now() + 1000 * 60 * 60 * 24).toUTCString()}`;
+        $isAuthenticated = true;
+        $user = jwt_decode($jwtKey);
+        goto('/')
+    })
+</script>
+
+
 <div class="h-screen">
 
 </div>
\ No newline at end of file
diff --git a/apps/web/src/routes/callback/github/+page.ts b/apps/web/src/routes/callback/github/+page.ts
index 8e682b7..2ab5b20 100644
--- a/apps/web/src/routes/callback/github/+page.ts
+++ b/apps/web/src/routes/callback/github/+page.ts
@@ -1,39 +1,26 @@
 import { env } from '$env/dynamic/public';
 import type { PageLoad } from './$types';
+import { redirect } from '@sveltejs/kit';
+import { jwtKey } from '$lib/stores/user';
 
 export const load = (async ({ url: { searchParams }, fetch }) => {
     const code = searchParams.get('code');
     if (!code) {
-        return {
-            status: 302,
-            headers: {
-                location: '/'
-            }
-        };
+        throw redirect(302, '/');
     } else {
         try {
             const response = await fetch(`${env.PUBLIC_API_URL}/auth/github?code=${code}`, {
-                method: 'POST'
-            })
-            const { jwt } = await response.json();
-            return {
-                status: 302,
+                method: 'POST',
                 headers: {
-                    location: '/',
-                    'set-cookie': `jwt=${jwt}; Path=/; HttpOnly`
+                    "Access-Control-Allow-Origin": "*",
+                    "Content-Type": "application/json",
                 }
-            };
+            })
+            const jwt = await response.json();
+            jwtKey.set(jwt.jwt);
         } catch (error) {
             console.log(error)
-            return {
-                status: 500,
-                headers: {
-                    location: '/'
-                },
-                body: {
-                    error: error.message
-                }
-            };
+            throw redirect(302, '/');
         }
     }
 }) satisfies PageLoad;
\ No newline at end of file
diff --git a/apps/web/src/routes/discover/+page.svelte b/apps/web/src/routes/discover/+page.svelte
new file mode 100644
index 0000000..e69de29
diff --git a/apps/web/src/routes/mod/[mod]/+page.svelte b/apps/web/src/routes/mod/[mod]/+page.svelte
index 43ac7fd..c748b6d 100644
--- a/apps/web/src/routes/mod/[mod]/+page.svelte
+++ b/apps/web/src/routes/mod/[mod]/+page.svelte
@@ -25,7 +25,7 @@
 	}
 </script>
 
-<div class="h-screen w-screen">
+<div class="h-full w-full">
 	<div class="flex justify-center">
 		<div class="flex flex-col gap-2 w-full max-w-7xl px-4">
 			<div
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0d201e3..93bbe36 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -168,6 +168,9 @@ importers:
 
   apps/web:
     dependencies:
+      jwt-decode:
+        specifier: ^3.1.2
+        version: 3.1.2
       sugar:
         specifier: ^2.0.6
         version: 2.0.6
@@ -7557,6 +7560,10 @@ packages:
       graceful-fs: 4.2.11
     dev: true
 
+  /jwt-decode@3.1.2:
+    resolution: {integrity: sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==}
+    dev: false
+
   /kind-of@6.0.3:
     resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
     engines: {node: '>=0.10.0'}