From 2b08d0eeadf87b9431d9d80f4b0746eed96b7610 Mon Sep 17 00:00:00 2001
From: Benjamin Labrecque <labrecque.benji@gmail.com>
Date: Fri, 28 Aug 2026 16:50:03 +0200
Subject: [PATCH 1/2] claude: add topbar to guis

---
 .gitea/scripts/common.sh                      |   6 +-
 .gitea/workflows/add-new-service.yml          |   1 +
 .gitea/workflows/deploy.yml                   |   1 +
 .../qt/A_BD_TestService99-X00.ui              |  55 ++++++++-
 qt/A_BD_DBPM3Curr.ui                          | 106 ++++++++++++------
 qt/A_BD_FeedBackOverview.ui                   |  28 ++++-
 qt/A_BD_InjectionGuard.ui                     |  20 ++--
 qt/A_BD_Master.ui                             |  61 ++++++++--
 qt/A_BD_NTurns.ui                             |  90 +++++++++++----
 qt/A_BD_OrbitBump.ui                          |  72 +++++++++---
 qt/A_BD_OrbitBump_Expert.ui                   |  80 +++++++++----
 qt/A_BD_OrbitBump_ExpertBackUp.ui             |  63 +++++++++--
 qt/A_BD_OrbitBump_Expert_all.ui               |  48 +++++++-
 qt/A_BD_OrbitBump_Operator.ui                 |  66 +++++++++--
 qt/A_BD_PostMortemLog.ui                      |  57 +++++++++-
 qt/A_BD_Scrubbing.ui                          |  84 ++++++++++----
 qt/A_BD_TauBPM.ui                             |  78 ++++++++++---
 qt/A_BD_TauPCT.ui                             |  78 ++++++++++---
 qt/A_BD_Timing.ui                             |  86 ++++++++++----
 qt/A_BD_TopUpTool.ui                          |  94 +++++++++++-----
 qt/A_BD_Tune.ui                               |  59 +++++++++-
 qt/A_BD_TuneBump.ui                           |  20 ++--
 templates/qt/A_BD_{{ui_filename}}.ui.jinja    |  55 ++++++++-
 23 files changed, 1043 insertions(+), 265 deletions(-)

diff --git a/.gitea/scripts/common.sh b/.gitea/scripts/common.sh
index 387a396..7bcbbc0 100644
--- a/.gitea/scripts/common.sh
+++ b/.gitea/scripts/common.sh
@@ -5,7 +5,9 @@
 # Overridable so the scripts can be exercised outside of the runner
 HLA_ROOT=${HLA_ROOT:-/sls/bd/hla}
 
