diff --git a/frontend/.npmrc b/frontend/.npmrc
index b6f27f1..fbf7f9a 100644
--- a/frontend/.npmrc
+++ b/frontend/.npmrc
@@ -1 +1,2 @@
 engine-strict=true
+auto-install-peers=true
diff --git a/frontend/src/lib/LoginForm.svelte b/frontend/src/lib/LoginForm.svelte
index 6fb6f81..ec1c4c1 100644
--- a/frontend/src/lib/LoginForm.svelte
+++ b/frontend/src/lib/LoginForm.svelte
@@ -1,11 +1,19 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
-	import { useForm, validators, HintGroup, Hint, required } from 'svelte-use-form';
+	import {
+		Button,
+		FluidForm,
+		ToastNotification,
+		TextInput,
+		PasswordInput,
+		ButtonSet
+	} from 'carbon-components-svelte';
 
 	let promise: Promise<void>;
 
-	const form = useForm();
+	// const form = useForm();
 	$: submit = async (event: Event) => {
+		event.preventDefault();
 		// @ts-expect-error FormData makes tsc sad
 		const formData = new URLSearchParams(new FormData(event.target as HTMLFormElement));
 
@@ -24,10 +32,10 @@
 			});
 	};
 
-	export let api_endpoint: string, description: string;
+	export let api_endpoint: string, button: string, description: string;
 </script>
 
-<form use:form on:submit|preventDefault={submit}>
+<!-- <form use:form on:submit|preventDefault={submit} action="/api/{api_endpoint}">
 	<h1>{description}</h1>
 
 	<a href="/">Home</a>
@@ -43,20 +51,36 @@
 		<Hint on="required">Password is mandatory!</Hint>
 	</HintGroup>
 
-	<button disabled={!$form.valid}>Login</button>
-</form>
+	<button disabled={!$form.valid} type="submit" formmethod="post">{button}</button>
+</form> -->
+<h1>{description}</h1>
+<FluidForm on:submit={submit} action="/api/{api_endpoint}">
+	<TextInput type="username" name="username" labelText="Username" placeholder="Username" required />
+	<PasswordInput
+		required
+		type="password"
+		name="password"
+		labelText="Password"
+		placeholder="Password"
+	/>
+	<br />
+	<ButtonSet>
+		<Button type="submit" formmethod="post">{button}</Button>
+		{#if api_endpoint === 'login'}
+			<Button kind="ghost" href="/register">Register</Button>
+		{/if}
+	</ButtonSet>
+	{#await promise}
+		<p />
+	{:then}
+		<p />
+	{:catch error}
+		<ToastNotification title="Error" subtitle={error?.message} timeout={3000} />
+	{/await}
+</FluidForm>
 
-{#await promise}
-	<p>Logging in...</p>
-{:then}
-	<p />
-{:catch error}
-	<p style="color: red">{error}</p>
-{/await}
-
-<style>
-	:global(.touched:invalid) {
-		border-color: red;
-		outline-color: red;
+<style lang="scss">
+	:global(form) {
+		max-width: 25em;
 	}
 </style>
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
new file mode 100644
index 0000000..3022560
--- /dev/null
+++ b/frontend/src/routes/+layout.svelte
@@ -0,0 +1,25 @@
+<script lang="ts">
+	import 'carbon-components-svelte/css/g100.css';
+	import { Button, OverflowMenu, OverflowMenuItem } from 'carbon-components-svelte';
+	import Login from 'carbon-icons-svelte/lib/Login.svelte';
+	import Logout from 'carbon-icons-svelte/lib/Logout.svelte';
+	import Home from 'carbon-icons-svelte/lib/Home.svelte';
+</script>
+
+<nav id="login">
+	<a href="/"><Home /></a>
+	<OverflowMenu size="xl">
+		<OverflowMenuItem href="/login" hasDivider><Login />Login</OverflowMenuItem>
+		<OverflowMenuItem href="/logout"><Logout />Logout</OverflowMenuItem>
+	</OverflowMenu>
+</nav>
+
+<main>
+	<slot />
+</main>
+
+<style lang="scss">
+	nav {
+		// display: none;
+	}
+</style>
diff --git a/frontend/src/routes/+layout.ts b/frontend/src/routes/+layout.ts
index c8cacf0..189f71e 100644
--- a/frontend/src/routes/+layout.ts
+++ b/frontend/src/routes/+layout.ts
@@ -1 +1 @@
-export const prerender = true;
\ No newline at end of file
+export const prerender = true;
diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte
index 350dab7..b589ee2 100644
--- a/frontend/src/routes/+page.svelte
+++ b/frontend/src/routes/+page.svelte
@@ -1,6 +1,4 @@
+<title>Pomme</title>
+
 <h1>Welcome to pomme!</h1>
 <p>There will be something here one day :)</p>
-
-<a href="/login">Login</a>
-<a href="/register">Register</a>
-<a href="/logout">Logout</a>
diff --git a/frontend/src/routes/login/+page.svelte b/frontend/src/routes/login/+page.svelte
index 190bf70..fa773f4 100644
--- a/frontend/src/routes/login/+page.svelte
+++ b/frontend/src/routes/login/+page.svelte
@@ -2,4 +2,4 @@
 	import LoginForm from '$lib/LoginForm.svelte';
 </script>
 
-<LoginForm api_endpoint="login" description="Login" />
+<LoginForm api_endpoint="login" description="Login!" button="Login" />
diff --git a/frontend/src/routes/logout/+page.svelte b/frontend/src/routes/logout/+page.svelte
index 6b39660..705a10f 100644
--- a/frontend/src/routes/logout/+page.svelte
+++ b/frontend/src/routes/logout/+page.svelte
@@ -13,6 +13,8 @@
 	});
 </script>
 
+<h1>Logging out...</h1>
+<a href="/">Click here if you do not get redirected automatically.</a>
 {#await promise}
 	<p />
 {:then}
diff --git a/frontend/src/routes/register/+page.svelte b/frontend/src/routes/register/+page.svelte
index 4da5eb7..3ff4a66 100644
--- a/frontend/src/routes/register/+page.svelte
+++ b/frontend/src/routes/register/+page.svelte
@@ -2,4 +2,4 @@
 	import LoginForm from '$lib/LoginForm.svelte';
 </script>
 
-<LoginForm api_endpoint="create" description="Register an Account" />
+<LoginForm api_endpoint="create" description="Register an Account" button="Register" />
diff --git a/frontend/src/routes/upload/+page.svelte b/frontend/src/routes/upload/+page.svelte
new file mode 100644
index 0000000..e69de29
diff --git a/frontend/svelte.config.js b/frontend/svelte.config.js
index 167dfb9..98a5f76 100644
--- a/frontend/svelte.config.js
+++ b/frontend/svelte.config.js
@@ -1,11 +1,12 @@
 import adapter from '@sveltejs/adapter-static';
+import { optimizeImports } from 'carbon-preprocess-svelte';
 import { vitePreprocess } from '@sveltejs/kit/vite';
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
 	// Consult https://kit.svelte.dev/docs/integrations#preprocessors
 	// for more information about preprocessors
-	preprocess: vitePreprocess(),
+	preprocess: [vitePreprocess(), optimizeImports()],
 
 	kit: {
 		adapter: adapter()