diff --git a/src/routes/+layout.server.ts b/src/routes/(app)/+layout.server.ts
similarity index 100%
rename from src/routes/+layout.server.ts
rename to src/routes/(app)/+layout.server.ts
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
new file mode 100644
index 0000000..38163bf
--- /dev/null
+++ b/src/routes/(app)/+layout.svelte
@@ -0,0 +1,26 @@
+<script lang="ts">
+	import AppShell from '$lib/components/app-shell.svelte';
+	import posthog from 'posthog-js';
+	import { browser } from '$app/environment';
+
+	let { children, data } = $props();
+
+	let previousUserId: string | null | undefined;
+
+	$effect(() => {
+		if (!browser) return;
+		if (data.userId) {
+			posthog.identify(data.userId);
+		} else if (previousUserId) {
+			posthog.reset();
+		}
+		previousUserId = data.userId;
+	});
+</script>
+
+{#if data.userId}
+	<span class="sr-only">Signed in</span>
+{/if}
+<AppShell userId={data.userId}>
+	{@render children()}
+</AppShell>
diff --git a/src/routes/regression/+page.server.ts b/src/routes/(app)/regression/+page.server.ts
similarity index 100%
rename from src/routes/regression/+page.server.ts
rename to src/routes/(app)/regression/+page.server.ts
diff --git a/src/routes/regression/+page.svelte b/src/routes/(app)/regression/+page.svelte
similarity index 100%
rename from src/routes/regression/+page.svelte
rename to src/routes/(app)/regression/+page.svelte
diff --git a/src/routes/regression/[id]/+page.server.ts b/src/routes/(app)/regression/[id]/+page.server.ts
similarity index 100%
rename from src/routes/regression/[id]/+page.server.ts
rename to src/routes/(app)/regression/[id]/+page.server.ts
diff --git a/src/routes/regression/[id]/+page.svelte b/src/routes/(app)/regression/[id]/+page.svelte
similarity index 100%
rename from src/routes/regression/[id]/+page.svelte
rename to src/routes/(app)/regression/[id]/+page.svelte
diff --git a/src/routes/regression/runs/[id]/+page.server.ts b/src/routes/(app)/regression/runs/[id]/+page.server.ts
similarity index 100%
rename from src/routes/regression/runs/[id]/+page.server.ts
rename to src/routes/(app)/regression/runs/[id]/+page.server.ts
diff --git a/src/routes/regression/runs/[id]/+page.svelte b/src/routes/(app)/regression/runs/[id]/+page.svelte
similarity index 100%
rename from src/routes/regression/runs/[id]/+page.svelte
rename to src/routes/(app)/regression/runs/[id]/+page.svelte
diff --git a/src/routes/runs/+page.server.ts b/src/routes/(app)/runs/+page.server.ts
similarity index 100%
rename from src/routes/runs/+page.server.ts
rename to src/routes/(app)/runs/+page.server.ts
diff --git a/src/routes/runs/+page.svelte b/src/routes/(app)/runs/+page.svelte
similarity index 100%
rename from src/routes/runs/+page.svelte
rename to src/routes/(app)/runs/+page.svelte
diff --git a/src/routes/runs/[id]/+page.server.ts b/src/routes/(app)/runs/[id]/+page.server.ts
similarity index 100%
rename from src/routes/runs/[id]/+page.server.ts
rename to src/routes/(app)/runs/[id]/+page.server.ts
diff --git a/src/routes/runs/[id]/+page.svelte b/src/routes/(app)/runs/[id]/+page.svelte
similarity index 100%
rename from src/routes/runs/[id]/+page.svelte
rename to src/routes/(app)/runs/[id]/+page.svelte
diff --git a/src/routes/+page.svelte b/src/routes/(marketing)/+page.svelte
similarity index 98%
rename from src/routes/+page.svelte
rename to src/routes/(marketing)/+page.svelte
index 2a1b286..b1c3d2f 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/(marketing)/+page.svelte
@@ -91,7 +91,7 @@ jobs:
 				<a href="https://github.com/x0ba/flightlog">GitHub</a>
 			</nav>
 
-			<a href={resolve('/runs')} class="nav-cta">
+			<a href={resolve('/runs')} rel="external" class="nav-cta">
 				Dashboard
 				<ArrowUpRight class="size-3.5" />
 			</a>
@@ -112,7 +112,7 @@ jobs:
 				requests on regression suites — surfaced directly as GitHub Check Runs.
 			</p>
 			<div class="cta-row">
-				<a href={resolve('/runs')} class="btn-primary">
+				<a href={resolve('/runs')} rel="external" class="btn-primary">
 					Open dashboard
 					<ArrowUpRight class="size-4" />
 				</a>
@@ -176,7 +176,7 @@ jobs:
 		<div>
 			<a href="https://github.com/x0ba/flightlog">GitHub</a>
 			<a href="https://github.com/x0ba/flightlog/blob/main/README.md">Docs</a>
-			<a href={resolve('/runs')}>Dashboard</a>
+			<a href={resolve('/runs')} rel="external">Dashboard</a>
 		</div>
 	</footer>
 </div>
diff --git a/src/routes/(marketing)/+page.ts b/src/routes/(marketing)/+page.ts
new file mode 100644
index 0000000..189f71e
--- /dev/null
+++ b/src/routes/(marketing)/+page.ts
@@ -0,0 +1 @@
+export const prerender = true;
diff --git a/src/routes/sign-in/+page.server.ts b/src/routes/(marketing)/sign-in/+page.server.ts
similarity index 100%
rename from src/routes/sign-in/+page.server.ts
rename to src/routes/(marketing)/sign-in/+page.server.ts
diff --git a/src/routes/sign-in/+page.svelte b/src/routes/(marketing)/sign-in/+page.svelte
similarity index 100%
rename from src/routes/sign-in/+page.svelte
rename to src/routes/(marketing)/sign-in/+page.svelte
diff --git a/src/routes/sign-up/+page.server.ts b/src/routes/(marketing)/sign-up/+page.server.ts
similarity index 100%
rename from src/routes/sign-up/+page.server.ts
rename to src/routes/(marketing)/sign-up/+page.server.ts
diff --git a/src/routes/sign-up/+page.svelte b/src/routes/(marketing)/sign-up/+page.svelte
similarity index 100%
rename from src/routes/sign-up/+page.svelte
rename to src/routes/(marketing)/sign-up/+page.svelte
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 8f8af0b..0d8eb03 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,40 +1,9 @@
 <script lang="ts">
 	import './layout.css';
 	import favicon from '$lib/assets/favicon.svg';
-	import AppShell from '$lib/components/app-shell.svelte';
-	import { page } from '$app/state';
-	import posthog from 'posthog-js';
-	import { browser } from '$app/environment';
 
-	let { children, data } = $props();
-
-	let useShell = $derived(
-		page.url.pathname !== '/' &&
-			!page.url.pathname.startsWith('/sign-in') &&
-			!page.url.pathname.startsWith('/sign-up')
-	);
-
-	let previousUserId: string | null | undefined;
-
-	$effect(() => {
-		if (!browser) return;
-		if (data.userId) {
-			posthog.identify(data.userId);
-		} else if (previousUserId) {
-			posthog.reset();
-		}
-		previousUserId = data.userId;
-	});
+	let { children } = $props();
 </script>
 
 <svelte:head><link rel="icon" href={favicon} /></svelte:head>
-{#if data.userId}
-	<span class="sr-only">Signed in</span>
-{/if}
-{#if useShell}
-	<AppShell userId={data.userId}>
-		{@render children()}
-	</AppShell>
-{:else}
-	{@render children()}
-{/if}
+{@render children()}