diff --git a/website/src/lib/assets/img/cyclosm.png b/website/src/lib/assets/img/home/cyclosm.png
similarity index 100%
rename from website/src/lib/assets/img/cyclosm.png
rename to website/src/lib/assets/img/home/cyclosm.png
diff --git a/website/src/lib/assets/img/ign.png b/website/src/lib/assets/img/home/ign.png
similarity index 100%
rename from website/src/lib/assets/img/ign.png
rename to website/src/lib/assets/img/home/ign.png
diff --git a/website/src/lib/assets/img/map.png b/website/src/lib/assets/img/home/map.png
similarity index 100%
rename from website/src/lib/assets/img/map.png
rename to website/src/lib/assets/img/home/map.png
diff --git a/website/src/lib/assets/img/mapbox-outdoors.png b/website/src/lib/assets/img/home/mapbox-outdoors.png
similarity index 100%
rename from website/src/lib/assets/img/mapbox-outdoors.png
rename to website/src/lib/assets/img/home/mapbox-outdoors.png
diff --git a/website/src/lib/assets/img/mapbox-satellite.png b/website/src/lib/assets/img/home/mapbox-satellite.png
similarity index 100%
rename from website/src/lib/assets/img/mapbox-satellite.png
rename to website/src/lib/assets/img/home/mapbox-satellite.png
diff --git a/website/src/lib/assets/img/routing.png b/website/src/lib/assets/img/home/routing.png
similarity index 100%
rename from website/src/lib/assets/img/routing.png
rename to website/src/lib/assets/img/home/routing.png
diff --git a/website/src/lib/assets/img/waymarked.png b/website/src/lib/assets/img/home/waymarked.png
similarity index 100%
rename from website/src/lib/assets/img/waymarked.png
rename to website/src/lib/assets/img/home/waymarked.png
diff --git a/website/src/lib/components/Footer.svelte b/website/src/lib/components/Footer.svelte
index d41c806d..9dbf0c87 100644
--- a/website/src/lib/components/Footer.svelte
+++ b/website/src/lib/components/Footer.svelte
@@ -44,10 +44,10 @@
 					<Button
 						variant="link"
 						class="h-6 px-0 text-muted-foreground"
-						href={getURLForLanguage('/[...language]/documentation', $locale)}
+						href={getURLForLanguage('/[...language]/help', $locale)}
 					>
 						<BookOpenText size="16" class="mr-1" />
-						{$_('homepage.documentation')}
+						{$_('menu.help')}
 					</Button>
 				</div>
 				<div class="flex flex-col items-start gap-1" id="contact">
diff --git a/website/src/lib/components/Menu.svelte b/website/src/lib/components/Menu.svelte
index ab010043..fb64a2b4 100644
--- a/website/src/lib/components/Menu.svelte
+++ b/website/src/lib/components/Menu.svelte
@@ -417,7 +417,7 @@
 		<div class="h-fit flex flex-row items-center ml-1 gap-1">
 			<Button
 				variant="ghost"
-				href={getURLForLanguage('/[...language]/documentation', $locale)}
+				href={getURLForLanguage('/[...language]/help', $locale)}
 				target="_blank"
 				class="cursor-default h-fit rounded-sm px-3 py-0.5"
 			>
diff --git a/website/src/lib/components/Nav.svelte b/website/src/lib/components/Nav.svelte
index 1ea2ae3d..da1d7c0c 100644
--- a/website/src/lib/components/Nav.svelte
+++ b/website/src/lib/components/Nav.svelte
@@ -9,9 +9,9 @@
 
 <nav class="w-full sticky top-0 bg-background z-10">
 	<div class="mx-6 py-2 flex flex-row items-center border-b gap-4 md:gap-8">
-		<a href={getURLForLanguage('/[...language]', $locale)} class="shrink-0">
+		<a href={getURLForLanguage('/[...language]', $locale)} class="shrink-0 translate-y-0.5">
 			<Logo class="h-8 sm:hidden" iconOnly={true} />
-			<Logo class="h-7 hidden sm:block" />
+			<Logo class="h-8 hidden sm:block" />
 		</a>
 		<Button
 			variant="link"
