diff --git a/src/components/sitepages/SiteData.vue b/src/components/sitepages/SiteData.vue
index 0f1d9fb7..ec66f9e6 100644
--- a/src/components/sitepages/SiteData.vue
+++ b/src/components/sitepages/SiteData.vue
@@ -35,148 +35,11 @@
 
       <!-- Collapsible panels on the right of the image -->
       <div class="image-tools-area">
-
-        <div v-if="userIsAdmin" class="obs-config-box">
-          <div class="obs-config-control-group">
-            <div class="obs-config-title">Manual Telescope</div>
-            <StatusVal :status-item="scopeInManualMode" style="width: 100%;"/>
-            <div class="obs-config-command-button-group">
-              <CommandButton
-                class="is-small obs-config-command-button"
-                admin
-                :data="obs_set_scope_to_manual_mode"
-              >Set Manual</CommandButton>
-              <CommandButton
-                class="button admin is-small obs-config-command-button"
-                admin
-                :data="obs_set_scope_to_automatic_mode"
-              >Set Auto</CommandButton>
-            </div>
-          </div>
-
-          <div class="obs-config-control-group">
-            <div class="obs-config-title">Sun Safety</div>
-            <StatusVal :status-item="sunSafetyMode" style="width: 100%;"/>
-            <div class="obs-config-command-button-group">
-              <CommandButton
-                class="is-small obs-config-command-button"
-                admin
-                :data="obs_configure_sun_safety_on"
-              >Enable</CommandButton>
-              <CommandButton
-                class="button admin is-small obs-config-command-button"
-                admin
-                :data="obs_configure_sun_safety_off"
-              >Disable</CommandButton>
-            </div>
-          </div>
-
-          <div class="obs-config-control-group">
-            <div class="obs-config-title">Moon Safety</div>
-            <StatusVal :status-item="moonSafetyMode" style="width: 100%;"/>
-            <div class="obs-config-command-button-group">
-              <CommandButton
-                class="is-small obs-config-command-button"
-                admin
-                :data="obs_configure_moon_safety_on"
-              >Enable</CommandButton>
-              <CommandButton
-                class="button admin is-small obs-config-command-button"
-                admin
-                :data="obs_configure_moon_safety_off"
-              >Disable</CommandButton>
-            </div>
-          </div>
-
-          <div class="obs-config-control-group">
-            <div class="obs-config-title">Altitude Safety</div>
-            <StatusVal :status-item="altitudeSafetyMode" style="width: 100%;"/>
-            <div class="obs-config-command-button-group">
-              <CommandButton
-                class="is-small obs-config-command-button"
-                admin
-                :data="obs_configure_altitude_safety_on"
-              >Enable</CommandButton>
-              <CommandButton
-                class="button admin is-small obs-config-command-button"
-                admin
-                :data="obs_configure_altitude_safety_off"
-              >Disable</CommandButton>
-            </div>
-          </div>
-          <div class="obs-config-control-group">
-            <div class="obs-config-title">Daytime Safety</div>
-            <StatusVal :status-item="daytimeExposureSafetyMode" style="width: 100%;"/>
-            <div class="obs-config-command-button-group">
-              <CommandButton
-                class="is-small obs-config-command-button"
-                admin
-                :data="obs_configure_daytime_exposure_safety_on"
-              >Enable</CommandButton>
-              <CommandButton
-                class="button admin is-small obs-config-command-button"
-                admin
-                :data="obs_configure_daytime_exposure_safety_off"
-              >Disable</CommandButton>
-            </div>
-          </div>
-
-          <div class="obs-config-control-group">
-            <div class="obs-config-title">Simulate Open Roof</div>
-            <StatusVal :status-item="simulatingOpenRoof" style="width: 100%;"/>
-            <div class="obs-config-command-button-group">
-              <CommandButton
-                class="is-small obs-config-command-button"
-                admin
-                :data="obs_start_simulating_open_roof"
-              >Start</CommandButton>
-              <CommandButton
-                class="button admin is-small obs-config-command-button"
-                admin
-                :data="obs_stop_simulating_open_roof"
-              >Stop</CommandButton>
-            </div>
-          </div>
-
-          <div class="obs-config-control-group">
-            <div class="obs-config-title">Who Can Operate</div>
-            <StatusVal :status-item="adminOwnerCommandsOnly" style="width: 100%;"/>
-            <div class="obs-config-command-button-group">
-              <CommandButton
-                class="is-small obs-config-command-button"
-                admin
-                :data="obs_configure_admin_owner_commands_only_true"
-              >Owner</CommandButton>
-              <CommandButton
-                class="button admin is-small obs-config-command-button"
-                admin
-                :data="obs_configure_admin_owner_commands_only_false"
-              >Anyone</CommandButton>
-            </div>
-          </div>
-
-          <div class="obs-config-control-group">
-            <div class="obs-config-title">Pointing Reference</div>
-            <StatusVal :status-item="pointingReference" style="width: 100%;"/>
-            <div class="obs-config-command-button-group">
-              <CommandButton
-                class="is-small obs-config-command-button"
-                admin
-                :data="obs_configure_pointing_reference_on"
-              >Enable</CommandButton>
-              <CommandButton
-                class="button admin is-small obs-config-command-button"
-                admin
-                :data="obs_configure_pointing_reference_off"
-              >Disable</CommandButton>
-            </div>
-          </div>
-
-        </div>
-
         <div class="obs-config-box" style="padding-bottom: calc(1em - 11.25px); justify-content: space-between;">
-          <UiSyncControls />
-          <div style="width: 1px; height: 30px; border-left: 1px solid grey; margin: 0 1em;" />
+          <!--
+            <UiSyncControls />
+            <div style="width: 1px; height: 30px; border-left: 1px solid grey; margin: 0 1em;" />
+          -->
           <NightLog :site="sitecode" />
         </div>
 
