diff --git a/csaxs_bec/bec_widgets/widgets/xray_eye/x_ray_eye.py b/csaxs_bec/bec_widgets/widgets/xray_eye/x_ray_eye.py
index 21c79e2..97ffc44 100644
--- a/csaxs_bec/bec_widgets/widgets/xray_eye/x_ray_eye.py
+++ b/csaxs_bec/bec_widgets/widgets/xray_eye/x_ray_eye.py
@@ -159,7 +159,7 @@ class XRayEye(BECWidget, QWidget):
         self.image.enable_toolbar = False  # Disable default toolbar to not allow to user set anything
         self.image.inner_axes = False  # Disable inner axes to maximize image area
         self.image.enable_full_colorbar = True
-        self.image.plot_item.vb.invertY(True)  # #TODO Invert y axis to match logic of LabView GUI
+        self.image.invert_y = True # Invert y axis to match image coordinates
 
         # Control panel on the right: vertical layout inside a fixed-width widget
         self.control_panel = QWidget(parent=self.alignment_tab)
@@ -178,8 +178,8 @@ class XRayEye(BECWidget, QWidget):
         self.live_preview_label = QLabel("Live Preview", parent=self)
         self.live_preview_toggle = ToggleSwitch(parent=self)
         self.live_preview_toggle.checked = False
-        header_row.addWidget(self.live_preview_label, 0, Qt.AlignVCenter)
-        header_row.addWidget(self.live_preview_toggle, 0, Qt.AlignVCenter)
+        header_row.addWidget(self.live_preview_label, 0, Qt.AlignmentFlag.AlignVCenter)
+        header_row.addWidget(self.live_preview_toggle, 0, Qt.AlignmentFlag.AlignVCenter)
         self.control_panel_layout.addLayout(header_row)
 
         switch_row = QHBoxLayout()
@@ -194,10 +194,10 @@ class XRayEye(BECWidget, QWidget):
         self.shutter_toggle = ToggleSwitch(parent=self)
         # self.shutter_toggle.checked = False
         self.shutter_toggle.enabled.connect(self.opening_shutter)
-        switch_row.addWidget(self.shutter_label, 0, Qt.AlignVCenter)
-        switch_row.addWidget(self.shutter_toggle, 0, Qt.AlignVCenter)
-        switch_row.addWidget(self.camera_running_label, 0, Qt.AlignVCenter)
-        switch_row.addWidget(self.camera_running_toggle, 0, Qt.AlignVCenter)
+        switch_row.addWidget(self.shutter_label, 0, Qt.AlignmentFlag.AlignVCenter)
+        switch_row.addWidget(self.shutter_toggle, 0, Qt.AlignmentFlag.AlignVCenter)
+        switch_row.addWidget(self.camera_running_label, 0, Qt.AlignmentFlag.AlignVCenter)
+        switch_row.addWidget(self.camera_running_toggle, 0, Qt.AlignmentFlag.AlignVCenter)
         self.control_panel_layout.addLayout(switch_row)
 
 
@@ -206,7 +206,7 @@ class XRayEye(BECWidget, QWidget):
 
         # 2D Positioner (fixed size)
         self.motor_control_2d = XRayEye2DControl(parent=self)
-        self.control_panel_layout.addWidget(self.motor_control_2d, 0, Qt.AlignTop | Qt.AlignCenter)
+        self.control_panel_layout.addWidget(self.motor_control_2d, 0, Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignCenter)
 
         # separator
         self.control_panel_layout.addWidget(self._create_separator())
@@ -249,7 +249,7 @@ class XRayEye(BECWidget, QWidget):
         self.control_panel.adjustSize()
         p_hint = self.control_panel.sizeHint()
         self.control_panel.setFixedWidth(p_hint.width())
-        self.control_panel.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding)
+        self.control_panel.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Expanding)
 
         # Core Layout: image (expanding) | control panel (fixed)
         self.core_layout.addWidget(self.image)
@@ -286,8 +286,8 @@ class XRayEye(BECWidget, QWidget):
 
     def _create_separator(self):
         sep = QFrame(parent=self)
-        sep.setFrameShape(QFrame.HLine)
-        sep.setFrameShadow(QFrame.Sunken)
+        sep.setFrameShape(QFrame.Shape.HLine)
+        sep.setFrameShadow(QFrame.Shadow.Sunken)
         sep.setLineWidth(1)
         return sep
 
@@ -305,7 +305,7 @@ class XRayEye(BECWidget, QWidget):
         for motor in possible_motors:
             if motor in self.dev:
                 self.bec_dispatcher.connect_slot(self.on_tomo_angle_readback, MessageEndpoints.device_readback(motor))
-                logger.info(f"Succesfully connected to {motor}")
+                logger.info(f"Successfully connected to {motor}")
 
     ################################################################################
     # Properties ported from the original OmnyAlignment, can be adjusted as needed
@@ -469,7 +469,6 @@ class XRayEye(BECWidget, QWidget):
         self.on_live_view_enabled(bool(enable_live_preview))
         self.on_motors_enable(bool(enable_x_motor), bool(enable_y_motor))
 
-        #TODO hook the waveform plotting logic
         fit_array = signals.get("omny_xray_gui_fit_array").get('value')
         self.waveform_x.clear_all()
         self.waveform_y.clear_all()
@@ -519,7 +518,7 @@ class XRayEye(BECWidget, QWidget):
         width_x = getattr(self.dev.omny_xray_gui.width_x, f"width_x_{step}").set(roi_width)
         width_y = getattr(self.dev.omny_xray_gui.width_y, f"width_y_{step}").set(roi_height)
         self.dev.omny_xray_gui.submit.set(1)
-    
+
     def cleanup(self):
         """Cleanup connections on widget close -> disconnect slots and stop live mode of camera."""
         self.bec_dispatcher.disconnect_slot(self.device_updates, MessageEndpoints.device_readback("omny_xray_gui"))