@@ -32,10 +32,10 @@
 		<Button
 			variant="link"
 			class="text-base px-0"
-			href={getURLForLanguage('/[...language]/documentation', $locale)}
+			href={getURLForLanguage('/[...language]/help', $locale)}
 		>
 			<BookOpenText size="18" class="mr-1.5" />
-			{$_('homepage.documentation')}
+			{$_('menu.help')}
 		</Button>
 		<ModeSwitch class="ml-auto" />
 	</div>
diff --git a/website/src/lib/components/docs/Docs.svelte b/website/src/lib/components/docs/Docs.svelte
deleted file mode 100644
index 044b32d5..00000000
--- a/website/src/lib/components/docs/Docs.svelte
+++ /dev/null
@@ -1,11 +0,0 @@
-<script>
-	import Test, { metadata } from '$lib/docs/en/introduction/test.md';
-
-	const toc = {
-		introduction: ['test']
-	};
-</script>
-
-{metadata.title}
-
-<Test />
diff --git a/website/src/lib/components/docs/DocsLoader.svelte b/website/src/lib/components/docs/DocsLoader.svelte
index 8eaeee44..2362aff7 100644
--- a/website/src/lib/components/docs/DocsLoader.svelte
+++ b/website/src/lib/components/docs/DocsLoader.svelte
@@ -2,22 +2,33 @@
 	import { _, locale } from 'svelte-i18n';
 
 	export let path: string;
+	export let titleOnly: boolean = false;
 
 	let module = undefined;
+	let metadata: Record<string, any> = {};
 
 	const modules = import.meta.glob('/src/lib/docs/**/*.{md,svx}');
 
