diff --git a/10-Top/bpmioc/top.bob b/10-Top/bpmioc/top.bob
index 9c07c0614eec4758365eb12ba8775bb5674c7050..4bcfdc28856b5e2508d36770a175b092c4be6dd0 100644
--- a/10-Top/bpmioc/top.bob
+++ b/10-Top/bpmioc/top.bob
@@ -58,14 +58,14 @@
   </widget>
   <widget type="group" version="2.0.0">
     <name>BPMManager</name>
-    <x>600</x>
-    <width>240</width>
+    <x>430</x>
+    <width>1000</width>
     <height>50</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
-      <name>BPMManagerBackground</name>
-      <width>240</width>
+      <name>Background</name>
+      <width>1000</width>
       <height>50</height>
       <line_width>0</line_width>
       <background_color>
@@ -75,8 +75,20 @@
       <corner_width>5</corner_width>
       <corner_height>5</corner_height>
     </widget>
+    <widget type="label" version="2.0.0">
+      <name>Header</name>
+      <text>BPM Manager</text>
+      <width>80</width>
+      <height>50</height>
+      <font>
+        <font family="Source Sans Pro" style="BOLD" size="14.0">
+        </font>
+      </font>
+      <horizontal_alignment>1</horizontal_alignment>
+      <vertical_alignment>1</vertical_alignment>
+    </widget>
     <widget type="action_button" version="3.0.0">
-      <name>BPMManagerOverview</name>
+      <name>Overview</name>
       <actions>
         <action type="open_display">
           <file>../../99-Shared/bpmmanager/bpmmanager-top.bob</file>
@@ -90,44 +102,59 @@
         </action>
       </actions>
       <text>Overview</text>
-      <x>10</x>
-      <y>20</y>
+      <x>100</x>
+      <y>10</y>
+      <width>80</width>
       <font>
         <font family="Source Sans Pro" style="BOLD" size="14.0">
         </font>
       </font>
       <tooltip>$(actions)</tooltip>
     </widget>
-    <widget type="label" version="2.0.0">
-      <name>BPMManagerHeader</name>
-      <text>BPM Manager</text>
-      <x>10</x>
-      <width>230</width>
+    <widget type="action_button" version="3.0.0">
+      <name>MEBT-ALL</name>
+      <actions>
+        <action type="open_display">
+          <file>../../99-Shared/bpmmanager/bpmmanager-bpm-instance.bob</file>
+          <macros>
+            <BPM_PAIR>ALL</BPM_PAIR>
+            <P>PBI-BPM::MEBT-</P>
+            <R>ALL-</R>
+            <S>MEBT-</S>
+          </macros>
+          <target>tab</target>
+          <description>MEBT-ALL</description>
+        </action>
+      </actions>
+      <text>MEBT</text>
+      <x>200</x>
+      <y>10</y>
+      <width>80</width>
       <font>
         <font family="Source Sans Pro" style="BOLD" size="14.0">
         </font>
       </font>
-      <horizontal_alignment>1</horizontal_alignment>
-      <vertical_alignment>1</vertical_alignment>
+      <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="action_button" version="3.0.0">
-      <name>BPMManagerALL</name>
+      <name>DTL-ALL</name>
       <actions>
         <action type="open_display">
           <file>../../99-Shared/bpmmanager/bpmmanager-bpm-instance.bob</file>
           <macros>
             <BPM_PAIR>ALL</BPM_PAIR>
-            <P>PBI-BPM::MEBT-</P>
+            <P>PBI-BPM::DTL-</P>
             <R>ALL-</R>
-            <S>MEBT-</S>
+            <S>DTL-</S>
           </macros>
           <target>tab</target>
-          <description>MEBT-ALL</description>
+          <description>DTL-ALL</description>
         </action>
       </actions>
-      <text>PBI-BPM01</text>
-      <x>130</x>
-      <y>20</y>
+      <text>DTL</text>
+      <x>300</x>
+      <y>10</y>
+      <width>80</width>
       <font>
         <font family="Source Sans Pro" style="BOLD" size="14.0">
         </font>
@@ -8231,7 +8258,6 @@ if (action_ == 1):
     <y>50</y>
     <width>2390</width>
     <height>1150</height>
