diff --git a/client/src/components/inputs/CheckBox.vue b/client/src/components/inputs/CheckBox.vue
index e756b61..8738759 100644
--- a/client/src/components/inputs/CheckBox.vue
+++ b/client/src/components/inputs/CheckBox.vue
@@ -1,10 +1,17 @@
 <script setup lang="ts">
+const props = withDefaults(defineProps<{
+  modelValue: boolean
+}>(), {
+  modelValue: false,
+});
 
-const props = defineModel<{
-  modelValue: boolean,
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: boolean): void,
 }>();
-let { modelValue } = $(props);
 
+let modelValue = $ref(false);
+watch(() => props.modelValue, (val) => { if (val !== modelValue) modelValue = val; });
+watch($$(modelValue), (val) => emit('update:modelValue', val));
 </script>
 
 <template>
diff --git a/client/src/components/inputs/DropdownInput.vue b/client/src/components/inputs/DropdownInput.vue
index 36b5972..00f6f08 100644
--- a/client/src/components/inputs/DropdownInput.vue
+++ b/client/src/components/inputs/DropdownInput.vue
@@ -1,10 +1,6 @@
 <!-- Base component that implements selecting single and multiple values from a list in a type-unsafe manner -->
-<script lang="ts">
-export type Index = string | number | symbol;
-</script>
-
 <script setup lang="ts">
