0.94.7

Automatically generated by python-semantic-release
fix: formatting of stdout, stderr captured text for logger
2026-04-16 05:30:54 +02:00 · 2024-08-20 13:17:23 +00:00 · 2024-08-14 18:01:51 +02:00 · 2024-08-14 15:05:11 +00:00 · 2024-08-14 16:55:04 +02:00 · 2024-08-14 12:01:45 +00:00
101 changed files with 2200 additions and 702 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,13 +43,20 @@ stages:
  - export QTWEBENGINE_DISABLE_SANDBOX=1

 .clone-repos: &clone-repos
+  - echo -e "\033[35;1m Using branch $BEC_CORE_BRANCH of BEC CORE \033[0;m";
  - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+  - echo -e "\033[35;1m Using branch $OPHYD_DEVICES_BRANCH of OPHYD_DEVICES \033[0;m";
  - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
  - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices

+.install-repos: &install-repos
+  - pip install -e ./ophyd_devices
+  - pip install -e ./bec/bec_lib[dev]
+  - pip install -e ./bec/bec_ipython_client
+
 .install-os-packages: &install-os-packages
  - apt-get update
-  - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+  - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3 xvfb
  - *install-qt-webengine-deps

 before_script:
@@ -131,8 +138,7 @@ tests:
  script:
    - *clone-repos
    - *install-os-packages
-    - pip install -e ./bec/bec_lib[dev]
-    - pip install -e ./bec/bec_ipython_client
+    - *install-repos
    - pip install -e .[dev,pyqt6]
    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
    - coverage report
@@ -169,8 +175,7 @@ test-matrix:
  script:
    - *clone-repos
    - *install-os-packages
-    - pip install -e ./bec/bec_lib[dev]
-    - pip install -e ./bec/bec_ipython_client
+    - *install-repos
    - pip install -e .[dev,$QT_PCKG]
    - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests
  allow_failure: true
@@ -195,10 +200,9 @@ end-2-end-conda:

    - cd ./bec
    - source ./bin/install_bec_dev.sh -t
-
-    - pip install -e ./bec_lib[dev]
-    - pip install -e ./bec_ipython_client[dev]
    - cd ../
+    - pip install -e ./ophyd_devices
+
    - pip install -e .[dev,pyqt6]
    - cd ./tests/end-2-end
    - pytest -v --start-servers --flush-redis --random-order
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,149 +1,157 @@
 # CHANGELOG

-## v0.91.0 (2024-07-23)
-
-### Feature
-
-* feat(dock_area): plugin added ([`a16b87a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a16b87ac28d164230dd2e8020f50ff3a63cd407e))
-
-* feat(dock_area): Added toolbar to dock area to add widgets without CLI interactions ([`cce1367`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cce1367a72fca7206d351894bd1831b7bbfa7ec6))
-
-* feat(toolbar): expandable menu actions ([`28f26e9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/28f26e92a46063db1a194be552156a5d3b2c43e7))
+## v0.94.7 (2024-08-20)

 ### Fix

-* fix(status_item): icons changed to material design ([`1b9c55a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1b9c55a46a0dfd8678c8e95ff64dd6e8cfb9233e))
+* fix: formatting of stdout, stderr captured text for logger ([`939f834`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/939f834a26ddbac0bdead0b60b1cdf52014f182f))

-* fix(plugins): Qt Designer plugins icons adjusted ([`f4844d2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f4844d2e067ce75dc64b89b230d7932b308ddfc2))
-
-### Test
-
-* test(dock_area): tests extended ([`06fab0e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/06fab0eab926cef5677d4988fd1fce09da342dd8))
-
-## v0.90.0 (2024-07-23)
-
-### Feature
-
-* feat(image_widget): plugin added ([`4371168`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/43711680ba253f81fb0ffe764bcaae701b02bb49))
-
-* feat(image_widget): all toolbar actions added ([`501eb92`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/501eb923f12fa6aaa93f5428ca78e57694edfbc0))
-
-* feat(image_widget): image_widget added ([`6a9317f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6a9317facda896ee784c7fc1db0cd3d68cdfcf73))
+## v0.94.6 (2024-08-14)

 ### Fix

-* fix(axis_setting): fix compatibility for issue with horizontal line for PyQt6 ([`1cf6e32`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1cf6e32303f82bc7c3f3391d0e96a88bc31f29fc))
+* fix(server): emit heartbeat with state ([`bc2abe9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/bc2abe945fb5adeec89ed5ac45e966db86ce6ffc))

-* fix(image_widget): image_widget autorange fixed ([`7f49893`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7f49893d2ce3b9d02efa764f7f10442ed6ab8f3c))
+## v0.94.5 (2024-08-14)

-* fix(image_widget): image widget adjusted ([`3d2ca48`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3d2ca4855c36fe0af59a4b540caa3c8023a81773))
+### Build

-* fix(image): only single monitor image is allowed ([`fe7e542`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fe7e542b19dc5b401523501acb74ac03edf62ad4))
+* build: increased min version of bec to 2.21.4

-* fix(image): raw data are saved in image item to always have precise processing ([`c15035b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c15035b6b769a96780a16da9e7f75af3b823654c))
+Since we now rely on reusing the BECClient singleton, we need the fix introduced with 2.21.4 in BEC. ([`4f96d0e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4f96d0e4a14edc4b2839c1dddeda384737dc7a8a))

-### Refactor
+### Fix

-* refactor(jupyter_console_example): added examples of standalone widgets ([`ba0d1ea`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ba0d1ea9031b4ae2e2e73bf269fbfad973b924a5))
+* fix(rpc): use client singleton instead of dispatcher ([`ea9240d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ea9240d2f71931082f33fb6b68231469875c3d63))

-### Test
+* fix: removed qcoreapplication for polling events ([`4d02b42`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4d02b42f11e9882b843317255a4975565c8a536f))

-* test(image_widget): tests added ([`70fb276`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/70fb276fdf31dffc105435d3dfe7c5caea0b10ce))
-
-## v0.89.0 (2024-07-22)
-
-### Feature
-
-* feat(themes): moved themes to bec_qthemes ([`3798714`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3798714369adf4023f833b7749d2f46a0ec74eee))
-
-### Unknown
-
-* Revert &#34;feat(themes): moved themes to bec_qthemes&#34;
-
-This reverts commit 3798714369adf4023f833b7749d2f46a0ec74eee ([`fd6ae91`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fd6ae91993a23a7b8dbb2cf3c4b7c3eda6d2b0f6))
-
-## v0.88.1 (2024-07-22)
+## v0.94.4 (2024-08-14)

 ### Documentation

-* docs: readthedocs icon path fixed ([`2bcaa42`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2bcaa4256d6daaefacb3ead8c72458d7b1498e29))
+* docs: review developer section; add introduction ([`2af5c94`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2af5c94913a3435c1839034df4f45f885b56d08b))

 ### Fix

-* fix(plot_base): set_xy autorange moved to plotbase from waveform ([`a3dff7d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a3dff7decc16115c12dc6b4ef1572552368da309))
+* fix: do not shutdown client in &#34;close&#34;

-### Refactor
+Terminating client connections has to be done at the application level ([`198c1d1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/198c1d1064cc2dae55de4b941929341faddacb28))

-* refactor(toolbar): generalizations of the ToolBarAction ([`ad112d1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ad112d1f08157f6987edd48a0bacf9f669ef1997))
-
-## v0.88.0 (2024-07-19)
-
-### Feature
-
-* feat(waveform_widget): designer plugin added ([`1f8ef52`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1f8ef52b606283038052640849094f515a463403))
-
-* feat(waveform_widget): switch between drag and rectangle mode ([`2be009c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2be009c6477ba26c5cfb4d827534c5d5eb428999))
-
-* feat(waveform_widget): autorange button ([`8df6b00`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8df6b003e5c6a942fa2e875d9790e492c087bf26))
-
-* feat(waveform_widget): dap parameter window ([`1e551d6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1e551d6e9696f79ea2e0a179d13a4fc6c2a128b2))
-
-* feat(waveform): export to matplotlib window of current scene ([`8d93405`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8d9340539967b06b1e15f21a2106a39d5c740f31))
-
-* feat(figure): export dialog can be launched from CLI and from toolbar ([`6ff6111`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6ff611109153b9412dce37c527b19e839d99bba7))
-
-* feat(waveform_widget): added error handle utility ([`a8ff1d4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a8ff1d4cd09cae5eaeb4bd0ea90fdd102e32f3a3))
-
-* feat(curve_dialog): add DAP functionality ([`e830565`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e8305652fde384da037242cf8f7e3606f22bcfb6))
-
-* feat(curve_dialog): curves can be added ([`c926a75`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c926a75a7927d672c044ea8f68771209ae5accc6))
-
-* feat(waveform_widget): BECWaveformWidget toolbar added import/export config ([`fa9b171`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fa9b17191ddbb4043a658dae9aa0801e1dc22b84))
-
-* feat(waveform_widget): BECWaveformWidget added with toolbar ([`755b394`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/755b394c1c4d7c443c442d89c630d08ce5415554))
+## v0.94.3 (2024-08-13)

 ### Fix

-* fix(waveform_widget): plot API unified with BECFigure ([`2c8764a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2c8764a27de89b39b717032b58465e120ec57fbc))
+* fix(curve_dialog): async curves are shown in curve dialog after addition. ([`7aeb2b5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7aeb2b5c26c7c2851e8d663d32521da8daec95ef))

-* fix(colormap_selector): compatibility for PyQt6 when using designer fixed ([`50135b5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/50135b5fe90a88618291e9357f180cb19251dace))
-
-* fix(waveform_widget): adapted for BECWidget base class ([`6eb313f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6eb313fa76e559d62ecd8fa8849142b83817e47c))
-
-* fix(waveform_widget): temporary disabled save/load config ([`7089cf3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7089cf356a43d805241d5621952e544d690e65e0))
-
-* fix(waveform_widget): use @SafeSlot decorator for automatic error message ([`8e588d7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8e588d79c86e950f6915e89c08fa9415c4bd8033))
-
-* fix(waveform): colormaps of curves can be changed and normalised
-
-feat(waveform): colormap can be changed from curve dialog
-
-fix(curve_dialog): default dialog parameters fixed
-
-curve Dialog colormap WIP ([`33495cf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/33495cfe03b363f18db61d8af2983f49027b7a43))
-
-* fix(waveform_widget): adapted for changes from improved scan logic from waveform widget ([`8ac35d7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8ac35d7280b1ff007c10612228d163cc0c5d1a99))
-
-### Refactor
-
-* refactor(icons): icons moved to the assets directory ([`a8b6ef2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a8b6ef20cccae87515b10f054d0ed5b10e152769))
-
-* refactor(waveform_widget): removed PYSIDE6 check ([`47fcb9e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/47fcb9ebfe35ae600cced95a1edc68f6f6e37a04))
+* fix(waveform): async device entry is correctly passed, updated and with new scan the previous data are cleared ([`d56ea95`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d56ea95ef97bfdd0bc3eeddc4505d20b38e28559))

 ### Test

-* test(waveform_widget): test added ([`8d764e2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8d764e2d46a1e017dadc3c4630648c1ca708afc2))
+* test(waveform_widget): added tests for axis setting and curve dialog ([`f285b35`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f285b35b491660549e74349318119f7c2c44f619))

-## v0.87.1 (2024-07-18)
+## v0.94.2 (2024-08-13)

 ### Fix

-* fix(dock): added hasattr to cleanup method for widgets ([`d75c55b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d75c55b2b1ccf156fb789c7813f1c5bdf256f860))
+* fix(image): image is single image mode do not raise popup error when connected twice with the same monitor ([`98b79aa`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/98b79aac7b47b73137f4d582f7f1d552b1d95366))

-* fix: add missing close() call, ensure jupyter console client.shutdown() is called in closeEvent ([`e52ee26`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e52ee2604cb35096f1bd833ca9516d8a34197d35))
+## v0.94.1 (2024-08-12)
+
+### Fix
+
+* fix: issue #292, wrong key was used to clean _slots internal dictionary ([`93d3977`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/93d397759c756397604ebff5e24f3a580be8620d))
+
+## v0.94.0 (2024-08-08)
+
+### Feature
+
+* feat: add PositionerControlLine ([`c80a7cd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c80a7cd1083baa9543a2cee2e3c3a51dfd209b19))

 ### Refactor

-* refactor: BECWidget is a mixin based on BECConnector, for each QWidget in BEC
+* refactor: adjust dimensions ([`0273bf4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0273bf485694609325b5b556a3c69fb53c18446e))

-Handles closeEvent() and RPC registering/unregistering ([`c7feb69`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c7feb6952d590b569f7b0cba3b019a9af0ce0c93))
+## v0.93.5 (2024-08-08)
+
+### Fix
+
+* fix(positioner_box): icons fixed ([`281633d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/281633deff15b6879dac3a4f0770fa6949aaecdc))
+
+### Refactor
+
+* refactor: add button for positioner selection ([`0d190c5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0d190c5c5996e59fec4bdd44d2003e10e200b009))
+
+### Test
+
+* test(dap): wait for fit ([`6269009`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6269009e5451f830cdee58a514c7858483488a8d))
+
+* test(auto-update): wait for rendering ([`6d2442d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6d2442d23c683fe92af13df982ce681c07e99cde))
+
+## v0.93.4 (2024-08-07)
+
+### Fix
+
+* fix: rename DeviceBox to PositionerBox, fix test for validation ([`37aa371`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/37aa371e7c4c62d70abf37abc125db0c088790fe))
+
+* fix: add validation for bec_lib.device.Positioner; closes #268 ([`eb54e9f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/eb54e9f788e97af23db8fe0c78f8facb8688bb99))
+
+## v0.93.3 (2024-08-07)
+
+### Fix
+
+* fix(dock): properly shut down docks and temp areas ([`99ee545`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/99ee545e41c6078654958b668b5b329f85553d16))
+
+* fix(settings): shut down settings dialog ([`b50b3a2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b50b3a27e68956e10e8169a0aa698c911d2d9642))
+
+* fix(website): fixed teardown of website widgets ([`a3d4f5a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a3d4f5ac4bc52acfed2791a1724fade6972ed320))
+
+* fix(dock): properly shut down docks and dock areas ([`bc26497`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/bc264975b1363c9dfea516621d7878c320677d15))
+
+* fix(figure): cleanup pyqtgraph ([`ad07bbf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ad07bbf85e9c8d9838bdd686f69d41c235b7db19))
+
+### Test
+
+* test: removed quit from teardown ([`cf94599`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cf94599c2544d6831c8afbe7b340082077557ed1))
+
+* test: removed explicit call to close the widget ([`bf6294e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/bf6294ecbfd494565d2dc215e4d7e0c280ac7745))
+
+* test: use factory instead of fixture to properly cleanup widgets on teardown ([`9856857`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9856857f4cc7fa229c10d00fbae4452464a207cb))
+
+* test: ensure all toplevelwidgets are closed ([`f9e5897`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f9e58979009cf632feea529700ad191401dd7eb8))
+
+## v0.93.2 (2024-08-07)
+
+### Fix
+
+* fix(scan_group_box): Scan Spinboxes limits increased to max allowed values; setting dialog for step size and decimal precision for ScanDoubleSpinBox on right click ([`a372925`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a372925fffa787c686198ae7cb3f9c15b459c109))
+
+## v0.93.1 (2024-08-06)
+
+### Documentation
+
+* docs: added video tutorial section with BSEG YT video ([`302ae90`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/302ae90139f6a88e2401fe29fe312387486e27a9))
+
+### Fix
+
+* fix(dock): docks have more recognizable red icon for closing docks ([`af86860`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/af86860bf35474805fb1a7bc3725cf8835ed4cc7))
+
+## v0.93.0 (2024-08-05)
+
+### Feature
+
+* feat(themes): moved themes to bec_qthemes
+
+This reverts commit fd6ae91993a23a7b8dbb2cf3c4b7c3eda6d2b0f6 ([`5aad401`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5aad401ef8774c7330784f72cd3b9d8c253e2b6a))
+
+## v0.92.5 (2024-08-05)
+
+### Fix
+
+* fix(spinner): stop timer on close event ([`30fef92`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/30fef929cf6fb4b73f48151c92a0ee54c734031d))
+
+* fix(status_box): fix cleanup of status box ([`1f30dd7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1f30dd73a9c1e3135087a5eef92c7329f54a604e))
+
+### Test
+
+* test: register all widgets with qtbot and close them ([`73cd11e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/73cd11e47277e4437554b785a9551b28a572094f))
--- a/bec_widgets/assets/app_icons/BEC-Dark.png
+++ b/bec_widgets/assets/app_icons/BEC-Dark.png
--- a/bec_widgets/assets/designer_icons/positioner_box.png
+++ b/bec_widgets/assets/designer_icons/positioner_box.png
--- a/bec_widgets/assets/toolbar_icons/device_line_edit.svg
+++ b/bec_widgets/assets/toolbar_icons/device_line_edit.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 -960 960 960" width="48px" fill="#FFFFFF">
+    <path d="M180-404.87v-50.26h289.75v50.26H180Zm0-162.57v-50.25h454.62v50.25H180Zm0-162.3V-780h454.62v50.26H180ZM524.62-180v-105.69l217.15-216.16q7.46-7.07 16.11-10.3 8.65-3.23 17.3-3.23 9.43 0 18.25 3.53 8.82 3.54 16.03 10.62l37 37.38q6.87 7.47 10.21 16.16Q860-439 860-430.31t-3.37 17.69q-3.37 9-10.52 16.46L630.31-180H524.62Zm250.69-211.69 37-38.62-37-37.38-38 38 38 38Z"/>
+</svg>
--- a/bec_widgets/assets/toolbar_icons/positioner_box.svg
+++ b/bec_widgets/assets/toolbar_icons/positioner_box.svg
--- a/bec_widgets/cli/auto_updates.py
+++ b/bec_widgets/cli/auto_updates.py
@@ -1,5 +1,7 @@
 from __future__ import annotations

+import threading
+from queue import Queue
 from typing import TYPE_CHECKING

 from pydantic import BaseModel
@@ -25,6 +27,17 @@ class AutoUpdates:

    def __init__(self, gui: BECDockArea):
        self.gui = gui
+        self.msg_queue = Queue()
+        self.auto_update_thread = None
+        self._shutdown_sentinel = object()
+        self.start()
+
+    def start(self):
+        """
+        Start the auto update thread.
+        """
+        self.auto_update_thread = threading.Thread(target=self.process_queue)
+        self.auto_update_thread.start()

    def start_default_dock(self):
        """
@@ -79,6 +92,16 @@ class AutoUpdates:
        info = self.get_scan_info(msg)
        self.handler(info)

+    def process_queue(self):
+        """
+        Process the message queue.
+        """
+        while True:
+            msg = self.msg_queue.get()
+            if msg is self._shutdown_sentinel:
+                break
+            self.run(msg)
+
    @staticmethod
    def get_selected_device(monitored_devices, selected_device):
        """
@@ -151,3 +174,11 @@ class AutoUpdates:
        fig.clear_all()
        plt = fig.plot(x_name=dev_x, y_name=dev_y, label=f"Scan {info.scan_number} - {dev_y}")
        plt.set(title=f"Scan {info.scan_number}", x_label=dev_x, y_label=dev_y)
+
+    def shutdown(self):
+        """
+        Shutdown the auto update thread.
+        """
+        self.msg_queue.put(self._shutdown_sentinel)
+        if self.auto_update_thread:
+            self.auto_update_thread.join()
--- a/bec_widgets/cli/client.py
+++ b/bec_widgets/cli/client.py
@@ -21,9 +21,10 @@ class Widgets(str, enum.Enum):
    BECQueue = "BECQueue"
    BECStatusBox = "BECStatusBox"
    BECWaveformWidget = "BECWaveformWidget"
-    DeviceBox = "DeviceBox"
    DeviceComboBox = "DeviceComboBox"
    DeviceLineEdit = "DeviceLineEdit"
+    PositionerBox = "PositionerBox"
+    PositionerControlLine = "PositionerControlLine"
    RingProgressBar = "RingProgressBar"
    ScanControl = "ScanControl"
    StopButton = "StopButton"
@@ -2287,24 +2288,6 @@ class BECWaveformWidget(RPCBase):
        """


-class DeviceBox(RPCBase):
-    @property
-    @rpc_call
-    def _config_dict(self) -> "dict":
-        """
-        Get the configuration of the widget.
-
-        Returns:
-            dict: The configuration of the widget.
-        """
-
-    @rpc_call
-    def _get_all_rpc(self) -> "dict":
-        """
-        Get all registered RPC objects.
-        """
-
-
 class DeviceComboBox(RPCBase):
    @property
    @rpc_call
@@ -2359,6 +2342,28 @@ class DeviceLineEdit(RPCBase):
        """


+class PositionerBox(RPCBase):
+    @rpc_call
+    def set_positioner(self, positioner: str):
+        """
+        Set the device
+
+        Args:
+            positioner (Positioner | str) : Positioner to set, accepts str or the device
+        """
+
+
+class PositionerControlLine(RPCBase):
+    @rpc_call
+    def set_positioner(self, positioner: str):
+        """
+        Set the device
+
+        Args:
+            positioner (Positioner | str) : Positioner to set, accepts str or the device
+        """
+
+
 class Ring(RPCBase):
    @rpc_call
    def _get_all_rpc(self) -> "dict":
--- a/bec_widgets/cli/client_utils.py
+++ b/bec_widgets/cli/client_utils.py
@@ -6,17 +6,16 @@ import json
 import os
 import select
 import subprocess
-import sys
 import threading
 import time
 import uuid
 from functools import wraps
 from typing import TYPE_CHECKING

+from bec_lib.client import BECClient
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
 from bec_lib.utils.import_utils import isinstance_based_on_class_name, lazy_import, lazy_import_from
-from qtpy.QtCore import QEventLoop, QSocketNotifier, QTimer

 import bec_widgets.cli.client as client
 from bec_widgets.cli.auto_updates import AutoUpdates
@@ -24,10 +23,6 @@ from bec_widgets.cli.auto_updates import AutoUpdates
 if TYPE_CHECKING:
    from bec_lib.device import DeviceBase

-    from bec_widgets.cli.client import BECDockArea, BECFigure
-
-from bec_lib.serialization import MsgpackSerialization
-
 messages = lazy_import("bec_lib.messages")
 # from bec_lib.connector import MessageObject
 MessageObject = lazy_import_from("bec_lib.connector", ("MessageObject",))
