diff --git a/src/gui/GenericInputPrompt/GenericInputPrompt.ts b/src/gui/GenericInputPrompt/GenericInputPrompt.ts
index c4cc422..e17d71c 100644
--- a/src/gui/GenericInputPrompt/GenericInputPrompt.ts
+++ b/src/gui/GenericInputPrompt/GenericInputPrompt.ts
@@ -118,6 +118,7 @@ export default class GenericInputPrompt extends Modal {
 		buttonBarContainer.style.flexDirection = "row-reverse";
 		buttonBarContainer.style.justifyContent = "flex-start";
 		buttonBarContainer.style.marginTop = "1rem";
+		buttonBarContainer.style.gap = "0.5rem";
 	}
 
 	private submitClickCallback = (evt: MouseEvent) => this.submit();
diff --git a/src/gui/GenericWideInputPrompt/GenericWideInputPrompt.ts b/src/gui/GenericWideInputPrompt/GenericWideInputPrompt.ts
index 9e2b105..4ad20ab 100644
--- a/src/gui/GenericWideInputPrompt/GenericWideInputPrompt.ts
+++ b/src/gui/GenericWideInputPrompt/GenericWideInputPrompt.ts
@@ -118,6 +118,7 @@ export default class GenericWideInputPrompt extends Modal {
 		buttonBarContainer.style.flexDirection = "row-reverse";
 		buttonBarContainer.style.justifyContent = "flex-start";
 		buttonBarContainer.style.marginTop = "1rem";
+		buttonBarContainer.style.gap = "0.5rem";
 	}
 
 	private submitClickCallback = (evt: MouseEvent) => this.submit();
diff --git a/src/gui/choiceList/AddChoiceBox.svelte b/src/gui/choiceList/AddChoiceBox.svelte
index 174280e..7364776 100644
--- a/src/gui/choiceList/AddChoiceBox.svelte
+++ b/src/gui/choiceList/AddChoiceBox.svelte
@@ -34,7 +34,6 @@
 
 <style>
     .addChoiceBox {
-        margin-top: 1em;
         display: flex;
         flex-direction: row;
         align-items: center;
@@ -49,8 +48,8 @@
     }
 
     #addChoiceTypeSelector {
-        font-size: 16px;
-        padding: 3px;
-        border-radius: 3px;
+        font-size: var(--font-ui-small);
+        padding: var(--size-4-1) var(--size-4-3);
+        border-radius: var(--button-radius);
     }
 </style>
\ No newline at end of file
diff --git a/src/gui/choiceList/ChoiceView.svelte b/src/gui/choiceList/ChoiceView.svelte
index ca2125a..7f4bea5 100644
--- a/src/gui/choiceList/ChoiceView.svelte
+++ b/src/gui/choiceList/ChoiceView.svelte
@@ -318,6 +318,7 @@
 		align-items: center;
 		justify-content: space-between;
 		margin-top: 1rem;
+		gap: 1rem;
 	}
 
 	@media (max-width: 800px) {