diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 12a58c9..0f34f5c 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -9,31 +9,12 @@
 		DropdownItem,
 		DarkMode
 	} from 'flowbite-svelte';
-	import { ChevronDownOutline } from 'flowbite-svelte-icons';
+	import { ChevronDownOutline, HomeOutline } from 'flowbite-svelte-icons';
 	import '../app.css';
-	import CloudflareAnalytics from '../lib/CloudflareAnalytics.svelte';
+	import CloudflareAnalytics from '$lib/CloudflareAnalytics.svelte';
 	import logo from '$lib/logo.png';
 	import { page } from '$app/stores';
 
-	// Navigation links are generated based on this object
-	const nav = [
-		{
-			name: 'index',
-			subPages: []
-		},
-		{
-			name: 'whoami',
-			subPages: ['about', 'resume']
-		},
-		{
-			name: 'portfolio',
-			subPages: ['svelte', 'next.js', 'homelab']
-		},
-		{
-			name: 'contact',
-			subPages: ['get_in_touch', 'socials']
-		}
-	];
 	$: activeUrl = $page.url.pathname;
 </script>
 
@@ -53,9 +34,9 @@
 			projects<ChevronDownOutline class="w-6 h-6  text-primary-800 dark:text-stone-200 inline" />
 		</NavLi>
 		<Dropdown class="w-44 z-20">
-			<DropdownItem href="/svelte">svelte</DropdownItem>
-			<DropdownItem href="/nextjs">nextjs</DropdownItem>
-			<DropdownItem href="/homelab">homelab</DropdownItem>
+			<DropdownItem href="/projects/svelte">svelte</DropdownItem>
+			<DropdownItem href="/projects/nextjs">nextjs</DropdownItem>
+			<DropdownItem href="/projects/homelab">homelab</DropdownItem>
 		</Dropdown>
 		<NavLi href="/contact">contact</NavLi>
 		<NavLi>
@@ -63,7 +44,7 @@
 		</NavLi>
 	</NavUl>
 </Navbar>
-<div class="mt-6 mx-auto max-w-xs sm:max-w-md md:max-w-3xl text-center">
+<div class="px-2 sm:px-0 mx-auto max-w-xs sm:max-w-md md:max-w-3xl text-center">
 	<slot />
 </div>
 <footer class="mt-12 text-center">
diff --git a/src/routes/get_in_touch/+page.svelte b/src/routes/contact/+page.svelte
similarity index 100%
rename from src/routes/get_in_touch/+page.svelte
rename to src/routes/contact/+page.svelte
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
deleted file mode 100644
index b44e380..0000000
--- a/src/routes/login/+page.svelte
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>This is the login page</h1>
-<p>Access denied</p>
\ No newline at end of file
diff --git a/src/routes/homelab/+page.svelte b/src/routes/projects/homelab/+page.svelte
similarity index 100%
rename from src/routes/homelab/+page.svelte
rename to src/routes/projects/homelab/+page.svelte
diff --git a/src/routes/nextjs/+page.svelte b/src/routes/projects/nextjs/+page.svelte
similarity index 64%
rename from src/routes/nextjs/+page.svelte
rename to src/routes/projects/nextjs/+page.svelte
index 525c4a4..bbd7ed1 100644
--- a/src/routes/nextjs/+page.svelte
+++ b/src/routes/projects/nextjs/+page.svelte
@@ -1,7 +1,7 @@
 <script>
 	import { fade } from 'svelte/transition';
-	import Projects from '../../lib/Projects.svelte';
-	import PageHeader from '../../lib/PageHeader.svelte';
+	import Projects from '$lib/Projects.svelte';
+	import PageHeader from '$lib/PageHeader.svelte';
 	const category = 'nextjs';
 	const title = 'Next.js Projects';
 </script>
diff --git a/src/routes/svelte/+page.svelte b/src/routes/projects/svelte/+page.svelte
similarity index 72%
rename from src/routes/svelte/+page.svelte
rename to src/routes/projects/svelte/+page.svelte
index bbd3201..449dea2 100644
--- a/src/routes/svelte/+page.svelte
+++ b/src/routes/projects/svelte/+page.svelte
@@ -1,7 +1,7 @@
 <script>
 	import { fade } from 'svelte/transition';
-	import Projects from '../../lib/Projects.svelte';
-	import PageHeader from '../../lib/PageHeader.svelte';
+	import Projects from '$lib/Projects.svelte';
+	import PageHeader from '$lib/PageHeader.svelte';
 	const projectRssUrl = 'https://gitea.rannes.dev/rannes.dev/my-portfolio.rss';
 	const category = 'svelte';
 	const title = 'Svelte Projects';
diff --git a/src/routes/resume/+page.svelte b/src/routes/resume/+page.svelte
deleted file mode 100644
index 1a3b94c..0000000
--- a/src/routes/resume/+page.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-<script>
-
-	import { fade } from "svelte/transition";
-
-</script>
-<div in:fade>
-    <h1 class="text-xl">Under development</h1>
-    <p>In the meantime have a look at my <a class="underline" href="https://www.linkedin.com/in/christian-rannes/">linkedin</a></p>
-</div>
\ No newline at end of file
diff --git a/src/routes/socials/+page.svelte b/src/routes/socials/+page.svelte
deleted file mode 100644
index 0ed404a..0000000
--- a/src/routes/socials/+page.svelte
+++ /dev/null
@@ -1 +0,0 @@
-<h1>Under development</h1>
\ No newline at end of file