@@ -105,6 +100,7 @@ def _start_plot_process(gui_id: str, gui_class: type, config: dict | str, logger

    env_dict = os.environ.copy()
    env_dict["PYTHONUNBUFFERED"] = "1"
+
    if logger is None:
        stdout_redirect = subprocess.DEVNULL
        stderr_redirect = subprocess.DEVNULL
@@ -184,7 +180,7 @@ class BECGuiClientMixin:
        if isinstance(msg, messages.ScanStatusMessage):
            if not self.gui_is_alive():
                return
-            self.auto_updates.run(msg)
+            self.auto_updates.msg_queue.put(msg)

    def show(self) -> None:
        """
@@ -213,6 +209,8 @@ class BECGuiClientMixin:
                self._process_output_processing_thread.join()
            self._process.wait()
            self._process = None
+        if self.auto_updates is not None:
+            self.auto_updates.shutdown()


 class RPCResponseTimeoutError(Exception):
@@ -224,54 +222,14 @@ class RPCResponseTimeoutError(Exception):
        )


-class QtRedisMessageWaiter:
-    def __init__(self, redis_connector, message_to_wait):
-        self.ev_loop = QEventLoop()
-        self.response = None
-        self.connector = redis_connector
-        self.message_to_wait = message_to_wait
-        self.pubsub = redis_connector._redis_conn.pubsub()
-        self.pubsub.subscribe(self.message_to_wait.endpoint)
-        fd = self.pubsub.connection._sock.fileno()
-        self.notifier = QSocketNotifier(fd, QSocketNotifier.Read)
-        self.notifier.activated.connect(self._pubsub_readable)
-
-    def _msg_received(self, msg_obj):
-        self.response = msg_obj.value
-        self.ev_loop.quit()
-
-    def wait(self, timeout=1):
-        timer = QTimer()
-        timer.singleShot(timeout * 1000, self.ev_loop.quit)
-        self.ev_loop.exec_()
-        timer.stop()
-        self.notifier.setEnabled(False)
-        self.pubsub.close()
-        return self.response
-
-    def _pubsub_readable(self, fd):
-        while True:
-            msg = self.pubsub.get_message()
-            if msg:
-                if msg["type"] == "subscribe":
-                    # get_message buffers, so we may already have the answer
-                    # let's check...
-                    continue
-                else:
-                    break
-            else:
-                return
-        channel = msg["channel"].decode()
-        msg = MessageObject(topic=channel, value=MsgpackSerialization.loads(msg["data"]))
-        self.connector._execute_callback(self._msg_received, msg, {})
-
-
 class RPCBase:
    def __init__(self, gui_id: str = None, config: dict = None, parent=None) -> None:
-        self._client = BECDispatcher().client
+        self._client = BECClient()  # BECClient is a singleton; here, we simply get the instance
        self._config = config if config is not None else {}
        self._gui_id = gui_id if gui_id is not None else str(uuid.uuid4())
        self._parent = parent
+        self._msg_wait_event = threading.Event()
+        self._rpc_response = None
        super().__init__()
        # print(f"RPCBase: {self._gui_id}")

@@ -315,24 +273,39 @@ class RPCBase:
        # pylint: disable=protected-access
        receiver = self._root._gui_id
        if wait_for_rpc_response:
-            redis_msg = QtRedisMessageWaiter(
-                self._client.connector, MessageEndpoints.gui_instruction_response(request_id)
+            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,
            )

        self._client.connector.set_and_publish(MessageEndpoints.gui_instructions(receiver), rpc_msg)

        if wait_for_rpc_response:
-            response = redis_msg.wait(timeout)
-
-            if response is None:
-                raise RPCResponseTimeoutError(request_id, timeout)
-
+            try:
+                finished = self._msg_wait_event.wait(10)
+                if not finished:
+                    raise RPCResponseTimeoutError(request_id, timeout)
+            finally:
+                self._msg_wait_event.clear()
+                self._client.connector.unregister(
+                    MessageEndpoints.gui_instruction_response(request_id), cb=self._on_rpc_response
+                )
            # get class name
-            if not response.accepted:
-                raise ValueError(response.message["error"])
-            msg_result = response.message.get("result")
+            if not self._rpc_response.accepted:
+                raise ValueError(self._rpc_response.message["error"])
+            msg_result = self._rpc_response.message.get("result")
+            self._rpc_response = None
            return self._create_widget_from_msg_result(msg_result)

+    @staticmethod
+    def _on_rpc_response(msg: MessageObject, parent: RPCBase) -> None:
+        msg = msg.value
+        parent._msg_wait_event.set()
+        parent._rpc_response = msg
+
    def _create_widget_from_msg_result(self, msg_result):
        if msg_result is None:
            return None
@@ -359,4 +332,8 @@ class RPCBase:
        Check if the GUI is alive.
        """
        heart = self._client.connector.get(MessageEndpoints.gui_heartbeat(self._root._gui_id))
-        return heart is not None
+        if heart is None:
+            return False
+        if heart.status == messages.BECStatus.RUNNING:
+            return True
+        return False
--- a/bec_widgets/cli/server.py
+++ b/bec_widgets/cli/server.py
@@ -28,12 +28,13 @@ class BECWidgetsCLIServer:

    def __init__(
        self,
-        gui_id: str = None,
+        gui_id: str,
        dispatcher: BECDispatcher = None,
        client=None,
        config=None,
        gui_class: Union[BECFigure, BECDockArea] = BECFigure,
    ) -> None:
+        self.status = messages.BECStatus.BUSY
        self.dispatcher = BECDispatcher(config=config) if dispatcher is None else dispatcher
        self.client = self.dispatcher.client if client is None else client
        self.client.start()
@@ -47,11 +48,12 @@ class BECWidgetsCLIServer:
        )

        # Setup QTimer for heartbeat
-        self._shutdown_event = False
        self._heartbeat_timer = QTimer()
        self._heartbeat_timer.timeout.connect(self.emit_heartbeat)
        self._heartbeat_timer.start(200)

+        self.status = messages.BECStatus.RUNNING
+
    def on_rpc_update(self, msg: dict, metadata: dict):
        request_id = metadata.get("request_id")
        try:
@@ -111,16 +113,16 @@ class BECWidgetsCLIServer:
        return obj

    def emit_heartbeat(self):
-        if self._shutdown_event is False:
-            self.client.connector.set(
-                MessageEndpoints.gui_heartbeat(self.gui_id),
-                messages.StatusMessage(name=self.gui_id, status=1, info={}),
-                expire=1,
-            )
+        self.client.connector.set(
+            MessageEndpoints.gui_heartbeat(self.gui_id),
+            messages.StatusMessage(name=self.gui_id, status=self.status, info={}),
+            expire=10,
+        )

    def shutdown(self):  # TODO not sure if needed when cleanup is done at level of BECConnector
-        self._shutdown_event = True
+        self.status = messages.BECStatus.IDLE
        self._heartbeat_timer.stop()
+        self.emit_heartbeat()
        self.gui.close()
        self.client.shutdown()

@@ -128,15 +130,15 @@ class BECWidgetsCLIServer:
 class SimpleFileLikeFromLogOutputFunc:
    def __init__(self, log_func):
        self._log_func = log_func
+        self._buffer = []

    def write(self, buffer):
-        for line in buffer.rstrip().splitlines():
-            line = line.rstrip()
-            if line:
-                self._log_func(line)
+        self._buffer.append(buffer)

    def flush(self):
-        return
+        lines, _, remaining = "".join(self._buffer).rpartition("\n")
+        self._log_func(lines)
+        self._buffer = [remaining]

    def close(self):
        return
@@ -231,4 +233,5 @@ def main():


 if __name__ == "__main__":  # pragma: no cover
+    sys.argv = ["bec_widgets.cli.server", "--id", "test", "--gui_class", "BECDockArea"]
    main()
--- a/bec_widgets/examples/general_app/init.py
+++ b/bec_widgets/examples/general_app/init.py
--- a/bec_widgets/examples/general_app/general_app.py
+++ b/bec_widgets/examples/general_app/general_app.py
@@ -0,0 +1,92 @@
+import os
+import sys
+
+from qtpy.QtCore import QSize
+from qtpy.QtGui import QActionGroup, QIcon
+from qtpy.QtWidgets import QApplication, QMainWindow, QStyle
+
+import bec_widgets
+from bec_widgets.examples.general_app.web_links import BECWebLinksMixin
+from bec_widgets.utils.colors import apply_theme
+from bec_widgets.utils.ui_loader import UILoader
+
+MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+
+
+class BECGeneralApp(QMainWindow):
+    def __init__(self, parent=None):
+        super(BECGeneralApp, self).__init__(parent)
+        ui_file_path = os.path.join(os.path.dirname(__file__), "general_app.ui")
+        self.load_ui(ui_file_path)
+
+        self.resize(1280, 720)
+
+        self.ini_ui()
+
+    def ini_ui(self):
+        self._setup_icons()
+        self._hook_menubar_docs()
+        self._hook_theme_bar()
+
+    def load_ui(self, ui_file):
+        loader = UILoader(self)
+        self.ui = loader.loader(ui_file)
+        self.setCentralWidget(self.ui)
+
+    def _hook_menubar_docs(self):
+        # BEC Docs
+        self.ui.action_BEC_docs.triggered.connect(BECWebLinksMixin.open_bec_docs)
+        # BEC Widgets Docs
+        self.ui.action_BEC_widgets_docs.triggered.connect(BECWebLinksMixin.open_bec_widgets_docs)
+        # Bug report
+        self.ui.action_bug_report.triggered.connect(BECWebLinksMixin.open_bec_bug_report)
+
+    def change_theme(self, theme):
+        apply_theme(theme)
+
+    def _setup_icons(self):
+        help_icon = QApplication.style().standardIcon(QStyle.SP_MessageBoxQuestion)
+        bug_icon = QApplication.style().standardIcon(QStyle.SP_MessageBoxInformation)
+        computer_icon = QIcon.fromTheme("computer")
+        widget_icon = QIcon(os.path.join(MODULE_PATH, "assets", "designer_icons", "dock_area.png"))
+
+        self.ui.action_BEC_docs.setIcon(help_icon)
+        self.ui.action_BEC_widgets_docs.setIcon(help_icon)
+        self.ui.action_bug_report.setIcon(bug_icon)
+
+        self.ui.central_tab.setTabIcon(0, widget_icon)
+        self.ui.central_tab.setTabIcon(1, computer_icon)
+
+    def _hook_theme_bar(self):
+        self.ui.action_light.setCheckable(True)
+        self.ui.action_dark.setCheckable(True)
+
+        # Create an action group to make sure only one can be checked at a time
+        theme_group = QActionGroup(self)
+        theme_group.addAction(self.ui.action_light)
+        theme_group.addAction(self.ui.action_dark)
+        theme_group.setExclusive(True)
+
+        # Connect the actions to the theme change method
+
+        self.ui.action_light.triggered.connect(lambda: self.change_theme("light"))
+        self.ui.action_dark.triggered.connect(lambda: self.change_theme("dark"))
+
+        self.ui.action_dark.trigger()
+
+
+def main():  # pragma: no cover
+
+    app = QApplication(sys.argv)
+    icon = QIcon()
+    icon.addFile(
+        os.path.join(MODULE_PATH, "assets", "app_icons", "BEC-Dark.png"), size=QSize(48, 48)
+    )
+    app.setWindowIcon(icon)
+    main_window = BECGeneralApp()
+    main_window.show()
+    sys.exit(app.exec_())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()
--- a/bec_widgets/examples/general_app/general_app.ui
+++ b/bec_widgets/examples/general_app/general_app.ui
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+    <class>MainWindow</class>
+    <widget class="QMainWindow" name="MainWindow">
+        <property name="geometry">
+            <rect>
+                <x>0</x>
+                <y>0</y>
+                <width>1718</width>
+                <height>1139</height>
+            </rect>
+        </property>
+        <property name="windowTitle">
+            <string>MainWindow</string>
+        </property>
+        <property name="tabShape">
+            <enum>QTabWidget::TabShape::Rounded</enum>
+        </property>
+        <widget class="QWidget" name="centralwidget">
+            <layout class="QVBoxLayout" name="verticalLayout_3">
+                <item>
+                    <widget class="QTabWidget" name="central_tab">
+                        <property name="currentIndex">
+                            <number>0</number>
+                        </property>
+                        <widget class="QWidget" name="dock_area_tab">
+                            <attribute name="title">
+                                <string>Dock Area</string>
+                            </attribute>
+                            <layout class="QVBoxLayout" name="verticalLayout">
+                                <property name="leftMargin">
+                                    <number>2</number>
+                                </property>
+                                <property name="topMargin">
+                                    <number>1</number>
+                                </property>
+                                <property name="rightMargin">
+                                    <number>2</number>
+                                </property>
+                                <property name="bottomMargin">
+                                    <number>2</number>
+                                </property>
+                                <item>
+                                    <widget class="BECDockArea" name="dock_area"/>
+                                </item>
+                            </layout>
+                        </widget>
+                        <widget class="QWidget" name="vscode_tab">
+                            <attribute name="icon">
+                                <iconset theme="QIcon::ThemeIcon::Computer"/>
+                            </attribute>
+                            <attribute name="title">
+                                <string>Visual Studio Code</string>
+                            </attribute>
+                            <layout class="QVBoxLayout" name="verticalLayout_2">
+                                <property name="leftMargin">
+                                    <number>2</number>
+                                </property>
+                                <property name="topMargin">
+                                    <number>1</number>
+                                </property>
+                                <property name="rightMargin">
+                                    <number>2</number>
+                                </property>
+                                <property name="bottomMargin">
+                                    <number>2</number>
+                                </property>
+                                <item>
+                                    <widget class="VSCodeEditor" name="vscode"/>
+                                </item>
+                            </layout>
+                        </widget>
+                    </widget>
+                </item>
+            </layout>
+        </widget>
+        <widget class="QMenuBar" name="menubar">
+            <property name="geometry">
+                <rect>
+                    <x>0</x>
+                    <y>0</y>
+                    <width>1718</width>
+                    <height>31</height>
+                </rect>
+            </property>
+            <widget class="QMenu" name="menuHelp">
+                <property name="title">
+                    <string>Help</string>
+                </property>
+                <addaction name="action_BEC_docs"/>
+                <addaction name="action_BEC_widgets_docs"/>
+                <addaction name="action_bug_report"/>
+            </widget>
+            <widget class="QMenu" name="menuTheme">
+                <property name="title">
+                    <string>Theme</string>
+                </property>
+                <addaction name="action_light"/>
+                <addaction name="action_dark"/>
+            </widget>
+            <addaction name="menuTheme"/>
+            <addaction name="menuHelp"/>
+        </widget>
+        <widget class="QStatusBar" name="statusbar"/>
+        <widget class="QDockWidget" name="dock_scan_control">
+            <property name="windowTitle">
+                <string>Scan Control</string>
+            </property>
+            <attribute name="dockWidgetArea">
+                <number>2</number>
+            </attribute>
+            <widget class="QWidget" name="dockWidgetContents_2">
+                <layout class="QVBoxLayout" name="verticalLayout_4">
+                    <item>
+                        <widget class="ScanControl" name="scan_control"/>
+                    </item>
+                </layout>
+            </widget>
+        </widget>
+        <widget class="QDockWidget" name="dock_status_2">
+            <property name="windowTitle">
+                <string>BEC Service Status</string>
+            </property>
+            <attribute name="dockWidgetArea">
+                <number>2</number>
+            </attribute>
+            <widget class="QWidget" name="dockWidgetContents_3">
+                <layout class="QVBoxLayout" name="verticalLayout_5">
+                    <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="BECStatusBox" name="bec_status_box_2"/>
+                    </item>
+                </layout>
+            </widget>
+        </widget>
+        <widget class="QDockWidget" name="dock_queue">
+            <property name="windowTitle">
+                <string>Scan Queue</string>
+            </property>
+            <attribute name="dockWidgetArea">
+                <number>2</number>
+            </attribute>
+            <widget class="QWidget" name="dockWidgetContents_4">
+                <layout class="QVBoxLayout" name="verticalLayout_6">
+                    <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="BECQueue" name="bec_queue">
+                            <row/>
+                            <column/>
+                            <column/>
+                            <column/>
+                            <item row="0" column="0"/>
+                            <item row="0" column="1"/>
+                            <item row="0" column="2"/>
+                        </widget>
+                    </item>
+                </layout>
+            </widget>
+        </widget>
+        <action name="action_BEC_docs">
+            <property name="icon">
+                <iconset theme="QIcon::ThemeIcon::DialogQuestion"/>
+            </property>
+            <property name="text">
+                <string>BEC Docs</string>
+            </property>
+        </action>
+        <action name="action_BEC_widgets_docs">
+            <property name="icon">
+                <iconset theme="QIcon::ThemeIcon::DialogQuestion"/>
+            </property>
+            <property name="text">
+                <string>BEC Widgets Docs</string>
+            </property>
+        </action>
+        <action name="action_bug_report">
+            <property name="icon">
+                <iconset theme="QIcon::ThemeIcon::DialogError"/>
+            </property>
+            <property name="text">
+                <string>Bug Report</string>
+            </property>
+        </action>
+        <action name="action_light">
+            <property name="checkable">
+                <bool>true</bool>
+            </property>
+            <property name="text">
+                <string>Light</string>
+            </property>
+        </action>
+        <action name="action_dark">
+            <property name="checkable">
+                <bool>true</bool>
+            </property>
+            <property name="text">
+                <string>Dark</string>
+            </property>
+        </action>
+    </widget>
+    <customwidgets>
+        <customwidget>
+            <class>WebsiteWidget</class>
+            <extends>QWebEngineView</extends>
+            <header>website_widget</header>
+        </customwidget>
+        <customwidget>
+            <class>BECQueue</class>
+            <extends>QTableWidget</extends>
+            <header>bec_queue</header>
+        </customwidget>
+        <customwidget>
+            <class>ScanControl</class>
+            <extends>QWidget</extends>
+            <header>scan_control</header>
+        </customwidget>
+        <customwidget>
+            <class>VSCodeEditor</class>
+            <extends>WebsiteWidget</extends>
+            <header>vs_code_editor</header>
+        </customwidget>
+        <customwidget>
+            <class>BECStatusBox</class>
+            <extends>QWidget</extends>
+            <header>bec_status_box</header>
+        </customwidget>
+        <customwidget>
+            <class>BECDockArea</class>
+            <extends>QWidget</extends>
+            <header>dock_area</header>
+        </customwidget>
+        <customwidget>
+            <class>QWebEngineView</class>
+            <extends></extends>
+            <header location="global">QtWebEngineWidgets/QWebEngineView</header>
+        </customwidget>
+    </customwidgets>
+    <resources/>
+    <connections/>
+</ui>
--- a/bec_widgets/examples/general_app/web_links.py
+++ b/bec_widgets/examples/general_app/web_links.py
@@ -0,0 +1,15 @@
+import webbrowser
+
+
+class BECWebLinksMixin:
+    @staticmethod
+    def open_bec_docs():
+        webbrowser.open("https://beamline-experiment-control.readthedocs.io/en/latest/")
+
+    @staticmethod
+    def open_bec_widgets_docs():
+        webbrowser.open("https://bec.readthedocs.io/projects/bec-widgets/en/latest/")
+
+    @staticmethod
+    def open_bec_bug_report():
+        webbrowser.open("https://gitlab.psi.ch/groups/bec/-/issues/")
--- a/bec_widgets/examples/jupyter_console/jupyter_console_window.py
+++ b/bec_widgets/examples/jupyter_console/jupyter_console_window.py
@@ -46,6 +46,7 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
                    "w7": self.w7,
                    "w8": self.w8,
                    "w9": self.w9,
+                    "w10": self.w10,
                    "d0": self.d0,
                    "d1": self.d1,
                    "d2": self.d2,
--- a/bec_widgets/examples/plugin_example_pyside/main.py
+++ b/bec_widgets/examples/plugin_example_pyside/main.py
@@ -7,7 +7,8 @@ import sys

 from bec_ipython_client.main import BECIPythonClient
 from qtpy.QtWidgets import QApplication
-from tictactoe import TicTacToe
+
+from bec_widgets.examples.plugin_example_pyside.tictactoe import TicTacToe

 if __name__ == "__main__":  # pragma: no cover
    app = QApplication(sys.argv)
--- a/bec_widgets/examples/plugin_example_pyside/registertictactoe.py
+++ b/bec_widgets/examples/plugin_example_pyside/registertictactoe.py
@@ -2,8 +2,9 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause

 from qtpy.QtDesigner import QPyDesignerCustomWidgetCollection
-from tictactoe import TicTacToe
-from tictactoeplugin import TicTacToePlugin
+
+from bec_widgets.examples.plugin_example_pyside.tictactoe import TicTacToe
+from bec_widgets.examples.plugin_example_pyside.tictactoeplugin import TicTacToePlugin

 # Set PYSIDE_DESIGNER_PLUGINS to point to this directory and load the plugin

--- a/bec_widgets/examples/plugin_example_pyside/tictactoeplugin.py
+++ b/bec_widgets/examples/plugin_example_pyside/tictactoeplugin.py
@@ -4,10 +4,10 @@ import os

 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon
-from tictactoe import TicTacToe
-from tictactoetaskmenu import TicTacToeTaskMenuFactory

 import bec_widgets
+from bec_widgets.examples.plugin_example_pyside.tictactoe import TicTacToe
+from bec_widgets.examples.plugin_example_pyside.tictactoetaskmenu import TicTacToeTaskMenuFactory

 DOM_XML = """
 <ui language='c++'>
--- a/bec_widgets/examples/plugin_example_pyside/tictactoetaskmenu.py
+++ b/bec_widgets/examples/plugin_example_pyside/tictactoetaskmenu.py
@@ -1,11 +1,12 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause

-from qtpy.QtCore import Slot
 from qtpy.QtDesigner import QExtensionFactory, QPyDesignerTaskMenuExtension
 from qtpy.QtGui import QAction
 from qtpy.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout
-from tictactoe import TicTacToe
+
+from bec_widgets.examples.plugin_example_pyside.tictactoe import TicTacToe
+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot


 class TicTacToeDialog(QDialog):  # pragma: no cover
--- a/bec_widgets/qt_utils/error_popups.py
+++ b/bec_widgets/qt_utils/error_popups.py
@@ -6,7 +6,7 @@ from qtpy.QtCore import QObject, Qt, Signal, Slot
 from qtpy.QtWidgets import QApplication, QMessageBox, QPushButton, QVBoxLayout, QWidget


-def SafeSlot(*slot_args, **slot_kwargs):
+def SafeSlot(*slot_args, **slot_kwargs):  # pylint: disable=invalid-name
    """Function with args, acting like a decorator, applying "error_managed" decorator + Qt Slot
    to the passed function, to display errors instead of potentially raising an exception

@@ -34,10 +34,7 @@ class WarningPopupUtility(QObject):
    Utility class to show warning popups in the application.
    """

-    def __init__(self, parent=None):
-        super().__init__(parent)
-
-    @Slot(str, str, str, QWidget)
+    @SafeSlot(str, str, str, QWidget)
    def show_warning_message(self, title, message, detailed_text, widget):
        msg = QMessageBox(widget)
        msg.setIcon(QMessageBox.Warning)
@@ -60,7 +57,10 @@ class WarningPopupUtility(QObject):
        self.show_warning_message(title, message, detailed_text, widget)


-class ErrorPopupUtility(QObject):
+_popup_utility_instance = None
+
+
+class _ErrorPopupUtility(QObject):
    """
    Utility class to manage error popups in the application to show error messages to the users.
    This class is singleton and the error popup can be enabled or disabled globally or attach to widget methods with decorator @error_managed.
@@ -68,24 +68,14 @@ class ErrorPopupUtility(QObject):

    error_occurred = Signal(str, str, QWidget)

-    _instance = None
-    _initialized = False
-
-    def __new__(cls, *args, **kwargs):
-        if cls._instance is None:
-            cls._instance = super(ErrorPopupUtility, cls).__new__(cls)
-            cls._instance._initialized = False
-        return cls._instance
-
    def __init__(self, parent=None):
-        if not self._initialized:
-            super().__init__(parent=parent)
-            self.error_occurred.connect(self.show_error_message)
-            self.enable_error_popup = False
-            self._initialized = True
-            sys.excepthook = self.custom_exception_hook
+        super().__init__(parent=parent)
+        self.error_occurred.connect(self.show_error_message)
+        self.enable_error_popup = False
+        self._initialized = True
+        sys.excepthook = self.custom_exception_hook

-    @Slot(str, str, QWidget)
+    @SafeSlot(str, str, QWidget)
    def show_error_message(self, title, message, widget):
        detailed_text = self.format_traceback(message)
        error_message = self.parse_error_message(detailed_text)
