diff --git a/ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui b/ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
index 00a2f60aa..f82b350c3 100644
--- a/ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
+++ b/ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
@@ -6,29 +6,14 @@
0
0
- 403
- 400
+ 615
+ 577
Form
-
- 3
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 3
-
-
-
@@ -144,475 +129,569 @@
-
+
+ 6
+
+
+ 6
+
-
-
-
- Attitude data
+
+
+ QFrame::NoFrame
-
-
- 3
-
-
- 3
-
-
- 3
-
-
- 3
-
-
- 0
-
-
-
-
-
- AttitudeRaw (gyro, accels)
-
-
- true
-
-
- true
-
-
- false
-
-
-
- 3
-
-
- 3
-
-
- 0
-
-
- 0
-
-
-
-
-
- Refresh rate
-
-
-
- -
-
-
- ms
-
-
- 10
-
-
- 100
-
-
- 20
-
-
-
-
-
-
- -
-
-
- AttitudeActual
-
-
- true
-
-
- true
-
-
- false
-
-
-
- 3
-
-
- 3
-
-
- 0
-
-
- 0
-
-
-
-
-
- send raw data to board
-
-
-
- -
-
-
-
- 75
- true
-
-
-
-
-
-
- use values from simulator
-
-
- true
-
-
-
- -
-
-
-
-
-
- calculate from AttitudeRaw
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
-
-
-
- -
-
-
- Other data
+
+ QFrame::Plain
-
-
- 3
+
+ true
+
+
+
+
+ 0
+ 0
+ 574
+ 391
+
-
- 3
-
-
- 3
-
-
- 3
-
-
- 0
-
-
-
-
-
- HomeLocation
-
-
- true
-
-
- true
-
-
- false
-
-
-
- 3
+
+
+ 0
+
+
-
+
+
+ Attitude data
-
- 3
-
-
- 0
-
-
- 0
-
-
-
-
-
- Refresh rate
-
-
-
- -
-
-
- 0 - update once, or every N seconds
-
-
- sec
-
-
- 10
-
-
-
-
-
-
- -
-
-
- GPSPosition
-
-
- true
-
-
- true
-
-
- false
-
-
-
- 3
-
-
- 3
-
-
- 0
-
-
- 0
-
-
-
-
-
- Refresh rate
-
-
-
- -
-
-
- ms
-
-
- 100
-
-
- 2000
-
-
- 500
-
-
-
-
-
-
- -
-
-
- SonarAltitude
-
-
- true
-
-
- true
-
-
- false
-
-
-
- 3
-
-
- 6
-
-
- 3
-
-
- 0
-
-
- 0
-
-
-
-
-
-
-
-
- Range detectioon
-
-
-
- -
-
-
- m
-
-
- 1
-
-
- 10
-
-
- 5
-
-
-
- -
-
-
- Refresh rate
-
-
-
- -
-
-
- ms
-
-
- 20
-
-
- 2000
-
-
- 10
-
-
- 50
-
-
-
-
-
-
-
-
- -
-
-
- Map command from simulator
-
-
- true
-
-
- true
-
-
- false
-
-
-
- 3
-
-
- 3
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 75
- true
-
-
-
- to GCSReciver
-
-
- true
-
-
-
- -
-
-
- false
-
-
- to ManualCtrll (not implemented)
-
-
-
-
-
-
- -
-
-
- 6
-
-
-
-
-
- Maximum output rate
+
+
+ 12
-
-
- -
-
-
- ms
+
+ 3
-
- 10
+
+ 18
-
- 100
+
+ 3
-
- 5
+
+ 0
-
- 15
+
-
+
+
+
+ 0
+ 0
+
+
+
+ AttitudeRaw (gyro, accels)
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+
+ 6
+
+
+ 12
+
+
+ 0
+
+
+ 12
+
+
-
+
+
+ Refresh rate
+
+
+
+ -
+
+
+ ms
+
+
+ 10
+
+
+ 100
+
+
+ 20
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ AttitudeActual
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+
+ 6
+
+
+ 12
+
+
+ 0
+
+
+ 12
+
+
-
+
+
+ send raw data to board
+
+
+
+ -
+
+
+
+ 75
+ true
+
+
+
+
+
+
+ use values from simulator
+
+
+ true
+
+
+
+ -
+
+
+
+
+
+ calculate from AttitudeRaw
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Expanding
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+ -
+
+
+ Other data
+
+
+
+ 12
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
+
+ 3
+
+
+ 18
+
+
+ 3
+
+
+ 0
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ HomeLocation
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+
+ 6
+
+
+ 12
+
+
+ 0
+
+
+ 12
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Refresh rate
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 0 - update once, or every N seconds
+
+
+ sec
+
+
+ 10
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ GPSPosition
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+
+ 6
+
+
+ 12
+
+
+ 0
+
+
+ 12
+
+
-
+
+
+ Refresh rate
+
+
+
+ -
+
+
+ ms
+
+
+ 100
+
+
+ 2000
+
+
+ 500
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ SonarAltitude
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+
+ 3
+
+
+ 6
+
+
+ 3
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ 6
+
+
+ 6
+
+
-
+
+
+ Range detection
+
+
+
+ -
+
+
+ m
+
+
+ 1
+
+
+ 10
+
+
+ 5
+
+
+
+ -
+
+
+ Refresh rate
+
+
+
+ -
+
+
+ ms
+
+
+ 20
+
+
+ 2000
+
+
+ 10
+
+
+ 50
+
+
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Map command from simulator
+
+
+ true
+
+
+ true
+
+
+ false
+
+
+
+ 3
+
+
+ 12
+
+
+ 0
+
+
+ 12
+
+
-
+
+
+
+ 75
+ true
+
+
+
+ to GCSReciver
+
+
+ true
+
+
+
+ -
+
+
+ false
+
+
+ to ManualCtrll (not implemented)
+
+
+
+
+
+
+ -
+
+
+ 6
+
+
-
+
+
+ Maximum output rate
+
+
+
+ -
+
+
+ ms
+
+
+ 10
+
+
+ 100
+
+
+ 5
+
+
+ 15
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Expanding
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+