diff --git a/src/lib/components/atoms/Button.svelte b/src/lib/components/atoms/Button.svelte
index a60238f..0b7b819 100644
--- a/src/lib/components/atoms/Button.svelte
+++ b/src/lib/components/atoms/Button.svelte
@@ -4,10 +4,11 @@
 	export let maxWidth = false;
 	export let icon = '';
 	export let alt = '';
-	export let unclickable = false;
+	export let disabled = false;
+
 </script>
 
-<button class={type} class:unclickable on:click|stopPropagation style="width: {maxWidth ? '100%' : 'max-content'}">
+<button class={type} {disabled} on:click|stopPropagation style="width: {maxWidth ? '100%' : 'max-content'}">
 	{#if icon}
 		<img src={icon} {alt} />
 	{/if}
@@ -22,7 +23,7 @@
 		transition: all 0.2s var(--bezier-one);
 	}
 
-	.unclickable {
+	button:disabled {
 		cursor: not-allowed;
 		opacity: 0.25;
 	}
diff --git a/src/routes/poll/+page.svelte b/src/routes/poll/+page.svelte
index c53e96e..f36b43b 100644
--- a/src/routes/poll/+page.svelte
+++ b/src/routes/poll/+page.svelte
@@ -106,7 +106,6 @@
 	});
 
 	function previousPage() {
-		if (currentPage <= 0 || submitted) return null;
 		currentPage--;
 		submit = false;
 		transitionDirection = -5;
@@ -114,14 +113,12 @@
 	}
 
 	function nextPage() {
-		if (currentPage >= logoPages || submitted) return null;
 		currentPage++;
 		transitionDirection = 5;
 		window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
 	}
 
 	function submitSelection() {
-		if (ui_selected_count < 1) return null;
 		submitModal = true;
 	}
 
@@ -276,11 +273,11 @@
 		</Modal>
 	</div>
 	<div class="buttons-container">
-		<Button on:click={previousPage} unclickable={currentPage <= 0 || submitted}>Previous</Button>
+		<Button on:click={previousPage} disabled={currentPage <= 0 || submitted}>Previous</Button>
 		<Button
 			kind="primary"
 			on:click={finalPage ? submitSelection : nextPage}
-			unclickable={(finalPage && ui_selected_count < 1) || submitted}
+			disabled={(finalPage && ui_selected_count < 1) || submitted}
 		>
 			{finalPage ? 'Submit' : 'Next'}
 		</Button>
@@ -415,6 +412,7 @@
 	.warning {
 		display: flex;
 		justify-content: center;
+		margin-bottom: 2rem;
 	}
 
 	@media screen and (max-width: 768px) {