@@ -157,13 +147,12 @@ class ErrorPopupUtility(QObject):
        """
        self.enable_error_popup = bool(state)

-    @classmethod
-    def reset_singleton(cls):
-        """
-        Reset the singleton instance.
-        """
-        cls._instance = None
-        cls._initialized = False
+
+def ErrorPopupUtility():
+    global _popup_utility_instance
+    if not _popup_utility_instance:
+        _popup_utility_instance = _ErrorPopupUtility()
+    return _popup_utility_instance


 class ExampleWidget(QWidget):  # pragma: no cover
--- a/bec_widgets/qt_utils/redis_message_waiter.py
+++ b/bec_widgets/qt_utils/redis_message_waiter.py
@@ -0,0 +1,47 @@
+from bec_lib.serialization import MsgpackSerialization
+from bec_lib.utils import lazy_import_from
+from qtpy.QtCore import QEventLoop, QSocketNotifier, QTimer
+
+MessageObject = lazy_import_from("bec_lib.connector", ("MessageObject",))
+
+
+class QtRedisMessageWaiter:
+    def __init__(self, redis_connector, message_to_wait):
+        self.ev_loop = QEventLoop()
+        self.response = None
+        self.connector = redis_connector
+        self.message_to_wait = message_to_wait
+        self.pubsub = redis_connector._redis_conn.pubsub()
+        self.pubsub.subscribe(self.message_to_wait.endpoint)
+        fd = self.pubsub.connection._sock.fileno()
+        self.notifier = QSocketNotifier(fd, QSocketNotifier.Read)
+        self.notifier.activated.connect(self._pubsub_readable)
+
+    def _msg_received(self, msg_obj):
+        self.response = msg_obj.value
+        self.ev_loop.quit()
+
+    def wait(self, timeout=1):
+        timer = QTimer()
+        timer.singleShot(timeout * 1000, self.ev_loop.quit)
+        self.ev_loop.exec_()
+        timer.stop()
+        self.notifier.setEnabled(False)
+        self.pubsub.close()
+        return self.response
+
+    def _pubsub_readable(self, fd):
+        while True:
+            msg = self.pubsub.get_message()
+            if msg:
+                if msg["type"] == "subscribe":
+                    # get_message buffers, so we may already have the answer
+                    # let's check...
+                    continue
+                else:
+                    break
+            else:
+                return
+        channel = msg["channel"].decode()
+        msg = MessageObject(topic=channel, value=MsgpackSerialization.loads(msg["data"]))
+        self.connector._execute_callback(self._msg_received, msg, {})
--- a/bec_widgets/qt_utils/settings_dialog.py
+++ b/bec_widgets/qt_utils/settings_dialog.py
@@ -1,6 +1,7 @@
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QDialog, QDialogButtonBox, QHBoxLayout, QPushButton, QVBoxLayout, QWidget

+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
+

 class SettingWidget(QWidget):
    """
@@ -105,3 +106,14 @@ class SettingsDialog(QDialog):
        Apply the changes made in the settings widget without closing the dialog.
        """
        self.widget.accept_changes()
+
+    def cleanup(self):
+        """
+        Cleanup the dialog.
+        """
+        self.button_box.close()
+        self.button_box.deleteLater()
+
+    def closeEvent(self, event):
+        self.cleanup()
+        super().closeEvent(event)
--- a/bec_widgets/utils/bec_connector.py
+++ b/bec_widgets/utils/bec_connector.py
@@ -10,11 +10,11 @@ import yaml
 from bec_lib.utils.import_utils import lazy_import_from
 from pydantic import BaseModel, Field, field_validator
 from qtpy.QtCore import QObject, QRunnable, QThreadPool, Signal
-from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QApplication

 from bec_widgets.cli.rpc_register import RPCRegister
 from bec_widgets.qt_utils.error_popups import ErrorPopupUtility
+from bec_widgets.qt_utils.error_popups import SafeSlot as pyqtSlot
 from bec_widgets.utils.yaml_dialog import load_yaml, load_yaml_gui, save_yaml, save_yaml_gui

 BECDispatcher = lazy_import_from("bec_widgets.utils.bec_dispatcher", ("BECDispatcher",))
--- a/bec_widgets/utils/bec_dispatcher.py
+++ b/bec_widgets/utils/bec_dispatcher.py
@@ -8,7 +8,7 @@ import redis
 from bec_lib.client import BECClient
 from bec_lib.redis_connector import MessageObject, RedisConnector
 from bec_lib.service_config import ServiceConfig
-from qtpy.QtCore import PYQT6, PYSIDE6, QCoreApplication, QObject
+from qtpy.QtCore import QObject
 from qtpy.QtCore import Signal as pyqtSignal

 if TYPE_CHECKING:
@@ -75,7 +75,6 @@ class BECDispatcher:

    _instance = None
    _initialized = False
-    qapp = None

    def __new__(cls, client=None, config: str = None, *args, **kwargs):
        if cls._instance is None:
@@ -87,9 +86,6 @@ class BECDispatcher:
        if self._initialized:
            return

-        if not QCoreApplication.instance():
-            BECDispatcher.qapp = QCoreApplication([])
-
        self._slots = collections.defaultdict(set)
        self.client = client

@@ -123,16 +119,6 @@ class BECDispatcher:
        cls._instance = None
        cls._initialized = False

-        if not cls.qapp:
-            return
-
-        # shutdown QCoreApp if it exists
-        if PYQT6:
-            cls.qapp.exit()
-        elif PYSIDE6:
-            cls.qapp.shutdown()
-        cls.qapp = None
-
    def connect_slot(
        self,
        slot: Callable,
@@ -162,9 +148,9 @@ class BECDispatcher:
            return
        self.client.connector.unregister(topics, cb=connected_slot)
        topics_str, _ = self.client.connector._convert_endpointinfo(topics)
-        self._slots[slot].difference_update(set(topics_str))
-        if not self._slots[slot]:
-            del self._slots[slot]
+        self._slots[connected_slot].difference_update(set(topics_str))
+        if not self._slots[connected_slot]:
+            del self._slots[connected_slot]

    def disconnect_topics(self, topics: Union[str, list]):
        self.client.connector.unregister(topics)
--- a/bec_widgets/utils/colors.py
+++ b/bec_widgets/utils/colors.py
@@ -2,11 +2,10 @@ import itertools
 import re
 from typing import Literal

+import bec_qthemes
 import numpy as np
 import pyqtgraph as pg
-import qdarkstyle
 from pydantic_core import PydanticCustomError
-from qdarkstyle import DarkPalette, LightPalette
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QApplication

@@ -14,7 +13,7 @@ CURRENT_THEME = "dark"


 def get_theme_palette():
-    return DarkPalette if CURRENT_THEME == "dark" else LightPalette
+    return bec_qthemes.load_palette(CURRENT_THEME)


 def apply_theme(theme: Literal["dark", "light"]):
@@ -30,7 +29,7 @@ def apply_theme(theme: Literal["dark", "light"]):
        pg_widget.setBackground("k" if theme == "dark" else "w")

    # now define stylesheet according to theme and apply it
-    style = qdarkstyle.load_stylesheet(palette=get_theme_palette())
+    style = bec_qthemes.load_stylesheet(theme)
    app.setStyleSheet(style)


--- a/bec_widgets/widgets/bec_queue/bec_queue.py
+++ b/bec_widgets/widgets/bec_queue/bec_queue.py
@@ -1,12 +1,12 @@
 from bec_lib.endpoints import MessageEndpoints
 from qtpy.QtCore import Qt, Slot
-from qtpy.QtWidgets import QHeaderView, QTableWidget, QTableWidgetItem, QWidget
+from qtpy.QtWidgets import QHBoxLayout, QHeaderView, QTableWidget, QTableWidgetItem, QWidget

 from bec_widgets.utils.bec_connector import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget


-class BECQueue(BECWidget, QTableWidget):
+class BECQueue(BECWidget, QWidget):
    """
    Widget to display the BEC queue.
    """
@@ -19,10 +19,14 @@ class BECQueue(BECWidget, QTableWidget):
        gui_id: str = None,
    ):
        super().__init__(client, config, gui_id)
-        QTableWidget.__init__(self, parent=parent)
-        self.setColumnCount(3)
-        self.setHorizontalHeaderLabels(["Scan Number", "Type", "Status"])
-        header = self.horizontalHeader()
+        QWidget.__init__(self, parent=parent)
+        self.table = QTableWidget(self)
+        self.layout = QHBoxLayout(self)
+        self.layout.addWidget(self.table)
+
+        self.table.setColumnCount(3)
+        self.table.setHorizontalHeaderLabels(["Scan Number", "Type", "Status"])
+        header = self.table.horizontalHeader()
        header.setSectionResizeMode(QHeaderView.Stretch)
        self.bec_dispatcher.connect_slot(self.update_queue, MessageEndpoints.scan_queue_status())
        self.reset_content()
@@ -38,8 +42,8 @@ class BECQueue(BECWidget, QTableWidget):
        """
        # only show the primary queue for now
        queue_info = content.get("queue", {}).get("primary", {}).get("info", [])
-        self.setRowCount(len(queue_info))
-        self.clearContents()
+        self.table.setRowCount(len(queue_info))
+        self.table.clearContents()

        if not queue_info:
            self.reset_content()
@@ -73,6 +77,8 @@ class BECQueue(BECWidget, QTableWidget):
        Returns:
            QTableWidgetItem: The formatted item.
        """
+        if not content or not isinstance(content, str):
+            content = ""
        item = QTableWidgetItem(content)
        item.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
        return item
@@ -88,16 +94,16 @@ class BECQueue(BECWidget, QTableWidget):
            status (str): The status.
        """

-        self.setItem(index, 0, self.format_item(scan_number))
-        self.setItem(index, 1, self.format_item(scan_type))
-        self.setItem(index, 2, self.format_item(status))
+        self.table.setItem(index, 0, self.format_item(scan_number))
+        self.table.setItem(index, 1, self.format_item(scan_type))
+        self.table.setItem(index, 2, self.format_item(status))

    def reset_content(self):
        """
        Reset the content of the table.
        """

-        self.setRowCount(1)
+        self.table.setRowCount(1)
        self.set_row(0, "", "", "")


--- a/bec_widgets/widgets/bec_status_box/bec_status_box.py
+++ b/bec_widgets/widgets/bec_status_box/bec_status_box.py
@@ -56,6 +56,11 @@ class BECServiceStatusMixin(QObject):
        self.client._update_existing_services()
        self.services_update.emit(self.client._services_info, self.client._services_metric)

+    def cleanup(self):
+        """Cleanup the BECServiceStatusMixin."""
+        self._service_update_timer.stop()
+        self._service_update_timer.deleteLater()
+

 class BECStatusBox(BECWidget, QWidget):
    """An autonomous widget to display the status of BEC services.
@@ -290,6 +295,11 @@ class BECStatusBox(BECWidget, QWidget):
            if objects["item"] == item:
                objects["widget"].show_popup()

+    def cleanup(self):
+        """Cleanup the BECStatusBox widget."""
+        self.bec_service_status.cleanup()
+        return super().cleanup()
+

 def main():
    """Main method to run the BECStatusBox widget."""
--- a/bec_widgets/widgets/color_button/color_button.py
+++ b/bec_widgets/widgets/color_button/color_button.py
@@ -34,3 +34,10 @@ class ColorButton(pg.ColorButton):
            return self.color().getRgb()
        if format == "HEX":
            return self.color().name()
+
+    def cleanup(self):
+        """
+        Clean up the ColorButton.
+        """
+        self.colorDialog.close()
+        self.colorDialog.deleteLater()
--- a/bec_widgets/widgets/console/console.py
+++ b/bec_widgets/widgets/console/console.py
@@ -18,10 +18,11 @@ import pyte
 from qtpy import QtCore, QtGui, QtWidgets
 from qtpy.QtCore import QSize, QSocketNotifier, Qt
 from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtGui import QClipboard, QTextCursor
 from qtpy.QtWidgets import QApplication, QHBoxLayout, QScrollBar, QSizePolicy

+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
+
 ansi_colors = {
    "black": "#000000",
    "red": "#CD0000",
@@ -289,7 +290,7 @@ class _TerminalWidget(QtWidgets.QPlainTextEdit):
        old["value"] = value
        self.dataReady(self.backend.screen, reset_scroll=False)

-    @pyqtSlot(object)
+    @Slot(object)
    def keyPressEvent(self, event):
        """
        Redirect all keystrokes to the terminal process.
--- a/bec_widgets/widgets/device_box/device_box.pyproject
+++ b/bec_widgets/widgets/device_box/device_box.pyproject
@@ -1 +0,0 @@
-{'files': ['device_box.py']}
--- a/bec_widgets/widgets/device_combobox/device_combobox.py
+++ b/bec_widgets/widgets/device_combobox/device_combobox.py
@@ -34,7 +34,7 @@ class DeviceComboBox(DeviceInputBase, QComboBox):
    ):
        super().__init__(client=client, config=config, gui_id=gui_id)
        QComboBox.__init__(self, parent=parent)
-
+        self.setMinimumSize(125, 26)
        self.populate_combobox()

        if arg_name is not None:
--- a/bec_widgets/widgets/dock/dock.py
+++ b/bec_widgets/widgets/dock/dock.py
@@ -3,7 +3,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any, Literal, Optional

 from pydantic import Field
-from pyqtgraph.dockarea import Dock
+from pyqtgraph.dockarea import Dock, DockLabel
+from qtpy import QtCore, QtGui

 from bec_widgets.cli.rpc_wigdet_handler import widget_handler
 from bec_widgets.utils import ConnectionConfig, GridLayoutManager
@@ -12,8 +13,6 @@ from bec_widgets.utils.bec_widget import BECWidget
 if TYPE_CHECKING:
    from qtpy.QtWidgets import QWidget

-    from bec_widgets.widgets.dock import BECDockArea
-

 class DockConfig(ConnectionConfig):
    widgets: dict[str, Any] = Field({}, description="The widgets in the dock.")
@@ -25,6 +24,81 @@ class DockConfig(ConnectionConfig):
    )


+class CustomDockLabel(DockLabel):
+    def __init__(self, text: str, closable: bool = True):
+        super().__init__(text, closable)
+        if closable:
+            red_icon = QtGui.QIcon()
+            pixmap = QtGui.QPixmap(32, 32)
+            pixmap.fill(QtCore.Qt.GlobalColor.red)
+            painter = QtGui.QPainter(pixmap)
+            pen = QtGui.QPen(QtCore.Qt.GlobalColor.white)
+            pen.setWidth(2)
+            painter.setPen(pen)
+            painter.drawLine(8, 8, 24, 24)
+            painter.drawLine(24, 8, 8, 24)
+            painter.end()
+            red_icon.addPixmap(pixmap)
+
+            self.closeButton.setIcon(red_icon)
+
+    def updateStyle(self):
+        r = "3px"
+        if self.dim:
+            fg = "#aaa"
+            bg = "#44a"
+            border = "#339"
+        else:
+            fg = "#fff"
+            bg = "#3f4042"
+            border = "#3f4042"
+
+        if self.orientation == "vertical":
+            self.vStyle = """DockLabel {
+                background-color : %s;
+                color : %s;
+                border-top-right-radius: 0px;
+                border-top-left-radius: %s;
+                border-bottom-right-radius: 0px;
+                border-bottom-left-radius: %s;
+                border-width: 0px;
+                border-right: 2px solid %s;
+                padding-top: 3px;
+                padding-bottom: 3px;
+                font-size: %s;
+            }""" % (
+                bg,
+                fg,
+                r,
+                r,
+                border,
+                self.fontSize,
+            )
+            self.setStyleSheet(self.vStyle)
+        else:
+            self.hStyle = """DockLabel {
+                background-color : %s;
+                color : %s;
+                border-top-right-radius: %s;
+                border-top-left-radius: %s;
+                border-bottom-right-radius: 0px;
+                border-bottom-left-radius: 0px;
+                border-width: 0px;
+                border-bottom: 2px solid %s;
+                padding-left: 3px;
+                padding-right: 3px;
+                font-size: %s;
+            }""" % (
+                bg,
+                fg,
+                r,
+                r,
+                border,
+                self.fontSize,
+            )
+            self.setStyleSheet(self.hStyle)
+
+
 class BECDock(BECWidget, Dock):
    USER_ACCESS = [
        "_config_dict",
@@ -51,6 +125,7 @@ class BECDock(BECWidget, Dock):
        name: str | None = None,
        client=None,
        gui_id: str | None = None,
+        closable: bool = True,
        **kwargs,
    ) -> None:
        if config is None:
@@ -62,7 +137,9 @@ class BECDock(BECWidget, Dock):
                config = DockConfig(**config)
            self.config = config
        super().__init__(client=client, config=config, gui_id=gui_id)
-        Dock.__init__(self, name=name, **kwargs)
+        label = CustomDockLabel(text=name, closable=closable)
+        Dock.__init__(self, name=name, label=label, **kwargs)
+        # Dock.__init__(self, name=name, **kwargs)

        self.parent_dock_area = parent_dock_area

@@ -76,6 +153,7 @@ class BECDock(BECWidget, Dock):
        super().dropEvent(event)
        if old_area in self.orig_area.tempAreas and old_area != self.orig_area:
            self.orig_area.removeTempArea(old_area)
+            old_area.window().deleteLater()

    def float(self):
        """
@@ -207,7 +285,7 @@ class BECDock(BECWidget, Dock):
        """
        Attach the dock to the parent dock area.
        """
-        self.orig_area.removeTempArea(self.area)
+        self.parent_dock_area.remove_temp_area(self.area)

    def detach(self):
        """
@@ -242,6 +320,8 @@ class BECDock(BECWidget, Dock):
            if hasattr(widget, "cleanup"):
                widget.cleanup()
        self.widgets.clear()
+        self.label.close()
+        self.label.deleteLater()
        super().cleanup()

    def close(self):
--- a/bec_widgets/widgets/dock/dock_area.py
+++ b/bec_widgets/widgets/dock/dock_area.py
@@ -83,8 +83,8 @@ class BECDockArea(BECWidget, QWidget):
                        "scan_control": IconAction(
                            icon_path="scan_control.svg", tooltip="Add Scan Control"
                        ),
-                        "device_box": IconAction(
-                            icon_path="device_box.svg", tooltip="Add Device Box"
+                        "positioner_box": IconAction(
+                            icon_path="positioner_box.svg", tooltip="Add Device Box"
                        ),
                    },
                ),
@@ -132,8 +132,8 @@ class BECDockArea(BECWidget, QWidget):
        self.toolbar.widgets["menu_devices"].widgets["scan_control"].triggered.connect(
            lambda: self.add_dock(widget="ScanControl", prefix="scan_control")
        )
-        self.toolbar.widgets["menu_devices"].widgets["device_box"].triggered.connect(
-            lambda: self.add_dock(widget="DeviceBox", prefix="device_box")
+        self.toolbar.widgets["menu_devices"].widgets["positioner_box"].triggered.connect(
+            lambda: self.add_dock(widget="PositionerBox", prefix="positioner_box")
        )

        # Menu Utils
@@ -231,6 +231,7 @@ class BECDockArea(BECWidget, QWidget):
        self.config.docks.pop(name, None)
        if dock:
            dock.close()
+            dock.deleteLater()
            if len(self.dock_area.docks) <= 1:
                for dock in self.dock_area.docks.values():
                    dock.hide_title_bar()
@@ -329,7 +330,16 @@ class BECDockArea(BECWidget, QWidget):
        """
        while self.dock_area.tempAreas:
            for temp_area in self.dock_area.tempAreas:
-                self.dock_area.removeTempArea(temp_area)
+                self.remove_temp_area(temp_area)
+
+    def remove_temp_area(self, area):
+        """
+        Remove a temporary area from the dock area.
+        This is a patched method of pyqtgraph's removeTempArea
+        """
+        self.dock_area.tempAreas.remove(area)
+        area.window().close()
+        area.window().deleteLater()

    def clear_all(self):
        """
@@ -345,6 +355,10 @@ class BECDockArea(BECWidget, QWidget):
        Cleanup the dock area.
        """
        self.clear_all()
+        self.toolbar.close()
+        self.toolbar.deleteLater()
+        self.dock_area.close()
+        self.dock_area.deleteLater()
        super().cleanup()

    def close(self):
--- a/bec_widgets/widgets/figure/figure.py
+++ b/bec_widgets/widgets/figure/figure.py
@@ -164,7 +164,7 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
    def __getitem__(self, key: tuple | str):
        if isinstance(key, tuple) and len(key) == 2:
            return self.axes(*key)
-        elif isinstance(key, str):
+        if isinstance(key, str):
            widget = self._widgets.get(key)
            if widget is None:
                raise KeyError(f"No widget with ID {key}")
@@ -185,7 +185,7 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
        self.change_theme(self.config.theme)

        # widget_config has to be reset for not have each widget config twice when added to the figure
-        widget_configs = [config for config in self.config.widgets.values()]
+        widget_configs = list(self.config.widgets.values())
        self.config.widgets = {}
        for widget_config in widget_configs:
            getattr(self, self.widget_method_map[widget_config.widget_class])(
@@ -233,8 +233,8 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
        """Export the plot widget."""
        try:
            plot_item = self.widget_list[0]
-        except:
-            raise ValueError("No plot widget available to export.")
+        except Exception as exc:
+            raise ValueError("No plot widget available to export.") from exc

        scene = plot_item.scene()
        scene.contextMenuItem = plot_item
@@ -513,6 +513,13 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
        if widget_id in self._widgets:
            raise ValueError(f"Widget with ID '{widget_id}' already exists.")

+        # Check if position is occupied
+        if row is not None and col is not None:
+            if self.getItem(row, col):
+                raise ValueError(f"Position at row {row} and column {col} is already occupied.")
+        else:
+            row, col = self._find_next_empty_position()
+
        widget = self.widget_handler.create_widget(
            widget_type=widget_type,
            widget_id=widget_id,
@@ -525,23 +532,11 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
        # used otherwise multiple times
        widget.set_gui_id(widget_id)

-        # Check if position is occupied
-        if row is not None and col is not None:
-            if self.getItem(row, col):
-                raise ValueError(f"Position at row {row} and column {col} is already occupied.")
-            else:
-                widget.config.row = row
-                widget.config.col = col
+        widget.config.row = row
+        widget.config.col = col

-                # Add widget to the figure
-                self.addItem(widget, row=row, col=col)
-        else:
-            row, col = self._find_next_empty_position()
-            widget.config.row = row
-            widget.config.col = col
-
-            # Add widget to the figure
-            self.addItem(widget, row=row, col=col)
+        # Add widget to the figure
+        self.addItem(widget, row=row, col=col)

        # Update num_cols and num_rows based on the added widget
        self.config.num_rows = max(self.config.num_rows, row + 1)
@@ -620,6 +615,7 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
        """
        if widget_id in self._widgets:
            widget = self._widgets.pop(widget_id)
+            widget.cleanup_pyqtgraph()
            widget.cleanup()
            self.removeItem(widget)
            self.grid[widget.config.row][widget.config.col] = None
@@ -721,7 +717,7 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):

        # Populate the new grid with widgets' IDs
        current_idx = 0
-        for widget_id, widget in self._widgets.items():
+        for widget_id in self._widgets:
            row = current_idx // len(new_grid[0])
            col = current_idx % len(new_grid[0])
            new_grid[row][col] = widget_id
@@ -745,3 +741,12 @@ class BECFigure(BECWidget, pg.GraphicsLayoutWidget):
        self.config = FigureConfig(
            widget_class=self.__class__.__name__, gui_id=self.gui_id, theme=theme
        )
+
+    def cleanup_pyqtgraph_all_widgets(self):
+        """Clean up the pyqtgraph widget."""
+        for widget in self.widget_list:
+            widget.cleanup_pyqtgraph()
+
+    def cleanup(self):
+        """Close the figure widget."""
+        self.cleanup_pyqtgraph_all_widgets()
--- a/bec_widgets/widgets/figure/plots/axis_settings.py
+++ b/bec_widgets/widgets/figure/plots/axis_settings.py
@@ -1,8 +1,8 @@
 import os

-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QVBoxLayout

