diff --git a/classquiz/routers/users.py b/classquiz/routers/users.py
index 91ca01f..099c34e 100644
--- a/classquiz/routers/users.py
+++ b/classquiz/routers/users.py
@@ -91,6 +91,9 @@ async def logout(request: Request, response: Response):
     response.delete_cookie("expiry")
     response.delete_cookie("rememberme")
     response.delete_cookie("rememberme_token")
+    response.status_code = 302
+    response.headers["Location"] = "/"
+    return response
 
 
 @router.get("/check")
diff --git a/frontend/src/routes/account/login.svelte b/frontend/src/routes/account/login.svelte
index 23116a6..8c16940 100644
--- a/frontend/src/routes/account/login.svelte
+++ b/frontend/src/routes/account/login.svelte
@@ -1,4 +1,4 @@
-<script context="module" lang="ts">
+<script context='module' lang='ts'>
 	export async function load({ session }) {
 		if (session.authenticated) {
 			return {
@@ -10,7 +10,7 @@
 	}
 </script>
 
-<script lang="ts">
+<script lang='ts'>
 	//import { rememberme } from '$lib/utils/clientAuth';
 
 	/*if (browser) {
@@ -20,6 +20,9 @@
 			}
 		});
 	}*/
+	import { navbarVisible } from '$lib/stores';
+
+	navbarVisible.set(true);
 
 
 	let loginData = {
@@ -63,88 +66,79 @@
 	};
 </script>
 
-<div class="flex items-center justify-center h-screen px-4">
+<div class='flex items-center justify-center h-full px-4'>
 	<div>
-		<span class="p-4" />
+		<span class='p-4' />
 
 		<div
-			class="w-full max-w-sm mx-auto overflow-hidden bg-white rounded-lg shadow-md dark:bg-gray-800"
+			class='w-full max-w-sm mx-auto overflow-hidden bg-white rounded-lg shadow-md dark:bg-gray-800'
 		>
-			<div class="px-6 py-4">
-				<h2 class="text-3xl font-bold text-center text-gray-700 dark:text-white">
+			<div class='px-6 py-4'>
+				<h2 class='text-3xl font-bold text-center text-gray-700 dark:text-white'>
 					ClassQuiz
 				</h2>
 
-				<h3 class="mt-1 text-xl font-medium text-center text-gray-600 dark:text-gray-200">
+				<h3 class='mt-1 text-xl font-medium text-center text-gray-600 dark:text-gray-200'>
 					Welcome Back
 				</h3>
 
-				<p class="mt-1 text-center text-gray-500 dark:text-gray-400">
+				<p class='mt-1 text-center text-gray-500 dark:text-gray-400'>
 					Login or create account
 				</p>
 
 				<form on:submit|preventDefault={login}>
-					<div class="w-full mt-4">
-						<div class="dark:bg-gray-800 bg-white p-4 rounded-lg">
-							<div class="relative bg-inherit w-full">
+					<div class='w-full mt-4'>
+						<div class='dark:bg-gray-800 bg-white p-4 rounded-lg'>
+							<div class='relative bg-inherit w-full'>
 								<input
-									id="email"
+									id='email'
 									bind:value={loginData.email}
-									name="email"
-									type="email"
-									class="w-full peer bg-transparent h-10 rounded-lg text-gray-700 dark:text-white placeholder-transparent ring-2 px-2 ring-gray-500 focus:ring-sky-600 focus:outline-none focus:border-rose-600"
-									placeholder="Email"
+									name='email'
+									type='email'
+									class='w-full peer bg-transparent h-10 rounded-lg text-gray-700 dark:text-white placeholder-transparent ring-2 px-2 ring-gray-500 focus:ring-sky-600 focus:outline-none focus:border-rose-600'
+									placeholder='Email'
 								/>
 								<label
-									for="email"
-									class="absolute cursor-text left-0 -top-3 text-sm text-gray-700 dark:text-white bg-inherit mx-1 px-1 peer-placeholder-shown:text-base peer-placeholder-shown:text-gray-500 peer-placeholder-shown:top-2 peer-focus:-top-3 peer-focus:text-sky-600 peer-focus:text-sm transition-all"
+									for='email'
+									class='absolute cursor-text left-0 -top-3 text-sm text-gray-700 dark:text-white bg-inherit mx-1 px-1 peer-placeholder-shown:text-base peer-placeholder-shown:text-gray-500 peer-placeholder-shown:top-2 peer-focus:-top-3 peer-focus:text-sky-600 peer-focus:text-sm transition-all'
 								>
 									Email
 								</label>
 							</div>
 						</div>
-						<div class="dark:bg-gray-800 bg-white p-4 rounded-lg">
-							<div class="relative bg-inherit w-full">
+						<div class='dark:bg-gray-800 bg-white p-4 rounded-lg'>
+							<div class='relative bg-inherit w-full'>
 								<input
-									id="password"
-									name="password"
-									type="password"
+									id='password'
+									name='password'
+									type='password'
 									bind:value={loginData.password}
-									class="w-full peer bg-transparent h-10 rounded-lg text-gray-700 dark:text-white placeholder-transparent ring-2 px-2 ring-gray-500 focus:ring-sky-600 focus:outline-none focus:border-rose-600"
-									placeholder="Password"
+									class='w-full peer bg-transparent h-10 rounded-lg text-gray-700 dark:text-white placeholder-transparent ring-2 px-2 ring-gray-500 focus:ring-sky-600 focus:outline-none focus:border-rose-600'
+									placeholder='Password'
 								/>
 								<label
-									for="password"
-									class="absolute cursor-text left-0 -top-3 text-sm text-gray-500 bg-inherit mx-1 px-1 peer-placeholder-shown:text-base peer-placeholder-shown:text-gray-500 peer-placeholder-shown:top-2 peer-focus:-top-3 peer-focus:text-sky-600 peer-focus:text-sm transition-all"
+									for='password'
+									class='absolute cursor-text left-0 -top-3 text-sm text-gray-500 bg-inherit mx-1 px-1 peer-placeholder-shown:text-base peer-placeholder-shown:text-gray-500 peer-placeholder-shown:top-2 peer-focus:-top-3 peer-focus:text-sky-600 peer-focus:text-sm transition-all'
 								>
 									Password
 								</label>
 							</div>
 						</div>
 
-						<div class="flex items-center justify-between mt-4">
+						<div class='flex items-center justify-between mt-4'>
 							<a
-								href="/account/reset-password"
-								class="text-sm text-gray-600 dark:text-gray-200 hover:text-gray-500"
-								>Forgot Password?</a
+								href='/account/reset-password'
+								class='text-sm text-gray-600 dark:text-gray-200 hover:text-gray-500'
+							>Forgot Password?</a
 							>
 
 							<button
-								class="px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50"
+								class='px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50'
 								disabled={!inputValid}
-								type="submit"
+								type='submit'
 							>
 								{#if isSubmitting}
-									<svg class="h-4 w-4 animate-spin" viewBox="3 3 18 18">
-										<path
-											class="fill-blue-800"
-											d="M12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 8.13401 15.866 5 12 5ZM3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12Z"
-										/>
-										<path
-											class="fill-blue-100"
-											d="M16.9497 7.05015C14.2161 4.31648 9.78392 4.31648 7.05025 7.05015C6.65973 7.44067 6.02656 7.44067 5.63604 7.05015C5.24551 6.65962 5.24551 6.02646 5.63604 5.63593C9.15076 2.12121 14.8492 2.12121 18.364 5.63593C18.7545 6.02646 18.7545 6.65962 18.364 7.05015C17.9734 7.44067 17.3403 7.44067 16.9497 7.05015Z"
-										/>
-									</svg>
+
 								{:else}
 									Login
 								{/if}
@@ -155,16 +149,16 @@
 			</div>
 
 			<div
-				class="flex items-center justify-center py-4 text-center bg-gray-50 dark:bg-gray-700"
+				class='flex items-center justify-center py-4 text-center bg-gray-50 dark:bg-gray-700'
 			>
-				<span class="text-sm text-gray-600 dark:text-gray-200"
-					>Don't have an account?
+				<span class='text-sm text-gray-600 dark:text-gray-200'
+				>Don't have an account?
 				</span>
 
 				<a
-					href="/account/register"
-					class="mx-2 text-sm font-bold text-blue-500 dark:text-blue-400 hover:underline"
-					>Register</a
+					href='/account/register'
+					class='mx-2 text-sm font-bold text-blue-500 dark:text-blue-400 hover:underline'
+				>Register</a
 				>
 			</div>
 		</div>
@@ -172,14 +166,14 @@
 </div>
 
 <div
-	class="fixed z-10 inset-0 overflow-y-auto"
-	aria-labelledby="modal-title"
-	role="dialog"
-	aria-modal="true"
+	class='fixed z-10 inset-0 overflow-y-auto'
+	aria-labelledby='modal-title'
+	role='dialog'
+	aria-modal='true'
 	class:hidden={!responseData.open}
 >
 	<div
-		class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0"
+		class='flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0'
 	>
 		<!--
         Background overlay, show/hide based on modal state.
@@ -192,13 +186,13 @@
           To: "opacity-0"
       -->
 		<div
-			class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"
-			aria-hidden="true"
+			class='fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity'
+			aria-hidden='true'
 		/>
 
 		<!-- This element is to trick the browser into centering the modal contents. -->
-		<span class="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true"
-			>&#8203;</span
+		<span class='hidden sm:inline-block sm:align-middle sm:h-screen' aria-hidden='true'
+		>&#8203;</span
 		>
 
 		<!--
@@ -212,49 +206,49 @@
           To: "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
       -->
 		<div
-			class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
+			class='inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full'
 		>
-			<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
-				<div class="sm:flex sm:items-start">
+			<div class='bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4'>
+				<div class='sm:flex sm:items-start'>
 					<div
-						class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10"
+						class='mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10'
 					>
 						<!-- Heroicon name: outline/exclamation -->
 						{#if responseData.data === '404' || responseData.data === 'error'}
 							<svg
-								class="h-6 w-6 text-red-600"
-								xmlns="http://www.w3.org/2000/svg"
-								fill="none"
-								viewBox="0 0 24 24"
-								stroke="currentColor"
-								aria-hidden="true"
+								class='h-6 w-6 text-red-600'
+								xmlns='http://www.w3.org/2000/svg'
+								fill='none'
+								viewBox='0 0 24 24'
+								stroke='currentColor'
+								aria-hidden='true'
 							>
 								<path
-									stroke-linecap="round"
-									stroke-linejoin="round"
-									stroke-width="2"
-									d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
+									stroke-linecap='round'
+									stroke-linejoin='round'
+									stroke-width='2'
+									d='M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z'
 								/>
 							</svg>
 						{:else}
 							<svg
-								class="w-6 h-6 text-green-600"
-								fill="none"
-								stroke="currentColor"
-								viewBox="0 0 24 24"
-								xmlns="http://www.w3.org/2000/svg"
+								class='w-6 h-6 text-green-600'
+								fill='none'
+								stroke='currentColor'
+								viewBox='0 0 24 24'
+								xmlns='http://www.w3.org/2000/svg'
 							>
 								<path
-									stroke-linecap="round"
-									stroke-linejoin="round"
-									stroke-width="2"
-									d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
+									stroke-linecap='round'
+									stroke-linejoin='round'
+									stroke-width='2'
+									d='M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z'
 								/>
 							</svg>
 						{/if}
 					</div>
-					<div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
-						<h3 class="text-lg leading-6 font-medium text-gray-900" id="modal-title">
+					<div class='mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left'>
+						<h3 class='text-lg leading-6 font-medium text-gray-900' id='modal-title'>
 							{#if responseData.data === 'magic'}
 								Login Succeded! Check your mailbox!
 							{:else if responseData.data === 'password'}
@@ -267,8 +261,8 @@
 								You stupid Mawoka!
 							{/if}
 						</h3>
-						<div class="mt-2">
-							<p class="text-sm text-gray-500">
+						<div class='mt-2'>
+							<p class='text-sm text-gray-500'>
 								{#if responseData.data === 'magic'}
 									Please check your mailbox, since you should have received a
 									Mail, with a link you can click to login.
@@ -286,17 +280,17 @@
 					</div>
 				</div>
 			</div>
-			<div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
+			<div class='bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse'>
 				<button
-					type="button"
+					type='button'
 					on:click={() => {
 						responseData.open = false;
 						if (responseData.data === 'magic' || responseData.data === 'password') {
 							window.location.reload();
 						}
 					}}
-					class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm"
-					>Close
+					class='mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm'
+				>Close
 				</button>
 			</div>
 		</div>
diff --git a/frontend/src/routes/account/register.svelte b/frontend/src/routes/account/register.svelte
index ddbd42d..f08784d 100644
--- a/frontend/src/routes/account/register.svelte
+++ b/frontend/src/routes/account/register.svelte
@@ -14,6 +14,8 @@
 	import { createForm } from 'felte';
 	// import reporter from '@felte/reporter-tippy';
 	import { validateSchema } from '@felte/validator-yup';
+	import {navbarVisible} from '$lib/stores';
+	navbarVisible.set(true)
 	import * as yup from 'yup';
 
 	const registerSchema = yup.object({
@@ -67,13 +69,13 @@
 	};
 </script>
 
-<div class="flex items-center justify-center h-screen px-4">
+<div class="flex items-center justify-center h-full px-4">
 	<div>
 		<div
 			class="w-full max-w-sm mx-auto overflow-hidden bg-white rounded-lg shadow-md dark:bg-gray-800"
 		>
 			<div class="px-6 py-4">
-				<h2 class="text-3xl font-bold text-center text-gray-700 dark:text-white">ImNote</h2>
+				<h2 class="text-3xl font-bold text-center text-gray-700 dark:text-white">ClassQuiz</h2>
 
 				<h3 class="mt-1 text-xl font-medium text-center text-gray-600 dark:text-gray-200">
 					Nice to meet you!
diff --git a/frontend/src/routes/create.svelte b/frontend/src/routes/create.svelte
new file mode 100644
index 0000000..dcab2c2
--- /dev/null
+++ b/frontend/src/routes/create.svelte
@@ -0,0 +1,137 @@
+<script context='module' lang='ts'>
+	export async function load({ session, url }) {
+		if (!session.authenticated) {
+			return {
+				status: 302,
+				redirect: '/account/login'
+			};
+		}
+		const token = url.searchParams.get('token');
+		const pin = url.searchParams.get('pin');
+		let auto_connect = url.searchParams.get('connect') !== null;
+		if (token === null || pin === null) {
+			auto_connect = false;
+		}
+		return {
+			props: {
+				game_pin: pin === null ? '' : pin,
+				game_token: token === null ? '' : token,
+				auto_connect: auto_connect
+			}
+		};
+	}
+</script>
+
+<script lang='ts'>
+	interface Data {
+		public: boolean;
+		title: string;
+		description: string;
+		questions: Question[];
+	}
+
+	interface Question {
+		question: string;
+		time: string;
+		answers: Answer[];
+	}
+
+	interface Answer {
+		right: boolean;
+		answer: string;
+	}
+
+	let empty_question: Question = {
+		question: '',
+		time: '20',
+		answers: [{
+			right: false,
+			answer: ''
+		}]
+	};
+
+	let empty_answer: Answer = {
+		right: false,
+		answer: ''
+	};
+	let data: Data;
+	const from_localstorage = localStorage.getItem('create_game');
+	if (from_localstorage === null) {
+		data = {
+			description: '',
+			public: false,
+			title: '',
+			questions: [{ question: '', time: '20', answers: [{ right: false, answer: '' }] }]
+		};
+	} else {
+		data = JSON.parse(from_localstorage);
+	}
+
+
+	const submit = async () => {
+		const res = await fetch('/api/v1/quiz/create', {
+			method: 'POST',
+			body: JSON.stringify(data)
+		});
+		if (res.status === 401) {
+			localStorage.setItem('create_game', JSON.stringify(data));
+			window.location.href = '/account/login';
+		}
+	};
+
+</script>
+
+<form on:submit|preventDefault={submit} class='grid grid-cols-1 gap-2'>
+	<label>
+		<input type='checkbox' bind:checked={data.public}>
+		Public?
+	</label>
+	<label>
+		<input type='text' placeholder='Title' bind:value={data.title} class='text-black' />
+		Title
+	</label>
+	<label>
+		<textarea placeholder='Description' bind:value={data.description} class='text-black'></textarea>
+		Description
+	</label>
+	{#each data.questions as question, index_question}
+		<div class='ml-8 grid grid-cols-1 gap-2 m-2 border border-black border-2'>
+			<h1 class='text-3xl'>Question {index_question + 1}</h1>
+
+			<label>
+				<input type='text' placeholder='Question' bind:value={question.question} class='text-black' />
+				Question
+			</label>
+			<label>
+				<input type='text' placeholder='20' bind:value={question.time} class='text-black' />
+				Time in seconds
+			</label>
+			{#each question.answers as answer, index_answer}
+				<div class='ml-8 grid grid-cols-1 gap-2 m-2 border border-black border-2'>
+					<h1 class='text-3xl'>Answer {index_answer + 1}</h1>
+					<p>Answer: {index_answer} Question: {index_question}</p>
+					<label>
+						<input type='text' placeholder='Answer'
+							   bind:value={data.questions[index_question].answers[index_answer].answer}
+							   class='text-black' />
+						Answer
+					</label>
+					<label>
+						<input type='checkbox' bind:checked={answer.right} class='text-black' />
+						Right?
+					</label>
+					<button class='text-left'
+							on:click={() => {data.questions[index_question].answers = [...data.questions[index_question].answers, empty_answer]}}>
+						Add new answer
+					</button>
+				</div>
+			{/each}
+			<button class='text-left' on:click={() => {data.questions = [...data.questions, empty_question]}}>Add new
+				question
+			</button>
+
+		</div>
+
+	{/each}
+	<button type='submit'>Create</button>
+</form>
\ No newline at end of file
diff --git a/frontend/src/routes/overview.svelte b/frontend/src/routes/overview.svelte
index 952b59b..a508cd8 100644
--- a/frontend/src/routes/overview.svelte
+++ b/frontend/src/routes/overview.svelte
@@ -20,8 +20,7 @@
 
 	const getData = async (): Promise<Array<QuizData>> => {
 		const res = await fetch('/api/v1/quiz/list');
-		const data = await res.json();
-		return data;
+		return await res.json();
 	};
 
 	const formatDate = (date: string): string => {
@@ -48,11 +47,34 @@
 </script>
 
 {#await getData()}
-	<p>Loading...</p>
+	<svg class='h-8 w-8 animate-spin mx-auto my-20' viewBox='3 3 18 18'>
+		<path
+			class='fill-black'
+			d='M12 5C8.13401 5 5 8.13401 5 12C5 15.866 8.13401 19 12 19C15.866 19 19 15.866 19 12C19 8.13401 15.866 5 12 5ZM3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12Z'
+		/>
+		<path
+			class='fill-blue-100'
+			d='M16.9497 7.05015C14.2161 4.31648 9.78392 4.31648 7.05025 7.05015C6.65973 7.44067 6.02656 7.44067 5.63604 7.05015C5.24551 6.65962 5.24551 6.02646 5.63604 5.63593C9.15076 2.12121 14.8492 2.12121 18.364 5.63593C18.7545 6.02646 18.7545 6.65962 18.364 7.05015C17.9734 7.44067 17.3403 7.44067 16.9497 7.05015Z'
+		/>
+	</svg>
 
 {:then quizzes}
 
 	<div class='flex flex-col w-fit mx-auto'>
+		<!--		<button
+					class='px-4 py-2 font-medium tracking-wide text-gray-500 whitespace-nowrap dark:text-gray-400 capitalize transition-colors dark:bg-gray-700 duration-200 transform bg-gray-50 rounded-md hover:bg-green-600 focus:outline-none focus:ring focus:ring-blue-300 focus:ring-opacity-80'>
+					Primary
+				</button>-->
+		<div class='w-full grid grid-cols-2 gap-2'>
+			<a href='/create'
+			   class='px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded text-center hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50'
+			>Create
+			</a>
+			<a href='/api/v1/users/logout'
+			   class='px-4 py-2 leading-5 text-white transition-colors duration-200 transform bg-gray-700 rounded text-center hover:bg-gray-600 focus:outline-none disabled:cursor-not-allowed disabled:opacity-50'
+			>Logout
+			</a>
+		</div>
 		<div class='overflow-x-auto sm:-mx-8 lg:-mx-8'>
 			<div class='inline-block py-2 min-w-full sm:px-6 lg:px-8'>
 				<div class='overflow-hidden shadow-md sm:rounded-lg'>