diff --git a/gui/src/aaregui/main_window.py b/gui/src/aaregui/main_window.py
index 8be47a53..06d85157 100644
--- a/gui/src/aaregui/main_window.py
+++ b/gui/src/aaregui/main_window.py
@@ -37,7 +37,7 @@ from aaregui.widgets.no_wheel_scroll_area import NoWheelScrollArea
 from aaregui.widgets.status_bar import StatusBar
 from aaregui.widgets.video_image import VideoGraphicsView
 
-logger = setup_logger(__name__)
+logger = setup_logger("aareGUI")
 
 class MainWindow(QMainWindow):
     sample_geometry = Signal(SampleGeometryModel)
@@ -169,6 +169,8 @@ class MainWindow(QMainWindow):
         self.log_dock = LogDock("Console Log", self)
         self.addDockWidget(Qt.BottomDockWidgetArea, self.log_dock)
         self.log_dock.attach_logger("")
+        self.log_dock.attach_logger("aareDAQ")
+        self.log_dock.attach_logger("aareGUI")
         self.log_dock.hide()
 
         self.setCentralWidget(top_widget)
@@ -200,14 +202,15 @@ class MainWindow(QMainWindow):
         self.sample_camera.set_omega.connect(self.daq.set_omega)
         self.beamline.zoom_panel.zoom.connect(self.daq.zoom)
         self.beamline.illumination_panel.light.connect(self.daq.light)
-        self.beamline.abr_tweak.abr_tweak.connect(self.daq.abr_tweak)
-        self.beamline.abr_tweak.abr_save.connect(self.daq.abr_save)
-        self.beamline.abr_tweak.abr_goto_meas.connect(self.daq.abr_goto_meas)
+        if self.__decoded_token.staff:
+            self.beamline.abr_tweak.abr_tweak.connect(self.daq.abr_tweak)
+            self.beamline.abr_tweak.abr_save.connect(self.daq.abr_save)
+            self.beamline.abr_tweak.abr_goto_meas.connect(self.daq.abr_goto_meas)
 
-        self.beamline.beam_mark.beam_mark_clear.connect(self.daq.beam_mark_clear)
-        self.sample_camera.update_beam_mark.connect(self.daq.beam_mark_add)
-        self.beamline.beam_center.beam_center.connect(self.daq.beam_center)
-        self.beamline.beam_size.beam_size.connect(self.daq.beam_size_mm)
+            self.beamline.beam_mark.beam_mark_clear.connect(self.daq.beam_mark_clear)
+            self.sample_camera.update_beam_mark.connect(self.daq.beam_mark_add)
+            self.beamline.beam_center.beam_center.connect(self.daq.beam_center)
+            self.beamline.beam_size.beam_size.connect(self.daq.beam_size_mm)
         self.sample_camera.load_image.connect(self.raster.load_image)
         self.sample_camera.switch_raster_grid.connect(self.data_collection.switch_to_raster)
         self.beamline.samcam.show_detections_changed.connect(self.sample_camera.set_show_detections)
@@ -292,19 +295,22 @@ class MainWindow(QMainWindow):
 
         self.daq.update.connect(self.beamline.omega_panel.update_daq_status)
         self.daq.update.connect(self.beamline.smargon_panel.update_daq_status)
-        self.daq.update.connect(self.beamline.beam_size.update_daq_status)
-        self.daq.update.connect(self.beamline.beam_center.update_daq_status)
+
         self.daq.update.connect(self.data_collection.update_daq_status)
         self.daq.update.connect(self.beamline.illumination_panel.update_daq_status)
         self.daq.update.connect(self.raster.update_daq_status)
         self.daq.update.connect(self.sample_camera.update_daq_status)
         self.daq.update.connect(self.tell_samples.update_daq_status)
         self.daq.update.connect(self.ref_tools_panel.update_daq_status)
-        self.daq.update.connect(self.beamline.abr_tweak.update_daq_status)
+        if self.__decoded_token.staff:
+            self.daq.update.connect(self.beamline.beam_size.update_daq_status)
+            self.daq.update.connect(self.beamline.beam_center.update_daq_status)
+            self.daq.update.connect(self.beamline.abr_tweak.update_daq_status)
+            self.daq.update.connect(self.beamline.beam_mark.update_daq_status)
         self.daq.update.connect(self.status_bar.update_daq_status)
         self.daq.update.connect(self.beamline.samcam.update_daq_status)
         self.daq.update.connect(self.beamline.zoom_panel.update_daq_status)
-        self.daq.update.connect(self.beamline.beam_mark.update_daq_status)
+
         self.daq.update.connect(self.sample_logic.update_daq_status)
         self.daq.update.connect(self.manual_sample_panel.update_daq_status)
         self.daq.update.connect(self.update_daq_status)