diff --git a/src/components/AccordionItem.vue b/src/components/AccordionItem.vue
new file mode 100644
index 0000000..eaf31f2
--- /dev/null
+++ b/src/components/AccordionItem.vue
@@ -0,0 +1,32 @@
+<script>
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  computed: {
+    uid() {
+      return `accordion_item_${this.$.uid}`;
+    },
+  },
+  props: {
+    expanded: false,
+  },
+});
+</script>
+
+<template>
+  <div class="accordion-item">
+    <h2 v-if="$slots.header" class="accordion-header">
+      <button class="accordion-button" :class="{collapsed: !expanded}"
+          type="button" data-bs-toggle="collapse" :data-bs-target="`#${uid}`"
+          :aria-expanded="expanded" :aria-controls="uid">
+        <slot name="header"></slot>
+      </button>
+    </h2>
+    <div :id="uid" class="accordion-collapse"
+       :class="{collapse: $slots.header, show: expanded}">
+      <div class="accordion-body">
+        <slot></slot>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/src/components/SeedSettings.vue b/src/components/SeedSettings.vue
index 3c17cf7..e6ab0fe 100644
--- a/src/components/SeedSettings.vue
+++ b/src/components/SeedSettings.vue
@@ -24,11 +24,10 @@ export default defineComponent({
           || (this.settings.boss_shuffle && this.settings.boss_shuffle != "vanilla");
     },
     dungeonItemsShuffled() {
-      return (this.settings.small_keys && this.settings.small_keys != "dungeons")
-          || (this.settings.big_keys && this.settings.big_keys != "dungeons")
-          || (this.settings.maps && this.settings.maps != "dungeons")
-          || (this.settings.compasses && this.settings.compasses != "dungeons")
-          || (this.settings.compasses && this.settings.compasses != "dungeons")
+      return (this.settings.small_keys && this.settings.small_keys != "dungeon")
+          || (this.settings.big_keys && this.settings.big_keys != "dungeon")
+          || (this.settings.maps && this.settings.maps != "dungeon")
+          || (this.settings.compasses && this.settings.compasses != "dungeon")
           || (this.settings.prize_shuffle && this.settings.prize_shuffle != "vanilla");
     }
   },
diff --git a/src/main.js b/src/main.js
index a57624e..d0ffaad 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,7 +3,6 @@ import App from "./App.vue";
 import router from "./router";
 
 import "bootstrap/dist/css/bootstrap.min.css";
-import "bootstrap/dist/js/bootstrap.min.js";
 import "bootstrap-icons/font/bootstrap-icons.css";
 import "bootstrap";
 
diff --git a/src/views/GenerateView.vue b/src/views/GenerateView.vue
index 77fc21c..8a1b719 100644
--- a/src/views/GenerateView.vue
+++ b/src/views/GenerateView.vue
@@ -4,11 +4,13 @@ import { defineComponent } from "vue";
 import axios from "axios";
 import { Modal } from "bootstrap";
 
