diff --git a/Common.cs b/Common.cs
index 03db903fca..6a638e1097 100644
--- a/Common.cs
+++ b/Common.cs
@@ -22,6 +22,12 @@ public class Common
     {
         private static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        public enum altitudes
+        {
+            Meters,
+            Feet
+        }
+
         public enum distances
         {
             Meters,
diff --git a/CurrentState.cs b/CurrentState.cs
index ee2233a73e..6c75fdd444 100644
--- a/CurrentState.cs
+++ b/CurrentState.cs
@@ -32,6 +32,8 @@ public class CurrentState : ICloneable
         public static string DistanceUnit = "";
         public static float multiplierspeed = 1;
         public static string SpeedUnit = "";
+        public static float multiplieralt = 1;
+        public static string AltUnit = "";
 
         public static double toDistDisplayUnit(double input)
         {
@@ -116,7 +118,7 @@ public float groundcourse
         [DisplayText("Altitude (dist)")]
         public float alt
         {
-            get { return (_alt - altoffsethome)*multiplierdist; }
+            get { return (_alt - altoffsethome)* multiplieralt; }
             set
             {
                 // check update rate, and ensure time hasnt gone backwards                
@@ -139,7 +141,7 @@ public float alt
         [DisplayText("Altitude (dist)")]
         public float altasl
         {
-            get { return _altasl*multiplierdist; }
+            get { return _altasl* multiplieralt; }
             set { _altasl = value; }
         }
 
@@ -535,7 +537,7 @@ public float wp_dist
         [DisplayText("Altitude Error (dist)")]
         public float alt_error
         {
-            get { return _alt_error*multiplierdist; }
+            get { return _alt_error* multiplieralt; }
             set
             {
                 if (_alt_error == value) return;
diff --git a/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs b/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs
index 6b1b4e1fd3..3e54d5c8a0 100644
--- a/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs
+++ b/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs
@@ -100,6 +100,8 @@ private void InitializeComponent()
             this.label5 = new System.Windows.Forms.Label();
             this.CHK_AutoParamCommit = new System.Windows.Forms.CheckBox();
             this.chk_shownofly = new System.Windows.Forms.CheckBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.CMB_altunits = new System.Windows.Forms.ComboBox();
             ((System.ComponentModel.ISupportInitialize)(this.NUM_tracklength)).BeginInit();
             this.SuspendLayout();
             // 
@@ -659,9 +661,24 @@ private void InitializeComponent()
             this.chk_shownofly.UseVisualStyleBackColor = true;
             this.chk_shownofly.CheckedChanged += new System.EventHandler(this.chk_shownofly_CheckedChanged);
             // 
+            // label6
+            // 
+            resources.ApplyResources(this.label6, "label6");
+            this.label6.Name = "label6";
+            // 
+            // CMB_altunits
+            // 
+            this.CMB_altunits.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.CMB_altunits.FormattingEnabled = true;
+            resources.ApplyResources(this.CMB_altunits, "CMB_altunits");
+            this.CMB_altunits.Name = "CMB_altunits";
+            this.CMB_altunits.SelectedIndexChanged += new System.EventHandler(this.CMB_altunits_SelectedIndexChanged);
+            // 
             // ConfigPlanner
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.Controls.Add(this.label6);
+            this.Controls.Add(this.CMB_altunits);
             this.Controls.Add(this.chk_shownofly);
             this.Controls.Add(this.CHK_AutoParamCommit);
             this.Controls.Add(this.label5);
@@ -815,5 +832,7 @@ private void InitializeComponent()
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.CheckBox CHK_AutoParamCommit;
         private System.Windows.Forms.CheckBox chk_shownofly;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.ComboBox CMB_altunits;
     }
 }
diff --git a/GCSViews/ConfigurationView/ConfigPlanner.cs b/GCSViews/ConfigurationView/ConfigPlanner.cs
index faa2b25148..a8970639a8 100644
--- a/GCSViews/ConfigurationView/ConfigPlanner.cs
+++ b/GCSViews/ConfigurationView/ConfigPlanner.cs
@@ -54,6 +54,7 @@ public void Activate()
             // set distance/speed unit states
             CMB_distunits.DataSource = Enum.GetNames(typeof (Common.distances));
             CMB_speedunits.DataSource = Enum.GetNames(typeof (Common.speeds));
+            CMB_altunits.DataSource = Enum.GetNames(typeof(Common.altitudes));
 
             CMB_theme.DataSource = Enum.GetNames(typeof (ThemeManager.Themes));
 
@@ -930,5 +931,13 @@ private void chk_shownofly_CheckedChanged(object sender, EventArgs e)
         {
             Settings.Instance["ShowNoFly"] = chk_shownofly.Checked.ToString();
         }
+
+        private void CMB_altunits_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (startup)
+                return;
+            Settings.Instance["altunits"] = CMB_altunits.Text;
+            MainV2.instance.ChangeUnits();
+        }
     }
 }
\ No newline at end of file
diff --git a/GCSViews/ConfigurationView/ConfigPlanner.resx b/GCSViews/ConfigurationView/ConfigPlanner.resx
index f8d050b881..1a0188e56c 100644
--- a/GCSViews/ConfigurationView/ConfigPlanner.resx
+++ b/GCSViews/ConfigurationView/ConfigPlanner.resx
@@ -123,7 +123,7 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="label33.Location" type="System.Drawing.Point, System.Drawing">
-    <value>513, 227</value>
+    <value>496, 227</value>
   </data>
   <data name="label33.Size" type="System.Drawing.Size, System.Drawing">
     <value>43, 13</value>
@@ -145,7 +145,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label33.ZOrder" xml:space="preserve">
-    <value>26</value>
+    <value>28</value>
   </data>
   <data name="CMB_ratesensors.Items" xml:space="preserve">
     <value>0</value>
@@ -184,7 +184,7 @@
     <value>50</value>
   </data>
   <data name="CMB_ratesensors.Location" type="System.Drawing.Point, System.Drawing">
-    <value>562, 224</value>
+    <value>545, 224</value>
   </data>
   <data name="CMB_ratesensors.Size" type="System.Drawing.Size, System.Drawing">
     <value>40, 21</value>
@@ -202,7 +202,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_ratesensors.ZOrder" xml:space="preserve">
-    <value>27</value>
+    <value>29</value>
   </data>
   <data name="label26.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -211,7 +211,7 @@
     <value>NoControl</value>
   </data>
   <data name="label26.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 38</value>
+    <value>9, 38</value>
   </data>
   <data name="label26.Size" type="System.Drawing.Size, System.Drawing">
     <value>69, 13</value>
@@ -232,10 +232,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label26.ZOrder" xml:space="preserve">
-    <value>28</value>
+    <value>30</value>
   </data>
   <data name="CMB_videoresolutions.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 35</value>
+    <value>107, 35</value>
   </data>
   <data name="CMB_videoresolutions.Size" type="System.Drawing.Size, System.Drawing">
     <value>408, 21</value>
@@ -253,7 +253,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_videoresolutions.ZOrder" xml:space="preserve">
-    <value>29</value>
+    <value>31</value>
   </data>
   <data name="label12.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -262,7 +262,7 @@
     <value>NoControl</value>
   </data>
   <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 323</value>
+    <value>9, 323</value>
   </data>
   <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
     <value>31, 13</value>
@@ -283,13 +283,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label12.ZOrder" xml:space="preserve">
-    <value>30</value>
+    <value>32</value>
   </data>
   <data name="CHK_GDIPlus.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="CHK_GDIPlus.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 322</value>
+    <value>107, 322</value>
   </data>
   <data name="CHK_GDIPlus.Size" type="System.Drawing.Size, System.Drawing">
     <value>177, 17</value>
@@ -310,7 +310,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_GDIPlus.ZOrder" xml:space="preserve">
-    <value>31</value>
+    <value>33</value>
   </data>
   <data name="label24.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -319,7 +319,7 @@
     <value>NoControl</value>
   </data>
   <data name="label24.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 300</value>
+    <value>9, 300</value>
   </data>
   <data name="label24.Size" type="System.Drawing.Size, System.Drawing">
     <value>57, 13</value>
@@ -340,13 +340,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label24.ZOrder" xml:space="preserve">
-    <value>32</value>
+    <value>34</value>
   </data>
   <data name="CHK_loadwponconnect.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="CHK_loadwponconnect.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 299</value>
+    <value>107, 299</value>
   </data>
   <data name="CHK_loadwponconnect.Size" type="System.Drawing.Size, System.Drawing">
     <value>177, 17</value>
@@ -367,7 +367,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_loadwponconnect.ZOrder" xml:space="preserve">
-    <value>33</value>
+    <value>35</value>
   </data>
   <data name="label23.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -376,7 +376,7 @@
     <value>NoControl</value>
   </data>
   <data name="label23.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 274</value>
+    <value>9, 274</value>
   </data>
   <data name="label23.Size" type="System.Drawing.Size, System.Drawing">
     <value>71, 13</value>
@@ -397,10 +397,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label23.ZOrder" xml:space="preserve">
-    <value>34</value>
+    <value>36</value>
   </data>
   <data name="NUM_tracklength.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 273</value>
+    <value>107, 273</value>
   </data>
   <data name="NUM_tracklength.Size" type="System.Drawing.Size, System.Drawing">
     <value>67, 20</value>
@@ -418,7 +418,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;NUM_tracklength.ZOrder" xml:space="preserve">
-    <value>35</value>
+    <value>37</value>
   </data>
   <data name="CHK_speechaltwarning.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -427,7 +427,7 @@
     <value>NoControl</value>
   </data>
   <data name="CHK_speechaltwarning.Location" type="System.Drawing.Point, System.Drawing">
-    <value>532, 89</value>
+    <value>515, 89</value>
   </data>
   <data name="CHK_speechaltwarning.Size" type="System.Drawing.Size, System.Drawing">
     <value>81, 17</value>
@@ -451,7 +451,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speechaltwarning.ZOrder" xml:space="preserve">
-    <value>36</value>
+    <value>38</value>
   </data>
   <data name="label108.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -460,16 +460,16 @@
     <value>NoControl</value>
   </data>
   <data name="label108.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 251</value>
+    <value>9, 251</value>
   </data>
   <data name="label108.Size" type="System.Drawing.Size, System.Drawing">
-    <value>61, 13</value>
+    <value>78, 13</value>
   </data>
   <data name="label108.TabIndex" type="System.Int32, mscorlib">
     <value>45</value>
   </data>
   <data name="label108.Text" xml:space="preserve">
-    <value>APM Reset</value>
+    <value>Connect Reset</value>
   </data>
   <data name="&gt;&gt;label108.Name" xml:space="preserve">
     <value>label108</value>
@@ -481,13 +481,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label108.ZOrder" xml:space="preserve">
-    <value>37</value>
+    <value>39</value>
   </data>
   <data name="CHK_resetapmonconnect.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="CHK_resetapmonconnect.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 250</value>
+    <value>107, 250</value>
   </data>
   <data name="CHK_resetapmonconnect.Size" type="System.Drawing.Size, System.Drawing">
     <value>163, 17</value>
@@ -496,7 +496,7 @@
     <value>46</value>
   </data>
   <data name="CHK_resetapmonconnect.Text" xml:space="preserve">
-    <value>Reset APM on USB Connect</value>
+    <value>Reset on USB Connect</value>
   </data>
   <data name="&gt;&gt;CHK_resetapmonconnect.Name" xml:space="preserve">
     <value>CHK_resetapmonconnect</value>
@@ -508,7 +508,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_resetapmonconnect.ZOrder" xml:space="preserve">
-    <value>38</value>
+    <value>40</value>
   </data>
   <data name="CHK_mavdebug.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -517,7 +517,7 @@
     <value>NoControl</value>
   </data>
   <data name="CHK_mavdebug.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 512</value>
+    <value>107, 509</value>
   </data>
   <data name="CHK_mavdebug.Size" type="System.Drawing.Size, System.Drawing">
     <value>144, 17</value>
@@ -538,13 +538,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_mavdebug.ZOrder" xml:space="preserve">
-    <value>39</value>
+    <value>41</value>
   </data>
   <data name="label107.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="label107.Location" type="System.Drawing.Point, System.Drawing">
-    <value>439, 227</value>
+    <value>422, 227</value>
   </data>
   <data name="label107.Size" type="System.Drawing.Size, System.Drawing">
     <value>22, 13</value>
@@ -565,7 +565,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label107.ZOrder" xml:space="preserve">
-    <value>40</value>
+    <value>42</value>
   </data>
   <data name="CMB_raterc.Items" xml:space="preserve">
     <value>0</value>
@@ -601,7 +601,7 @@
     <value>10</value>
   </data>
   <data name="CMB_raterc.Location" type="System.Drawing.Point, System.Drawing">
-    <value>467, 224</value>
+    <value>450, 224</value>
   </data>
   <data name="CMB_raterc.Size" type="System.Drawing.Size, System.Drawing">
     <value>40, 21</value>
@@ -619,13 +619,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_raterc.ZOrder" xml:space="preserve">
-    <value>41</value>
+    <value>43</value>
   </data>
   <data name="label104.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="label104.Location" type="System.Drawing.Point, System.Drawing">
-    <value>318, 227</value>
+    <value>301, 227</value>
   </data>
   <data name="label104.Size" type="System.Drawing.Size, System.Drawing">
     <value>69, 13</value>
@@ -646,13 +646,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label104.ZOrder" xml:space="preserve">
-    <value>42</value>
+    <value>44</value>
   </data>
   <data name="label103.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="label103.Location" type="System.Drawing.Point, System.Drawing">
-    <value>222, 227</value>
+    <value>205, 227</value>
   </data>
   <data name="label103.Size" type="System.Drawing.Size, System.Drawing">
     <value>44, 13</value>
@@ -673,13 +673,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label103.ZOrder" xml:space="preserve">
-    <value>43</value>
+    <value>45</value>
   </data>
   <data name="label102.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="label102.Location" type="System.Drawing.Point, System.Drawing">
-    <value>121, 227</value>
+    <value>104, 227</value>
   </data>
   <data name="label102.Size" type="System.Drawing.Size, System.Drawing">
     <value>43, 13</value>
@@ -700,7 +700,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label102.ZOrder" xml:space="preserve">
-    <value>44</value>
+    <value>46</value>
   </data>
   <data name="label101.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -709,7 +709,7 @@
     <value>NoControl</value>
   </data>
   <data name="label101.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 227</value>
+    <value>9, 227</value>
   </data>
   <data name="label101.Size" type="System.Drawing.Size, System.Drawing">
     <value>84, 13</value>
@@ -730,7 +730,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label101.ZOrder" xml:space="preserve">
-    <value>45</value>
+    <value>47</value>
   </data>
   <data name="CMB_ratestatus.Items" xml:space="preserve">
     <value>0</value>
@@ -766,7 +766,7 @@
     <value>10</value>
   </data>
   <data name="CMB_ratestatus.Location" type="System.Drawing.Point, System.Drawing">
-    <value>393, 224</value>
+    <value>376, 224</value>
   </data>
   <data name="CMB_ratestatus.Size" type="System.Drawing.Size, System.Drawing">
     <value>40, 21</value>
@@ -784,7 +784,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_ratestatus.ZOrder" xml:space="preserve">
-    <value>46</value>
+    <value>48</value>
   </data>
   <data name="CMB_rateposition.Items" xml:space="preserve">
     <value>0</value>
@@ -820,7 +820,7 @@
     <value>10</value>
   </data>
   <data name="CMB_rateposition.Location" type="System.Drawing.Point, System.Drawing">
-    <value>272, 224</value>
+    <value>255, 224</value>
   </data>
   <data name="CMB_rateposition.Size" type="System.Drawing.Size, System.Drawing">
     <value>40, 21</value>
@@ -838,7 +838,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_rateposition.ZOrder" xml:space="preserve">
-    <value>47</value>
+    <value>49</value>
   </data>
   <data name="CMB_rateattitude.Items" xml:space="preserve">
     <value>0</value>
@@ -874,7 +874,7 @@
     <value>10</value>
   </data>
   <data name="CMB_rateattitude.Location" type="System.Drawing.Point, System.Drawing">
-    <value>170, 224</value>
+    <value>153, 224</value>
   </data>
   <data name="CMB_rateattitude.Size" type="System.Drawing.Size, System.Drawing">
     <value>40, 21</value>
@@ -892,16 +892,16 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_rateattitude.ZOrder" xml:space="preserve">
-    <value>48</value>
+    <value>50</value>
   </data>
   <data name="label99.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="label99.Location" type="System.Drawing.Point, System.Drawing">
-    <value>268, 190</value>
+    <value>480, 171</value>
   </data>
   <data name="label99.Size" type="System.Drawing.Size, System.Drawing">
-    <value>402, 13</value>
+    <value>241, 31</value>
   </data>
   <data name="label99.TabIndex" type="System.Int32, mscorlib">
     <value>57</value>
@@ -920,7 +920,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label99.ZOrder" xml:space="preserve">
-    <value>49</value>
+    <value>51</value>
   </data>
   <data name="label98.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -929,7 +929,7 @@
     <value>NoControl</value>
   </data>
   <data name="label98.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 198</value>
+    <value>9, 198</value>
   </data>
   <data name="label98.Size" type="System.Drawing.Size, System.Drawing">
     <value>65, 13</value>
@@ -950,7 +950,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label98.ZOrder" xml:space="preserve">
-    <value>50</value>
+    <value>52</value>
   </data>
   <data name="label97.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -959,7 +959,7 @@
     <value>NoControl</value>
   </data>
   <data name="label97.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 171</value>
+    <value>9, 171</value>
   </data>
   <data name="label97.Size" type="System.Drawing.Size, System.Drawing">
     <value>52, 13</value>
@@ -980,10 +980,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label97.ZOrder" xml:space="preserve">
-    <value>51</value>
+    <value>53</value>
   </data>
   <data name="CMB_speedunits.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 195</value>
+    <value>107, 195</value>
   </data>
   <data name="CMB_speedunits.Size" type="System.Drawing.Size, System.Drawing">
     <value>138, 21</value>
@@ -1001,10 +1001,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_speedunits.ZOrder" xml:space="preserve">
-    <value>52</value>
+    <value>54</value>
   </data>
   <data name="CMB_distunits.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 168</value>
+    <value>107, 168</value>
   </data>
   <data name="CMB_distunits.Size" type="System.Drawing.Size, System.Drawing">
     <value>138, 21</value>
@@ -1022,7 +1022,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_distunits.ZOrder" xml:space="preserve">
-    <value>53</value>
+    <value>55</value>
   </data>
   <data name="label96.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1031,7 +1031,7 @@
     <value>NoControl</value>
   </data>
   <data name="label96.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 144</value>
+    <value>9, 144</value>
   </data>
   <data name="label96.Size" type="System.Drawing.Size, System.Drawing">
     <value>45, 13</value>
@@ -1052,7 +1052,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label96.ZOrder" xml:space="preserve">
-    <value>54</value>
+    <value>56</value>
   </data>
   <data name="label95.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1061,7 +1061,7 @@
     <value>NoControl</value>
   </data>
   <data name="label95.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 90</value>
+    <value>9, 90</value>
   </data>
   <data name="label95.Size" type="System.Drawing.Size, System.Drawing">
     <value>44, 13</value>
@@ -1082,7 +1082,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label95.ZOrder" xml:space="preserve">
-    <value>55</value>
+    <value>57</value>
   </data>
   <data name="CHK_speechbattery.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1091,7 +1091,7 @@
     <value>NoControl</value>
   </data>
   <data name="CHK_speechbattery.Location" type="System.Drawing.Point, System.Drawing">
-    <value>429, 89</value>
+    <value>412, 89</value>
   </data>
   <data name="CHK_speechbattery.Size" type="System.Drawing.Size, System.Drawing">
     <value>102, 17</value>
@@ -1115,7 +1115,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speechbattery.ZOrder" xml:space="preserve">
-    <value>56</value>
+    <value>58</value>
   </data>
   <data name="CHK_speechcustom.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1124,7 +1124,7 @@
     <value>NoControl</value>
   </data>
   <data name="CHK_speechcustom.Location" type="System.Drawing.Point, System.Drawing">
-    <value>349, 89</value>
+    <value>332, 89</value>
   </data>
   <data name="CHK_speechcustom.Size" type="System.Drawing.Size, System.Drawing">
     <value>81, 17</value>
@@ -1148,7 +1148,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speechcustom.ZOrder" xml:space="preserve">
-    <value>57</value>
+    <value>59</value>
   </data>
   <data name="CHK_speechmode.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1157,7 +1157,7 @@
     <value>NoControl</value>
   </data>
   <data name="CHK_speechmode.Location" type="System.Drawing.Point, System.Drawing">
-    <value>297, 89</value>
+    <value>280, 89</value>
   </data>
   <data name="CHK_speechmode.Size" type="System.Drawing.Size, System.Drawing">
     <value>56, 17</value>
@@ -1181,7 +1181,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speechmode.ZOrder" xml:space="preserve">
-    <value>58</value>
+    <value>60</value>
   </data>
   <data name="CHK_speechwaypoint.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1190,7 +1190,7 @@
     <value>NoControl</value>
   </data>
   <data name="CHK_speechwaypoint.Location" type="System.Drawing.Point, System.Drawing">
-    <value>224, 89</value>
+    <value>207, 89</value>
   </data>
   <data name="CHK_speechwaypoint.Size" type="System.Drawing.Size, System.Drawing">
     <value>71, 17</value>
@@ -1214,7 +1214,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speechwaypoint.ZOrder" xml:space="preserve">
-    <value>59</value>
+    <value>61</value>
   </data>
   <data name="label94.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1223,7 +1223,7 @@
     <value>NoControl</value>
   </data>
   <data name="label94.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 65</value>
+    <value>9, 65</value>
   </data>
   <data name="label94.Size" type="System.Drawing.Size, System.Drawing">
     <value>57, 13</value>
@@ -1244,10 +1244,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label94.ZOrder" xml:space="preserve">
-    <value>60</value>
+    <value>62</value>
   </data>
   <data name="CMB_osdcolor.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 62</value>
+    <value>107, 62</value>
   </data>
   <data name="CMB_osdcolor.Size" type="System.Drawing.Size, System.Drawing">
     <value>138, 21</value>
@@ -1265,10 +1265,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_osdcolor.ZOrder" xml:space="preserve">
-    <value>61</value>
+    <value>63</value>
   </data>
   <data name="CMB_language.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 112</value>
+    <value>107, 112</value>
   </data>
   <data name="CMB_language.Size" type="System.Drawing.Size, System.Drawing">
     <value>138, 21</value>
@@ -1286,7 +1286,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_language.ZOrder" xml:space="preserve">
-    <value>62</value>
+    <value>64</value>
   </data>
   <data name="label93.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1295,7 +1295,7 @@
     <value>NoControl</value>
   </data>
   <data name="label93.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 115</value>
+    <value>9, 115</value>
   </data>
   <data name="label93.Size" type="System.Drawing.Size, System.Drawing">
     <value>69, 13</value>
@@ -1316,7 +1316,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label93.ZOrder" xml:space="preserve">
-    <value>63</value>
+    <value>65</value>
   </data>
   <data name="CHK_enablespeech.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1325,7 +1325,7 @@
     <value>NoControl</value>
   </data>
   <data name="CHK_enablespeech.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 89</value>
+    <value>107, 89</value>
   </data>
   <data name="CHK_enablespeech.Size" type="System.Drawing.Size, System.Drawing">
     <value>99, 17</value>
@@ -1346,13 +1346,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_enablespeech.ZOrder" xml:space="preserve">
-    <value>64</value>
+    <value>66</value>
   </data>
   <data name="CHK_hudshow.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="CHK_hudshow.Location" type="System.Drawing.Point, System.Drawing">
-    <value>537, 10</value>
+    <value>520, 10</value>
   </data>
   <data name="CHK_hudshow.Size" type="System.Drawing.Size, System.Drawing">
     <value>125, 17</value>
@@ -1373,7 +1373,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_hudshow.ZOrder" xml:space="preserve">
-    <value>65</value>
+    <value>67</value>
   </data>
   <data name="label92.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1382,7 +1382,7 @@
     <value>NoControl</value>
   </data>
   <data name="label92.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 11</value>
+    <value>9, 11</value>
   </data>
   <data name="label92.Size" type="System.Drawing.Size, System.Drawing">
     <value>71, 13</value>
@@ -1403,10 +1403,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label92.ZOrder" xml:space="preserve">
-    <value>66</value>
+    <value>68</value>
   </data>
   <data name="CMB_videosources.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 8</value>
+    <value>107, 8</value>
   </data>
   <data name="CMB_videosources.Size" type="System.Drawing.Size, System.Drawing">
     <value>245, 21</value>
@@ -1424,7 +1424,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_videosources.ZOrder" xml:space="preserve">
-    <value>67</value>
+    <value>69</value>
   </data>
   <data name="label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1433,7 +1433,7 @@
     <value>NoControl</value>
   </data>
   <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 346</value>
+    <value>9, 346</value>
   </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
     <value>61, 13</value>
@@ -1454,13 +1454,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>24</value>
+    <value>26</value>
   </data>
   <data name="CHK_maprotation.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="CHK_maprotation.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 345</value>
+    <value>107, 345</value>
   </data>
   <data name="CHK_maprotation.Size" type="System.Drawing.Size, System.Drawing">
     <value>205, 17</value>
@@ -1481,13 +1481,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_maprotation.ZOrder" xml:space="preserve">
-    <value>25</value>
+    <value>27</value>
   </data>
   <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>355, 274</value>
+    <value>338, 274</value>
   </data>
   <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
     <value>81, 17</value>
@@ -1508,13 +1508,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>22</value>
+    <value>24</value>
   </data>
   <data name="CHK_disttohomeflightdata.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="CHK_disttohomeflightdata.Location" type="System.Drawing.Point, System.Drawing">
-    <value>447, 273</value>
+    <value>430, 273</value>
   </data>
   <data name="CHK_disttohomeflightdata.Size" type="System.Drawing.Size, System.Drawing">
     <value>129, 17</value>
@@ -1535,13 +1535,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_disttohomeflightdata.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>25</value>
   </data>
   <data name="BUT_Joystick.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="BUT_Joystick.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 139</value>
+    <value>107, 139</value>
   </data>
   <data name="BUT_Joystick.Size" type="System.Drawing.Size, System.Drawing">
     <value>99, 23</value>
@@ -1562,13 +1562,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;BUT_Joystick.ZOrder" xml:space="preserve">
-    <value>68</value>
+    <value>70</value>
   </data>
   <data name="BUT_videostop.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="BUT_videostop.Location" type="System.Drawing.Point, System.Drawing">
-    <value>456, 6</value>
+    <value>439, 6</value>
   </data>
   <data name="BUT_videostop.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
@@ -1589,13 +1589,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;BUT_videostop.ZOrder" xml:space="preserve">
-    <value>69</value>
+    <value>71</value>
   </data>
   <data name="BUT_videostart.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="BUT_videostart.Location" type="System.Drawing.Point, System.Drawing">
-    <value>375, 6</value>
+    <value>358, 6</value>
   </data>
   <data name="BUT_videostart.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
@@ -1616,7 +1616,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;BUT_videostart.ZOrder" xml:space="preserve">
-    <value>70</value>
+    <value>72</value>
   </data>
   <data name="label3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1625,7 +1625,7 @@
     <value>NoControl</value>
   </data>
   <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 371</value>
+    <value>9, 371</value>
   </data>
   <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 13</value>
@@ -1646,10 +1646,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>21</value>
+    <value>23</value>
   </data>
   <data name="txt_log_dir.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 368</value>
+    <value>107, 368</value>
   </data>
   <data name="txt_log_dir.Size" type="System.Drawing.Size, System.Drawing">
     <value>386, 20</value>
@@ -1667,13 +1667,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;txt_log_dir.ZOrder" xml:space="preserve">
-    <value>20</value>
+    <value>22</value>
   </data>
   <data name="BUT_logdirbrowse.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="BUT_logdirbrowse.Location" type="System.Drawing.Point, System.Drawing">
-    <value>513, 366</value>
+    <value>496, 366</value>
   </data>
   <data name="BUT_logdirbrowse.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
@@ -1694,7 +1694,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;BUT_logdirbrowse.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>21</value>
   </data>
   <data name="label4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1703,7 +1703,7 @@
     <value>NoControl</value>
   </data>
   <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 397</value>
+    <value>9, 397</value>
   </data>
   <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
     <value>40, 13</value>
@@ -1724,10 +1724,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>20</value>
   </data>
   <data name="CMB_theme.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 394</value>
+    <value>107, 394</value>
   </data>
   <data name="CMB_theme.Size" type="System.Drawing.Size, System.Drawing">
     <value>138, 21</value>
@@ -1745,13 +1745,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_theme.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>19</value>
   </data>
   <data name="BUT_themecustom.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="BUT_themecustom.Location" type="System.Drawing.Point, System.Drawing">
-    <value>266, 394</value>
+    <value>249, 394</value>
   </data>
   <data name="BUT_themecustom.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 20</value>
@@ -1772,7 +1772,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;BUT_themecustom.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>18</value>
   </data>
   <data name="CHK_speecharmdisarm.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1781,7 +1781,7 @@
     <value>NoControl</value>
   </data>
   <data name="CHK_speecharmdisarm.Location" type="System.Drawing.Point, System.Drawing">
-    <value>611, 89</value>
+    <value>594, 89</value>
   </data>
   <data name="CHK_speecharmdisarm.Size" type="System.Drawing.Size, System.Drawing">
     <value>81, 17</value>
@@ -1805,13 +1805,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speecharmdisarm.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>17</value>
   </data>
   <data name="BUT_Vario.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="BUT_Vario.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 448</value>
+    <value>107, 448</value>
   </data>
   <data name="BUT_Vario.Size" type="System.Drawing.Size, System.Drawing">
     <value>99, 20</value>
@@ -1832,7 +1832,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;BUT_Vario.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>16</value>
   </data>
   <data name="chk_analytics.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1841,7 +1841,7 @@
     <value>NoControl</value>
   </data>
   <data name="chk_analytics.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 474</value>
+    <value>107, 474</value>
   </data>
   <data name="chk_analytics.Size" type="System.Drawing.Size, System.Drawing">
     <value>115, 17</value>
@@ -1862,7 +1862,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_analytics.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>15</value>
   </data>
   <data name="CHK_beta.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1871,7 +1871,7 @@
     <value>NoControl</value>
   </data>
   <data name="CHK_beta.Location" type="System.Drawing.Point, System.Drawing">
-    <value>245, 474</value>
+    <value>228, 474</value>
   </data>
   <data name="CHK_beta.Size" type="System.Drawing.Size, System.Drawing">
     <value>91, 17</value>
@@ -1892,7 +1892,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_beta.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>14</value>
   </data>
   <data name="CHK_Password.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1901,7 +1901,7 @@
     <value>NoControl</value>
   </data>
   <data name="CHK_Password.Location" type="System.Drawing.Point, System.Drawing">
-    <value>357, 451</value>
+    <value>340, 451</value>
   </data>
   <data name="CHK_Password.Size" type="System.Drawing.Size, System.Drawing">
     <value>142, 17</value>
@@ -1922,7 +1922,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_Password.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>13</value>
   </data>
   <data name="CHK_speechlowspeed.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1931,7 +1931,7 @@
     <value>NoControl</value>
   </data>
   <data name="CHK_speechlowspeed.Location" type="System.Drawing.Point, System.Drawing">
-    <value>688, 89</value>
+    <value>671, 89</value>
   </data>
   <data name="CHK_speechlowspeed.Size" type="System.Drawing.Size, System.Drawing">
     <value>80, 17</value>
@@ -1955,7 +1955,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speechlowspeed.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>12</value>
   </data>
   <data name="CHK_showairports.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1964,7 +1964,7 @@
     <value>NoControl</value>
   </data>
   <data name="CHK_showairports.Location" type="System.Drawing.Point, System.Drawing">
-    <value>513, 451</value>
+    <value>496, 451</value>
   </data>
   <data name="CHK_showairports.Size" type="System.Drawing.Size, System.Drawing">
     <value>91, 17</value>
@@ -1985,7 +1985,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_showairports.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>11</value>
   </data>
   <data name="chk_ADSB.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1994,7 +1994,7 @@
     <value>NoControl</value>
   </data>
   <data name="chk_ADSB.Location" type="System.Drawing.Point, System.Drawing">
-    <value>615, 451</value>
+    <value>598, 451</value>
   </data>
   <data name="chk_ADSB.Size" type="System.Drawing.Size, System.Drawing">
     <value>55, 17</value>
@@ -2015,7 +2015,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_ADSB.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>10</value>
   </data>
   <data name="chk_tfr.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2024,7 +2024,7 @@
     <value>NoControl</value>
   </data>
   <data name="chk_tfr.Location" type="System.Drawing.Point, System.Drawing">
-    <value>513, 474</value>
+    <value>496, 474</value>
   </data>
   <data name="chk_tfr.Size" type="System.Drawing.Size, System.Drawing">
     <value>54, 17</value>
@@ -2045,7 +2045,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_tfr.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>9</value>
   </data>
   <data name="chk_temp.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -2054,7 +2054,7 @@
     <value>NoControl</value>
   </data>
   <data name="chk_temp.Location" type="System.Drawing.Point, System.Drawing">
-    <value>357, 512</value>
+    <value>341, 509</value>
   </data>
   <data name="chk_temp.Size" type="System.Drawing.Size, System.Drawing">
     <value>144, 17</value>
@@ -2075,7 +2075,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_temp.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>8</value>
   </data>
   <data name="chk_norcreceiver.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2084,7 +2084,7 @@
     <value>NoControl</value>
   </data>
   <data name="chk_norcreceiver.Location" type="System.Drawing.Point, System.Drawing">
-    <value>357, 474</value>
+    <value>340, 474</value>
   </data>
   <data name="chk_norcreceiver.Size" type="System.Drawing.Size, System.Drawing">
     <value>104, 17</value>
@@ -2105,13 +2105,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_norcreceiver.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>7</value>
   </data>
   <data name="but_AAsignin.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="but_AAsignin.Location" type="System.Drawing.Point, System.Drawing">
-    <value>229, 448</value>
+    <value>212, 448</value>
   </data>
   <data name="but_AAsignin.Size" type="System.Drawing.Size, System.Drawing">
     <value>115, 20</value>
@@ -2132,10 +2132,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;but_AAsignin.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>6</value>
   </data>
   <data name="CMB_Layout.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 421</value>
+    <value>107, 421</value>
   </data>
   <data name="CMB_Layout.Size" type="System.Drawing.Size, System.Drawing">
     <value>138, 21</value>
@@ -2153,7 +2153,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_Layout.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>5</value>
   </data>
   <data name="label5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2162,7 +2162,7 @@
     <value>NoControl</value>
   </data>
   <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 424</value>
+    <value>9, 424</value>
   </data>
   <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
     <value>39, 13</value>
@@ -2183,13 +2183,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>4</value>
   </data>
   <data name="CHK_AutoParamCommit.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="CHK_AutoParamCommit.Location" type="System.Drawing.Point, System.Drawing">
-    <value>615, 475</value>
+    <value>598, 475</value>
   </data>
   <data name="CHK_AutoParamCommit.Size" type="System.Drawing.Size, System.Drawing">
     <value>123, 17</value>
@@ -2210,7 +2210,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_AutoParamCommit.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>3</value>
   </data>
   <data name="chk_shownofly.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2219,7 +2219,7 @@
     <value>NoControl</value>
   </data>
   <data name="chk_shownofly.Location" type="System.Drawing.Point, System.Drawing">
-    <value>688, 451</value>
+    <value>671, 451</value>
   </data>
   <data name="chk_shownofly.Size" type="System.Drawing.Size, System.Drawing">
     <value>56, 17</value>
@@ -2240,13 +2240,64 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_shownofly.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label6.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+    <value>249, 171</value>
+  </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>46, 13</value>
+  </data>
+  <data name="label6.TabIndex" type="System.Int32, mscorlib">
+    <value>118</value>
+  </data>
+  <data name="label6.Text" xml:space="preserve">
+    <value>Alt Units</value>
+  </data>
+  <data name="&gt;&gt;label6.Name" xml:space="preserve">
+    <value>label6</value>
+  </data>
+  <data name="&gt;&gt;label6.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label6.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="CMB_altunits.Location" type="System.Drawing.Point, System.Drawing">
+    <value>320, 168</value>
+  </data>
+  <data name="CMB_altunits.Size" type="System.Drawing.Size, System.Drawing">
+    <value>138, 21</value>
+  </data>
+  <data name="CMB_altunits.TabIndex" type="System.Int32, mscorlib">
+    <value>119</value>
+  </data>
+  <data name="&gt;&gt;CMB_altunits.Name" xml:space="preserve">
+    <value>CMB_altunits</value>
+  </data>
+  <data name="&gt;&gt;CMB_altunits.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;CMB_altunits.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;CMB_altunits.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>759, 538</value>
+    <value>750, 535</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>ConfigPlanner</value>
diff --git a/MainV2.cs b/MainV2.cs
index 873531e0ee..ee2f157850 100644
--- a/MainV2.cs
+++ b/MainV2.cs
@@ -3529,6 +3529,28 @@ public void ChangeUnits()
                     CurrentState.DistanceUnit = "m";
                 }
 
+                // alt
+                if (Settings.Instance["altunits"] != null)
+                {
+                    switch (
+                        (Common.distances)Enum.Parse(typeof(Common.altitudes), Settings.Instance["altunits"].ToString()))
+                    {
+                        case Common.distances.Meters:
+                            CurrentState.multiplieralt = 1;
+                            CurrentState.AltUnit = "m";
+                            break;
+                        case Common.distances.Feet:
+                            CurrentState.multiplieralt = 3.2808399f;
+                            CurrentState.AltUnit = "ft";
+                            break;
+                    }
+                }
+                else
+                {
+                    CurrentState.multiplieralt = 1;
+                    CurrentState.AltUnit = "m";
+                }
+
                 // speed
                 if (Settings.Instance["speedunits"] != null)
                 {
@@ -3552,7 +3574,7 @@ public void ChangeUnits()
                             break;
                         case Common.speeds.knots:
                             CurrentState.multiplierspeed = 1.94384449f;
-                            CurrentState.SpeedUnit = "knots";
+                            CurrentState.SpeedUnit = "kts";
                             break;
                     }
                 }