-    <active_tab>1</active_tab>
     <direction>1</direction>
   </widget>
 </display>
diff --git a/99-Shared/bpmmanager/bpmmanager-top.bob b/99-Shared/bpmmanager/bpmmanager-top.bob
index ba230cc1433ed1350d31e02041cfe00518a5c858..46dc43f2bf968da20fa30d001e192f556298c8d6 100644
--- a/99-Shared/bpmmanager/bpmmanager-top.bob
+++ b/99-Shared/bpmmanager/bpmmanager-top.bob
@@ -2,7 +2,7 @@
 <display version="2.0.0">
   <name>BPM Manager</name>
   <width>1600</width>
-  <height>700</height>
+  <height>740</height>
   <background_color>
     <color name="BACKGROUND" red="220" green="225" blue="221">
     </color>
@@ -69,13 +69,13 @@
     <x>20</x>
     <y>50</y>
     <width>100</width>
-    <height>620</height>
+    <height>660</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>BackgroundMEBT</name>
       <y>50</y>
-      <height>570</height>
+      <height>610</height>
       <line_width>0</line_width>
       <background_color>
         <color red="150" green="155" blue="151" alpha="90">
@@ -95,26 +95,6 @@
       <horizontal_alignment>1</horizontal_alignment>
       <vertical_alignment>1</vertical_alignment>
     </widget>
-    <widget type="action_button" version="3.0.0">
-      <name>MEBT-ALL</name>
-      <actions>
-        <action type="open_display">
-          <file>bpmmanager-bpm-instance.bob</file>
-          <macros>
-            <BPM_PAIR>ALL</BPM_PAIR>
-            <P>$(P)$(S1)</P>
-            <R>ALL-</R>
-            <S>$(S1)</S>
-          </macros>
-          <target>tab</target>
-          <description>$(S1)ALL</description>
-        </action>
-      </actions>
-      <text></text>
-      <height>50</height>
-      <transparent>true</transparent>
-      <tooltip>$(actions)</tooltip>
-    </widget>
     <widget type="action_button" version="3.0.0">
       <name>MEBT-BPM01</name>
       <actions>
@@ -409,20 +389,45 @@
         </color>
       </border_color>
     </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>MEBT-ALL</name>
+      <actions>
+        <action type="open_display">
+          <file>bpmmanager-bpm-instance.bob</file>
+          <macros>
+            <BPM_PAIR>ALL</BPM_PAIR>
+            <P>$(P)$(S1)</P>
+            <R>ALL-</R>
+            <S>$(S1)</S>
+          </macros>
+          <target>tab</target>
+          <description>$(S1)ALL</description>
+        </action>
+      </actions>
+      <text>ALL</text>
+      <x>10</x>
+      <y>620</y>
+      <width>80</width>
+      <font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+      <tooltip>$(actions)</tooltip>
+    </widget>
   </widget>
   <widget type="group" version="2.0.0">
     <name>Section2-DTL</name>
     <x>130</x>
     <y>50</y>
     <width>190</width>
-    <height>620</height>
+    <height>660</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="rectangle" version="2.0.0">
       <name>BackgroundDTL</name>
       <y>50</y>
       <width>190</width>
-      <height>570</height>
+      <height>610</height>
       <line_width>0</line_width>
       <background_color>
         <color red="150" green="155" blue="151" alpha="90">
@@ -1073,6 +1078,31 @@
       <height>60</height>
       <tooltip>$(actions)</tooltip>
     </widget>
+    <widget type="action_button" version="3.0.0">
+      <name>DTL-ALL</name>
+      <actions>
+        <action type="open_display">
+          <file>bpmmanager-bpm-instance.bob</file>
+          <macros>
+            <BPM_PAIR>ALL</BPM_PAIR>
+            <P>$(P)$(S2)</P>
+            <R>ALL-</R>
+            <S>$(S2)</S>
+          </macros>
+          <target>tab</target>
+          <description>$(S2)ALL</description>
+        </action>
+      </actions>
+      <text>ALL</text>
+      <x>10</x>
+      <y>620</y>
+      <width>170</width>
+      <font>
+        <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+        </font>
+      </font>
+      <tooltip>$(actions)</tooltip>
+    </widget>
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>SquareExample</name>