diff --git a/src/lib/components/atoms/Dialogue.svelte b/src/lib/components/atoms/Dialogue.svelte
index f0ab5f3..f03947d 100644
--- a/src/lib/components/atoms/Dialogue.svelte
+++ b/src/lib/components/atoms/Dialogue.svelte
@@ -21,21 +21,23 @@
 		transition:fade={{ easing: quadInOut, duration: 150 }}
 	>
 		<div class="top">
-			<div class="title">
-				{#if fullscreen}
-					<button on:click={() => (modalOpen = !modalOpen)}>
-						<img src="../icons/back.svg" id="back" alt="back" />
-					</button>
-				{/if}
-				{#if $$slots.icon}
-					<slot name="icon" />
-				{/if}
-				{#if $$slots.title}
-					<h2>
-						<slot name="title" />
-					</h2>
-				{/if}
-			</div>
+			{#if $$slots.title || $$slots.icon}
+				<div class="title">
+					{#if fullscreen}
+						<button on:click={() => (modalOpen = !modalOpen)}>
+							<img src="../icons/back.svg" id="back" alt="back" />
+						</button>
+					{/if}
+					{#if $$slots.icon}
+						<slot name="icon" />
+					{/if}
+					{#if $$slots.title}
+						<h2>
+							<slot name="title" />
+						</h2>
+					{/if}
+				</div>
+			{/if}
 
 			{#if $$slots.description}
 				<p>
diff --git a/src/lib/components/atoms/LogoOption.svelte b/src/lib/components/atoms/LogoOption.svelte
index a4a7303..760c922 100644
--- a/src/lib/components/atoms/LogoOption.svelte
+++ b/src/lib/components/atoms/LogoOption.svelte
@@ -65,7 +65,7 @@
 
 {#if hasVariants}
 	<Modal bind:modalOpen>
-		<svelte:fragment slot="title">Select a variant</svelte:fragment>
+		<svelte:fragment slot="title">Select logo variants</svelte:fragment>
 		<div class="variants">
 			{#each variants as variant}
 				<!-- Mega Trolley -->
diff --git a/src/routes/poll/+page.svelte b/src/routes/poll/+page.svelte
index d06b3db..0de28cf 100644
--- a/src/routes/poll/+page.svelte
+++ b/src/routes/poll/+page.svelte
@@ -18,6 +18,7 @@
 
 	let helpModal = false;
 	let clearModal = false;
+	let submitModal = false;
 	let selected: Selected = {};
 	function calc_ui_selected_count(v: Selected) {
 		let n = 0;
@@ -141,7 +142,7 @@
 
 	function submitSelection() {
 		if (ui_selected_count < 1) return null;
-		submit = true;
+		submitModal = true;
 	}
 
 	function clearLogos() {
@@ -239,19 +240,21 @@
 			</div>
 		{/if}
 
-		{#if submit}
-			<Modal modalOpen={true}>
-				<svelte:fragment slot="title">Submit</svelte:fragment>
-				<svelte:fragment slot="description">
+		<Modal bind:modalOpen={submitModal}>
+			<svelte:fragment slot="title">
+				{#if submit}
+					Submitting
+				{:else}
+					Confirm submission
+				{/if}
+			</svelte:fragment>
+			<svelte:fragment slot="description">
+				{#if submit}
 					<div>
 						{#await submitBallot()}
-							<h6>
-								Submitting your vote...
-							</h6>
+							<h6>Submitting your vote...</h6>
 						{:then _}
-							<h6>
-								Your vote has been casted.
-							</h6>
+							<h6>Your vote has been casted.</h6>
 						{:catch err}
 							<h6>
 								An error occurred. Try again later.
@@ -260,16 +263,35 @@
 							</h6>
 						{/await}
 					</div>
-				</svelte:fragment>
-			</Modal>
-		{/if}
+				{:else}
+					<div>
+						<h6>Do you want to cast your vote? You will not be able to vote again.</h6>
+					</div>
+				{/if}
+			</svelte:fragment>
+
+			<div class="buttons">
+				<Button
+					kind="text"
+					on:click={() => {
+						submitModal = false;
+					}}>Cancel</Button
+				>
+				<Button
+					kind="text"
+					on:click={() => {
+						submit = true;
+					}}>Submit</Button
+				>
+			</div>
+		</Modal>
 	</div>
 	<div class="buttons-container">
 		<Button on:click={previousPage} unclickable={currentPage <= 0}>Previous</Button>
 		<Button
 			kind="primary"
 			on:click={finalPage ? submitSelection : nextPage}
-			unclickable={submit || (finalPage && ui_selected_count < 1)}
+			unclickable={finalPage && ui_selected_count < 1}
 		>
 			{finalPage ? 'Submit' : 'Next'}
 		</Button>
@@ -281,8 +303,8 @@
 	<svelte:fragment slot="description">
 		<div class="desc">
 			<h6>
-				This is an approval voting system. Voters can choose any number of logo and variants. The
-				logo that is selected the most wins. Note that you can only vote once!
+				This is an approval voting system. Voters can choose any number of logos (and its variants
+				if applicable). The logo that is selected the most wins. Note that you can only vote once.
 			</h6>
 		</div>
 	</svelte:fragment>
@@ -299,9 +321,7 @@
 <Modal bind:modalOpen={clearModal}>
 	<svelte:fragment slot="description">
 		<div class="desc">
-			<h6>
-				Deselect all logos?
-			</h6>
+			<h6>Deselect all logos?</h6>
 		</div>
 	</svelte:fragment>
 	<div class="buttons">
@@ -350,7 +370,7 @@
 		gap: 1rem;
 		justify-content: right;
 		width: 100%;
-		z-index: 999;
+		z-index: 99;
 		position: fixed;
 		bottom: 0;
 		right: 0;