diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui
index 5916b2777..6dbe964d9 100644
--- a/qt-ui/plannerSettings.ui
+++ b/qt-ui/plannerSettings.ui
@@ -104,15 +104,15 @@
              <property name="horizontalSpacing">
               <number>2</number>
              </property>
-             <item row="0" column="0">
-              <widget class="QLabel" name="label">
+             <item row="3" column="0">
+              <widget class="QLabel" name="asc6toSurf">
                <property name="text">
-                <string>below 75% avg. depth</string>
+                <string>6m to surface</string>
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
-              <widget class="QSpinBox" name="ascRate75">
+             <item row="3" column="1">
+              <widget class="QSpinBox" name="ascRateLast6m">
                <property name="suffix">
                 <string>m/min</string>
                </property>
@@ -121,15 +121,8 @@
                </property>
               </widget>
              </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="label_2">
-               <property name="text">
-                <string>75% to 50% avg. depth</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QSpinBox" name="ascRate50">
+             <item row="2" column="1">
+              <widget class="QSpinBox" name="ascRateStops">
                <property name="suffix">
                 <string>m/min</string>
                </property>
@@ -145,8 +138,8 @@
                </property>
               </widget>
              </item>
-             <item row="2" column="1">
-              <widget class="QSpinBox" name="ascRateStops">
+             <item row="1" column="1">
+              <widget class="QSpinBox" name="ascRate50">
                <property name="suffix">
                 <string>m/min</string>
                </property>
@@ -155,20 +148,27 @@
                </property>
               </widget>
              </item>
-             <item row="3" column="0">
-              <widget class="QLabel" name="asc6toSurf">
+             <item row="0" column="1">
+              <widget class="QSpinBox" name="ascRate75">
+               <property name="suffix">
+                <string>m/min</string>
+               </property>
+               <property name="minimum">
+                <number>1</number>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0">
+              <widget class="QLabel" name="label">
                <property name="text">
-                <string>6m to surface</string>
+                <string>below 75% avg. depth</string>
                </property>
               </widget>
              </item>
-             <item row="3" column="1">
-              <widget class="QSpinBox" name="ascRateLast6m">
-               <property name="suffix">
-                <string>m/min</string>
-               </property>
-               <property name="minimum">
-                <number>1</number>
+             <item row="1" column="0">
+              <widget class="QLabel" name="label_2">
+               <property name="text">
+                <string>75% to 50% avg. depth</string>
                </property>
               </widget>
              </item>
@@ -274,71 +274,14 @@
           <property name="spacing">
            <number>2</number>
           </property>
-          <item row="6" column="1">
-           <widget class="QLabel" name="label_16">
+          <item row="17" column="1">
+           <widget class="QLabel" name="label_4">
             <property name="text">
-             <string>GF high</string>
+             <string>Min. switch duration</string>
             </property>
            </widget>
           </item>
-          <item row="9" column="1" colspan="2">
-           <widget class="QCheckBox" name="backgasBreaks">
-            <property name="text">
-             <string>Plan backgas breaks</string>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="2">
-           <widget class="QSpinBox" name="gfhigh">
-            <property name="suffix">
-             <string>%</string>
-            </property>
-            <property name="minimum">
-             <number>1</number>
-            </property>
-            <property name="maximum">
-             <number>150</number>
-            </property>
-           </widget>
-          </item>
-          <item row="8" column="1" colspan="2">
-           <widget class="QCheckBox" name="lastStop">
-            <property name="text">
-             <string>Last stop at 6m</string>
-            </property>
-           </widget>
-          </item>
-          <item row="12" column="1">
-           <widget class="QComboBox" name="rebreathermode">
-            <property name="currentText">
-             <string/>
-            </property>
-            <property name="maxVisibleItems">
-             <number>6</number>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="2">
-           <widget class="QSpinBox" name="gflow">
-            <property name="suffix">
-             <string>%</string>
-            </property>
-            <property name="minimum">
-             <number>1</number>
-            </property>
-            <property name="maximum">
-             <number>150</number>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="1" colspan="2">
-           <widget class="QCheckBox" name="drop_stone_mode">
-            <property name="text">
-             <string>Drop to first depth</string>
-            </property>
-           </widget>
-          </item>
-          <item row="13" column="1">
+          <item row="19" column="1">
            <spacer name="verticalSpacer_2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -351,10 +294,40 @@
             </property>
            </spacer>
           </item>
-          <item row="5" column="1">
-           <widget class="QLabel" name="label_15">
+          <item row="18" column="1">
+           <widget class="QComboBox" name="rebreathermode">
+            <property name="currentText">
+             <string/>
+            </property>
+            <property name="maxVisibleItems">
+             <number>6</number>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="2">
+           <widget class="QSpinBox" name="gflow">
+            <property name="suffix">
+             <string>%</string>
+            </property>
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>150</number>
+            </property>
+           </widget>
+          </item>
+          <item row="13" column="1" colspan="2">
+           <widget class="QCheckBox" name="drop_stone_mode">
             <property name="text">
