diff --git a/10-Top/coll/top.bob b/10-Top/coll/top.bob
index c80047534212de75e8ddbdd740da779e6d845870..4fcd98b18a657ddd92a522a6e64b5bab598e53ec 100644
--- a/10-Top/coll/top.bob
+++ b/10-Top/coll/top.bob
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>Display</name>
- <width>920</width>
+ <name>Collimators</name>
+ <width>1020</width>
<height>300</height>
<widget type="rectangle" version="2.0.0">
<name>Titlebar</name>
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>920</width>
+ <width>1020</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -19,10 +19,10 @@
<widget type="label" version="2.0.0">
<name>Title</name>
<class>TITLE</class>
- <text>Click to edit Title</text>
+ <text>Collimators</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>280</width>
+ <width>980</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -38,51 +38,156 @@
<wrap_words use_class="true">false</wrap_words>
</widget>
<widget type="group" version="2.0.0">
- <name>MGGrey02</name>
+ <name>Motion</name>
<x>20</x>
<y>70</y>
- <width>280</width>
+ <width>380</width>
<height>210</height>
<style>3</style>
- <background_color>
- <color name="BACKGROUND" red="220" green="225" blue="221">
- </color>
- </background_color>
<widget type="rectangle" version="2.0.0">
- <name>MGGrey02-background</name>
- <width>280</width>
+ <name>Background</name>
+ <class>GROUP</class>
+ <width>380</width>
<height>210</height>
- <line_width>2</line_width>
- <line_color>
+ <line_color use_class="true">
<color name="GROUP-BORDER" red="150" green="155" blue="151">
</color>
</line_color>
- <background_color>
+ <background_color use_class="true">
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
</color>
</background_color>
</widget>
<widget type="label" version="2.0.0">
- <name>MGGrey02-title</name>
- <text>Click to edit Title</text>
- <x>10</x>
- <width>260</width>
- <height>30</height>
- <font>
- <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+ <name>Title</name>
+ <class>GROUP-TITLE</class>
+ <text>Motion</text>
+ <width>380</width>
+ <height use_class="true">30</height>
+ <font use_class="true">
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
- <background_color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
+ <foreground_color use_class="true">
+ <color name="GROUP-TEXT" red="25" green="25" blue="25">
</color>
- </background_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
+ </foreground_color>
+ <horizontal_alignment use_class="true">1</horizontal_alignment>
+ <vertical_alignment use_class="true">1</vertical_alignment>
+ <wrap_words use_class="true">false</wrap_words>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Axis 1-1</name>
+ <actions>
+ <action type="open_display">
+ <file>../../99-Shared/ecmcgeneralopi/ecmcOneAxisEngineering.bob</file>
+ <macros>
+ <M>m1</M>
+ <P>MEBT-010:PBI-Coll-001:</P>
+ <R>$(M)-</R>
+ </macros>
+ <target>tab</target>
+ </action>
+ </actions>
+ <text>Coll 1 Axis 1</text>
+ <x>20</x>
+ <y>50</y>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Axis 1-2</name>
+ <actions>
+ <action type="open_display">
+ <file>../../99-Shared/ecmcgeneralopi/ecmcOneAxisEngineering.bob</file>
+ <macros>
+ <M>m2</M>
+ <P>MEBT-010:PBI-Coll-001:</P>
+ <R>$(M)-</R>
+ </macros>
+ <target>tab</target>
+ </action>
+ </actions>
+ <text>Coll 1 Axis 2</text>
+ <x>20</x>
+ <y>100</y>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Axis 2-1</name>
+ <actions>
+ <action type="open_display">
+ <file>../../99-Shared/ecmcgeneralopi/ecmcOneAxisEngineering.bob</file>
+ <macros>
+ <M>m1</M>
+ <P>MEBT-010:PBI-Coll-002:</P>
+ <R>$(M)-</R>
+ </macros>
+ <target>tab</target>
+ </action>
+ </actions>
+ <text>Coll 2 Axis 1</text>
+ <x>140</x>
+ <y>50</y>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Axis 2-2</name>
+ <actions>
+ <action type="open_display">
+ <file>../../99-Shared/ecmcgeneralopi/ecmcOneAxisEngineering.bob</file>
+ <macros>
+ <M>m2</M>
+ <P>MEBT-010:PBI-Coll-002:</P>
+ <R>$(M)-</R>
+ </macros>
+ <target>tab</target>
+ </action>
+ </actions>
+ <text>Coll 2 Axis 2</text>
+ <x>140</x>
+ <y>100</y>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Axis 3-1</name>
+ <actions>
+ <action type="open_display">
+ <file>../../99-Shared/ecmcgeneralopi/ecmcOneAxisEngineering.bob</file>
+ <macros>
+ <M>m1</M>
+ <P>MEBT-010:PBI-Coll-003:</P>
+ <R>$(M)-</R>
+ </macros>
+ <target>tab</target>
+ </action>
+ </actions>
+ <text>Coll 3 Axis 1</text>
+ <x>260</x>
+ <y>50</y>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Axis 3-2</name>
+ <actions>
+ <action type="open_display">
+ <file>../../99-Shared/ecmcgeneralopi/ecmcOneAxisEngineering.bob</file>
+ <macros>
+ <M>m1</M>
+ <P>MEBT-010:PBI-Coll-003:</P>
+ <R>$(M)-</R>
+ </macros>
+ <target>tab</target>
+ </action>
+ </actions>
+ <text>Coll 3 Axis 2</text>
+ <x>260</x>
+ <y>100</y>
+ <tooltip>$(actions)</tooltip>
</widget>
</widget>
<widget type="group" version="2.0.0">
<name>MGGrey03</name>
- <x>320</x>
+ <x>420</x>
<y>70</y>
<width>280</width>
<height>210</height>
@@ -127,7 +232,7 @@
</widget>
<widget type="group" version="2.0.0">
<name>BGGrey01</name>
- <x>620</x>
+ <x>720</x>
<y>70</y>
<width>280</width>
<height>210</height>