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>