diff --git a/src/components/paneNavigate.vue b/src/components/paneNavigate.vue
index 90c61252..1adb59a0 100644
--- a/src/components/paneNavigate.vue
+++ b/src/components/paneNavigate.vue
@@ -64,26 +64,22 @@
 
     <li class="uk-open">
       <a class="uk-accordion-title" href="#">Autofocus</a>
-      <div class="uk-text-center uk-container" v-if="isAutofocusing">
-        <div class="center-spinner" uk-spinner></div>
-      </div>
-      <div class="uk-accordion-content" v-else>
-
-          <div class="uk-grid-small uk-child-width-1-3" uk-grid>
-
-            <div>
-              <button v-on:click="runFastAutofocus(2000, 300);" class="uk-button uk-button-default uk-form-small uk-float-right uk-width-1-1">Fast</button>
-            </div>
-
-            <div>
-              <button v-on:click="runAutofocus([-60,-30,0,30,60]);" class="uk-button uk-button-default uk-form-small uk-float-right uk-width-1-1">Medium</button>
-            </div>
-
-            <div>
-              <button v-on:click="runAutofocus([-20,-10,0,10,20]);" class="uk-button uk-button-default uk-form-small uk-float-right uk-width-1-1">Fine</button>
-            </div>
+      <div class="uk-accordion-content">
 
+        <div class="uk-text-center uk-container" v-if="isAutofocusing">
+          <div class="center-spinner" uk-spinner></div>
+        </div>
+        <div class="uk-grid-small uk-child-width-1-3" v-bind:hidden="isAutofocusing" uk-grid>
+          <div>
+            <button v-on:click="runFastAutofocus(2000, 300);" class="uk-button uk-button-default uk-form-small uk-float-right uk-width-1-1">Fast</button>
           </div>
+          <div>
+            <button v-on:click="runAutofocus([-60,-30,0,30,60]);" class="uk-button uk-button-default uk-form-small uk-float-right uk-width-1-1">Medium</button>
+          </div>
+          <div>
+            <button v-on:click="runAutofocus([-20,-10,0,10,20]);" class="uk-button uk-button-default uk-form-small uk-float-right uk-width-1-1">Fine</button>
+          </div>
+        </div>
 
       </div>
     </li>
diff --git a/src/components/paneSettingsComponents/cameraSettings.vue b/src/components/paneSettingsComponents/cameraSettings.vue
index 7433babe..86c5ff5e 100644
--- a/src/components/paneSettingsComponents/cameraSettings.vue
+++ b/src/components/paneSettingsComponents/cameraSettings.vue
@@ -27,7 +27,7 @@
     <div class="uk-text-center uk-container" v-if="isCalibrating">
       <div class="center-spinner" uk-spinner></div>
     </div>
-    <div v-else>
+    <div v-bind:hidden="isCalibrating">
       <button type="button" v-on:click="recalibrateConfirm()" class="uk-button uk-button-default uk-form-small uk-float-right uk-margin-small uk-width-1-1">Auto-Calibrate</button>
     </div>