-             <string>GF low</string>
+             <string>Drop to first depth</string>
+            </property>
+           </widget>
+          </item>
+          <item row="14" column="1" colspan="2">
+           <widget class="QCheckBox" name="lastStop">
+            <property name="text">
+             <string>Last stop at 6m</string>
             </property>
            </widget>
           </item>
@@ -365,7 +338,109 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
+          <item row="8" column="1">
+           <widget class="QLabel" name="label_15">
+            <property name="text">
+             <string>GF low</string>
+            </property>
+            <property name="indent">
+             <number>26</number>
+            </property>
+           </widget>
+          </item>
+          <item row="15" column="1" colspan="2">
+           <widget class="QCheckBox" name="backgasBreaks">
+            <property name="text">
+             <string>Plan backgas breaks</string>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="1">
+           <widget class="QLabel" name="label_16">
+            <property name="text">
+             <string>GF high</string>
+            </property>
+            <property name="indent">
+             <number>25</number>
+            </property>
+           </widget>
+          </item>
+          <item row="9" column="2">
+           <widget class="QSpinBox" name="gfhigh">
+            <property name="suffix">
+             <string>%</string>
+            </property>
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>150</number>
+            </property>
+           </widget>
+          </item>
+          <item row="16" column="1" colspan="2">
+           <widget class="QCheckBox" name="switch_at_req_stop">
+            <property name="toolTip">
+             <string>Postpone gas change if a stop is not required</string>
+            </property>
+            <property name="text">
+             <string>Only switch at required stops</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <spacer name="verticalSpacer_6">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="12" column="1">
+           <spacer name="verticalSpacer_5">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="17" column="2">
+           <widget class="QSpinBox" name="min_switch_duration">
+            <property name="suffix">
+             <string>min</string>
+            </property>
+            <property name="prefix">
+             <string/>
+            </property>
+            <property name="minimum">
+             <number>0</number>
+            </property>
+            <property name="maximum">
+             <number>9</number>
+            </property>
+            <property name="value">
+             <number>1</number>
+            </property>
+           </widget>
+          </item>
+          <item row="11" column="1">
+           <widget class="QRadioButton" name="vpmb_deco">
+            <property name="text">
+             <string>VPM-B deco</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
            <widget class="QRadioButton" name="buehlmann_deco">
             <property name="text">
              <string>Buehlmann deco</string>
@@ -375,31 +450,17 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QRadioButton" name="vpmb_deco">
-            <property name="text">
-             <string>VPM-B deco</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QCheckBox" name="safetystop">
-            <property name="text">
-             <string>Safety stop</string>
-            </property>
-            <property name="tristate">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1">
+          <item row="1" column="1">
            <widget class="QLabel" name="label_3">
             <property name="text">
              <string>Reserve gas</string>
             </property>
+            <property name="indent">
+             <number>26</number>
+            </property>
            </widget>
           </item>
-          <item row="4" column="2">
+          <item row="1" column="2">
            <widget class="QSpinBox" name="reserve_gas">
             <property name="suffix">
              <string>bar</string>
@@ -418,41 +479,31 @@
             </property>
            </widget>
           </item>
-          <item row="10" column="1" colspan="2">
-           <widget class="QCheckBox" name="switch_at_req_stop">
-            <property name="toolTip">
-             <string>Postpone gas change if a stop is not required</string>
+          <item row="2" column="1" alignment="Qt::AlignHCenter">
+           <widget class="QCheckBox" name="safetystop">
+            <property name="layoutDirection">
+             <enum>Qt::LeftToRight</enum>
             </property>
             <property name="text">
-             <string>Only switch at required stops</string>
+             <string>Safety stop</string>
+            </property>
+            <property name="tristate">
+             <bool>false</bool>
             </property>
            </widget>
           </item>
-          <item row="11" column="1">
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>Min. switch duration</string>
+          <item row="10" column="1">
+           <spacer name="verticalSpacer_7">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
             </property>
-           </widget>
-          </item>
-          <item row="11" column="2">
-           <widget class="QSpinBox" name="min_switch_duration">
-            <property name="suffix">
-             <string>min</string>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
             </property>
-            <property name="prefix">
-             <string/>
-            </property>
-            <property name="minimum">
-             <number>0</number>
-            </property>
-            <property name="maximum">
-             <number>9</number>
-            </property>
-            <property name="value">
-             <number>1</number>
-            </property>
-           </widget>
+           </spacer>
           </item>
          </layout>
         </widget>