+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.qt_utils.settings_dialog import SettingWidget
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.widget_io import WidgetIO
--- a/bec_widgets/widgets/figure/plots/image/image.py
+++ b/bec_widgets/widgets/figure/plots/image/image.py
@@ -7,9 +7,9 @@ import numpy as np
 from bec_lib.endpoints import MessageEndpoints
 from pydantic import BaseModel, Field, ValidationError
 from qtpy.QtCore import QThread
-from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QWidget

+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import EntryValidator
 from bec_widgets.widgets.figure.plots.image.image_item import BECImageItem, ImageItemConfig
 from bec_widgets.widgets.figure.plots.image.image_processor import (
@@ -247,13 +247,14 @@ class BECImageShow(BECPlotBase):
        Returns:
            BECImageItem: The image item.
        """
-        image_source = "device_monitor"
+        image_source = "device_monitor_2d"

        image_exits = self._check_image_id(monitor, self._images)
        if image_exits:
-            raise ValueError(
-                f"Monitor with ID '{monitor}' already exists in widget '{self.gui_id}'."
-            )
+            # raise ValueError(
+            #     f"Monitor with ID '{monitor}' already exists in widget '{self.gui_id}'."
+            # )
+            return

        # monitor = self.entry_validator.validate_monitor(monitor)

@@ -287,7 +288,7 @@ class BECImageShow(BECPlotBase):
        **kwargs,
    ):
        image_source = "custom"
-        # image_source = "device_monitor"
+        # image_source = "device_monitor_2d"

        image_exits = self._check_image_id(name, self._images)
        if image_exits:
@@ -500,21 +501,22 @@ class BECImageShow(BECPlotBase):
            self.update_image(device, data)
            self.update_vrange(device, self.processor.config.stats)

-    @pyqtSlot(dict)
-    def on_image_update(self, msg: dict):
+    @Slot(dict, dict)
+    def on_image_update(self, msg: dict, metadata: dict):
        """
        Update the image of the device monitor from bec.

        Args:
            msg(dict): The message from bec.
+            metadata(dict): The metadata of the message.
        """
        data = msg["data"]
        device = msg["device"]
-        image = self._images["device_monitor"][device]
+        image = self._images["device_monitor_2d"][device]
        image.raw_data = data
        self.process_image(device, image, data)

-    @pyqtSlot(str, np.ndarray)
+    @Slot(str, np.ndarray)
    def update_image(self, device: str, data: np.ndarray):
        """
        Update the image of the device monitor.
@@ -523,10 +525,10 @@ class BECImageShow(BECPlotBase):
            device(str): The name of the device.
            data(np.ndarray): The data to be updated.
        """
-        image_to_update = self._images["device_monitor"][device]
+        image_to_update = self._images["device_monitor_2d"][device]
        image_to_update.updateImage(data, autoLevels=image_to_update.config.autorange)

-    @pyqtSlot(str, ImageStats)
+    @Slot(str, ImageStats)
    def update_vrange(self, device: str, stats: ImageStats):
        """
        Update the scaling of the image.
@@ -534,7 +536,7 @@ class BECImageShow(BECPlotBase):
        Args:
            stats(ImageStats): The statistics of the image.
        """
-        image_to_update = self._images["device_monitor"][device]
+        image_to_update = self._images["device_monitor_2d"][device]
        if image_to_update.config.autorange:
            image_to_update.auto_update_vrange(stats)

@@ -547,7 +549,7 @@ class BECImageShow(BECPlotBase):
                data = image.raw_data
                self.process_image(image_id, image, data)

-    def _connect_device_monitor(self, monitor: str):
+    def _connect_device_monitor_2d(self, monitor: str):
        """
        Connect to the device monitor.

@@ -561,13 +563,13 @@ class BECImageShow(BECPlotBase):
            previous_monitor = None
        if previous_monitor and image_item.connected is True:
            self.bec_dispatcher.disconnect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(previous_monitor)
+                self.on_image_update, MessageEndpoints.device_monitor_2d(previous_monitor)
            )
            image_item.connected = False
        if monitor and image_item.connected is False:
            self.entry_validator.validate_monitor(monitor)
            self.bec_dispatcher.connect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(monitor)
+                self.on_image_update, MessageEndpoints.device_monitor_2d(monitor)
            )
            image_item.set_monitor(monitor)
            image_item.connected = True
@@ -576,13 +578,13 @@ class BECImageShow(BECPlotBase):
        self, source: str, name: str, config: ImageItemConfig, data=None
    ) -> BECImageItem:  # TODO fix types
        config.parent_id = self.gui_id
-        image = BECImageItem(config=config, parent_image=self)
-        self.plot_item.addItem(image)
        if self.single_image is True and len(self.images) > 0:
            self.remove_image(0)
+        image = BECImageItem(config=config, parent_image=self)
+        self.plot_item.addItem(image)
        self._images[source][name] = image
-        if source == "device_monitor":
-            self._connect_device_monitor(config.monitor)
+        if source == "device_monitor_2d":
+            self._connect_device_monitor_2d(config.monitor)
        self.config.images[name] = config
        if data is not None:
            image.setImage(data)
@@ -668,15 +670,29 @@ class BECImageShow(BECPlotBase):
        image = self.find_image_by_monitor(image_id)
        if image:
            self.bec_dispatcher.disconnect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(image.config.monitor)
+                self.on_image_update, MessageEndpoints.device_monitor_2d(image.config.monitor)
            )

    def cleanup(self):
        """
        Clean up the widget.
        """
-        for monitor in self._images["device_monitor"]:
+        for monitor in self._images["device_monitor_2d"]:
            self.bec_dispatcher.disconnect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(monitor)
+                self.on_image_update, MessageEndpoints.device_monitor_2d(monitor)
            )
        self.images.clear()
+
+    def cleanup_pyqtgraph(self):
+        """Cleanup pyqtgraph items."""
+        super().cleanup_pyqtgraph()
+        item = self.plot_item
+        if not item.items:
+            return
+        cbar = item.items[0].color_bar
+        cbar.vb.menu.close()
+        cbar.vb.menu.deleteLater()
+        cbar.gradient.menu.close()
+        cbar.gradient.menu.deleteLater()
+        cbar.gradient.colorDialog.close()
+        cbar.gradient.colorDialog.deleteLater()
--- a/bec_widgets/widgets/figure/plots/motor_map/motor_map.py
+++ b/bec_widgets/widgets/figure/plots/motor_map/motor_map.py
@@ -10,9 +10,9 @@ from pydantic import Field, ValidationError, field_validator
 from pydantic_core import PydanticCustomError
 from qtpy import QtCore, QtGui
 from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QWidget

+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import Colors, EntryValidator
 from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
 from bec_widgets.widgets.figure.plots.waveform.waveform import Signal, SignalData
@@ -444,7 +444,7 @@ class BECMotorMap(BECPlotBase):
            return None

    @Slot()
-    def _update_plot(self):
+    def _update_plot(self, _=None):
        """Update the motor map plot."""
        # If the number of points exceeds max_points, delete the oldest points
        if len(self.database_buffer["x"]) > self.config.max_points:
@@ -493,13 +493,14 @@ class BECMotorMap(BECPlotBase):
            f"Motor position: ({round(float(current_x),precision)}, {round(float(current_y),precision)})"
        )

-    @Slot(dict)
-    def on_device_readback(self, msg: dict) -> None:
+    @Slot(dict, dict)
+    def on_device_readback(self, msg: dict, metadata: dict) -> None:
        """
        Update the motor map plot with the new motor position.

        Args:
            msg(dict): Message from the device readback.
+            metadata(dict): Metadata of the message.
        """
        if self.motor_x is None or self.motor_y is None:
            return
--- a/bec_widgets/widgets/figure/plots/plot_base.py
+++ b/bec_widgets/widgets/figure/plots/plot_base.py
@@ -314,3 +314,11 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
        """Remove the plot widget from the figure."""
        if self.figure is not None:
            self.figure.remove(widget_id=self.gui_id)
+
+    def cleanup_pyqtgraph(self):
+        """Cleanup pyqtgraph items."""
+        item = self.plot_item
+        item.vb.menu.close()
+        item.vb.menu.deleteLater()
+        item.ctrlMenu.close()
+        item.ctrlMenu.deleteLater()
--- a/bec_widgets/widgets/figure/plots/waveform/waveform.py
+++ b/bec_widgets/widgets/figure/plots/waveform/waveform.py
@@ -11,9 +11,9 @@ from bec_lib.endpoints import MessageEndpoints
 from pydantic import Field, ValidationError, field_validator
 from pyqtgraph.exporters import MatplotlibExporter
 from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QWidget

+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import Colors, EntryValidator
 from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
 from bec_widgets.widgets.figure.plots.waveform.waveform_curve import (
@@ -391,7 +391,7 @@ class BECWaveform(BECPlotBase):
            self.async_signal_update.emit()
            self.scan_signal_update.emit()

-    @pyqtSlot()
+    @Slot()
    def auto_range(self):
        self.plot_item.autoRange()

@@ -408,7 +408,7 @@ class BECWaveform(BECPlotBase):
        """
        self.plot_item.enableAutoRange(axis, enabled)

-    @pyqtSlot()
+    @Slot()
    def auto_range(self):
        self.plot_item.autoRange()

@@ -642,7 +642,7 @@ class BECWaveform(BECPlotBase):
        self.refresh_dap()
        return curve

-    @pyqtSlot()
+    @Slot()
    def get_dap_params(self) -> dict:
        """
        Get the DAP parameters of all DAP curves.
@@ -655,7 +655,7 @@ class BECWaveform(BECPlotBase):
            params[curve_id] = curve.dap_params
        return params

-    @pyqtSlot()
+    @Slot()
    def get_dap_summary(self) -> dict:
        """
        Get the DAP summary of all DAP curves.
@@ -921,7 +921,7 @@ class BECWaveform(BECPlotBase):
        else:
            raise IndexError(f"Curve order {N} out of range.")

-    @pyqtSlot(dict)
+    @Slot(dict)
    def on_scan_status(self, msg):
        """
        Handle the scan status message.
@@ -943,9 +943,11 @@ class BECWaveform(BECPlotBase):
                self.setup_dap(self.old_scan_id, self.scan_id)
            if self._curves_data["async"]:
                for curve_id, curve in self._curves_data["async"].items():
-                    self.setup_async(curve.config.signals.y.name)
+                    self.setup_async(
+                        name=curve.config.signals.y.name, entry=curve.config.signals.y.entry
+                    )

-    @pyqtSlot(dict, dict)
+    @Slot(dict, dict)
    def on_scan_segment(self, msg: dict, metadata: dict):
        """
        Handle new scan segments and saves data to a dictionary. Linked through bec_dispatcher.
@@ -1004,24 +1006,24 @@ class BECWaveform(BECPlotBase):
                self.update_dap, MessageEndpoints.dap_response(f"{new_scan_id}-{self.gui_id}")
            )

-    @pyqtSlot(str)
-    def setup_async(self, device: str):
+    @Slot(str)
+    def setup_async(self, name: str, entry: str):
        self.bec_dispatcher.disconnect_slot(
-            self.on_async_readback, MessageEndpoints.device_async_readback(self.old_scan_id, device)
+            self.on_async_readback, MessageEndpoints.device_async_readback(self.old_scan_id, name)
        )
        try:
-            self._curves_data["async"][f"{device}-{device}"].clear_data()
+            self._curves_data["async"][f"{name}-{entry}"].clear_data()
        except KeyError:
            pass
        if len(self._curves_data["async"]) > 0:
            self.bec_dispatcher.connect_slot(
                self.on_async_readback,
-                MessageEndpoints.device_async_readback(self.scan_id, device),
+                MessageEndpoints.device_async_readback(self.scan_id, name),
                from_start=True,
            )

-    @pyqtSlot()
-    def refresh_dap(self):
+    @Slot()
+    def refresh_dap(self, _=None):
        """
        Refresh the DAP curves with the latest data from the DAP model MessageEndpoints.dap_response().
        """
@@ -1069,7 +1071,7 @@ class BECWaveform(BECPlotBase):
            )
            self.client.connector.set_and_publish(MessageEndpoints.dap_request(), msg)

-    @pyqtSlot(dict, dict)
+    @Slot(dict, dict)
    def update_dap(self, msg, metadata):
        self.msg = msg
        scan_id, x_name, x_entry, y_name, y_entry = msg["dap_request"].content["config"]["args"]
@@ -1089,7 +1091,7 @@ class BECWaveform(BECPlotBase):
                    self.dap_summary_update.emit(curve.dap_summary)
                break

-    @pyqtSlot(dict, dict)
+    @Slot(dict, dict)
    def on_async_readback(self, msg, metadata):
        """
        Get async data readback.
@@ -1127,7 +1129,7 @@ class BECWaveform(BECPlotBase):
                        else:
                            curve.setData(data_plot)

-    @pyqtSlot()
+    @Slot()
    def replot_async_curve(self):
        try:
            data = self.scan_item.async_data
@@ -1152,8 +1154,8 @@ class BECWaveform(BECPlotBase):
            else:
                curve.setData(data_x, data_y)

-    @pyqtSlot()
-    def _update_scan_curves(self):
+    @Slot()
+    def _update_scan_curves(self, _=None):
        """
        Update the scan curves with the data from the scan segment.
        """
--- a/bec_widgets/widgets/image/image_widget.py
+++ b/bec_widgets/widgets/image/image_widget.py
@@ -457,7 +457,8 @@ class BECImageWidget(BECWidget, QWidget):

    def cleanup(self):
        self.fig.cleanup()
-        self.client.shutdown()
+        self.toolbar.close()
+        self.toolbar.deleteLater()
        return super().cleanup()


--- a/bec_widgets/widgets/jupyter_console/jupyter_console.py
+++ b/bec_widgets/widgets/jupyter_console/jupyter_console.py
@@ -63,8 +63,6 @@ class BECJupyterConsole(RichJupyterWidget):  # pragma: no cover:

    def closeEvent(self, event):
        self.shutdown_kernel()
-        if self.client:
-            self.client.shutdown()


 if __name__ == "__main__":  # pragma: no cover
--- a/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py
+++ b/bec_widgets/widgets/motor_map/motor_map_dialog/motor_map_settings.py
@@ -1,8 +1,8 @@
 import os

-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QVBoxLayout

+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.qt_utils.settings_dialog import SettingWidget
 from bec_widgets.utils import UILoader
 from bec_widgets.utils.widget_io import WidgetIO
@@ -45,3 +45,12 @@ class MotorMapSettings(SettingWidget):
            self.target_widget.set_scatter_size(scatter_size)
            self.target_widget.set_background_value(background_intensity)
            self.target_widget.set_color(color)
+
+    def cleanup(self):
+        self.ui.color.cleanup()
+        self.ui.color.close()
+        self.ui.color.deleteLater()
+
+    def closeEvent(self, event):
+        self.cleanup()
+        super().closeEvent(event)
--- a/bec_widgets/widgets/positioner_box/init.py
+++ b/bec_widgets/widgets/positioner_box/init.py
--- a/bec_widgets/widgets/positioner_box/positioner_box.py
+++ b/bec_widgets/widgets/positioner_box/positioner_box.py
@@ -1,22 +1,43 @@
+""" Module for a PositionerBox widget to control a positioner device."""
+
 import os
 import uuid

+from bec_lib.device import Positioner
 from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 from bec_lib.messages import ScanQueueMessage
-from qtpy.QtCore import Property, Signal, Slot
-from qtpy.QtGui import QDoubleValidator
-from qtpy.QtWidgets import QDoubleSpinBox, QVBoxLayout, QWidget
+from qtpy.QtCore import Property, QSize, Signal, Slot
+from qtpy.QtGui import QDoubleValidator, QIcon
+from qtpy.QtWidgets import QDialog, QDoubleSpinBox, QPushButton, QVBoxLayout, QWidget

 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.widgets.device_line_edit.device_line_edit import DeviceLineEdit
+
+logger = bec_logger.logger
+
+MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))


-class DeviceBox(BECWidget, QWidget):
+class PositionerBox(BECWidget, QWidget):
+    """Simple Widget to control a positioner in box form"""
+
+    ui_file = "positioner_box.ui"
+    dimensions = (234, 224)
+
+    USER_ACCESS = ["set_positioner"]
    device_changed = Signal(str, str)

-    def __init__(self, parent=None, device=None, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, parent=None, device: Positioner = None, *args, **kwargs):
+        """Initialize the PositionerBox widget.
+
+        Args:
+            parent: The parent widget.
+            device (Positioner): The device to control.
+        """
+        super().__init__(**kwargs)
        QWidget.__init__(self, parent=parent)
        self.get_bec_shortcuts()
        self._device = ""
@@ -29,10 +50,11 @@ class DeviceBox(BECWidget, QWidget):
            self.init_device()

    def init_ui(self):
+        """Init the ui"""
        self.device_changed.connect(self.on_device_change)

        current_path = os.path.dirname(__file__)
-        self.ui = UILoader(self).loader(os.path.join(current_path, "device_box.ui"))
+        self.ui = UILoader(self).loader(os.path.join(current_path, self.ui_file))

        self.layout = QVBoxLayout(self)
        self.layout.addWidget(self.ui)
@@ -41,8 +63,8 @@ class DeviceBox(BECWidget, QWidget):

        # fix the size of the device box
        db = self.ui.device_box
-        db.setFixedHeight(234)
-        db.setFixedWidth(224)
+        db.setFixedHeight(self.dimensions[0])
+        db.setFixedWidth(self.dimensions[1])

        self.ui.step_size.setStepType(QDoubleSpinBox.AdaptiveDecimalStepType)
        self.ui.stop.clicked.connect(self.on_stop)
@@ -55,30 +77,105 @@ class DeviceBox(BECWidget, QWidget):
        self.setpoint_validator = QDoubleValidator()
        self.ui.setpoint.setValidator(self.setpoint_validator)
        self.ui.spinner_widget.start()
+        self.ui.tool_button.clicked.connect(self._open_dialog_selection)
+        icon = QIcon()
+        icon.addFile(
+            os.path.join(MODULE_PATH, "assets", "toolbar_icons", "device_line_edit.svg"),
+            size=QSize(16, 16),
+        )
+        self.ui.tool_button.setIcon(icon)
+
+    def _open_dialog_selection(self):
+        """Open dialog window for positioner selection"""
+        dialog = QDialog(self)
+        dialog.setWindowTitle("Positioner Selection")
+        layout = QVBoxLayout()
+        line_edit = DeviceLineEdit(self, client=self.client, device_filter="Positioner")
+        line_edit.textChanged.connect(self._positioner_changed)
+        layout.addWidget(line_edit)
+        close_button = QPushButton("Close")
+        close_button.clicked.connect(dialog.accept)
+        layout.addWidget(close_button)
+        dialog.setLayout(layout)
+        dialog.exec()
+
+    @Slot(str)
+    def _positioner_changed(self, positioner_name: str):
+        """Changed input in combobox.
+
+        Args:
+            positioner_name (str): name of the positioner
+        """
+        self.set_positioner(positioner_name)

    def init_device(self):
-        if self.device in self.dev:
+        """Init the device view and readback"""
+        if self._check_device_is_valid(self.device):
            data = self.dev[self.device].read()
            self.on_device_readback({"signals": data}, {})

+    def _toogle_enable_buttons(self, enable: bool) -> None:
+        """Toogle enable/disable on available buttons
+
+        Args:
+            enable (bool): Enable buttons
+        """
+        self.ui.tweak_left.setEnabled(enable)
+        self.ui.tweak_right.setEnabled(enable)
+        self.ui.stop.setEnabled(enable)
+        self.ui.setpoint.setEnabled(enable)
+        self.ui.step_size.setEnabled(enable)
+
    @Property(str)
    def device(self):
+        """Property to set the device"""
        return self._device

    @device.setter
-    def device(self, value):
+    def device(self, value: str):
+        """Setter, checks if device is a string"""
        if not value or not isinstance(value, str):
            return
        old_device = self._device
        self._device = value
        self.device_changed.emit(old_device, value)

+    def set_positioner(self, positioner: str):
+        """Set the device
+
+        Args:
+            positioner (Positioner | str) : Positioner to set, accepts str or the device
+        """
+        if isinstance(positioner, Positioner):
+            positioner = positioner.name
+        self.device = positioner
+
+    def _check_device_is_valid(self, device: str):
+        """Check if the device is a positioner
+
+        Args:
+            device (str): The device name
+        """
+        if device not in self.dev:
+            logger.info(f"Device {device} not found in the device list")
+            return False
+        if not isinstance(self.dev[device], Positioner):
+            logger.info(f"Device {device} is not a positioner")
+            return False
+        return True
+
    @Slot(str, str)
    def on_device_change(self, old_device: str, new_device: str):
-        if new_device not in self.dev:
-            print(f"Device {new_device} not found in the device list")
+        """Upon changing the device, a check will be performed if the device is a Positioner.
+
+        Args:
+            old_device (str): The old device name.
+            new_device (str): The new device name.
+        """
+        if not self._check_device_is_valid(new_device):
            return
-        print(f"Device changed from {old_device} to {new_device}")
+        logger.info(f"Device changed from {old_device} to {new_device}")
+        self._toogle_enable_buttons(True)
        self.init_device()
        self.bec_dispatcher.disconnect_slot(
            self.on_device_readback, MessageEndpoints.device_readback(old_device)
@@ -98,6 +195,12 @@ class DeviceBox(BECWidget, QWidget):

    @Slot(dict, dict)
    def on_device_readback(self, msg_content: dict, metadata: dict):
+        """Callback for device readback.
+
+        Args:
+            msg_content (dict): The message content.
+            metadata (dict): The message metadata.
+        """
        signals = msg_content.get("signals", {})
        # pylint: disable=protected-access
        hinted_signals = self.dev[self.device]._hints
@@ -134,7 +237,12 @@ class DeviceBox(BECWidget, QWidget):
            pos = (readback_val - limits[0]) / (limits[1] - limits[0])
            self.ui.position_indicator.on_position_update(pos)

-    def update_limits(self, limits):
+    def update_limits(self, limits: tuple):
+        """Update limits
+
+        Args:
+            limits (tuple): Limits of the positioner
+        """
        if limits == self._limits:
            return
        self._limits = limits
@@ -147,6 +255,7 @@ class DeviceBox(BECWidget, QWidget):

    @Slot()
    def on_stop(self):
+        """Stop call"""
        request_id = str(uuid.uuid4())
        params = {
            "device": self.device,
@@ -165,18 +274,22 @@ class DeviceBox(BECWidget, QWidget):

    @property
    def step_size(self):
+        """Step size for tweak"""
        return self.ui.step_size.value()

    @Slot()
    def on_tweak_right(self):
+        """Tweak motor right"""
        self.dev[self.device].move(self.step_size, relative=True)

    @Slot()
    def on_tweak_left(self):
+        """Tweak motor left"""
        self.dev[self.device].move(-self.step_size, relative=True)

    @Slot()
    def on_setpoint_change(self):
+        """Change the setpoint for the motor"""
        self.ui.setpoint.clearFocus()
        setpoint = self.ui.setpoint.text()
        self.dev[self.device].move(float(setpoint), relative=False)
@@ -190,8 +303,8 @@ if __name__ == "__main__":  # pragma: no cover
    from qtpy.QtWidgets import QApplication

    app = QApplication(sys.argv)
-    apply_theme("light")
-    widget = DeviceBox(device="samx")
+    apply_theme("dark")
+    widget = PositionerBox(device="bpm4i")

    widget.show()
    sys.exit(app.exec_())
--- a/bec_widgets/widgets/positioner_box/positioner_box.pyproject
+++ b/bec_widgets/widgets/positioner_box/positioner_box.pyproject
@@ -0,0 +1 @@
+{'files': ['positioner_box.py']}
--- a/bec_widgets/widgets/positioner_box/positioner_box.ui
+++ b/bec_widgets/widgets/positioner_box/positioner_box.ui
@@ -29,17 +29,24 @@
   <item>
    <widget class="QGroupBox" name="device_box">
     <property name="title">
-      <string>Device Name</string>
+      <string>No positioner selected</string>
     </property>
     <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0">
      <property name="topMargin">
       <number>0</number>
      </property>
      <item row="3" column="1">
-       <widget class="QDoubleSpinBox" name="step_size"/>
+       <widget class="QDoubleSpinBox" name="step_size">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
      </item>
      <item row="3" column="2">
       <widget class="QToolButton" name="tweak_right">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
        <property name="minimumSize">
         <size>
          <width>50</width>
@@ -67,10 +74,20 @@
       </widget>
      </item>
      <item row="2" column="0" colspan="3">
-       <widget class="QLineEdit" name="setpoint"/>
+       <widget class="QLineEdit" name="setpoint">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignmentFlag::AlignCenter</set>
+        </property>
+       </widget>
      </item>
      <item row="3" column="0">
       <widget class="QToolButton" name="tweak_left">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
        <property name="minimumSize">
         <size>
          <width>50</width>
@@ -99,6 +116,9 @@
      </item>
      <item row="4" column="0" colspan="3">
       <widget class="QPushButton" name="stop">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
        <property name="text">
         <string>Stop</string>
        </property>
@@ -108,6 +128,13 @@
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QToolButton" name="tool_button">
+            <property name="text">
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
          <item>
           <spacer name="horizontalSpacer">
            <property name="orientation">
--- a/bec_widgets/widgets/positioner_box/positioner_box_plugin.py
+++ b/bec_widgets/widgets/positioner_box/positioner_box_plugin.py
@@ -1,30 +1,29 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
 import os

 from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtGui import QIcon

-import bec_widgets
-from bec_widgets.widgets.device_box.device_box import DeviceBox
+from bec_widgets.widgets.positioner_box.positioner_box import PositionerBox

 DOM_XML = """
 <ui language='c++'>
-    <widget class='DeviceBox' name='device_box'>
+    <widget class='PositionerBox' name='positioner_box'>
    </widget>
 </ui>
 """
-
-MODULE_PATH = os.path.dirname(bec_widgets.__file__)
+MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))


