diff --git a/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue b/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue
index 7080daac..a095514f 100644
--- a/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue
+++ b/webapp/src/components/tabContentComponents/controlComponents/paneControl.vue
@@ -1,108 +1,52 @@
 <template>
   <div id="paneControl" class="uk-padding-small">
-    <div v-if="stageAvailable">
-      <ul uk-accordion="multiple: true">
-        <li class="uk-open">
-          <a class="uk-accordion-title" href="#">Position</a>
-          <div class="uk-accordion-content">
-            <form>
-              <!-- Text boxes to set and view position -->
-              <div class="input-and-buttons-container">
-                <input
-                  v-for="(_v, key) in setPosition"
-                  :key="`setPosition_${key}`"
-                  v-model="setPosition[key]"
-                  class="uk-form-small numeric-setting-line-input"
-                  type="number"
-                  @keyup.enter="startMoveTask"
-                />
-                <sync-property-button @click="updatePosition" />
-              </div>
-              <p>
-                <action-button
-                  ref="moveButton"
-                  thing="stage"
-                  action="move_absolute"
-                  :submit-data="setPosition"
-                  :submit-label="'Move'"
-                  :can-terminate="true"
-                  :poll-interval="0.05"
-                  @taskStarted="moveLock = true"
-                  @finished="
-                    updatePosition();
-                    moveLock = false;
-                  "
-                  @error="modalError"
-                />
-              </p>
-            </form>
-            <action-button
-              thing="stage"
-              action="set_zero_position"
-              submit-label="Zero Coordinates"
-              :can-terminate="false"
-              @finished="updatePosition"
-              @error="modalError"
-            />
-          </div>
-        </li>
-        <!--Show autofocus if default plugin is enabled-->
-        <li 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>
-              <div v-show="!isAutofocusing || isAutofocusing == 1">
-                <action-button
-                  thing="autofocus"
-                  action="fast_autofocus"
-                  :submit-data="{ dz: 2000 }"
-                  :submit-label="'Autofocus'"
-                  :button-primary="true"
-                  :submit-on-event="'globalFastAutofocusEvent'"
-                  @taskStarted="isAutofocusing = 1"
-                  @finished="
-                    updatePosition();
-                    isAutofocusing = 0;
-                  "
-                  @error="modalError"
-                />
-              </div>
-            </div>
-          </div>
-        </li>
-        <li class="uk-open">
-          <a class="uk-accordion-title" href="#">Image Capture</a>
-          <div class="uk-accordion-content">
-            <div class="uk-margin">
-              <action-button
-                thing="camera"
-                action="capture_jpeg"
-                :submit-data="{ stream_name: 'main' }"
-                :submit-label="'Low Resolution'"
-                :submit-on-event="'globalCaptureEvent'"
-                @response="handleCaptureResponse"
-                @error="modalError"
-              />
-            </div>
+    <positionControl />
 
-            <div class="uk-margin">
-              <action-button
-                thing="camera"
-                action="capture_jpeg"
-                :submit-data="{ stream_name: 'full' }"
-                submit-label="Full Resolution"
-                :submit-on-event="'globalCaptureEvent'"
-                @response="handleCaptureResponse"
-                @error="modalError"
-              />
-            </div>
-          </div>
-        </li>
-      </ul>
+    <p>Autofocus</p>
+
+    <div class="uk-grid-small uk-child-width-expand" uk-grid>
+      <div v-show="!isAutofocusing || isAutofocusing == 1">
+        <action-button
+          thing="autofocus"
+          action="fast_autofocus"
+          :submit-data="{ dz: 2000 }"
+          :submit-label="'Autofocus'"
+          :button-primary="true"
+          :submit-on-event="'globalFastAutofocusEvent'"
+          @taskStarted="isAutofocusing = 1"
+          @finished="
+            updatePosition();
+            isAutofocusing = 0;
+          "
+          @error="modalError"
+        />
+      </div>
     </div>
