diff --git a/firmware/website/src/app.svelte b/firmware/website/src/app.svelte
index 7784987..d1de190 100644
--- a/firmware/website/src/app.svelte
+++ b/firmware/website/src/app.svelte
@@ -1,24 +1,24 @@
 <script lang="ts">
-	import Header from "./components/header.svelte";
-	import Footer from "./components/footer.svelte";
-	import Index from "./index.svelte";
-	import Captive from "./captive.svelte";
-	import Router, { location } from "svelte-spa-router";
-	import { lang } from "./i18n/store";
+	import Header from './components/header.svelte';
+	import Footer from './components/footer.svelte';
+	import Index from './routes/index.svelte';
+	import Captive from './routes/captive.svelte';
+	import Router, { location } from 'svelte-spa-router';
+	import { lang } from './i18n/store';
 
 	const routes = {
-		"/control": Index,
-		"/captive": Captive,
+		'/': Index,
+		'/captive': Captive,
 		// Fallback route
-		"*": Index,
+		'*': Index
 	};
 
-	$: document.documentElement.lang = $lang;
+	$effect(() => {
+		document.documentElement.lang = $lang;
+	});
 </script>
 
-{#if $location !== "/captive"}
-	<Header />
-{/if}
+<Header />
 
 <main class="container mx-auto px-4 py-8">
 	<Router {routes} />
diff --git a/firmware/website/src/components/common/dropDown.svelte b/firmware/website/src/components/common/dropDown.svelte
index e40b4ab..7a2d5a9 100644
--- a/firmware/website/src/components/common/dropDown.svelte
+++ b/firmware/website/src/components/common/dropDown.svelte
@@ -71,7 +71,7 @@
 						type="button"
 						class="w-full text-left px-4 py-3 text-sm transition-colors hover:bg-accent hover:text-accent-foreground {option.value ===
 						value
-							? 'bg-primary/10 text-primary font-medium'
+							? 'bg-primary text-primary-foreground font-medium'
 							: ''}"
 						role="option"
 						aria-selected={option.value === value}
diff --git a/firmware/website/src/captive.svelte b/firmware/website/src/routes/captive.svelte
similarity index 66%
rename from firmware/website/src/captive.svelte
rename to firmware/website/src/routes/captive.svelte
index 86bf07c..2b6b8d6 100644
--- a/firmware/website/src/captive.svelte
+++ b/firmware/website/src/routes/captive.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { t } from "./i18n/store";
+	import { t } from "../i18n/store";
 </script>
 
 <h1>{$t("welcome")} - Captive Portal</h1>
diff --git a/firmware/website/src/index.svelte b/firmware/website/src/routes/index.svelte
similarity index 74%
rename from firmware/website/src/index.svelte
rename to firmware/website/src/routes/index.svelte
index ef72b54..d73a365 100644
--- a/firmware/website/src/index.svelte
+++ b/firmware/website/src/routes/index.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
 	import { onMount } from "svelte";
-	import { t } from "./i18n/store";
-	import ControlTab from "./components/control/controlTab.svelte";
-	import ConfigTab from "./components/config/configTab.svelte";
-	import TabButton from "./components/common/tabButton.svelte";
-	import TabBar from "./components/common/tabBar.svelte";
-	import { controlStore } from "./stores/controlStore";
+	import { t } from "../i18n/store";
+	import ControlTab from "../components/control/controlTab.svelte";
+	import ConfigTab from "../components/config/configTab.svelte";
+	import TabButton from "../components/common/tabButton.svelte";
+	import TabBar from "../components/common/tabBar.svelte";
+	import { controlStore } from "../stores/controlStore";
 
 	let activeTab = "control";