diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui
index d7589e1f495ee3efed3b5fea541aaab0ef799db6..4003cd4f75ea2141ef398be04c9cce5f01d46877 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ConvertToEnergy.ui
@@ -1945,66 +1945,69 @@ Later steps in the process (saving, renaming) will not be done.</string>
</spacer>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_24">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_5">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_7">
- <item>
- <widget class="QCheckBox" name="cal_ckVerbose">
- <property name="text">
- <string>Verbose</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_34">
- <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="QCheckBox" name="cal_ckPlotResult">
- <property name="toolTip">
- <string>Plot resulting calibration file when created.</string>
- </property>
- <property name="text">
- <string>Plot Result</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_35">
- <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="QCheckBox" name="cal_ckSave">
- <property name="text">
- <string>Save Result</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
+ <widget class="QGroupBox" name="slice_outputOptions">
+ <property name="title">
+ <string>Output Options</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+ <widget class="QCheckBox" name="cal_ckVerbose">
+ <property name="text">
+ <string>Verbose</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_34">
+ <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="QCheckBox" name="cal_ckPlotResult">
+ <property name="toolTip">
+ <string>Plot resulting calibration file when created.</string>
+ </property>
+ <property name="text">
+ <string>Plot Result</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_35">
+ <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="QCheckBox" name="cal_ckSave">
+ <property name="text">
+ <string>Save Result</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ <zorder></zorder>
+ <zorder></zorder>
+ </widget>
</item>
</layout>
</widget>
@@ -2122,58 +2125,67 @@ Later steps in the process (saving, renaming) will not be done.</string>
</spacer>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_39">
- <item>
- <widget class="QCheckBox" name="slice_ckVerbose">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>Verbose</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_20">
- <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="QCheckBox" name="slice_ckPlot">
- <property name="text">
- <string>Plot Result</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_21">
- <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="QCheckBox" name="slice_ckSave">
- <property name="text">
- <string>Save Result</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QGroupBox" name="diag_outputOptions">
+ <property name="title">
+ <string>Output Options</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_30">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_39">
+ <item>
+ <widget class="QCheckBox" name="slice_ckVerbose">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Verbose</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_20">
+ <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="QCheckBox" name="slice_ckPlot">
+ <property name="text">
+ <string>Plot Result</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_21">
+ <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="QCheckBox" name="slice_ckSave">
+ <property name="text">
+ <string>Save Result</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
</item>
</layout>
</widget>
@@ -2222,60 +2234,6 @@ Later steps in the process (saving, renaming) will not be done.</string>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2">
- <layout class="QHBoxLayout" name="horizontalLayout_44">
- <item>
- <widget class="QCheckBox" name="trans_ckVerbose">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>Verbose</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_17">
- <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="QCheckBox" name="trans_ckPlot">
- <property name="text">
- <string>Plot Result</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_18">
- <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="QCheckBox" name="trans_ckSave">
- <property name="text">
- <string>Save Result</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
<item row="2" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
@@ -2291,6 +2249,69 @@ Later steps in the process (saving, renaming) will not be done.</string>
</item>
</layout>
</item>
+ <item>
+ <widget class="QGroupBox" name="trans_OutputOptions">
+ <property name="title">
+ <string>Output Options</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_29">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_44">
+ <item>
+ <widget class="QCheckBox" name="trans_ckVerbose">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Verbose</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_17">
+ <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="QCheckBox" name="trans_ckPlot">
+ <property name="text">
+ <string>Plot Result</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_18">
+ <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="QCheckBox" name="trans_ckSave">
+ <property name="text">
+ <string>Save Result</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="tabSofQW">
@@ -2804,86 +2825,97 @@ p, li { white-space: pre-wrap; }
</spacer>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_43">
- <item>
- <widget class="QCheckBox" name="sqw_ckVerbose">
- <property name="text">
- <string>Verbose</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_30">
- <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="QLabel" name="label_4">
- <property name="text">
- <string>Plot Output:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="sqw_cbPlotType">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>150</width>
- <height>0</height>
- </size>
- </property>
- <item>
- <property name="text">
- <string>None</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Contour</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Spectra</string>
- </property>
- </item>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_19">
- <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="QCheckBox" name="sqw_ckSave">
- <property name="text">
- <string>Save Result</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QGroupBox" name="sqw_outputOptions">
+ <property name="title">
+ <string>Output Options</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_27">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_43">
+ <item>
+ <widget class="QCheckBox" name="sqw_ckVerbose">
+ <property name="text">
+ <string>Verbose</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_30">
+ <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="QLabel" name="label_4">
+ <property name="text">
+ <string>Plot Output:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="sqw_cbPlotType">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
+ <item>
+ <property name="text">
+ <string>None</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Contour</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Spectra</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_19">
+ <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="QCheckBox" name="sqw_ckSave">
+ <property name="text">
+ <string>Save Result</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ <zorder></zorder>
+ <zorder></zorder>
+ </widget>
</item>
</layout>
</widget>