-    <div v-else class="uk-text-warning">
-      <p>Stage positioning is disabled since no stage is connected.</p>
-      <p>Please check all data and power connections to your motor controller board.</p>
+
+    <p>Image Capture</p>
+
+    <div class="uk-margin">
+      <action-button
+        thing="camera"
+        action="capture_jpeg"
+        :submit-data="{ stream_name: 'main' }"
+        :submit-label="'Low Resolution'"
+        :submit-on-event="'globalCaptureEvent'"
+        @response="handleCaptureResponse"
+        @error="modalError"
+      />
+    </div>
+
+    <div class="uk-margin">
+      <action-button
+        thing="camera"
+        action="capture_jpeg"
+        :submit-data="{ stream_name: 'full' }"
+        submit-label="Full Resolution"
+        :submit-on-event="'globalCaptureEvent'"
+        @response="handleCaptureResponse"
+        @error="modalError"
+      />
     </div>
   </div>
 </template>
@@ -110,129 +54,23 @@
 <script>
 import axios from "axios";
 import ActionButton from "../../labThingsComponents/actionButton.vue";
-import syncPropertyButton from "../../labThingsComponents/syncPropertyButton.vue";
+import positionControl from "./positionControl.vue";
 
-// Export main app
 export default {
   name: "PaneControl",
 
   components: {
     ActionButton,
-    syncPropertyButton,
+    positionControl,
   },
 
   data: function () {
     return {
-      setPosition: null,
       isAutofocusing: 0,
-      moveLock: false,
     };
   },
 
-  computed: {
-    stageAvailable() {
-      return this.thingAvailable("stage");
-    },
-    baseUri: function () {
-      return this.$store.getters.baseUri;
-    },
-    positionStatusUri: function () {
-      return `${this.baseUri}/stage/position`;
-    },
-    moveInImageCoordinatesUri: function () {
-      return this.thingActionUrl("camera_stage_mapping", "move_in_image_coordinates");
-    },
-  },
-
-  async mounted() {
-    let self = this;
-    // A global signal listener to perform a move action
-    this.$root.$on("globalMoveEvent", self.move);
-    // A global signal listener to perform a move action in pixels
-    this.$root.$on("globalMoveInImageCoordinatesEvent", (x, y, absolute) => {
-      this.moveInImageCoordinatesRequest(x, y, absolute);
-    });
-    // A global signal listener to perform a move in multiples of a step size
-    this.$root.$on("globalMoveStepEvent", (x_steps, y_steps, z_steps) => {
-      const navigationStepSize = this.$store.state.navigationStepSize;
-      const navigationInvert = this.$store.state.navigationInvert;
-      const x = x_steps * navigationStepSize.x * (navigationInvert.x ? -1 : 1);
-      const y = y_steps * navigationStepSize.y * (navigationInvert.y ? -1 : 1);
-      const z = z_steps * navigationStepSize.z * (navigationInvert.z ? -1 : 1);
-      this.$root.$emit("globalMoveEvent", x, y, z, false);
-    });
-    // Update the current position in text boxes
-    await this.updatePosition();
-  },
-
-  beforeDestroy() {
-    // Remove global signal listener to perform a move action
-    this.$root.$off("globalMoveEvent");
-    this.$root.$off("globalMoveInImageCoordinatesEvent");
-    this.$root.$off("globalMoveStepEvent");
-  },
-
   methods: {
-    timeout(ms) {
-      return new Promise((resolve) => setTimeout(resolve, ms));
-    },
-    async move(x, y, z, absolute) {
-      // Move the stage, by updating the controls and starting a move task
-      // This is equivalent to clicking the "move" button.
-      if (this.moveLock) return; // Discard move requests if we're already moving
-      // NB moveLock is just  boolean flag - it's not as safe as a "proper" lock.
-      this.moveLock = true; // This will also be set by the task submitter, but
-      // setting it here avoids multiple moves being requested simultaneously.
-      if (absolute) {
-        this.setPosition = { x: x, y: y, z: z };
-      } else {
-        await this.updatePosition();
-        this.setPosition = {
-          x: this.setPosition.x + x,
-          y: this.setPosition.y + y,
-          z: this.setPosition.z + z,
-        };
-      }
-      await this.timeout(1); // Wait for Vue to update the position
-      await this.startMoveTask();
-    },
-    async startMoveTask() {
-      await this.$refs.moveButton.startTask();
-    },
-    moveInImageCoordinatesRequest: function (x, y) {
-      // If not movement-locked
-      if (!this.moveLock) {
-        // Lock move requests
-        this.moveLock = true;
-
-        if (!this.moveInImageCoordinatesUri) {
-          this.modalError(
-            "Moving in image coordinates is not supported - you will need to upgrade your microscope's software.",
-          );
-        }
-
-        // Send move request
-        axios
-          .post(this.moveInImageCoordinatesUri, {
-            x: x, // NB the coordinates are numpy/PIL style, meaning X and Y are swapped.
-            y: y,
-          })
-          .then(() => {
-            this.updatePosition(); // Update the position in text boxes
-          })
-          .catch((error) => {
-            this.modalError(error); // Let mixin handle error
-          })
-          .then(() => {
-            this.moveLock = false; // Release the move lock
-          });
-      }
-    },
-
-    async updatePosition() {
-      this.setPosition = await this.readThingProperty("stage", "position");
-    },
-
     handleCaptureResponse: async function (response) {
       // Retrieve the captured image and save it
       let imageUri = response.output.href;
@@ -253,29 +91,3 @@ export default {
   },
 };
 </script>
-
-<style scoped>
-.input-and-buttons-container {
-  display: flex;
-  flex-flow: row wrap;
-  justify-content: flex-start;
-  align-content: stretch;
-  align-items: center;
-  width: 100%;
-}
-.numeric-setting-line-input {
-  flex-grow: 1;
-  margin-left: 5px;
-  margin-right: 5px;
-  width: 3em;
-  /* Stop Firefox showing input spinners, other
-  browsers set with block below */
-  -moz-appearance: textfield;
-}
-/* Chrome, Safari, Edge, Opera */
-.numeric-setting-line-input::-webkit-outer-spin-button,
-.numeric-setting-line-input::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-  margin: 0;
-}
-</style>
diff --git a/webapp/src/components/tabContentComponents/controlComponents/positionControl.vue b/webapp/src/components/tabContentComponents/controlComponents/positionControl.vue
new file mode 100644
index 00000000..fc4d4bc3
--- /dev/null
+++ b/webapp/src/components/tabContentComponents/controlComponents/positionControl.vue
@@ -0,0 +1,195 @@
+<template>
+  <ul uk-accordion="multiple: true">
+    <li class="uk-closed">
+      <a class="uk-accordion-title" href="#">Position</a>
+      <div class="uk-accordion-content">
+        <form>
+          <!-- Text boxes to set and view position -->
+          <div class="input-and-buttons-container">
+            <input
+              v-for="(_v, key) in setPosition"
+              :key="`setPosition_${key}`"
+              v-model="setPosition[key]"
+              class="uk-form-small numeric-setting-line-input"
+              type="number"
+              @keyup.enter="startMoveTask"
+            />
+            <sync-property-button @click="updatePosition" />
+          </div>
+          <p>
+            <action-button
+              ref="moveButton"
+              thing="stage"
+              action="move_absolute"
+              :submit-data="setPosition"
+              :submit-label="'Move'"
+              :can-terminate="true"
+              :poll-interval="0.05"
+              @taskStarted="moveLock = true"
+              @finished="
+                updatePosition();
+                moveLock = false;
+              "
+              @error="modalError"
+            />
+          </p>
+        </form>
+        <action-button
+          thing="stage"
+          action="set_zero_position"
+          submit-label="Zero Coordinates"
+          :can-terminate="false"
+          @finished="updatePosition"
+          @error="modalError"
+        />
+      </div>
+    </li>
+  </ul>
+</template>
+
+<script>
+import axios from "axios";
+import ActionButton from "../../labThingsComponents/actionButton.vue";
+import syncPropertyButton from "../../labThingsComponents/syncPropertyButton.vue";
+
+export default {
+  name: "PaneControl",
+
+  components: {
+    ActionButton,
+    syncPropertyButton,
+  },
+
+  data: function () {
+    return {
+      setPosition: null,
+      moveLock: false,
+    };
+  },
+
+  computed: {
+    baseUri: function () {
+      return this.$store.getters.baseUri;
+    },
+    positionStatusUri: function () {
+      return `${this.baseUri}/stage/position`;
+    },
+    moveInImageCoordinatesUri: function () {
+      return this.thingActionUrl("camera_stage_mapping", "move_in_image_coordinates");
+    },
+  },
+
+  async mounted() {
+    let self = this;
+    // A global signal listener to perform a move action
+    this.$root.$on("globalMoveEvent", self.move);
+    // A global signal listener to perform a move action in pixels
+    this.$root.$on("globalMoveInImageCoordinatesEvent", (x, y, absolute) => {
+      this.moveInImageCoordinatesRequest(x, y, absolute);
+    });
+    // A global signal listener to perform a move in multiples of a step size
+    this.$root.$on("globalMoveStepEvent", (x_steps, y_steps, z_steps) => {
+      const navigationStepSize = this.$store.state.navigationStepSize;
+      const navigationInvert = this.$store.state.navigationInvert;
+      const x = x_steps * navigationStepSize.x * (navigationInvert.x ? -1 : 1);
+      const y = y_steps * navigationStepSize.y * (navigationInvert.y ? -1 : 1);
+      const z = z_steps * navigationStepSize.z * (navigationInvert.z ? -1 : 1);
+      this.$root.$emit("globalMoveEvent", x, y, z, false);
+    });
+    // Update the current position in text boxes
+    await this.updatePosition();
+  },
+
+  beforeDestroy() {
+    // Remove global signal listener to perform a move action
+    this.$root.$off("globalMoveEvent");
+    this.$root.$off("globalMoveInImageCoordinatesEvent");
+    this.$root.$off("globalMoveStepEvent");
+  },
+
+  methods: {
+    timeout(ms) {
+      return new Promise((resolve) => setTimeout(resolve, ms));
+    },
+    async move(x, y, z, absolute) {
+      // Move the stage, by updating the controls and starting a move task
+      // This is equivalent to clicking the "move" button.
+      if (this.moveLock) return; // Discard move requests if we're already moving
+      // NB moveLock is just  boolean flag - it's not as safe as a "proper" lock.
+      this.moveLock = true; // This will also be set by the task submitter, but
+      // setting it here avoids multiple moves being requested simultaneously.
+      if (absolute) {
+        this.setPosition = { x: x, y: y, z: z };
+      } else {
+        await this.updatePosition();
+        this.setPosition = {
+          x: this.setPosition.x + x,
+          y: this.setPosition.y + y,
+          z: this.setPosition.z + z,
+        };
+      }
+      await this.timeout(1); // Wait for Vue to update the position
+      await this.startMoveTask();
+    },
+    async startMoveTask() {
+      await this.$refs.moveButton.startTask();
+    },
+    moveInImageCoordinatesRequest: function (x, y) {
+      // If not movement-locked
+      if (!this.moveLock) {
+        // Lock move requests
+        this.moveLock = true;
+
+        if (!this.moveInImageCoordinatesUri) {
+          this.modalError(
+            "Moving in image coordinates is not supported - you will need to upgrade your microscope's software.",
+          );
+        }
+
+        // Send move request
+        axios
+          .post(this.moveInImageCoordinatesUri, {
+            x: x, // NB the coordinates are numpy/PIL style, meaning X and Y are swapped.
+            y: y,
+          })
+          .then(() => {
+            this.updatePosition(); // Update the position in text boxes
+          })
+          .catch((error) => {
+            this.modalError(error); // Let mixin handle error
+          })
+          .then(() => {
+            this.moveLock = false; // Release the move lock
+          });
+      }
+    },
+
+    async updatePosition() {
+      this.setPosition = await this.readThingProperty("stage", "position");
+    },
+  },
+};
+</script>
+<style scoped>
+.input-and-buttons-container {
+  display: flex;
+  flex-flow: column wrap;
+  justify-content: flex-start;
+  align-content: stretch;
+  align-items: center;
+  width: 100%;
+}
+.numeric-setting-line-input {
+  flex-grow: 1;
+  margin: 5px 0px;
+  width: 5em;
+  /* Stop Firefox showing input spinners, other
+  browsers set with block below */
+  -moz-appearance: textfield;
+}
+/* Chrome, Safari, Edge, Opera */
+.numeric-setting-line-input::-webkit-outer-spin-button,
+.numeric-setting-line-input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+}
+</style>
diff --git a/webapp/src/components/tabContentComponents/controlContent.vue b/webapp/src/components/tabContentComponents/controlContent.vue
index d9b7101d..11cc87c4 100644
--- a/webapp/src/components/tabContentComponents/controlContent.vue
+++ b/webapp/src/components/tabContentComponents/controlContent.vue
@@ -23,3 +23,9 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.control-component {
+  width: 160px;
+}
+</style>