diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui
index 271906e70..9cb802848 100644
--- a/qt-ui/plannerSettings.ui
+++ b/qt-ui/plannerSettings.ui
@@ -6,78 +6,334 @@
0
0
- 537
- 435
+ 1116
+ 292
Form
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
-
-
-
-
- 0
- 0
-
+
+
+ Rates
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
-
-
-
- surface to the bottom
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
-
+
+
+ Ascent
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
-
+
+
+ 75%-50% avg. depth
+
+
+
+ -
+
+
+ m/min
+
+
+ 1
+
+
+
+ -
+
+
+ below 75% avg. depth
+
+
+
+ -
+
+
+ m/min
+
+
+ 1
+
+
+
+ -
+
+
+ 6m/20ft to surface
+
+
+
+ -
+
+
+ m/min
+
+
+ 1
+
+
+
+ -
+
+
+ m/min
+
+
+ 1
+
+
+
+ -
+
+
+ 50% avg. depth - 6m/20ft
+
+
+
+
- -
-
-
- bar
-
-
- 2.000000000000000
-
-
- 0.100000000000000
-
-
- 1.400000000000000
+
-
+
+
+ Descent
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+ m/min
+
+
+ 1
+
+
+ 18
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ surface to the bottom
+
+
+
+
- -
-
-
-
- 0
- 0
-
+
-
+
+
+ Qt::Vertical
-
+
- 16777215
- 20
+ 20
+ 40
-
- m/min
+
+
+
+
+
+ -
+
+
+ Planning
+
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
-
+
+
+ plan backgas breaks
+
+
+ -
+
+
+ GF low
+
+
+
+ -
+
+
+ Last Stop at 6m/20ft
+
+
+
+ -
+
+
+ GF high
+
+
+
+ -
+
1
-
- 18
+
+ 150
- -
+
-
+
+
+ Drop to first depth
+
+
+
+ -
+
+
+ 1
+
+
+ 150
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+ -
+
+
+ Gas Options
+
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
-
bar
@@ -93,38 +349,23 @@
- -
-
+
-
+
- m/min
+ bar
-
- 1
+
+ 2.000000000000000
+
+
+ 0.100000000000000
+
+
+ 1.400000000000000
- -
-
-
- bottom pO₂
-
-
-
- -
-
-
- <html><head/><body><p><span style=" font-weight:600;">Descent rate</span></p></body></html>
-
-
-
- -
-
-
- 6m/20ft to surface
-
-
-
- -
+
-
deco pO₂
@@ -132,205 +373,77 @@
-
-
+
- 75%-50% avg. depth
+ bottom pO₂
- -
-
-
- below 75% avg. depth
-
-
-
- -
-
-
- 50% avg. depth - 6m/20ft
-
-
+
-
+
-
-
-
- <html><head/><body><p><span style=" font-weight:600;">Ascent rates</span></p></body></html>
-
-
-
- -
-
-
- m/min
-
-
- 1
-
-
-
- -
-
-
- m/min
-
-
- 1
-
-
-
- -
-
-
- <html><head/><body><p><span style=" font-weight:600;">Gas options</span></p></body></html>
-
-
-
- -
-
-
- m/min
-
-
- 1
-
-
-
- -
-
-
- -
bottom SAC
- -
+
-
+
+
+ -
deco SAC
- -
-
+
-
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
-
-
-
-
- 0
- 0
-
+
+
+ Dive Notes
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
- QLayout::SetNoConstraint
+
+
+ 2
-
-
-
-
-
- 0
- 0
-
-
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
-
+
- <html><head/><body><p><span style=" font-weight:600;">Planning options</span></p></body></html>
+ verbatim diveplan
- -
-
-
- QFrame::NoFrame
-
-
- QFrame::Raised
-
-
-
-
-
-
- GF low
-
-
-
- -
-
-
- 1
-
-
- 150
-
-
-
- -
-
-
- GF high
-
-
-
- -
-
-
- 1
-
-
- 150
-
-
-
-
-
-
- -
-
-
- Drop to first depth
-
-
-
- -
-
-
- Last Stop at 6m/20ft
-
-
-
- -
-
-
- plan backgas breaks
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- <html><head/><body><p><span style=" font-weight:600;">Dive note options</span></p></body></html>
-
-
-
- -
+
-
In dive plan, show runtime (absolute time) of stops
@@ -343,7 +456,7 @@
- -
+
-
true
@@ -359,7 +472,7 @@
- -
+
-
In diveplan, list transitions or treat them as implicit
@@ -369,35 +482,24 @@
- -
-
-
-
- 20
- 0
-
-
+
-
+
- Qt::Horizontal
+ Qt::Vertical
-
-
- -
-
-
- verbatim diveplan
+
+
+ 20
+ 40
+
-
+
-
- lastStop
- backgasBreaks
-