-# Sets AGEBD_ENV_SUFFIX_UPPER/LOWER for the given environment.
+# Sets AGEBD_ENV_SUFFIX_UPPER/LOWER/PAREN for the given environment.
+# PAREN is the human readable variant used in qt panel titles, e.g.
+# "Tune{{ agebd_env_suffix_paren }}" -> "Tune (dev)" on dev, "Tune" on prod.
 # Usage: set_env_suffix <dev|prod>
 set_env_suffix() {
     local ENV=$1
@@ -13,9 +15,11 @@ set_env_suffix() {
     if [ "${ENV}" = "dev" ]; then
         AGEBD_ENV_SUFFIX_UPPER="-DEV"
         AGEBD_ENV_SUFFIX_LOWER="-dev"
+        AGEBD_ENV_SUFFIX_PAREN=" (dev)"
     elif [ "${ENV}" = "prod" ]; then
         AGEBD_ENV_SUFFIX_UPPER=""
         AGEBD_ENV_SUFFIX_LOWER=""
+        AGEBD_ENV_SUFFIX_PAREN=""
     else
         echo "Unknown environment '${ENV}', expected 'dev' or 'prod'" >&2
         exit 1
diff --git a/.gitea/workflows/add-new-service.yml b/.gitea/workflows/add-new-service.yml
index 3d18c25..65159c0 100644
--- a/.gitea/workflows/add-new-service.yml
+++ b/.gitea/workflows/add-new-service.yml
@@ -51,6 +51,7 @@ jobs:
           set_env_suffix "dev"
           sed -i "s/{{ *agebd_env_suffix_upper* }}/${AGEBD_ENV_SUFFIX_UPPER}/g" "${DEST_DIR}/"*
           sed -i "s/{{ *agebd_env_suffix_lower* }}/${AGEBD_ENV_SUFFIX_LOWER}/g" "${DEST_DIR}/"*
+          sed -i "s/{{ *agebd_env_suffix_paren* }}/${AGEBD_ENV_SUFFIX_PAREN}/g" "${DEST_DIR}/"*
 
       # The ioc steps read the deployed ioc files on /sls, so the service
       # has to be deployed before its ioc is installed.
diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index e665244..3a060b2 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -121,6 +121,7 @@ jobs:
           set_env_suffix "${AGEBD_ENV}"
           sed -i "s/{{ *agebd_env_suffix_upper* }}/${AGEBD_ENV_SUFFIX_UPPER}/g" "${DEST_DIR}/"*
           sed -i "s/{{ *agebd_env_suffix_lower* }}/${AGEBD_ENV_SUFFIX_LOWER}/g" "${DEST_DIR}/"*
+          sed -i "s/{{ *agebd_env_suffix_paren* }}/${AGEBD_ENV_SUFFIX_PAREN}/g" "${DEST_DIR}/"*
 
       # -----------------------------------------------------------------
       # Services Detection, Testing, and Deployment
diff --git a/cli/tests/fixtures/expected_output/qt/A_BD_TestService99-X00.ui b/cli/tests/fixtures/expected_output/qt/A_BD_TestService99-X00.ui
index 9fbb703..2ed516e 100644
--- a/cli/tests/fixtures/expected_output/qt/A_BD_TestService99-X00.ui
+++ b/cli/tests/fixtures/expected_output/qt/A_BD_TestService99-X00.ui
@@ -8,18 +8,60 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>600</height>
+    <height>632</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>800</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>TestService99-X00{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="caNumeric" name="canumeric">
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>60</y>
+      <y>92</y>
       <width>100</width>
       <height>50</height>
      </rect>
@@ -44,7 +86,7 @@
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>0</y>
+      <y>32</y>
       <width>601</width>
       <height>22</height>
      </rect>
@@ -60,7 +102,7 @@
     <property name="geometry">
      <rect>
       <x>6</x>
-      <y>34</y>
+      <y>66</y>
       <width>401</width>
       <height>21</height>
      </rect>
@@ -98,6 +140,11 @@
    <extends>QCheckBox</extends>
    <header>caToggleButton</header>
   </customwidget>
+  <customwidget>
+   <class>caLabel</class>
+   <extends>QLabel</extends>
+   <header>caLabel</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/qt/A_BD_DBPM3Curr.ui b/qt/A_BD_DBPM3Curr.ui
index 350323b..7bc450f 100644
--- a/qt/A_BD_DBPM3Curr.ui
+++ b/qt/A_BD_DBPM3Curr.ui
@@ -8,18 +8,60 @@
     <x>0</x>
     <y>0</y>
     <width>530</width>
-    <height>500</height>
+    <height>532</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>530</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>DBPM3 Current{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="wmSignalPropagator" name="wmsignalpropagator">
     <property name="geometry">
      <rect>
       <x>570</x>
-      <y>140</y>
+      <y>172</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -29,7 +71,7 @@
     <property name="geometry">
      <rect>
       <x>570</x>
-      <y>80</y>
+      <y>112</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -54,7 +96,7 @@
     <property name="geometry">
      <rect>
       <x>250</x>
-      <y>100</y>
+      <y>132</y>
       <width>200</width>
       <height>30</height>
      </rect>
@@ -114,7 +156,7 @@
     <property name="geometry">
      <rect>
       <x>250</x>
-      <y>140</y>
+      <y>172</y>
       <width>200</width>
       <height>30</height>
      </rect>
@@ -174,7 +216,7 @@
     <property name="geometry">
      <rect>
       <x>250</x>
-      <y>180</y>
+      <y>212</y>
       <width>200</width>
       <height>30</height>
      </rect>
@@ -234,7 +276,7 @@
     <property name="geometry">
      <rect>
       <x>250</x>
-      <y>380</y>
+      <y>412</y>
       <width>200</width>
       <height>30</height>
      </rect>
@@ -294,7 +336,7 @@
     <property name="geometry">
      <rect>
       <x>250</x>
-      <y>420</y>
+      <y>452</y>
       <width>200</width>
       <height>30</height>
      </rect>
@@ -354,7 +396,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>100</y>
+      <y>132</y>
       <width>230</width>
       <height>30</height>
      </rect>
@@ -370,7 +412,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>140</y>
+      <y>172</y>
       <width>230</width>
       <height>30</height>
      </rect>
@@ -386,7 +428,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>180</y>
+      <y>212</y>
       <width>230</width>
       <height>30</height>
      </rect>
@@ -402,7 +444,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>380</y>
+      <y>412</y>
       <width>230</width>
       <height>30</height>
      </rect>
@@ -418,7 +460,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>220</y>
+      <y>252</y>
       <width>230</width>
       <height>30</height>
      </rect>
@@ -434,7 +476,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>420</y>
+      <y>452</y>
       <width>230</width>
       <height>30</height>
      </rect>
@@ -450,7 +492,7 @@
     <property name="geometry">
      <rect>
       <x>460</x>
-      <y>140</y>
+      <y>172</y>
       <width>60</width>
       <height>30</height>
      </rect>
@@ -510,7 +552,7 @@
     <property name="geometry">
      <rect>
       <x>460</x>
-      <y>380</y>
+      <y>412</y>
       <width>60</width>
       <height>30</height>
      </rect>
@@ -570,7 +612,7 @@
     <property name="geometry">
      <rect>
       <x>460</x>
-      <y>180</y>
+      <y>212</y>
       <width>60</width>
       <height>30</height>
      </rect>
@@ -630,7 +672,7 @@
     <property name="geometry">
      <rect>
       <x>460</x>
-      <y>420</y>
+      <y>452</y>
       <width>60</width>
       <height>30</height>
      </rect>
@@ -690,7 +732,7 @@
     <property name="geometry">
      <rect>
       <x>460</x>
-      <y>100</y>
+      <y>132</y>
       <width>60</width>
       <height>30</height>
      </rect>
@@ -750,7 +792,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>10</y>
+      <y>42</y>
       <width>510</width>
       <height>40</height>
      </rect>
@@ -769,7 +811,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>300</y>
+      <y>332</y>
       <width>230</width>
       <height>30</height>
      </rect>
@@ -785,7 +827,7 @@
     <property name="geometry">
      <rect>
       <x>250</x>
-      <y>300</y>
+      <y>332</y>
       <width>271</width>
       <height>30</height>
      </rect>
@@ -845,7 +887,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>260</y>
+      <y>292</y>
       <width>411</width>
       <height>30</height>
      </rect>
@@ -867,7 +909,7 @@
     <property name="geometry">
      <rect>
       <x>430</x>
-      <y>260</y>
+      <y>292</y>
       <width>91</width>
       <height>30</height>
      </rect>
@@ -886,7 +928,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>340</y>
+      <y>372</y>
       <width>511</width>
       <height>30</height>
      </rect>
@@ -911,7 +953,7 @@
     <property name="geometry">
      <rect>
       <x>250</x>
-      <y>220</y>
+      <y>252</y>
       <width>271</width>
       <height>30</height>
      </rect>
@@ -971,7 +1013,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>60</y>
+      <y>92</y>
       <width>230</width>
       <height>30</height>
      </rect>
@@ -987,7 +1029,7 @@
     <property name="geometry">
      <rect>
       <x>460</x>
-      <y>60</y>
+      <y>92</y>
       <width>60</width>
       <height>30</height>
      </rect>
@@ -1047,7 +1089,7 @@
     <property name="geometry">
      <rect>
       <x>250</x>
-      <y>60</y>
+      <y>92</y>
       <width>200</width>
       <height>30</height>
      </rect>
@@ -1107,7 +1149,7 @@
     <property name="geometry">
      <rect>
       <x>250</x>
-      <y>460</y>
+      <y>492</y>
       <width>200</width>
       <height>30</height>
      </rect>
@@ -1167,7 +1209,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>460</y>
+      <y>492</y>
       <width>230</width>
       <height>30</height>
      </rect>
@@ -1183,7 +1225,7 @@
     <property name="geometry">
      <rect>
       <x>460</x>
-      <y>460</y>
+      <y>492</y>
       <width>60</width>
       <height>30</height>
      </rect>
diff --git a/qt/A_BD_FeedBackOverview.ui b/qt/A_BD_FeedBackOverview.ui
index be6df57..7d46181 100644
--- a/qt/A_BD_FeedBackOverview.ui
+++ b/qt/A_BD_FeedBackOverview.ui
@@ -62,17 +62,37 @@ caLabel[statusTip=&quot;Operation&quot;]{
       <height>27</height>
      </rect>
     </property>
-    <property name="statusTip">
-     <string>Operation</string>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
     </property>
     <property name="text">
-     <string>Feedback / Feed Forward Overview</string>
+     <string>Feedback / Feed Forward Overview{{ agebd_env_suffix_paren }}</string>
     </property>
     <property name="alignment">
      <set>Qt::AlignLeading</set>
     </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
     <property name="colorMode">
-     <enum>caLabel::Default</enum>
+     <enum>caLabel::Static</enum>
     </property>
    </widget>
    <widget class="QTabWidget" name="tabWidget">
diff --git a/qt/A_BD_InjectionGuard.ui b/qt/A_BD_InjectionGuard.ui
index b037d9f..ec5d508 100644
--- a/qt/A_BD_InjectionGuard.ui
+++ b/qt/A_BD_InjectionGuard.ui
@@ -859,24 +859,28 @@ caLabel[statusTip=&quot;Operation&quot;]{
       <bold>true</bold>
      </font>
     </property>
-    <property name="statusTip">
-     <string>Operation</string>
-    </property>
     <property name="text">
-     <string>Injection Guard</string>
+     <string>Injection Guard{{ agebd_env_suffix_paren }}</string>
     </property>
     <property name="alignment">
      <set>Qt::AlignLeading</set>
     </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
     <property name="background">
      <color>
-      <red>218</red>
-      <green>218</green>
-      <blue>218</blue>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
      </color>
     </property>
     <property name="colorMode">
-     <enum>caLabel::Default</enum>
+     <enum>caLabel::Static</enum>
     </property>
    </widget>
    <widget class="caMimeDisplay" name="camimedisplay_2">
diff --git a/qt/A_BD_Master.ui b/qt/A_BD_Master.ui
index 2e3ed38..2ee84f8 100644
--- a/qt/A_BD_Master.ui
+++ b/qt/A_BD_Master.ui
@@ -8,18 +8,60 @@
     <x>0</x>
     <y>0</y>
     <width>1200</width>
-    <height>1060</height>
+    <height>1092</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>1200</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>Master{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="wmSignalPropagator" name="wmsignalpropagator">
     <property name="geometry">
      <rect>
       <x>1290</x>
-      <y>170</y>
+      <y>202</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -29,7 +71,7 @@
     <property name="geometry">
      <rect>
       <x>1290</x>
-      <y>110</y>
+      <y>142</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -54,7 +96,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>10</y>
+      <y>42</y>
       <width>101</width>
       <height>30</height>
      </rect>
@@ -86,7 +128,7 @@
     <property name="geometry">
      <rect>
       <x>840</x>
-      <y>10</y>
+      <y>42</y>
       <width>351</width>
       <height>30</height>
      </rect>
@@ -118,7 +160,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>50</y>
+      <y>82</y>
       <width>1180</width>
       <height>1000</height>
      </rect>
@@ -137,7 +179,7 @@
     <property name="geometry">
      <rect>
       <x>1310</x>
-      <y>210</y>
+      <y>242</y>
       <width>31</width>
       <height>5</height>
      </rect>
@@ -184,6 +226,11 @@
    <extends>QLabel</extends>
    <header>wmSignalPropagator</header>
   </customwidget>
+  <customwidget>
+   <class>caLabel</class>
+   <extends>QLabel</extends>
+   <header>caLabel</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections>
diff --git a/qt/A_BD_NTurns.ui b/qt/A_BD_NTurns.ui
index 39e9cf3..311ba55 100644
--- a/qt/A_BD_NTurns.ui
+++ b/qt/A_BD_NTurns.ui
@@ -8,18 +8,60 @@
     <x>0</x>
     <y>0</y>
     <width>705</width>
-    <height>813</height>
+    <height>845</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>705</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>N Turns{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="caChoice" name="cachoice">
     <property name="geometry">
      <rect>
       <x>190</x>
-      <y>10</y>
+      <y>42</y>
       <width>341</width>
       <height>65</height>
      </rect>
@@ -38,7 +80,7 @@
     <property name="geometry">
      <rect>
       <x>810</x>
-      <y>280</y>
+      <y>312</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -48,7 +90,7 @@
     <property name="geometry">
      <rect>
       <x>810</x>
-      <y>220</y>
+      <y>252</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -73,7 +115,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>90</y>
+      <y>122</y>
       <width>340</width>
       <height>30</height>
      </rect>
@@ -99,7 +141,7 @@
     <property name="geometry">
      <rect>
       <x>360</x>
-      <y>90</y>
+      <y>122</y>
       <width>340</width>
       <height>30</height>
      </rect>
@@ -125,7 +167,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>130</y>
+      <y>162</y>
       <width>130</width>
       <height>30</height>
      </rect>
@@ -149,7 +191,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>170</y>
+      <y>202</y>
       <width>130</width>
       <height>30</height>
      </rect>
@@ -173,7 +215,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>210</y>
+      <y>242</y>
       <width>130</width>
       <height>30</height>
      </rect>
@@ -197,7 +239,7 @@
     <property name="geometry">
      <rect>
       <x>160</x>
-      <y>130</y>
+      <y>162</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -213,7 +255,7 @@
     <property name="geometry">
      <rect>
       <x>160</x>
-      <y>170</y>
+      <y>202</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -226,7 +268,7 @@
     <property name="geometry">
      <rect>
       <x>160</x>
-      <y>210</y>
+      <y>242</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -239,7 +281,7 @@
     <property name="geometry">
      <rect>
       <x>370</x>
-      <y>170</y>
+      <y>202</y>
       <width>130</width>
       <height>30</height>
      </rect>
@@ -263,7 +305,7 @@
     <property name="geometry">
      <rect>
       <x>370</x>
-      <y>210</y>
+      <y>242</y>
       <width>130</width>
       <height>30</height>
      </rect>
@@ -287,7 +329,7 @@
     <property name="geometry">
      <rect>
       <x>520</x>
-      <y>210</y>
+      <y>242</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -300,7 +342,7 @@
     <property name="geometry">
      <rect>
       <x>520</x>
-      <y>170</y>
+      <y>202</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -313,7 +355,7 @@
     <property name="geometry">
      <rect>
       <x>520</x>
-      <y>130</y>
+      <y>162</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -329,7 +371,7 @@
     <property name="geometry">
      <rect>
       <x>370</x>
-      <y>130</y>
+      <y>162</y>
       <width>130</width>
       <height>30</height>
      </rect>
@@ -353,7 +395,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>250</y>
+      <y>282</y>
       <width>130</width>
       <height>30</height>
      </rect>
@@ -377,7 +419,7 @@
     <property name="geometry">
      <rect>
       <x>160</x>
-      <y>250</y>
+      <y>282</y>
       <width>101</width>
       <height>30</height>
      </rect>
@@ -437,7 +479,7 @@
     <property name="geometry">
      <rect>
       <x>520</x>
-      <y>250</y>
+      <y>282</y>
       <width>101</width>
       <height>30</height>
      </rect>
@@ -497,7 +539,7 @@
     <property name="geometry">
      <rect>
       <x>370</x>
-      <y>250</y>
+      <y>282</y>
       <width>130</width>
       <height>30</height>
      </rect>
@@ -521,7 +563,7 @@
     <property name="geometry">
      <rect>
       <x>1</x>
-      <y>300</y>
+      <y>332</y>
       <width>703</width>
       <height>250</height>
      </rect>
@@ -577,7 +619,7 @@
     <property name="geometry">
      <rect>
       <x>1</x>
-      <y>560</y>
+      <y>592</y>
       <width>703</width>
       <height>250</height>
      </rect>
diff --git a/qt/A_BD_OrbitBump.ui b/qt/A_BD_OrbitBump.ui
index d248f98..a0ac929 100644
--- a/qt/A_BD_OrbitBump.ui
+++ b/qt/A_BD_OrbitBump.ui
@@ -8,18 +8,60 @@
     <x>0</x>
     <y>0</y>
     <width>770</width>
-    <height>990</height>
+    <height>1022</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>770</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>Orbit Bump{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="caInclude" name="cainclude">
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>220</y>
+      <y>252</y>
       <width>750</width>
       <height>346</height>
      </rect>
@@ -41,7 +83,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>80</y>
+      <y>112</y>
       <width>750</width>
       <height>100</height>
      </rect>
@@ -63,7 +105,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>190</y>
+      <y>222</y>
       <width>261</width>
       <height>30</height>
      </rect>
@@ -86,7 +128,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>50</y>
+      <y>82</y>
       <width>291</width>
       <height>30</height>
      </rect>
@@ -109,7 +151,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>570</y>
+      <y>602</y>
       <width>261</width>
       <height>30</height>
      </rect>
@@ -132,7 +174,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>600</y>
+      <y>632</y>
       <width>750</width>
       <height>541</height>
      </rect>
@@ -154,7 +196,7 @@
     <property name="geometry">
      <rect>
       <x>330</x>
-      <y>50</y>
+      <y>82</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -177,7 +219,7 @@
     <property name="geometry">
      <rect>
       <x>440</x>
-      <y>50</y>
+      <y>82</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -200,7 +242,7 @@
     <property name="geometry">
      <rect>
       <x>550</x>
-      <y>50</y>
+      <y>82</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -223,7 +265,7 @@
     <property name="geometry">
      <rect>
       <x>660</x>
-      <y>50</y>
+      <y>82</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -246,7 +288,7 @@
     <property name="geometry">
      <rect>
       <x>598</x>
-      <y>4</y>
+      <y>36</y>
       <width>170</width>
       <height>30</height>
      </rect>
@@ -272,7 +314,7 @@
     <property name="geometry">
      <rect>
       <x>2</x>
-      <y>2</y>
+      <y>34</y>
       <width>767</width>
       <height>33</height>
      </rect>
@@ -314,7 +356,7 @@
     <property name="geometry">
      <rect>
       <x>800</x>
-      <y>260</y>
+      <y>292</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -339,7 +381,7 @@
     <property name="geometry">
      <rect>
       <x>800</x>
-      <y>320</y>
+      <y>352</y>
       <width>70</width>
       <height>20</height>
      </rect>
diff --git a/qt/A_BD_OrbitBump_Expert.ui b/qt/A_BD_OrbitBump_Expert.ui
index 9155f42..d0b3906 100644
--- a/qt/A_BD_OrbitBump_Expert.ui
+++ b/qt/A_BD_OrbitBump_Expert.ui
@@ -8,18 +8,60 @@
     <x>0</x>
     <y>0</y>
     <width>1801</width>
-    <height>196</height>
+    <height>228</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>1801</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>Orbit Bump Expert{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="caInclude" name="cainclude_2">
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>72</y>
+      <y>104</y>
       <width>1790</width>
       <height>120</height>
      </rect>
@@ -41,7 +83,7 @@
     <property name="geometry">
      <rect>
       <x>240</x>
-      <y>42</y>
+      <y>74</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -64,7 +106,7 @@
     <property name="geometry">
      <rect>
       <x>354</x>
-      <y>42</y>
+      <y>74</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -87,7 +129,7 @@
     <property name="geometry">
      <rect>
       <x>462</x>
-      <y>42</y>
+      <y>74</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -110,7 +152,7 @@
     <property name="geometry">
      <rect>
       <x>574</x>
-      <y>42</y>
+      <y>74</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -133,7 +175,7 @@
     <property name="geometry">
      <rect>
       <x>686</x>
-      <y>42</y>
+      <y>74</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -156,7 +198,7 @@
     <property name="geometry">
      <rect>
       <x>966</x>
-      <y>42</y>
+      <y>74</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -179,7 +221,7 @@
     <property name="geometry">
      <rect>
       <x>1246</x>
-      <y>42</y>
+      <y>74</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -202,7 +244,7 @@
     <property name="geometry">
      <rect>
       <x>1526</x>
-      <y>42</y>
+      <y>74</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -225,7 +267,7 @@
     <property name="geometry">
      <rect>
       <x>791</x>
-      <y>42</y>
+      <y>74</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -248,7 +290,7 @@
     <property name="geometry">
      <rect>
       <x>876</x>
-      <y>42</y>
+      <y>74</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -271,7 +313,7 @@
     <property name="geometry">
      <rect>
       <x>1071</x>
-      <y>42</y>
+      <y>74</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -294,7 +336,7 @@
     <property name="geometry">
      <rect>
       <x>1156</x>
-      <y>42</y>
+      <y>74</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -317,7 +359,7 @@
     <property name="geometry">
      <rect>
       <x>1631</x>
-      <y>42</y>
+      <y>74</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -340,7 +382,7 @@
     <property name="geometry">
      <rect>
       <x>1351</x>
-      <y>42</y>
+      <y>74</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -363,7 +405,7 @@
     <property name="geometry">
      <rect>
       <x>1716</x>
-      <y>42</y>
+      <y>74</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -386,7 +428,7 @@
     <property name="geometry">
      <rect>
       <x>1436</x>
-      <y>42</y>
+      <y>74</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -409,7 +451,7 @@
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>0</y>
+      <y>32</y>
       <width>1909</width>
       <height>33</height>
      </rect>
diff --git a/qt/A_BD_OrbitBump_ExpertBackUp.ui b/qt/A_BD_OrbitBump_ExpertBackUp.ui
index 272110f..74a1cd8 100644
--- a/qt/A_BD_OrbitBump_ExpertBackUp.ui
+++ b/qt/A_BD_OrbitBump_ExpertBackUp.ui
@@ -8,18 +8,60 @@
     <x>0</x>
     <y>0</y>
     <width>1178</width>
-    <height>600</height>
+    <height>632</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>1178</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>Orbit Bump Expert (Backup){{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="caMenu" name="camenu">
     <property name="geometry">
      <rect>
       <x>80</x>
-      <y>30</y>
+      <y>62</y>
       <width>460</width>
       <height>40</height>
      </rect>
@@ -39,7 +81,7 @@
     <property name="geometry">
      <rect>
       <x>650</x>
-      <y>30</y>
+      <y>62</y>
       <width>460</width>
       <height>40</height>
      </rect>
@@ -59,7 +101,7 @@
     <property name="geometry">
      <rect>
       <x>270</x>
-      <y>340</y>
+      <y>372</y>
       <width>501</width>
       <height>51</height>
      </rect>
@@ -81,7 +123,7 @@
     <property name="geometry">
      <rect>
       <x>50</x>
-      <y>110</y>
+      <y>142</y>
       <width>501</width>
       <height>51</height>
      </rect>
@@ -103,7 +145,7 @@
     <property name="geometry">
      <rect>
       <x>270</x>
-      <y>230</y>
+      <y>262</y>
       <width>501</width>
       <height>51</height>
      </rect>
@@ -125,7 +167,7 @@
     <property name="geometry">
      <rect>
       <x>630</x>
-      <y>110</y>
+      <y>142</y>
       <width>501</width>
       <height>51</height>
      </rect>
@@ -147,7 +189,7 @@
     <property name="geometry">
      <rect>
       <x>260</x>
-      <y>450</y>
+      <y>482</y>
       <width>501</width>
       <height>51</height>
      </rect>
@@ -178,6 +220,11 @@
    <extends>QLineEdit</extends>
    <header>caLineEdit</header>
   </customwidget>
+  <customwidget>
+   <class>caLabel</class>
+   <extends>QLabel</extends>
+   <header>caLabel</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/qt/A_BD_OrbitBump_Expert_all.ui b/qt/A_BD_OrbitBump_Expert_all.ui
index 05a106f..997afed 100644
--- a/qt/A_BD_OrbitBump_Expert_all.ui
+++ b/qt/A_BD_OrbitBump_Expert_all.ui
@@ -8,18 +8,60 @@
     <x>0</x>
     <y>0</y>
     <width>1819</width>
-    <height>1470</height>
+    <height>1502</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>1819</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>Orbit Bump Expert All{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="caLabel" name="calabel_20">
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>2</y>
+      <y>34</y>
       <width>1837</width>
       <height>33</height>
      </rect>
@@ -61,7 +103,7 @@
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>40</y>
+      <y>72</y>
       <width>1819</width>
       <height>1430</height>
      </rect>
diff --git a/qt/A_BD_OrbitBump_Operator.ui b/qt/A_BD_OrbitBump_Operator.ui
index 44e9ac5..13ecf36 100644
--- a/qt/A_BD_OrbitBump_Operator.ui
+++ b/qt/A_BD_OrbitBump_Operator.ui
@@ -8,18 +8,60 @@
     <x>0</x>
     <y>0</y>
     <width>770</width>
-    <height>950</height>
+    <height>982</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>770</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>Orbit Bump Operator{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="caInclude" name="cainclude">
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>190</y>
+      <y>222</y>
       <width>750</width>
       <height>346</height>
      </rect>
@@ -41,7 +83,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>80</y>
+      <y>112</y>
       <width>750</width>
       <height>80</height>
      </rect>
@@ -63,7 +105,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>160</y>
+      <y>192</y>
       <width>261</width>
       <height>30</height>
      </rect>
@@ -86,7 +128,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>50</y>
+      <y>82</y>
       <width>291</width>
       <height>30</height>
      </rect>
@@ -109,7 +151,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>530</y>
+      <y>562</y>
       <width>261</width>
       <height>30</height>
      </rect>
@@ -132,7 +174,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>560</y>
+      <y>592</y>
       <width>750</width>
       <height>541</height>
      </rect>
@@ -154,7 +196,7 @@
     <property name="geometry">
      <rect>
       <x>330</x>
-      <y>50</y>
+      <y>82</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -177,7 +219,7 @@
     <property name="geometry">
      <rect>
       <x>440</x>
-      <y>50</y>
+      <y>82</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -200,7 +242,7 @@
     <property name="geometry">
      <rect>
       <x>550</x>
-      <y>50</y>
+      <y>82</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -223,7 +265,7 @@
     <property name="geometry">
      <rect>
       <x>660</x>
-      <y>50</y>
+      <y>82</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -246,7 +288,7 @@
     <property name="geometry">
      <rect>
       <x>590</x>
-      <y>10</y>
+      <y>42</y>
       <width>170</width>
       <height>30</height>
      </rect>
diff --git a/qt/A_BD_PostMortemLog.ui b/qt/A_BD_PostMortemLog.ui
index ef605fb..b5956ac 100644
--- a/qt/A_BD_PostMortemLog.ui
+++ b/qt/A_BD_PostMortemLog.ui
@@ -11,7 +11,7 @@
     <x>0</x>
     <y>0</y>
     <width>1200</width>
-    <height>1275</height>
+    <height>1307</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -24,11 +24,53 @@
    <locale language="English" country="UnitedStates"/>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>1200</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>Post Mortem Log{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="wmSignalPropagator" name="wmsignalpropagator">
     <property name="geometry">
      <rect>
       <x>1460</x>
-      <y>210</y>
+      <y>242</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -38,7 +80,7 @@
     <property name="geometry">
      <rect>
       <x>1460</x>
-      <y>150</y>
+      <y>182</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -63,7 +105,7 @@
     <property name="geometry">
      <rect>
       <x>1450</x>
-      <y>260</y>
+      <y>292</y>
       <width>91</width>
       <height>21</height>
      </rect>
@@ -82,7 +124,7 @@
     <property name="geometry">
      <rect>
       <x>5</x>
-      <y>5</y>
+      <y>37</y>
       <width>1190</width>
       <height>1265</height>
      </rect>
@@ -1159,6 +1201,11 @@
    <extends>QFrame</extends>
    <header>qwt_plot.h</header>
   </customwidget>
+  <customwidget>
+   <class>caLabel</class>
+   <extends>QLabel</extends>
+   <header>caLabel</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections>
diff --git a/qt/A_BD_Scrubbing.ui b/qt/A_BD_Scrubbing.ui
index fa49779..5beab5d 100644
--- a/qt/A_BD_Scrubbing.ui
+++ b/qt/A_BD_Scrubbing.ui
@@ -8,18 +8,60 @@
     <x>0</x>
     <y>0</y>
     <width>1500</width>
-    <height>1000</height>
+    <height>1032</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>1500</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>Scrubbing{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="caChoice" name="cachoice">
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>10</y>
+      <y>42</y>
       <width>211</width>
       <height>61</height>
      </rect>
@@ -38,7 +80,7 @@
     <property name="geometry">
      <rect>
       <x>640</x>
-      <y>280</y>
+      <y>312</y>
       <width>861</width>
       <height>461</height>
      </rect>
@@ -384,7 +426,7 @@
     <property name="geometry">
      <rect>
       <x>1990</x>
-      <y>540</y>
+      <y>572</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -394,7 +436,7 @@
     <property name="geometry">
      <rect>
       <x>1980</x>
-      <y>360</y>
+      <y>392</y>
       <width>71</width>
       <height>20</height>
      </rect>
@@ -422,7 +464,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>80</y>
+      <y>112</y>
       <width>391</width>
       <height>41</height>
      </rect>
@@ -444,7 +486,7 @@
     <property name="geometry">
      <rect>
       <x>230</x>
-      <y>40</y>
+      <y>72</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -469,7 +511,7 @@
     <property name="geometry">
      <rect>
       <x>349</x>
-      <y>40</y>
+      <y>72</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -494,7 +536,7 @@
     <property name="geometry">
      <rect>
       <x>350</x>
-      <y>10</y>
+      <y>42</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -517,7 +559,7 @@
     <property name="geometry">
      <rect>
       <x>290</x>
-      <y>10</y>
+      <y>42</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -540,7 +582,7 @@
     <property name="geometry">
      <rect>
       <x>230</x>
-      <y>10</y>
+      <y>42</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -563,7 +605,7 @@
     <property name="geometry">
      <rect>
       <x>290</x>
-      <y>40</y>
+      <y>72</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -588,7 +630,7 @@
     <property name="geometry">
      <rect>
       <x>5</x>
-      <y>450</y>
+      <y>482</y>
       <width>631</width>
       <height>291</height>
      </rect>
@@ -3386,7 +3428,7 @@ Remaining</string>
     <property name="geometry">
      <rect>
       <x>420</x>
-      <y>750</y>
+      <y>782</y>
       <width>1081</width>
       <height>241</height>
      </rect>
@@ -3474,7 +3516,7 @@ Remaining</string>
     <property name="geometry">
      <rect>
       <x>5</x>
-      <y>750</y>
+      <y>782</y>
       <width>410</width>
       <height>241</height>
      </rect>
@@ -3731,7 +3773,7 @@ Remaining</string>
     <property name="geometry">
      <rect>
       <x>5</x>
-      <y>130</y>
+      <y>162</y>
       <width>530</width>
       <height>140</height>
      </rect>
@@ -4009,7 +4051,7 @@ Remaining</string>
     <property name="geometry">
      <rect>
       <x>5</x>
-      <y>280</y>
+      <y>312</y>
       <width>255</width>
       <height>160</height>
      </rect>
@@ -4150,7 +4192,7 @@ Remaining</string>
     <property name="geometry">
      <rect>
       <x>550</x>
-      <y>0</y>
+      <y>32</y>
       <width>951</width>
       <height>271</height>
      </rect>
@@ -4486,7 +4528,7 @@ Remaining</string>
     <property name="geometry">
      <rect>
       <x>410</x>
-      <y>30</y>
+      <y>62</y>
       <width>120</width>
       <height>40</height>
      </rect>
@@ -4509,7 +4551,7 @@ Remaining</string>
     <property name="geometry">
      <rect>
       <x>410</x>
-      <y>80</y>
+      <y>112</y>
       <width>120</width>
       <height>40</height>
      </rect>
@@ -4535,7 +4577,7 @@ AGEBD-SCRUBBING{{ agebd_env_suffix_upper }}:CONTROL-VACUUM-DYN-FRAC</string>
     <property name="geometry">
      <rect>
       <x>270</x>
-      <y>280</y>
+      <y>312</y>
       <width>360</width>
       <height>180</height>
      </rect>
diff --git a/qt/A_BD_TauBPM.ui b/qt/A_BD_TauBPM.ui
index 66455d0..a6ef567 100644
--- a/qt/A_BD_TauBPM.ui
+++ b/qt/A_BD_TauBPM.ui
@@ -8,18 +8,60 @@
     <x>0</x>
     <y>0</y>
     <width>550</width>
-    <height>267</height>
+    <height>299</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>550</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>Tau BPM{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="caLabel" name="calabel">
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>60</y>
+      <y>92</y>
       <width>230</width>
       <height>30</height>
      </rect>
@@ -35,7 +77,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>140</y>
+      <y>172</y>
       <width>230</width>
       <height>30</height>
      </rect>
@@ -51,7 +93,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>190</y>
+      <y>222</y>
       <width>230</width>
       <height>30</height>
      </rect>
@@ -67,7 +109,7 @@
     <property name="geometry">
      <rect>
       <x>260</x>
-      <y>190</y>
+      <y>222</y>
       <width>120</width>
       <height>30</height>
      </rect>
@@ -127,7 +169,7 @@
     <property name="geometry">
      <rect>
       <x>420</x>
-      <y>190</y>
+      <y>222</y>
       <width>120</width>
       <height>30</height>
      </rect>
@@ -187,7 +229,7 @@
     <property name="geometry">
      <rect>
       <x>390</x>
-      <y>190</y>
+      <y>222</y>
       <width>21</width>
       <height>30</height>
      </rect>
@@ -203,7 +245,7 @@
     <property name="geometry">
      <rect>
       <x>260</x>
-      <y>230</y>
+      <y>262</y>
       <width>120</width>
       <height>30</height>
      </rect>
@@ -263,7 +305,7 @@
     <property name="geometry">
      <rect>
       <x>420</x>
-      <y>230</y>
+      <y>262</y>
       <width>120</width>
       <height>30</height>
      </rect>
@@ -323,7 +365,7 @@
     <property name="geometry">
      <rect>
       <x>390</x>
-      <y>230</y>
+      <y>262</y>
       <width>21</width>
       <height>30</height>
      </rect>
@@ -339,7 +381,7 @@
     <property name="geometry">
      <rect>
       <x>660</x>
-      <y>130</y>
+      <y>162</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -349,7 +391,7 @@
     <property name="geometry">
      <rect>
       <x>660</x>
-      <y>70</y>
+      <y>102</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -374,7 +416,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>230</y>
+      <y>262</y>
       <width>230</width>
       <height>30</height>
      </rect>
@@ -390,7 +432,7 @@
     <property name="geometry">
      <rect>
       <x>260</x>
-      <y>60</y>
+      <y>92</y>
       <width>280</width>
       <height>30</height>
      </rect>
@@ -406,7 +448,7 @@
     <property name="geometry">
      <rect>
       <x>260</x>
-      <y>140</y>
+      <y>172</y>
       <width>280</width>
       <height>30</height>
      </rect>
@@ -425,7 +467,7 @@
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>10</y>
+      <y>42</y>
       <width>541</width>
       <height>40</height>
      </rect>
@@ -444,7 +486,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>100</y>
+      <y>132</y>
       <width>230</width>
       <height>30</height>
      </rect>
@@ -460,7 +502,7 @@
     <property name="geometry">
      <rect>
       <x>260</x>
-      <y>100</y>
+      <y>132</y>
       <width>280</width>
       <height>30</height>
      </rect>
diff --git a/qt/A_BD_TauPCT.ui b/qt/A_BD_TauPCT.ui
index 702529c..820ca86 100644
--- a/qt/A_BD_TauPCT.ui
+++ b/qt/A_BD_TauPCT.ui
@@ -8,18 +8,60 @@
     <x>0</x>
     <y>0</y>
     <width>570</width>
-    <height>260</height>
+    <height>292</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>570</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>Tau PCT{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="caLabel" name="calabel">
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>60</y>
+      <y>92</y>
       <width>260</width>
       <height>30</height>
      </rect>
@@ -35,7 +77,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>140</y>
+      <y>172</y>
       <width>260</width>
       <height>30</height>
      </rect>
@@ -51,7 +93,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>180</y>
+      <y>212</y>
       <width>260</width>
       <height>30</height>
      </rect>
@@ -67,7 +109,7 @@
     <property name="geometry">
      <rect>
       <x>280</x>
-      <y>180</y>
+      <y>212</y>
       <width>120</width>
       <height>30</height>
      </rect>
@@ -127,7 +169,7 @@
     <property name="geometry">
      <rect>
       <x>440</x>
-      <y>180</y>
+      <y>212</y>
       <width>120</width>
       <height>30</height>
      </rect>
@@ -187,7 +229,7 @@
     <property name="geometry">
      <rect>
       <x>410</x>
-      <y>180</y>
+      <y>212</y>
       <width>21</width>
       <height>30</height>
      </rect>
@@ -203,7 +245,7 @@
     <property name="geometry">
      <rect>
       <x>280</x>
-      <y>220</y>
+      <y>252</y>
       <width>120</width>
       <height>30</height>
      </rect>
@@ -263,7 +305,7 @@
     <property name="geometry">
      <rect>
       <x>440</x>
-      <y>220</y>
+      <y>252</y>
       <width>120</width>
       <height>30</height>
      </rect>
@@ -323,7 +365,7 @@
     <property name="geometry">
      <rect>
       <x>410</x>
-      <y>220</y>
+      <y>252</y>
       <width>21</width>
       <height>30</height>
      </rect>
@@ -339,7 +381,7 @@
     <property name="geometry">
      <rect>
       <x>660</x>
-      <y>130</y>
+      <y>162</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -349,7 +391,7 @@
     <property name="geometry">
      <rect>
       <x>660</x>
-      <y>70</y>
+      <y>102</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -374,7 +416,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>220</y>
+      <y>252</y>
       <width>260</width>
       <height>30</height>
      </rect>
@@ -390,7 +432,7 @@
     <property name="geometry">
      <rect>
       <x>280</x>
-      <y>60</y>
+      <y>92</y>
       <width>280</width>
       <height>30</height>
      </rect>
@@ -406,7 +448,7 @@
     <property name="geometry">
      <rect>
       <x>280</x>
-      <y>140</y>
+      <y>172</y>
       <width>280</width>
       <height>30</height>
      </rect>
@@ -425,7 +467,7 @@
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>10</y>
+      <y>42</y>
       <width>561</width>
       <height>40</height>
      </rect>
@@ -444,7 +486,7 @@
     <property name="geometry">
      <rect>
       <x>280</x>
-      <y>100</y>
+      <y>132</y>
       <width>280</width>
       <height>30</height>
      </rect>
@@ -460,7 +502,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>100</y>
+      <y>132</y>
       <width>260</width>
       <height>30</height>
      </rect>
diff --git a/qt/A_BD_Timing.ui b/qt/A_BD_Timing.ui
index 6ba15a4..a10966a 100644
--- a/qt/A_BD_Timing.ui
+++ b/qt/A_BD_Timing.ui
@@ -8,7 +8,7 @@
     <x>0</x>
     <y>0</y>
     <width>750</width>
-    <height>880</height>
+    <height>912</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,11 +18,53 @@
    <string>(Qt::Window | Qt::FramelessWindowHint);</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>750</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>Timing{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="wmSignalPropagator" name="wmsignalpropagator">
     <property name="geometry">
      <rect>
       <x>1390</x>
-      <y>270</y>
+      <y>302</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -32,7 +74,7 @@
     <property name="geometry">
      <rect>
       <x>1390</x>
-      <y>210</y>
+      <y>242</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -57,7 +99,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>20</y>
+      <y>52</y>
       <width>161</width>
       <height>31</height>
      </rect>
@@ -80,7 +122,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>170</y>
+      <y>202</y>
       <width>431</width>
       <height>705</height>
      </rect>
@@ -1385,7 +1427,7 @@
     <property name="geometry">
      <rect>
       <x>480</x>
-      <y>170</y>
+      <y>202</y>
       <width>260</width>
       <height>705</height>
      </rect>
@@ -3333,7 +3375,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>50</y>
+      <y>82</y>
       <width>411</width>
       <height>30</height>
      </rect>
@@ -3357,7 +3399,7 @@
     <property name="geometry">
      <rect>
       <x>550</x>
-      <y>10</y>
+      <y>42</y>
       <width>100</width>
       <height>60</height>
      </rect>
@@ -3417,7 +3459,7 @@
     <property name="geometry">
      <rect>
       <x>410</x>
-      <y>10</y>
+      <y>42</y>
       <width>140</width>
       <height>40</height>
      </rect>
@@ -3440,7 +3482,7 @@
     <property name="geometry">
      <rect>
       <x>440</x>
-      <y>170</y>
+      <y>202</y>
       <width>41</width>
       <height>705</height>
      </rect>
@@ -4054,7 +4096,7 @@
     <property name="geometry">
      <rect>
       <x>571</x>
-      <y>75</y>
+      <y>107</y>
       <width>80</width>
       <height>25</height>
      </rect>
@@ -4078,7 +4120,7 @@
     <property name="geometry">
      <rect>
       <x>661</x>
-      <y>80</y>
+      <y>112</y>
       <width>80</width>
       <height>20</height>
      </rect>
@@ -4138,7 +4180,7 @@
     <property name="geometry">
      <rect>
       <x>660</x>
-      <y>105</y>
+      <y>137</y>
       <width>80</width>
       <height>20</height>
      </rect>
@@ -4201,7 +4243,7 @@
     <property name="geometry">
      <rect>
       <x>570</x>
-      <y>105</y>
+      <y>137</y>
       <width>80</width>
       <height>25</height>
      </rect>
@@ -4225,7 +4267,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>80</y>
+      <y>112</y>
       <width>550</width>
       <height>45</height>
      </rect>
@@ -4250,7 +4292,7 @@
     <property name="geometry">
      <rect>
       <x>660</x>
-      <y>40</y>
+      <y>72</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -4300,7 +4342,7 @@
     <property name="geometry">
      <rect>
       <x>400</x>
-      <y>140</y>
+      <y>172</y>
       <width>81</width>
       <height>30</height>
      </rect>
@@ -4323,7 +4365,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>140</y>
+      <y>172</y>
       <width>271</width>
       <height>30</height>
      </rect>
@@ -4346,7 +4388,7 @@
     <property name="geometry">
      <rect>
       <x>490</x>
-      <y>140</y>
+      <y>172</y>
       <width>241</width>
       <height>30</height>
      </rect>
@@ -4369,7 +4411,7 @@
     <property name="geometry">
      <rect>
       <x>410</x>
-      <y>50</y>
+      <y>82</y>
       <width>131</width>
       <height>20</height>
      </rect>
@@ -4401,7 +4443,7 @@
     <property name="geometry">
      <rect>
       <x>310</x>
-      <y>130</y>
+      <y>162</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -4434,7 +4476,7 @@
     <property name="geometry">
      <rect>
       <x>660</x>
-      <y>10</y>
+      <y>42</y>
       <width>80</width>
       <height>30</height>
      </rect>
diff --git a/qt/A_BD_TopUpTool.ui b/qt/A_BD_TopUpTool.ui
index 2ed18e6..28c9c3c 100644
--- a/qt/A_BD_TopUpTool.ui
+++ b/qt/A_BD_TopUpTool.ui
@@ -8,18 +8,60 @@
     <x>0</x>
     <y>0</y>
     <width>1852</width>
-    <height>610</height>
+    <height>642</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>1852</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>Top Up Tool{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="caChoice" name="cachoice">
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>10</y>
+      <y>42</y>
       <width>391</width>
       <height>61</height>
      </rect>
@@ -38,7 +80,7 @@
     <property name="geometry">
      <rect>
       <x>729</x>
-      <y>0</y>
+      <y>32</y>
       <width>1111</width>
       <height>601</height>
      </rect>
@@ -198,7 +240,7 @@
     <property name="geometry">
      <rect>
       <x>280</x>
-      <y>140</y>
+      <y>172</y>
       <width>85</width>
       <height>40</height>
      </rect>
@@ -223,7 +265,7 @@
     <property name="geometry">
      <rect>
       <x>160</x>
-      <y>140</y>
+      <y>172</y>
       <width>105</width>
       <height>40</height>
      </rect>
@@ -246,7 +288,7 @@
     <property name="geometry">
      <rect>
       <x>1990</x>
-      <y>540</y>
+      <y>572</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -256,7 +298,7 @@
     <property name="geometry">
      <rect>
       <x>1980</x>
-      <y>360</y>
+      <y>392</y>
       <width>71</width>
       <height>20</height>
      </rect>
@@ -284,7 +326,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>90</y>
+      <y>122</y>
       <width>391</width>
       <height>41</height>
      </rect>
@@ -306,7 +348,7 @@
     <property name="geometry">
      <rect>
       <x>570</x>
-      <y>190</y>
+      <y>222</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -331,7 +373,7 @@
     <property name="geometry">
      <rect>
       <x>570</x>
-      <y>310</y>
+      <y>342</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -356,7 +398,7 @@
     <property name="geometry">
      <rect>
       <x>480</x>
-      <y>310</y>
+      <y>342</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -379,7 +421,7 @@
     <property name="geometry">
      <rect>
       <x>480</x>
-      <y>230</y>
+      <y>262</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -402,7 +444,7 @@
     <property name="geometry">
      <rect>
       <x>480</x>
-      <y>190</y>
+      <y>222</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -425,7 +467,7 @@
     <property name="geometry">
      <rect>
       <x>570</x>
-      <y>230</y>
+      <y>262</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -450,7 +492,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>330</y>
+      <y>362</y>
       <width>601</width>
       <height>270</height>
      </rect>
@@ -2974,7 +3016,7 @@ AGETI-CVME-MASTER-TMA:Evt-14.VALA</string>
     <property name="geometry">
      <rect>
       <x>440</x>
-      <y>20</y>
+      <y>52</y>
       <width>271</width>
       <height>50</height>
      </rect>
@@ -3027,7 +3069,7 @@ AGETI-CVME-MASTER-TMA:Evt-14.VALA</string>
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>170</y>
+      <y>202</y>
       <width>461</width>
       <height>151</height>
      </rect>
@@ -3234,7 +3276,7 @@ AGETI-CVME-MASTER-TMA:Evt-14.VALA</string>
     <property name="geometry">
      <rect>
       <x>480</x>
-      <y>270</y>
+      <y>302</y>
       <width>71</width>
       <height>30</height>
      </rect>
@@ -3257,7 +3299,7 @@ AGETI-CVME-MASTER-TMA:Evt-14.VALA</string>
     <property name="geometry">
      <rect>
       <x>630</x>
-      <y>190</y>
+      <y>222</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -3282,7 +3324,7 @@ AGETI-CVME-MASTER-TMA:Evt-14.VALA</string>
     <property name="geometry">
      <rect>
       <x>630</x>
-      <y>230</y>
+      <y>262</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -3307,7 +3349,7 @@ AGETI-CVME-MASTER-TMA:Evt-14.VALA</string>
     <property name="geometry">
      <rect>
       <x>570</x>
-      <y>270</y>
+      <y>302</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -3332,7 +3374,7 @@ AGETI-CVME-MASTER-TMA:Evt-14.VALA</string>
     <property name="geometry">
      <rect>
       <x>630</x>
-      <y>270</y>
+      <y>302</y>
       <width>50</width>
       <height>30</height>
      </rect>
@@ -3357,7 +3399,7 @@ AGETI-CVME-MASTER-TMA:Evt-14.VALA</string>
     <property name="geometry">
      <rect>
       <x>550</x>
-      <y>150</y>
+      <y>182</y>
       <width>71</width>
       <height>30</height>
      </rect>
@@ -3380,7 +3422,7 @@ AGETI-CVME-MASTER-TMA:Evt-14.VALA</string>
     <property name="geometry">
      <rect>
       <x>630</x>
-      <y>150</y>
+      <y>182</y>
       <width>71</width>
       <height>30</height>
      </rect>
@@ -3403,7 +3445,7 @@ AGETI-CVME-MASTER-TMA:Evt-14.VALA</string>
     <property name="geometry">
      <rect>
       <x>440</x>
-      <y>90</y>
+      <y>122</y>
       <width>161</width>
       <height>30</height>
      </rect>
@@ -3426,7 +3468,7 @@ AGETI-CVME-MASTER-TMA:Evt-14.VALA</string>
     <property name="geometry">
      <rect>
       <x>620</x>
-      <y>90</y>
+      <y>122</y>
       <width>51</width>
       <height>31</height>
      </rect>
diff --git a/qt/A_BD_Tune.ui b/qt/A_BD_Tune.ui
index 8690699..d854fcd 100644
--- a/qt/A_BD_Tune.ui
+++ b/qt/A_BD_Tune.ui
@@ -8,24 +8,66 @@
     <x>0</x>
     <y>0</y>
     <width>950</width>
-    <height>780</height>
+    <height>812</height>
    </rect>
   </property>
   <property name="maximumSize">
    <size>
     <width>1600</width>
-    <height>800</height>
+    <height>832</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>950</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>Tune{{ agebd_env_suffix_paren }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="QTabWidget" name="tabWidget">
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>400</y>
+      <y>432</y>
       <width>911</width>
       <height>331</height>
      </rect>
@@ -233,7 +275,7 @@
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>20</y>
+      <y>52</y>
       <width>141</width>
       <height>171</height>
      </rect>
@@ -370,7 +412,7 @@ measurement</string>
     <property name="geometry">
      <rect>
       <x>180</x>
-      <y>20</y>
+      <y>52</y>
       <width>281</width>
       <height>141</height>
      </rect>
@@ -565,7 +607,7 @@ measurement</string>
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>200</y>
+      <y>232</y>
       <width>911</width>
       <height>191</height>
      </rect>
@@ -2295,6 +2337,11 @@ ARS07-DBPM-0840</string>
    <extends>QFrame</extends>
    <header>qwt_plot.h</header>
   </customwidget>
+  <customwidget>
+   <class>caLabel</class>
+   <extends>QLabel</extends>
+   <header>caLabel</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/qt/A_BD_TuneBump.ui b/qt/A_BD_TuneBump.ui
index bf4250b..2113a6b 100644
--- a/qt/A_BD_TuneBump.ui
+++ b/qt/A_BD_TuneBump.ui
@@ -409,24 +409,28 @@ caLabel[statusTip=&quot;Operation&quot;]{
       <bold>true</bold>
      </font>
     </property>
-    <property name="statusTip">
-     <string>Operation</string>
-    </property>
     <property name="text">
-     <string> Tune Shift</string>
+     <string>Tune Shift{{ agebd_env_suffix_paren }}</string>
     </property>
     <property name="alignment">
      <set>Qt::AlignLeading</set>
     </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
     <property name="background">
      <color>
-      <red>218</red>
-      <green>218</green>
-      <blue>218</blue>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
      </color>
     </property>
     <property name="colorMode">
-     <enum>caLabel::Default</enum>
+     <enum>caLabel::Static</enum>
     </property>
    </widget>
    <widget class="QTabWidget" name="tabWidget">
diff --git a/templates/qt/A_BD_{{ui_filename}}.ui.jinja b/templates/qt/A_BD_{{ui_filename}}.ui.jinja
index 85fe03a..d7e619c 100644
--- a/templates/qt/A_BD_{{ui_filename}}.ui.jinja
+++ b/templates/qt/A_BD_{{ui_filename}}.ui.jinja
@@ -8,18 +8,60 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>600</height>
+    <height>632</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
+   <widget class="caLabel" name="calabel_agebd_env_bar">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>800</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Sans Serif</family>
+      <pointsize>18</pointsize>
+      <weight>75</weight>
+      <italic>false</italic>
+      <bold>true</bold>
+     </font>
+    </property>
+    <property name="text">
+     <string>{{ ui_filename }}{{ '{{ agebd_env_suffix_paren }}' }}</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading</set>
+    </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
+    <property name="background">
+     <color>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
+     </color>
+    </property>
+    <property name="colorMode">
+     <enum>caLabel::Static</enum>
+    </property>
+   </widget>
    <widget class="caNumeric" name="canumeric">
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>60</y>
+      <y>92</y>
       <width>100</width>
       <height>50</height>
      </rect>
@@ -44,7 +86,7 @@
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>0</y>
+      <y>32</y>
       <width>601</width>
       <height>22</height>
      </rect>
@@ -60,7 +102,7 @@
     <property name="geometry">
      <rect>
       <x>6</x>
-      <y>34</y>
+      <y>66</y>
       <width>401</width>
       <height>21</height>
      </rect>
@@ -98,6 +140,11 @@
    <extends>QCheckBox</extends>
    <header>caToggleButton</header>
   </customwidget>
+  <customwidget>
+   <class>caLabel</class>
+   <extends>QLabel</extends>
+   <header>caLabel</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
-- 
2.54.0


From 30d8affec0259e3adb7cfe0804ffcdefa06d7f55 Mon Sep 17 00:00:00 2001
From: Benjamin Labrecque <labrecque.benji@gmail.com>
Date: Fri, 28 Aug 2026 17:13:07 +0200
Subject: [PATCH 2/2] fix orbitbump

---
 qt/A_BD_OrbitBump.ui            | 80 +++++++-----------------------
 qt/A_BD_OrbitBump_Expert.ui     | 88 +++++++++------------------------
 qt/A_BD_OrbitBump_Expert_all.ui | 58 +++-------------------
 qt/A_BD_ServiceManager.ui       | 20 +++++---
 4 files changed, 62 insertions(+), 184 deletions(-)

diff --git a/qt/A_BD_OrbitBump.ui b/qt/A_BD_OrbitBump.ui
index a0ac929..05a40dc 100644
--- a/qt/A_BD_OrbitBump.ui
+++ b/qt/A_BD_OrbitBump.ui
@@ -8,60 +8,18 @@
     <x>0</x>
     <y>0</y>
     <width>770</width>
-    <height>1022</height>
+    <height>990</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <widget class="caLabel" name="calabel_agebd_env_bar">
-    <property name="geometry">
-     <rect>
-      <x>0</x>
-      <y>0</y>
-      <width>770</width>
-      <height>32</height>
-     </rect>
-    </property>
-    <property name="font">
-     <font>
-      <family>Sans Serif</family>
-      <pointsize>18</pointsize>
-      <weight>75</weight>
-      <italic>false</italic>
-      <bold>true</bold>
-     </font>
-    </property>
-    <property name="text">
-     <string>Orbit Bump{{ agebd_env_suffix_paren }}</string>
-    </property>
-    <property name="alignment">
-     <set>Qt::AlignLeading</set>
-    </property>
-    <property name="foreground">
-     <color>
-      <red>255</red>
-      <green>255</green>
-      <blue>255</blue>
-     </color>
-    </property>
-    <property name="background">
-     <color>
-      <red>200</red>
-      <green>0</green>
-      <blue>0</blue>
-     </color>
-    </property>
-    <property name="colorMode">
-     <enum>caLabel::Static</enum>
-    </property>
-   </widget>
    <widget class="caInclude" name="cainclude">
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>252</y>
+      <y>220</y>
       <width>750</width>
       <height>346</height>
      </rect>
@@ -83,7 +41,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>112</y>
+      <y>80</y>
       <width>750</width>
       <height>100</height>
      </rect>
@@ -105,7 +63,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>222</y>
+      <y>190</y>
       <width>261</width>
       <height>30</height>
      </rect>
@@ -128,7 +86,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>82</y>
+      <y>50</y>
       <width>291</width>
       <height>30</height>
      </rect>
@@ -151,7 +109,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>602</y>
+      <y>570</y>
       <width>261</width>
       <height>30</height>
      </rect>
@@ -174,7 +132,7 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>632</y>
+      <y>600</y>
       <width>750</width>
       <height>541</height>
      </rect>
@@ -196,7 +154,7 @@
     <property name="geometry">
      <rect>
       <x>330</x>
-      <y>82</y>
+      <y>50</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -219,7 +177,7 @@
     <property name="geometry">
      <rect>
       <x>440</x>
-      <y>82</y>
+      <y>50</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -242,7 +200,7 @@
     <property name="geometry">
      <rect>
       <x>550</x>
-      <y>82</y>
+      <y>50</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -265,7 +223,7 @@
     <property name="geometry">
      <rect>
       <x>660</x>
-      <y>82</y>
+      <y>50</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -288,7 +246,7 @@
     <property name="geometry">
      <rect>
       <x>598</x>
-      <y>36</y>
+      <y>4</y>
       <width>170</width>
       <height>30</height>
      </rect>
@@ -314,7 +272,7 @@
     <property name="geometry">
      <rect>
       <x>2</x>
-      <y>34</y>
+      <y>2</y>
       <width>767</width>
       <height>33</height>
      </rect>
@@ -329,7 +287,7 @@
      </font>
     </property>
     <property name="text">
-     <string>Beamline local Bumps</string>
+     <string>Beamline local Bumps{{ agebd_env_suffix_paren }}</string>
     </property>
     <property name="alignment">
      <set>Qt::AlignLeading</set>
@@ -343,9 +301,9 @@
     </property>
     <property name="background">
      <color>
-      <red>100</red>
-      <green>100</green>
-      <blue>100</blue>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
      </color>
     </property>
     <property name="colorMode">
@@ -356,7 +314,7 @@
     <property name="geometry">
      <rect>
       <x>800</x>
-      <y>292</y>
+      <y>260</y>
       <width>70</width>
       <height>20</height>
      </rect>
@@ -381,7 +339,7 @@
     <property name="geometry">
      <rect>
       <x>800</x>
-      <y>352</y>
+      <y>320</y>
       <width>70</width>
       <height>20</height>
      </rect>
diff --git a/qt/A_BD_OrbitBump_Expert.ui b/qt/A_BD_OrbitBump_Expert.ui
index d0b3906..6f2e128 100644
--- a/qt/A_BD_OrbitBump_Expert.ui
+++ b/qt/A_BD_OrbitBump_Expert.ui
@@ -8,60 +8,18 @@
     <x>0</x>
     <y>0</y>
     <width>1801</width>
-    <height>228</height>
+    <height>196</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <widget class="caLabel" name="calabel_agebd_env_bar">
-    <property name="geometry">
-     <rect>
-      <x>0</x>
-      <y>0</y>
-      <width>1801</width>
-      <height>32</height>
-     </rect>
-    </property>
-    <property name="font">
-     <font>
-      <family>Sans Serif</family>
-      <pointsize>18</pointsize>
-      <weight>75</weight>
-      <italic>false</italic>
-      <bold>true</bold>
-     </font>
-    </property>
-    <property name="text">
-     <string>Orbit Bump Expert{{ agebd_env_suffix_paren }}</string>
-    </property>
-    <property name="alignment">
-     <set>Qt::AlignLeading</set>
-    </property>
-    <property name="foreground">
-     <color>
-      <red>255</red>
-      <green>255</green>
-      <blue>255</blue>
-     </color>
-    </property>
-    <property name="background">
-     <color>
-      <red>200</red>
-      <green>0</green>
-      <blue>0</blue>
-     </color>
-    </property>
-    <property name="colorMode">
-     <enum>caLabel::Static</enum>
-    </property>
-   </widget>
    <widget class="caInclude" name="cainclude_2">
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>104</y>
+      <y>72</y>
       <width>1790</width>
       <height>120</height>
      </rect>
@@ -83,7 +41,7 @@
     <property name="geometry">
      <rect>
       <x>240</x>
-      <y>74</y>
+      <y>42</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -106,7 +64,7 @@
     <property name="geometry">
      <rect>
       <x>354</x>
-      <y>74</y>
+      <y>42</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -129,7 +87,7 @@
     <property name="geometry">
      <rect>
       <x>462</x>
-      <y>74</y>
+      <y>42</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -152,7 +110,7 @@
     <property name="geometry">
      <rect>
       <x>574</x>
-      <y>74</y>
+      <y>42</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -175,7 +133,7 @@
     <property name="geometry">
      <rect>
       <x>686</x>
-      <y>74</y>
+      <y>42</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -198,7 +156,7 @@
     <property name="geometry">
      <rect>
       <x>966</x>
-      <y>74</y>
+      <y>42</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -221,7 +179,7 @@
     <property name="geometry">
      <rect>
       <x>1246</x>
-      <y>74</y>
+      <y>42</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -244,7 +202,7 @@
     <property name="geometry">
      <rect>
       <x>1526</x>
-      <y>74</y>
+      <y>42</y>
       <width>100</width>
       <height>30</height>
      </rect>
@@ -267,7 +225,7 @@
     <property name="geometry">
      <rect>
       <x>791</x>
-      <y>74</y>
+      <y>42</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -290,7 +248,7 @@
     <property name="geometry">
      <rect>
       <x>876</x>
-      <y>74</y>
+      <y>42</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -313,7 +271,7 @@
     <property name="geometry">
      <rect>
       <x>1071</x>
-      <y>74</y>
+      <y>42</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -336,7 +294,7 @@
     <property name="geometry">
      <rect>
       <x>1156</x>
-      <y>74</y>
+      <y>42</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -359,7 +317,7 @@
     <property name="geometry">
      <rect>
       <x>1631</x>
-      <y>74</y>
+      <y>42</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -382,7 +340,7 @@
     <property name="geometry">
      <rect>
       <x>1351</x>
-      <y>74</y>
+      <y>42</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -405,7 +363,7 @@
     <property name="geometry">
      <rect>
       <x>1716</x>
-      <y>74</y>
+      <y>42</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -428,7 +386,7 @@
     <property name="geometry">
      <rect>
       <x>1436</x>
-      <y>74</y>
+      <y>42</y>
       <width>80</width>
       <height>30</height>
      </rect>
@@ -451,7 +409,7 @@
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>32</y>
+      <y>0</y>
       <width>1909</width>
       <height>33</height>
      </rect>
@@ -466,7 +424,7 @@
      </font>
     </property>
     <property name="text">
-     <string> $(sourcepoint) $(beamline)</string>
+     <string> $(sourcepoint) $(beamline){{ agebd_env_suffix_paren }}</string>
     </property>
     <property name="alignment">
      <set>Qt::AlignLeading</set>
@@ -480,9 +438,9 @@
     </property>
     <property name="background">
      <color>
-      <red>100</red>
-      <green>100</green>
-      <blue>100</blue>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
      </color>
     </property>
     <property name="colorMode">
diff --git a/qt/A_BD_OrbitBump_Expert_all.ui b/qt/A_BD_OrbitBump_Expert_all.ui
index 997afed..6bccc50 100644
--- a/qt/A_BD_OrbitBump_Expert_all.ui
+++ b/qt/A_BD_OrbitBump_Expert_all.ui
@@ -8,33 +8,33 @@
     <x>0</x>
     <y>0</y>
     <width>1819</width>
-    <height>1502</height>
+    <height>1470</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <widget class="caLabel" name="calabel_agebd_env_bar">
+   <widget class="caLabel" name="calabel_20">
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>0</y>
-      <width>1819</width>
-      <height>32</height>
+      <y>2</y>
+      <width>1837</width>
+      <height>33</height>
      </rect>
     </property>
     <property name="font">
      <font>
       <family>Sans Serif</family>
-      <pointsize>18</pointsize>
+      <pointsize>20</pointsize>
       <weight>75</weight>
       <italic>false</italic>
       <bold>true</bold>
      </font>
     </property>
     <property name="text">
-     <string>Orbit Bump Expert All{{ agebd_env_suffix_paren }}</string>
+     <string>Beamline local Bumps Expert{{ agebd_env_suffix_paren }}</string>
     </property>
     <property name="alignment">
      <set>Qt::AlignLeading</set>
@@ -57,53 +57,11 @@
      <enum>caLabel::Static</enum>
     </property>
    </widget>
-   <widget class="caLabel" name="calabel_20">
-    <property name="geometry">
-     <rect>
-      <x>0</x>
-      <y>34</y>
-      <width>1837</width>
-      <height>33</height>
-     </rect>
-    </property>
-    <property name="font">
-     <font>
-      <family>Sans Serif</family>
-      <pointsize>20</pointsize>
-      <weight>75</weight>
-      <italic>false</italic>
-      <bold>true</bold>
-     </font>
-    </property>
-    <property name="text">
-     <string>Beamline local Bumps Expert</string>
-    </property>
-    <property name="alignment">
-     <set>Qt::AlignLeading</set>
-    </property>
-    <property name="foreground">
-     <color>
-      <red>255</red>
-      <green>255</green>
-      <blue>255</blue>
-     </color>
-    </property>
-    <property name="background">
-     <color>
-      <red>100</red>
-      <green>100</green>
-      <blue>100</blue>
-     </color>
-    </property>
-    <property name="colorMode">
-     <enum>caLabel::Static</enum>
-    </property>
-   </widget>
    <widget class="QTabWidget" name="tabWidget">
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>72</y>
+      <y>40</y>
       <width>1819</width>
       <height>1430</height>
      </rect>
diff --git a/qt/A_BD_ServiceManager.ui b/qt/A_BD_ServiceManager.ui
index 792b30a..35a1e06 100644
--- a/qt/A_BD_ServiceManager.ui
+++ b/qt/A_BD_ServiceManager.ui
@@ -1213,24 +1213,28 @@ caLabel[statusTip="Operation"]{
       <bold>true</bold>
      </font>
     </property>
-    <property name="statusTip">
-     <string>Operation</string>
-    </property>
     <property name="text">
-     <string>Service  Overview</string>
+     <string>Service  Overview{{ agebd_env_suffix_paren }}</string>
     </property>
     <property name="alignment">
      <set>Qt::AlignLeading</set>
     </property>
+    <property name="foreground">
+     <color>
+      <red>255</red>
+      <green>255</green>
+      <blue>255</blue>
+     </color>
+    </property>
     <property name="background">
      <color>
-      <red>218</red>
-      <green>218</green>
-      <blue>218</blue>
+      <red>200</red>
+      <green>0</green>
+      <blue>0</blue>
      </color>
     </property>
     <property name="colorMode">
-     <enum>caLabel::Default</enum>
+     <enum>caLabel::Static</enum>
     </property>
    </widget>
   </widget>
-- 
2.54.0