diff --git a/src/components/controlComponents/paneCapture.vue b/src/components/controlComponents/paneCapture.vue
index 1e3ddd3b..0baf73bd 100644
--- a/src/components/controlComponents/paneCapture.vue
+++ b/src/components/controlComponents/paneCapture.vue
@@ -232,20 +232,22 @@
       </li>
     </ul>
 
-    <taskSubmitter
-      v-if="scanCapture"
-      :submit-url="scanUri"
-      :submit-data="scanPayload"
-      :submit-label="'Start Scan'"
-      @submit="onScanSubmit"
-      @response="onScanResponse"
-      @error="onScanError"
-    >
-    </taskSubmitter>
+    <div v-if="scanCapture" class="uk-margin uk-margin-remove-top ">
+      <taskSubmitter
+        :submit-url="scanUri"
+        :submit-data="scanPayload"
+        :submit-label="'Start Scan'"
+        :button-primary="true"
+        @submit="onScanSubmit"
+        @response="onScanResponse"
+        @error="onScanError"
+      >
+      </taskSubmitter>
+    </div>
 
     <button
       v-else
-      class="uk-button uk-button-primary uk-form-small uk-margin uk-margin-remove-top uk-float-right uk-width-1-1"
+      class="uk-button uk-button-primary uk-form-small uk-margin uk-margin-remove-top uk-width-1-1"
       @click="handleCapture()"
     >
       Capture
diff --git a/src/components/controlComponents/paneNavigate.vue b/src/components/controlComponents/paneNavigate.vue
index a3ff6db5..30b3b0b7 100644
--- a/src/components/controlComponents/paneNavigate.vue
+++ b/src/components/controlComponents/paneNavigate.vue
@@ -95,7 +95,7 @@
       </li>
 
       <!--Show autofocus if default plugin is enabled-->
-      <li class="uk-open">
+      <li v-show="fastAutofocusUri || normalAutofocusUri" class="uk-open">
         <a class="uk-accordion-title" href="#">Autofocus</a>
         <div class="uk-accordion-content">
           <div class="uk-grid-small uk-child-width-expand" uk-grid>
diff --git a/src/components/controlComponents/settingsComponents/cameraSettings.vue b/src/components/controlComponents/settingsComponents/cameraSettings.vue
index 1fb1759d..db0cbaf6 100644
--- a/src/components/controlComponents/settingsComponents/cameraSettings.vue
+++ b/src/components/controlComponents/settingsComponents/cameraSettings.vue
@@ -61,7 +61,7 @@
             'Start recalibration? This may take a while, and the microscope will be locked during this time.'
           "
           :submit-url="recalibrationUri"
-          :submit-label="'Auto-Calibrate (Task)'"
+          :submit-label="'Auto-Calibrate'"
           @response="onRecalibrateResponse"
           @error="onRecalibrateError"
         >
diff --git a/src/components/genericComponents/taskSubmitter.vue b/src/components/genericComponents/taskSubmitter.vue
index b10b0bc2..9ce03642 100644
--- a/src/components/genericComponents/taskSubmitter.vue
+++ b/src/components/genericComponents/taskSubmitter.vue
@@ -20,14 +20,17 @@
       </button>
     </div>
 
-    <button
-      type="button"
-      :hidden="taskRunning"
-      class="uk-button uk-button-primary uk-form-small uk-margin-remove uk-float-right uk-width-1-1"
-      @click="bootstrapTask()"
-    >
-      {{ submitLabel }}
-    </button>
+    <div>
+      <button
+        type="button"
+        :hidden="taskRunning"
+        class="uk-button uk-form-small uk-margin-remove uk-width-1-1"
+        :class="[buttonPrimary ? 'uk-button-primary' : 'uk-button-default']"
+        @click="bootstrapTask()"
+      >
+        {{ submitLabel }}
+      </button>
+    </div>
   </div>
 </template>
 
@@ -76,6 +79,11 @@ export default {
       type: String,
       required: false,
       default: "Start task?"
+    },
+    buttonPrimary: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },