fix(plugin_utils): ast inheritance map

fix(monaco_dock): removed cli
fix(imports): use concrete scan control import
2026-06-15 09:32:20 +02:00 · 2026-04-16 20:00:13 +02:00 · 2026-04-16 16:38:07 +02:00 · 2026-04-16 16:31:14 +02:00 · 2026-04-16 16:31:14 +02:00 · 2026-04-16 16:31:14 +02:00
176 changed files with 7511 additions and 2194 deletions
@@ -62,4 +62,4 @@ runs:
        uv pip install --system -e ./ophyd_devices
        uv pip install --system -e ./bec/bec_lib[dev]
        uv pip install --system -e ./bec/bec_ipython_client
-        uv pip install --system -e ./bec_widgets[dev,pyside6]
+        uv pip install --system -e ./bec_widgets[dev,qtermwidget]
@@ -55,5 +55,5 @@ jobs:
        uses: actions/upload-artifact@v4
        with:
          name: pytest-logs
-          path: ./logs/*.log
+          path: ./bec/logs/*.log
          retention-days: 7
@@ -177,4 +177,6 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+#.idea/
+#
+tombi.toml
@@ -1,6 +1,291 @@
 # CHANGELOG


+## v3.5.0 (2026-04-14)
+
+### Bug Fixes
+
+- Connect signals the correct way around
+  ([`f562c61`](https://github.com/bec-project/bec_widgets/commit/f562c61e3cec3387f6821bad74403beeb3436355))
+
+- Create new bec shell if deleted
+  ([`1754e75`](https://github.com/bec-project/bec_widgets/commit/1754e759f0c59f2f4063f661bacd334127326947))
+
+- Formatting in plugin template
+  ([`fa2ef83`](https://github.com/bec-project/bec_widgets/commit/fa2ef83bb9dfeeb4c5fc7cd77168c16101c32693))
+
+- **bec_console**: Persistent bec session
+  ([`9b0ec9d`](https://github.com/bec-project/bec_widgets/commit/9b0ec9dd79ad1adc5d211dd703db7441da965f34))
+
+### Features
+
+- Add qtermwidget plugin and replace web term
+  ([`02cb393`](https://github.com/bec-project/bec_widgets/commit/02cb393bb086165dc64917b633d5570d02e1a2a9))
+
+### Refactoring
+
+- Code cleanup
+  ([`bda5d38`](https://github.com/bec-project/bec_widgets/commit/bda5d389651bb2b13734cd31159679e85b1bd583))
+
+
+## v3.4.4 (2026-04-14)
+
+### Bug Fixes
+
+- Check duplicate stream sub
+  ([`c7de320`](https://github.com/bec-project/bec_widgets/commit/c7de320ca564264a31b84931f553170f25659685))
+
+- Check for duplicate subscriptions in GUIClient
+  ([`37747ba`](https://github.com/bec-project/bec_widgets/commit/37747babda407040333c6bd04646be9a49e0ee81))
+
+- Make gui client registry callback non static
+  ([`32f5d48`](https://github.com/bec-project/bec_widgets/commit/32f5d486d3fc8d41df2668c58932ae982819b285))
+
+- Remove staticmethod subscription
+  ([`0ff1fdc`](https://github.com/bec-project/bec_widgets/commit/0ff1fdc81578eec3ffc5d4030fca7b357a0b4c2f))
+
+
+## v3.4.3 (2026-04-13)
+
+### Bug Fixes
+
+- Set OPHYD_CONTROL_LAYER to dummy for tests
+  ([`5e84d3b`](https://github.com/bec-project/bec_widgets/commit/5e84d3bec608ae9f2ee6dae67db2e3e1387b1f59))
+
+
+## v3.4.2 (2026-04-01)
+
+### Bug Fixes
+
+- Allow admin user to pass deployment group check
+  ([`e6c8cd0`](https://github.com/bec-project/bec_widgets/commit/e6c8cd0b1a1162302071c93a2ac51880b3cf1b7d))
+
+- **bec-atlas-admin-view**: Fix atlas_url to bec-atlas-prod.psi.ch
+  ([`242f893`](https://github.com/bec-project/bec_widgets/commit/242f8933b246802f5f3a5b9df7de07901f151c82))
+
+### Testing
+
+- Add tests for admin access
+  ([`2dab16b`](https://github.com/bec-project/bec_widgets/commit/2dab16b68415806f3f291657f394bb2d8654229d))
+
+
+## v3.4.1 (2026-04-01)
+
+### Bug Fixes
+
+- **hover_widget**: Make it fancy + mouse tracking
+  ([`e25b660`](https://github.com/bec-project/bec_widgets/commit/e25b6604d195804bbd6ea6aac395d44dc00d6155))
+
+- **ring**: Changed inheritance to BECWidget and added cleanup
+  ([`2f75aae`](https://github.com/bec-project/bec_widgets/commit/2f75aaea16a178e180e68d702cd1bdf85a768bcf))
+
+- **ring**: Hook update hover to update method
+  ([`90ecd8e`](https://github.com/bec-project/bec_widgets/commit/90ecd8ea87faf06c3f545e3f9241f403b733d7eb))
+
+- **ring**: Minor general fixes
+  ([`6775509`](https://github.com/bec-project/bec_widgets/commit/677550931b28fbf35fd55880bf6e001f7351b99b))
+
+- **ring_progress_bar**: Added hover mouse effect
+  ([`96b5179`](https://github.com/bec-project/bec_widgets/commit/96b5179658c41fb39df7a40f4d96e82092605791))
+
+### Testing
+
+- **ring_progress_bar**: Add unit tests for hover behavior
+  ([`6e5f6e7`](https://github.com/bec-project/bec_widgets/commit/6e5f6e7fbb6f9680f6d026e105e6840d24c6591c))
+
+
+## v3.4.0 (2026-03-26)
+
+### Bug Fixes
+
+- **lmfit_dialog**: Compact layout size policy for better alignment panel UX
+  ([`31389a3`](https://github.com/bec-project/bec_widgets/commit/31389a3dd0c7b1c671acdf49ae50b08455f466a7))
+
+- **waveform**: Alignment panel indicators request autoscale if updated
+  ([`a292375`](https://github.com/bec-project/bec_widgets/commit/a2923752c27ad7b9749db3d309fe288747b85acb))
+
+### Features
+
+- **waveform**: 1d alignment mode panel
+  ([`a486c52`](https://github.com/bec-project/bec_widgets/commit/a486c52058b4edbea00ad7bb018f1fa2822fb9c6))
+
+
+## v3.3.4 (2026-03-24)
+
+### Bug Fixes
+
+- **lmfit_dialog**: Dialog compact adjustment and cleanup of stale methods
+  ([`f67b60a`](https://github.com/bec-project/bec_widgets/commit/f67b60ac98cd87ed8391fee8545eb8064a068e67))
+
+- **lmfit_dialog**: Fix cpp object deleted
+  ([`5ec59d5`](https://github.com/bec-project/bec_widgets/commit/5ec59d5dbb75e3a9deb488b0affaf8cb704242b9))
+
+- **lmfit_dialog**: Fix fit_curve_id type annotation and remove_dap_data selection behavior
+  ([`05c38d9`](https://github.com/bec-project/bec_widgets/commit/05c38d9b82cc6dfaec8f5abf8e0ececa5d001524))
+
+Co-authored-by: wyzula-jan <133381102+wyzula-jan@users.noreply.github.com>
+
+Agent-Logs-Url:
+  https://github.com/bec-project/bec_widgets/sessions/97395c0e-0271-4cdf-b39f-f3117d21bfa3
+
+
+## v3.3.3 (2026-03-23)
+
+### Bug Fixes
+
+- **positioner_box**: Remove CompactPopupWidget inheritance
+  ([`da400d2`](https://github.com/bec-project/bec_widgets/commit/da400d20b672236241ce3a4480481ac6a5df1b2e))
+
+
+## v3.3.2 (2026-03-22)
+
+### Bug Fixes
+
+- Typos
+  ([`3d29a67`](https://github.com/bec-project/bec_widgets/commit/3d29a67c0b2175f2f29b8e5a7befce55f3d28fd3))
+
+
+## v3.3.1 (2026-03-20)
+
+### Bug Fixes
+
+- **dap_combobox**: Added safeguard for no DAP models
+  ([`79af15a`](https://github.com/bec-project/bec_widgets/commit/79af15a88b993cd5b6bf730796f995f20cf6f188))
+
+- **dap_combobox**: Rewritten as proper combobox
+  ([`90222f3`](https://github.com/bec-project/bec_widgets/commit/90222f30821f822eb24b0179401d4e43050e0156))
+
+
+## v3.3.0 (2026-03-20)
+
+### Bug Fixes
+
+- Fix black 2026 formatting
+  ([`d4ecefd`](https://github.com/bec-project/bec_widgets/commit/d4ecefd80a6ab944b4da51c1ee35e5dea67770f2))
+
+- **actions**: Allow minimum icon size for actions in toolbar
+  ([`de941d1`](https://github.com/bec-project/bec_widgets/commit/de941d1bc565e444f84696b1de046d50b62f3c1b))
+
+- **admin-view**: Generate RPC interface for AdminView
+  ([`137e572`](https://github.com/bec-project/bec_widgets/commit/137e572a942281a9c7478a6be83f815848917e26))
+
+- **admin-widget**: Cleanup and minor improvements
+  ([`0c6f3f8`](https://github.com/bec-project/bec_widgets/commit/0c6f3f8352e7318a4f0579c83066b5b433fd1144))
+
+- **admin_view**: Minor changes
+  ([`48c9c83`](https://github.com/bec-project/bec_widgets/commit/48c9c83bb0c9432905d347b2d2cf46c05e58c098))
+
+- **bec-atlas-admin-view**: Fix connect_slot for dispatcher
+  ([`23c146b`](https://github.com/bec-project/bec_widgets/commit/23c146b3e6bbbabfb35f1892bc8653a65652ae6a))
+
+- **login-dialog**: Remove login_dialog
+  ([`d1a1d85`](https://github.com/bec-project/bec_widgets/commit/d1a1d85abd3331ebab696580c692c69b71482f37))
+
+- **main-app**: Fix id for main-app init of AdminView
+  ([`b14b046`](https://github.com/bec-project/bec_widgets/commit/b14b04688284eb875ea4469765786834e74fceb3))
+
+- **main-app**: Skip on_enter/exit hooks if darkmodebutton clicked
+  ([`f565deb`](https://github.com/bec-project/bec_widgets/commit/f565deb71db8fa5206fa2b4eea436e5055030bbc))
+
+- **pyproject**: Add PyJWT as dependency
+  ([`889e9c0`](https://github.com/bec-project/bec_widgets/commit/889e9c0994a960b93c93143b6dc5845dc96f9f96))
+
+- **RPC**: Fix rpc access
+  ([`8e53ae2`](https://github.com/bec-project/bec_widgets/commit/8e53ae2d3938e9c0a4c11082300156994447faaf))
+
+### Features
+
+- **admin-view**: Add admin view to views
+  ([`63059a4`](https://github.com/bec-project/bec_widgets/commit/63059a4ef897a919f296c68ada066e0b228f8248))
+
+- **bec-atlas-admin-view**: Add http service through QNetworkAccessManager
+  ([`1770873`](https://github.com/bec-project/bec_widgets/commit/17708730fcff41713638c17d0cc1f5d9d0b75122))
+
+- **bec-atlas-admin-view**: Add initial admin view
+  ([`ec58fbd`](https://github.com/bec-project/bec_widgets/commit/ec58fbd6d859058f518b88ba15670a3a715c3cc3))
+
+- **bec-atlas-admin-view**: Add login dilaog
+  ([`1384a32`](https://github.com/bec-project/bec_widgets/commit/1384a329abf873b5496e540a542088c7f13b7270))
+
+- **experiment-selection**: Add experiment selection widget
+  ([`598c453`](https://github.com/bec-project/bec_widgets/commit/598c453a1876cebc2482d55bf6c2728ec247def0))
+
+### Refactoring
+
+- Address review comments
+  ([`a7a9458`](https://github.com/bec-project/bec_widgets/commit/a7a9458180c18bf2bba652c2ff8a68875af36a22))
+
+- Cleanup widgets
+  ([`895b318`](https://github.com/bec-project/bec_widgets/commit/895b3189904778c269200365b264a32ff15dda21))
+
+- Fix formatting, running black 2026.1
+  ([`ab223d5`](https://github.com/bec-project/bec_widgets/commit/ab223d5fdc00b1a7bc9fd61abce5fabe4409654b))
+
+- **admin-view**: Refactor experiment selection, http service, admin view, and add main view
+  ([`3a17a24`](https://github.com/bec-project/bec_widgets/commit/3a17a249ed179fb8a11591f948c7b6338e10a60d))
+
+- **atlas-http-service**: Rename AtlasEndpoints
+  ([`2b0f575`](https://github.com/bec-project/bec_widgets/commit/2b0f575733412a96e54dff2dca15082d64caf7ee))
+
+- **fuzzy-search**: Unify is_match for fuzzy search
+  ([`d4afcb6`](https://github.com/bec-project/bec_widgets/commit/d4afcb68324f63ac8aea7cc3b2c82e79d2e643ca))
+
+### Testing
+
+- **bec-atlas-admin-view**: Complement tests for BECAtlasAdminView, ExperimentSelection,
+  BECAtlasHTTPService
+  ([`df44d9b`](https://github.com/bec-project/bec_widgets/commit/df44d9b50eb289a7851579c64a2a8c0e2363b06a))
+
+- **bec-atlas-http-service**: Add tests for http service
+  ([`34e80ee`](https://github.com/bec-project/bec_widgets/commit/34e80ee8f9a2b2373c97ae7cde90690ab6fb37ce))
+
+
+## v3.2.4 (2026-03-19)
+
+### Bug Fixes
+
+- **main_app**: Setapplicationname("bec")
+  ([`28be696`](https://github.com/bec-project/bec_widgets/commit/28be696f7c7d9762c742c6d5fb5b03867d5e92ea))
+
+
+## v3.2.3 (2026-03-16)
+
+### Bug Fixes
+
+- Check adding parent for filesystemmodel
+  ([`b9145d7`](https://github.com/bec-project/bec_widgets/commit/b9145d762cdf946f184834928a6404f21b4802a9))
+
+- Refactor client mock with global fakeredis
+  ([`37a5dc2`](https://github.com/bec-project/bec_widgets/commit/37a5dc2e9eeb447d174f4d7087051672f308c84c))
+
+### Continuous Integration
+
+- Fix path for uploading logs on failure
+  ([`1351fcd`](https://github.com/bec-project/bec_widgets/commit/1351fcd47b909c1a33cb389c096041eb1449e3d3))
+
+
+## v3.2.2 (2026-03-16)
+
+### Bug Fixes
+
+- **image**: Disconnecting of 2d monitor
+  ([`4c9d7fd`](https://github.com/bec-project/bec_widgets/commit/4c9d7fddce7aa5b7f13a00ac332bd54b301e3c28))
+
+
+## v3.2.1 (2026-03-16)
+
+### Bug Fixes
+
+- **e2e**: Bec dock rpc fixed synchronization
+  ([`e061fa3`](https://github.com/bec-project/bec_widgets/commit/e061fa31a9a5e5c00e44337d7cc52c51d8e259b5))
+
+- **e2e**: Bec shell excluded from e2e testing
+  ([`974f259`](https://github.com/bec-project/bec_widgets/commit/974f25997d68d13ff1063026f9e5c4c8dd4d49f3))
+
+- **e2e**: Timeout for maybe_remove_dock_area
+  ([`718f995`](https://github.com/bec-project/bec_widgets/commit/718f99527c3bebb96845d3305aba69434eb83f77))
+
+
 ## v3.2.0 (2026-03-11)

 ### Features
@@ -1,19 +1,21 @@
 import os
 import sys

-import bec_widgets.widgets.containers.qt_ads as QtAds
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-
 if sys.platform.startswith("linux"):
    qt_platform = os.environ.get("QT_QPA_PLATFORM", "")
    if qt_platform != "offscreen":
        os.environ["QT_QPA_PLATFORM"] = "xcb"

-# Default QtAds configuration
-QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.eConfigFlag.FocusHighlighting, True)
-QtAds.CDockManager.setConfigFlag(
-    QtAds.CDockManager.eConfigFlag.RetainTabSizeWhenCloseButtonHidden, True
-)
-
 __all__ = ["BECWidget", "SafeSlot", "SafeProperty"]
+
+
+def __getattr__(name: str):
+    if name == "BECWidget":
+        from bec_widgets.utils.bec_widget import BECWidget
+
+        return BECWidget
+    if name in {"SafeProperty", "SafeSlot"}:
+        from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
+
+        return {"SafeProperty": SafeProperty, "SafeSlot": SafeSlot}[name]
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
@@ -5,6 +5,7 @@ from qtpy.QtWidgets import QApplication, QHBoxLayout, QStackedWidget, QWidget
 from bec_widgets.applications.navigation_centre.reveal_animator import ANIMATION_DURATION
 from bec_widgets.applications.navigation_centre.side_bar import SideBar
 from bec_widgets.applications.navigation_centre.side_bar_components import NavigationItem
+from bec_widgets.applications.views.admin_view.admin_view import AdminView
 from bec_widgets.applications.views.developer_view.developer_view import DeveloperView
 from bec_widgets.applications.views.device_manager_view.device_manager_view import DeviceManagerView
 from bec_widgets.applications.views.dock_area_view.dock_area_view import DockAreaView
@@ -63,6 +64,8 @@ class BECMainApp(BECMainWindow):
        self.dock_area = DockAreaView(self)
        self.device_manager = DeviceManagerView(self)
        # self.developer_view = DeveloperView(self) #TODO temporary disable until the bugs with BECShell are resolved
+        self.admin_view = AdminView(self)
+
        self.add_view(icon="widgets", title="Dock Area", widget=self.dock_area, mini_text="Docks")
        self.add_view(
            icon="display_settings",
@@ -78,6 +81,13 @@ class BECMainApp(BECMainWindow):
        #     mini_text="IDE",
        #     exclusive=True,
        # )
+        self.add_view(
+            icon="admin_panel_settings",
+            title="Admin View",
+            widget=self.admin_view,
+            mini_text="Admin",
+            from_top=False,
+        )

        if self._show_examples:
            self.add_section("Examples", "examples")
@@ -181,6 +191,12 @@ class BECMainApp(BECMainWindow):

    # Internal: route sidebar selection to the stack
    def _on_view_selected(self, vid: str) -> None:
+        # Special handling for views that can not be switched to (e.g. dark mode toggle)
+        # Not registered as proper view with a stack index, so we ignore any logic below
+        # as it will anyways not result in a stack switch.
+        idx = self._view_index.get(vid)
+        if idx is None or not (0 <= idx < self.stack.count()):
+            return
        # Determine current view
        current_index = self.stack.currentIndex()
        current_view = (
@@ -247,7 +263,7 @@ class BECMainApp(BECMainWindow):
            developer_view_step = self.guided_tour.register_widget(
                widget=sidebar_developer_view,
                title="Developer View",
-                text="Click here to access the Developer view to write scripts and makros.",
+                text="Click here to access the Developer view to write scripts and macros.",
            )
            tour_steps.append(developer_view_step)

@@ -378,6 +394,7 @@ def main():  # pragma: no cover
    args, qt_args = parser.parse_known_args(sys.argv[1:])

    app = QApplication([sys.argv[0], *qt_args])
+    app.setApplicationName("BEC")
    apply_theme("dark")
    w = BECMainApp(show_examples=args.examples)

@@ -0,0 +1,35 @@
+"""Module for Admin View."""
+
+from qtpy.QtWidgets import QWidget
+
+from bec_widgets.applications.views.view import ViewBase
+from bec_widgets.utils.error_popups import SafeSlot
+from bec_widgets.widgets.services.bec_atlas_admin_view.bec_atlas_admin_view import BECAtlasAdminView
+
+
+class AdminView(ViewBase):
+    """
+    A view for administrators to change the current active experiment, manage messaging
+    services, and more tasks reserved for users with admin privileges.
+    """
+
+    def __init__(
+        self,
+        parent: QWidget | None = None,
+        content: QWidget | None = None,
+        *,
+        view_id: str | None = None,
+        title: str | None = None,
+        **kwargs,
+    ):
+        super().__init__(parent=parent, content=content, view_id=view_id, title=title)
+        self.admin_widget = BECAtlasAdminView(parent=self)
+        self.set_content(self.admin_widget)
+
+    @SafeSlot()
+    def on_exit(self) -> None:
+        """Called before the view is hidden.
+
+        Default implementation does nothing. Override in subclasses.
+        """
+        self.admin_widget.logout()
@@ -16,9 +16,9 @@ from bec_widgets.utils.toolbars.toolbar import ModularToolBar
 from bec_widgets.widgets.containers.dock_area.basic_dock_area import DockAreaWidget
 from bec_widgets.widgets.containers.dock_area.dock_area import BECDockArea
 from bec_widgets.widgets.containers.qt_ads import CDockWidget
+from bec_widgets.widgets.editors.bec_console.bec_console import BecConsole, BECShell
 from bec_widgets.widgets.editors.monaco.monaco_dock import MonacoDock
 from bec_widgets.widgets.editors.monaco.monaco_widget import MonacoWidget
-from bec_widgets.widgets.editors.web_console.web_console import BECShell, WebConsole
 from bec_widgets.widgets.utility.ide_explorer.ide_explorer import IDEExplorer


@@ -96,7 +96,7 @@ class DeveloperWidget(DockAreaWidget):

        self.console = BECShell(self, rpc_exposed=False)
        self.console.setObjectName("BEC Shell")
-        self.terminal = WebConsole(self, rpc_exposed=False)
+        self.terminal = BecConsole(self, rpc_exposed=False)
        self.terminal.setObjectName("Terminal")
        self.monaco = MonacoDock(self, rpc_exposed=False, rpc_passthrough_children=False)
        self.monaco.setObjectName("MonacoEditor")
@@ -410,23 +410,3 @@ class DeveloperWidget(DockAreaWidget):
        """Clean up resources used by the developer widget."""
        self.delete_all()
        return super().cleanup()
-
-
-if __name__ == "__main__":
-    import sys
-
-    from bec_qthemes import apply_theme
-    from qtpy.QtWidgets import QApplication
-
-    from bec_widgets.applications.main_app import BECMainApp
-
-    app = QApplication(sys.argv)
-    apply_theme("dark")
-
-    _app = BECMainApp()
-    _app.show()
-    # developer_view.show()
-    # developer_view.setWindowTitle("Developer View")
-    # developer_view.resize(1920, 1080)
-    # developer_view.set_stretch(horizontal=[1, 3, 2], vertical=[5, 5]) #can be set during runtime
-    sys.exit(app.exec_())
@@ -1,2 +0,0 @@
-from .config_choice_dialog import ConfigChoiceDialog
-from .device_form_dialog import DeviceFormDialog
@@ -8,14 +8,16 @@ from ophyd_devices.interfaces.device_config_templates.ophyd_templates import OPH
 from qtpy import QtCore, QtWidgets

 from bec_widgets.utils.error_popups import SafeSlot
-from bec_widgets.widgets.control.device_manager.components import OphydValidation
 from bec_widgets.widgets.control.device_manager.components.device_config_template.device_config_template import (
    DeviceConfigTemplate,
 )
 from bec_widgets.widgets.control.device_manager.components.device_config_template.template_items import (
    validate_name,
 )
-from bec_widgets.widgets.control.device_manager.components.ophyd_validation import (
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation import (
+    OphydValidation,
+)
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation_utils import (
    ConfigStatus,
    ConnectionStatus,
    format_error_to_md,
@@ -12,7 +12,7 @@ from qtpy import QtCore, QtGui, QtWidgets

 from bec_widgets.utils.colors import get_accent_colors
 from bec_widgets.utils.error_popups import SafeSlot
-from bec_widgets.widgets.control.device_manager.components.ophyd_validation import (
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation_utils import (
    ConfigStatus,
    ConnectionStatus,
    get_validation_icons,
@@ -13,6 +13,7 @@ from bec_lib.file_utils import DeviceConfigWriter
 from bec_lib.logger import bec_logger
 from bec_lib.messages import ConfigAction, ScanStatusMessage
 from bec_lib.plugin_helper import plugin_package_name, plugin_repo_path
+from bec_lib.utils.import_utils import lazy_import_from
 from bec_qthemes import apply_theme, material_icon
 from qtpy.QtCore import QMetaObject, Qt, QThreadPool, Signal
 from qtpy.QtGui import QColor
@@ -26,26 +27,18 @@ from qtpy.QtWidgets import (
    QWidget,
 )

-from bec_widgets.applications.views.device_manager_view.device_manager_dialogs import (
-    ConfigChoiceDialog,
-    DeviceFormDialog,
-)
-from bec_widgets.applications.views.device_manager_view.device_manager_dialogs.upload_redis_dialog import (
-    UploadRedisDialog,
-)
 from bec_widgets.utils.colors import get_accent_colors
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.toolbars.actions import MaterialIconAction
 from bec_widgets.utils.toolbars.bundles import ToolbarBundle
 from bec_widgets.utils.toolbars.toolbar import ModularToolBar
 from bec_widgets.widgets.containers.dock_area.basic_dock_area import DockAreaWidget
-from bec_widgets.widgets.control.device_manager.components import (
-    DeviceTable,
-    DMConfigView,
-    DocstringView,
-    OphydValidation,
-)
 from bec_widgets.widgets.control.device_manager.components._util import SharedSelectionSignal
+from bec_widgets.widgets.control.device_manager.components.device_table.device_table import (
+    DeviceTable,
+)
+from bec_widgets.widgets.control.device_manager.components.dm_config_view import DMConfigView
+from bec_widgets.widgets.control.device_manager.components.dm_docstring_view import DocstringView
 from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation_utils import (
    ConfigStatus,
    ConnectionStatus,
@@ -61,8 +54,29 @@ from bec_widgets.widgets.utility.spinner.spinner import SpinnerWidget
 if TYPE_CHECKING:  # pragma: no cover
    from bec_lib.client import BECClient

+    from bec_widgets.applications.views.device_manager_view.device_manager_dialogs.upload_redis_dialog import (
+        UploadRedisDialog,
+    )
+
 logger = bec_logger.logger

+ConfigChoiceDialog = lazy_import_from(
+    "bec_widgets.applications.views.device_manager_view.device_manager_dialogs.config_choice_dialog",
+    ("ConfigChoiceDialog",),
+)
+DeviceFormDialog = lazy_import_from(
+    "bec_widgets.applications.views.device_manager_view.device_manager_dialogs.device_form_dialog",
+    ("DeviceFormDialog",),
+)
+UploadRedisDialog = lazy_import_from(
+    "bec_widgets.applications.views.device_manager_view.device_manager_dialogs.upload_redis_dialog",
+    ("UploadRedisDialog",),
+)
+OphydValidation = lazy_import_from(
+    "bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation",
+    ("OphydValidation",),
+)
+
 _yes_no_question = partial(
    QMessageBox.question,
    buttons=QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
@@ -169,7 +183,7 @@ class DeviceManagerDisplayWidget(DockAreaWidget):
        self._upload_redis_dialog: UploadRedisDialog | None = None
        self._dialog_validation_connection: QMetaObject.Connection | None = None

-        # NOTE: We need here a seperate config helper instance to avoid conflicts with
+        # NOTE: We need here a separate config helper instance to avoid conflicts with
        # other communications to REDIS as uploading a config through a CommunicationConfigAction
        # will block if we use the config_helper from self.client.config._config_helper
        self._config_helper = config_helper.ConfigHelper(self.client.connector)
@@ -607,8 +621,8 @@ class DeviceManagerDisplayWidget(DockAreaWidget):
                self.device_table_view._is_config_in_sync_with_redis()
            )
            validation_results = self.device_table_view.get_validation_results()
-            for config, config_status, connnection_status in validation_results.values():
-                if connnection_status == ConnectionStatus.CONNECTED.value:
+            for config, config_status, connection_status in validation_results.values():
+                if connection_status == ConnectionStatus.CONNECTED.value:
                    self.device_table_view.update_device_validation(
                        config, config_status, ConnectionStatus.CAN_CONNECT, ""
                    )
@@ -1,14 +1,17 @@
 """Module for Device Manager View."""

+from bec_lib.utils.import_utils import lazy_import_from
 from qtpy.QtCore import QRect
 from qtpy.QtWidgets import QWidget

-from bec_widgets.applications.views.device_manager_view.device_manager_widget import (
-    DeviceManagerWidget,
-)
 from bec_widgets.applications.views.view import ViewBase, ViewTourSteps
 from bec_widgets.utils.error_popups import SafeSlot

+DeviceManagerWidget = lazy_import_from(
+    "bec_widgets.applications.views.device_manager_view.device_manager_widget",
+    ("DeviceManagerWidget",),
+)
+

 class DeviceManagerView(ViewBase):
    """
@@ -6,15 +6,18 @@ import os

 from bec_lib.bec_yaml_loader import yaml_load
 from bec_lib.logger import bec_logger
+from bec_lib.utils.import_utils import lazy_import_from
 from bec_qthemes import material_icon
 from qtpy import QtCore, QtWidgets

-from bec_widgets.applications.views.device_manager_view.device_manager_display_widget import (
-    DeviceManagerDisplayWidget,
-)
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.error_popups import SafeSlot

+DeviceManagerDisplayWidget = lazy_import_from(
+    "bec_widgets.applications.views.device_manager_view.device_manager_display_widget",
+    ("DeviceManagerDisplayWidget",),
+)
+
 logger = bec_logger.logger


@@ -21,7 +21,7 @@ logger = bec_logger.logger


 class _WidgetsEnumType(str, enum.Enum):
-    """Enum for the available widgets, to be generated programatically"""
+    """Enum for the available widgets, to be generated programmatically"""

    ...

@@ -32,6 +32,7 @@ _Widgets = {
    "BECQueue": "BECQueue",
    "BECShell": "BECShell",
    "BECStatusBox": "BECStatusBox",
+    "BecConsole": "BecConsole",
    "DapComboBox": "DapComboBox",
    "DeviceBrowser": "DeviceBrowser",
    "Heatmap": "Heatmap",
@@ -56,7 +57,6 @@ _Widgets = {
    "SignalLabel": "SignalLabel",
    "TextBox": "TextBox",
    "Waveform": "Waveform",
-    "WebConsole": "WebConsole",
    "WebsiteWidget": "WebsiteWidget",
 }

@@ -89,6 +89,16 @@ except ImportError as e:
    logger.error(f"Failed loading plugins: \n{reduce(add, traceback.format_exception(e))}")


+class AdminView(RPCBase):
+    """A view for administrators to change the current active experiment, manage messaging"""
+
+    @rpc_call
+    def activate(self) -> "None":
+        """
+        Switch the parent application to this view.
+        """
+
+
 class AutoUpdates(RPCBase):
    @property
    @rpc_call
@@ -496,7 +506,7 @@ class BECQueue(RPCBase):


 class BECShell(RPCBase):
-    """A WebConsole pre-configured to run the BEC shell."""
+    """A BecConsole pre-configured to run the BEC shell."""

    @rpc_call
    def remove(self):
@@ -681,6 +691,28 @@ class BaseROI(RPCBase):
        """


+class BecConsole(RPCBase):
+    """A console widget with access to a shared registry of terminals, such that instances can be moved around."""
+
+    @rpc_call
+    def remove(self):
+        """
+        Cleanup the BECConnector
+        """
+
+    @rpc_call
+    def attach(self):
+        """
+        None
+        """
+
+    @rpc_call
+    def detach(self):
+        """
+        Detach the widget from its parent dock widget (if widget is in the dock), making it a floating widget.
+        """
+
+
 class CircularROI(RPCBase):
    """Circular Region of Interest with center/diameter tracking and auto-labeling."""

@@ -975,7 +1007,7 @@ class Curve(RPCBase):


 class DapComboBox(RPCBase):
-    """The DAPComboBox widget is an extension to the QComboBox with all avaialble DAP model from BEC."""
+    """Editable combobox listing the available DAP models."""

    @rpc_call
    def select_y_axis(self, y_axis: str):
@@ -1001,7 +1033,7 @@ class DapComboBox(RPCBase):
        Slot to update the fit model.

        Args:
-            default_device(str): Default device name.
+            fit_name(str): Fit model name.
        """


@@ -3140,190 +3172,6 @@ class LogPanel(RPCBase):
 class Minesweeper(RPCBase): ...


-class MonacoDock(RPCBase):
-    """MonacoDock is a dock widget that contains Monaco editor instances."""
-
-    @rpc_call
-    def new(
-        self,
-        widget: "QWidget | str",
-        *,
-        closable: "bool" = True,
-        floatable: "bool" = True,
-        movable: "bool" = True,
-        start_floating: "bool" = False,
-        floating_state: "Mapping[str, object] | None" = None,
-        where: "Literal['left', 'right', 'top', 'bottom'] | None" = None,
-        on_close: "Callable[[CDockWidget, QWidget], None] | None" = None,
-        tab_with: "CDockWidget | QWidget | str | None" = None,
-        relative_to: "CDockWidget | QWidget | str | None" = None,
-        return_dock: "bool" = False,
-        show_title_bar: "bool | None" = None,
-        title_buttons: "Mapping[str, bool] | Sequence[str] | str | None" = None,
-        show_settings_action: "bool | None" = False,
-        promote_central: "bool" = False,
-        dock_icon: "QIcon | None" = None,
-        apply_widget_icon: "bool" = True,
-        object_name: "str | None" = None,
-        **widget_kwargs,
-    ) -> "QWidget | CDockWidget | BECWidget":
-        """
-        Create a new widget (or reuse an instance) and add it as a dock.
-
-        Args:
-            widget(QWidget | str): Instance or registered widget type string.
-            closable(bool): Whether the dock is closable.
-            floatable(bool): Whether the dock is floatable.
-            movable(bool): Whether the dock is movable.
-            start_floating(bool): Whether to start the dock floating.
-            floating_state(Mapping | None): Optional floating geometry metadata to apply when floating.
-            where(Literal["left", "right", "top", "bottom"] | None): Dock placement hint relative to the dock area (ignored when
-                ``relative_to`` is provided without an explicit value).
-            on_close(Callable[[CDockWidget, QWidget], None] | None): Optional custom close handler accepting (dock, widget).
-            tab_with(CDockWidget | QWidget | str | None): Existing dock (or widget/name) to tab the new dock alongside.
-            relative_to(CDockWidget | QWidget | str | None): Existing dock (or widget/name) used as the positional anchor.
-                When supplied and ``where`` is ``None``, the new dock inherits the
-                anchor's current dock area.
-            return_dock(bool): When True, return the created dock instead of the widget.
-            show_title_bar(bool | None): Explicitly show or hide the dock area's title bar.
-            title_buttons(Mapping[str, bool] | Sequence[str] | str | None): Mapping or iterable describing which title bar buttons should
-                remain visible. Provide a mapping of button names (``"float"``,
-                ``"close"``, ``"menu"``, ``"auto_hide"``, ``"minimize"``) to booleans,
-                or a sequence of button names to hide.
-            show_settings_action(bool | None): Control whether a dock settings/property action should
-                be installed. Defaults to ``False`` for the basic dock area; subclasses
-                such as `BECDockArea` override the default to ``True``.
-            promote_central(bool): When True, promote the created dock to be the dock manager's
-                central widget (useful for editor stacks or other root content).
-            dock_icon(QIcon | None): Optional icon applied to the dock via ``CDockWidget.setIcon``.
-                Provide a `QIcon` (e.g. from ``material_icon``). When ``None`` (default),
-                the widget's ``ICON_NAME`` attribute is used when available.
-            apply_widget_icon(bool): When False, skip automatically resolving the icon from
-                the widget's ``ICON_NAME`` (useful for callers who want no icon and do not pass one explicitly).
-            object_name(str | None): Optional object name to assign to the created widget.
-            **widget_kwargs: Additional keyword arguments passed to the widget constructor
-                when creating by type name.
-
-        Returns:
-            The widget instance by default, or the created `CDockWidget` when `return_dock` is True.
-        """
-
-    @rpc_call
-    def dock_map(self) -> "dict[str, CDockWidget]":
-        """
-        Return the dock widgets map as dictionary with names as keys.
-        """
-
-    @rpc_call
-    def dock_list(self) -> "list[CDockWidget]":
-        """
-        Return the list of dock widgets.
-        """
-
-    @rpc_call
-    def widget_map(self, bec_widgets_only: "bool" = True) -> "dict[str, QWidget]":
-        """
-        Return a dictionary mapping widget names to their corresponding widgets.
-
-        Args:
-            bec_widgets_only(bool): If True, only include widgets that are BECConnector instances.
-        """
-
-    @rpc_call
-    def widget_list(self, bec_widgets_only: "bool" = True) -> "list[QWidget]":
-        """
-        Return a list of widgets contained in the dock area.
-
-        Args:
-            bec_widgets_only(bool): If True, only include widgets that are BECConnector instances.
-        """
-
-    @rpc_call
-    def attach_all(self):
-        """
-        Re-attach floating docks back into the dock manager.
-        """
-
-    @rpc_call
-    def delete_all(self):
-        """
-        Delete all docks and their associated widgets.
-        """
-
-    @rpc_call
-    def delete(self, object_name: "str") -> "bool":
-        """
-        Remove a widget from the dock area by its object name.
-
-        Args:
-            object_name: The object name of the widget to remove.
-
-        Returns:
-            bool: True if the widget was found and removed, False otherwise.
-
-        Raises:
-            ValueError: If no widget with the given object name is found.
-
-        Example:
-            >>> dock_area.delete("my_widget")
-            True
-        """
-
-    @rpc_call
-    def set_layout_ratios(
-        self,
-        *,
-        horizontal: "Sequence[float] | Mapping[int | str, float] | None" = None,
-        vertical: "Sequence[float] | Mapping[int | str, float] | None" = None,
-        splitter_overrides: "Mapping[int | str | Sequence[int], Sequence[float] | Mapping[int | str, float]] | None" = None,
-    ) -> "None":
-        """
-        Adjust splitter ratios in the dock layout.
-
-        Args:
-            horizontal: Weights applied to every horizontal splitter encountered.
-            vertical: Weights applied to every vertical splitter encountered.
-            splitter_overrides: Optional overrides targeting specific splitters identified
-                by their index path (e.g. ``{0: [1, 2], (1, 0): [3, 5]}``). Paths are zero-based
-                indices following the splitter hierarchy, starting from the root splitter.
-
-        Example:
-            To build three columns with custom per-column ratios::
-
-                area.set_layout_ratios(
-                    horizontal=[1, 2, 1],             # column widths
-                    splitter_overrides={
-                        0: [1, 2],                    # column 0 (two rows)
-                        1: [3, 2, 1],                 # column 1 (three rows)
-                        2: [1],                       # column 2 (single row)
-                    },
-                )
-        """
-
-    @rpc_call
-    def describe_layout(self) -> "list[dict[str, Any]]":
-        """
-        Return metadata describing splitter paths, orientations, and contained docks.
-
-        Useful for determining the keys to use in `set_layout_ratios(splitter_overrides=...)`.
-        """
-
-    @rpc_call
-    def print_layout_structure(self) -> "None":
-        """
-        Pretty-print the current splitter paths to stdout.
-        """
-
-    @rpc_call
-    def set_central_dock(self, dock: "CDockWidget | QWidget | str") -> "None":
-        """
-        Promote an existing dock to be the dock manager's central widget.
-
-        Args:
-            dock(CDockWidget | QWidget | str): Dock reference to promote.
-        """
-
-
 class MonacoWidget(RPCBase):
    """A simple Monaco editor widget"""

@@ -6407,28 +6255,6 @@ class WaveformViewPopup(RPCBase):
        """


-class WebConsole(RPCBase):
-    """A simple widget to display a website"""
-
-    @rpc_call
-    def remove(self):
-        """
-        Cleanup the BECConnector
-        """
-
-    @rpc_call
-    def attach(self):
-        """
-        None
-        """
-
-    @rpc_call
-    def detach(self):
-        """
-        Detach the widget from its parent dock widget (if widget is in the dock), making it a floating widget.
-        """
-
-
 class WebsiteWidget(RPCBase):
    """A simple widget to display a website"""

@@ -10,9 +10,9 @@ import threading
 import time
 from contextlib import contextmanager
 from threading import Lock
-from typing import TYPE_CHECKING, Literal, TypeAlias, cast
+from typing import TYPE_CHECKING, Callable, Literal, TypeAlias, cast

-from bec_lib.endpoints import MessageEndpoints
+from bec_lib.endpoints import EndpointInfo, MessageEndpoints
 from bec_lib.logger import bec_logger
 from bec_lib.utils.import_utils import lazy_import, lazy_import_from
 from rich.console import Console
@@ -232,6 +232,11 @@ class BECGuiClient(RPCBase):
        """The launcher object."""
        return RPCBase(gui_id=f"{self._gui_id}:launcher", parent=self, object_name="launcher")

+    def _safe_register_stream(self, endpoint: EndpointInfo, cb: Callable, **kwargs):
+        """Check if already registered for registration in idempotent functions."""
+        if not self._client.connector.any_stream_is_registered(endpoint, cb=cb):
+            self._client.connector.register(endpoint, cb=cb, **kwargs)
+
    def connect_to_gui_server(self, gui_id: str) -> None:
        """Connect to a GUI server"""
        # Unregister the old callback
@@ -247,10 +252,9 @@ class BECGuiClient(RPCBase):
        self._ipython_registry = {}

        # Register the new callback
-        self._client.connector.register(
+        self._safe_register_stream(
            MessageEndpoints.gui_registry_state(self._gui_id),
            cb=self._handle_registry_update,
-            parent=self,
            from_start=True,
        )

@@ -531,20 +535,14 @@ class BECGuiClient(RPCBase):

    def _start(self, wait: bool = False) -> None:
        self._killed = False
-        self._client.connector.register(
-            MessageEndpoints.gui_registry_state(self._gui_id),
-            cb=self._handle_registry_update,
-            parent=self,
+        self._safe_register_stream(
+            MessageEndpoints.gui_registry_state(self._gui_id), cb=self._handle_registry_update
        )
        return self._start_server(wait=wait)

-    @staticmethod
-    def _handle_registry_update(
-        msg: dict[str, GUIRegistryStateMessage], parent: BECGuiClient
-    ) -> None:
+    def _handle_registry_update(self, msg: dict[str, GUIRegistryStateMessage]) -> None:
        # This was causing a deadlock during shutdown, not sure why.
        # with self._lock:
-        self = parent
        self._server_registry = cast(dict[str, RegistryState], msg["data"].state)
        self._update_dynamic_namespace(self._server_registry)

@@ -94,7 +94,7 @@ logger = bec_logger.logger
        if self._base:
            self.content += """
 class _WidgetsEnumType(str, enum.Enum):
-    \"\"\" Enum for the available widgets, to be generated programatically  \"\"\"
+    \"\"\" Enum for the available widgets, to be generated programmatically  \"\"\"
    ...
    """

@@ -248,9 +248,7 @@ class RPCBase:
            self._rpc_response = None
            self._msg_wait_event.clear()
            self._client.connector.register(
-                MessageEndpoints.gui_instruction_response(request_id),
-                cb=self._on_rpc_response,
-                parent=self,
+                MessageEndpoints.gui_instruction_response(request_id), cb=self._on_rpc_response
            )

        self._client.connector.set_and_publish(MessageEndpoints.gui_instructions(receiver), rpc_msg)
@@ -276,11 +274,10 @@ class RPCBase:
            self._rpc_response = None
            return self._create_widget_from_msg_result(msg_result)

-    @staticmethod
-    def _on_rpc_response(msg_obj: MessageObject, parent: RPCBase) -> None:
+    def _on_rpc_response(self, msg_obj: MessageObject) -> None:
        msg = cast(messages.RequestResponseMessage, msg_obj.value)
-        parent._rpc_response = msg
-        parent._msg_wait_event.set()
+        self._rpc_response = msg
+        self._msg_wait_event.set()

    def _create_widget_from_msg_result(self, msg_result):
        if msg_result is None:
@@ -1,9 +1,19 @@
 from __future__ import annotations

-from bec_widgets.cli.client_utils import IGNORE_WIDGETS
-from bec_widgets.utils.bec_plugin_helper import get_all_plugin_widgets
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.plugin_utils import get_custom_classes
+from typing import TYPE_CHECKING
+
+from bec_lib.utils.import_utils import lazy_import_from
+
+from bec_widgets.utils.bec_plugin_helper import get_all_plugin_widget_references
+from bec_widgets.utils.plugin_utils import get_custom_class_references
+
+try:
+    from bec_widgets.cli.constants import IGNORE_WIDGETS
+except ModuleNotFoundError:  # pragma: no cover
+    IGNORE_WIDGETS = ["LaunchWindow"]
+
+if TYPE_CHECKING:  # pragma: no cover
+    from bec_widgets.utils.bec_widget import BECWidget


 class RPCWidgetHandler:
@@ -13,7 +23,7 @@ class RPCWidgetHandler:
        self._widget_classes = None

    @property
-    def widget_classes(self) -> dict[str, type[BECWidget]]:
+    def widget_classes(self) -> dict[str, type["BECWidget"]]:
        """
        Get the available widget classes.

@@ -31,12 +41,24 @@ class RPCWidgetHandler:
        Returns:
            None
        """
-        self._widget_classes = (
-            get_custom_classes("bec_widgets", packages=("widgets", "applications"))
-            + get_all_plugin_widgets()
-        ).as_dict(IGNORE_WIDGETS)
+        ignored = set(IGNORE_WIDGETS)
+        widget_classes = {
+            reference.name: lazy_import_from(reference.module, (reference.name,))
+            for reference in get_all_plugin_widget_references(use_cache=False)
+            if reference.name not in ignored
+        }
+        widget_classes.update(
+            {
+                reference.name: lazy_import_from(reference.module, (reference.name,))
+                for reference in get_custom_class_references(
+                    "bec_widgets", packages=("widgets", "applications"), use_cache=False
+                )
+                if reference.name not in ignored
+            }
+        )
+        self._widget_classes = widget_classes

-    def create_widget(self, widget_type, **kwargs) -> BECWidget:
+    def create_widget(self, widget_type, **kwargs) -> "BECWidget":
        """
        Create a widget from an RPC message.

@@ -1,6 +1,7 @@
 # pylint: skip-file
 from unittest.mock import MagicMock

+from bec_lib.config_helper import ConfigHelper
 from bec_lib.device import Device as BECDevice
 from bec_lib.device import Positioner as BECPositioner
 from bec_lib.device import ReadoutPriority
@@ -219,7 +220,9 @@ class Device(FakeDevice):


 class DMMock:
-    def __init__(self):
+    def __init__(self, *args, **kwargs):
+        self._service = args[0]
+        self.config_helper = ConfigHelper(self._service.connector, self._service._service_name)
        self.devices = DeviceContainer()
        self.enabled_devices = [device for device in self.devices if device.enabled]

@@ -273,6 +276,10 @@ class DMMock:
            configs.append(device._config)
        return configs

+    def initialize(*_): ...
+
+    def shutdown(self): ...
+

 DEVICES = [
    FakePositioner("samx", limits=[-10, 10], read_value=2.0),
@@ -1,13 +0,0 @@
-from qtpy.QtWebEngineWidgets import QWebEngineView
-
-from .bec_connector import BECConnector, ConnectionConfig
-from .bec_dispatcher import BECDispatcher
-from .bec_table import BECTable
-from .colors import Colors
-from .container_utils import WidgetContainerUtils
-from .crosshair import Crosshair
-from .entry_validator import EntryValidator
-from .layout_manager import GridLayoutManager
-from .rpc_decorator import register_rpc_methods, rpc_public
-from .ui_loader import UILoader
-from .validator_delegate import DoubleValidationDelegate
@@ -167,7 +167,7 @@ class BECConnector:
            )
            self.config = ConnectionConfig(widget_class=self.__class__.__name__)

-        # If the gui_id is passed, it should be respected. However, this should be revisted since
+        # If the gui_id is passed, it should be respected. However, this should be revisited since
        # the gui_id has to be unique, and may no longer be.
        if gui_id:
            self.config.gui_id = gui_id
@@ -399,7 +399,7 @@ class BECConnector:
        """
        self.config = config

-    # FIXME some thoughts are required to decide how thhis should work with rpc registry
+    # FIXME some thoughts are required to decide how this should work with rpc registry
    def apply_config(self, config: dict, generate_new_id: bool = True) -> None:
        """
        Apply the configuration to the widget.
@@ -417,7 +417,7 @@ class BECConnector:
        else:
            self.gui_id = self.config.gui_id

-    # FIXME some thoughts are required to decide how thhis should work with rpc registry
+    # FIXME some thoughts are required to decide how this should work with rpc registry
    def load_config(self, path: str | None = None, gui: bool = False):
        """
        Load the configuration of the widget from YAML.
@@ -123,17 +123,16 @@ class BECDispatcher:
        self._registered_slots: DefaultDict[Hashable, QtThreadSafeCallback] = (
            collections.defaultdict()
        )
-        self.client = client

-        if self.client is None:
-            if config is not None:
-                if not isinstance(config, ServiceConfig):
-                    # config is supposed to be a path
-                    config = ServiceConfig(config)
+        if client is None:
+            if config is not None and not isinstance(config, ServiceConfig):
+                # config is supposed to be a path
+                config = ServiceConfig(config)
            self.client = BECClient(
                config=config, connector_cls=QtRedisConnector, name="BECWidgets"
            )
        else:
+            self.client = client
            if self.client.started:
                # have to reinitialize client to use proper connector
                logger.info("Shutting down BECClient to switch to QtRedisConnector")
@@ -176,12 +175,15 @@ class BECDispatcher:
            cb_info (dict | None): A dictionary containing information about the callback. Defaults to None.
        """
        qt_slot = QtThreadSafeCallback(cb=slot, cb_info=cb_info)
-        if qt_slot not in self._registered_slots:
-            self._registered_slots[qt_slot] = qt_slot
-        qt_slot = self._registered_slots[qt_slot]
-        self.client.connector.register(topics, cb=qt_slot, **kwargs)
-        topics_str, _ = self.client.connector._convert_endpointinfo(topics)
-        qt_slot.topics.update(set(topics_str))
+        if not self.client.connector.any_stream_is_registered(topics, qt_slot):
+            if qt_slot not in self._registered_slots:
+                self._registered_slots[qt_slot] = qt_slot
+            qt_slot = self._registered_slots[qt_slot]
+            self.client.connector.register(topics, cb=qt_slot, **kwargs)
+            topics_str, _ = self.client.connector._convert_endpointinfo(topics)
+            qt_slot.topics.update(set(topics_str))
+        else:
+            logger.warning(f"Attempted to create duplicate stream subscription for {topics=}")

    def disconnect_slot(
        self, slot: Callable, topics: EndpointInfo | str | list[EndpointInfo] | list[str]
@@ -1,7 +1,9 @@
 from __future__ import annotations

+import ast
 import importlib.metadata
 import inspect
+import logging
 import pkgutil
 import traceback
 from importlib import util as importlib_util
@@ -9,11 +11,65 @@ from importlib.machinery import FileFinder, ModuleSpec, SourceFileLoader
 from types import ModuleType
 from typing import Generator

-from bec_lib.logger import bec_logger
+from bec_widgets.utils.plugin_utils import (
+    BECClassContainer,
+    BECClassInfo,
+    BECClassReference,
+    _ast_node_name,
+    _class_has_rpc_markers,
+    _discover_class_references_from_roots,
+    _find_package_roots,
+)

-from bec_widgets.utils.plugin_utils import BECClassContainer, BECClassInfo
+logger = logging.getLogger(__name__)

-logger = bec_logger.logger
+
+def _plugin_class_is_candidate(node: ast.ClassDef) -> bool:
+    base_names = {_ast_node_name(base) for base in node.bases}
+    return bool({"BECWidget", "BECConnector"} & base_names) or _class_has_rpc_markers(node)
+
+
+_PLUGIN_WIDGET_REFERENCE_CACHE: dict[tuple[tuple[str, str], ...], tuple[BECClassReference, ...]] = (
+    {}
+)
+
+
+def _plugin_entry_point_snapshot() -> tuple[tuple[str, str], ...]:
+    return tuple(
+        sorted(
+            (entry_point.name, entry_point.module)
+            for entry_point in importlib.metadata.entry_points(group="bec.widgets.user_widgets")  # type: ignore
+        )
+    )
+
+
+def _build_plugin_widget_references() -> tuple[BECClassReference, ...]:
+    references: list[BECClassReference] = []
+    seen_names: set[str] = set()
+    for entry_point in importlib.metadata.entry_points(group="bec.widgets.user_widgets"):  # type: ignore
+        try:
+            package_roots = _find_package_roots(entry_point.module)
+        except ModuleNotFoundError:
+            continue
+        for reference in _discover_class_references_from_roots(
+            entry_point.module,
+            package_roots,
+            file_name_filter=lambda file_name: file_name.endswith(".py")
+            and not file_name.startswith("__"),
+            candidate_filter=_plugin_class_is_candidate,
+        ):
+            if reference.name in seen_names:
+                continue
+            references.append(reference)
+            seen_names.add(reference.name)
+    return tuple(references)
+
+
+def get_all_plugin_widget_references(*, use_cache: bool = True) -> list[BECClassReference]:
+    snapshot = _plugin_entry_point_snapshot()
+    if not use_cache or snapshot not in _PLUGIN_WIDGET_REFERENCE_CACHE:
+        _PLUGIN_WIDGET_REFERENCE_CACHE[snapshot] = _build_plugin_widget_references()
+    return list(_PLUGIN_WIDGET_REFERENCE_CACHE[snapshot])


 def _submodule_specs(module: ModuleType) -> tuple[ModuleSpec | None, ...]:
@@ -20,7 +20,6 @@ from bec_widgets.widgets.utility.spinner.spinner import SpinnerWidget

 if TYPE_CHECKING:  # pragma: no cover
    from bec_widgets.utils.busy_loader import BusyLoaderOverlay
-    from bec_widgets.widgets.containers.dock import BECDock

 logger = bec_logger.logger

@@ -43,7 +43,7 @@ class WidgetContainerUtils:
        if list_of_names is None:
            list_of_names = []
        ii = 0
-        while ii < 1000:  # 1000 is arbritrary!
+        while ii < 1000:  # 1000 is arbitrary!
            name_candidate = f"{name}_{ii}"
            if name_candidate not in list_of_names:
                return name_candidate
@@ -71,7 +71,7 @@ class FormItemSpec(BaseModel):
    """
    The specification for an item in a dynamically generated form. Uses a pydantic FieldInfo
    to store most annotation info, since one of the main purposes is to store data for
-    forms genrated from pydantic models, but can also be composed from other sources or by hand.
+    forms generated from pydantic models, but can also be composed from other sources or by hand.
    """

    model_config = ConfigDict(arbitrary_types_allowed=True)
@@ -192,7 +192,7 @@ class DynamicFormItem(QWidget):
    @abstractmethod
    def _add_main_widget(self) -> None:
        self._main_widget: QWidget
-        """Add the main data entry widget to self._main_widget and appply any
+        """Add the main data entry widget to self._main_widget and apply any
        constraints from the field info"""

    @SafeSlot()
@@ -0,0 +1,35 @@
+"""Module providing fuzzy search utilities for the BEC widgets."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from thefuzz import fuzz
+
+FUZZY_SEARCH_THRESHOLD = 80
+
+
+def is_match(
+    text: str, row_data: dict[str, Any], relevant_keys: list[str], enable_fuzzy: bool
+) -> bool:
+    """
+    Check if the text matches any of the relevant keys in the row data.
+
+    Args:
+        text (str): The text to search for.
+        row_data (dict[str, Any]): The row data to search in.
+        relevant_keys (list[str]): The keys to consider for searching.
+        enable_fuzzy (bool): Whether to use fuzzy matching.
+    Returns:
+        bool: True if a match is found, False otherwise.
+    """
+    for key in relevant_keys:
+        data = str(row_data.get(key, "") or "")
+        if enable_fuzzy:
+            match_ratio = fuzz.partial_ratio(text.lower(), data.lower())
+            if match_ratio >= FUZZY_SEARCH_THRESHOLD:
+                return True
+        else:
+            if text.lower() in data.lower():
+                return True
+    return False
@@ -15,7 +15,7 @@ class Kind(IFBase):
    """
    This is used in the .kind attribute of all OphydObj (Signals, Devices).

-    A Device examines its components' .kind atttribute to decide whether to
+    A Device examines its components' .kind attribute to decide whether to
    traverse it in read(), read_configuration(), or neither. Additionally, if
    decides whether to include its name in `hints['fields']`.
    """
@@ -22,7 +22,7 @@ class {plugin_name_pascal}Plugin(QDesignerCustomWidgetInterface):  # pragma: no

    def createWidget(self, parent):
        if parent is None:
-           return QWidget()
+            return QWidget()
        t = {plugin_name_pascal}(parent)
        return t

@@ -1,22 +1,23 @@
 from __future__ import annotations

+import ast
 import importlib
 import inspect
 import os
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Iterable
-
-from bec_lib.plugin_helper import _get_available_plugins
-from qtpy.QtWidgets import QWidget
-
-from bec_widgets.utils import BECConnector
-from bec_widgets.utils.bec_widget import BECWidget
+from functools import lru_cache
+from importlib import util as importlib_util
+from typing import TYPE_CHECKING, Callable, Iterable

 if TYPE_CHECKING:  # pragma: no cover
+    from bec_widgets.utils.bec_connector import BECConnector
+    from bec_widgets.utils.bec_widget import BECWidget
    from bec_widgets.widgets.containers.auto_update.auto_updates import AutoUpdates

+_DISCOVERY_BASE_NAMES = frozenset({"BECConnector", "BECWidget", "ViewBase"})

-def get_plugin_widgets() -> dict[str, BECConnector]:
+
+def get_plugin_widgets() -> dict[str, "BECConnector"]:
    """
    Get all available widgets from the plugin directory. Widgets are classes that inherit from BECConnector.
    The plugins are provided through python plugins and specified in the respective pyproject.toml file using
@@ -35,9 +36,10 @@ def get_plugin_widgets() -> dict[str, BECConnector]:
    Returns:
        dict[str, BECConnector]: A dictionary of widget names and their respective classes.
    """
+    from bec_lib.plugin_helper import _get_available_plugins
+
    modules = _get_available_plugins("bec.widgets.user_widgets")
    loaded_plugins = {}
-    print(modules)
    for module in modules:
        mods = inspect.getmembers(module, predicate=_filter_plugins)
        for name, mod_cls in mods:
@@ -48,6 +50,8 @@ def get_plugin_widgets() -> dict[str, BECConnector]:


 def _filter_plugins(obj):
+    from bec_widgets.utils.bec_connector import BECConnector
+
    return inspect.isclass(obj) and issubclass(obj, BECConnector)


@@ -66,6 +70,8 @@ def get_plugin_auto_updates() -> dict[str, type[AutoUpdates]]:
    Returns:
        dict[str, AutoUpdates]: A dictionary of widget names and their respective classes.
    """
+    from bec_lib.plugin_helper import _get_available_plugins
+
    modules = _get_available_plugins("bec.widgets.auto_updates")
    loaded_plugins = {}
    for module in modules:
@@ -90,14 +96,20 @@ class BECClassInfo:
    name: str
    module: str
    file: str
-    obj: type[BECWidget]
+    obj: type["BECWidget"]
    is_connector: bool = False
    is_widget: bool = False
    is_plugin: bool = False


+@dataclass(frozen=True)
+class BECClassReference:
+    name: str
+    module: str
+
+
 class BECClassContainer:
-    def __init__(self, initial: Iterable[BECClassInfo] = []):
+    def __init__(self, initial: Iterable[BECClassInfo] = ()):
        self._collection: list[BECClassInfo] = list(initial)

    def __repr__(self):
@@ -109,12 +121,13 @@ class BECClassContainer:
    def __add__(self, other: BECClassContainer):
        return BECClassContainer((*self, *(c for c in other if c.name not in self.names)))

-    def as_dict(self, ignores: list[str] = []) -> dict[str, type[BECWidget]]:
+    def as_dict(self, ignores: list[str] | None = None) -> dict[str, type["BECWidget"]]:
        """get a dict of {name: Type} for all the entries in the collection.

        Args:
            ignores(list[str]): a list of class names to exclude from the dictionary."""
-        return {c.name: c.obj for c in self if c.name not in ignores}
+        ignore_set = set(ignores or ())
+        return {c.name: c.obj for c in self if c.name not in ignore_set}

    def add_class(self, class_info: BECClassInfo):
        """
@@ -166,48 +179,276 @@ class BECClassContainer:
        return [info.obj for info in self.collection]


+def _ast_node_name(node: ast.expr) -> str | None:
+    if isinstance(node, ast.Name):
+        return node.id
+    if isinstance(node, ast.Attribute):
+        return node.attr
+    return None
+
+
+def _class_has_rpc_markers(node: ast.ClassDef) -> bool:
+    for stmt in node.body:
+        if isinstance(stmt, ast.Assign):
+            target_names = {target.id for target in stmt.targets if isinstance(target, ast.Name)}
+            if (
+                "PLUGIN" in target_names
+                and isinstance(stmt.value, ast.Constant)
+                and stmt.value.value
+            ):
+                return True
+            if {"RPC_CONTENT_CLASS", "USER_ACCESS"} & target_names:
+                return True
+        if isinstance(stmt, ast.AnnAssign) and isinstance(stmt.target, ast.Name):
+            if (
+                stmt.target.id == "PLUGIN"
+                and isinstance(stmt.value, ast.Constant)
+                and stmt.value.value
+            ):
+                return True
+            if stmt.target.id in {"RPC_CONTENT_CLASS", "USER_ACCESS"}:
+                return True
+    return False
+
+
+def _class_is_candidate(node: ast.ClassDef) -> bool:
+    base_names = {_ast_node_name(base) for base in node.bases}
+    return bool(_DISCOVERY_BASE_NAMES & base_names) or _class_has_rpc_markers(node)
+
+
+def _candidate_top_level_class_names(path: str) -> list[str]:
+    with open(path, encoding="utf-8") as file_handle:
+        module = ast.parse(file_handle.read(), filename=path)
+    return [
+        node.name
+        for node in module.body
+        if isinstance(node, ast.ClassDef) and _class_is_candidate(node)
+    ]
+
+
+@lru_cache(maxsize=64)
+def _find_package_roots(module_name: str) -> tuple[str, ...]:
+    spec = importlib_util.find_spec(module_name)
+    if spec is None:
+        raise ModuleNotFoundError(module_name)
+
+    package_roots = tuple(spec.submodule_search_locations or ())
+    if package_roots:
+        return package_roots
+    if spec.origin:
+        return (os.path.dirname(spec.origin),)
+    raise ModuleNotFoundError(module_name)
+
+
+def _discover_class_references_from_roots(
+    module_prefix: str,
+    package_roots: Iterable[str],
+    *,
+    file_name_filter: Callable[[str], bool],
+    candidate_filter: Callable[[ast.ClassDef], bool],
+) -> tuple[BECClassReference, ...]:
+    references: list[BECClassReference] = []
+    seen_names: set[str] = set()
+
+    for package_root in package_roots:
+        for root, _, files in sorted(os.walk(package_root)):
+            for file_name in sorted(files):
+                if not file_name_filter(file_name):
+                    continue
+                path = os.path.join(root, file_name)
+                with open(path, encoding="utf-8") as file_handle:
+                    module = ast.parse(file_handle.read(), filename=path)
+                rel_path = os.path.relpath(path, package_root).removesuffix(".py")
+                module_name = ".".join([module_prefix, *rel_path.split(os.sep)])
+                for node in module.body:
+                    if not isinstance(node, ast.ClassDef) or not candidate_filter(node):
+                        continue
+                    if node.name in seen_names:
+                        continue
+                    references.append(BECClassReference(name=node.name, module=module_name))
+                    seen_names.add(node.name)
+
+    return tuple(references)
+
+
+def _iter_candidate_modules(repo_name: str, package: str) -> Iterable[tuple[str, str, list[str]]]:
+    try:
+        package_roots = _find_package_roots(f"{repo_name}.{package}")
+    except ModuleNotFoundError:
+        return ()
+
+    modules: list[tuple[str, str, list[str]]] = []
+    for directory in package_roots:
+        for root, _, files in sorted(os.walk(directory)):
+            for file_name in sorted(files):
+                if (
+                    not file_name.endswith(".py")
+                    or file_name.startswith("__")
+                    or file_name.startswith("register_")
+                    or file_name.endswith("_plugin.py")
+                ):
+                    continue
+                path = os.path.join(root, file_name)
+                rel_dir = os.path.dirname(os.path.relpath(path, directory))
+                module_name = (
+                    file_name.removesuffix(".py")
+                    if rel_dir in ("", ".")
+                    else ".".join(rel_dir.split(os.sep) + [file_name.removesuffix(".py")])
+                )
+                class_names = _candidate_top_level_class_names(path)
+                if class_names:
+                    modules.append((f"{repo_name}.{package}.{module_name}", path, class_names))
+    return tuple(modules)
+
+
 def _collect_classes_from_package(repo_name: str, package: str) -> BECClassContainer:
    """Collect classes from a package subtree (for example ``widgets`` or ``applications``)."""
    collection = BECClassContainer()
-    try:
-        anchor_module = importlib.import_module(f"{repo_name}.{package}")
-    except ModuleNotFoundError as exc:
-        # Some plugin repositories expose only one subtree. Skip gracefully if it does not exist.
-        if exc.name == f"{repo_name}.{package}":
-            return collection
-        raise
+    for module_name, path, _ in _iter_candidate_modules(repo_name, package):
+        from qtpy.QtWidgets import QWidget

-    directory = os.path.dirname(anchor_module.__file__)
-    for root, _, files in sorted(os.walk(directory)):
-        for file in files:
-            if not file.endswith(".py") or file.startswith("__"):
+        from bec_widgets.utils.bec_connector import BECConnector
+        from bec_widgets.utils.bec_widget import BECWidget
+
+        module = importlib.import_module(module_name)
+        for name, obj in inspect.getmembers(module, inspect.isclass):
+            if obj.__module__ != module.__name__:
                continue
-
-            path = os.path.join(root, file)
-            rel_dir = os.path.dirname(os.path.relpath(path, directory))
-            if rel_dir in ("", "."):
-                module_name = file.split(".")[0]
-            else:
-                module_name = ".".join(rel_dir.split(os.sep) + [file.split(".")[0]])
-
-            module = importlib.import_module(f"{repo_name}.{package}.{module_name}")
-
-            for name in dir(module):
-                obj = getattr(module, name)
-                if not hasattr(obj, "__module__") or obj.__module__ != module.__name__:
-                    continue
-                if isinstance(obj, type):
-                    class_info = BECClassInfo(name=name, module=module.__name__, file=path, obj=obj)
-                    if issubclass(obj, BECConnector):
-                        class_info.is_connector = True
-                    if issubclass(obj, QWidget) or issubclass(obj, BECWidget):
-                        class_info.is_widget = True
-                    if hasattr(obj, "PLUGIN") and obj.PLUGIN:
-                        class_info.is_plugin = True
-                    collection.add_class(class_info)
+            class_info = BECClassInfo(name=name, module=module.__name__, file=path, obj=obj)
+            if issubclass(obj, BECConnector):
+                class_info.is_connector = True
+            if issubclass(obj, QWidget) or issubclass(obj, BECWidget):
+                class_info.is_widget = True
+            if hasattr(obj, "PLUGIN") and obj.PLUGIN:
+                class_info.is_plugin = True
+            collection.add_class(class_info)
    return collection


+def _build_ast_inheritance_map(
+    repo_name: str, packages: tuple[str, ...]
+) -> dict[str, tuple[str, set[str]]]:
+    """
+    Walk all candidate modules in the given packages and return a map of:
+        class_name -> (module_name, {direct_base_names})
+
+    This is used for the transitive-closure widget discovery so that subclasses
+    of discovered widget bases are themselves discoverable without needing to
+    repeat ``PLUGIN = True`` on every intermediate or leaf class.
+    """
+    mapping: dict[str, tuple[str, set[str]]] = {}
+    for package in packages:
+        try:
+            package_roots = _find_package_roots(f"{repo_name}.{package}")
+        except ModuleNotFoundError:
+            continue
+        for directory in package_roots:
+            for root, _, files in sorted(os.walk(directory)):
+                for file_name in sorted(files):
+                    if (
+                        not file_name.endswith(".py")
+                        or file_name.startswith("__")
+                        or file_name.startswith("register_")
+                        or file_name.endswith("_plugin.py")
+                    ):
+                        continue
+                    path = os.path.join(root, file_name)
+                    rel_dir = os.path.dirname(os.path.relpath(path, directory))
+                    module_name = (
+                        file_name.removesuffix(".py")
+                        if rel_dir in ("", ".")
+                        else ".".join(rel_dir.split(os.sep) + [file_name.removesuffix(".py")])
+                    )
+                    full_module = f"{repo_name}.{package}.{module_name}"
+                    with open(path, encoding="utf-8") as fh:
+                        tree = ast.parse(fh.read(), filename=path)
+                    for node in tree.body:
+                        if not isinstance(node, ast.ClassDef):
+                            continue
+                        base_names = {_ast_node_name(b) for b in node.bases} - {None}
+                        mapping[node.name] = (full_module, base_names)  # type: ignore[arg-type]
+    return mapping
+
+
+@lru_cache(maxsize=32)
+def _cached_custom_class_references(
+    repo_name: str, packages: tuple[str, ...]
+) -> tuple[BECClassReference, ...]:
+    """Discover widget/connector class references using a transitive-closure AST scan.
+
+    The first pass identifies classes that directly inherit from
+    ``_DISCOVERY_BASE_NAMES`` or carry explicit RPC markers (``PLUGIN``,
+    ``USER_ACCESS``, ``RPC_CONTENT_CLASS``).  Subsequent passes treat every
+    newly found class name as an additional base name, so subclasses of
+    subclasses are discovered automatically — without requiring each
+    intermediate class to repeat ``PLUGIN = True``.
+    """
+    inheritance_map = _build_ast_inheritance_map(repo_name, packages)
+
+    # Seed with _class_has_rpc_markers — we need the AST nodes for that check.
+    # Re-parse only to identify initial RPC-marker classes; inheritance_map
+    # already has everything else we need.
+    rpc_marker_names: set[str] = set()
+    for package in packages:
+        try:
+            package_roots = _find_package_roots(f"{repo_name}.{package}")
+        except ModuleNotFoundError:
+            continue
+        for directory in package_roots:
+            for root, _, files in sorted(os.walk(directory)):
+                for file_name in sorted(files):
+                    if (
+                        not file_name.endswith(".py")
+                        or file_name.startswith("__")
+                        or file_name.startswith("register_")
+                        or file_name.endswith("_plugin.py")
+                    ):
+                        continue
+                    path = os.path.join(root, file_name)
+                    with open(path, encoding="utf-8") as fh:
+                        tree = ast.parse(fh.read(), filename=path)
+                    for node in tree.body:
+                        if isinstance(node, ast.ClassDef) and _class_has_rpc_markers(node):
+                            rpc_marker_names.add(node.name)
+
+    # Transitive closure: start with known base names + RPC-marker classes,
+    # then repeatedly add classes whose direct bases are already known.
+    known: set[str] = set(_DISCOVERY_BASE_NAMES) | rpc_marker_names
+    changed = True
+    while changed:
+        changed = False
+        for class_name, (_, bases) in inheritance_map.items():
+            if class_name not in known and bases & known:
+                known.add(class_name)
+                changed = True
+
+    # Build the final list of references, preserving first-seen order and
+    # keeping only classes that are in the inheritance map (i.e. have a module).
+    references: list[BECClassReference] = []
+    seen_names: set[str] = set()
+    for class_name, (module_name, bases) in inheritance_map.items():
+        if class_name not in known:
+            continue
+        if class_name in seen_names:
+            continue
+        # Only emit if the class is actually a candidate (not just a raw base)
+        if class_name in _DISCOVERY_BASE_NAMES:
+            continue
+        references.append(BECClassReference(name=class_name, module=module_name))
+        seen_names.add(class_name)
+    return tuple(references)
+
+
+def get_custom_class_references(
+    repo_name: str, packages: tuple[str, ...] | None = None, *, use_cache: bool = True
+) -> list[BECClassReference]:
+    selected_packages = packages or ("widgets",)
+    if use_cache:
+        return list(_cached_custom_class_references(repo_name, tuple(selected_packages)))
+    _cached_custom_class_references.cache_clear()
+    return list(_cached_custom_class_references(repo_name, tuple(selected_packages)))
+
+
 def get_custom_classes(
    repo_name: str, packages: tuple[str, ...] | None = None
 ) -> BECClassContainer:
@@ -15,8 +15,8 @@ from qtpy.QtWidgets import QWidget
 from redis.exceptions import RedisError

 from bec_widgets.cli.rpc.rpc_register import RPCRegister
-from bec_widgets.utils import BECDispatcher
 from bec_widgets.utils.bec_connector import BECConnector
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
 from bec_widgets.utils.container_utils import WidgetContainerUtils
 from bec_widgets.utils.error_popups import ErrorPopupUtility
 from bec_widgets.utils.screen_utils import apply_window_geometry
@@ -25,7 +25,6 @@ from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow

 if TYPE_CHECKING:  # pragma: no cover
    from bec_lib import messages
-    from qtpy.QtCore import QObject
 else:
    messages = lazy_import("bec_lib.messages")
 logger = bec_logger.logger
@@ -156,7 +155,7 @@ class RPCServer:
            if method == "raise" and hasattr(
                obj, "setWindowState"
            ):  # special case for raising windows, should work even if minimized
-                # this is a special case for raising windows for gnome on rethat 9 systems where changing focus is supressed by default
+                # this is a special case for raising windows for gnome on Red Hat (RHEL) 9 systems where changing focus is suppressed by default
                # The procedure is as follows:
                # 1. Get the current window state to check if the window is minimized and remove minimized flag
                # 2. Then in order to force gnome to raise the window, we set the window to stay on top temporarily
@@ -442,5 +441,5 @@ class RPCServer:
        self.status = messages.BECStatus.IDLE
        self._heartbeat_timer.stop()
        self.emit_heartbeat()
-        logger.info("Succeded in shutting down CLI server")
+        logger.info("Succeeded in shutting down CLI server")
        self.client.shutdown()
@@ -35,16 +35,19 @@ logger = bec_logger.logger
 MODULE_PATH = os.path.dirname(bec_widgets.__file__)


-def create_action_with_text(toolbar_action, toolbar: QToolBar):
+def create_action_with_text(toolbar_action, toolbar: QToolBar, min_size: QSize | None = None):
    """
    Helper function to create a toolbar button with text beside or under the icon.

    Args:
        toolbar_action(ToolBarAction): The toolbar action to create the button for.
        toolbar(ModularToolBar): The toolbar to add the button to.
+        min_size(QSize, optional): The minimum size for the button. Defaults to None.
    """

    btn = QToolButton(parent=toolbar)
+    if min_size is not None:
+        btn.setMinimumSize(min_size)
    if getattr(toolbar_action, "label_text", None):
        toolbar_action.action.setText(toolbar_action.label_text)
    if getattr(toolbar_action, "tooltip", None):
@@ -26,7 +26,7 @@ from qtpy.QtWidgets import (
 from bec_widgets.widgets.utility.toggle.toggle import ToggleSwitch

 if TYPE_CHECKING:  # pragma: no cover
-    from bec_widgets.utils import BECConnector
+    from bec_widgets.utils.bec_connector import BECConnector

 logger = bec_logger.logger

@@ -418,7 +418,7 @@ class WidgetHierarchy:
            only_bec_widgets(bool, optional): Whether to print only widgets that are instances of BECWidget.
            show_parent(bool, optional): Whether to display which BECWidget is the parent of each discovered BECWidget.
        """
-        from bec_widgets.utils import BECConnector
+        from bec_widgets.utils.bec_connector import BECConnector
        from bec_widgets.widgets.plots.waveform.waveform import Waveform

        for node in WidgetHierarchy.iter_widget_tree(
@@ -468,7 +468,7 @@ class WidgetHierarchy:

        from qtpy.QtWidgets import QApplication

-        from bec_widgets.utils import BECConnector
+        from bec_widgets.utils.bec_connector import BECConnector
        from bec_widgets.widgets.plots.plot_base import PlotBase

        # 1) Gather ALL QWidget-based BECConnector objects
@@ -534,7 +534,7 @@ class WidgetHierarchy:
        Returns:
            The nearest ancestor that is a BECConnector, or None if not found.
        """
-        from bec_widgets.utils import BECConnector
+        from bec_widgets.utils.bec_connector import BECConnector

        # Guard against deleted/invalid Qt wrappers
        if not shb.isValid(widget):
@@ -636,7 +636,7 @@ class WidgetHierarchy:
        Return all BECConnector instances whose closest BECConnector ancestor is the given widget,
        including the widget itself if it is a BECConnector.
        """
-        from bec_widgets.utils import BECConnector
+        from bec_widgets.utils.bec_connector import BECConnector

        connectors: list[BECConnector] = []
        if isinstance(widget, BECConnector):
@@ -664,7 +664,7 @@ class WidgetHierarchy:
            return None

        try:
-            from bec_widgets.utils import BECConnector  # local import to avoid cycles
+            from bec_widgets.utils.bec_connector import BECConnector  # local import to avoid cycles

            is_bec_target = False
            if isinstance(ancestor_class, str):
@@ -21,7 +21,7 @@ import bec_widgets.widgets.containers.qt_ads as QtAds
 from bec_widgets import BECWidget, SafeProperty, SafeSlot
 from bec_widgets.applications.views.view import ViewTourSteps
 from bec_widgets.cli.rpc.rpc_widget_handler import widget_handler
-from bec_widgets.utils import BECDispatcher
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.rpc_decorator import rpc_timeout
 from bec_widgets.utils.toolbars.actions import (
@@ -68,8 +68,8 @@ from bec_widgets.widgets.containers.dock_area.toolbar_components.workspace_actio
 from bec_widgets.widgets.containers.main_window.main_window import BECMainWindowNoRPC
 from bec_widgets.widgets.containers.qt_ads import CDockWidget
 from bec_widgets.widgets.control.device_control.positioner_box import PositionerBox, PositionerBox2D
-from bec_widgets.widgets.control.scan_control import ScanControl
-from bec_widgets.widgets.editors.web_console.web_console import BECShell, WebConsole
+from bec_widgets.widgets.control.scan_control.scan_control import ScanControl
+from bec_widgets.widgets.editors.bec_console.bec_console import BecConsole, BECShell
 from bec_widgets.widgets.plots.heatmap.heatmap import Heatmap
 from bec_widgets.widgets.plots.image.image import Image
 from bec_widgets.widgets.plots.motor_map.motor_map import MotorMap
@@ -372,7 +372,7 @@ class BECDockArea(DockAreaWidget):
                "Add Circular ProgressBar",
                "RingProgressBar",
            ),
-            "terminal": (WebConsole.ICON_NAME, "Add Terminal", "WebConsole"),
+            "terminal": (BecConsole.ICON_NAME, "Add Terminal", "BecConsole"),
            "bec_shell": (BECShell.ICON_NAME, "Add BEC Shell", "BECShell"),
            "log_panel": (LogPanel.ICON_NAME, "Add LogPanel - Disabled", "LogPanel"),
            "sbb_monitor": ("train", "Add SBB Monitor", "SBBMonitor"),
@@ -63,7 +63,7 @@ class ScriptTreeWidget(QWidget):
        layout.setSpacing(0)

        # Create tree view
-        self.tree = QTreeView()
+        self.tree = QTreeView(parent=self)
        self.tree.setHeaderHidden(True)
        self.tree.setRootIsDecorated(True)

@@ -71,12 +71,12 @@ class ScriptTreeWidget(QWidget):
        self.tree.setMouseTracking(True)

        # Create file system model
-        self.model = QFileSystemModel()
+        self.model = QFileSystemModel(parent=self)
        self.model.setNameFilters(["*.py"])
        self.model.setNameFilterDisables(False)

        # Create proxy model to filter out underscore directories
-        self.proxy_model = QSortFilterProxyModel()
+        self.proxy_model = QSortFilterProxyModel(parent=self)
        self.proxy_model.setFilterRegularExpression(QRegularExpression("^[^_].*"))
        self.proxy_model.setSourceModel(self.model)
        self.tree.setModel(self.proxy_model)
@@ -1,27 +1,83 @@
 import sys

+from qtpy import QtGui, QtWidgets
 from qtpy.QtCore import QPoint, Qt
-from qtpy.QtWidgets import QApplication, QHBoxLayout, QLabel, QProgressBar, QVBoxLayout, QWidget
+from qtpy.QtWidgets import (
+    QApplication,
+    QFrame,
+    QHBoxLayout,
+    QLabel,
+    QProgressBar,
+    QVBoxLayout,
+    QWidget,
+)


 class WidgetTooltip(QWidget):
    """Frameless, always-on-top window that behaves like a tooltip."""

    def __init__(self, content: QWidget) -> None:
-        super().__init__(None, Qt.ToolTip | Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint)
-        self.setAttribute(Qt.WA_ShowWithoutActivating)
+        super().__init__(
+            None,
+            Qt.WindowType.ToolTip
+            | Qt.WindowType.FramelessWindowHint
+            | Qt.WindowType.WindowStaysOnTopHint,
+        )
+        self.setAttribute(Qt.WidgetAttribute.WA_ShowWithoutActivating)
+        self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
        self.setMouseTracking(True)
        self.content = content

        layout = QVBoxLayout(self)
-        layout.setContentsMargins(6, 6, 6, 6)
-        layout.addWidget(self.content)
+        layout.setContentsMargins(14, 14, 14, 14)
+
+        self._card = QFrame(self)
+        self._card.setObjectName("WidgetTooltipCard")
+        card_layout = QVBoxLayout(self._card)
+        card_layout.setContentsMargins(12, 10, 12, 10)
+        card_layout.addWidget(self.content)
+
+        shadow = QtWidgets.QGraphicsDropShadowEffect(self._card)
+        shadow.setBlurRadius(18)
+        shadow.setOffset(0, 2)
+        shadow.setColor(QtGui.QColor(0, 0, 0, 140))
+        self._card.setGraphicsEffect(shadow)
+
+        layout.addWidget(self._card)
+        self.apply_theme()
        self.adjustSize()

    def leaveEvent(self, _event) -> None:
        self.hide()

+    def apply_theme(self) -> None:
+        palette = QApplication.palette()
+        base = palette.color(QtGui.QPalette.ColorRole.Base)
+        text = palette.color(QtGui.QPalette.ColorRole.Text)
+        border = palette.color(QtGui.QPalette.ColorRole.Mid)
+        background = QtGui.QColor(base)
+        background.setAlpha(242)
+        self._card.setStyleSheet(f"""
+            QFrame#WidgetTooltipCard {{
+                background: {background.name(QtGui.QColor.NameFormat.HexArgb)};
+                border: 1px solid {border.name()};
+                border-radius: 12px;
+            }}
+            QFrame#WidgetTooltipCard QLabel {{
+                color: {text.name()};
+                background: transparent;
+            }}
+            """)
+
    def show_above(self, global_pos: QPoint, offset: int = 8) -> None:
+        """
+        Show the tooltip above a global position, adjusting to stay within screen bounds.
+
+        Args:
+            global_pos(QPoint): The global position to show above.
+            offset(int, optional): The vertical offset from the global position. Defaults to 8 pixels.
+        """
+        self.apply_theme()
        self.adjustSize()
        screen = QApplication.screenAt(global_pos) or QApplication.primaryScreen()
        screen_geo = screen.availableGeometry()
@@ -30,11 +86,43 @@ class WidgetTooltip(QWidget):
        x = global_pos.x() - geom.width() // 2
        y = global_pos.y() - geom.height() - offset

+        self._navigate_screen_coordinates(screen_geo, geom, x, y)
+
+    def show_near(self, global_pos: QPoint, offset: QPoint | None = None) -> None:
+        """
+        Show the tooltip near a global position, adjusting to stay within screen bounds.
+        By default, it will try to show below and to the right of the position,
+        but if that would cause it to go off-screen, it will flip to the other side.
+
+        Args:
+            global_pos(QPoint): The global position to show near.
+            offset(QPoint, optional): The offset from the global position. Defaults to QPoint(12, 16).
+        """
+
+        self.apply_theme()
+        self.adjustSize()
+        offset = offset or QPoint(12, 16)
+        screen = QApplication.screenAt(global_pos) or QApplication.primaryScreen()
+        screen_geo = screen.availableGeometry()
+        geom = self.geometry()
+
+        x = global_pos.x() + offset.x()
+        y = global_pos.y() + offset.y()
+
+        if x + geom.width() > screen_geo.right():
+            x = global_pos.x() - geom.width() - abs(offset.x())
+        if y + geom.height() > screen_geo.bottom():
+            y = global_pos.y() - geom.height() - abs(offset.y())
+
+        self._navigate_screen_coordinates(screen_geo, geom, x, y)
+
+    def _navigate_screen_coordinates(self, screen_geo, geom, x, y):
        x = max(screen_geo.left(), min(x, screen_geo.right() - geom.width()))
        y = max(screen_geo.top(), min(y, screen_geo.bottom() - geom.height()))

        self.move(x, y)
        self.show()
+        self.raise_()


 class HoverWidget(QWidget):
@@ -28,7 +28,7 @@ from qtpy.QtCore import QObject, QTimer
 from qtpy.QtWidgets import QApplication, QFrame, QMainWindow, QScrollArea, QWidget

 from bec_widgets import SafeProperty, SafeSlot
-from bec_widgets.utils import BECConnector
+from bec_widgets.utils.bec_connector import BECConnector
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.widget_io import WidgetIO

@@ -18,10 +18,10 @@ from qtpy.QtWidgets import (
 )

 import bec_widgets
-from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.error_popups import SafeSlot
+from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.widgets.containers.main_window.addons.hover_widget import HoverWidget
 from bec_widgets.widgets.containers.main_window.addons.notification_center.notification_banner import (
    BECNotificationBroker,
@@ -1 +1,4 @@
 from PySide6QtAds import *
+
+CDockManager.setConfigFlag(CDockManager.eConfigFlag.FocusHighlighting, True)
+CDockManager.setConfigFlag(CDockManager.eConfigFlag.RetainTabSizeWhenCloseButtonHidden, True)
@@ -1,3 +0,0 @@
-from .positioner_box_base import PositionerBoxBase
-
-__ALL__ = ["PositionerBoxBase"]
@@ -11,12 +11,12 @@ from qtpy.QtCore import Qt, Signal
 from qtpy.QtGui import QDoubleValidator
 from qtpy.QtWidgets import QDoubleSpinBox

-from bec_widgets.utils import UILoader
 from bec_widgets.utils.colors import apply_theme, get_accent_colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-from bec_widgets.widgets.control.device_control.positioner_box._base import PositionerBoxBase
-from bec_widgets.widgets.control.device_control.positioner_box._base.positioner_box_base import (
+from bec_widgets.utils.ui_loader import UILoader
+from bec_widgets.widgets.control.device_control.positioner_box.positioner_box_base import (
    DeviceUpdateUIComponents,
+    PositionerBoxBase,
 )

 logger = bec_logger.logger
@@ -63,10 +63,10 @@ class PositionerBox(PositionerBoxBase):

        self.ui = UILoader(self).loader(os.path.join(self.current_path, self.ui_file))

-        self.addWidget(self.ui)
-        self.layout.setSpacing(0)
-        self.layout.setContentsMargins(0, 0, 0, 0)
-        self.layout.setAlignment(Qt.AlignmentFlag.AlignVCenter | Qt.AlignmentFlag.AlignHCenter)
+        self.main_layout.addWidget(self.ui)
+        self.main_layout.setSpacing(0)
+        self.main_layout.setContentsMargins(0, 0, 0, 0)
+        self.main_layout.setAlignment(Qt.AlignmentFlag.AlignVCenter | Qt.AlignmentFlag.AlignHCenter)
        ui_min_size = self.ui.minimumSize()
        ui_min_hint = self.ui.minimumSizeHint()
        self.setMinimumSize(
@@ -115,8 +115,6 @@ class PositionerBox(PositionerBoxBase):
            return
        old_device = self._device
        self._device = value
-        if not self.label:
-            self.label = value
        self.device_changed.emit(old_device, value)

    @SafeProperty(bool)
@@ -12,12 +12,12 @@ from qtpy.QtCore import Signal
 from qtpy.QtGui import QDoubleValidator
 from qtpy.QtWidgets import QDoubleSpinBox

-from bec_widgets.utils import UILoader
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-from bec_widgets.widgets.control.device_control.positioner_box._base import PositionerBoxBase
-from bec_widgets.widgets.control.device_control.positioner_box._base.positioner_box_base import (
+from bec_widgets.utils.ui_loader import UILoader
+from bec_widgets.widgets.control.device_control.positioner_box.positioner_box_base import (
    DeviceUpdateUIComponents,
+    PositionerBoxBase,
 )

 logger = bec_logger.logger
@@ -96,9 +96,9 @@ class PositionerBox2D(PositionerBoxBase):

    def connect_ui(self):
        """Connect the UI components to signals, data, or routines"""
-        self.addWidget(self.ui)
-        self.layout.setSpacing(0)
-        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.main_layout.addWidget(self.ui)
+        self.main_layout.setSpacing(0)
+        self.main_layout.setContentsMargins(0, 0, 0, 0)

        def _init_ui(val: QDoubleValidator, device_id: DeviceId):
            ui = self._device_ui_components_hv(device_id)
@@ -200,7 +200,6 @@ class PositionerBox2D(PositionerBoxBase):
            return
        old_device = self._device_hor
        self._device_hor = value
-        self.label = f"{self._device_hor}, {self._device_ver}"
        self.device_changed_hor.emit(old_device, value)
        self._init_device(self.device_hor, self.position_update_hor.emit, self.update_limits_hor)

@@ -220,7 +219,6 @@ class PositionerBox2D(PositionerBoxBase):
            return
        old_device = self._device_ver
        self._device_ver = value
-        self.label = f"{self._device_hor}, {self._device_ver}"
        self.device_changed_ver.emit(old_device, value)
        self._init_device(self.device_ver, self.position_update_ver.emit, self.update_limits_ver)

@@ -14,10 +14,10 @@ from qtpy.QtWidgets import (
    QLineEdit,
    QPushButton,
    QVBoxLayout,
+    QWidget,
 )

 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.compact_popup import CompactPopupWidget
 from bec_widgets.widgets.control.device_control.position_indicator.position_indicator import (
    PositionIndicator,
 )
@@ -43,7 +43,7 @@ class DeviceUpdateUIComponents(TypedDict):
    units: QLabel


-class PositionerBoxBase(BECWidget, CompactPopupWidget):
+class PositionerBoxBase(BECWidget, QWidget):
    """Contains some core logic for positioner box widgets"""

    current_path = ""
@@ -57,7 +57,10 @@ class PositionerBoxBase(BECWidget, CompactPopupWidget):
            parent: The parent widget.
            device (Positioner): The device to control.
        """
-        super().__init__(parent=parent, layout=QVBoxLayout, **kwargs)
+        super().__init__(parent=parent, **kwargs)
+        self.main_layout = QVBoxLayout(self)
+        self.main_layout.setContentsMargins(0, 0, 0, 0)
+        self.main_layout.setSpacing(0)
        self._dialog = None
        self.get_bec_shortcuts()

@@ -173,11 +176,9 @@ class PositionerBoxBase(BECWidget, CompactPopupWidget):
            if is_moving:
                spinner.start()
                spinner.setToolTip("Device is moving")
-                self.set_global_state("warning")
            else:
                spinner.stop()
                spinner.setToolTip("Device is idle")
-                self.set_global_state("success")
        else:
            spinner.setVisible(False)

@@ -196,9 +197,8 @@ class PositionerBoxBase(BECWidget, CompactPopupWidget):
            pos = (readback_val - limits[0]) / (limits[1] - limits[0])
            position_indicator.set_value(pos)

-    def _update_limits_ui(
-        self, limits: tuple[float, float], position_indicator, setpoint_validator
-    ):
+    @staticmethod
+    def _update_limits_ui(limits: tuple[float, float], position_indicator, setpoint_validator):
        if limits is not None and limits[0] != limits[1]:
            position_indicator.setToolTip(f"Min: {limits[0]}, Max: {limits[1]}")
            setpoint_validator.setRange(limits[0], limits[1])
@@ -223,8 +223,9 @@ class PositionerBoxBase(BECWidget, CompactPopupWidget):
        self.bec_dispatcher.disconnect_slot(slot, MessageEndpoints.device_readback(old_device))
        self.bec_dispatcher.connect_slot(slot, MessageEndpoints.device_readback(new_device))

-    def _toggle_enable_buttons(self, ui: DeviceUpdateUIComponents, enable: bool) -> None:
-        """Toogle enable/disable on available buttons
+    @staticmethod
+    def _toggle_enable_buttons(ui: DeviceUpdateUIComponents, enable: bool) -> None:
+        """Toggle enable/disable on available buttons

        Args:
            enable (bool): Enable buttons
@@ -1,6 +1,8 @@
 import os

 from bec_lib.device import Positioner
+from qtpy.QtCore import Qt
+from qtpy.QtWidgets import QSizePolicy

 from bec_widgets.widgets.control.device_control.positioner_box import PositionerBox

@@ -22,7 +24,82 @@ class PositionerControlLine(PositionerBox):
            device (Positioner): The device to control.
        """
        self.current_path = os.path.dirname(__file__)
+        self._indicator_switch_width = 0
+        self._horizontal_indicator_width = 0
+        self._vertical_indicator_width = 15
+        self._indicator_thickness = 10
+        self._indicator_is_horizontal = False
+        self._line_height = self.dimensions[0]
        super().__init__(parent=parent, device=device, *args, **kwargs)
+        self._configure_line_layout()
+        self._update_indicator_orientation()
+
+    def _configure_line_layout(self):
+        device_box = self.ui.device_box
+        indicator = self.ui.position_indicator
+
+        self.main_layout.setAlignment(Qt.AlignmentFlag(0))
+        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
+        self.ui.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
+        device_box.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
+
+        self._line_height = max(
+            self.dimensions[0],
+            self.ui.minimumSizeHint().height(),
+            self.ui.sizeHint().height(),
+            device_box.minimumSizeHint().height(),
+            device_box.sizeHint().height(),
+        )
+        device_box.setFixedHeight(self._line_height)
+        device_box.setMinimumWidth(self.dimensions[1])
+        device_box.setMaximumWidth(16777215)
+        self.setFixedHeight(self._line_height)
+        self.setMinimumWidth(self.dimensions[1])
+
+        self.ui.verticalLayout.setContentsMargins(0, 0, 0, 0)
+        self.ui.verticalLayout.setSpacing(0)
+        self.ui.readback.setMaximumWidth(16777215)
+        self.ui.setpoint.setMaximumWidth(16777215)
+        self.ui.step_size.setMaximumWidth(16777215)
+
+        indicator_hint = indicator.minimumSizeHint()
+        step_hint = self.ui.step_size.sizeHint()
+        self._indicator_thickness = max(indicator_hint.height(), 10)
+        self._vertical_indicator_width = max(indicator.minimumWidth(), 15)
+        self._horizontal_indicator_width = max(90, step_hint.width())
+        base_width = max(device_box.minimumSizeHint().width(), self.dimensions[1])
+        self._indicator_switch_width = (
+            base_width - self._vertical_indicator_width + self._horizontal_indicator_width
+        )
+
+    def resizeEvent(self, event):
+        super().resizeEvent(event)
+        self._update_indicator_orientation()
+
+    def _update_indicator_orientation(self):
+        if not hasattr(self, "ui"):
+            return
+
+        indicator = self.ui.position_indicator
+        available_width = self.ui.device_box.width() or self.width() or self.dimensions[1]
+        should_use_horizontal = available_width >= self._indicator_switch_width
+        if should_use_horizontal == self._indicator_is_horizontal:
+            return
+
+        self._indicator_is_horizontal = should_use_horizontal
+        indicator.vertical = not should_use_horizontal
+
+        if should_use_horizontal:
+            indicator.setMinimumSize(self._horizontal_indicator_width, self._indicator_thickness)
+            indicator.setMaximumHeight(self._indicator_thickness)
+            indicator.setMaximumWidth(16777215)
+            indicator.setSizePolicy(QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Fixed)
+        else:
+            indicator.setMinimumSize(self._vertical_indicator_width, self._indicator_thickness)
+            indicator.setMaximumSize(self._vertical_indicator_width, 16777215)
+            indicator.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
+
+        indicator.updateGeometry()


 if __name__ == "__main__":  # pragma: no cover
@@ -2,12 +2,18 @@
 <ui version="4.0">
 <class>Form</class>
 <widget class="QWidget" name="Form">
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
  <property name="geometry">
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>612</width>
-    <height>91</height>
+    <width>592</width>
+    <height>76</height>
   </rect>
  </property>
  <property name="minimumSize">
@@ -26,8 +32,29 @@
   <string>Form</string>
  </property>
  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
   <item>
    <widget class="QGroupBox" name="device_box">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
     <property name="title">
      <string>Device Name</string>
     </property>
@@ -227,12 +254,12 @@
 <customwidgets>
  <customwidget>
   <class>PositionIndicator</class>
-   <extends>QWidget</extends>
+   <extends></extends>
   <header>position_indicator</header>
  </customwidget>
  <customwidget>
   <class>SpinnerWidget</class>
-   <extends>QWidget</extends>
+   <extends></extends>
   <header>spinner_widget</header>
  </customwidget>
 </customwidgets>
@@ -27,30 +27,13 @@ class PositionerGroupBox(QGroupBox):
        self.layout().setContentsMargins(0, 0, 0, 0)
        self.layout().setSpacing(0)
        self.widget = PositionerBox(self, dev_name)
-        self.widget.compact_view = True
-        self.widget.expand_popup = False
        self.layout().addWidget(self.widget)
        self.widget.position_update.connect(self._on_position_update)
-        self.widget.expand.connect(self._on_expand)
        self.setTitle(self.device_name)
        self.widget.force_update_readback()

-    def _on_expand(self, expand):
-        if expand:
-            self.setTitle("")
-            self.setFlat(True)
-        else:
-            self.setTitle(self.device_name)
-            self.setFlat(False)
-
    def _on_position_update(self, pos: float):
        self.position_update.emit(pos)
-        precision = getattr(self.widget.dev[self.widget.device], "precision", 8)
-        try:
-            precision = int(precision)
-        except (TypeError, ValueError):
-            precision = int(8)
-        self.widget.label = f"{pos:.{precision}f}"

    def close(self):
        self.widget.close()
@@ -7,7 +7,7 @@ from bec_lib.device import Signal as BECSignal
 from bec_lib.logger import bec_logger
 from pydantic import field_validator

-from bec_widgets.utils import ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.filter_io import FilterIO
@@ -3,7 +3,7 @@ from bec_lib.device import Signal
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import Property

-from bec_widgets.utils import ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.filter_io import FilterIO
@@ -1 +0,0 @@
-from .components import DeviceTable, DMConfigView, DocstringView, OphydValidation
@@ -1,5 +0,0 @@
-# from .device_table_view import DeviceTableView
-from .device_table.device_table import DeviceTable
-from .dm_config_view import DMConfigView
-from .dm_docstring_view import DocstringView, docstring_to_markdown
-from .ophyd_validation.ophyd_validation import OphydValidation
@@ -1,3 +0,0 @@
-from .available_device_resources import AvailableDeviceResources
-
-__all__ = ["AvailableDeviceResources"]
@@ -13,7 +13,7 @@ if TYPE_CHECKING:
    from .available_device_group import AvailableDeviceGroup


-class _DeviceListWiget(QListWidget):
+class _DeviceListWidget(QListWidget):

    def _item_iter(self):
        return (self.item(i) for i in range(self.count()))
@@ -44,7 +44,7 @@ class Ui_AvailableDeviceGroup(object):
        self.n_included.setObjectName("n_included")
        title_layout.addWidget(self.n_included)

-        self.device_list = _DeviceListWiget(AvailableDeviceGroup)
+        self.device_list = _DeviceListWidget(AvailableDeviceGroup)
        self.device_list.setSelectionMode(QListWidget.SelectionMode.ExtendedSelection)
        self.device_list.setObjectName("device_list")
        self.device_list.setFrameStyle(0)
@@ -34,13 +34,13 @@ class HashModel(str, Enum):
 class DeviceResourceBackend(Protocol):
    @property
    def tag_groups(self) -> dict[str, set[HashableDevice]]:
-        """A dictionary of all availble devices separated by tag groups. The same device may
+        """A dictionary of all available devices separated by tag groups. The same device may
        appear more than once (in different groups)."""
        ...

    @property
    def all_devices(self) -> set[HashableDevice]:
-        """A set of all availble devices. The same device may not appear more than once."""
+        """A set of all available devices. The same device may not appear more than once."""
        ...

    @property
@@ -5,9 +5,8 @@ in DeviceTableRow entries.

 from __future__ import annotations

-import traceback
 from copy import deepcopy
-from typing import TYPE_CHECKING, Any, Callable, Iterable, Literal, Tuple
+from typing import TYPE_CHECKING, Any, Callable, Iterable, Tuple

 from bec_lib.atlas_models import Device as DeviceModel
 from bec_lib.callback_handler import EventType
@@ -19,10 +18,11 @@ from thefuzz import fuzz
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import get_accent_colors
 from bec_widgets.utils.error_popups import SafeSlot
+from bec_widgets.utils.fuzzy_search import is_match
 from bec_widgets.widgets.control.device_manager.components.device_table.device_table_row import (
    DeviceTableRow,
 )
-from bec_widgets.widgets.control.device_manager.components.ophyd_validation import (
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation_utils import (
    ConfigStatus,
    ConnectionStatus,
    get_validation_icons,
@@ -37,34 +37,6 @@ _DeviceCfgIter = Iterable[dict[str, Any]]
 # DeviceValidationResult: device_config, config_status, connection_status, error_message
 _ValidationResultIter = Iterable[Tuple[dict[str, Any], ConfigStatus, ConnectionStatus, str]]

-FUZZY_SEARCH_THRESHOLD = 80
-
-
-def is_match(
-    text: str, row_data: dict[str, Any], relevant_keys: list[str], enable_fuzzy: bool
-) -> bool:
-    """
-    Check if the text matches any of the relevant keys in the row data.
-
-    Args:
-        text (str): The text to search for.
-        row_data (dict[str, Any]): The row data to search in.
-        relevant_keys (list[str]): The keys to consider for searching.
-        enable_fuzzy (bool): Whether to use fuzzy matching.
-    Returns:
-        bool: True if a match is found, False otherwise.
-    """
-    for key in relevant_keys:
-        data = str(row_data.get(key, "") or "")
-        if enable_fuzzy:
-            match_ratio = fuzz.partial_ratio(text.lower(), data.lower())
-            if match_ratio >= FUZZY_SEARCH_THRESHOLD:
-                return True
-        else:
-            if text.lower() in data.lower():
-                return True
-    return False
-

 class TableSortOnHold:
    """Context manager for putting table sorting on hold. Works with nested calls."""
@@ -2,7 +2,7 @@

 from bec_lib.atlas_models import Device as DeviceModel

-from bec_widgets.widgets.control.device_manager.components.ophyd_validation import (
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation_utils import (
    ConfigStatus,
    ConnectionStatus,
 )
@@ -1,8 +0,0 @@
-from .ophyd_validation_utils import (
-    ConfigStatus,
-    ConnectionStatus,
-    DeviceTestModel,
-    format_error_to_md,
-    get_validation_icons,
-)
-from .validation_list_item import ValidationButton, ValidationListItem
@@ -22,15 +22,17 @@ from bec_widgets.utils.bec_list import BECList
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import get_accent_colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-from bec_widgets.widgets.control.device_manager.components.ophyd_validation import (
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation_utils import (
    ConfigStatus,
    ConnectionStatus,
    DeviceTestModel,
-    ValidationButton,
-    ValidationListItem,
    format_error_to_md,
    get_validation_icons,
 )
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.validation_list_item import (
+    ValidationButton,
+    ValidationListItem,
+)

 READY_TO_TEST = False

@@ -7,7 +7,7 @@ from qtpy import QtCore, QtGui, QtWidgets

 from bec_widgets.utils.colors import get_accent_colors
 from bec_widgets.utils.error_popups import SafeSlot
-from bec_widgets.widgets.control.device_manager.components.ophyd_validation import (
+from bec_widgets.widgets.control.device_manager.components.ophyd_validation.ophyd_validation_utils import (
    ConfigStatus,
    ConnectionStatus,
    DeviceTestModel,
@@ -1 +0,0 @@
-from .scan_control import ScanControl
@@ -19,7 +19,7 @@ from qtpy.QtWidgets import (
    QWidget,
 )

-from bec_widgets.utils import ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import apply_theme, get_accent_colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
@@ -347,14 +347,14 @@ class ScanGroupBox(QGroupBox):

    def get_parameters(self, device_object: bool = True):
        """
-        Returns the parameters from the widgets in the scan control layout formated to run scan from BEC.
+        Returns the parameters from the widgets in the scan control layout formatted to run scan from BEC.
        """
        if self.box_type == "args":
-            return self._get_arg_parameterts(device_object=device_object)
+            return self._get_arg_parameters(device_object=device_object)
        elif self.box_type == "kwargs":
            return self._get_kwarg_parameters(device_object=device_object)

-    def _get_arg_parameterts(self, device_object: bool = True):
+    def _get_arg_parameters(self, device_object: bool = True):
        args = []
        for i in range(1, self.layout.rowCount()):
            for j in range(self.layout.columnCount()):
@@ -2,22 +2,19 @@

 from bec_lib.logger import bec_logger
 from qtpy.QtCore import Property, Signal, Slot
-from qtpy.QtWidgets import QComboBox, QVBoxLayout, QWidget
+from qtpy.QtWidgets import QComboBox

 from bec_widgets.utils.bec_widget import BECWidget

 logger = bec_logger.logger


-class DapComboBox(BECWidget, QWidget):
+class DapComboBox(BECWidget, QComboBox):
    """
-    The DAPComboBox widget is an extension to the QComboBox with all avaialble DAP model from BEC.
+    Editable combobox listing the available DAP models.

-    Args:
-        parent: Parent widget.
-        client: BEC client object.
-        gui_id: GUI ID.
-        default: Default device name.
+    The widget behaves as a plain QComboBox and keeps ``fit_model_combobox`` as an alias to itself
+    for backwards compatibility with older call sites.
    """

    ICON_NAME = "data_exploration"
@@ -45,19 +42,20 @@ class DapComboBox(BECWidget, QWidget):
        **kwargs,
    ):
        super().__init__(parent=parent, client=client, gui_id=gui_id, **kwargs)
-        self.layout = QVBoxLayout(self)
-        self.fit_model_combobox = QComboBox(self)
-        self.layout.addWidget(self.fit_model_combobox)
-        self.layout.setContentsMargins(0, 0, 0, 0)
-        self._available_models = None
+        self.fit_model_combobox = self  # Just for backwards compatibility with older call sites, the widget itself is the combobox
+        self._available_models: list[str] = []
        self._x_axis = None
        self._y_axis = None
-        self.populate_fit_model_combobox()
-        self.fit_model_combobox.currentTextChanged.connect(self._update_current_fit)
-        # Set default fit model
-        self.select_default_fit(default_fit)
+        self._is_valid_input = False

-    def select_default_fit(self, default_fit: str | None):
+        self.setEditable(True)
+
+        self.populate_fit_model_combobox()
+        self.currentTextChanged.connect(self._on_text_changed)
+        self.select_default_fit(default_fit)
+        self.check_validity(self.currentText())
+
+    def select_default_fit(self, default_fit: str | None = "GaussianModel"):
        """Set the default fit model.

        Args:
@@ -65,8 +63,8 @@ class DapComboBox(BECWidget, QWidget):
        """
        if self._validate_dap_model(default_fit):
            self.select_fit_model(default_fit)
-        else:
-            self.select_fit_model("GaussianModel")
+        elif self.available_models:
+            self.select_fit_model(self.available_models[0])

    @property
    def available_models(self):
@@ -114,12 +112,40 @@ class DapComboBox(BECWidget, QWidget):
        self._y_axis = y_axis
        self.y_axis_updated.emit(y_axis)

-    def _update_current_fit(self, fit_name: str):
-        """Update the current fit."""
+    @Slot(str)
+    def _on_text_changed(self, fit_name: str):
+        """
+        Validate and emit updates for the current text.
+
+        Args:
+            fit_name(str): The current text in the combobox, representing the selected fit model.
+        """
+        self.check_validity(fit_name)
+        if not self._is_valid_input:
+            return
+
        self.fit_model_updated.emit(fit_name)
        if self.x_axis is not None and self.y_axis is not None:
            self.new_dap_config.emit(self._x_axis, self._y_axis, fit_name)

+    @Slot(str)
+    def check_validity(self, fit_name: str):
+        """
+        Highlight invalid manual entries similarly to DeviceComboBox.
+
+        Args:
+            fit_name(str): The current text in the combobox, representing the selected fit model.
+        """
+        if self._validate_dap_model(fit_name):
+            self._is_valid_input = True
+            self.setStyleSheet("border: 1px solid transparent;")
+        else:
+            self._is_valid_input = False
+            if self.isEnabled():
+                self.setStyleSheet("border: 1px solid red;")
+            else:
+                self.setStyleSheet("border: 1px solid transparent;")
+
    @Slot(str)
    def select_x_axis(self, x_axis: str):
        """Slot to update the x axis.
@@ -128,7 +154,7 @@ class DapComboBox(BECWidget, QWidget):
            x_axis(str): X axis.
        """
        self.x_axis = x_axis
-        self._update_current_fit(self.fit_model_combobox.currentText())
+        self._on_text_changed(self.currentText())

    @Slot(str)
    def select_y_axis(self, y_axis: str):
@@ -138,25 +164,26 @@ class DapComboBox(BECWidget, QWidget):
            y_axis(str): Y axis.
        """
        self.y_axis = y_axis
-        self._update_current_fit(self.fit_model_combobox.currentText())
+        self._on_text_changed(self.currentText())

    @Slot(str)
    def select_fit_model(self, fit_name: str | None):
        """Slot to update the fit model.

        Args:
-            default_device(str): Default device name.
+            fit_name(str): Fit model name.
        """
        if not self._validate_dap_model(fit_name):
            raise ValueError(f"Fit {fit_name} is not valid.")
-        self.fit_model_combobox.setCurrentText(fit_name)
+        self.setCurrentText(fit_name)

    def populate_fit_model_combobox(self):
        """Populate the fit_model_combobox with the devices."""
        # pylint: disable=protected-access
-        self.available_models = [model for model in self.client.dap._available_dap_plugins.keys()]
-        self.fit_model_combobox.clear()
-        self.fit_model_combobox.addItems(self.available_models)
+        available_plugins = getattr(getattr(self.client, "dap", None), "_available_dap_plugins", {})
+        self.available_models = [model for model in available_plugins.keys()]
+        self.clear()
+        self.addItems(self.available_models)

    def _validate_dap_model(self, model: str | None) -> bool:
        """Validate the DAP model.
@@ -166,23 +193,23 @@ class DapComboBox(BECWidget, QWidget):
        """
        if model is None:
            return False
-        if model not in self.available_models:
-            return False
-        return True
+        return model in self.available_models
+
+    @property
+    def is_valid_input(self) -> bool:
+        """Whether the current text matches an available DAP model."""
+        return self._is_valid_input


 if __name__ == "__main__":  # pragma: no cover
-    # pylint: disable=import-outside-toplevel
+    import sys
+
    from qtpy.QtWidgets import QApplication

    from bec_widgets.utils.colors import apply_theme

-    app = QApplication([])
+    app = QApplication(sys.argv)
    apply_theme("dark")
-    widget = QWidget()
-    widget.setFixedSize(200, 200)
-    layout = QVBoxLayout()
-    widget.setLayout(layout)
-    layout.addWidget(DapComboBox())
-    widget.show()
-    app.exec_()
+    dialog = DapComboBox()
+    dialog.show()
+    sys.exit(app.exec_())
@@ -1,13 +1,14 @@
 import os

+import shiboken6
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import Signal
-from qtpy.QtWidgets import QPushButton, QTreeWidgetItem, QVBoxLayout, QWidget
+from qtpy.QtWidgets import QPushButton, QSizePolicy, QTreeWidgetItem, QVBoxLayout, QWidget

-from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import get_accent_colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
+from bec_widgets.utils.ui_loader import UILoader

 logger = bec_logger.logger

@@ -34,7 +35,7 @@ class LMFitDialog(BECWidget, QWidget):
        **kwargs,
    ):
        """
-        Initialises the LMFitDialog widget.
+        Initializes the LMFitDialog widget.

        Args:
            parent (QWidget): The parent widget.
@@ -68,6 +69,27 @@ class LMFitDialog(BECWidget, QWidget):
        self._hide_curve_selection = False
        self._hide_summary = False
        self._hide_parameters = False
+        self._configure_embedded_size_policy()
+
+    def _configure_embedded_size_policy(self):
+        """Allow the compact dialog to shrink more gracefully in embedded layouts."""
+        if self._ui_file != "lmfit_dialog_compact.ui":
+            return
+
+        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
+        self.ui.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
+
+        for group in (
+            self.ui.group_curve_selection,
+            self.ui.group_summary,
+            self.ui.group_parameters,
+        ):
+            group.setMinimumHeight(0)
+            group.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
+
+        for view in (self.ui.curve_list, self.ui.summary_tree, self.ui.param_tree):
+            view.setMinimumHeight(0)
+            view.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Ignored)

    @property
    def enable_actions(self) -> bool:
@@ -77,8 +99,14 @@ class LMFitDialog(BECWidget, QWidget):
    @enable_actions.setter
    def enable_actions(self, enable: bool):
        self._enable_actions = enable
-        for button in self.action_buttons.values():
+        valid_buttons = {}
+        for name, button in self.action_buttons.items():
+            # just to be sure we have a valid c++ object
+            if button is None or not shiboken6.isValid(button):
+                continue
            button.setEnabled(enable)
+            valid_buttons[name] = button
+        self.action_buttons = valid_buttons

    @SafeProperty(list)
    def active_action_list(self) -> list[str]:
@@ -89,16 +117,6 @@ class LMFitDialog(BECWidget, QWidget):
    def active_action_list(self, actions: list[str]):
        self._active_actions = actions

-    # This SafeSlot needed?
-    @SafeSlot(bool)
-    def set_actions_enabled(self, enable: bool) -> bool:
-        """SafeSlot to enable the move to buttons.
-
-        Args:
-            enable (bool): Whether to enable the action buttons.
-        """
-        self.enable_actions = enable
-
    @SafeProperty(bool)
    def always_show_latest(self):
        """SafeProperty to indicate if always the latest DAP update is displayed."""
@@ -154,19 +172,21 @@ class LMFitDialog(BECWidget, QWidget):
        self.ui.group_parameters.setVisible(not show)

    @property
-    def fit_curve_id(self) -> str:
+    def fit_curve_id(self) -> str | None:
        """SafeProperty for the currently displayed fit curve_id."""
        return self._fit_curve_id

    @fit_curve_id.setter
-    def fit_curve_id(self, curve_id: str):
+    def fit_curve_id(self, curve_id: str | None):
        """Setter for the currently displayed fit curve_id.

        Args:
-            fit_curve_id (str): The curve_id of the fit curve to be displayed.
+            curve_id (str | None): The curve_id of the fit curve to be displayed,
+                or None to clear the selection.
        """
        self._fit_curve_id = curve_id
-        self.selected_fit.emit(curve_id)
+        if curve_id is not None:
+            self.selected_fit.emit(curve_id)

    @SafeSlot(str)
    def remove_dap_data(self, curve_id: str):
@@ -176,6 +196,15 @@ class LMFitDialog(BECWidget, QWidget):
            curve_id (str): The curve_id of the DAP data to be removed.
        """
        self.summary_data.pop(curve_id, None)
+        if self.fit_curve_id == curve_id:
+            self.action_buttons = {}
+            self.ui.summary_tree.clear()
+            self.ui.param_tree.clear()
+            remaining = list(self.summary_data.keys())
+            if remaining:
+                self.fit_curve_id = remaining[0]
+            else:
+                self._fit_curve_id = None
        self.refresh_curve_list()

    @SafeSlot(str)
@@ -251,6 +280,7 @@ class LMFitDialog(BECWidget, QWidget):
            params (list): List of LMFit parameters for the fit curve.
        """
        self._move_buttons = []
+        self.action_buttons = {}
        self.ui.param_tree.clear()
        for param in params:
            param_name = param[0]
@@ -269,9 +299,9 @@ class LMFitDialog(BECWidget, QWidget):
            if param_name in self.active_action_list:  # pylint: disable=unsupported-membership-test
                # Create a push button to move the motor to a specific position
                widget = QWidget()
-                button = QPushButton(f"Move to {param_name}")
+                button = QPushButton("Move")
                button.clicked.connect(self._create_move_action(param_name, param[1]))
-                if self.enable_actions is True:
+                if self.enable_actions:
                    button.setEnabled(True)
                else:
                    button.setEnabled(False)
@@ -14,6 +14,18 @@
   <string>Form</string>
  </property>
  <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
   <item row="0" column="0">
    <widget class="QSplitter" name="splitter_2">
     <property name="sizePolicy">
@@ -22,15 +34,6 @@
       <verstretch>0</verstretch>
      </sizepolicy>
     </property>
-     <property name="frameShape">
-      <enum>QFrame::Shape::VLine</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Shadow::Plain</enum>
-     </property>
-     <property name="lineWidth">
-      <number>1</number>
-     </property>
     <property name="orientation">
      <enum>Qt::Orientation::Horizontal</enum>
     </property>
@@ -41,6 +44,12 @@
      <bool>true</bool>
     </property>
     <widget class="QGroupBox" name="group_curve_selection">
+      <property name="minimumSize">
+       <size>
+        <width>120</width>
+        <height>0</height>
+       </size>
+      </property>
      <property name="title">
       <string>Select Curve</string>
      </property>
@@ -58,18 +67,36 @@
       </sizepolicy>
      </property>
      <property name="orientation">
-       <enum>Qt::Orientation::Vertical</enum>
+       <enum>Qt::Orientation::Horizontal</enum>
      </property>
      <widget class="QGroupBox" name="group_summary">
+       <property name="minimumSize">
+        <size>
+         <width>180</width>
+         <height>0</height>
+        </size>
+       </property>
       <property name="title">
        <string>Fit Summary</string>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <widget class="QTreeWidget" name="summary_tree">
+          <property name="alternatingRowColors">
+           <bool>true</bool>
+          </property>
+             <property name="indentation">
+                 <number>0</number>
+             </property>
+             <property name="rootIsDecorated">
+                 <bool>false</bool>
+             </property>
          <property name="uniformRowHeights">
           <bool>false</bool>
          </property>
+          <attribute name="headerDefaultSectionSize">
+           <number>90</number>
+          </attribute>
          <column>
           <property name="text">
            <string>Property</string>
@@ -85,12 +112,33 @@
       </layout>
      </widget>
      <widget class="QGroupBox" name="group_parameters">
+       <property name="minimumSize">
+        <size>
+         <width>240</width>
+         <height>0</height>
+        </size>
+       </property>
       <property name="title">
        <string>Parameter Details</string>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <widget class="QTreeWidget" name="param_tree">
+          <property name="alternatingRowColors">
+           <bool>true</bool>
+          </property>
+             <property name="indentation">
+                 <number>0</number>
+             </property>
+             <property name="rootIsDecorated">
+                 <bool>false</bool>
+          </property>
+          <property name="columnCount">
+           <number>4</number>
+          </property>
+          <attribute name="headerDefaultSectionSize">
+           <number>80</number>
+          </attribute>
          <column>
           <property name="text">
            <string>Parameter</string>
@@ -106,6 +154,11 @@
            <string>Std</string>
           </property>
          </column>
+          <column>
+           <property name="text">
+            <string>Action</string>
+           </property>
+          </column>
         </widget>
        </item>
       </layout>
@@ -95,6 +95,12 @@
          <height>0</height>
         </size>
        </property>
+           <property name="indentation">
+               <number>0</number>
+           </property>
+           <property name="rootIsDecorated">
+               <bool>false</bool>
+           </property>
        <property name="uniformRowHeights">
         <bool>false</bool>
        </property>
@@ -147,6 +153,12 @@
          <width>0</width>
          <height>0</height>
         </size>
+        </property>
+           <property name="indentation">
+               <number>0</number>
+           </property>
+           <property name="rootIsDecorated">
+               <bool>false</bool>
        </property>
        <property name="columnCount">
         <number>4</number>
@@ -0,0 +1,605 @@
+from __future__ import annotations
+
+import enum
+from dataclasses import dataclass, field
+from uuid import uuid4
+from weakref import WeakValueDictionary
+
+import shiboken6
+from bec_lib.logger import bec_logger
+from qtpy.QtCore import Qt, Signal
+from qtpy.QtGui import QMouseEvent
+from qtpy.QtWidgets import (
+    QApplication,
+    QHBoxLayout,
+    QLabel,
+    QStackedLayout,
+    QTabWidget,
+    QVBoxLayout,
+    QWidget,
+)
+
+from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.widgets.utility.bec_term.protocol import BecTerminal
+from bec_widgets.widgets.utility.bec_term.util import get_current_bec_term_class
+
+logger = bec_logger.logger
+
+_BecTermClass = get_current_bec_term_class()
+
+# Note on definitions:
+# Terminal: an instance of a terminal widget with a system shell
+# Console: one of possibly several widgets which may share ownership of one single terminal
+# Shell: a Console set to start the BEC IPython client in its terminal
+
+
+class ConsoleMode(str, enum.Enum):
+    ACTIVE = "active"
+    INACTIVE = "inactive"
+    HIDDEN = "hidden"
+
+
+@dataclass
+class _TerminalOwnerInfo:
+    """Should be managed only by the BecConsoleRegistry. Consoles should ask the registry for
+    necessary ownership info."""
+
+    owner_console_id: str | None = None
+    registered_console_ids: set[str] = field(default_factory=set)
+    instance: BecTerminal | None = None
+    terminal_id: str = ""
+    initialized: bool = False
+    persist_session: bool = False
+    fallback_holder: QWidget | None = None
+
+
+class BecConsoleRegistry:
+    """
+    A registry for the BecConsole class to manage its instances.
+    """
+
+    def __init__(self):
+        """
+        Initialize the registry.
+        """
+        self._consoles: WeakValueDictionary[str, BecConsole] = WeakValueDictionary()
+        self._terminal_registry: dict[str, _TerminalOwnerInfo] = {}
+
+    @staticmethod
+    def _is_valid_qobject(obj: object | None) -> bool:
+        return obj is not None and shiboken6.isValid(obj)
+
+    def _connect_app_cleanup(self) -> None:
+        app = QApplication.instance()
+        if app is None:
+            return
+        app.aboutToQuit.connect(self.clear, Qt.ConnectionType.UniqueConnection)
+
+    @staticmethod
+    def _new_terminal_info(console: BecConsole) -> _TerminalOwnerInfo:
+        term = _BecTermClass()
+        return _TerminalOwnerInfo(
+            registered_console_ids={console.console_id},
+            owner_console_id=console.console_id,
+            instance=term,
+            terminal_id=console.terminal_id,
+            persist_session=console.persist_terminal_session,
+        )
+
+    @staticmethod
+    def _replace_terminal(info: _TerminalOwnerInfo, console: BecConsole) -> None:
+        info.instance = _BecTermClass()
+        info.initialized = False
+        info.owner_console_id = console.console_id
+        info.registered_console_ids.add(console.console_id)
+        info.persist_session = info.persist_session or console.persist_terminal_session
+
+    def _delete_terminal_info(self, info: _TerminalOwnerInfo) -> None:
+        if self._is_valid_qobject(info.instance):
+            info.instance.deleteLater()  # type: ignore[union-attr]
+        info.instance = None
+        if self._is_valid_qobject(info.fallback_holder):
+            info.fallback_holder.deleteLater()
+        info.fallback_holder = None
+
+    def _parking_parent(
+        self,
+        info: _TerminalOwnerInfo,
+        console: BecConsole | None = None,
+        *,
+        avoid_console: bool = False,
+    ) -> QWidget | None:
+        for console_id in info.registered_console_ids:
+            candidate = self._consoles.get(console_id)
+            if candidate is None or candidate is console:
+                continue
+            if self._is_valid_qobject(candidate):
+                return candidate._term_holder
+
+        if console is None or not self._is_valid_qobject(console):
+            return None
+
+        window = console.window()
+        if window is not None and window is not console and self._is_valid_qobject(window):
+            return window
+
+        if not avoid_console:
+            return console._term_holder
+        return None
+
+    def _fallback_holder(
+        self,
+        info: _TerminalOwnerInfo,
+        console: BecConsole | None = None,
+        *,
+        avoid_console: bool = False,
+    ) -> QWidget:
+        if not self._is_valid_qobject(info.fallback_holder):
+            info.fallback_holder = QWidget(
+                parent=self._parking_parent(info, console, avoid_console=avoid_console)
+            )
+            info.fallback_holder.setObjectName(f"_bec_console_terminal_holder_{info.terminal_id}")
+            info.fallback_holder.hide()
+        return info.fallback_holder
+
+    def _park_terminal(
+        self,
+        info: _TerminalOwnerInfo,
+        console: BecConsole | None = None,
+        *,
+        avoid_console: bool = False,
+    ) -> None:
+        if not self._is_valid_qobject(info.instance):
+            return
+
+        parent = self._parking_parent(info, console, avoid_console=avoid_console)
+        if parent is None and info.persist_session:
+            parent = self._fallback_holder(info, console, avoid_console=avoid_console)
+
+        info.instance.hide()  # type: ignore[union-attr]
+        info.instance.setParent(parent)  # type: ignore[union-attr]
+
+    def clear(self) -> None:
+        """Delete every tracked terminal and holder."""
+        for info in list(self._terminal_registry.values()):
+            self._delete_terminal_info(info)
+        self._terminal_registry.clear()
+        self._consoles.clear()
+
+    def register(self, console: BecConsole):
+        """
+        Register an instance of BecConsole. If there is already a terminal with the associated
+        terminal_id, this does not automatically grant ownership.
+
+        Args:
+            console (BecConsole): The instance to register.
+        """
+        self._connect_app_cleanup()
+        self._consoles[console.console_id] = console
+        console_id, terminal_id = console.console_id, console.terminal_id
+        term_info = self._terminal_registry.get(terminal_id)
+        if term_info is None:
+            self._terminal_registry[terminal_id] = self._new_terminal_info(console)
+            return
+
+        term_info.persist_session = term_info.persist_session or console.persist_terminal_session
+        had_registered_consoles = bool(term_info.registered_console_ids)
+        term_info.registered_console_ids.add(console_id)
+        if not self._is_valid_qobject(term_info.instance):
+            self._replace_terminal(term_info, console)
+            return
+        if (
+            term_info.owner_console_id is not None
+            and term_info.owner_console_id not in self._consoles
+        ):
+            term_info.owner_console_id = None
+        if term_info.owner_console_id is None and not had_registered_consoles:
+            term_info.owner_console_id = console_id
+        logger.info(f"Registered new console {console_id} for terminal {terminal_id}")
+
+    def unregister(self, console: BecConsole):
+        """
+        Unregister an instance of BecConsole.
+
+        Args:
+            console (BecConsole): The instance to unregister.
+        """
+        console_id, terminal_id = console.console_id, console.terminal_id
+        if console_id in self._consoles:
+            del self._consoles[console_id]
+        if (term_info := self._terminal_registry.get(terminal_id)) is None:
+            return
+        detached = console._detach_terminal_widget(term_info.instance)
+        if console_id in term_info.registered_console_ids:
+            term_info.registered_console_ids.remove(console_id)
+        if term_info.owner_console_id == console_id:
+            term_info.owner_console_id = None
+        if not term_info.registered_console_ids:
+            if term_info.persist_session and self._is_valid_qobject(term_info.instance):
+                self._park_terminal(term_info, console, avoid_console=True)
+                logger.info(f"Unregistered console {console_id} for terminal {terminal_id}")
+                return
+
+            self._delete_terminal_info(term_info)
+            del self._terminal_registry[terminal_id]
+        elif detached:
+            self._park_terminal(term_info, console, avoid_console=True)
+
+        logger.info(f"Unregistered console {console_id} for terminal {terminal_id}")
+
+    def is_owner(self, console: BecConsole):
+        """Returns true if the given console is the owner of its terminal"""
+        if console not in self._consoles.values():
+            return False
+        if (info := self._terminal_registry.get(console.terminal_id)) is None:
+            logger.warning(f"Console {console.console_id} references an unknown terminal!")
+            return False
+        if not self._is_valid_qobject(info.instance):
+            return False
+        return info.owner_console_id == console.console_id
+
+    def take_ownership(self, console: BecConsole) -> BecTerminal | None:
+        """
+        Transfer ownership of a terminal to the given console.
+
+        Args:
+            console: the console which wishes to take ownership of its associated terminal.
+        Returns:
+            BecTerminal | None: The instance if ownership transfer was successful, None otherwise.
+        """
+        console_id, terminal_id = console.console_id, console.terminal_id
+
+        if terminal_id not in self._terminal_registry:
+            self.register(console)
+
+        instance_info = self._terminal_registry[terminal_id]
+        if not self._is_valid_qobject(instance_info.instance):
+            self._replace_terminal(instance_info, console)
+        if (old_owner_console_ide := instance_info.owner_console_id) is not None:
+            if (
+                old_owner_console_ide != console_id
+                and (old_owner := self._consoles.get(old_owner_console_ide)) is not None
+            ):
+                old_owner.yield_ownership()  # call this on the old owner to make sure it is updated
+        instance_info.owner_console_id = console_id
+        instance_info.registered_console_ids.add(console_id)
+        logger.info(f"Transferred ownership of terminal {terminal_id} to {console_id}")
+        return instance_info.instance
+
+    def try_get_term(self, console: BecConsole) -> BecTerminal | None:
+        """
+        Return the terminal instance if the requesting console is the owner
+
+        Args:
+            console: the requesting console.
+        Returns:
+            BecTerminal | None: The instance if the console is the owner, None otherwise.
+        """
+        console_id, terminal_id = console.console_id, console.terminal_id
+        logger.debug(f"checking term for {console_id}")
+        if terminal_id not in self._terminal_registry:
+            logger.warning(f"Terminal {terminal_id} not found in registry")
+            return None
+
+        instance_info = self._terminal_registry[terminal_id]
+        if not self._is_valid_qobject(instance_info.instance):
+            if instance_info.owner_console_id == console_id:
+                self._replace_terminal(instance_info, console)
+            else:
+                return None
+        if instance_info.owner_console_id == console_id:
+            return instance_info.instance
+
+    def yield_ownership(self, console: BecConsole):
+        """
+        Yield ownership of an instance without destroying it. The instance remains in the
+        registry with no owner, available for another widget to claim.
+
+        Args:
+            console (BecConsole): The console which wishes to yield ownership of its associated terminal.
+        """
+        console_id, terminal_id = console.console_id, console.terminal_id
+        logger.debug(f"Console {console_id} attempted to yield ownership")
+        if console_id not in self._consoles or terminal_id not in self._terminal_registry:
+            return
+
+        term_info = self._terminal_registry[terminal_id]
+        if term_info.owner_console_id != console_id:
+            logger.debug(f"But it was not the owner, which was {term_info.owner_console_id}!")
+            return
+        term_info.owner_console_id = None
+        console._detach_terminal_widget(term_info.instance)
+        self._park_terminal(term_info, console)
+
+    def should_initialize(self, console: BecConsole) -> bool:
+        """Return true if the console should send its startup command to the terminal."""
+        info = self._terminal_registry.get(console.terminal_id)
+        if info is None:
+            return False
+        return (
+            info.owner_console_id == console.console_id
+            and not info.initialized
+            and self._is_valid_qobject(info.instance)
+        )
+
+    def mark_initialized(self, console: BecConsole) -> None:
+        info = self._terminal_registry.get(console.terminal_id)
+        if info is not None and info.owner_console_id == console.console_id:
+            info.initialized = True
+
+    def owner_is_visible(self, term_id: str) -> bool:
+        """
+        Check if the owner of an instance is currently visible.
+
+        Args:
+            term_id (str): The terminal ID to check.
+        Returns:
+            bool: True if the owner is visible, False otherwise.
+        """
+        instance_info = self._terminal_registry.get(term_id)
+        if (
+            instance_info is None
+            or instance_info.owner_console_id is None
+            or not self._is_valid_qobject(instance_info.instance)
+        ):
+            return False
+
+        if (owner := self._consoles.get(instance_info.owner_console_id)) is None:
+            return False
+        return owner.isVisible()
+
+
+_bec_console_registry = BecConsoleRegistry()
+
+
+class _Overlay(QWidget):
+    def __init__(self, console: BecConsole):
+        super().__init__(parent=console)
+        self._console = console
+
+    def mousePressEvent(self, event: QMouseEvent) -> None:
+        if event.button() == Qt.MouseButton.LeftButton:
+            self._console.take_terminal_ownership()
+            event.accept()
+            return
+        return super().mousePressEvent(event)
+
+
+class BecConsole(BECWidget, QWidget):
+    """A console widget with access to a shared registry of terminals, such that instances can be moved around."""
+
+    _js_callback = Signal(bool)
+    initialized = Signal()
+
+    PLUGIN = True
+    ICON_NAME = "terminal"
+    persist_terminal_session = False
+
+    def __init__(
+        self,
+        parent=None,
+        config=None,
+        client=None,
+        gui_id=None,
+        startup_cmd: str | None = None,
+        terminal_id: str | None = None,
+        **kwargs,
+    ):
+        super().__init__(parent=parent, client=client, gui_id=gui_id, config=config, **kwargs)
+        self._mode = ConsoleMode.INACTIVE
+        self._startup_cmd = startup_cmd
+        self._is_initialized = False
+        self.terminal_id = terminal_id or str(uuid4())
+        self.console_id = self.gui_id
+        self.term: BecTerminal | None = None  # Will be set in _set_up_instance
+
+        self._set_up_instance()
+
+    def _set_up_instance(self):
+        """
+        Set up the web instance and UI elements.
+        """
+        self._stacked_layout = QStackedLayout()
+        # self._stacked_layout.setStackingMode(QStackedLayout.StackingMode.StackAll)
+        self._term_holder = QWidget()
+        self._term_layout = QVBoxLayout()
+        self._term_layout.setContentsMargins(0, 0, 0, 0)
+        self._term_holder.setLayout(self._term_layout)
+
+        self.setLayout(self._stacked_layout)
+
+        # prepare overlay
+        self._overlay = _Overlay(self)
+        layout = QVBoxLayout(self._overlay)
+        layout.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        label = QLabel("Click to activate terminal", self._overlay)
+        layout.addWidget(label)
+
+        self._stacked_layout.addWidget(self._term_holder)
+        self._stacked_layout.addWidget(self._overlay)
+
+        # will create a new terminal instance if there isn't already one for this ID
+        _bec_console_registry.register(self)
+        self._infer_mode()
+        self._ensure_startup_started()
+
+    def _infer_mode(self):
+        self.term = _bec_console_registry.try_get_term(self)
+        if self.term:
+            self._set_mode(ConsoleMode.ACTIVE)
+        elif self.isHidden():
+            self._set_mode(ConsoleMode.HIDDEN)
+        else:
+            self._set_mode(ConsoleMode.INACTIVE)
+
+    def _set_mode(self, mode: ConsoleMode):
+        """
+        Set the mode of the web console.
+
+        Args:
+            mode (ConsoleMode): The mode to set.
+        """
+
+        match mode:
+            case ConsoleMode.ACTIVE:
+                if self.term:
+                    if self._term_layout.indexOf(self.term) == -1:  # type: ignore[arg-type]
+                        self._term_layout.addWidget(self.term)  # type: ignore # BecTerminal is QWidget
+                    self.term.show()  # type: ignore[attr-defined]
+                    self._stacked_layout.setCurrentIndex(0)
+                    self._mode = mode
+                else:
+                    self._stacked_layout.setCurrentIndex(1)
+                    self._mode = ConsoleMode.INACTIVE
+            case ConsoleMode.INACTIVE:
+                self._stacked_layout.setCurrentIndex(1)
+                self._mode = mode
+            case ConsoleMode.HIDDEN:
+                self._stacked_layout.setCurrentIndex(1)
+                self._mode = mode
+
+    @property
+    def startup_cmd(self):
+        """
+        Get the startup command for the web console.
+        """
+        return self._startup_cmd
+
+    @startup_cmd.setter
+    def startup_cmd(self, cmd: str | None):
+        """
+        Set the startup command for the console.
+        """
+        self._startup_cmd = cmd
+
+    def write(self, data: str, send_return: bool = True):
+        """
+        Send data to the console
+
+        Args:
+            data (str): The data to send.
+            send_return (bool): Whether to send a return after the data.
+        """
+        if self.term:
+            self.term.write(data, send_return)
+
+    def _ensure_startup_started(self):
+        if not self.startup_cmd or not _bec_console_registry.should_initialize(self):
+            return
+        self.write(self.startup_cmd, True)
+        _bec_console_registry.mark_initialized(self)
+
+    def _detach_terminal_widget(self, term: BecTerminal | None) -> bool:
+        if term is None or not BecConsoleRegistry._is_valid_qobject(term):
+            if self.term is term:
+                self.term = None
+            return False
+
+        is_child = self.isAncestorOf(term)  # type: ignore[arg-type]
+        if self._term_layout.indexOf(term) != -1:  # type: ignore[arg-type]
+            self._term_layout.removeWidget(term)  # type: ignore[arg-type]
+            is_child = True
+        if is_child:
+            term.hide()  # type: ignore[attr-defined]
+            term.setParent(None)  # type: ignore[attr-defined]
+        if self.term is term:
+            self.term = None
+        return is_child
+
+    def take_terminal_ownership(self):
+        """
+        Take ownership of a web instance from the registry. This will transfer the instance
+        from its current owner (if any) to this widget.
+        """
+        # Get the instance from registry
+        self.term = _bec_console_registry.take_ownership(self)
+        self._infer_mode()
+        self._ensure_startup_started()
+        if self._mode == ConsoleMode.ACTIVE:
+            logger.debug(f"Widget {self.gui_id} took ownership of instance {self.terminal_id}")
+
+    def yield_ownership(self):
+        """
+        Yield ownership of the instance. The instance remains in the registry with no owner,
+        available for another widget to claim. This is automatically called when the
+        widget becomes hidden.
+        """
+        _bec_console_registry.yield_ownership(self)
+        self._infer_mode()
+        if self._mode != ConsoleMode.ACTIVE:
+            logger.debug(f"Widget {self.gui_id} yielded ownership of instance {self.terminal_id}")
+
+    def hideEvent(self, event):
+        """Called when the widget is hidden. Automatically yields ownership."""
+        self.yield_ownership()
+        super().hideEvent(event)
+
+    def showEvent(self, event):
+        """Called when the widget is shown. Updates UI state based on ownership."""
+        super().showEvent(event)
+        if not _bec_console_registry.is_owner(self):
+            if not _bec_console_registry.owner_is_visible(self.terminal_id):
+                self.take_terminal_ownership()
+
+    def cleanup(self):
+        """Unregister this console on destruction."""
+        _bec_console_registry.unregister(self)
+        super().cleanup()
+
+
+class BECShell(BecConsole):
+    """
+    A BecConsole pre-configured to run the BEC shell.
+    We cannot simply expose the web console properties to Qt as we need to have a deterministic
+    startup behavior for sharing the same shell instance across multiple widgets.
+    """
+
+    ICON_NAME = "hub"
+    persist_terminal_session = True
+
+    def __init__(self, parent=None, config=None, client=None, gui_id=None, **kwargs):
+        super().__init__(
+            parent=parent,
+            config=config,
+            client=client,
+            gui_id=gui_id,
+            terminal_id="bec_shell",
+            **kwargs,
+        )
+
+    @property
+    def startup_cmd(self):
+        """
+        Get the startup command for the BEC shell.
+        """
+        if self.bec_dispatcher.cli_server is None:
+            return "bec --nogui"
+        return f"bec --gui-id {self.bec_dispatcher.cli_server.gui_id}"
+
+    @startup_cmd.setter
+    def startup_cmd(self, cmd: str | None): ...
+
+
+if __name__ == "__main__":  # pragma: no cover
+    import sys
+
+    app = QApplication(sys.argv)
+    widget = QTabWidget()
+
+    # Create two consoles with different unique_ids
+    bec_console_1a = BecConsole(startup_cmd="htop", gui_id="console_1_a", terminal_id="terminal_1")
+    bec_console_1b = BecConsole(startup_cmd="htop", gui_id="console_1_b", terminal_id="terminal_1")
+    bec_console_1 = QWidget()
+    bec_console_1_layout = QHBoxLayout(bec_console_1)
+    bec_console_1_layout.addWidget(bec_console_1a)
+    bec_console_1_layout.addWidget(bec_console_1b)
+    bec_console2 = BECShell()
+    bec_console3 = BecConsole(gui_id="console_3", terminal_id="terminal_1")
+    widget.addTab(bec_console_1, "Console 1")
+    widget.addTab(bec_console2, "Console 2 - BEC Shell")
+    widget.addTab(bec_console3, "Console 3 -- mirror of Console 1")
+    widget.show()
+
+    widget.resize(800, 600)
+
+    sys.exit(app.exec_())
@@ -0,0 +1 @@
+{'files': ['bec_console.py']}
@@ -5,17 +5,17 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtWidgets import QWidget

 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.editors.web_console.web_console import WebConsole
+from bec_widgets.widgets.editors.bec_console.bec_console import BecConsole

 DOM_XML = """
 <ui language='c++'>
-    <widget class='WebConsole' name='web_console'>
+    <widget class='BecConsole' name='bec_console'>
    </widget>
 </ui>
 """


-class WebConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+class BecConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
    def __init__(self):
        super().__init__()
        self._form_editor = None
@@ -23,20 +23,20 @@ class WebConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
    def createWidget(self, parent):
        if parent is None:
            return QWidget()
-        t = WebConsole(parent)
+        t = BecConsole(parent)
        return t

    def domXml(self):
        return DOM_XML

    def group(self):
-        return "BEC Developer"
+        return ""

    def icon(self):
-        return designer_material_icon(WebConsole.ICON_NAME)
+        return designer_material_icon(BecConsole.ICON_NAME)

    def includeFile(self):
-        return "web_console"
+        return "bec_console"

    def initialize(self, form_editor):
        self._form_editor = form_editor
@@ -48,10 +48,10 @@ class WebConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
        return self._form_editor is not None

    def name(self):
-        return "WebConsole"
+        return "BecConsole"

    def toolTip(self):
-        return ""
+        return "A console widget with access to a shared registry of terminals, such that instances can be moved around."

    def whatsThis(self):
        return self.toolTip()
@@ -0,0 +1 @@
+{'files': ['bec_console.py']}
@@ -5,7 +5,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtWidgets import QWidget

 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.editors.web_console.web_console import BECShell
+from bec_widgets.widgets.editors.bec_console.bec_console import BECShell

 DOM_XML = """
 <ui language='c++'>
@@ -6,9 +6,9 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.editors.web_console.web_console_plugin import WebConsolePlugin
+    from bec_widgets.widgets.editors.bec_console.bec_console_plugin import BecConsolePlugin

-    QPyDesignerCustomWidgetCollection.addCustomWidget(WebConsolePlugin())
+    QPyDesignerCustomWidgetCollection.addCustomWidget(BecConsolePlugin())


 if __name__ == "__main__":  # pragma: no cover
@@ -6,7 +6,7 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.editors.web_console.bec_shell_plugin import BECShellPlugin
+    from bec_widgets.widgets.editors.bec_console.bec_shell_plugin import BECShellPlugin

    QPyDesignerCustomWidgetCollection.addCustomWidget(BECShellPlugin())

@@ -1,10 +1,12 @@
-from bec_ipython_client.main import BECIPythonClient
+from bec_lib.utils.import_utils import lazy_import_from
 from qtconsole.inprocess import QtInProcessKernelManager
 from qtconsole.manager import QtKernelManager
 from qtconsole.rich_jupyter_widget import RichJupyterWidget
 from qtpy.QtCore import Qt
 from qtpy.QtWidgets import QApplication, QMainWindow

+BECIPythonClient = lazy_import_from("bec_ipython_client.main", ("BECIPythonClient",))
+

 class BECJupyterConsole(RichJupyterWidget):  # pragma: no cover:
    def __init__(self, inprocess: bool = False):
@@ -11,7 +11,7 @@ from bec_lib.logger import bec_logger
 from qtpy.QtCore import QSize, Qt
 from qtpy.QtWidgets import QDialog, QDialogButtonBox, QPushButton, QVBoxLayout

-from bec_widgets.widgets.control.scan_control import ScanControl
+from bec_widgets.widgets.control.scan_control.scan_control import ScanControl

 logger = bec_logger.logger

@@ -1 +0,0 @@
-{'files': ['web_console.py']}
@@ -1,705 +0,0 @@
-from __future__ import annotations
-
-import enum
-import json
-import secrets
-import subprocess
-import time
-
-from bec_lib.logger import bec_logger
-from louie.saferef import safe_ref
-from pydantic import BaseModel
-from qtpy.QtCore import Qt, QTimer, QUrl, Signal, qInstallMessageHandler
-from qtpy.QtGui import QMouseEvent, QResizeEvent
-from qtpy.QtWebEngineWidgets import QWebEnginePage, QWebEngineView
-from qtpy.QtWidgets import QApplication, QLabel, QTabWidget, QVBoxLayout, QWidget
-
-from bec_widgets.utils.bec_widget import BECWidget
-
-logger = bec_logger.logger
-
-
-class ConsoleMode(str, enum.Enum):
-    ACTIVE = "active"
-    INACTIVE = "inactive"
-    HIDDEN = "hidden"
-
-
-class PageOwnerInfo(BaseModel):
-    owner_gui_id: str | None = None
-    widget_ids: list[str] = []
-    page: QWebEnginePage | None = None
-    initialized: bool = False
-
-    model_config = {"arbitrary_types_allowed": True}
-
-
-class WebConsoleRegistry:
-    """
-    A registry for the WebConsole class to manage its instances.
-    """
-
-    def __init__(self):
-        """
-        Initialize the registry.
-        """
-        self._instances = {}
-        self._server_process = None
-        self._server_port = None
-        self._token = secrets.token_hex(16)
-        self._page_registry: dict[str, PageOwnerInfo] = {}
-
-    def register(self, instance: WebConsole):
-        """
-        Register an instance of WebConsole.
-
-        Args:
-            instance (WebConsole): The instance to register.
-        """
-        self._instances[instance.gui_id] = safe_ref(instance)
-        self.cleanup()
-
-        if instance._unique_id:
-            self._register_page(instance)
-
-        if self._server_process is None:
-            # Start the ttyd server if not already running
-            self.start_ttyd()
-
-    def start_ttyd(self, use_zsh: bool | None = None):
-        """
-        Start the ttyd server
-        ttyd -q -W -t 'theme={"background": "black"}' zsh
-
-        Args:
-            use_zsh (bool): Whether to use zsh or bash. If None, it will try to detect if zsh is available.
-        """
-
-        # First, check if ttyd is installed
-        try:
-            subprocess.run(["ttyd", "--version"], check=True, stdout=subprocess.PIPE)
-        except FileNotFoundError:
-            # pylint: disable=raise-missing-from
-            raise RuntimeError("ttyd is not installed. Please install it first.")
-
-        if use_zsh is None:
-            # Check if we can use zsh
-            try:
-                subprocess.run(["zsh", "--version"], check=True, stdout=subprocess.PIPE)
-                use_zsh = True
-            except FileNotFoundError:
-                use_zsh = False
-
-        command = [
-            "ttyd",
-            "-p",
-            "0",
-            "-W",
-            "-t",
-            'theme={"background": "black"}',
-            "-c",
-            f"user:{self._token}",
-        ]
-        if use_zsh:
-            command.append("zsh")
-        else:
-            command.append("bash")
-
-        # Start the ttyd server
-        self._server_process = subprocess.Popen(
-            command, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-        )
-
-        self._wait_for_server_port()
-
-        self._server_process.stdout.close()
-        self._server_process.stderr.close()
-
-    def _wait_for_server_port(self, timeout: float = 10):
-        """
-        Wait for the ttyd server to start and get the port number.
-
-        Args:
-            timeout (float): The timeout in seconds to wait for the server to start.
-        """
-        start_time = time.time()
-        while True:
-            output = self._server_process.stderr.readline()
-            if output == b"" and self._server_process.poll() is not None:
-                break
-            if not output:
-                continue
-
-            output = output.decode("utf-8").strip()
-            if "Listening on" in output:
-                # Extract the port number from the output
-                self._server_port = int(output.split(":")[-1])
-                logger.info(f"ttyd server started on port {self._server_port}")
-                break
-            if time.time() - start_time > timeout:
-                raise TimeoutError(
-                    "Timeout waiting for ttyd server to start. Please check if ttyd is installed and available in your PATH."
-                )
-
-    def cleanup(self):
-        """
-        Clean up the registry by removing any instances that are no longer valid.
-        """
-        for gui_id, weak_ref in list(self._instances.items()):
-            if weak_ref() is None:
-                del self._instances[gui_id]
-
-        if not self._instances and self._server_process:
-            # If no instances are left, terminate the server process
-            self._server_process.terminate()
-            self._server_process = None
-            self._server_port = None
-            logger.info("ttyd server terminated")
-
-    def unregister(self, instance: WebConsole):
-        """
-        Unregister an instance of WebConsole.
-
-        Args:
-            instance (WebConsole): The instance to unregister.
-        """
-        if instance.gui_id in self._instances:
-            del self._instances[instance.gui_id]
-
-        if instance._unique_id:
-            self._unregister_page(instance._unique_id, instance.gui_id)
-
-        self.cleanup()
-
-    def _register_page(self, instance: WebConsole):
-        """
-        Register a page in the registry. Please note that this does not transfer ownership
-        for already existing pages; it simply records which widget currently owns the page.
-        Use transfer_page_ownership to change ownership.
-
-        Args:
-            instance (WebConsole): The instance to register.
-        """
-
-        unique_id = instance._unique_id
-        gui_id = instance.gui_id
-
-        if unique_id is None:
-            return
-
-        if unique_id not in self._page_registry:
-            page = BECWebEnginePage()
-            page.authenticationRequired.connect(instance._authenticate)
-            self._page_registry[unique_id] = PageOwnerInfo(
-                owner_gui_id=gui_id, widget_ids=[gui_id], page=page
-            )
-            logger.info(f"Registered new page {unique_id} for {gui_id}")
-            return
-
-        if gui_id not in self._page_registry[unique_id].widget_ids:
-            self._page_registry[unique_id].widget_ids.append(gui_id)
-
-    def _unregister_page(self, unique_id: str, gui_id: str):
-        """
-        Unregister a page from the registry.
-
-        Args:
-            unique_id (str): The unique identifier for the page.
-            gui_id (str): The GUI ID of the widget.
-        """
-        if unique_id not in self._page_registry:
-            return
-        page_info = self._page_registry[unique_id]
-        if gui_id in page_info.widget_ids:
-            page_info.widget_ids.remove(gui_id)
-        if page_info.owner_gui_id == gui_id:
-            page_info.owner_gui_id = None
-        if not page_info.widget_ids:
-            if page_info.page:
-                page_info.page.deleteLater()
-            del self._page_registry[unique_id]
-
-        logger.info(f"Unregistered page {unique_id} for {gui_id}")
-
-    def get_page_info(self, unique_id: str) -> PageOwnerInfo | None:
-        """
-        Get a page from the registry.
-
-        Args:
-            unique_id (str): The unique identifier for the page.
-
-        Returns:
-            PageOwnerInfo | None: The page info if found, None otherwise.
-        """
-        if unique_id not in self._page_registry:
-            return None
-        return self._page_registry[unique_id]
-
-    def take_page_ownership(self, unique_id: str, new_owner_gui_id: str) -> QWebEnginePage | None:
-        """
-        Transfer ownership of a page to a new owner.
-
-        Args:
-            unique_id (str): The unique identifier for the page.
-            new_owner_gui_id (str): The GUI ID of the new owner.
-
-        Returns:
-            QWebEnginePage | None: The page if ownership transfer was successful, None otherwise.
-        """
-        if unique_id not in self._page_registry:
-            logger.warning(f"Page {unique_id} not found in registry")
-            return None
-
-        page_info = self._page_registry[unique_id]
-        old_owner_gui_id = page_info.owner_gui_id
-        if old_owner_gui_id:
-            old_owner_ref = self._instances.get(old_owner_gui_id)
-            if old_owner_ref:
-                old_owner_instance = old_owner_ref()
-                if old_owner_instance:
-                    old_owner_instance.yield_ownership()
-        page_info.owner_gui_id = new_owner_gui_id
-
-        logger.info(f"Transferred ownership of page {unique_id} to {new_owner_gui_id}")
-        return page_info.page
-
-    def yield_ownership(self, gui_id: str) -> bool:
-        """
-        Yield ownership of a page without destroying it. The page remains in the
-        registry with no owner, available for another widget to claim.
-
-        Args:
-            gui_id (str): The GUI ID of the widget yielding ownership.
-
-        Returns:
-            bool: True if ownership was yielded, False otherwise.
-        """
-        if gui_id not in self._instances:
-            return False
-
-        instance = self._instances[gui_id]()
-        if instance is None:
-            return False
-
-        unique_id = instance._unique_id
-        if unique_id is None:
-            return False
-
-        if unique_id not in self._page_registry:
-            return False
-
-        page_owner_info = self._page_registry[unique_id]
-        if page_owner_info.owner_gui_id != gui_id:
-            return False
-
-        page_owner_info.owner_gui_id = None
-        return True
-
-    def owner_is_visible(self, unique_id: str) -> bool:
-        """
-        Check if the owner of a page is currently visible.
-
-        Args:
-            unique_id (str): The unique identifier for the page.
-        Returns:
-            bool: True if the owner is visible, False otherwise.
-        """
-        page_info = self.get_page_info(unique_id)
-        if page_info is None or page_info.owner_gui_id is None:
-            return False
-
-        owner_ref = self._instances.get(page_info.owner_gui_id)
-        if owner_ref is None:
-            return False
-
-        owner_instance = owner_ref()
-        if owner_instance is None:
-            return False
-
-        return owner_instance.isVisible()
-
-
-_web_console_registry = WebConsoleRegistry()
-
-
-def suppress_qt_messages(type_, context, msg):
-    if context.category in ["js", "default"]:
-        return
-    print(msg)
-
-
-qInstallMessageHandler(suppress_qt_messages)
-
-
-class BECWebEnginePage(QWebEnginePage):
-    def javaScriptConsoleMessage(self, level, message, lineNumber, sourceID):
-        logger.info(f"[JS Console] {level.name} at line {lineNumber} in {sourceID}: {message}")
-
-
-class WebConsole(BECWidget, QWidget):
-    """
-    A simple widget to display a website
-    """
-
-    _js_callback = Signal(bool)
-    initialized = Signal()
-
-    PLUGIN = True
-    ICON_NAME = "terminal"
-
-    def __init__(
-        self,
-        parent=None,
-        config=None,
-        client=None,
-        gui_id=None,
-        startup_cmd: str | None = None,
-        is_bec_shell: bool = False,
-        unique_id: str | None = None,
-        **kwargs,
-    ):
-        super().__init__(parent=parent, client=client, gui_id=gui_id, config=config, **kwargs)
-        self._mode = ConsoleMode.INACTIVE
-        self._is_bec_shell = is_bec_shell
-        self._startup_cmd = startup_cmd
-        self._is_initialized = False
-        self._unique_id = unique_id
-        self.page = None  # Will be set in _set_up_page
-
-        self._startup_timer = QTimer()
-        self._startup_timer.setInterval(500)
-        self._startup_timer.timeout.connect(self._check_page_ready)
-        self._startup_timer.start()
-        self._js_callback.connect(self._on_js_callback)
-
-        self._set_up_page()
-
-    def _set_up_page(self):
-        """
-        Set up the web page and UI elements.
-        """
-        layout = QVBoxLayout()
-        layout.setContentsMargins(0, 0, 0, 0)
-        self.browser = QWebEngineView(self)
-
-        layout.addWidget(self.browser)
-        self.setLayout(layout)
-
-        # prepare overlay
-        self.overlay = QWidget(self)
-        layout = QVBoxLayout(self.overlay)
-        layout.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        label = QLabel("Click to activate terminal", self.overlay)
-        layout.addWidget(label)
-        self.overlay.hide()
-
-        _web_console_registry.register(self)
-        self._token = _web_console_registry._token
-
-        # If no unique_id is provided, create a new page
-        if not self._unique_id:
-            self.page = BECWebEnginePage(self)
-            self.page.authenticationRequired.connect(self._authenticate)
-            self.page.setUrl(QUrl(f"http://localhost:{_web_console_registry._server_port}"))
-            self.browser.setPage(self.page)
-            self._set_mode(ConsoleMode.ACTIVE)
-            return
-
-        # Try to get the page from the registry
-        page_info = _web_console_registry.get_page_info(self._unique_id)
-        if page_info and page_info.page:
-            self.page = page_info.page
-            if not page_info.owner_gui_id or page_info.owner_gui_id == self.gui_id:
-                self.browser.setPage(self.page)
-            # Only set URL if this is a newly created page (no URL set yet)
-            if self.page.url().isEmpty():
-                self.page.setUrl(QUrl(f"http://localhost:{_web_console_registry._server_port}"))
-            else:
-                # We have an existing page, so we don't need the startup timer
-                self._startup_timer.stop()
-            if page_info.owner_gui_id != self.gui_id:
-                self._set_mode(ConsoleMode.INACTIVE)
-            else:
-                self._set_mode(ConsoleMode.ACTIVE)
-
-    def _set_mode(self, mode: ConsoleMode):
-        """
-        Set the mode of the web console.
-
-        Args:
-            mode (ConsoleMode): The mode to set.
-        """
-        if not self._unique_id:
-            # For non-unique_id consoles, always active
-            mode = ConsoleMode.ACTIVE
-
-        self._mode = mode
-        match mode:
-            case ConsoleMode.ACTIVE:
-                self.browser.setVisible(True)
-                self.overlay.hide()
-            case ConsoleMode.INACTIVE:
-                self.browser.setVisible(False)
-                self.overlay.show()
-            case ConsoleMode.HIDDEN:
-                self.browser.setVisible(False)
-                self.overlay.hide()
-
-    def _check_page_ready(self):
-        """
-        Check if the page is ready and stop the timer if it is.
-        """
-        if not self.page or self.page.isLoading():
-            return
-
-        self.page.runJavaScript("window.term !== undefined", self._js_callback.emit)
-
-    def _on_js_callback(self, ready: bool):
-        """
-        Callback for when the JavaScript is ready.
-        """
-        if not ready:
-            return
-        self._is_initialized = True
-        self._startup_timer.stop()
-        if self.startup_cmd:
-            if self._unique_id:
-                page_info = _web_console_registry.get_page_info(self._unique_id)
-                if page_info is None:
-                    return
-                if not page_info.initialized:
-                    page_info.initialized = True
-                    self.write(self.startup_cmd)
-            else:
-                self.write(self.startup_cmd)
-        self.initialized.emit()
-
-    @property
-    def startup_cmd(self):
-        """
-        Get the startup command for the web console.
-        """
-        if self._is_bec_shell:
-            if self.bec_dispatcher.cli_server is None:
-                return "bec --nogui"
-            return f"bec --gui-id {self.bec_dispatcher.cli_server.gui_id}"
-        return self._startup_cmd
-
-    @startup_cmd.setter
-    def startup_cmd(self, cmd: str):
-        """
-        Set the startup command for the web console.
-        """
-        if not isinstance(cmd, str):
-            raise ValueError("Startup command must be a string.")
-        self._startup_cmd = cmd
-
-    def write(self, data: str, send_return: bool = True):
-        """
-        Send data to the web page
-
-        Args:
-            data (str): The data to send.
-            send_return (bool): Whether to send a return after the data.
-        """
-        cmd = f"window.term.paste({json.dumps(data)});"
-        if self.page is None:
-            logger.warning("Cannot write to web console: page is not initialized.")
-            return
-        self.page.runJavaScript(cmd)
-        if send_return:
-            self.send_return()
-
-    def take_page_ownership(self, unique_id: str | None = None):
-        """
-        Take ownership of a web page from the registry. This will transfer the page
-        from its current owner (if any) to this widget.
-
-        Args:
-            unique_id (str): The unique identifier of the page to take ownership of.
-                           If None, uses this widget's unique_id.
-        """
-        if unique_id is None:
-            unique_id = self._unique_id
-
-        if not unique_id:
-            logger.warning("Cannot take page ownership without a unique_id")
-            return
-
-        # Get the page from registry
-        page = _web_console_registry.take_page_ownership(unique_id, self.gui_id)
-
-        if not page:
-            logger.warning(f"Page {unique_id} not found in registry")
-            return
-
-        self.page = page
-        self.browser.setPage(page)
-        self._set_mode(ConsoleMode.ACTIVE)
-        logger.info(f"Widget {self.gui_id} took ownership of page {unique_id}")
-
-    def _on_ownership_lost(self):
-        """
-        Called when this widget loses ownership of its page.
-        Displays the overlay and hides the browser.
-        """
-        self._set_mode(ConsoleMode.INACTIVE)
-        logger.info(f"Widget {self.gui_id} lost ownership of page {self._unique_id}")
-
-    def yield_ownership(self):
-        """
-        Yield ownership of the page. The page remains in the registry with no owner,
-        available for another widget to claim. This is automatically called when the
-        widget becomes hidden.
-        """
-        if not self._unique_id:
-            return
-        success = _web_console_registry.yield_ownership(self.gui_id)
-        if success:
-            self._on_ownership_lost()
-            logger.info(f"Widget {self.gui_id} yielded ownership of page {self._unique_id}")
-
-    def has_ownership(self) -> bool:
-        """
-        Check if this widget currently has ownership of a page.
-
-        Returns:
-            bool: True if this widget owns a page, False otherwise.
-        """
-        if not self._unique_id:
-            return False
-        page_info = _web_console_registry.get_page_info(self._unique_id)
-        if page_info is None:
-            return False
-        return page_info.owner_gui_id == self.gui_id
-
-    def hideEvent(self, event):
-        """
-        Called when the widget is hidden. Automatically yields ownership.
-        """
-        if self.has_ownership():
-            self.yield_ownership()
-        self._set_mode(ConsoleMode.HIDDEN)
-        super().hideEvent(event)
-
-    def showEvent(self, event):
-        """
-        Called when the widget is shown. Updates UI state based on ownership.
-        """
-        super().showEvent(event)
-        if self._unique_id and not self.has_ownership():
-            # Take ownership if the page does not have an owner or
-            # the owner is not visible
-            page_info = _web_console_registry.get_page_info(self._unique_id)
-            if page_info is None:
-                self._set_mode(ConsoleMode.INACTIVE)
-                return
-            if page_info.owner_gui_id is None or not _web_console_registry.owner_is_visible(
-                self._unique_id
-            ):
-                self.take_page_ownership(self._unique_id)
-                return
-            if page_info.owner_gui_id != self.gui_id:
-                self._set_mode(ConsoleMode.INACTIVE)
-                return
-
-    def resizeEvent(self, event: QResizeEvent) -> None:
-        super().resizeEvent(event)
-        self.overlay.resize(event.size())
-
-    def mousePressEvent(self, event: QMouseEvent) -> None:
-        if event.button() == Qt.MouseButton.LeftButton and not self.has_ownership():
-            self.take_page_ownership(self._unique_id)
-            event.accept()
-            return
-        return super().mousePressEvent(event)
-
-    def _authenticate(self, _, auth):
-        """
-        Authenticate the request with the provided username and password.
-        """
-        auth.setUser("user")
-        auth.setPassword(self._token)
-
-    def send_return(self):
-        """
-        Send return to the web page
-        """
-        self.page.runJavaScript(
-            "document.querySelector('textarea.xterm-helper-textarea').dispatchEvent(new KeyboardEvent('keypress', {charCode: 13}))"
-        )
-
-    def send_ctrl_c(self):
-        """
-        Send Ctrl+C to the web page
-        """
-        self.page.runJavaScript(
-            "document.querySelector('textarea.xterm-helper-textarea').dispatchEvent(new KeyboardEvent('keypress', {charCode: 3}))"
-        )
-
-    def set_readonly(self, readonly: bool):
-        """
-        Set the web console to read-only mode.
-        """
-        if not isinstance(readonly, bool):
-            raise ValueError("Readonly must be a boolean.")
-        self.setEnabled(not readonly)
-
-    def cleanup(self):
-        """
-        Clean up the registry by removing any instances that are no longer valid.
-        """
-        self._startup_timer.stop()
-        _web_console_registry.unregister(self)
-        super().cleanup()
-
-
-class BECShell(WebConsole):
-    """
-    A WebConsole pre-configured to run the BEC shell.
-    We cannot simply expose the web console properties to Qt as we need to have a deterministic
-    startup behavior for sharing the same shell instance across multiple widgets.
-    """
-
-    ICON_NAME = "hub"
-
-    def __init__(self, parent=None, config=None, client=None, gui_id=None, **kwargs):
-        super().__init__(
-            parent=parent,
-            config=config,
-            client=client,
-            gui_id=gui_id,
-            is_bec_shell=True,
-            unique_id="bec_shell",
-            **kwargs,
-        )
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    app = QApplication(sys.argv)
-    widget = QTabWidget()
-
-    # Create two consoles with different unique_ids
-    web_console1 = WebConsole(startup_cmd="bec --nogui", unique_id="console1")
-    web_console2 = WebConsole(startup_cmd="htop")
-    web_console3 = WebConsole(startup_cmd="bec --nogui", unique_id="console1")
-    widget.addTab(web_console1, "Console 1")
-    widget.addTab(web_console2, "Console 2")
-    widget.addTab(web_console3, "Console 3 -- mirror of Console 1")
-    widget.show()
-
-    # Demonstrate page sharing:
-    # After initialization, web_console2 can take ownership of console1's page:
-    # web_console2.take_page_ownership("console1")
-
-    widget.resize(800, 600)
-
-    def _close_cons1():
-        web_console2.close()
-        web_console2.deleteLater()
-
-    # QTimer.singleShot(3000, _close_cons1)
-
-    sys.exit(app.exec_())
@@ -1 +0,0 @@
-{'files': ['web_console.py']}
@@ -19,8 +19,8 @@ from scipy.interpolate import (
 from scipy.spatial import cKDTree
 from toolz import partition

-from bec_widgets.utils import Colors
 from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils.colors import Colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.settings_dialog import SettingsDialog
 from bec_widgets.utils.toolbars.actions import MaterialIconAction
@@ -4,9 +4,9 @@ import os

 from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout

-from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
+from bec_widgets.utils.ui_loader import UILoader


 class HeatmapSettings(SettingWidget):
@@ -10,7 +10,7 @@ from pydantic import BaseModel, Field, field_validator
 from qtpy.QtCore import QTimer
 from qtpy.QtWidgets import QWidget

-from bec_widgets.utils import ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.colors import Colors, apply_theme
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.widgets.plots.image.image_base import ImageBase
@@ -270,6 +270,16 @@ class Image(ImageBase):
            return

        old_device = self._config.device
+        old_signal = self._config.signal
+        old_config = self.subscriptions["main"]
+        if old_device and old_signal and old_device != value:
+            self._disconnect_monitor_subscription(
+                device=old_device,
+                signal=old_signal,
+                source=old_config.source,
+                async_update=self.async_update,
+                async_signal_name=old_config.async_signal_name,
+            )
        self._config.device = value

        # If we have a signal, reconnect with the new device
@@ -325,6 +335,16 @@ class Image(ImageBase):
                self._set_connection_status("disconnected")
            return

+        old_signal = self._config.signal
+        old_config = self.subscriptions["main"]
+        if self._config.device and old_signal and old_signal != value:
+            self._disconnect_monitor_subscription(
+                device=self._config.device,
+                signal=old_signal,
+                source=old_config.source,
+                async_update=self.async_update,
+                async_signal_name=old_config.async_signal_name,
+            )
        self._config.signal = value

        # If we have a device, try to connect
@@ -447,6 +467,61 @@ class Image(ImageBase):
        )
        self._autorange_on_next_update = True

+    def _disconnect_monitor_subscription(
+        self,
+        *,
+        device: str,
+        signal: str,
+        source: Literal["device_monitor_1d", "device_monitor_2d"] | None,
+        async_update: bool,
+        async_signal_name: str | None,
+    ) -> None:
+        if not device or not signal:
+            return
+
+        if async_update:
+            async_signal_name = async_signal_name or signal
+            ids_to_check = [self.scan_id, self.old_scan_id]
+
+            if source == "device_monitor_1d":
+                for scan_id in ids_to_check:
+                    if scan_id is None:
+                        continue
+                    self.bec_dispatcher.disconnect_slot(
+                        self.on_image_update_1d,
+                        MessageEndpoints.device_async_signal(scan_id, device, async_signal_name),
+                    )
+                    logger.info(
+                        f"Disconnecting 1d update ScanID:{scan_id}, Device Name:{device},Device Entry:{async_signal_name}"
+                    )
+            elif source == "device_monitor_2d":
+                for scan_id in ids_to_check:
+                    if scan_id is None:
+                        continue
+                    self.bec_dispatcher.disconnect_slot(
+                        self.on_image_update_2d,
+                        MessageEndpoints.device_async_signal(scan_id, device, async_signal_name),
+                    )
+                    logger.info(
+                        f"Disconnecting 2d update ScanID:{scan_id}, Device Name:{device},Device Entry:{async_signal_name}"
+                    )
+            return
+
+        if source == "device_monitor_1d":
+            self.bec_dispatcher.disconnect_slot(
+                self.on_image_update_1d, MessageEndpoints.device_preview(device, signal)
+            )
+            logger.info(
+                f"Disconnecting preview 1d update Device Name:{device}, Device Entry:{signal}"
+            )
+        elif source == "device_monitor_2d":
+            self.bec_dispatcher.disconnect_slot(
+                self.on_image_update_2d, MessageEndpoints.device_preview(device, signal)
+            )
+            logger.info(
+                f"Disconnecting preview 2d update Device Name:{device}, Device Entry:{signal}"
+            )
+
    def _disconnect_current_monitor(self):
        """
        Internal method to disconnect the current monitor subscriptions.
@@ -455,55 +530,13 @@ class Image(ImageBase):
            return

        config = self.subscriptions["main"]
-
-        if self.async_update:
-            async_signal_name = config.async_signal_name or self._config.signal
-            ids_to_check = [self.scan_id, self.old_scan_id]
-
-            if config.source == "device_monitor_1d":
-                for scan_id in ids_to_check:
-                    if scan_id is None:
-                        continue
-                    self.bec_dispatcher.disconnect_slot(
-                        self.on_image_update_1d,
-                        MessageEndpoints.device_async_signal(
-                            scan_id, self._config.device, async_signal_name
-                        ),
-                    )
-                    logger.info(
-                        f"Disconnecting 1d update ScanID:{scan_id}, Device Name:{self._config.device},Device Entry:{async_signal_name}"
-                    )
-            elif config.source == "device_monitor_2d":
-                for scan_id in ids_to_check:
-                    if scan_id is None:
-                        continue
-                    self.bec_dispatcher.disconnect_slot(
-                        self.on_image_update_2d,
-                        MessageEndpoints.device_async_signal(
-                            scan_id, self._config.device, async_signal_name
-                        ),
-                    )
-                    logger.info(
-                        f"Disconnecting 2d update ScanID:{scan_id}, Device Name:{self._config.device},Device Entry:{async_signal_name}"
-                    )
-
-        else:
-            if config.source == "device_monitor_1d":
-                self.bec_dispatcher.disconnect_slot(
-                    self.on_image_update_1d,
-                    MessageEndpoints.device_preview(self._config.device, self._config.signal),
-                )
-                logger.info(
-                    f"Disconnecting preview 1d update Device Name:{self._config.device}, Device Entry:{self._config.signal}"
-                )
-            elif config.source == "device_monitor_2d":
-                self.bec_dispatcher.disconnect_slot(
-                    self.on_image_update_2d,
-                    MessageEndpoints.device_preview(self._config.device, self._config.signal),
-                )
-                logger.info(
-                    f"Disconnecting preview 2d update Device Name:{self._config.device}, Device Entry:{self._config.signal}"
-                )
+        self._disconnect_monitor_subscription(
+            device=self._config.device,
+            signal=self._config.signal,
+            source=config.source,
+            async_update=self.async_update,
+            async_signal_name=config.async_signal_name,
+        )

        # Reset async state
        self.async_update = False
@@ -860,45 +893,19 @@ class Image(ImageBase):
            logger.warning("Cannot disconnect monitor without both device and signal")
            return

-        if self.async_update:
-            async_signal_name = config.async_signal_name or target_entry
-            ids_to_check = [self.scan_id, self.old_scan_id]
-            if config.source == "device_monitor_1d":
-                for scan_id in ids_to_check:
-                    if scan_id is None:
-                        continue
-                    self.bec_dispatcher.disconnect_slot(
-                        self.on_image_update_1d,
-                        MessageEndpoints.device_async_signal(
-                            scan_id, target_device, async_signal_name
-                        ),
-                    )
-            elif config.source == "device_monitor_2d":
-                for scan_id in ids_to_check:
-                    if scan_id is None:
-                        continue
-                    self.bec_dispatcher.disconnect_slot(
-                        self.on_image_update_2d,
-                        MessageEndpoints.device_async_signal(
-                            scan_id, target_device, async_signal_name
-                        ),
-                    )
-        else:
-            if config.source == "device_monitor_1d":
-                self.bec_dispatcher.disconnect_slot(
-                    self.on_image_update_1d,
-                    MessageEndpoints.device_preview(target_device, target_entry),
-                )
-            elif config.source == "device_monitor_2d":
-                self.bec_dispatcher.disconnect_slot(
-                    self.on_image_update_2d,
-                    MessageEndpoints.device_preview(target_device, target_entry),
-                )
-            else:
-                logger.warning(
-                    f"Cannot disconnect monitor {target_device}.{target_entry} with source {self.subscriptions['main'].source}"
-                )
-                return
+        if config.source not in {"device_monitor_1d", "device_monitor_2d"}:
+            logger.warning(
+                f"Cannot disconnect monitor {target_device}.{target_entry} with source {self.subscriptions['main'].source}"
+            )
+            return
+
+        self._disconnect_monitor_subscription(
+            device=target_device,
+            signal=target_entry,
+            source=config.source,
+            async_update=self.async_update,
+            async_signal_name=config.async_signal_name,
+        )

        self.subscriptions["main"].async_signal_name = None
        self.async_update = False
@@ -9,7 +9,7 @@ from pydantic import BaseModel, ConfigDict, Field, ValidationError
 from qtpy.QtCore import QPointF, Signal, SignalInstance
 from qtpy.QtWidgets import QDialog, QVBoxLayout

-from bec_widgets.utils import Colors
+from bec_widgets.utils.colors import Colors
 from bec_widgets.utils.container_utils import WidgetContainerUtils
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.side_panel import SidePanel
@@ -9,7 +9,8 @@ from pydantic import Field, ValidationError, field_validator
 from qtpy.QtCore import Signal
 from qtpy.QtGui import QTransform

-from bec_widgets.utils import BECConnector, Colors, ConnectionConfig
+from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
+from bec_widgets.utils.colors import Colors
 from bec_widgets.widgets.plots.image.image_processor import (
    ImageProcessor,
    ImageStats,
@@ -20,7 +20,8 @@ from qtpy.QtWidgets import (
 )

 from bec_widgets import BECWidget
-from bec_widgets.utils import BECDispatcher, ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
 from bec_widgets.utils.toolbars.actions import WidgetAction
 from bec_widgets.utils.toolbars.bundles import ToolbarBundle
 from bec_widgets.utils.toolbars.toolbar import MaterialIconAction, ModularToolBar
@@ -10,8 +10,8 @@ from qtpy.QtCore import Signal
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QHBoxLayout, QMainWindow, QWidget

-from bec_widgets.utils import Colors, ConnectionConfig
-from bec_widgets.utils.colors import apply_theme
+from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils.colors import Colors, apply_theme
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.settings_dialog import SettingsDialog
 from bec_widgets.utils.toolbars.toolbar import MaterialIconAction
@@ -2,9 +2,9 @@ import os

 from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout, QWidget

-from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
+from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.utils.widget_io import WidgetIO


@@ -10,7 +10,8 @@ from pydantic import Field, ValidationError, field_validator
 from qtpy.QtCore import Signal
 from qtpy.QtWidgets import QWidget

-from bec_widgets.utils import Colors, ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils.colors import Colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.side_panel import SidePanel
 from bec_widgets.widgets.control.device_input.device_combobox.device_combobox import DeviceComboBox
@@ -2,9 +2,9 @@ import os

 from qtpy.QtWidgets import QVBoxLayout, QWidget

-from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
+from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.utils.widget_io import WidgetIO


@@ -8,8 +8,10 @@ from bec_lib import bec_logger
 from qtpy.QtCore import QPoint, QPointF, Qt, Signal
 from qtpy.QtWidgets import QHBoxLayout, QLabel, QMainWindow, QVBoxLayout, QWidget

-from bec_widgets.utils import ConnectionConfig, Crosshair, EntryValidator
+from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.crosshair import Crosshair
+from bec_widgets.utils.entry_validator import EntryValidator
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.fps_counter import FPSCounter
 from bec_widgets.utils.plot_indicator_items import BECArrowItem, BECTickItem
@@ -10,7 +10,7 @@ from qtpy import QtCore
 from qtpy.QtCore import QObject, Signal

 from bec_widgets import SafeProperty
-from bec_widgets.utils import BECConnector, ConnectionConfig
+from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
 from bec_widgets.utils.colors import Colors

 if TYPE_CHECKING:
@@ -8,7 +8,8 @@ from bec_lib import bec_logger
 from pydantic import BaseModel, Field, ValidationError, field_validator
 from qtpy import QtCore

-from bec_widgets.utils import BECConnector, Colors, ConnectionConfig
+from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
+from bec_widgets.utils.colors import Colors

 if TYPE_CHECKING:  # pragma: no cover
    from bec_widgets.widgets.plots.scatter_waveform.scatter_waveform import ScatterWaveform
@@ -7,7 +7,8 @@ from pydantic import Field, ValidationError, field_validator
 from qtpy.QtCore import QTimer, Signal
 from qtpy.QtWidgets import QHBoxLayout, QMainWindow, QWidget

-from bec_widgets.utils import Colors, ConnectionConfig
+from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils.colors import Colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.settings_dialog import SettingsDialog
 from bec_widgets.utils.toolbars.toolbar import MaterialIconAction
@@ -2,9 +2,9 @@ import os

 from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout

-from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
+from bec_widgets.utils.ui_loader import UILoader


 class ScatterCurveSettings(SettingWidget):
@@ -2,9 +2,9 @@ import os

 from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout, QWidget

-from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
+from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.utils.widget_io import WidgetIO


@@ -8,7 +8,8 @@ from bec_lib import bec_logger
 from pydantic import BaseModel, Field, field_validator
 from qtpy import QtCore

-from bec_widgets.utils import BECConnector, Colors, ConnectionConfig
+from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
+from bec_widgets.utils.colors import Colors

 if TYPE_CHECKING:  # pragma: no cover
    from bec_widgets.widgets.plots.waveform.waveform import Waveform
@@ -50,9 +50,10 @@ from qtpy.QtWidgets import (
 )

 from bec_widgets import SafeSlot
-from bec_widgets.utils import ConnectionConfig, EntryValidator
+from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import Colors
+from bec_widgets.utils.entry_validator import EntryValidator
 from bec_widgets.utils.toolbars.actions import WidgetAction
 from bec_widgets.utils.toolbars.bundles import ToolbarBundle
 from bec_widgets.utils.toolbars.toolbar import MaterialIconAction, ModularToolBar
@@ -0,0 +1,345 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+import pyqtgraph as pg
+from qtpy.QtCore import QObject, Qt, Signal
+from qtpy.QtGui import QColor
+
+from bec_widgets.utils.colors import get_accent_colors, get_theme_name
+from bec_widgets.utils.error_popups import SafeSlot
+from bec_widgets.widgets.plots.waveform.utils.alignment_panel import WaveformAlignmentPanel
+
+
+@dataclass(slots=True)
+class AlignmentContext:
+    """Alignment state produced by `Waveform` and consumed by the controller.
+
+    Attributes:
+        visible: Whether alignment mode is currently visible.
+        positioner_name: Name of the resolved x-axis positioner, if available.
+        precision: Decimal precision to use for readback and target labels.
+        limits: Optional positioner limits for the draggable target line.
+        readback: Current cached positioner readback value.
+        has_dap_curves: Whether the waveform currently contains any DAP curves.
+        force_readback: Whether the embedded positioner should refresh its readback immediately.
+    """
+
+    visible: bool
+    positioner_name: str | None
+    precision: int = 3
+    limits: tuple[float, float] | None = None
+    readback: float | None = None
+    has_dap_curves: bool = False
+    force_readback: bool = False
+
+
+class WaveformAlignmentController(QObject):
+    """Own the alignment plot overlays and synchronize them with the alignment panel."""
+
+    move_absolute_requested = Signal(float)
+    autoscale_requested = Signal()
+
+    def __init__(self, plot_item: pg.PlotItem, panel: WaveformAlignmentPanel, parent=None):
+        super().__init__(parent=parent)
+        self._plot_item = plot_item
+        self._panel = panel
+
+        self._visible = False
+        self._positioner_name: str | None = None
+        self._precision = 3
+        self._limits: tuple[float, float] | None = None
+        self._readback: float | None = None
+        self._marker_line: pg.InfiniteLine | None = None
+        self._target_line: pg.InfiniteLine | None = None
+
+        self._panel.position_readback_changed.connect(self.update_position)
+        self._panel.target_toggled.connect(self._on_target_toggled)
+        self._panel.target_move_requested.connect(self._on_target_move_requested)
+        self._panel.fit_selection_changed.connect(self._on_fit_selection_changed)
+        self._panel.fit_center_requested.connect(self._on_fit_center_requested)
+
+    @property
+    def marker_line(self) -> pg.InfiniteLine | None:
+        """Return the current-position indicator line, if it exists."""
+        return self._marker_line
+
+    @property
+    def target_line(self) -> pg.InfiniteLine | None:
+        """Return the draggable target indicator line, if it exists."""
+        return self._target_line
+
+    def update_context(self, context: AlignmentContext):
+        """Apply waveform-owned alignment context to the panel and plot overlays.
+
+        Args:
+            context: Snapshot of the current alignment-relevant waveform/device state.
+        """
+        previous_name = self._positioner_name
+        self._visible = context.visible
+        self._positioner_name = context.positioner_name
+        self._precision = context.precision
+        self._limits = context.limits
+        self._readback = context.readback
+
+        self._panel.set_positioner_device(context.positioner_name)
+        self._panel.set_positioner_enabled(context.visible and context.positioner_name is not None)
+        self._panel.set_status_message(self._status_message_for_context(context))
+
+        if context.positioner_name is None or not context.visible:
+            self.clear()
+            self._refresh_fit_actions()
+            self._refresh_target_controls()
+            return
+
+        if previous_name != context.positioner_name:
+            self._clear_marker()
+            if self._panel.target_active:
+                self._clear_target_line()
+
+        if context.readback is not None:
+            self.update_position(context.readback)
+
+        if self._panel.target_active:
+            if previous_name != context.positioner_name or self._target_line is None:
+                self._show_target_line()
+            else:
+                self._refresh_target_line_metadata()
+                self._on_target_line_changed()
+
+        if context.force_readback or previous_name != context.positioner_name:
+            self._panel.force_positioner_readback()
+
+        self._refresh_fit_actions()
+        self._refresh_target_controls()
+
+    @SafeSlot(float)
+    def update_position(self, position: float):
+        """Update the live position marker from a positioner readback value.
+
+        Args:
+            position: Current absolute position of the active alignment positioner.
+        """
+        self._readback = float(position)
+        if not self._visible or self._positioner_name is None:
+            self._clear_marker()
+            return
+
+        self._ensure_marker()
+        self._marker_line.setValue(self._readback)
+        self._marker_line.label.setText(
+            f"{self._positioner_name}: {self._readback:.{self._precision}f}"
+        )
+        self.autoscale_requested.emit()
+
+    @SafeSlot(dict, dict)
+    def update_dap_summary(self, data: dict, metadata: dict):
+        """Forward DAP summary updates into the alignment fit panel.
+
+        Args:
+            data: DAP fit summary payload.
+            metadata: Metadata describing the emitting DAP curve.
+        """
+        self._panel.update_dap_summary(data, metadata)
+        self._refresh_fit_actions()
+
+    @SafeSlot(str)
+    def remove_dap_curve(self, curve_id: str):
+        """Remove a deleted DAP curve from the alignment fit selection state.
+
+        Args:
+            curve_id: Label of the DAP curve that was removed from the waveform.
+        """
+        self._panel.remove_dap_curve(curve_id)
+        self._panel.clear_fit_selection_if_missing()
+        self._refresh_fit_actions()
+
+    def clear(self):
+        """Remove alignment overlay items from the plot and reset target state."""
+        self._clear_marker()
+        self._clear_target_line()
+
+    def cleanup(self):
+        """Disconnect panel signals and remove all controller-owned overlay items."""
+        self.clear()
+        self._disconnect_panel_signals()
+
+    def refresh_theme_colors(self):
+        """Reapply theme-aware styling to any existing alignment overlay items."""
+        self._apply_marker_style()
+        self._apply_target_style()
+
+    def _disconnect_panel_signals(self):
+        signal_pairs = [
+            (self._panel.position_readback_changed, self.update_position),
+            (self._panel.target_toggled, self._on_target_toggled),
+            (self._panel.target_move_requested, self._on_target_move_requested),
+            (self._panel.fit_selection_changed, self._on_fit_selection_changed),
+            (self._panel.fit_center_requested, self._on_fit_center_requested),
+        ]
+        for signal, slot in signal_pairs:
+            try:
+                signal.disconnect(slot)
+            except (RuntimeError, TypeError):
+                continue
+
+    def _selected_fit_has_center(self) -> bool:
+        data = self._panel.selected_fit_summary()
+        params = data.get("params", []) if isinstance(data, dict) else []
+        return any(param[0] == "center" for param in params if param)
+
+    @staticmethod
+    def _status_message_for_context(context: AlignmentContext) -> str | None:
+        if context.positioner_name is None:
+            return "Alignment mode requires a positioner on the x axis."
+        if not context.has_dap_curves:
+            return "Add a DAP curve in Curve Settings to enable alignment fitting."
+        return None
+
+    def _refresh_fit_actions(self):
+        self._panel.set_fit_actions_enabled(
+            self._visible and self._positioner_name is not None and self._selected_fit_has_center()
+        )
+
+    def _refresh_target_controls(self):
+        has_positioner = self._visible and self._positioner_name is not None
+        self._panel.set_target_enabled(has_positioner)
+        self._panel.set_target_move_enabled(has_positioner and self._target_line is not None)
+        if self._target_line is None:
+            self._panel.set_target_value(None)
+
+    def _ensure_marker(self):
+        if self._marker_line is not None:
+            return
+
+        warning = get_accent_colors().warning
+
+        self._marker_line = pg.InfiniteLine(
+            angle=90,
+            movable=False,
+            pen=pg.mkPen(warning, width=4),
+            label="",
+            labelOpts={"position": 0.95, "color": warning},
+        )
+        self._apply_marker_style()
+        self._plot_item.addItem(self._marker_line)
+
+    def _clear_marker(self):
+        if self._marker_line is None:
+            return
+        self._plot_item.removeItem(self._marker_line)
+        self._marker_line = None
+
+    def _show_target_line(self):
+        if not self._visible or self._positioner_name is None:
+            return
+
+        if self._target_line is None:
+            accent_colors = get_accent_colors()
+            label = f"{self._positioner_name} target={{value:0.{self._precision}f}}"
+            self._target_line = pg.InfiniteLine(
+                movable=True,
+                angle=90,
+                pen=pg.mkPen(accent_colors.default, width=2, style=Qt.PenStyle.DashLine),
+                hoverPen=pg.mkPen(accent_colors.success, width=2),
+                label=label,
+                labelOpts={"movable": True, "color": accent_colors.default},
+            )
+            self._target_line.sigPositionChanged.connect(self._on_target_line_changed)
+            self._apply_target_style()
+            self._plot_item.addItem(self._target_line)
+        self._refresh_target_line_metadata()
+
+        value = 0.0 if self._readback is None else self._readback
+        if self._limits is not None:
+            value = min(max(value, self._limits[0]), self._limits[1])
+        self._target_line.setValue(value)
+        self._on_target_line_changed()
+        self.autoscale_requested.emit()
+
+    def _refresh_target_line_metadata(self):
+        if self._target_line is None or self._positioner_name is None:
+            return
+        self._apply_target_style()
+        self._target_line.label.setFormat(
+            f"{self._positioner_name} target={{value:0.{self._precision}f}}"
+        )
+        if self._limits is not None:
+            self._target_line.setBounds(list(self._limits))
+        else:
+            self._target_line.setBounds((None, None))
+        if self._limits is not None:
+            current_value = float(self._target_line.value())
+            clamped_value = min(max(current_value, self._limits[0]), self._limits[1])
+            if clamped_value != current_value:
+                self._target_line.setValue(clamped_value)
+
+    def _clear_target_line(self):
+        if self._target_line is not None:
+            try:
+                self._target_line.sigPositionChanged.disconnect(self._on_target_line_changed)
+            except (RuntimeError, TypeError):
+                pass
+            self._plot_item.removeItem(self._target_line)
+            self._target_line = None
+        self._panel.set_target_value(None)
+
+    def _apply_marker_style(self):
+        if self._marker_line is None:
+            return
+
+        accent_colors = get_accent_colors()
+        warning = accent_colors.warning
+
+        self._marker_line.setPen(pg.mkPen(warning, width=4))
+        self._marker_line.label.setColor(warning)
+        self._marker_line.label.fill = pg.mkBrush(self._label_fill_color())
+
+    def _apply_target_style(self):
+        if self._target_line is None:
+            return
+
+        accent_colors = get_accent_colors()
+        default = accent_colors.default
+        success = accent_colors.success
+
+        self._target_line.setPen(pg.mkPen(default, width=2, style=Qt.PenStyle.DashLine))
+        self._target_line.setHoverPen(pg.mkPen(success, width=2))
+        self._target_line.label.setColor(default)
+        self._target_line.label.fill = pg.mkBrush(self._label_fill_color())
+
+    @staticmethod
+    def _label_fill_color() -> QColor:
+        if get_theme_name() == "light":
+            return QColor(244, 244, 244, 228)
+        return QColor(48, 48, 48, 210)
+
+    @SafeSlot(bool)
+    def _on_target_toggled(self, checked: bool):
+        if checked:
+            self._show_target_line()
+        else:
+            self._clear_target_line()
+        self._refresh_target_controls()
+
+    @SafeSlot(object)
+    def _on_target_line_changed(self, _line=None):
+        if self._target_line is None:
+            return
+        self._panel.set_target_value(float(self._target_line.value()), precision=self._precision)
+        self._refresh_target_controls()
+        self.autoscale_requested.emit()
+
+    @SafeSlot()
+    def _on_target_move_requested(self):
+        if self._visible and self._positioner_name is not None and self._target_line is not None:
+            self.move_absolute_requested.emit(float(self._target_line.value()))
+
+    @SafeSlot(str)
+    def _on_fit_selection_changed(self, _curve_id: str):
+        self._refresh_fit_actions()
+
+    @SafeSlot(float)
+    def _on_fit_center_requested(self, value: float):
+        if self._visible and self._positioner_name is not None:
+            self.move_absolute_requested.emit(float(value))
@@ -0,0 +1,285 @@
+from __future__ import annotations
+
+from qtpy.QtCore import Qt, Signal
+from qtpy.QtGui import QColor
+from qtpy.QtWidgets import (
+    QCheckBox,
+    QGridLayout,
+    QGroupBox,
+    QHBoxLayout,
+    QLabel,
+    QPushButton,
+    QSizePolicy,
+    QWidget,
+)
+
+from bec_widgets.utils.colors import get_accent_colors, get_theme_name
+from bec_widgets.widgets.control.device_control.positioner_box.positioner_control_line.positioner_control_line import (
+    PositionerControlLine,
+)
+from bec_widgets.widgets.dap.lmfit_dialog.lmfit_dialog import LMFitDialog
+
+
+class WaveformAlignmentPanel(QWidget):
+    """Compact bottom panel used by Waveform alignment mode."""
+
+    position_readback_changed = Signal(float)
+    target_toggled = Signal(bool)
+    target_move_requested = Signal()
+    fit_selection_changed = Signal(str)
+    fit_center_requested = Signal(float)
+
+    def __init__(self, parent=None, client=None, gui_id: str | None = None, **kwargs):
+        super().__init__(parent=parent, **kwargs)
+        self.setProperty("skip_settings", True)
+
+        self.positioner = PositionerControlLine(parent=self, client=client, gui_id=gui_id)
+        self.positioner.hide_device_selection = True
+
+        self.fit_dialog = LMFitDialog(
+            parent=self, client=client, gui_id=gui_id, ui_file="lmfit_dialog_compact.ui"
+        )
+        self.fit_dialog.active_action_list = ["center"]
+        self.fit_dialog.enable_actions = False
+
+        self.target_toggle = QCheckBox("Target: --", parent=self)
+        self.move_to_target_button = QPushButton("Move To Target", parent=self)
+        self.move_to_target_button.setEnabled(False)
+        self.target_group = QGroupBox("Target Position", parent=self)
+
+        self.status_label = QLabel(parent=self)
+        self.status_label.setWordWrap(False)
+        self.status_label.setAlignment(
+            Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter
+        )
+        self.status_label.setSizePolicy(QSizePolicy.Policy.Maximum, QSizePolicy.Policy.Fixed)
+        self.status_label.setMaximumHeight(28)
+        self.status_label.setVisible(False)
+
+        self._init_ui()
+        self.fit_dialog.setMinimumHeight(0)
+        self.target_group.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
+        self._sync_target_group_size()
+        self.refresh_theme_colors()
+        self._connect_signals()
+
+    def _connect_signals(self):
+        self.positioner.position_update.connect(self.position_readback_changed)
+        self.target_toggle.toggled.connect(self.target_toggled)
+        self.move_to_target_button.clicked.connect(self.target_move_requested)
+        self.fit_dialog.selected_fit.connect(self.fit_selection_changed)
+        self.fit_dialog.move_action.connect(self._forward_fit_move_action)
+
+    def _init_ui(self):
+        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
+        self.setMinimumHeight(260)
+
+        root = QGridLayout(self)
+        root.setContentsMargins(8, 8, 8, 8)
+        root.setSpacing(8)
+
+        self.fit_dialog.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
+        root.addWidget(
+            self.status_label,
+            0,
+            0,
+            1,
+            2,
+            alignment=Qt.AlignmentFlag.AlignHCenter | Qt.AlignmentFlag.AlignVCenter,
+        )
+        root.addWidget(self.fit_dialog, 1, 0, 1, 2)
+
+        target_layout = QHBoxLayout(self.target_group)
+        target_layout.addWidget(self.target_toggle)
+        target_layout.addWidget(self.move_to_target_button)
+
+        root.addWidget(self.positioner, 2, 0, alignment=Qt.AlignmentFlag.AlignTop)
+        root.addWidget(self.target_group, 2, 1, alignment=Qt.AlignmentFlag.AlignTop)
+        root.setColumnStretch(0, 1)
+        root.setColumnStretch(1, 0)
+        root.setRowStretch(1, 1)
+
+    def _sync_target_group_size(self):
+        representative_text = "Target: -99999.999"
+        label_width = max(
+            self.target_toggle.sizeHint().width(),
+            self.target_toggle.fontMetrics().horizontalAdvance(representative_text) + 24,
+        )
+        self.target_toggle.setMinimumWidth(label_width)
+
+        # To make those two box the same height
+        target_height = max(
+            self.positioner.height(),
+            self.positioner.ui.device_box.minimumSizeHint().height(),
+            self.positioner.ui.device_box.sizeHint().height(),
+        )
+        self.target_group.setFixedHeight(target_height)
+        self.target_group.setFixedWidth(self.target_group.sizeHint().width() + 16)
+
+    def showEvent(self, event):
+        super().showEvent(event)
+        self._sync_target_group_size()
+
+    def resizeEvent(self, event):
+        super().resizeEvent(event)
+        self._sync_target_group_size()
+
+    def set_status_message(self, text: str | None):
+        """Show or hide the alignment status pill.
+
+        Args:
+            text: Message to display. Pass `None` or an empty string to hide the pill.
+        """
+
+        text = text or ""
+        self.status_label.setText(text)
+        self.status_label.setVisible(bool(text))
+
+    @staticmethod
+    def _qcolor_to_rgba(color: QColor, alpha: int | None = None) -> str:
+        if alpha is not None:
+            color = QColor(color)
+            color.setAlpha(alpha)
+        return f"rgba({color.red()}, {color.green()}, {color.blue()}, {color.alpha()})"
+
+    def refresh_theme_colors(self):
+        """Apply theme-aware accent styling to the status pill."""
+        warning = get_accent_colors().warning
+        is_light = get_theme_name() == "light"
+        text_color = "#202124" if is_light else warning.name()
+        fill_alpha = 72 if is_light else 48
+        border_alpha = 220 if is_light else 160
+
+        self.status_label.setStyleSheet(f"""
+            QLabel {{
+                background-color: {self._qcolor_to_rgba(warning, fill_alpha)};
+                border: 1px solid {self._qcolor_to_rgba(warning, border_alpha)};
+                border-radius: 12px;
+                padding: 4px 10px;
+                color: {text_color};
+            }}
+        """)
+
+    def set_positioner_device(self, device: str | None):
+        """Bind the embedded positioner control to a fixed device.
+
+        Args:
+            device: Name of the positioner device to display, or `None` to clear it.
+        """
+        if device is None:
+            self.positioner.ui.device_box.setTitle("No positioner selected")
+            return
+        if self.positioner.device != device:
+            self.positioner.set_positioner(device)
+        self.positioner.hide_device_selection = True
+
+    def set_positioner_enabled(self, enabled: bool):
+        """Enable or disable the embedded positioner widget.
+
+        Args:
+            enabled: Whether the positioner widget should accept interaction.
+        """
+        self.positioner.setEnabled(enabled)
+
+    def force_positioner_readback(self):
+        """Trigger an immediate readback refresh on the embedded positioner widget."""
+        self.positioner.force_update_readback()
+
+    def set_target_enabled(self, enabled: bool):
+        """Enable or disable the target-line toggle.
+
+        Args:
+            enabled: Whether the target toggle should accept interaction.
+        """
+        self.target_toggle.setEnabled(enabled)
+
+    def set_target_move_enabled(self, enabled: bool):
+        """Enable or disable the move-to-target button.
+
+        Args:
+            enabled: Whether the move button should accept interaction.
+        """
+        self.move_to_target_button.setEnabled(enabled)
+
+    def set_target_active(self, active: bool):
+        """Programmatically toggle the draggable target-line state.
+
+        Args:
+            active: Whether the target line should be considered active.
+        """
+        blocker = self.target_toggle.blockSignals(True)
+        self.target_toggle.setChecked(active)
+        self.target_toggle.blockSignals(blocker)
+        if not active:
+            self.set_target_value(None)
+
+    def set_target_value(self, value: float | None, precision: int = 3) -> None:
+        """
+        Update the target checkbox label for the draggable target line.
+
+        Args:
+            value(float | None): The target value to display. If None, the label will show "--".
+            precision(int): The number of decimal places to display for the target value.
+        """
+        if value is None or not self.target_toggle.isChecked():
+            self.target_toggle.setText("Target: --")
+            return
+        self.target_toggle.setText(f"Target: {value:.{precision}f}")
+
+    def set_fit_actions_enabled(self, enabled: bool):
+        """Enable or disable LMFit action buttons in the embedded fit dialog.
+
+        Args:
+            enabled: Whether fit action buttons should be enabled.
+        """
+        self.fit_dialog.enable_actions = enabled
+
+    def update_dap_summary(self, data: dict, metadata: dict):
+        """Forward a DAP summary update into the embedded fit dialog.
+
+        Args:
+            data: DAP fit summary payload.
+            metadata: Metadata describing the emitting DAP curve.
+        """
+        self.fit_dialog.update_summary_tree(data, metadata)
+
+    def remove_dap_curve(self, curve_id: str):
+        """Remove DAP summary state for a deleted fit curve.
+
+        Args:
+            curve_id: Label of the DAP curve that should be removed.
+        """
+        self.fit_dialog.remove_dap_data(curve_id)
+
+    def clear_fit_selection_if_missing(self):
+        """Select a remaining fit curve if the current selection no longer exists."""
+        fit_curve_id = self.fit_dialog.fit_curve_id
+        if fit_curve_id is not None and fit_curve_id not in self.fit_dialog.summary_data:
+            remaining = list(self.fit_dialog.summary_data)
+            self.fit_dialog.fit_curve_id = remaining[0] if remaining else None
+
+    @property
+    def target_active(self) -> bool:
+        """Whether the target-line checkbox is currently checked."""
+        return self.target_toggle.isChecked()
+
+    @property
+    def selected_fit_curve_id(self) -> str | None:
+        """Return the currently selected fit curve label, if any."""
+        return self.fit_dialog.fit_curve_id
+
+    def selected_fit_summary(self) -> dict | None:
+        """Return the summary payload for the currently selected fit curve.
+
+        Returns:
+            The selected fit summary, or `None` if no fit curve is selected.
+        """
+        fit_curve_id = self.selected_fit_curve_id
+        if fit_curve_id is None:
+            return None
+        return self.fit_dialog.summary_data.get(fit_curve_id)
+
+    def _forward_fit_move_action(self, action: tuple[str, float]):
+        param_name, param_value = action
+        if param_name == "center":
+            self.fit_center_requested.emit(float(param_value))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
wyzula_j	70098dfee2	fix(plugin_utils): ast inheritance map	2026-04-16 20:00:13 +02:00
wyzula_j	a8c595f2a8	fix(monaco_dock): removed cli	2026-04-16 16:38:07 +02:00
wyzula_j	27a5899c8b	fix(imports): use concrete scan control import	2026-04-16 16:31:14 +02:00
wyzula_j	02a5763a0f	test(rpc): cover lazy widget registry discovery	2026-04-16 16:31:14 +02:00
wyzula_j	152aadfffd	perf(rpc): build widget registry from lazy references	2026-04-16 16:31:14 +02:00
wyzula_j	ac6af06ef6	perf(imports): defer package-level widget imports	2026-04-15 10:47:26 +02:00
semantic-release	846b6e6968	3.5.0 Automatically generated by python-semantic-release	2026-04-14 15:29:09 +00:00
perl_d	f562c61e3c	fix: connect signals the correct way around	2026-04-14 17:28:19 +02:00
wyzula_j	bda5d38965	refactor: code cleanup	2026-04-14 17:28:19 +02:00
wyzula_j	9b0ec9dd79	fix(bec_console): persistent bec session	2026-04-14 17:28:19 +02:00
perl_d	1754e759f0	fix: create new bec shell if deleted	2026-04-14 17:28:19 +02:00
perl_d	308e84d0e1	tests: update tests	2026-04-14 17:28:19 +02:00
perl_d	fa2ef83bb9	fix: formatting in plugin template	2026-04-14 17:28:19 +02:00
perl_d	02cb393bb0	feat: add qtermwidget plugin and replace web term	2026-04-14 17:28:19 +02:00
semantic-release	1d3e0214fd	3.4.4 Automatically generated by python-semantic-release	2026-04-14 07:33:15 +00:00
perl_d	37747babda	fix: check for duplicate subscriptions in GUIClient	2026-04-14 09:32:17 +02:00
perl_d	32f5d486d3	fix: make gui client registry callback non static	2026-04-14 09:32:17 +02:00
perl_d	0ff1fdc815	fix: remove staticmethod subscription	2026-04-14 09:32:17 +02:00
perl_d	c7de320ca5	fix: check duplicate stream sub	2026-04-14 09:32:17 +02:00
semantic-release	5b23dce3d0	3.4.3 Automatically generated by python-semantic-release	2026-04-13 09:20:13 +00:00
wakonig_k	5e84d3bec6	fix: Set OPHYD_CONTROL_LAYER to dummy for tests	2026-04-13 11:19:22 +02:00
semantic-release	9a2396ee9c	3.4.2 Automatically generated by python-semantic-release	2026-04-01 12:55:30 +00:00
appel_c	2dab16b684	test: Add tests for admin access	2026-04-01 14:54:28 +02:00
appel_c	e6c8cd0b1a	fix: allow admin user to pass deployment group check	2026-04-01 14:54:28 +02:00
appel_c	242f8933b2	fix(bec-atlas-admin-view): Fix atlas_url to bec-atlas-prod.psi.ch	2026-04-01 14:54:28 +02:00
semantic-release	83ac6bcd37	3.4.1 Automatically generated by python-semantic-release	2026-04-01 08:51:56 +00:00
wyzula_j	90ecd8ea87	fix(ring): hook update hover to update method	2026-04-01 10:51:11 +02:00
copilot-swe-agent[bot]	6e5f6e7fbb	test(ring_progress_bar): add unit tests for hover behavior	2026-04-01 10:51:11 +02:00
wyzula_j	2f75aaea16	fix(ring): changed inheritance to BECWidget and added cleanup	2026-04-01 10:51:11 +02:00
wyzula_j	677550931b	fix(ring): minor general fixes	2026-04-01 10:51:11 +02:00
wyzula_j	96b5179658	fix(ring_progress_bar): added hover mouse effect	2026-04-01 10:51:11 +02:00
wyzula_j	e25b6604d1	fix(hover_widget): make it fancy + mouse tracking	2026-04-01 10:51:11 +02:00
semantic-release	f74c5a4516	3.4.0 Automatically generated by python-semantic-release	2026-03-26 11:25:40 +00:00
wyzula_j	a2923752c2	fix(waveform): alignment panel indicators request autoscale if updated	2026-03-26 12:24:56 +01:00
wyzula_j	a486c52058	feat(waveform): 1D alignment mode panel	2026-03-26 12:24:56 +01:00
wyzula_j	31389a3dd0	fix(lmfit_dialog): compact layout size policy for better alignment panel UX	2026-03-26 12:24:56 +01:00
semantic-release	1676efc1ea	3.3.4 Automatically generated by python-semantic-release	2026-03-24 11:26:35 +00:00
copilot-swe-agent[bot]	05c38d9b82	fix(lmfit_dialog): fix fit_curve_id type annotation and remove_dap_data selection behavior Co-authored-by: wyzula-jan <133381102+wyzula-jan@users.noreply.github.com> Agent-Logs-Url: https://github.com/bec-project/bec_widgets/sessions/97395c0e-0271-4cdf-b39f-f3117d21bfa3	2026-03-24 12:25:44 +01:00
wyzula_j	f67b60ac98	fix(lmfit_dialog): dialog compact adjustment and cleanup of stale methods	2026-03-24 12:25:44 +01:00
wyzula_j	5ec59d5dbb	fix(lmfit_dialog): fix cpp object deleted	2026-03-24 12:25:44 +01:00
semantic-release	d46ffb59f0	3.3.3 Automatically generated by python-semantic-release	2026-03-23 18:24:36 +00:00
wyzula_j	da400d20b6	fix(positioner_box): remove CompactPopupWidget inheritance	2026-03-23 19:23:47 +01:00
semantic-release	20f06d8659	3.3.2 Automatically generated by python-semantic-release	2026-03-22 19:13:32 +00:00
wakonig_k	3d29a67c0b	fix: typos	2026-03-22 20:12:46 +01:00
semantic-release	e7ef8a3891	3.3.1 Automatically generated by python-semantic-release	2026-03-20 14:01:06 +00:00
wyzula_j	90222f3082	fix(dap_combobox): rewritten as proper combobox	2026-03-20 15:00:12 +01:00
wyzula_j	79af15a88b	fix(dap_combobox): added safeguard for no DAP models	2026-03-20 15:00:12 +01:00
semantic-release	ad01011a3e	3.3.0 Automatically generated by python-semantic-release	2026-03-20 13:18:49 +00:00
appel_c	d4ecefd80a	fix: Fix black 2026 formatting	2026-03-20 14:17:41 +01:00
appel_c	d4afcb6832	refactor(fuzzy-search): unify is_match for fuzzy search	2026-03-20 14:17:41 +01:00
appel_c	2b0f575733	refactor(atlas-http-service): Rename AtlasEndpoints	2026-03-20 14:17:41 +01:00
appel_c	0c6f3f8352	fix(admin-widget): Cleanup and minor improvements	2026-03-20 14:17:41 +01:00
wakonig_k	48c9c83bb0	fix(admin_view): minor changes fixed the styling and avoid shadowing styles minor rewording	2026-03-20 14:17:41 +01:00
appel_c	ab223d5fdc	refactor: fix formatting, running black 2026.1	2026-03-20 14:17:41 +01:00
appel_c	137e572a94	fix(admin-view): generate RPC interface for AdminView	2026-03-20 14:17:41 +01:00
appel_c	b14b046882	fix(main-app): fix id for main-app init of AdminView	2026-03-20 14:17:41 +01:00
appel_c	a7a9458180	refactor: address review comments	2026-03-20 14:17:41 +01:00
appel_c	23c146b3e6	fix(bec-atlas-admin-view): Fix connect_slot for dispatcher	2026-03-20 14:17:41 +01:00
appel_c	df44d9b50e	test(bec-atlas-admin-view): complement tests for BECAtlasAdminView, ExperimentSelection, BECAtlasHTTPService	2026-03-20 14:17:41 +01:00
appel_c	de941d1bc5	fix(actions): allow minimum icon size for actions in toolbar	2026-03-20 14:17:41 +01:00
appel_c	34e80ee8f9	test(bec-atlas-http-service): add tests for http service	2026-03-20 14:17:41 +01:00
appel_c	d1a1d85abd	fix(login-dialog): remove login_dialog	2026-03-20 14:17:41 +01:00
appel_c	8e53ae2d39	fix(RPC): fix rpc access	2026-03-20 14:17:41 +01:00
appel_c	889e9c0994	fix(pyproject): add PyJWT as dependency	2026-03-20 14:17:41 +01:00
appel_c	f565deb71d	fix(main-app): skip on_enter/exit hooks if darkmodebutton clicked	2026-03-20 14:17:41 +01:00
appel_c	895b318990	refactor: cleanup widgets	2026-03-20 14:17:41 +01:00
appel_c	3a17a249ed	refactor(admin-view): Refactor experiment selection, http service, admin view, and add main view	2026-03-20 14:17:41 +01:00
appel_c	598c453a18	feat(experiment-selection): add experiment selection widget	2026-03-20 14:17:41 +01:00
appel_c	63059a4ef8	feat(admin-view): add admin view to views	2026-03-20 14:17:41 +01:00
appel_c	ec58fbd6d8	feat(bec-atlas-admin-view): Add initial admin view	2026-03-20 14:17:41 +01:00
appel_c	17708730fc	feat(bec-atlas-admin-view): add http service through QNetworkAccessManager	2026-03-20 14:17:41 +01:00
appel_c	1384a329ab	feat(bec-atlas-admin-view): Add login dilaog	2026-03-20 14:17:41 +01:00
semantic-release	da1dc85b44	3.2.4 Automatically generated by python-semantic-release	2026-03-19 17:23:19 +00:00
wyzula_j	28be696f7c	fix(main_app): setApplicationName("BEC")	2026-03-19 18:22:29 +01:00
semantic-release	008c3a223a	3.2.3 Automatically generated by python-semantic-release	2026-03-16 15:07:09 +00:00
perl_d	b9145d762c	fix: check adding parent for filesystemmodel	2026-03-16 16:06:22 +01:00
perl_d	37a5dc2e9e	fix: refactor client mock with global fakeredis	2026-03-16 16:06:22 +01:00
wakonig_k	1351fcd47b	ci: fix path for uploading logs on failure	2026-03-16 15:49:22 +01:00
semantic-release	14a6b04b11	3.2.2 Automatically generated by python-semantic-release	2026-03-16 14:28:24 +00:00
wyzula_j	4c9d7fddce	fix(image): disconnecting of 2d monitor	2026-03-16 15:26:40 +01:00
semantic-release	39ecb89196	3.2.1 Automatically generated by python-semantic-release	2026-03-16 14:08:42 +00:00
wyzula_j	974f25997d	fix(e2e): bec shell excluded from e2e testing	2026-03-16 15:07:51 +01:00
wyzula_j	e061fa31a9	fix(e2e): bec dock rpc fixed synchronization	2026-03-16 15:07:51 +01:00
wyzula_j	718f99527c	fix(e2e): timeout for maybe_remove_dock_area	2026-03-16 15:07:51 +01:00
				`@@ -1 +0,0 @@`
				`from .components import DeviceTable, DMConfigView, DocstringView, OphydValidation`