diff --git a/src/aare/gui/main_window.py b/src/aare/gui/main_window.py
index 91aecd36..1e2249bd 100644
--- a/src/aare/gui/main_window.py
+++ b/src/aare/gui/main_window.py
@@ -41,9 +41,9 @@ from aare.gui.constants import LOGGER_NAME
 
 # Gui Models
 from aare.gui.models.gui_state_manager import UIStateManager
+from aare.gui.panels.abr_tweak_panel import AbrTweakWidget
 from aare.gui.panels.automation_panel import AutomationProgressWidget
 from aare.gui.panels.axis_video_panel import AxisVideoPanel
-from aare.gui.panels.abr_tweak_panel import AbrTweakWidget
 from aare.gui.panels.beamline_controls import BeamConfigPanel, BeamlineControls
 from aare.gui.panels.beamline_recovery_panel import BeamlineRecoveryDialog
 from aare.gui.panels.beamline_state_panel import BeamlineStatePanel
@@ -84,8 +84,6 @@ from aare.gui.threads.daq_worker import DAQWorker
 from aare.gui.threads.jfjoch_viewer import JFJochDBusClient
 from aare.gui.threads.prediction_subscriber import PredictionSubscriber
 from aare.gui.tutorials.controls_help_dialog import ControlsHelpDialog
-from aare.gui.widgets.popout_window import DockTitleBar, PopoutWindow
-from aare.gui.widgets.wheel_value_guard import WheelValueGuard
 
 # Tutorials
 from aare.gui.tutorials.tutorial_actions import TutorialActionExecutor
@@ -102,9 +100,11 @@ from aare.gui.widgets.busy_overlay import build_busy_overlay_style
 from aare.gui.widgets.camera_image import SampleCameraImageLabel
 from aare.gui.widgets.message_box import precondition_check
 from aare.gui.widgets.no_wheel_scroll_area import NoWheelScrollArea
+from aare.gui.widgets.popout_window import DockTitleBar, PopoutWindow
 from aare.gui.widgets.status_bar import StatusBar
 from aare.gui.widgets.title_label import TitleLabel, tighten_column
 from aare.gui.widgets.video_image import VideoGraphicsView
+from aare.gui.widgets.wheel_value_guard import WheelValueGuard
 
 logger = setup_logger(LOGGER_NAME)
 
diff --git a/src/aare/gui/panels/log_panel.py b/src/aare/gui/panels/log_panel.py
index 686033b2..fcb56443 100644
--- a/src/aare/gui/panels/log_panel.py
+++ b/src/aare/gui/panels/log_panel.py
@@ -13,7 +13,6 @@ from PySide6.QtWidgets import (
 )
 
 from aare.gui.log import QtLogEmitter, QtLogHandler
-from aare.gui.widgets.popout_window import DockTitleBar, PopoutWindow
 from aare.gui.styles import (
     FLAT_CARD_RADIUS,
     LOG_BORDER,
@@ -28,6 +27,7 @@ from aare.gui.styles import (
     LOG_WARN_BORDER,
     card_style,
 )
+from aare.gui.widgets.popout_window import DockTitleBar, PopoutWindow
 
 
 class RuntimeNotificationWidget(QFrame):
diff --git a/tests/unit/gui/test_models.py b/tests/unit/gui/test_models.py
index 718ae6e0..c72ed78c 100644
--- a/tests/unit/gui/test_models.py
+++ b/tests/unit/gui/test_models.py
@@ -57,8 +57,8 @@ def test_user_sample_model_init(sample_list):
 def test_user_sample_model_column_filter(sample_list):
     model = UserSampleSpreadsheet(samples=sample_list)
     model.set_show_all_pgroups(True)
-    # Column 5 is user
-    model.set_column_filter(5, "U1")
+    # Column 6 is User (column 0 is the frozen #+status cell)
+    model.set_column_filter(6, "U1")
     assert model.rowCount() == 2
     model.clear_all_column_filters()
     assert model.rowCount() == 3
@@ -67,8 +67,8 @@ def test_user_sample_model_column_filter(sample_list):
 def test_user_sample_model_unique_values(sample_list):
     model = UserSampleSpreadsheet(samples=sample_list)
     model.set_show_all_pgroups(True)
-    # Column 5 is User
-    users = model.unique_values_for_column(5)
+    # Column 6 is User (column 0 is the frozen #+status cell)
+    users = model.unique_values_for_column(6)
     assert "U1" in users
     assert "U2" in users
     assert len(users) == 2