-import { equals, isNullish } from '../../util';
+import { equals, isNullish, Index } from '../../util';
 // --- Prop setup ---
 const props = withDefaults(defineProps<{
   // Two-Way Bindings (v-model)
@@ -33,10 +29,10 @@ const emit = defineEmits<{
 // Hook up two-way bindings
 let modelValue = $ref(multiple ? props.modelValue ?? [] : props.modelValue);
 watch(() => props.modelValue, (val: any) => { if (!equals(val, modelValue)) modelValue = val; }, { deep: true });
-watch($$(modelValue), (val: any) => { if(!equals(val, props.modelValue)) emit('update:modelValue', modelValue); }, { deep: true });
+watch($$(modelValue), (val: any) => emit('update:modelValue', modelValue), { deep: true });
 let search = $ref(props.search);
 watch(() => props.search, (val: string) => { if (!equals(val, search)) search = val; }, { deep: true });
-watch($$(search), (val) => { if(!equals(val, props.search)) emit('update:search', search); }, { deep: true });
+watch($$(search), (val) => emit('update:search', search), { deep: true });
 
 // --- Everything Else  ---
 let expanded = $ref(false);
diff --git a/client/src/components/inputs/PillBar.vue b/client/src/components/inputs/PillBar.vue
index cc79b7a..dbe6894 100644
--- a/client/src/components/inputs/PillBar.vue
+++ b/client/src/components/inputs/PillBar.vue
@@ -1,41 +1,39 @@
 <script setup lang="ts">
+import { isNullish, Index, MaybeIndex } from '../../util';
 
-const props = defineModel<{
-  options: {
-    name: string,
-    key: string,
-    icon: Component,
-  }[],
-  modelValue: number | string,
-  useIndex: boolean,
+const props = withDefaults(defineProps<{
+  options: Record<Index, {
+    display?: string,
+    icon?: Component,
+  }>,
+  modelValue: MaybeIndex,
+}>(), {
+  options: () => ({}),
+});
+const { options } = $(props);
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: MaybeIndex): void,
 }>();
-let { options, modelValue, useIndex } = $(props);
 
-function setSelection(option: any, index: number){
-  if (useIndex) {
-      modelValue = index
-    } else {
-      modelValue = option.key
-    }
-}
+let modelValue: MaybeIndex = $ref(null);
+watch(() => props.modelValue, (val) => { if (val !== modelValue) modelValue = val; });
+watch($$(modelValue), (val) => emit('update:modelValue', val));
 
 onMounted(async() => {
-  if (modelValue === undefined) {
-    if (useIndex) {
-      modelValue = 0
-    } else {
-      modelValue = options[0].key
-    }
+  if (isNullish(modelValue)) {
+    const entries = Object.entries(options);
+    modelValue = entries.length > 0
+      ? entries[0][0]
+      : null;
   }
 });
-
 </script>
-
 <template>
   <div>
-    <button class="option" v-for="(option, index) in options" :key="index" :class="{selected:  modelValue == index || modelValue == option.key}" @click="setSelection(option, index)">
-      <i class="material-icons" v-if="option.icon">{{ option.icon }}</i>
-      {{ option.name }}
+    <button class="option" v-for="[index, option] of Object.entries(options)" :key="index" :class="{selected: modelValue === index}" @click="() => modelValue = index">
+      <component :is="option.icon"/>
+      {{ option.display }}
     </button>
   </div>
 </template>
@@ -43,9 +41,8 @@ onMounted(async() => {
 <style scoped>
 div {
   flex-flow: nowrap;
+  gap: 0.25rem;
 }
-
-.selected {
-  background-color: var(--cl-bg-sl);
-}
+button { padding: 0.25rem; gap: 0.25rem; }
+.selected { background-color: var(--cl-bg-sl); }
 </style>
\ No newline at end of file
diff --git a/client/src/components/inputs/SingleSelect.vue b/client/src/components/inputs/SingleSelect.vue
index 74b375f..c657fcf 100644
--- a/client/src/components/inputs/SingleSelect.vue
+++ b/client/src/components/inputs/SingleSelect.vue
@@ -1,10 +1,9 @@
 <!-- Wrapper component that sets "multiple" on DropdownInput to false and declares its type to be an Index -->
 <script setup lang="ts">
-import { Index } from "./DropdownInput.vue";
-import { equals } from "../../util";
+import { equals, Index, MaybeIndex } from "../../util";
 const props = withDefaults(defineProps<{
   // Two-Way Bindings (v-model)
-  modelValue?: Index | null,
+  modelValue?: MaybeIndex,
   search?: string,
 
   // One-Way Bindings
diff --git a/client/src/definitions.ts b/client/src/definitions.ts
index 0c7a3a1..b8b3ce6 100644
--- a/client/src/definitions.ts
+++ b/client/src/definitions.ts
@@ -15,14 +15,14 @@ export const editTypes: { [key: string]: { [key: string]: any } } = {
         }),
       ),
       sections: [
-        { 
+        {
           fields: [
-          { key: "name", label: "Name", as: "TextBox" },
-          { key: "verdict", label: "Verdict", as: "PillBar", props: { options: [{ name: 'Accept', key: 'accept' }, { name: 'Drop', key: 'drop' }, { name: 'Continue', key: 'continue' }] } },
-          { key: "counter", label: "Counter", as: "CheckBox", },
-          { key: "comment", label: "Comment", as: "MultilineTextBox", },
-        ],
-      },
+            { key: "name", label: "Name", as: "TextBox" },
+            { key: "verdict", label: "Verdict", as: "PillBar", props: { options: { accept: { display: 'Accept' }, drop: { display: 'Drop' }, continue: { display: 'Continue' } } } },
+            { key: "counter", label: "Counter", as: "CheckBox" },
+            { key: "comment", label: "Comment", as: "MultilineTextBox" },
+          ],
+        },
       ],
     },
   },
@@ -43,7 +43,7 @@ export const editTypes: { [key: string]: { [key: string]: any } } = {
         {
           fields: [
             { key: "name", label: "Name", as: "TextBox", default: "placeholder" },
-            { key: "type", label: "Type", as: "PillBar", props: { options: [{ name: 'Hardware', key: 'hardware' }, { name: 'VLAN', key: 'vlan' }, { name: 'Bond', key: 'bond' }, { name: 'Bridge', key: 'bridge' }] } },
+            { key: "type", label: "Type", as: "PillBar", props: { options: { hardware: { display: 'Hardware' }, vlan: { display: 'VLAN' }, bond: { display: 'Bond' }, bridge: { display: 'Bridge' } } } },
             { key: "hardware_device", label: "Hardware Device", as: "TextBox", enabled: (values: any) => (values["type"] == 'hardware') },
             { key: "vlan_parent", label: "VLAN Parent", as: "TextBox", enabled: (values: any) => (values["type"] == 'vlan') },
             { key: "vlan_id", label: "VLAN ID", as: "NumberBox", props: { min: 1, max: 4094 }, enabled: (values: any) => (values["type"] == 'vlan') },
@@ -54,11 +54,11 @@ export const editTypes: { [key: string]: { [key: string]: any } } = {
         {
           title: "Addressing",
           fields: [
-            { key: "addressing_mode", label: "Addressing Mode", as: "PillBar", props: { options: [{ name: 'None', key: 'none' }, { name: 'Static', key: 'static' }, { name: 'DHCP', key: 'dhcp' }] } },
+            { key: "addressing_mode", label: "Addressing Mode", as: "PillBar", props: { options: { none: { display: 'None' }, static: { display: 'Static' }, dhcp: { display: 'DHCP' } } } },
             { key: "address", label: "Address", as: "TextBox", enabled: (values: any) => (values["addressing_mode"] == 'static') },
             { key: "comment", label: "Comment", as: "MultilineTextBox" },
           ],
-        }
+        },
       ],
     },
     "staticroutes": {
@@ -71,7 +71,7 @@ export const editTypes: { [key: string]: { [key: string]: any } } = {
       sections: [
         {
           fields: [
-            { key: "name", label: "Name", as: "TextBox", },
+            { key: "name", label: "Name", as: "TextBox" },
             { key: "interface", label: "Interface", as: "TextBox" },
             { key: "gateway", label: "Gateway", as: "TextBox" },
             { key: "destination", label: "Destination", as: "TextBox" },
diff --git a/client/src/util.ts b/client/src/util.ts
index 2d8b29e..be8361e 100644
--- a/client/src/util.ts
+++ b/client/src/util.ts
@@ -13,4 +13,7 @@ export function equals(a: any, b: any): boolean {
 
 export function isNullish(value: any) {
   return !!(value === null || value === undefined);
-}
\ No newline at end of file
+}
+
+export type Index = string | number | symbol;
+export type MaybeIndex = Index | null;
\ No newline at end of file