diff --git a/Code/Mantid/Vates/VatesSimpleGui/QtWidgets/inc/MantidVatesSimpleGuiQtWidgets/ModeControlWidget.ui b/Code/Mantid/Vates/VatesSimpleGui/QtWidgets/inc/MantidVatesSimpleGuiQtWidgets/ModeControlWidget.ui
index 1fdec35f98e0126d87dd605381ae08768020a6d6..f64fd1f4ae3f5d1cc3c144265bee2e8405a228e7 100644
--- a/Code/Mantid/Vates/VatesSimpleGui/QtWidgets/inc/MantidVatesSimpleGuiQtWidgets/ModeControlWidget.ui
+++ b/Code/Mantid/Vates/VatesSimpleGui/QtWidgets/inc/MantidVatesSimpleGuiQtWidgets/ModeControlWidget.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>328</width>
- <height>135</height>
+ <width>358</width>
+ <height>40</height>
</rect>
</property>
<property name="sizePolicy">
@@ -19,135 +19,78 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>100</height>
+ <height>40</height>
</size>
</property>
<property name="windowTitle">
<string>ModeControlWidget</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>2</number>
+ </property>
+ <property name="leftMargin">
+ <number>1</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>1</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
<item>
- <widget class="QGroupBox" name="modeControlBox">
- <property name="styleSheet">
- <string notr="true">QGroupBox {
-border: 2px groove black ;
-border-radius: 5px;
-margin-top: 1ex;
-}
-
-QGroupBox::title {
-subcontrol-origin: margin;
-subcontrol-position: top center;
-padding: 0 3px;
-}</string>
+ <widget class="QPushButton" name="standardButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Standard Mode</string>
+ </property>
+ <property name="text">
+ <string>Standard</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="multiSliceButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>MultiSlice Mode</string>
+ </property>
+ <property name="text">
+ <string>MultiSlice</string>
</property>
- <property name="title">
- <string>View Mode</string>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="threeSliceButton">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="whatsThis">
+ <string>Three Slice Mode</string>
</property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+ <property name="text">
+ <string>ThreeSlice</string>
</property>
- <property name="flat">
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="splatterPlotButton">
+ <property name="enabled">
<bool>false</bool>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="1">
- <widget class="QPushButton" name="standardButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Standard</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QPushButton" name="multiSliceButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>MultiSlice</string>
- </property>
- </widget>
- </item>
- <item row="0" column="3">
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0">
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="1">
- <widget class="QPushButton" name="splatterPlotButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Splatter</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QPushButton" name="threeSliceButton">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>ThreeSlice</string>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <spacer name="horizontalSpacer_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
+ <property name="toolTip">
+ <string>Scatter Plot Mode</string>
+ </property>
+ <property name="text">
+ <string>Splatter</string>
+ </property>
</widget>
</item>
</layout>
diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.ui b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.ui
index d7790a606155dce9ccd8ac981588c335b0fdb61a..739dd67ed3a65e1cc0a2527acbee7bf78674b0c7 100644
--- a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.ui
+++ b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/MdViewerWidget.ui
@@ -47,6 +47,19 @@
<item>
<widget class="Mantid::Vates::SimpleGui::TimeControlWidget" name="timeControlWidget" native="true"/>
</item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
<item>
<widget class="Mantid::Vates::SimpleGui::ModeControlWidget" name="modeControlWidget" native="true"/>
</item>
diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/TimeControlWidget.ui b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/TimeControlWidget.ui
index 27f65ae96b157d5d75b6057d12c443a394feae2a..0c56206a05677b120b9767409c17c0355e58adc0 100644
--- a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/TimeControlWidget.ui
+++ b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/TimeControlWidget.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>465</width>
- <height>337</height>
+ <width>291</width>
+ <height>16</height>
</rect>
</property>
<property name="sizePolicy">
@@ -22,20 +22,41 @@
<property name="styleSheet">
<string notr="true">TimeControlWidget { border: 2px groove black; }</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="pqAnimationTimeToolbar" name="animWidget" native="true"/>
- </item>
- <item row="1" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>1</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>1</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>1</number>
+ </property>
+ <item>
<widget class="pqVCRToolbar" name="vcrWidget" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="minimumSize">
<size>
- <width>280</width>
+ <width>220</width>
<height>0</height>
</size>
</property>
</widget>
</item>
+ <item>
+ <widget class="pqAnimationTimeToolbar" name="animWidget" native="true"/>
+ </item>
</layout>
</widget>
<customwidgets>