-class DeviceBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+class PositionerBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
    def __init__(self):
        super().__init__()
        self._form_editor = None

    def createWidget(self, parent):
-        t = DeviceBox(parent)
+        t = PositionerBox(parent)
        return t

    def domXml(self):
@@ -34,11 +33,11 @@ class DeviceBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
        return "Device Control"

    def icon(self):
-        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "device_box.png")
+        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "positioner_box.png")
        return QIcon(icon_path)

    def includeFile(self):
-        return "device_box"
+        return "positioner_box"

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

    def name(self):
-        return "DeviceBox"
+        return "PositionerBox"

    def toolTip(self):
-        return "A widget for controlling a single positioner. "
+        return "Simple Widget to control a positioner in box form"

    def whatsThis(self):
        return self.toolTip()
--- a/bec_widgets/widgets/positioner_box/positioner_control_line.py
+++ b/bec_widgets/widgets/positioner_box/positioner_control_line.py
@@ -0,0 +1,33 @@
+from bec_lib.device import Positioner
+
+from bec_widgets.widgets.positioner_box.positioner_box import PositionerBox
+
+
+class PositionerControlLine(PositionerBox):
+    """A widget that controls a single device."""
+
+    ui_file = "positioner_control_line.ui"
+    dimensions = (60, 600)  # height, width
+
+    def __init__(self, parent=None, device: Positioner = None, *args, **kwargs):
+        """Initialize the DeviceControlLine.
+
+        Args:
+            parent: The parent widget.
+            device (Positioner): The device to control.
+        """
+        super().__init__(parent=parent, device=device, *args, **kwargs)
+
+
+if __name__ == "__main__":  # pragma: no cover
+    import sys
+
+    import qdarktheme
+    from qtpy.QtWidgets import QApplication
+
+    app = QApplication(sys.argv)
+    qdarktheme.setup_theme("dark")
+    widget = PositionerControlLine(device="samy")
+
+    widget.show()
+    sys.exit(app.exec_())
--- a/bec_widgets/widgets/positioner_box/positioner_control_line.pyproject
+++ b/bec_widgets/widgets/positioner_box/positioner_control_line.pyproject
@@ -0,0 +1 @@
+{'files': ['positioner_control_line.py']}
--- a/bec_widgets/widgets/positioner_box/positioner_control_line.ui
+++ b/bec_widgets/widgets/positioner_box/positioner_control_line.ui
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>785</width>
+    <height>91</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>16777215</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="device_box">
+     <property name="title">
+      <string>Device Name</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QToolButton" name="tool_button">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>25</width>
+          <height>25</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>25</width>
+          <height>25</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="PositionIndicator" name="position_indicator">
+          <property name="minimumSize">
+           <size>
+            <width>80</width>
+            <height>10</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="SpinnerWidget" name="spinner_widget">
+          <property name="minimumSize">
+           <size>
+            <width>25</width>
+            <height>25</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>25</width>
+            <height>25</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="readback">
+          <property name="minimumSize">
+           <size>
+            <width>80</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>150</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Position</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignmentFlag::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="setpoint">
+          <property name="minimumSize">
+           <size>
+            <width>80</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>150</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignmentFlag::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QPushButton" name="stop">
+        <property name="text">
+         <string>Stop</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="tweak_left">
+        <property name="minimumSize">
+         <size>
+          <width>30</width>
+          <height>30</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>30</width>
+          <height>30</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>30</width>
+          <height>30</height>
+         </size>
+        </property>
+        <property name="arrowType">
+         <enum>Qt::ArrowType::LeftArrow</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QDoubleSpinBox" name="step_size"/>
+      </item>
+      <item>
+       <widget class="QToolButton" name="tweak_right">
+        <property name="minimumSize">
+         <size>
+          <width>30</width>
+          <height>30</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>30</width>
+          <height>30</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>30</width>
+          <height>30</height>
+         </size>
+        </property>
+        <property name="arrowType">
+         <enum>Qt::ArrowType::RightArrow</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SpinnerWidget</class>
+   <extends>QWidget</extends>
+   <header>spinner_widget</header>
+  </customwidget>
+  <customwidget>
+   <class>PositionIndicator</class>
+   <extends>QWidget</extends>
+   <header>position_indicator</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
--- a/bec_widgets/widgets/positioner_box/positioner_control_line_plugin.py
+++ b/bec_widgets/widgets/positioner_box/positioner_control_line_plugin.py
@@ -0,0 +1,58 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+import os
+
+from qtpy.QtDesigner import QDesignerCustomWidgetInterface
+from qtpy.QtGui import QIcon
+
+from bec_widgets.widgets.positioner_box.positioner_control_line import PositionerControlLine
+
+DOM_XML = """
+<ui language='c++'>
+    <widget class='PositionerControlLine' name='positioner_control_line'>
+    </widget>
+</ui>
+"""
+MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+
+
+class PositionerControlLinePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+    def __init__(self):
+        super().__init__()
+        self._form_editor = None
+
+    def createWidget(self, parent):
+        t = PositionerControlLine(parent)
+        return t
+
+    def domXml(self):
+        return DOM_XML
+
+    def group(self):
+        return "Device Control"
+
+    def icon(self):
+        icon_path = os.path.join(MODULE_PATH, "assets", "designer_icons", "positioner_box.png")
+        return QIcon(icon_path)
+
+    def includeFile(self):
+        return "positioner_control_line"
+
+    def initialize(self, form_editor):
+        self._form_editor = form_editor
+
+    def isContainer(self):
+        return False
+
+    def isInitialized(self):
+        return self._form_editor is not None
+
+    def name(self):
+        return "PositionerControlLine"
+
+    def toolTip(self):
+        return "A widget that controls a single positioner in line form."
+
+    def whatsThis(self):
+        return self.toolTip()
--- a/bec_widgets/widgets/positioner_box/register_positioner_box.py
+++ b/bec_widgets/widgets/positioner_box/register_positioner_box.py
@@ -6,9 +6,9 @@ def main():  # pragma: no cover
        return
    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection

-    from bec_widgets.widgets.device_box.device_box_plugin import DeviceBoxPlugin
+    from bec_widgets.widgets.positioner_box.positioner_box_plugin import PositionerBoxPlugin

-    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceBoxPlugin())
+    QPyDesignerCustomWidgetCollection.addCustomWidget(PositionerBoxPlugin())


 if __name__ == "__main__":  # pragma: no cover
--- a/bec_widgets/widgets/positioner_box/register_positioner_control_line.py
+++ b/bec_widgets/widgets/positioner_box/register_positioner_control_line.py
@@ -0,0 +1,17 @@
+def main():  # pragma: no cover
+    from qtpy import PYSIDE6
+
+    if not PYSIDE6:
+        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
+        return
+    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
+
+    from bec_widgets.widgets.positioner_box.positioner_control_line_plugin import (
+        PositionerControlLinePlugin,
+    )
+
+    QPyDesignerCustomWidgetCollection.addCustomWidget(PositionerControlLinePlugin())
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()
--- a/bec_widgets/widgets/scan_control/scan_group_box.py
+++ b/bec_widgets/widgets/scan_control/scan_group_box.py
@@ -1,9 +1,13 @@
 from typing import Literal

+from qtpy.QtCore import Qt
 from qtpy.QtWidgets import (
    QCheckBox,
    QComboBox,
+    QDialog,
+    QDialogButtonBox,
    QDoubleSpinBox,
+    QFormLayout,
    QGridLayout,
    QGroupBox,
    QLabel,
@@ -25,13 +29,46 @@ class ScanArgType:
    LITERALS = "dict"


+class SettingsDialog(QDialog):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setWindowTitle("Settings")
+
+        layout = QFormLayout()
+
+        self.precision_spin_box = QSpinBox()
+        self.precision_spin_box.setRange(
+            -2147483647, 2147483647
+        )  # 2147483647 is the largest int which qt allows
+
+        self.step_size_spin_box = QDoubleSpinBox()
+        self.step_size_spin_box.setRange(-float("inf"), float("inf"))
+
+        fixed_width = 80
+        self.precision_spin_box.setFixedWidth(fixed_width)
+        self.step_size_spin_box.setFixedWidth(fixed_width)
+
+        layout.addRow("Decimal Precision:", self.precision_spin_box)
+        layout.addRow("Step Size:", self.step_size_spin_box)
+
+        button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        button_box.accepted.connect(self.accept)
+        button_box.rejected.connect(self.reject)
+        layout.addWidget(button_box)
+
+        self.setLayout(layout)
+
+    def getValues(self):
+        return self.precision_spin_box.value(), self.step_size_spin_box.value()
+
+
 class ScanSpinBox(QSpinBox):
    def __init__(
        self, parent=None, arg_name: str = None, default: int | None = None, *args, **kwargs
    ):
        super().__init__(parent=parent, *args, **kwargs)
        self.arg_name = arg_name
-        self.setRange(-9999, 9999)
+        self.setRange(-2147483647, 2147483647)  # 2147483647 is the largest int which qt allows
        if default is not None:
            self.setValue(default)

@@ -42,10 +79,25 @@ class ScanDoubleSpinBox(QDoubleSpinBox):
    ):
        super().__init__(parent=parent, *args, **kwargs)
        self.arg_name = arg_name
-        self.setRange(-9999, 9999)
+        self.setRange(-float("inf"), float("inf"))
        if default is not None:
            self.setValue(default)

