diff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui
index 41745a652..3a6c07513 100644
--- a/qt-ui/configuredivecomputerdialog.ui
+++ b/qt-ui/configuredivecomputerdialog.ui
@@ -6,8 +6,8 @@
0
0
- 844
- 616
+ 842
+ 614
@@ -124,6 +124,12 @@
-
+
+
+ 0
+ 2
+
+
Qt::Horizontal
@@ -157,650 +163,684 @@
-
-
-
-
-
- Serial No.
+
+
-
+
+
+ 0
-
- serialNoLineEdit
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- Firmware Version:
-
-
- firmwareVersionLineEdit
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- Custom Text:
-
-
- customTextLlineEdit
-
-
-
- -
-
-
-
- 1
- 0
-
-
-
-
- -
-
-
- Language:
-
-
- languageComboBox
-
-
-
- -
-
-
-
-
- English
-
-
- -
-
- German
-
-
- -
-
- French
-
-
- -
-
- Italian
-
-
-
-
- -
-
-
- Dive Mode:
-
-
- diveModeComboBox
-
-
-
- -
-
-
-
-
- OC
-
-
- -
-
- CC
-
-
- -
-
- Gauge
-
-
- -
-
- Apnea
-
-
-
-
- -
-
-
- Date Format:
-
-
- dateFormatComboBox
-
-
-
- -
-
-
-
-
- MMDDYY
-
-
- -
-
- DDMMYY
-
-
- -
-
- YYMMDD
-
-
-
-
- -
-
-
- Saturation:
-
-
- saturationSpinBox
-
-
-
- -
-
-
- %
-
-
-
- -
-
-
- Desaturation:
-
-
- desaturationSpinBox
-
-
-
- -
-
-
- %
-
-
-
- -
-
-
- Last Deco:
-
-
- lastDecoSpinBox
-
-
-
- -
-
-
- m
-
-
-
- -
-
-
- Brightness:
-
-
- brightnessComboBox
-
-
-
- -
-
-
-
-
- Eco
-
-
- -
-
- Medium
-
-
- -
-
- High
-
-
-
-
- -
-
-
- Sampling Rate:
-
-
- samplingRateComboBox
-
-
-
- -
-
-
-
-
- 2s
-
-
- -
-
- 10s
-
-
-
-
- -
-
-
- Units:
-
-
- unitsComboBox
-
-
-
- -
-
-
-
-
- m/°C
-
-
- -
-
- ft/°F
-
-
-
-
- -
-
-
- Dive Mode Colour:
-
-
- diveModeColour
-
-
-
- -
-
-
-
-
- Standard
-
-
- -
-
- Red
-
-
- -
-
- Green
-
-
- -
-
- Blue
-
-
-
-
- -
-
-
- Salinity (0-5%):
-
-
- salinitySpinBox
-
-
-
- -
-
-
- %
-
-
- 5
-
-
-
- -
-
-
- Sync dive computer time with PC
-
-
-
- -
-
-
- Compass Gain:
-
-
- compassGainComboBox
-
-
-
- -
-
-
-
- 1
- 0
-
-
-
-
-
- 230LSB/Gauss
-
-
- -
-
- 330LSB/Gauss
-
-
- -
-
- 390LSB/Gauss
-
-
- -
-
- 440LSB/Gauss
-
-
- -
-
- 660LSB/Gauss
-
-
- -
-
- 820LSB/Gauss
-
-
- -
-
- 1090LSB/Gauss
-
-
- -
-
- 1370LSB/Gauss
-
-
-
-
- -
-
-
-
- 0
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- %O2
-
-
-
-
- %He
-
-
-
-
- Type
-
-
-
-
- Change Depth
-
-
- -
-
- Gas 1
-
-
- -
-
- Gas 2
-
-
- -
-
- Gas 3
-
-
- -
-
- Gas 4
-
-
- -
-
- Gas 5
-
-
-
-
- -
-
-
-
- 0
- 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- %He
-
-
-
-
- %O2
-
-
-
-
- Type
-
-
-
-
- Change Depth
-
-
- -
-
- Dil 1
-
-
- -
-
- Dil 2
-
-
- -
-
- Dil 3
-
-
- -
-
- Dil 4
-
-
- -
-
- Dil 5
-
-
-
-
- -
-
-
-
- 0
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Set Point [cbar]
-
-
-
-
- Change Depth [m]
-
-
- -
-
- SP 1
-
-
- -
-
- SP 2
-
-
- -
-
- SP 3
-
-
- -
-
- SP 4
-
-
- -
-
- SP 5
-
-
+
+
+ Basic Settings
+
+
+ -
+
+
+ Serial No.
+
+
+ serialNoLineEdit
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ Firmware Version:
+
+
+ firmwareVersionLineEdit
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ Custom Text:
+
+
+ customTextLlineEdit
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+
+ -
+
+
+ Language:
+
+
+ languageComboBox
+
+
+
+ -
+
+
-
+
+ English
+
+
+ -
+
+ German
+
+
+ -
+
+ French
+
+
+ -
+
+ Italian
+
+
+
+
+ -
+
+
+ Dive Mode:
+
+
+ diveModeComboBox
+
+
+
+ -
+
+
-
+
+ OC
+
+
+ -
+
+ CC
+
+
+ -
+
+ Gauge
+
+
+ -
+
+ Apnea
+
+
+
+
+ -
+
+
+ Date Format:
+
+
+ dateFormatComboBox
+
+
+
+ -
+
+
-
+
+ MMDDYY
+
+
+ -
+
+ DDMMYY
+
+
+ -
+
+ YYMMDD
+
+
+
+
+ -
+
+
+ Saturation:
+
+
+ saturationSpinBox
+
+
+
+ -
+
+
+ %
+
+
+
+ -
+
+
+ Desaturation:
+
+
+ desaturationSpinBox
+
+
+
+ -
+
+
+ %
+
+
+
+ -
+
+
+ Last Deco:
+
+
+ lastDecoSpinBox
+
+
+
+ -
+
+
+ m
+
+
+
+ -
+
+
+ Brightness:
+
+
+ brightnessComboBox
+
+
+
+ -
+
+
-
+
+ Eco
+
+
+ -
+
+ Medium
+
+
+ -
+
+ High
+
+
+
+
+ -
+
+
+ Sampling Rate:
+
+
+ samplingRateComboBox
+
+
+
+ -
+
+
-
+
+ 2s
+
+
+ -
+
+ 10s
+
+
+
+
+ -
+
+
+ Units:
+
+
+ unitsComboBox
+
+
+
+ -
+
+
-
+
+ m/°C
+
+
+ -
+
+ ft/°F
+
+
+
+
+ -
+
+
+ Dive Mode Colour:
+
+
+ diveModeColour
+
+
+
+ -
+
+
-
+
+ Standard
+
+
+ -
+
+ Red
+
+
+ -
+
+ Green
+
+
+ -
+
+ Blue
+
+
+
+
+ -
+
+
+ Salinity (0-5%):
+
+
+ salinitySpinBox
+
+
+
+ -
+
+
+ %
+
+
+ 5
+
+
+
+ -
+
+
+ Sync dive computer time with PC
+
+
+
+ -
+
+
+ Compass Gain:
+
+
+ compassGainComboBox
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
-
+
+ 230LSB/Gauss
+
+
+ -
+
+ 330LSB/Gauss
+
+
+ -
+
+ 390LSB/Gauss
+
+
+ -
+
+ 440LSB/Gauss
+
+
+ -
+
+ 660LSB/Gauss
+
+
+ -
+
+ 820LSB/Gauss
+
+
+ -
+
+ 1090LSB/Gauss
+
+
+ -
+
+ 1370LSB/Gauss
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 177
+
+
+
+
+
+
+
+
+ Gas Settings
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %O2
+
+
+
+
+ %He
+
+
+
+
+ Type
+
+
+
+
+ Change Depth
+
+
+ -
+
+ Gas 1
+
+
+ -
+
+ Gas 2
+
+
+ -
+
+ Gas 3
+
+
+ -
+
+ Gas 4
+
+
+ -
+
+ Gas 5
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %He
+
+
+
+
+ %O2
+
+
+
+
+ Type
+
+
+
+
+ Change Depth
+
+
+ -
+
+ Dil 1
+
+
+ -
+
+ Dil 2
+
+
+ -
+
+ Dil 3
+
+
+ -
+
+ Dil 4
+
+
+ -
+
+ Dil 5
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Set Point [cbar]
+
+
+
+
+ Change Depth [m]
+
+
+ -
+
+ SP 1
+
+
+ -
+
+ SP 2
+
+
+ -
+
+ SP 3
+
+
+ -
+
+ SP 4
+
+
+ -
+
+ SP 5
+
+
+
+
+
+