@@ -189,6 +52,148 @@
             <command-tabs-wide class="command-tabs-wide is-hidden-touch" />
           </b-tab-item>
 
+          <b-tab-item
+            label="telescope"
+            :value="'telescope'"
+          >
+            <div v-if="userIsAdmin" class="obs-config-box">
+              <div class="obs-config-control-group">
+                <div class="obs-config-title">Manual Telescope</div>
+                <StatusVal :status-item="scopeInManualMode" style="width: 100%;"/>
+                <div class="obs-config-command-button-group">
+                  <CommandButton
+                    class="is-small obs-config-command-button"
+                    admin
+                    :data="obs_set_scope_to_manual_mode"
+                  >Set Manual</CommandButton>
+                  <CommandButton
+                    class="button admin is-small obs-config-command-button"
+                    admin
+                    :data="obs_set_scope_to_automatic_mode"
+                  >Set Auto</CommandButton>
+                </div>
+              </div>
+
+              <div class="obs-config-control-group">
+                <div class="obs-config-title">Sun Safety</div>
+                <StatusVal :status-item="sunSafetyMode" style="width: 100%;"/>
+                <div class="obs-config-command-button-group">
+                  <CommandButton
+                    class="is-small obs-config-command-button"
+                    admin
+                    :data="obs_configure_sun_safety_on"
+                  >Enable</CommandButton>
+                  <CommandButton
+                    class="button admin is-small obs-config-command-button"
+                    admin
+                    :data="obs_configure_sun_safety_off"
+                  >Disable</CommandButton>
+                </div>
+              </div>
+
+              <div class="obs-config-control-group">
+                <div class="obs-config-title">Moon Safety</div>
+                <StatusVal :status-item="moonSafetyMode" style="width: 100%;"/>
+                <div class="obs-config-command-button-group">
+                  <CommandButton
+                    class="is-small obs-config-command-button"
+                    admin
+                    :data="obs_configure_moon_safety_on"
+                  >Enable</CommandButton>
+                  <CommandButton
+                    class="button admin is-small obs-config-command-button"
+                    admin
+                    :data="obs_configure_moon_safety_off"
+                  >Disable</CommandButton>
+                </div>
+              </div>
+
+              <div class="obs-config-control-group">
+                <div class="obs-config-title">Altitude Safety</div>
+                <StatusVal :status-item="altitudeSafetyMode" style="width: 100%;"/>
+                <div class="obs-config-command-button-group">
+                  <CommandButton
+                    class="is-small obs-config-command-button"
+                    admin
+                    :data="obs_configure_altitude_safety_on"
+                  >Enable</CommandButton>
+                  <CommandButton
+                    class="button admin is-small obs-config-command-button"
+                    admin
+                    :data="obs_configure_altitude_safety_off"
+                  >Disable</CommandButton>
+                </div>
+              </div>
+              <div class="obs-config-control-group">
+                <div class="obs-config-title">Daytime Safety</div>
+                <StatusVal :status-item="daytimeExposureSafetyMode" style="width: 100%;"/>
+                <div class="obs-config-command-button-group">
+                  <CommandButton
+                    class="is-small obs-config-command-button"
+                    admin
+                    :data="obs_configure_daytime_exposure_safety_on"
+                  >Enable</CommandButton>
+                  <CommandButton
+                    class="button admin is-small obs-config-command-button"
+                    admin
+                    :data="obs_configure_daytime_exposure_safety_off"
+                  >Disable</CommandButton>
+                </div>
+              </div>
+
+              <div class="obs-config-control-group">
+                <div class="obs-config-title">Simulate Open Roof</div>
+                <StatusVal :status-item="simulatingOpenRoof" style="width: 100%;"/>
+                <div class="obs-config-command-button-group">
+                  <CommandButton
+                    class="is-small obs-config-command-button"
+                    admin
+                    :data="obs_start_simulating_open_roof"
+                  >Start</CommandButton>
+                  <CommandButton
+                    class="button admin is-small obs-config-command-button"
+                    admin
+                    :data="obs_stop_simulating_open_roof"
+                  >Stop</CommandButton>
+                </div>
+              </div>
+
+              <div class="obs-config-control-group">
+                <div class="obs-config-title">Who Can Operate</div>
+                <StatusVal :status-item="adminOwnerCommandsOnly" style="width: 100%;"/>
+                <div class="obs-config-command-button-group">
+                  <CommandButton
+                    class="is-small obs-config-command-button"
+                    admin
+                    :data="obs_configure_admin_owner_commands_only_true"
+                  >Owner</CommandButton>
+                  <CommandButton
+                    class="button admin is-small obs-config-command-button"
+                    admin
+                    :data="obs_configure_admin_owner_commands_only_false"
+                  >Anyone</CommandButton>
+                </div>
+              </div>
+
+              <div class="obs-config-control-group">
+                <div class="obs-config-title">Pointing Reference</div>
+                <StatusVal :status-item="pointingReference" style="width: 100%;"/>
+                <div class="obs-config-command-button-group">
+                  <CommandButton
+                    class="is-small obs-config-command-button"
+                    admin
+                    :data="obs_configure_pointing_reference_on"
+                  >Enable</CommandButton>
+                  <CommandButton
+                    class="button admin is-small obs-config-command-button"
+                    admin
+                    :data="obs_configure_pointing_reference_off"
+                  >Disable</CommandButton>
+                </div>
+              </div>
+            </div>
+          </b-tab-item>
+
           <b-tab-item
             label="analysis"
             class="analysis-tab-item"