+        self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.customContextMenuRequested.connect(self.showSettingsDialog)
+
+        self.setToolTip("Right click to open settings dialog for decimal precision and step size.")
+
+    def showSettingsDialog(self):
+        dialog = SettingsDialog(self)
+        dialog.precision_spin_box.setValue(self.decimals())
+        dialog.step_size_spin_box.setValue(self.singleStep())
+
+        if dialog.exec_() == QDialog.Accepted:
+            precision, step_size = dialog.getValues()
+            self.setDecimals(precision)
+            self.setSingleStep(step_size)
+

 class ScanLineEdit(QLineEdit):
    def __init__(
--- a/bec_widgets/widgets/spinner/spinner.py
+++ b/bec_widgets/widgets/spinner/spinner.py
@@ -55,7 +55,7 @@ class SpinnerWidget(QWidget):

        color_palette = get_theme_palette()

-        color = QColor(color_palette.COLOR_ACCENT_4)
+        color = QColor(color_palette.accent().color())

        rect.adjust(line_width, line_width, -line_width, -line_width)

@@ -75,6 +75,10 @@ class SpinnerWidget(QWidget):
            painter.drawArc(adjusted_rect, self.angle * 16, int(angle_span))
        painter.end()

+    def closeEvent(self, event):
+        self.timer.stop()
+        super().closeEvent(event)
+

 if __name__ == "__main__":  # pragma: no cover
    app = QApplication(sys.argv)
--- a/bec_widgets/widgets/stop_button/stop_button.py
+++ b/bec_widgets/widgets/stop_button/stop_button.py
@@ -1,6 +1,6 @@
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QPushButton

+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils.bec_widget import BECWidget


--- a/bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py
+++ b/bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py
@@ -58,16 +58,17 @@ class CurveSettings(SettingWidget):
        self.ui.color_map_selector_scan.combo.setCurrentText(cm)

        # Scan Curve Table
-        for label, curve in config["scan_segment"].items():
-            row_count = self.ui.scan_table.rowCount()
-            self.ui.scan_table.insertRow(row_count)
-            DialogRow(
-                parent=self,
-                table_widget=self.ui.scan_table,
-                client=self.target_widget.client,
-                row=row_count,
-                config=curve.config,
-            ).add_scan_row()
+        for source in ["scan_segment", "async"]:
+            for label, curve in config[source].items():
+                row_count = self.ui.scan_table.rowCount()
+                self.ui.scan_table.insertRow(row_count)
+                DialogRow(
+                    parent=self,
+                    table_widget=self.ui.scan_table,
+                    client=self.target_widget.client,
+                    row=row_count,
+                    config=curve.config,
+                ).add_scan_row()

        # Add DAP Curves
        for label, curve in config["DAP"].items():
@@ -132,11 +133,12 @@ class CurveSettings(SettingWidget):
        self.accept_curve_changes()

    def accept_curve_changes(self):
-        old_curves_scans = list(self.target_widget.waveform._curves_data["scan_segment"].values())
-        old_curves_dap = list(self.target_widget.waveform._curves_data["DAP"].values())
-        for curve in old_curves_scans:
-            curve.remove()
-        for curve in old_curves_dap:
+        sources = ["scan_segment", "async", "DAP"]
+        old_curves = []
+
+        for source in sources:
+            old_curves += list(self.target_widget.waveform._curves_data[source].values())
+        for curve in old_curves:
            curve.remove()
        self.get_curve_params()

--- a/bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/dap_summary_dialog.py
+++ b/bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/dap_summary_dialog.py
@@ -1,8 +1,8 @@
 import os

-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QDialog, QTreeWidgetItem, QVBoxLayout

+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import UILoader


--- a/bec_widgets/widgets/waveform/waveform_widget.py
+++ b/bec_widgets/widgets/waveform/waveform_widget.py
@@ -561,7 +561,6 @@ class BECWaveformWidget(BECWidget, QWidget):

    def cleanup(self):
        self.fig.cleanup()
-        self.client.shutdown()
        return super().cleanup()


--- a/bec_widgets/widgets/website/website.py
+++ b/bec_widgets/widgets/website/website.py
@@ -64,6 +64,12 @@ class WebsiteWidget(BECWidget, QWebEngineView):
        """
        QWebEngineView.forward(self)

+    def cleanup(self):
+        """
+        Cleanup the widget
+        """
+        self.page().deleteLater()
+

 if __name__ == "__main__":
    import sys
--- a/docs/developer/developer.md
+++ b/docs/developer/developer.md
@@ -1,7 +1,9 @@
 (developer)=
 # Developer 

-Welcome to the BEC Widgets developer guide! This section is intended for developers who want to contribute to the development of BEC Widgets.
+Welcome to the BEC Widgets developer guide! BEC Widgets is a framework for building graphical user interfaces (GUIs) for [BEC](https://bec.readthedocs.io/en/latest/), a Python package for beamline experiment control.
+
+This guide targets readers who want to develop new widgets or extend existing ones. If your goal is to use BEC Widgets to build GUIs for your experiments, please refer to the [user guide](#user).

 ```{toctree}
 ---
@@ -9,8 +11,8 @@ maxdepth: 2
 hidden: true
 ---

-getting_started/getting_started.md
-widgets/widgets.md
+introduction/introduction.md
+widget_development/widget_development.md
 api_reference/api_reference.md
 ```

@@ -21,26 +23,28 @@ api_reference/api_reference.md
 :gutter: 5

 ```{grid-item-card}
-:link: developer.getting_started
+:link: developer.introduction
 :link-type: ref
 :img-top: /assets/rocket_launch_48dp.svg
 :text-align: center

-## Getting Started
+## Introduction

-Learn how to install BEC Widgets and get started with the framework.
+An introduction into the single-resposibility principle and the modular design of BEC Widgets.
 ```

 ```{grid-item-card}
-:link: developer.widgets
+:link: developer.widget_development
 :link-type: ref
 :img-top: /assets/apps_48dp.svg
 :text-align: center

-## Widgets
+## Widget Development

-Learn about the building blocks of larger applications: widgets.
+Learn how to develop a new modular widget for BEC Widgets.
 ```
-````
+
+````{grid} 2
+


--- a/docs/developer/getting_started/getting_started.md
+++ b/docs/developer/getting_started/getting_started.md
@@ -1,12 +0,0 @@
-(developer.getting_started)=
-# Getting Started
-This section provides valuable information for developers who want to contribute to the development of BEC Widgets. The guide will help you set up the development environment, understand the modular development concept of BEC Widgets, and contribute to the project.
-
-```{toctree}
---
-maxdepth: 2
-hidden: false
---
-
-development/
-```
--- a/docs/developer/introduction/concepts.md
+++ b/docs/developer/introduction/concepts.md
@@ -0,0 +1,14 @@
+(developer.concepts)=
+# Concepts
+This section provides an overview of the core concepts of BEC Widgets, which are based on the single-responsibility principle and modular design.
+
+## Moduler Design
+We develop widgets with the single-responsibility principle in mind, meaning each widget is designed for a specific task. Our goal is to keep widgets simple, using them primarily for visualization or to initiate actions within BEC. Following these ideas, widgets should be designed to be reusable in various applications, making them versatile building blocks for larger GUIs. 
+
+We offer up to three different options for composing larger GUIs from these modular widgets: BECDesigner, DockArea widget, or scripting from the command line interface. More information about these options can be found in the user sections on [applications](user.applications).
+
+## Client-Server Architecture
+
+BEC Widgets is built on top of the [BEC](https://bec.readthedocs.io/en/latest/) package, which provides the backend for beamline experiment control. BEC Widgets is a client of BEC, meaning it can interact with the backend through a client-server architecture. To make full usage of the available features of BEC, we recommend to check the documentation about [data access](https://bec.readthedocs.io/en/latest/developer/data_access/data_access.html) in which the messaging and event system of BEC is described.
+In the context of BEC Widgets, the [`BECDispatcher`](/api_reference/_autosummary/bec_widgets.utils.bec_dispatcher.BECDispatcher) connects to this messaging and event system, allowing you to link your Qt [`Slots`](https://www.pythonguis.com/tutorials/pyside6-signals-slots-events/) to messages and event received from BEC.
+
--- a/docs/developer/getting_started/development.md
+++ b/docs/developer/getting_started/development.md
@@ -1,5 +1,5 @@
-(developer.development)=
-# Development
+(developer.contributing)=
+# Contributing

 If you like to contribute to the development of BEC Widgets, you can follow the steps below to set up your development environment.
 BEC Widgets works in conjunction with [BEC](https://bec.readthedocs.io/en/latest/). 
@@ -10,6 +10,7 @@ If you already have a BEC environment set up, you can install BEC Widgets in edi
 **Prerequisites**
 1. **Python Version:** BEC Widgets requires Python version 3.10 or higher. Verify your Python version to ensure compatibility.
 2. **BEC Installation:** BEC Widgets works in conjunction with BEC. While BEC is a dependency and will be installed automatically, you can find more information about BEC and its installation process in the [BEC documentation](https://beamline-experiment-control.readthedocs.io/en/latest/).
+3. **Qt Distributions:** BEC Widgets supports [PySide6](https://doc.qt.io/qtforpython-6/quickstart.html) and [PyQt6](https://www.riverbankcomputing.com/static/Docs/PyQt6/introduction.html). We use [qtpy](https://pypi.org/project/QtPy/) to abstract the underlying QT distribution.

 **Clone the Repository**: 
 ```bash
@@ -20,8 +21,8 @@ cd bec_widgets

 Please install the package in editable mode into your BEC Python environemnt. 
 ```bash
-pip install -e '.[dev,pyqt6]'
+pip install -e '.[dev,pyside6]'
 ```
-This installs the package together with [PyQT6](https://www.riverbankcomputing.com/static/Docs/PyQt6/introduction.html). 
+This installs the package together with [PySide6](https://doc.qt.io/qtforpython-6/quickstart.html).


--- a/docs/developer/introduction/introduction.md
+++ b/docs/developer/introduction/introduction.md
@@ -0,0 +1,15 @@
+(developer.introduction)=
+# Introduction
+BEC Widgets is a framework providing modular components that can be integrated into various larger GUI applications. Each widget serves a specific purpose adhering to the single-responsibility principle as detailed in our [concepts section](developer.concepts), and offers a straightforward, user-friendly interface.
+These widgets provide data visualisation tools and experimental control interfaces by triggering actions within BEC. 
+If you're interested in contributing to BEC Widgets, please refer to our [contributing guide](developer.contributing), which provides instructions for setting up your development environment and creating your own widgets.
+
+```{toctree}
+---
+maxdepth: 2
+hidden: false
+---
+
+concepts/
+contributing/
+```
--- a/docs/developer/widget_development/widget_development.md
+++ b/docs/developer/widget_development/widget_development.md
@@ -1,5 +1,5 @@
-(developer.widgets)=
-# Widgets
+(developer.widget_development)=
+# Widget development
 This section provides an introduction to the building blocks of BEC Widgets: widgets. Widgets are the basic components of the graphical user interface (GUI) and are used to create larger applications. We will cover key topics such as how to develop new widgets or how to customise existing widgets. For details on the already available widgets and their usage, please refer to user section about [widgets](#user.widgets)

 ```{toctree}
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -6,7 +6,6 @@ pydata-sphinx-theme
 sphinx-copybutton
 myst-parser
 sphinx-design
-PyQt6
-PyQt6-WebEngine
+PySide6
 bec-widgets
 tomli
--- a/docs/user/getting_started/getting_started.md
+++ b/docs/user/getting_started/getting_started.md
@@ -11,4 +11,5 @@ hidden: true
 installation/
 quick_start/
 auto_updates/
+video_tutorials/
 ```
--- a/docs/user/getting_started/video_tutorials.md
+++ b/docs/user/getting_started/video_tutorials.md
@@ -0,0 +1,17 @@
+(user.video_tutorials)=
+
+# Video Tutorials
+
+This section includes video tutorials that demonstrate various use cases of `bec-widgets`, including video tutorials,
+presentations, and conference talks.
+
+## BSEG Meeting 24th July 2024
+
+This video is a presentation of the BEC Widgets project at the BSEG meeting on the 24th July 2024. The presentation
+covers the basic interactions, including visualization of live data acquisition and how to steer experiments using
+user-friendly tools. Learn how BEC Widgets can enhance your experimental control projects with its intuitive interface
+and powerful features.
+
+Used version of BEC Widgets: 0.91.0
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/qZ8fWXRAdHE" frameborder="0" allowfullscreen></iframe>
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"

 [project]
 name = "bec_widgets"
-version = "0.91.0"
+version = "0.94.7"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [
@@ -13,16 +13,16 @@ classifiers = [
    "Topic :: Scientific/Engineering",
 ]
 dependencies = [
-    "bec_ipython_client~=2.16", # needed for jupyter console
-    "bec_lib~=2.16",
-    "black~=24.0",              # needed for bw-generate-cli
-    "isort~=5.13, >=5.13.2",    # needed for bw-generate-cli
+    "bec_ipython_client~=2.21, >=2.21.4", # needed for jupyter console
+    "bec_lib~=2.21, >=2.21.4",
+    "black~=24.0",                        # needed for bw-generate-cli
+    "isort~=5.13, >=5.13.2",              # needed for bw-generate-cli
    "pydantic~=2.0",
    "pyqtgraph~=0.13",
-    "qdarkstyle>=3.2.2",
-    "qtconsole~=5.5, >=5.5.1",  # needed for jupyter console
+    "bec_qthemes~=0.0",
+    "qtconsole~=5.5, >=5.5.1",            # needed for jupyter console
    "qtpy~=2.4",
-    "pyte",                     # needed for vt100 console
+    "pyte",                               # needed for vt100 console
 ]


--- a/tests/end-2-end/test_bec_dock_rpc_e2e.py
+++ b/tests/end-2-end/test_bec_dock_rpc_e2e.py
@@ -9,6 +9,10 @@ from bec_widgets.cli.auto_updates import AutoUpdates
 from bec_widgets.cli.client import BECDockArea, BECFigure, BECImageShow, BECMotorMap, BECWaveform
 from bec_widgets.utils import Colors

+# pylint: disable=unused-argument
+# pylint: disable=redefined-outer-name
+# pylint: disable=too-many-locals
+

 def test_rpc_add_dock_with_figure_e2e(bec_client_lib, rpc_server_dock):
    # BEC client shortcuts
@@ -98,7 +102,7 @@ def test_rpc_add_dock_with_figure_e2e(bec_client_lib, rpc_server_dock):
    assert plt_data["bpm4i-bpm4i"]["y"] == plt_last_scan_data["bpm4i"]["bpm4i"].val

    # image
-    last_image_device = client.connector.get_last(MessageEndpoints.device_monitor("eiger"))[
+    last_image_device = client.connector.get_last(MessageEndpoints.device_monitor_2d("eiger"))[
        "data"
    ].data
    time.sleep(0.5)
@@ -227,13 +231,20 @@ def test_ring_bar_scan_update(bec_client_lib, rpc_server_dock):
    assert bar_config["rings"][1]["max_value"] == final_samy


-def test_auto_update(bec_client_lib, rpc_server_dock):
+def test_auto_update(bec_client_lib, rpc_server_dock, qtbot):
    dock = BECDockArea(rpc_server_dock)

    AutoUpdates.enabled = True
    AutoUpdates.create_default_dock = True
    dock.auto_updates = AutoUpdates(gui=dock)
    dock.auto_updates.start_default_dock()
+
+    def get_default_figure():
+        return dock.auto_updates.get_default_figure()
+
+    qtbot.waitUntil(lambda: get_default_figure() is not None, timeout=10000)
+    plt = get_default_figure()
+
    dock.selected_device = "bpm4i"

    # we need to start the update script manually; normally this is done when the GUI is started
@@ -250,7 +261,6 @@ def test_auto_update(bec_client_lib, rpc_server_dock):
    last_scan_data = queue.scan_storage.storage[-1].data

    # get data from curves
-    plt = dock.auto_updates.get_default_figure()
    widgets = plt.widget_list
    plt_data = widgets[0].get_all_data()

@@ -271,6 +281,7 @@ def test_auto_update(bec_client_lib, rpc_server_dock):

    plt = dock.auto_updates.get_default_figure()
    widgets = plt.widget_list
+    qtbot.waitUntil(lambda: len(plt.widget_list) > 0, timeout=5000)
    plt_data = widgets[0].get_all_data()

    last_scan_data = queue.scan_storage.storage[-1].data
@@ -284,3 +295,4 @@ def test_auto_update(bec_client_lib, rpc_server_dock):
        plt_data[f"Scan {status.scan.scan_number} - {dock.selected_device}"]["y"]
        == last_scan_data["samy"]["samy"].val
    )
+    dock.auto_updates.shutdown()
--- a/tests/end-2-end/test_bec_figure_rpc_e2e.py
+++ b/tests/end-2-end/test_bec_figure_rpc_e2e.py
@@ -120,7 +120,7 @@ def test_rpc_image(rpc_server_figure, bec_client_lib):
    status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
    status.wait()

-    last_image_device = client.connector.get_last(MessageEndpoints.device_monitor("eiger"))[
+    last_image_device = client.connector.get_last(MessageEndpoints.device_monitor_2d("eiger"))[
        "data"
    ].data
    last_image_plot = im.images[0].get_data()
@@ -158,7 +158,7 @@ def test_rpc_motor_map(rpc_server_figure, bec_client_lib):
    )


-def test_dap_rpc(rpc_server_figure, bec_client_lib):
+def test_dap_rpc(rpc_server_figure, bec_client_lib, qtbot):

    fig = BECFigure(rpc_server_figure)
    plt = fig.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
@@ -178,13 +178,15 @@ def test_dap_rpc(rpc_server_figure, bec_client_lib):
    res = scans.line_scan(dev.samx, 0, 8, steps=50, relative=False)
    res.wait()

-    time.sleep(2)
+    # especially on slow machines, the fit might not be done yet
+    # so we wait until the fit reaches the expected value
+    def wait_for_fit():
+        dap_curve = plt.get_curve("bpm4i-bpm4i-GaussianModel")
+        fit_params = dap_curve.dap_params
+        print(fit_params)
+        return np.isclose(fit_params["center"], 5, atol=0.5)

-    dap_curve = plt.get_curve("bpm4i-bpm4i-GaussianModel")
-    fit_params = dap_curve.dap_params
-    print(fit_params)
-
-    assert np.isclose(fit_params["center"], 5, atol=0.5)
+    qtbot.waitUntil(wait_for_fit, timeout=10000)


 def test_removing_subplots(rpc_server_figure, bec_client_lib):
--- a/tests/references/SpinnerWidget/SpinnerWidget_darwin.png
+++ b/tests/references/SpinnerWidget/SpinnerWidget_darwin.png
--- a/tests/references/SpinnerWidget/SpinnerWidget_linux.png
+++ b/tests/references/SpinnerWidget/SpinnerWidget_linux.png
--- a/tests/references/SpinnerWidget/SpinnerWidget_started_darwin.png
+++ b/tests/references/SpinnerWidget/SpinnerWidget_started_darwin.png
--- a/tests/references/SpinnerWidget/SpinnerWidget_started_linux.png
+++ b/tests/references/SpinnerWidget/SpinnerWidget_started_linux.png
--- a/tests/unit_tests/conftest.py
+++ b/tests/unit_tests/conftest.py
@@ -1,9 +1,25 @@
 import pytest
+from pytestqt.exceptions import TimeoutError as QtBotTimeoutError
+from qtpy.QtWidgets import QApplication

 from bec_widgets.cli.rpc_register import RPCRegister
+from bec_widgets.qt_utils import error_popups
 from bec_widgets.utils import bec_dispatcher as bec_dispatcher_module


+@pytest.fixture(autouse=True)
+def qapplication(qtbot):  # pylint: disable=unused-argument
+    yield
+
+    qapp = QApplication.instance()
+    # qapp.quit()
+    qapp.processEvents()
+    try:
+        qtbot.waitUntil(lambda: qapp.topLevelWidgets() == [])
+    except QtBotTimeoutError as exc:
+        raise TimeoutError(f"Failed to close all widgets: {qapp.topLevelWidgets()}") from exc
+
+
@pytest.fixture(autouse=True)
 def rpc_register():
    yield RPCRegister()
@@ -11,7 +27,7 @@ def rpc_register():


@pytest.fixture(autouse=True)
-def bec_dispatcher(threads_check):
+def bec_dispatcher(threads_check):  # pylint: disable=unused-argument
    bec_dispatcher = bec_dispatcher_module.BECDispatcher()
    yield bec_dispatcher
    bec_dispatcher.disconnect_all()
@@ -19,3 +35,30 @@ def bec_dispatcher(threads_check):
    bec_dispatcher.client.shutdown()
    # reinitialize singleton for next test
    bec_dispatcher_module.BECDispatcher.reset_singleton()
+
+
+@pytest.fixture(autouse=True)
+def clean_singleton():
+    error_popups._popup_utility_instance = None
+
+
+def create_widget(qtbot, widget, *args, **kwargs):
+    """
+    Create a widget and add it to the qtbot for testing. This is a helper function that
+    should be used in all tests that require a widget to be created.
+    DO NOT CREATE WIDGETS DIRECTLY IN A FIXTURE!
+
+    Args:
+        qtbot (fixture): pytest-qt fixture
+        widget (QWidget): widget class to be created
+        *args: positional arguments for the widget
+        **kwargs: keyword arguments for the widget
+
+    Returns:
+        QWidget: the created widget
+
+    """
+    widget = widget(*args, **kwargs)
+    qtbot.addWidget(widget)
+    qtbot.waitExposed(widget)
+    return widget
--- a/tests/unit_tests/test_bec_connector.py
+++ b/tests/unit_tests/test_bec_connector.py
@@ -2,9 +2,9 @@
 import time

 import pytest
-from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QApplication

+from bec_widgets.qt_utils.error_popups import SafeSlot as Slot
 from bec_widgets.utils import BECConnector, ConnectionConfig

 from .client_mocks import mocked_client
--- a/tests/unit_tests/test_bec_dispatcher.py
+++ b/tests/unit_tests/test_bec_dispatcher.py
@@ -92,7 +92,9 @@ def test_dispatcher_2_cb_same_topic(bec_dispatcher_w_connector, qtbot, send_msg_
    bec_dispatcher.connect_slot(cb1, "topic1")
    bec_dispatcher.connect_slot(cb2, "topic1")
    assert len(bec_dispatcher.client.connector._topics_cb) == 1
+    assert len(bec_dispatcher._slots) == 2
    bec_dispatcher.disconnect_slot(cb1, "topic1")
+    assert len(bec_dispatcher._slots) == 1

    send_msg_event.set()
    qtbot.wait(10)
--- a/tests/unit_tests/test_bec_dock.py
+++ b/tests/unit_tests/test_bec_dock.py
@@ -14,7 +14,6 @@ def bec_dock_area(qtbot, mocked_client):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


 def test_bec_dock_area_init(bec_dock_area):
@@ -128,10 +127,12 @@ def test_toolbar_add_plot_motor_map(bec_dock_area):
    assert bec_dock_area.panels["motor_map_1"].widgets[0].config.widget_class == "BECMotorMapWidget"


-def test_toolbar_add_device_device_box(bec_dock_area):
-    bec_dock_area.toolbar.widgets["menu_devices"].widgets["device_box"].trigger()
-    assert "device_box_1" in bec_dock_area.panels
-    assert bec_dock_area.panels["device_box_1"].widgets[0].config.widget_class == "DeviceBox"
+def test_toolbar_add_device_positioner_box(bec_dock_area):
+    bec_dock_area.toolbar.widgets["menu_devices"].widgets["positioner_box"].trigger()
+    assert "positioner_box_1" in bec_dock_area.panels
+    assert (
+        bec_dock_area.panels["positioner_box_1"].widgets[0].config.widget_class == "PositionerBox"
+    )


 def test_toolbar_add_utils_queue(bec_dock_area):
--- a/tests/unit_tests/test_bec_figure.py
+++ b/tests/unit_tests/test_bec_figure.py
@@ -9,18 +9,11 @@ from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap
 from bec_widgets.widgets.figure.plots.waveform.waveform import BECWaveform

 from .client_mocks import mocked_client
+from .conftest import create_widget


-@pytest.fixture
-def bec_figure(qtbot, mocked_client):
-    widget = BECFigure(client=mocked_client)
-    qtbot.addWidget(widget)
-    qtbot.waitExposed(widget)
-    yield widget
-    widget.close()
-
-
-def test_bec_figure_init(bec_figure):
+def test_bec_figure_init(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    assert bec_figure is not None
    assert bec_figure.client is not None
    assert isinstance(bec_figure, BECFigure)
@@ -34,7 +27,8 @@ def test_bec_figure_init_with_config(mocked_client):
    assert widget.config.theme == "dark"


-def test_bec_figure_add_remove_plot(bec_figure):
+def test_bec_figure_add_remove_plot(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    initial_count = len(bec_figure._widgets)

    # Adding 3 widgets -  2 WaveformBase and 1 PlotBase
@@ -64,7 +58,8 @@ def test_bec_figure_add_remove_plot(bec_figure):
    assert bec_figure._widgets[w1.gui_id].config.widget_class == "BECWaveform"


-def test_add_different_types_of_widgets(bec_figure):
+def test_add_different_types_of_widgets(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    plt = bec_figure.plot(x_name="samx", y_name="bpm4i")
    im = bec_figure.image("eiger")
    motor_map = bec_figure.motor_map("samx", "samy")
@@ -74,7 +69,8 @@ def test_add_different_types_of_widgets(bec_figure):
    assert motor_map.__class__ == BECMotorMap


-def test_access_widgets_access_errors(bec_figure):
+def test_access_widgets_access_errors(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    bec_figure.plot(row=0, col=0)

    # access widget by non-existent coordinates
@@ -96,7 +92,8 @@ def test_access_widgets_access_errors(bec_figure):
        )


-def test_add_plot_to_occupied_position(bec_figure):
+def test_add_plot_to_occupied_position(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    bec_figure.plot(row=0, col=0)

    with pytest.raises(ValueError) as excinfo:
@@ -104,7 +101,8 @@ def test_add_plot_to_occupied_position(bec_figure):
        assert "Position at row 0 and column 0 is already occupied." in str(excinfo.value)


-def test_remove_plots(bec_figure):
+def test_remove_plots(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot(row=0, col=0)
    w2 = bec_figure.plot(row=0, col=1)
    w3 = bec_figure.plot(row=1, col=0)
@@ -134,7 +132,8 @@ def test_remove_plots(bec_figure):
    assert len(bec_figure._widgets) == 1


-def test_remove_plots_by_coordinates_ints(bec_figure):
+def test_remove_plots_by_coordinates_ints(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot(row=0, col=0)
    w2 = bec_figure.plot(row=0, col=1)

@@ -145,7 +144,8 @@ def test_remove_plots_by_coordinates_ints(bec_figure):
    assert len(bec_figure._widgets) == 1


-def test_remove_plots_by_coordinates_tuple(bec_figure):
+def test_remove_plots_by_coordinates_tuple(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot(row=0, col=0)
    w2 = bec_figure.plot(row=0, col=1)

@@ -156,7 +156,8 @@ def test_remove_plots_by_coordinates_tuple(bec_figure):
    assert len(bec_figure._widgets) == 1


-def test_remove_plot_by_id_error(bec_figure):
+def test_remove_plot_by_id_error(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    bec_figure.plot()

    with pytest.raises(ValueError) as excinfo:
@@ -164,7 +165,8 @@ def test_remove_plot_by_id_error(bec_figure):
        assert "Widget with ID 'non_existent_widget' does not exist." in str(excinfo.value)


-def test_remove_plot_by_coordinates_error(bec_figure):
+def test_remove_plot_by_coordinates_error(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    bec_figure.plot(row=0, col=0)

    with pytest.raises(ValueError) as excinfo:
@@ -172,7 +174,8 @@ def test_remove_plot_by_coordinates_error(bec_figure):
        assert "No widget at coordinates (0, 1)" in str(excinfo.value)


-def test_remove_plot_by_providing_nothing(bec_figure):
+def test_remove_plot_by_providing_nothing(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    bec_figure.plot(row=0, col=0)

    with pytest.raises(ValueError) as excinfo:
@@ -192,7 +195,8 @@ def test_remove_plot_by_providing_nothing(bec_figure):
 #     assert bec_figure.backgroundBrush().color().name() == "#000000"


-def test_change_layout(bec_figure):
+def test_change_layout(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot(row=0, col=0)
    w2 = bec_figure.plot(row=0, col=1)
    w3 = bec_figure.plot(row=1, col=0)
@@ -215,7 +219,8 @@ def test_change_layout(bec_figure):
    assert bec_figure[0, 3] == w4


-def test_clear_all(bec_figure):
+def test_clear_all(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    bec_figure.plot(row=0, col=0)
    bec_figure.plot(row=0, col=1)
    bec_figure.plot(row=1, col=0)
@@ -227,7 +232,8 @@ def test_clear_all(bec_figure):
    assert np.shape(bec_figure.grid) == (0,)


-def test_shortcuts(bec_figure):
+def test_shortcuts(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    plt = bec_figure.plot(x_name="samx", y_name="bpm4i")
    im = bec_figure.image("eiger")
    motor_map = bec_figure.motor_map("samx", "samy")
@@ -240,7 +246,8 @@ def test_shortcuts(bec_figure):
    assert motor_map.__class__ == BECMotorMap


-def test_plot_access_factory(bec_figure):
+def test_plot_access_factory(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    plt_00 = bec_figure.plot(x_name="samx", y_name="bpm4i")
    plt_01 = bec_figure.plot(x_name="samx", y_name="bpm4i", row=0, col=1)
    plt_10 = bec_figure.plot(new=True)
--- a/tests/unit_tests/test_bec_image.py
+++ b/tests/unit_tests/test_bec_image.py
@@ -6,8 +6,10 @@ import pytest
 from bec_lib import messages
 from qtpy.QtGui import QFontInfo

+from bec_widgets.widgets.figure import BECFigure
+
 from .client_mocks import mocked_client
-from .test_bec_figure import bec_figure
+from .conftest import create_widget


@pytest.fixture
@@ -15,23 +17,21 @@ def bec_image_show(bec_figure):
    yield bec_figure.image("eiger")


-def test_on_image_update(bec_image_show):
+def test_on_image_update(qtbot, mocked_client):
+    bec_image_show = create_widget(qtbot, BECFigure, client=mocked_client).image("eiger")
    data = np.random.rand(100, 100)
-    msg = messages.DeviceMonitorMessage(
-        device="eiger", data=data, metadata={"scan_id": "12345"}
-    ).model_dump()
-    bec_image_show.on_image_update(msg)
+    msg = messages.DeviceMonitor2DMessage(device="eiger", data=data, metadata={"scan_id": "12345"})
+    bec_image_show.on_image_update(msg.content, msg.metadata)
    img = bec_image_show.images[0]
    assert np.array_equal(img.get_data(), data)


-def test_autorange_on_image_update(bec_image_show):
+def test_autorange_on_image_update(qtbot, mocked_client):
+    bec_image_show = create_widget(qtbot, BECFigure, client=mocked_client).image("eiger")
    # Check if autorange mode "mean" works, should be default
    data = np.random.rand(100, 100)
-    msg = messages.DeviceMonitorMessage(
-        device="eiger", data=data, metadata={"scan_id": "12345"}
-    ).model_dump()
-    bec_image_show.on_image_update(msg)
+    msg = messages.DeviceMonitor2DMessage(device="eiger", data=data, metadata={"scan_id": "12345"})
+    bec_image_show.on_image_update(msg.content, msg.metadata)
    img = bec_image_show.images[0]
    assert np.array_equal(img.get_data(), data)
    vmin = max(np.mean(data) - 2 * np.std(data), 0)
@@ -39,7 +39,7 @@ def test_autorange_on_image_update(bec_image_show):
    assert np.isclose(img.color_bar.getLevels(), (vmin, vmax), rtol=(1e-5, 1e-5)).all()
    # Test general update with autorange True, mode "max"
    bec_image_show.set_autorange_mode("max")
-    bec_image_show.on_image_update(msg)
+    bec_image_show.on_image_update(msg.content, msg.metadata)
    img = bec_image_show.images[0]
    vmin = np.min(data)
    vmax = np.max(data)
@@ -47,18 +47,16 @@ def test_autorange_on_image_update(bec_image_show):
    assert np.isclose(img.color_bar.getLevels(), (vmin, vmax), rtol=(1e-5, 1e-5)).all()
    # Change the input data, and switch to autorange False, colormap levels should stay untouched
    data *= 100
-    msg = messages.DeviceMonitorMessage(
-        device="eiger", data=data, metadata={"scan_id": "12345"}
-    ).model_dump()
+    msg = messages.DeviceMonitor2DMessage(device="eiger", data=data, metadata={"scan_id": "12345"})
    bec_image_show.set_autorange(False)
-    bec_image_show.on_image_update(msg)
+    bec_image_show.on_image_update(msg.content, msg.metadata)
    img = bec_image_show.images[0]
    assert np.array_equal(img.get_data(), data)
    assert np.isclose(img.color_bar.getLevels(), (vmin, vmax), rtol=(1e-3, 1e-3)).all()
    # Reactivate autorange, should now scale the new data
    bec_image_show.set_autorange(True)
    bec_image_show.set_autorange_mode("mean")
-    bec_image_show.on_image_update(msg)
+    bec_image_show.on_image_update(msg.content, msg.metadata)
    img = bec_image_show.images[0]
    vmin = max(np.mean(data) - 2 * np.std(data), 0)
    vmax = np.mean(data) + 2 * np.std(data)
--- a/tests/unit_tests/test_bec_image_widget.py
+++ b/tests/unit_tests/test_bec_image_widget.py
@@ -15,7 +15,6 @@ def image_widget(qtbot, mocked_client):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


@pytest.fixture
--- a/tests/unit_tests/test_bec_motor_map.py
+++ b/tests/unit_tests/test_bec_motor_map.py
@@ -1,14 +1,17 @@
 import numpy as np
 import pytest
+from bec_lib.messages import DeviceMessage

+from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap, MotorMapConfig
 from bec_widgets.widgets.figure.plots.waveform.waveform_curve import SignalData

 from .client_mocks import mocked_client
-from .test_bec_figure import bec_figure
+from .conftest import create_widget


-def test_motor_map_init(bec_figure):
+def test_motor_map_init(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    default_config = MotorMapConfig(widget_class="BECMotorMap")

    mm = bec_figure.motor_map(config=default_config.model_dump())
@@ -17,7 +20,8 @@ def test_motor_map_init(bec_figure):
    assert mm.config == default_config


-def test_motor_map_change_motors(bec_figure):
+def test_motor_map_change_motors(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    mm = bec_figure.motor_map("samx", "samy")

    assert mm.motor_x == "samx"
@@ -31,7 +35,8 @@ def test_motor_map_change_motors(bec_figure):
    assert mm.config.signals.y == SignalData(name="samz", entry="samz", limits=[-8, 8])


-def test_motor_map_get_limits(bec_figure):
+def test_motor_map_get_limits(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    mm = bec_figure.motor_map("samx", "samy")
    expected_limits = {"samx": [-10, 10], "samy": [-5, 5]}

@@ -40,7 +45,8 @@ def test_motor_map_get_limits(bec_figure):
        assert actual_limit == expected_limit


-def test_motor_map_get_init_position(bec_figure):
+def test_motor_map_get_init_position(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    mm = bec_figure.motor_map("samx", "samy")
    mm.set_precision(2)

@@ -56,7 +62,8 @@ def test_motor_map_get_init_position(bec_figure):
        assert actual_position == expected_position


-def test_motor_movement_updates_position_and_database(bec_figure):
+def test_motor_movement_updates_position_and_database(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    mm = bec_figure.motor_map("samx", "samy")
    motor_map_dev = mm.client.device_manager.devices

@@ -72,7 +79,8 @@ def test_motor_movement_updates_position_and_database(bec_figure):

    # Simulate motor movement for 'samx' only
    new_position_samx = 4.0
-    mm.on_device_readback({"signals": {"samx": {"value": new_position_samx}}})
+    msg = DeviceMessage(signals={"samx": {"value": new_position_samx}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)

    init_positions["samx"].append(new_position_samx)
    init_positions["samy"].append(init_positions["samy"][-1])
@@ -83,7 +91,8 @@ def test_motor_movement_updates_position_and_database(bec_figure):
    assert mm.database_buffer["y"] == init_positions["samy"]


-def test_scatter_plot_rendering(bec_figure):
+def test_scatter_plot_rendering(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    mm = bec_figure.motor_map("samx", "samy")
    motor_map_dev = mm.client.device_manager.devices

@@ -96,7 +105,8 @@ def test_scatter_plot_rendering(bec_figure):

    # Simulate motor movement for 'samx' only
    new_position_samx = 4.0
-    mm.on_device_readback({"signals": {"samx": {"value": new_position_samx}}})
+    msg = DeviceMessage(signals={"samx": {"value": new_position_samx}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)
    mm._update_plot()

    # Get the scatter plot item
@@ -112,12 +122,15 @@ def test_scatter_plot_rendering(bec_figure):
    ), "Scatter plot Y data should retain last known position"


-def test_plot_visualization_consistency(bec_figure):
+def test_plot_visualization_consistency(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    mm = bec_figure.motor_map("samx", "samy")
    mm.change_motors("samx", "samy")
    # Simulate updating the plot with new data
-    mm.on_device_readback({"signals": {"samx": {"value": 5}}})
-    mm.on_device_readback({"signals": {"samy": {"value": 9}}})
+    msg = DeviceMessage(signals={"samx": {"value": 5}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)
+    msg = DeviceMessage(signals={"samy": {"value": 9}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)
    mm._update_plot()

    scatter_plot_item = mm.plot_components["scatter"]
@@ -128,7 +141,8 @@ def test_plot_visualization_consistency(bec_figure):
    ), "Plot not updated correctly with new data"


-def test_change_background_value(bec_figure, qtbot):
+def test_change_background_value(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    mm = bec_figure.motor_map("samx", "samy")

    assert mm.config.background_value == 25
@@ -141,7 +155,8 @@ def test_change_background_value(bec_figure, qtbot):
    assert np.all(mm.plot_components["limit_map"].image == 50.0)


-def test_motor_map_init_from_config(bec_figure):
+def test_motor_map_init_from_config(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    config = {
        "widget_class": "BECMotorMap",
        "gui_id": "mm_id",
@@ -195,7 +210,8 @@ def test_motor_map_init_from_config(bec_figure):
    assert mm._config_dict == config


-def test_motor_map_set_scatter_size(bec_figure, qtbot):
+def test_motor_map_set_scatter_size(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    mm = bec_figure.motor_map("samx", "samy")

    assert mm.config.scatter_size == 5
@@ -208,7 +224,8 @@ def test_motor_map_set_scatter_size(bec_figure, qtbot):
    assert mm.plot_components["scatter"].opts["size"] == 10


-def test_motor_map_change_precision(bec_figure):
+def test_motor_map_change_precision(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    mm = bec_figure.motor_map("samx", "samy")

    assert mm.config.precision == 2
@@ -216,7 +233,8 @@ def test_motor_map_change_precision(bec_figure):
    assert mm.config.precision == 10


-def test_motor_map_set_color(bec_figure, qtbot):
+def test_motor_map_set_color(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    mm = bec_figure.motor_map("samx", "samy")

    assert mm.config.color == (255, 255, 255, 255)
@@ -226,7 +244,8 @@ def test_motor_map_set_color(bec_figure, qtbot):
    assert mm.config.color == (0, 0, 0, 255)


-def test_motor_map_get_data_max_points(bec_figure, qtbot):
+def test_motor_map_get_data_max_points(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    mm = bec_figure.motor_map("samx", "samy")
    motor_map_dev = mm.client.device_manager.devices

@@ -234,10 +253,14 @@ def test_motor_map_get_data_max_points(bec_figure, qtbot):
        "samx": [motor_map_dev["samx"].read()["samx"]["value"]],
        "samy": [motor_map_dev["samy"].read()["samy"]["value"]],
    }
-    mm.on_device_readback({"signals": {"samx": {"value": 5.0}}})
-    mm.on_device_readback({"signals": {"samy": {"value": 9.0}}})
-    mm.on_device_readback({"signals": {"samx": {"value": 6.0}}})
-    mm.on_device_readback({"signals": {"samy": {"value": 7.0}}})
+    msg = DeviceMessage(signals={"samx": {"value": 5.0}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)
+    msg = DeviceMessage(signals={"samy": {"value": 9.0}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)
+    msg = DeviceMessage(signals={"samx": {"value": 6.0}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)
+    msg = DeviceMessage(signals={"samy": {"value": 7.0}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)

    expected_x = [init_positions["samx"][-1], 5.0, 5.0, 6.0, 6.0]
    expected_y = [init_positions["samy"][-1], init_positions["samy"][-1], 9.0, 9.0, 7.0]
--- a/tests/unit_tests/test_bec_queue.py
+++ b/tests/unit_tests/test_bec_queue.py
@@ -97,15 +97,15 @@ def bec_queue(qtbot, mocked_client):

 def test_bec_queue(bec_queue, bec_queue_msg_full):
    bec_queue.update_queue(bec_queue_msg_full.content, {})
-    assert bec_queue.rowCount() == 1
-    assert bec_queue.item(0, 0).text() == "1289"
-    assert bec_queue.item(0, 1).text() == "line_scan"
-    assert bec_queue.item(0, 2).text() == "COMPLETED"
+    assert bec_queue.table.rowCount() == 1
+    assert bec_queue.table.item(0, 0).text() == "1289"
+    assert bec_queue.table.item(0, 1).text() == "line_scan"
+    assert bec_queue.table.item(0, 2).text() == "COMPLETED"


 def test_bec_queue_empty(bec_queue):
    bec_queue.update_queue({}, {})
-    assert bec_queue.rowCount() == 1
-    assert bec_queue.item(0, 0).text() == ""
-    assert bec_queue.item(0, 1).text() == ""
-    assert bec_queue.item(0, 2).text() == ""
+    assert bec_queue.table.rowCount() == 1
+    assert bec_queue.table.item(0, 0).text() == ""
+    assert bec_queue.table.item(0, 1).text() == ""
+    assert bec_queue.table.item(0, 2).text() == ""
--- a/tests/unit_tests/test_color_map_selector.py
+++ b/tests/unit_tests/test_color_map_selector.py
@@ -10,7 +10,6 @@ def color_map_selector(qtbot):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


 def test_color_map_selector_init(color_map_selector):
--- a/tests/unit_tests/test_device_box.py
+++ b/tests/unit_tests/test_device_box.py
@@ -1,98 +0,0 @@
-from unittest import mock
-
-import pytest
-from bec_lib.endpoints import MessageEndpoints
-from bec_lib.messages import ScanQueueMessage
-from qtpy.QtGui import QValidator
-
-from bec_widgets.widgets.device_box.device_box import DeviceBox
-
-from .client_mocks import mocked_client
-
-
-@pytest.fixture
-def device_box(qtbot, mocked_client):
-    with mock.patch("bec_widgets.widgets.device_box.device_box.uuid.uuid4") as mock_uuid:
-        mock_uuid.return_value = "fake_uuid"
-        db = DeviceBox(device="samx", client=mocked_client)
-        qtbot.addWidget(db)
-        yield db
-
-
-def test_device_box(device_box):
-    assert device_box.device == "samx"
-    data = device_box.dev["samx"].read()
-
-    setpoint_text = device_box.ui.setpoint.text()
-    # check that the setpoint is taken correctly after init
-    assert float(setpoint_text) == data["samx_setpoint"]["value"]
-
-    # check that the precision is taken correctly after init
-    precision = device_box.dev["samx"].precision
-    assert setpoint_text == f"{data['samx_setpoint']['value']:.{precision}f}"
-
-    # check that the step size is set according to the device precision
-    assert device_box.ui.step_size.value() == 10**-precision * 10
-
-
-def test_device_box_update_limits(device_box):
-    device_box._limits = None
-    device_box.update_limits([0, 10])
-    assert device_box._limits == [0, 10]
-    assert device_box.setpoint_validator.bottom() == 0
-    assert device_box.setpoint_validator.top() == 10
-    assert device_box.setpoint_validator.validate("100", 0) == (
-        QValidator.State.Intermediate,
-        "100",
-        0,
-    )
-
-    device_box.update_limits(None)
-    assert device_box._limits is None
-    assert device_box.setpoint_validator.validate("100", 0) == (
-        QValidator.State.Acceptable,
-        "100",
-        0,
-    )
-
-
-def test_device_box_on_stop(device_box):
-    with mock.patch.object(device_box.client.connector, "send") as mock_send:
-        device_box.on_stop()
-        params = {"device": "samx", "rpc_id": "fake_uuid", "func": "stop", "args": [], "kwargs": {}}
-        msg = ScanQueueMessage(
-            scan_type="device_rpc",
-            parameter=params,
-            queue="emergency",
-            metadata={"RID": "fake_uuid", "response": False},
-        )
-        mock_send.assert_called_once_with(MessageEndpoints.scan_queue_request(), msg)
-
-
-def test_device_box_setpoint_change(device_box):
-    with mock.patch.object(device_box.dev["samx"], "move") as mock_move:
-        device_box.ui.setpoint.setText("100")
-        device_box.on_setpoint_change()
-        mock_move.assert_called_once_with(100, relative=False)
-
-
-def test_device_box_on_tweak_right(device_box):
-    with mock.patch.object(device_box.dev["samx"], "move") as mock_move:
-        device_box.ui.step_size.setValue(0.1)
-        device_box.on_tweak_right()
-        mock_move.assert_called_once_with(0.1, relative=True)
-
-
-def test_device_box_on_tweak_left(device_box):
-    with mock.patch.object(device_box.dev["samx"], "move") as mock_move:
-        device_box.ui.step_size.setValue(0.1)
-        device_box.on_tweak_left()
-        mock_move.assert_called_once_with(-0.1, relative=True)
-
-
-def test_device_box_setpoint_out_of_range(device_box):
-    device_box.update_limits([0, 10])
-    device_box.ui.setpoint.setText("100")
-    device_box.on_setpoint_change()
-    assert device_box.ui.setpoint.text() == "100"
-    assert device_box.ui.setpoint.hasAcceptableInput() == False
--- a/tests/unit_tests/test_device_input_base.py
+++ b/tests/unit_tests/test_device_input_base.py
@@ -8,12 +8,16 @@ from .client_mocks import mocked_client

 # DeviceInputBase is meant to be mixed in a QWidget
 class DeviceInputWidget(DeviceInputBase, QWidget):
-    pass
+    def __init__(self, parent=None, client=None, config=None, gui_id=None):
+        super().__init__(client=client, config=config, gui_id=gui_id)
+        QWidget.__init__(self, parent=parent)


@pytest.fixture
-def device_input_base(mocked_client):
+def device_input_base(qtbot, mocked_client):
    widget = DeviceInputWidget(client=mocked_client)
+    qtbot.addWidget(widget)
+    qtbot.waitExposed(widget)
    yield widget


--- a/tests/unit_tests/test_device_input_widgets.py
+++ b/tests/unit_tests/test_device_input_widgets.py
@@ -12,7 +12,6 @@ def device_input_combobox(qtbot, mocked_client):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


@pytest.fixture
@@ -28,7 +27,6 @@ def device_input_combobox_with_config(qtbot, mocked_client):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


@pytest.fixture
@@ -43,7 +41,6 @@ def device_input_combobox_with_kwargs(qtbot, mocked_client):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


 def test_device_input_combobox_init(device_input_combobox):
@@ -101,7 +98,6 @@ def device_input_line_edit(qtbot, mocked_client):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


@pytest.fixture
@@ -117,7 +113,6 @@ def device_input_line_edit_with_config(qtbot, mocked_client):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


@pytest.fixture
@@ -132,7 +127,6 @@ def device_input_line_edit_with_kwargs(qtbot, mocked_client):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


 def test_device_input_line_edit_init(device_input_line_edit):
--- a/tests/unit_tests/test_motor_map_widget.py
+++ b/tests/unit_tests/test_motor_map_widget.py
@@ -16,7 +16,6 @@ def motor_map_widget(qtbot, mocked_client):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


@pytest.fixture
@@ -139,7 +138,6 @@ def motor_map_settings(qtbot):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


 def test_display_current_settings(motor_map_settings):
--- a/tests/unit_tests/test_plot_base.py
+++ b/tests/unit_tests/test_plot_base.py
@@ -4,18 +4,22 @@ from unittest import mock
 import pytest
 from qtpy.QtGui import QFontInfo

+from bec_widgets.widgets.figure import BECFigure
+
 from .client_mocks import mocked_client
-from .test_bec_figure import bec_figure
+from .conftest import create_widget


-def test_init_plot_base(bec_figure):
+def test_init_plot_base(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    plot_base = bec_figure.add_widget(widget_type="BECPlotBase", widget_id="test_plot")
    assert plot_base is not None
    assert plot_base.config.widget_class == "BECPlotBase"
    assert plot_base.config.gui_id == "test_plot"


-def test_plot_base_axes_by_separate_methods(bec_figure):
+def test_plot_base_axes_by_separate_methods(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    plot_base = bec_figure.add_widget(widget_type="BECPlotBase", widget_id="test_plot")

    plot_base.set_title("Test Title")
@@ -65,7 +69,8 @@ def test_plot_base_axes_by_separate_methods(bec_figure):
        assert mock_set_title.call_args == call


-def test_plot_base_axes_added_by_kwargs(bec_figure):
+def test_plot_base_axes_added_by_kwargs(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    plot_base = bec_figure.add_widget(widget_type="BECPlotBase", widget_id="test_plot")

    plot_base.set(
--- a/tests/unit_tests/test_positioner_box.py
+++ b/tests/unit_tests/test_positioner_box.py
@@ -0,0 +1,130 @@
+from unittest import mock
+
+import pytest
+from bec_lib.device import Positioner
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.messages import ScanQueueMessage
+from qtpy.QtGui import QValidator
+
+from bec_widgets.widgets.positioner_box.positioner_box import PositionerBox
+from bec_widgets.widgets.positioner_box.positioner_control_line import PositionerControlLine
+
+from .client_mocks import mocked_client
+
+
+@pytest.fixture
+def positioner_box(qtbot, mocked_client):
+    """Fixture for PositionerBox widget"""
+    with mock.patch("bec_widgets.widgets.positioner_box.positioner_box.uuid.uuid4") as mock_uuid:
+        mock_uuid.return_value = "fake_uuid"
+        with mock.patch(
+            "bec_widgets.widgets.positioner_box.positioner_box.PositionerBox._check_device_is_valid",
+            return_value=True,
+        ):
+            db = PositionerBox(device="samx", client=mocked_client)
+            qtbot.addWidget(db)
+            yield db
+
+
+def test_positioner_box(positioner_box):
+    """Test init of positioner box"""
+    assert positioner_box.device == "samx"
+    data = positioner_box.dev["samx"].read()
+    # Avoid check for Positioner class from BEC in _init_device
+
+    setpoint_text = positioner_box.ui.setpoint.text()
+    # check that the setpoint is taken correctly after init
+    assert float(setpoint_text) == data["samx_setpoint"]["value"]
+
+    # check that the precision is taken correctly after isnit
+    precision = positioner_box.dev["samx"].precision
+    assert setpoint_text == f"{data['samx_setpoint']['value']:.{precision}f}"
+
+    # check that the step size is set according to the device precision
+    assert positioner_box.ui.step_size.value() == 10**-precision * 10
+
+
+def test_positioner_box_update_limits(positioner_box):
+    """Test update of limits"""
+    positioner_box._limits = None
+    positioner_box.update_limits([0, 10])
+    assert positioner_box._limits == [0, 10]
+    assert positioner_box.setpoint_validator.bottom() == 0
+    assert positioner_box.setpoint_validator.top() == 10
+    assert positioner_box.setpoint_validator.validate("100", 0) == (
+        QValidator.State.Intermediate,
+        "100",
+        0,
+    )
+
+    positioner_box.update_limits(None)
+    assert positioner_box._limits is None
+    assert positioner_box.setpoint_validator.validate("100", 0) == (
+        QValidator.State.Acceptable,
+        "100",
+        0,
+    )
+
+
+def test_positioner_box_on_stop(positioner_box):
+    """Test on stop button"""
+    with mock.patch.object(positioner_box.client.connector, "send") as mock_send:
+        positioner_box.on_stop()
+        params = {"device": "samx", "rpc_id": "fake_uuid", "func": "stop", "args": [], "kwargs": {}}
+        msg = ScanQueueMessage(
+            scan_type="device_rpc",
+            parameter=params,
+            queue="emergency",
+            metadata={"RID": "fake_uuid", "response": False},
+        )
+        mock_send.assert_called_once_with(MessageEndpoints.scan_queue_request(), msg)
+
+
+def test_positioner_box_setpoint_change(positioner_box):
+    """Test positioner box setpoint change"""
+    with mock.patch.object(positioner_box.dev["samx"], "move") as mock_move:
+        positioner_box.ui.setpoint.setText("100")
+        positioner_box.on_setpoint_change()
+        mock_move.assert_called_once_with(100, relative=False)
+
+
+def test_positioner_box_on_tweak_right(positioner_box):
+    """Test tweak right button"""
+    with mock.patch.object(positioner_box.dev["samx"], "move") as mock_move:
+        positioner_box.ui.step_size.setValue(0.1)
+        positioner_box.on_tweak_right()
+        mock_move.assert_called_once_with(0.1, relative=True)
+
+
+def test_positioner_box_on_tweak_left(positioner_box):
+    """Test tweak left button"""
+    with mock.patch.object(positioner_box.dev["samx"], "move") as mock_move:
+        positioner_box.ui.step_size.setValue(0.1)
+        positioner_box.on_tweak_left()
+        mock_move.assert_called_once_with(-0.1, relative=True)
+
+
+def test_positioner_box_setpoint_out_of_range(positioner_box):
+    """Test setpoint out of range"""
+    positioner_box.update_limits([0, 10])
+    positioner_box.ui.setpoint.setText("100")
+    positioner_box.on_setpoint_change()
+    assert positioner_box.ui.setpoint.text() == "100"
+    assert positioner_box.ui.setpoint.hasAcceptableInput() == False
+
+
+def test_positioner_control_line(qtbot, mocked_client):
+    """Test PositionerControlLine.
+    Inherits from PositionerBox, but the layout is changed. Check dimensions only
+    """
+    with mock.patch("bec_widgets.widgets.positioner_box.positioner_box.uuid.uuid4") as mock_uuid:
+        mock_uuid.return_value = "fake_uuid"
+        with mock.patch(
+            "bec_widgets.widgets.positioner_box.positioner_box.PositionerBox._check_device_is_valid",
+            return_value=True,
+        ):
+            db = PositionerControlLine(device="samx", client=mocked_client)
+            qtbot.addWidget(db)
+
+            assert db.ui.device_box.height() == 60
+            assert db.ui.device_box.width() == 600
--- a/tests/unit_tests/test_ring_progress_bar.py
+++ b/tests/unit_tests/test_ring_progress_bar.py
@@ -18,7 +18,6 @@ def ring_progress_bar(qtbot, mocked_client):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


 def test_bar_init(ring_progress_bar):
--- a/tests/unit_tests/test_setting_dialog.py
+++ b/tests/unit_tests/test_setting_dialog.py
@@ -16,7 +16,6 @@ def setting_widget(qtbot):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


 def test_setting_widget_initialization(setting_widget):
@@ -46,23 +45,23 @@ def test_setting_widget_display_current_settings(setting_widget):
 # SettingsDialog tests
 ###################################
@pytest.fixture
-def settings_dialog(qtbot):
+def settings_dialog(qtbot, setting_widget):
    parent_widget = QWidget()
-    settings_widget = SettingWidget()
-    settings_widget.set_target_widget = MagicMock()
-    settings_widget.display_current_settings = MagicMock()
-    settings_widget.accept_changes = MagicMock()
+    setting_widget.set_target_widget = MagicMock()
+    setting_widget.display_current_settings = MagicMock()
+    setting_widget.accept_changes = MagicMock()

    dialog = SettingsDialog(
        parent=parent_widget,
-        settings_widget=settings_widget,
+        settings_widget=setting_widget,
        window_title="Test Settings",
        config={"setting1": "value1", "setting2": "value2"},
    )
    qtbot.addWidget(dialog)
    qtbot.waitExposed(dialog)
-    yield dialog, parent_widget, settings_widget
-    dialog.close()
+    yield dialog, parent_widget, setting_widget
+    parent_widget.close()
+    parent_widget.deleteLater()


 def test_settings_dialog_initialization(settings_dialog):
--- a/tests/unit_tests/test_spinner.py
+++ b/tests/unit_tests/test_spinner.py
@@ -12,6 +12,7 @@ def spinner_widget(qtbot):
    qtbot.addWidget(spinner)
    qtbot.waitExposed(spinner)
    yield spinner
+    spinner.close()


 def test_spinner_widget_paint_event(spinner_widget, qtbot):
--- a/tests/unit_tests/test_stop_button.py
+++ b/tests/unit_tests/test_stop_button.py
@@ -13,7 +13,6 @@ def stop_button(qtbot, mocked_client):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


 def test_stop_button(stop_button):
--- a/tests/unit_tests/test_text_box_widget.py
+++ b/tests/unit_tests/test_text_box_widget.py
@@ -14,7 +14,6 @@ def text_box_widget(qtbot, mocked_client):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


 def test_textbox_widget(text_box_widget):
--- a/tests/unit_tests/test_vscode_widget.py
+++ b/tests/unit_tests/test_vscode_widget.py
@@ -14,6 +14,8 @@ from .client_mocks import mocked_client
 def vscode_widget(qtbot, mocked_client):
    with mock.patch("bec_widgets.widgets.vscode.vscode.subprocess.Popen") as mock_popen:
        widget = VSCodeEditor(client=mocked_client)
+        qtbot.addWidget(widget)
+        qtbot.waitExposed(widget)
        yield widget


--- a/tests/unit_tests/test_waveform1d.py
+++ b/tests/unit_tests/test_waveform1d.py
@@ -4,13 +4,15 @@ from unittest import mock
 import numpy as np
 import pytest

+from bec_widgets.widgets.figure import BECFigure
 from bec_widgets.widgets.figure.plots.waveform.waveform_curve import CurveConfig, Signal, SignalData

 from .client_mocks import mocked_client
-from .test_bec_figure import bec_figure
+from .conftest import create_widget


-def test_adding_curve_to_waveform(bec_figure):
+def test_adding_curve_to_waveform(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()

    # adding curve which is in bec - only names
@@ -38,7 +40,8 @@ def test_adding_curve_to_waveform(bec_figure):
    assert c3.config.label == "non_existent_device-non_existent_device"


-def test_adding_curve_with_same_id(bec_figure):
+def test_adding_curve_with_same_id(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()
    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i", gui_id="test_curve")

@@ -47,7 +50,8 @@ def test_adding_curve_with_same_id(bec_figure):
        assert "Curve with ID 'test_curve' already exists." in str(excinfo.value)


-def test_create_waveform1D_by_config(bec_figure):
+def test_create_waveform1D_by_config(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1_config_input = {
        "widget_class": "BECWaveform",
        "gui_id": "widget_1",
@@ -132,7 +136,8 @@ def test_create_waveform1D_by_config(bec_figure):
    assert w1.config.axis.title == "Widget 1"


-def test_change_gui_id(bec_figure):
+def test_change_gui_id(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()
    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i")
    w1.change_gui_id("new_id")
@@ -141,7 +146,8 @@ def test_change_gui_id(bec_figure):
    assert c1.config.parent_id == "new_id"


-def test_getting_curve(bec_figure):
+def test_getting_curve(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()
    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i", gui_id="test_curve")
    c1_expected_config = CurveConfig(
@@ -173,7 +179,8 @@ def test_getting_curve(bec_figure):
    assert c1.get_config() == c1_expected_config.model_dump()


-def test_getting_curve_errors(bec_figure):
+def test_getting_curve_errors(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()
    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i", gui_id="test_curve")

@@ -190,7 +197,8 @@ def test_getting_curve_errors(bec_figure):
        )


-def test_add_curve(bec_figure):
+def test_add_curve(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()

    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i")
@@ -201,7 +209,8 @@ def test_add_curve(bec_figure):
    assert c1.config.source == "scan_segment"


-def test_change_legend_font_size(bec_figure):
+def test_change_legend_font_size(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    plot = bec_figure.plot()

    w1 = plot.add_curve_bec(x_name="samx", y_name="bpm4i")
@@ -213,7 +222,8 @@ def test_change_legend_font_size(bec_figure):
        assert mock_set_scale.call_args == mock.call(2)


-def test_remove_curve(bec_figure):
+def test_remove_curve(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()

    w1.add_curve_bec(x_name="samx", y_name="bpm4i")
@@ -231,7 +241,8 @@ def test_remove_curve(bec_figure):
        )


-def test_change_curve_appearance_methods(bec_figure, qtbot):
+def test_change_curve_appearance_methods(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()

    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i")
@@ -260,7 +271,8 @@ def test_change_curve_appearance_methods(bec_figure, qtbot):
    }


-def test_change_curve_appearance_args(bec_figure):
+def test_change_curve_appearance_args(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()

    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i")
@@ -290,7 +302,8 @@ def test_change_curve_appearance_args(bec_figure):
    }


-def test_set_custom_curve_data(bec_figure, qtbot):
+def test_set_custom_curve_data(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()

    c1 = w1.add_curve_custom(
@@ -326,7 +339,8 @@ def test_set_custom_curve_data(bec_figure, qtbot):
    assert np.array_equal(y_new, [7, 8, 9])


-def test_custom_data_2D_array(bec_figure, qtbot):
+def test_custom_data_2D_array(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)

    data = np.random.rand(10, 2)

@@ -338,7 +352,8 @@ def test_custom_data_2D_array(bec_figure, qtbot):
    assert np.array_equal(y, data[:, 1])


-def test_get_all_data(bec_figure):
+def test_get_all_data(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()

    c1 = w1.add_curve_custom(
@@ -373,7 +388,8 @@ def test_get_all_data(bec_figure):
    }


-def test_curve_add_by_config(bec_figure):
+def test_curve_add_by_config(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()

    c1_config_input = {
@@ -413,7 +429,8 @@ def test_curve_add_by_config(bec_figure):
    assert c1.get_config(False) == CurveConfig(**c1_config_input)


-def test_scan_update(bec_figure, qtbot):
+def test_scan_update(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()

    c1 = w1.add_curve_bec(x_name="samx", y_name="bpm4i")
@@ -447,7 +464,8 @@ def test_scan_update(bec_figure, qtbot):
    assert c1.get_data() == ([10], [5])


-def test_scan_history_with_val_access(bec_figure, qtbot):
+def test_scan_history_with_val_access(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()

    w1.plot(x_name="samx", y_name="bpm4i")
@@ -472,7 +490,8 @@ def test_scan_history_with_val_access(bec_figure, qtbot):
    assert np.array_equal(y_data, [4, 5, 6])


-def test_scatter_2d_update(bec_figure, qtbot):
+def test_scatter_2d_update(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()

    c1 = w1.add_curve_bec(x_name="samx", y_name="samx", z_name="bpm4i")
@@ -512,7 +531,8 @@ def test_scatter_2d_update(bec_figure, qtbot):
    assert colors == expected_z_colors


-def test_waveform_single_arg_inputs(bec_figure, qtbot):
+def test_waveform_single_arg_inputs(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()

    w1.plot("bpm4i")
@@ -544,7 +564,8 @@ def test_waveform_single_arg_inputs(bec_figure, qtbot):
    assert np.array_equal(w1._curves_data["custom"]["np_ndarray 2D"].get_data(), data_array_2D.T)


-def test_waveform_set_x_sync(bec_figure, qtbot):
+def test_waveform_set_x_sync(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot()
    custom_label = "custom_label"
    w1.plot("bpm4i")
@@ -601,7 +622,8 @@ def test_waveform_set_x_sync(bec_figure, qtbot):
    assert w1.plot_item.getAxis("bottom").labelText == custom_label + " [timestamp]"


-def test_waveform_async_data_update(bec_figure, qtbot):
+def test_waveform_async_data_update(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot("async_device")
    custom_label = "custom_label"
    w1.set_x_label(custom_label)
@@ -647,7 +669,8 @@ def test_waveform_async_data_update(bec_figure, qtbot):
    assert w1.plot_item.getAxis("bottom").labelText == custom_label + " [best_effort]"


-def test_waveform_set_x_async(bec_figure, qtbot):
+def test_waveform_set_x_async(qtbot, mocked_client):
+    bec_figure = create_widget(qtbot, BECFigure, client=mocked_client)
    w1 = bec_figure.plot("async_device")
    custom_label = "custom_label"
    w1.set_x_label(custom_label)
--- a/tests/unit_tests/test_waveform_widget.py
+++ b/tests/unit_tests/test_waveform_widget.py
@@ -3,6 +3,9 @@ from unittest.mock import MagicMock, patch
 import pyqtgraph as pg
 import pytest

+from bec_widgets.qt_utils.settings_dialog import SettingsDialog
+from bec_widgets.widgets.figure.plots.axis_settings import AxisSettings
+from bec_widgets.widgets.waveform.waveform_popups.curve_dialog.curve_dialog import CurveSettings
 from bec_widgets.widgets.waveform.waveform_widget import BECWaveformWidget

 from .client_mocks import mocked_client
@@ -14,7 +17,6 @@ def waveform_widget(qtbot, mocked_client):
    qtbot.addWidget(widget)
    qtbot.waitExposed(widget)
    yield widget
-    widget.close()


@pytest.fixture
@@ -262,3 +264,199 @@ def test_enable_mouse_pan_mode(qtbot, waveform_widget):
    assert action_drag.isChecked() == True
    assert action_rectangle.isChecked() == False
    mock_view_box.setMouseMode.assert_called_once_with(pg.ViewBox.PanMode)
+
+
+###################################
+# Curve Dialog Tests
+###################################
+def show_curve_dialog(qtbot, waveform_widget):
+    curve_dialog = SettingsDialog(
+        waveform_widget,
+        settings_widget=CurveSettings(),
+        window_title="Curve Settings",
+        config=waveform_widget.waveform._curves_data,
+    )
+    qtbot.addWidget(curve_dialog)
+    qtbot.waitExposed(curve_dialog)
+    return curve_dialog
+
+
+def test_curve_dialog_scan_curves_interactions(qtbot, waveform_widget):
+    waveform_widget.plot(y_name="bpm4i")
+    waveform_widget.plot(y_name="bpm3a")
+
+    curve_dialog = show_curve_dialog(qtbot, waveform_widget)
+
+    # Check default display of config from waveform widget
+    assert curve_dialog is not None
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 2
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 0).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 1).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 0).text() == "bpm3a"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 1).text() == "bpm3a"
+    assert curve_dialog.widget.ui.x_mode.currentText() == "best_effort"
+    assert curve_dialog.widget.ui.x_name.isEnabled() == False
+    assert curve_dialog.widget.ui.x_entry.isEnabled() == False
+
+    # Add a new curve
+    curve_dialog.widget.ui.add_curve.click()
+    qtbot.wait(200)
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 3
+
+    # Set device to new curve
+    curve_dialog.widget.ui.scan_table.cellWidget(2, 0).setText("bpm3i")
+
+    # Change the x mode to device
+    curve_dialog.widget.ui.x_mode.setCurrentText("device")
+    qtbot.wait(200)
+    assert curve_dialog.widget.ui.x_name.isEnabled() == True
+    assert curve_dialog.widget.ui.x_entry.isEnabled() == True
+
+    # Set the x device
+    curve_dialog.widget.ui.x_name.setText("samx")
+
+    # Delete first curve ('bpm4i')
+    curve_dialog.widget.ui.scan_table.cellWidget(0, 6).click()
+    qtbot.wait(200)
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 2
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 0).text() == "bpm3a"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 1).text() == "bpm3a"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 0).text() == "bpm3i"
+
+    # Close the dialog
+    curve_dialog.accept()
+    qtbot.wait(200)
+
+    # Check the curve data in the target widget
+    assert list(waveform_widget.waveform._curves_data["scan_segment"].keys()) == [
+        "bpm3a-bpm3a",
+        "bpm3i-bpm3i",
+    ]
+    assert len(waveform_widget.curves) == 2
+
+
+def test_curve_dialog_async(qtbot, waveform_widget):
+    waveform_widget.plot(y_name="bpm4i")
+    waveform_widget.plot(y_name="async_device")
+
+    curve_dialog = show_curve_dialog(qtbot, waveform_widget)
+
+    assert curve_dialog is not None
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 2
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 0).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 1).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 0).text() == "async_device"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 1).text() == "async_device"
+
+
+def test_curve_dialog_dap(qtbot, waveform_widget):
+    waveform_widget.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
+
+    curve_dialog = show_curve_dialog(qtbot, waveform_widget)
+
+    assert curve_dialog is not None
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 1
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 0).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 1).text() == "bpm4i"
+    assert curve_dialog.widget.ui.dap_table.isEnabled() == True
+    assert curve_dialog.widget.ui.dap_table.rowCount() == 1
+    assert curve_dialog.widget.ui.dap_table.cellWidget(0, 0).text() == "bpm4i"
+    assert curve_dialog.widget.ui.dap_table.cellWidget(0, 1).text() == "bpm4i"
+    assert curve_dialog.widget.ui.x_mode.currentText() == "device"
+    assert curve_dialog.widget.ui.x_name.isEnabled() == True
+    assert curve_dialog.widget.ui.x_entry.isEnabled() == True
+    assert curve_dialog.widget.ui.x_name.text() == "samx"
+    assert curve_dialog.widget.ui.x_entry.text() == "samx"
+
+    curve_dialog.accept()
+    qtbot.wait(200)
+
+    assert list(waveform_widget.waveform._curves_data["scan_segment"].keys()) == ["bpm4i-bpm4i"]
+    assert len(waveform_widget.curves) == 2
+
+
+###################################
+# Axis Dialog Tests
+###################################
+
+
+def show_axis_dialog(qtbot, waveform_widget):
+    axis_dialog = SettingsDialog(
+        waveform_widget,
+        settings_widget=AxisSettings(),
+        window_title="Axis Settings",
+        config=waveform_widget._config_dict["axis"],
+    )
+    qtbot.addWidget(axis_dialog)
+    qtbot.waitExposed(axis_dialog)
+    return axis_dialog
+
+
+def test_axis_dialog_with_axis_limits(qtbot, waveform_widget):
+    waveform_widget.set(
+        title="Test Title",
+        x_label="X Label",
+        y_label="Y Label",
+        x_scale="linear",
+        y_scale="log",
+        x_lim=(0, 10),
+        y_lim=(0, 10),
+    )
+
+    axis_dialog = show_axis_dialog(qtbot, waveform_widget)
+
+    assert axis_dialog is not None
+    assert axis_dialog.widget.ui.plot_title.text() == "Test Title"
+    assert axis_dialog.widget.ui.x_label.text() == "X Label"
+    assert axis_dialog.widget.ui.y_label.text() == "Y Label"
+    assert axis_dialog.widget.ui.x_scale.currentText() == "linear"
+    assert axis_dialog.widget.ui.y_scale.currentText() == "log"
+    assert axis_dialog.widget.ui.x_min.value() == 0
+    assert axis_dialog.widget.ui.x_max.value() == 10
+    assert axis_dialog.widget.ui.y_min.value() == 0
+    assert axis_dialog.widget.ui.y_max.value() == 10
+
+
+def test_axis_dialog_without_axis_limits(qtbot, waveform_widget):
+    waveform_widget.set(
+        title="Test Title", x_label="X Label", y_label="Y Label", x_scale="linear", y_scale="log"
+    )
+    x_range = waveform_widget.fig.widget_list[0].plot_item.viewRange()[0]
+    y_range = waveform_widget.fig.widget_list[0].plot_item.viewRange()[1]
+
+    axis_dialog = show_axis_dialog(qtbot, waveform_widget)
+
+    assert axis_dialog is not None
+    assert axis_dialog.widget.ui.plot_title.text() == "Test Title"
+    assert axis_dialog.widget.ui.x_label.text() == "X Label"
+    assert axis_dialog.widget.ui.y_label.text() == "Y Label"
+    assert axis_dialog.widget.ui.x_scale.currentText() == "linear"
+    assert axis_dialog.widget.ui.y_scale.currentText() == "log"
+    assert axis_dialog.widget.ui.x_min.value() == x_range[0]
+    assert axis_dialog.widget.ui.x_max.value() == x_range[1]
+    assert axis_dialog.widget.ui.y_min.value() == y_range[0]
+    assert axis_dialog.widget.ui.y_max.value() == y_range[1]
+
+
+def test_axis_dialog_set_properties(qtbot, waveform_widget):
+    axis_dialog = show_axis_dialog(qtbot, waveform_widget)
+
+    axis_dialog.widget.ui.plot_title.setText("New Title")
+    axis_dialog.widget.ui.x_label.setText("New X Label")
+    axis_dialog.widget.ui.y_label.setText("New Y Label")
+    axis_dialog.widget.ui.x_scale.setCurrentText("log")
+    axis_dialog.widget.ui.y_scale.setCurrentText("linear")
+    axis_dialog.widget.ui.x_min.setValue(5)
+    axis_dialog.widget.ui.x_max.setValue(15)
+    axis_dialog.widget.ui.y_min.setValue(5)
+    axis_dialog.widget.ui.y_max.setValue(15)
+
+    axis_dialog.accept()
+
+    assert waveform_widget._config_dict["axis"]["title"] == "New Title"
+    assert waveform_widget._config_dict["axis"]["x_label"] == "New X Label"
+    assert waveform_widget._config_dict["axis"]["y_label"] == "New Y Label"
+    assert waveform_widget._config_dict["axis"]["x_scale"] == "log"
+    assert waveform_widget._config_dict["axis"]["y_scale"] == "linear"
+    assert waveform_widget._config_dict["axis"]["x_lim"] == (5, 15)
+    assert waveform_widget._config_dict["axis"]["y_lim"] == (5, 15)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
semantic-release	d36d801ef1	0.94.7 Automatically generated by python-semantic-release	2024-08-20 13:17:23 +00:00
Mathias Guijarro	939f834a26	fix: formatting of stdout, stderr captured text for logger	2024-08-14 18:01:51 +02:00
semantic-release	bee51bd86e	0.94.6 Automatically generated by python-semantic-release	2024-08-14 15:05:11 +00:00
wakonig_k	bc2abe945f	fix(server): emit heartbeat with state	2024-08-14 16:55:04 +02:00
semantic-release	49a5a23d41	0.94.5 Automatically generated by python-semantic-release	2024-08-14 12:01:45 +00:00
wakonig_k	4f96d0e4a1	build: increased min version of bec to 2.21.4 Since we now rely on reusing the BECClient singleton, we need the fix introduced with 2.21.4 in BEC.	2024-08-14 12:32:34 +02:00
wakonig_k	ea9240d2f7	fix(rpc): use client singleton instead of dispatcher	2024-08-14 12:32:34 +02:00
wakonig_k	4d02b42f11	fix: removed qcoreapplication for polling events	2024-08-14 12:32:34 +02:00
semantic-release	9509be14be	0.94.4 Automatically generated by python-semantic-release	2024-08-14 08:46:53 +00:00
Mathias Guijarro	198c1d1064	fix: do not shutdown client in "close" Terminating client connections has to be done at the application level	2024-08-13 12:23:51 +02:00
appel_c	2af5c94913	docs: review developer section; add introduction	2024-08-13 11:06:24 +02:00
semantic-release	a4a0bac3c1	0.94.3 Automatically generated by python-semantic-release	2024-08-13 09:03:11 +00:00
wyzula-jan	f285b35b49	test(waveform_widget): added tests for axis setting and curve dialog	2024-08-13 10:53:44 +02:00
wyzula-jan	7aeb2b5c26	fix(curve_dialog): async curves are shown in curve dialog after addition.	2024-08-13 10:53:44 +02:00
wyzula-jan	d56ea95ef9	fix(waveform): async device entry is correctly passed, updated and with new scan the previous data are cleared	2024-08-13 10:53:44 +02:00
semantic-release	5733fea98c	0.94.2 Automatically generated by python-semantic-release	2024-08-13 08:53:10 +00:00
wyzula-jan	98b79aac7b	fix(image): image is single image mode do not raise popup error when connected twice with the same monitor	2024-08-12 11:24:08 +02:00
semantic-release	4212fe0e32	0.94.1 Automatically generated by python-semantic-release	2024-08-12 08:53:48 +00:00
Mathias Guijarro	93d397759c	fix: issue #292 , wrong key was used to clean _slots internal dictionary	2024-08-12 10:32:35 +02:00
semantic-release	8c5b901a37	0.94.0 Automatically generated by python-semantic-release	2024-08-08 14:59:14 +00:00
appel_c	0273bf4856	refactor: adjust dimensions	2024-08-08 15:11:43 +02:00
appel_c	c80a7cd108	feat: add PositionerControlLine	2024-08-08 14:58:16 +02:00
semantic-release	a50d9c7b3f	0.93.5 Automatically generated by python-semantic-release	2024-08-08 11:48:07 +00:00
wyzula-jan	281633deff	fix(positioner_box): icons fixed	2024-08-08 13:34:07 +02:00
appel_c	0d190c5c59	refactor: add button for positioner selection	2024-08-08 13:34:07 +02:00
wakonig_k	6269009e54	test(dap): wait for fit	2024-08-07 20:19:37 +02:00
wakonig_k	6d2442d23c	test(auto-update): wait for rendering	2024-08-07 19:58:26 +02:00
semantic-release	110b27351b	0.93.4 Automatically generated by python-semantic-release	2024-08-07 16:21:43 +00:00
appel_c	37aa371e7c	fix: rename DeviceBox to PositionerBox, fix test for validation	2024-08-07 17:56:48 +02:00
appel_c	eb54e9f788	fix: add validation for bec_lib.device.Positioner; closes #268	2024-08-07 15:45:39 +02:00
semantic-release	482efeb340	0.93.3 Automatically generated by python-semantic-release	2024-08-07 13:14:54 +00:00
wakonig_k	99ee545e41	fix(dock): properly shut down docks and temp areas	2024-08-07 13:58:43 +02:00
wakonig_k	cf94599c25	test: removed quit from teardown	2024-08-07 12:25:54 +02:00
wakonig_k	b50b3a27e6	fix(settings): shut down settings dialog	2024-08-07 12:25:54 +02:00
wakonig_k	bf6294ecbf	test: removed explicit call to close the widget	2024-08-07 12:25:54 +02:00
wakonig_k	a3d4f5ac4b	fix(website): fixed teardown of website widgets	2024-08-07 11:15:14 +02:00
wakonig_k	bc264975b1	fix(dock): properly shut down docks and dock areas	2024-08-07 11:00:25 +02:00
wakonig_k	ad07bbf85e	fix(figure): cleanup pyqtgraph	2024-08-07 10:12:49 +02:00
wakonig_k	9856857f4c	test: use factory instead of fixture to properly cleanup widgets on teardown	2024-08-07 10:12:49 +02:00
wakonig_k	f9e5897900	test: ensure all toplevelwidgets are closed	2024-08-07 10:12:49 +02:00
semantic-release	39fb22b716	0.93.2 Automatically generated by python-semantic-release	2024-08-07 07:57:18 +00:00
wyzula-jan	a372925fff	fix(scan_group_box): Scan Spinboxes limits increased to max allowed values; setting dialog for step size and decimal precision for ScanDoubleSpinBox on right click	2024-08-07 09:47:06 +02:00
semantic-release	ec54440569	0.93.1 Automatically generated by python-semantic-release	2024-08-06 21:56:54 +00:00
wyzula-jan	af86860bf3	fix(dock): docks have more recognizable red icon for closing docks	2024-08-06 19:23:31 +02:00
wyzula-jan	302ae90139	docs: added video tutorial section with BSEG YT video	2024-08-06 17:42:15 +02:00
semantic-release	1405068925	0.93.0 Automatically generated by python-semantic-release	2024-08-05 14:11:40 +00:00
wakonig_k	5aad401ef8	feat(themes): moved themes to bec_qthemes This reverts commit `fd6ae91993`	2024-08-05 14:24:05 +02:00
semantic-release	885dcfda89	0.92.5 Automatically generated by python-semantic-release	2024-08-05 12:20:01 +00:00
wakonig_k	30fef929cf	fix(spinner): stop timer on close event	2024-08-05 13:54:20 +02:00
wakonig_k	1f30dd73a9	fix(status_box): fix cleanup of status box	2024-08-05 13:54:20 +02:00
wakonig_k	73cd11e472	test: register all widgets with qtbot and close them	2024-08-05 13:54:20 +02:00
wakonig_k	7616ca0e14	refactor(queue): refactored bec queue to inherit only from qwidget	2024-08-05 13:54:20 +02:00
semantic-release	ca29a69779	0.92.4 Automatically generated by python-semantic-release	2024-07-31 07:24:44 +00:00
appel_c	dcc5fd71ee	fix: fix missmatch of signal/slot in image and motormap	2024-07-29 16:05:21 +02:00
semantic-release	fee4901657	0.92.3 Automatically generated by python-semantic-release	2024-07-28 10:05:23 +00:00
wakonig_k	71873ddf35	fix(docs): moved to pyside6	2024-07-28 11:17:17 +02:00
semantic-release	f8552ca551	0.92.2 Automatically generated by python-semantic-release	2024-07-28 08:53:31 +00:00
wakonig_k	995a795060	fix(widgets): fixed import for tictactoe example	2024-07-28 10:42:32 +02:00
semantic-release	7ab81c5797	0.92.1 Automatically generated by python-semantic-release	2024-07-28 07:04:29 +00:00
Mathias Guijarro	bc1e23944c	fix: use SafeSlot instead of Slot	2024-07-28 08:54:24 +02:00
Mathias Guijarro	a3fe20500a	fix: linting	2024-07-28 08:54:24 +02:00
Mathias Guijarro	61a4e32deb	fix: always add a QApplication for tests	2024-07-28 08:54:24 +02:00
Mathias Guijarro	3d681f77e1	fix: add xvfb to draw offscreen	2024-07-28 08:54:24 +02:00
Mathias Guijarro	5a9ccfd1f6	fix: reset ErrorPopup singleton between tests	2024-07-26 11:58:07 +02:00
Mathias Guijarro	fc57b7a126	fix: metaclass + QObject segfaults PyQt(cpp bindings)	2024-07-26 11:58:07 +02:00
appel_c	06205e0790	build(ci): install ophyd_devices in editable mode for pipelines	2024-07-25 09:46:58 +02:00
appel_c	4be6fd6b83	refactor: renamed DeviceMonitor2DMessage	2024-07-25 09:46:58 +02:00
appel_c	714e1e139e	refactor: rename device_monitor to device_monitor_2d	2024-07-25 09:46:58 +02:00
semantic-release	01c0e0b1df	0.92.0 Automatically generated by python-semantic-release	2024-07-24 18:52:56 +00:00
wyzula-jan	4457ef2147	fix(dock): custom label can be created closable	2024-07-23 22:22:16 +02:00
wyzula-jan	8ca60d54b3	feat(dock): dock style sheets updated	2024-07-23 22:22:16 +02:00
wyzula-jan	5696c993dc	feat(general_gui): general gui added	2024-07-23 22:22:16 +02:00
wyzula-jan	1206e15309	fix(device_combobox): set minimum size to 125px	2024-07-23 22:22:16 +02:00