-	$: if ($locale) {
-		modules[`/src/lib/docs/${$locale}/${path}`]().then((mod) => {
+	function loadModule(path: string) {
+		modules[path]().then((mod) => {
 			module = mod.default;
+			metadata = mod.metadata;
 		});
 	}
+
+	$: if ($locale) {
+		loadModule(`/src/lib/docs/${$locale}/${path}`);
+	}
 </script>
 
 {#if module !== undefined}
-	<div class="markdown space-y-3">
-		<svelte:component this={module} />
-	</div>
+	{#if titleOnly}
+		{metadata.title}
+	{:else}
+		<div class="markdown space-y-3">
+			<svelte:component this={module} />
+		</div>
+	{/if}
 {/if}
 
 <style lang="postcss">
diff --git a/website/src/lib/docs/en/getting-started.svx b/website/src/lib/docs/en/getting-started.svx
new file mode 100644
index 00000000..748c035e
--- /dev/null
+++ b/website/src/lib/docs/en/getting-started.svx
@@ -0,0 +1,11 @@
+---
+title: Getting started
+---
+
+# { title }
+
+Welcome message.
+
+- screenshot of the interface
+
+explain main components of the interface and link to the corresponding sections
\ No newline at end of file
diff --git a/website/src/lib/docs/en/introduction/test.md b/website/src/lib/docs/en/introduction/test.md
deleted file mode 100644
index f280f447..00000000
--- a/website/src/lib/docs/en/introduction/test.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Test
----
-
-test
\ No newline at end of file
diff --git a/website/src/lib/docs/en/map-controls.svx b/website/src/lib/docs/en/map-controls.svx
new file mode 100644
index 00000000..4ff928c5
--- /dev/null
+++ b/website/src/lib/docs/en/map-controls.svx
@@ -0,0 +1,5 @@
+---
+title: Map controls
+---
+
+# { title }
diff --git a/website/src/lib/docs/en/menu.svx b/website/src/lib/docs/en/menu.svx
new file mode 100644
index 00000000..7be5972f
--- /dev/null
+++ b/website/src/lib/docs/en/menu.svx
@@ -0,0 +1,6 @@
+---
+title: Menu
+---
+
+# { title }
+
diff --git a/website/src/lib/docs/en/menu/edit.svx b/website/src/lib/docs/en/menu/edit.svx
new file mode 100644
index 00000000..6469317f
--- /dev/null
+++ b/website/src/lib/docs/en/menu/edit.svx
@@ -0,0 +1,5 @@
+---
+title: Edit
+---
+
+# { title }
\ No newline at end of file
diff --git a/website/src/lib/docs/en/menu/file.svx b/website/src/lib/docs/en/menu/file.svx
new file mode 100644
index 00000000..26f5e3e1
--- /dev/null
+++ b/website/src/lib/docs/en/menu/file.svx
@@ -0,0 +1,5 @@
+---
+title: File
+---
+
+# { title }
\ No newline at end of file
diff --git a/website/src/lib/docs/en/menu/settings.svx b/website/src/lib/docs/en/menu/settings.svx
new file mode 100644
index 00000000..4294e894
--- /dev/null
+++ b/website/src/lib/docs/en/menu/settings.svx
@@ -0,0 +1,5 @@
+---
+title: Settings
+---
+
+# { title }
\ No newline at end of file
diff --git a/website/src/lib/docs/en/menu/view.svx b/website/src/lib/docs/en/menu/view.svx
new file mode 100644
index 00000000..62f1423f
--- /dev/null
+++ b/website/src/lib/docs/en/menu/view.svx
@@ -0,0 +1,5 @@
+---
+title: View
+---
+
+# { title }
\ No newline at end of file
diff --git a/website/src/lib/docs/en/toolbar.svx b/website/src/lib/docs/en/toolbar.svx
new file mode 100644
index 00000000..4b0343c0
--- /dev/null
+++ b/website/src/lib/docs/en/toolbar.svx
@@ -0,0 +1,6 @@
+---
+title: Toolbar
+---
+
+# { title }
+
diff --git a/website/src/lib/docs/en/toolbar/clean.svx b/website/src/lib/docs/en/toolbar/clean.svx
new file mode 100644
index 00000000..faabb36a
--- /dev/null
+++ b/website/src/lib/docs/en/toolbar/clean.svx
@@ -0,0 +1,5 @@
+---
+title: Clean
+---
+
+# { title }
\ No newline at end of file
diff --git a/website/src/lib/docs/en/toolbar/extract.svx b/website/src/lib/docs/en/toolbar/extract.svx
new file mode 100644
index 00000000..33537405
--- /dev/null
+++ b/website/src/lib/docs/en/toolbar/extract.svx
@@ -0,0 +1,5 @@
+---
+title: Extract
+---
+
+# { title }
\ No newline at end of file
diff --git a/website/src/lib/docs/en/toolbar/merge.svx b/website/src/lib/docs/en/toolbar/merge.svx
new file mode 100644
index 00000000..1608d7f2
--- /dev/null
+++ b/website/src/lib/docs/en/toolbar/merge.svx
@@ -0,0 +1,5 @@
+---
+title: Merge
+---
+
+# { title }
\ No newline at end of file
diff --git a/website/src/lib/docs/en/toolbar/poi.svx b/website/src/lib/docs/en/toolbar/poi.svx
new file mode 100644
index 00000000..9ea9d82d
--- /dev/null
+++ b/website/src/lib/docs/en/toolbar/poi.svx
@@ -0,0 +1,5 @@
+---
+title: Points of interest
+---
+
+# { title }
\ No newline at end of file
diff --git a/website/src/lib/docs/en/toolbar/reduce.svx b/website/src/lib/docs/en/toolbar/reduce.svx
new file mode 100644
index 00000000..df9974c4
--- /dev/null
+++ b/website/src/lib/docs/en/toolbar/reduce.svx
@@ -0,0 +1,5 @@
+---
+title: Reduce
+---
+
+# { title }
\ No newline at end of file
diff --git a/website/src/lib/docs/en/toolbar/routing.svx b/website/src/lib/docs/en/toolbar/routing.svx
new file mode 100644
index 00000000..a17b0bd7
--- /dev/null
+++ b/website/src/lib/docs/en/toolbar/routing.svx
@@ -0,0 +1,5 @@
+---
+title: Route planning and editing
+---
+
+# { title }
\ No newline at end of file
diff --git a/website/src/lib/docs/en/toolbar/scissors.svx b/website/src/lib/docs/en/toolbar/scissors.svx
new file mode 100644
index 00000000..b5bf3399
--- /dev/null
+++ b/website/src/lib/docs/en/toolbar/scissors.svx
@@ -0,0 +1,5 @@
+---
+title: Scissors
+---
+
+# { title }
\ No newline at end of file
diff --git a/website/src/lib/docs/en/toolbar/time.svx b/website/src/lib/docs/en/toolbar/time.svx
new file mode 100644
index 00000000..3c903bf1
--- /dev/null
+++ b/website/src/lib/docs/en/toolbar/time.svx
@@ -0,0 +1,5 @@
+---
+title: Time
+---
+
+# { title }
\ No newline at end of file
diff --git a/website/src/lib/sitemap.ts b/website/src/lib/sitemap.ts
index 0f748f9e..4b79a515 100644
--- a/website/src/lib/sitemap.ts
+++ b/website/src/lib/sitemap.ts
@@ -3,7 +3,7 @@ import { glob } from 'glob';
 import { languages } from '$lib/languages';
 
 function generateSitemap() {
-    const pages = glob.sync('*.html', { cwd: 'build' });
+    const pages = glob.sync('**/*.html', { cwd: 'build' });
 
     let sitemap = '<?xml version="1.0" encoding="UTF-8"?>\n';
     sitemap += '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">\n';
@@ -11,7 +11,8 @@ function generateSitemap() {
     pages.forEach((page) => {
         const url = page.replace('.html', '').replace('index', '');
 
-        if (languages[url]) {
+        const rootDir = url.split('/')[0];
+        if (languages[url] || languages[rootDir]) {
             // Skip localized pages
             return;
         }
diff --git a/website/src/locales/en.json b/website/src/locales/en.json
index 23ed17d6..010fe2d5 100644
--- a/website/src/locales/en.json
+++ b/website/src/locales/en.json
@@ -2,7 +2,7 @@
     "metadata": {
         "home_title": "home",
         "app_title": "the online GPX file editor",
-        "documentation_title": "documentation",
+        "help_title": "help",
         "description": "View, edit and create GPX files online with advanced route planning capabilities and file processing tools, beautiful maps and detailed data visualizations."
     },
     "menu": {
@@ -349,7 +349,6 @@
         "website": "Website",
         "home": "Home",
         "app": "App",
-        "documentation": "Documentation",
         "contact": "Contact",
         "x": "X",
         "facebook": "Facebook",
diff --git a/website/src/routes/[...language]/+page.svelte b/website/src/routes/[...language]/+page.svelte
index 05051c7e..a840ae5d 100644
--- a/website/src/routes/[...language]/+page.svelte
+++ b/website/src/routes/[...language]/+page.svelte
@@ -14,13 +14,13 @@
 	import { currentTool, Tool } from '$lib/stores';
 	import { onDestroy, onMount } from 'svelte';
 	import { getURLForLanguage } from '$lib/utils';
-	import routingScreenshot from '$lib/assets/img/routing.png?enhanced';
-	import mapboxOutdoorsMap from '$lib/assets/img/mapbox-outdoors.png?enhanced';
-	import mapboxSatelliteMap from '$lib/assets/img/mapbox-satellite.png?enhanced';
-	import ignMap from '$lib/assets/img/ign.png?enhanced';
-	import cyclosmMap from '$lib/assets/img/cyclosm.png?enhanced';
-	import waymarkedMap from '$lib/assets/img/waymarked.png?enhanced';
-	import mapScreenshot from '$lib/assets/img/map.png?enhanced';
+	import routingScreenshot from '$lib/assets/img/home/routing.png?enhanced';
+	import mapboxOutdoorsMap from '$lib/assets/img/home/mapbox-outdoors.png?enhanced';
+	import mapboxSatelliteMap from '$lib/assets/img/home/mapbox-satellite.png?enhanced';
+	import ignMap from '$lib/assets/img/home/ign.png?enhanced';
+	import cyclosmMap from '$lib/assets/img/home/cyclosm.png?enhanced';
+	import waymarkedMap from '$lib/assets/img/home/waymarked.png?enhanced';
+	import mapScreenshot from '$lib/assets/img/home/map.png?enhanced';
 
 	let gpxStatistics = writable(exampleGPXFile.getStatistics());
 	let slicedGPXStatistics = writable(undefined);
@@ -52,11 +52,11 @@
 				</Button>
 				<Button
 					variant="secondary"
-					href={getURLForLanguage('/[...language]/documentation', $locale)}
+					href={getURLForLanguage('/[...language]/help', $locale)}
 					class="w-1/3 min-w-fit"
 				>
 					<BookOpenText size="18" class="mr-1.5" />
-					<span>{$_('homepage.documentation')}</span>
+					<span>{$_('homepage.help')}</span>
 				</Button>
 			</div>
 		</div>
diff --git a/website/src/routes/[...language]/documentation/+page.svelte b/website/src/routes/[...language]/documentation/+page.svelte
deleted file mode 100644
index 104e77ca..00000000
--- a/website/src/routes/[...language]/documentation/+page.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-	import Docs from '$lib/components/docs/Docs.svelte';
-</script>
-
-<Docs />
diff --git a/website/src/routes/[...language]/help/+layout.svelte b/website/src/routes/[...language]/help/+layout.svelte
new file mode 100644
index 00000000..116863e4
--- /dev/null
+++ b/website/src/routes/[...language]/help/+layout.svelte
@@ -0,0 +1,37 @@
+<script lang="ts">
+	import { Button } from '$lib/components/ui/button';
+	import { getURLForLanguage } from '$lib/utils';
+	import { locale } from 'svelte-i18n';
+	import DocsLoader from '$lib/components/docs/DocsLoader.svelte';
+
+	let guides: Record<string, string[]> = {
+		'getting-started': [],
+		menu: ['file', 'edit', 'view', 'settings'],
+		toolbar: ['routing', 'poi', 'scissors', 'time', 'merge', 'extract', 'reduce', 'clean'],
+		'map-controls': []
+	};
+</script>
+
+<div class="p-12 flex flex-row gap-24">
+	<div class="hidden md:flex flex-col gap-1 w-40">
+		{#each Object.keys(guides) as guide}
+			<Button
+				variant="link"
+				href={getURLForLanguage(`/[...language]/help/${guide}`, $locale)}
+				class="h-6 p-0 w-fit text-muted-foreground hover:text-foreground hover:no-underline font-normal hover:font-semibold items-start"
+			>
+				<DocsLoader path={`${guide}.svx`} titleOnly={true} />
+			</Button>
+			{#each guides[guide] as subGuide}
+				<Button
+					variant="link"
+					href={getURLForLanguage(`/[...language]/help/${guide}/${subGuide}`, $locale)}
+					class="h-6 p-0 w-fit text-muted-foreground hover:text-foreground hover:no-underline font-normal hover:font-semibold items-start ml-3"
+				>
+					<DocsLoader path={`${guide}/${subGuide}.svx`} titleOnly={true} />
+				</Button>
+			{/each}
+		{/each}
+	</div>
+	<slot />
+</div>
diff --git a/website/src/routes/[...language]/help/+page.svelte b/website/src/routes/[...language]/help/+page.svelte
new file mode 100644
index 00000000..fa124b2e
--- /dev/null
+++ b/website/src/routes/[...language]/help/+page.svelte
@@ -0,0 +1,4 @@
+<script>
+</script>
+
+<div></div>
diff --git a/website/src/routes/[...language]/help/[...guide]/+page.svelte b/website/src/routes/[...language]/help/[...guide]/+page.svelte
new file mode 100644
index 00000000..f05f9471
--- /dev/null
+++ b/website/src/routes/[...language]/help/[...guide]/+page.svelte
@@ -0,0 +1,6 @@
+<script lang="ts">
+	import { page } from '$app/stores';
+	import DocsLoader from '$lib/components/docs/DocsLoader.svelte';
+</script>
+
+<DocsLoader path="{$page.params.guide}.svx" />