diff --git a/src/ui/BeatSettings/BeatSettings.vue b/src/ui/BeatSettings/BeatSettings.vue
index ac3581c..7f9b1f5 100644
--- a/src/ui/BeatSettings/BeatSettings.vue
+++ b/src/ui/BeatSettings/BeatSettings.vue
@@ -1,17 +1,17 @@
 <template>
     <div class="beat-settings" v-if="beat">
         <div class="beat-settings-options">
-            <div class="beat-settings-boxes beat-settings-option">
-                <number-input label="Bars: " v-model="beat.barCount.value" :disabled="beat.barSettingsLocked.value" /> 
+            <div class="beat-settings-option">
+                <bool-box label="Auto beat length" v-model="beat.useAutoBeatLength.value" />
             </div>
-            <div class="beat-settings-bar-count beat-settings-option">
-                <number-input label="Boxes per bar: " v-model="beat.timeSigUp.value" /> 
+            <div class="beat-settings-option">
+                <number-input label-position="left" label="Bars" v-model="beat.barCount.value" :disabled="beat.barSettingsLocked.value" /> 
             </div>
-            <div class="beat-settings-bar-count beat-settings-option">
-                <bool-box label="Sticking mode: " v-model="beat.displaySticking.value" />
+            <div class="beat-settings-option">
+                <number-input label-position="left" label="Boxes per bar" v-model="beat.timeSigUp.value" /> 
             </div>
-            <div class="beat-settings-bar-count beat-settings-option">
-                <bool-box label="Auto beat length: " v-model="beat.useAutoBeatLength.value" />
+            <div class="beat-settings-option">
+                <bool-box label="Sticking mode" v-model="beat.displaySticking.value" />
             </div>
             <action-button
                 label="New Track"
@@ -53,7 +53,9 @@
     }
 
     .beat-settings-option {
+        vertical-align: center;
         text-align: center;
+        height: 3em;
     }
 
     .beat-settings-option-group {