+import AccordionItem from "@/components/AccordionItem.vue";
 import PresetPicker from "@/components/PresetPicker.vue";
 import SettingPicker from "@/components/SettingPicker.vue";
 
 export default defineComponent({
   components: {
+    AccordionItem,
     PresetPicker,
     SettingPicker,
   },
@@ -121,31 +123,41 @@ export default defineComponent({
     <div class="card-header">
       Generate Seed
     </div>
-    <ul class="list-group list-group-flush">
-      <li class="list-group-item">
-        <div class="mb-2 mt-2">
-          <PresetPicker ref="preset" generator="base" @selected="presetSelected"
-              @save="savePreset" />
-        </div>
-      </li>
-      <li class="list-group-item">
+    <div id="settings" class="accordion accordion-flush">
+      <AccordionItem>
+        <PresetPicker ref="preset" generator="base" @selected="presetSelected"
+            @save="savePreset" />
+      </AccordionItem>
+      <AccordionItem :expanded="true">
+        <template #header>
+          <b>World:</b>
+        </template>
         <SettingPicker color="primary" v-model="set.mode" name="mode" generator="base" />
         <SettingPicker color="primary" v-model="set.weapons" name="weapons" generator="base" />
-      </li>
-      <li class="list-group-item">
+      </AccordionItem>
+      <AccordionItem :expanded="true">
+        <template #header>
+          <b>Goal:</b>
+        </template>
         <SettingPicker color="success" v-model="set.goal" name="goal" generator="base" />
         <SettingPicker color="success" v-if="['ganon', 'fast_ganon'].includes(this.set.goal)" 
             v-model="set.crystals_ganon" name="crystals_ganon" generator="base" />
         <SettingPicker color="success" v-model="set.crystals_gt" name="crystals_gt" generator="base" />
-      </li>
-      <li class="list-group-item">
+      </AccordionItem>
+      <AccordionItem :expanded="false">
+        <template #header>
+          <b>Entrance Shuffle:</b>
+        </template>
         <SettingPicker color="warning" v-model="set.entrance_shuffle" name="entrance_shuffle" generator="base" />
         <SettingPicker color="warning" v-if="this.set.entrance_shuffle != 'vanilla'"
             v-model="set.skull_woods" name="skull_woods" generator="base" />
         <SettingPicker color="warning" v-if="this.set.entrance_shuffle != 'vanilla'"
             v-model="set.linked_drops" name="linked_drops" generator="base" />
-      </li>
-      <li class="list-group-item">
+      </AccordionItem>
+      <AccordionItem :expanded="false">
+        <template #header>
+          <b>Dungeon Shuffle:</b>
+        </template>
         <SettingPicker color="danger" v-model="set.door_shuffle" name="door_shuffle" generator="base" />
         <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
             v-model="set.door_lobbies" name="door_lobbies" generator="base" />
@@ -153,31 +165,43 @@ export default defineComponent({
             v-model="set.door_type_mode" name="door_type_mode" generator="base" />
         <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
             v-model="set.trap_door_mode" name="trap_door_mode" generator="base" />
-      </li>
-      <li class="list-group-item">
+      </AccordionItem>
+      <AccordionItem :expanded="false">
+        <template #header>
+          <b>Enemizer:</b>
+        </template>
         <SettingPicker color="success" v-model="set.boss_shuffle" name="boss_shuffle" generator="base" />
         <SettingPicker color="success" v-model="set.enemy_shuffle" name="enemy_shuffle" generator="base" />
-      </li>
-      <li class="list-group-item">
+      </AccordionItem>
+      <AccordionItem :expanded="false">
+        <template #header>
+          <b>Dungeon Item Shuffle:</b>
+        </template>
         <SettingPicker color="warning" v-model="set.small_keys" name="small_keys" generator="base" />
         <SettingPicker color="warning" v-model="set.big_keys" name="big_keys" generator="base" />
         <SettingPicker color="warning" v-model="set.maps" name="maps" generator="base" />
         <SettingPicker color="warning" v-model="set.compasses" name="compasses" generator="base" />
-      </li>
-      <li class="list-group-item">
+      </AccordionItem>
+      <AccordionItem :expanded="false">
+        <template #header>
+          <b>Other Pool Settings:</b>
+        </template>
         <SettingPicker color="danger" v-model="set.shop_shuffle" name="shop_shuffle" generator="base" />
         <SettingPicker color="danger" v-model="set.drop_shuffle" name="drop_shuffle" generator="base" />
         <SettingPicker color="danger" v-model="set.pottery" name="pottery" generator="base" />
         <SettingPicker color="danger" v-model="set.prize_shuffle" name="prize_shuffle" generator="base" />
-      </li>
-      <li class="list-group-item">
+      </AccordionItem>
+      <AccordionItem :expanded="false">
+        <template #header>
+          <b>Item Settings:</b>
+        </template>
         <SettingPicker color="primary" v-model="set.boots" name="boots" generator="base" />
         <SettingPicker color="primary" v-model="set.flute" name="flute" generator="base" />
         <SettingPicker color="primary" v-model="set.dark_rooms" name="dark_rooms" generator="base" />
         <SettingPicker color="primary" v-model="set.bombs" name="bombs" generator="base" />
         <SettingPicker color="primary" v-model="set.book" name="book" generator="base" />
-      </li>
-    </ul>
+      </AccordionItem>
+    </div>
     <div class="card-footer">
       <div class="nav nav-pills nav-fill" role="group">
         <button type="button" class="m-1 nav-item btn btn-outline-danger"