diff --git a/frontend/src/lib/editor.svelte b/frontend/src/lib/editor.svelte
index 77c2c6f..86834a7 100644
--- a/frontend/src/lib/editor.svelte
+++ b/frontend/src/lib/editor.svelte
@@ -72,7 +72,11 @@
 	<div class="col-span-5 flex flex-col">
 		<div class="h-10 w-full bg-white mb-10 flex align-middle justify-center rounded-br-lg">
 			{#if schemaInvalid}
-				<p class="text-center w-full text-red-600 h-full">{yupErrorMessage}</p>
+				<p class="text-center w-full text-red-600 h-full mt-0.5 font-semibold">
+					{yupErrorMessage}
+				</p>
+			{:else}
+				<p class="text-center w-full text-black h-full align-bottom mt-0.5">{data.title}</p>
 			{/if}
 			<button
 				class="pr-2 align-middle bg-purple-400 pl-2 ml-auto whitespace-nowrap disabled:opacity-60 rounded-br-lg"
diff --git a/frontend/src/lib/editor/sidebar.svelte b/frontend/src/lib/editor/sidebar.svelte
index fa9cea8..44d9ca4 100644
--- a/frontend/src/lib/editor/sidebar.svelte
+++ b/frontend/src/lib/editor/sidebar.svelte
@@ -75,47 +75,49 @@
 				class="bg-transparent resize-none w-full rounded text-sm"
 			/>
 		</div>
-		<button
-			type="button"
-			on:click={() => {
-				data.public = !data.public;
-			}}
-			class="text-center w-full"
-		>
-			{#if data.public}
-				<svg
-					class="w-5 h-5 inline-block"
-					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="M3.055 11H5a2 2 0 012 2v1a2 2 0 002 2 2 2 0 012 2v2.945M8 3.935V5.5A2.5 2.5 0 0010.5 8h.5a2 2 0 012 2 2 2 0 104 0 2 2 0 012-2h1.064M15 20.488V18a2 2 0 012-2h3.064M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
-					/>
-				</svg>
-				<span>Public</span>
-			{:else}
-				<svg
-					class="w-5 h-5 inline-block"
-					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="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21"
-					/>
-				</svg>
-				<span>Private</span>
-			{/if}
-		</button>
+		<div class="w-full flex justify-center">
+			<button
+				type="button"
+				on:click={() => {
+					data.public = !data.public;
+				}}
+				class="text-center"
+			>
+				{#if data.public}
+					<svg
+						class="w-5 h-5 inline-block"
+						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="M3.055 11H5a2 2 0 012 2v1a2 2 0 002 2 2 2 0 012 2v2.945M8 3.935V5.5A2.5 2.5 0 0010.5 8h.5a2 2 0 012 2 2 2 0 104 0 2 2 0 012-2h1.064M15 20.488V18a2 2 0 012-2h3.064M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+						/>
+					</svg>
+					<span>Public</span>
+				{:else}
+					<svg
+						class="w-5 h-5 inline-block"
+						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="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21"
+						/>
+					</svg>
+					<span>Private</span>
+				{/if}
+			</button>
+		</div>
 	</div>
 	{#each data.questions as question, index}
 		<div
diff --git a/frontend/src/routes/edit.svelte b/frontend/src/routes/edit.svelte
index e809c80..8e3333f 100644
--- a/frontend/src/routes/edit.svelte
+++ b/frontend/src/routes/edit.svelte
@@ -2,17 +2,18 @@
 	import { signedIn } from '$lib/stores';
 
 	export async function load({ url, session }) {
+		const quiz_id = url.searchParams.get('quiz_id');
 		if (!session.authenticated) {
 			return {
 				status: 302,
-				redirect: '/account/login?returnTo=/edit'
+				redirect: `/account/login?returnTo=/edit?quiz_id=${quiz_id}`
 			};
 		}
 
 		if (session.authenticated) {
 			signedIn.set(true);
 		}
-		const quiz_id = url.searchParams.get('quiz_id');
+
 		if (quiz_id === null) {
 			return {
 				status: 404