diff --git a/SourceCode/GPS/AgOpenGPS.csproj b/SourceCode/GPS/AgOpenGPS.csproj
index ade4c7e17..b69ebe437 100644
--- a/SourceCode/GPS/AgOpenGPS.csproj
+++ b/SourceCode/GPS/AgOpenGPS.csproj
@@ -134,12 +134,6 @@
     <Compile Include="Classes\CSequence.cs" />
     <Compile Include="Classes\CTurn.cs" />
     <Compile Include="Classes\CTurnLines.cs" />
-    <Compile Include="Forms\FormABPick.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\FormABPick.Designer.cs">
-      <DependentUpon>FormABPick.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\FormNumeric.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -389,9 +383,6 @@
       <AutoGen>True</AutoGen>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <EmbeddedResource Include="Forms\FormABPick.resx">
-      <DependentUpon>FormABPick.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\FormNumeric.resx">
       <DependentUpon>FormNumeric.cs</DependentUpon>
     </EmbeddedResource>
@@ -559,6 +550,19 @@
     <Content Include="AppIcon.ico" />
     <Content Include="AppIcon64.ico" />
     <Content Include="aChangeLog.txt" />
+    <None Include="Resources\Alarm10.wav" />
+    <None Include="btnImages\ABLineCycle.png" />
+    <None Include="btnImages\displayMenu.png" />
+    <None Include="btnImages\fileMenu.png" />
+    <None Include="btnImages\ABLineTurnOff.png" />
+    <None Include="btnImages\CurveTurnOff.png" />
+    <None Include="btnImages\SwitchOff.png" />
+    <None Include="btnImages\SwitchOn.png" />
+    <None Include="btnImages\AddNew.png" />
+    <None Include="btnImages\FileNewAndGo.png" />
+    <Content Include="Dependencies\Audio\Boundary.wav">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Dependencies\YouTurnShapes\SemiCircle.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -718,9 +722,7 @@
     </Content>
     <Content Include="ALicense.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/SourceCode/GPS/Classes/CABCurve.cs b/SourceCode/GPS/Classes/CABCurve.cs
index f3b18d8aa..f989b5fb3 100644
--- a/SourceCode/GPS/Classes/CABCurve.cs
+++ b/SourceCode/GPS/Classes/CABCurve.cs
@@ -21,7 +21,7 @@ public class CABCurve
         public vec2 refPoint1 = new vec2(1, 1), refPoint2 = new vec2(2, 2);
 
         public bool isSameWay;
-        public double refHeading;
+        public double refHeading, moveDistance;
         public double deltaOfRefAndAveHeadings;
 
         //generated box for finding closest point
@@ -51,6 +51,10 @@ public class CABCurve
         //the list of points of curve to drive on
         public List<vec3> curList = new List<vec3>();
 
+        public List<CCurveLines> curveArr = new List<CCurveLines>();
+        public int numCurveLines, numCurveLineSelected;
+
+
         public CABCurve(FormGPS _f)
         {
             //constructor
@@ -116,13 +120,10 @@ public void CalculateTurnHeadings()
                 refList.CopyTo(arr);
                 refList.Clear();
 
-                //first point needs last, first, second points
-                vec3 pt3 = arr[0];
-
                 //middle points
                 for (int i = 1; i < cnt; i++)
                 {
-                    pt3 = arr[i];
+                    vec3 pt3 = arr[i];
                     pt3.heading = Math.Atan2(arr[i + 1].easting - arr[i - 1].easting, arr[i + 1].northing - arr[i - 1].northing);
                     if (pt3.heading < 0) pt3.heading += glm.twoPI;
                     refList.Add(pt3);
@@ -155,8 +156,6 @@ public void SaveSmoothAsRefList()
 
         public void GetCurrentCurveLine(vec3 pivot, vec3 steer)
         {
-            //determine closest point
-            double minDistance = 9999999;
             int ptCount = refList.Count;
             int ptCnt = ptCount - 1;
             if (ptCount < 5) return;
@@ -195,7 +194,8 @@ public void GetCurrentCurveLine(vec3 pivot, vec3 steer)
             double dist = ((pivot.easting - refList[closestRefIndex].easting) * (pivot.easting - refList[closestRefIndex].easting))
                             + ((pivot.northing - refList[closestRefIndex].northing) * (pivot.northing - refList[closestRefIndex].northing));
 
-            minDistance = Math.Sqrt(dist);
+            //determine closest point
+            double minDistance = Math.Sqrt(dist);
 
             //grab the heading at the closest point
             refHeading = refList[closestRefIndex].heading;
@@ -244,7 +244,7 @@ public void GetCurrentCurveLine(vec3 pivot, vec3 steer)
             curveNumber = howManyPathsAway;
             if (distanceFromRefLine < 0) curveNumber = -curveNumber;
             
-            double toolOffset = mf.vehicle.toolOffset;
+            //double toolOffset = mf.vehicle.toolOffset;
 
             //build the current line
             curList?.Clear();
@@ -399,7 +399,6 @@ public void GetCurrentCurveLine(vec3 pivot, vec3 steer)
                     if (Math.Abs(dx) < Double.Epsilon && Math.Abs(dz) < Double.Epsilon) return;
 
                     //abHeading = Math.Atan2(dz, dx);
-                    double abHeading = curList[A].heading;
 
                     //how far from current AB Line is fix
                     distanceFromCurrentLine = ((dz * pivot.easting) - (dx * pivot.northing) + (curList[B].easting
@@ -649,8 +648,6 @@ public void MoveABCurve(double dist)
 
         public bool PointOnLine(vec3 pt1, vec3 pt2, vec3 pt)
         {
-            bool isValid = false;
-
             var r = new vec2(0, 0);
             if (pt1.northing == pt2.northing && pt1.easting == pt2.easting) { pt1.northing -= 0.00001; }
 
@@ -670,8 +667,7 @@ public bool PointOnLine(vec3 pt1, vec3 pt2, vec3 pt)
 
             miny = Math.Min(pt1.easting, pt2.easting);
             maxy = Math.Max(pt1.easting, pt2.easting);
-
-            return isValid = r.northing >= minx && r.northing <= maxx && (r.easting >= miny && r.easting <= maxy);
+            return _ = r.northing >= minx && r.northing <= maxx && (r.easting >= miny && r.easting <= maxy);
         }
 
         //add extensons
@@ -712,7 +708,7 @@ public void DrawCurve()
             int ptCount = refList.Count;
             if (refList.Count == 0) return;
 
-            GL.LineWidth(2);
+            GL.LineWidth(mf.ABLine.lineWidth);
             GL.Color3(0.30f, 0.692f, 0.60f);
             GL.Begin(PrimitiveType.LineStrip);
             for (int h = 0; h < ptCount; h++) GL.Vertex3(refList[h].easting, refList[h].northing, 0);
@@ -733,7 +729,7 @@ public void DrawCurve()
                 ptCount = smooList.Count;
                 if (smooList.Count == 0) return;
 
-                GL.LineWidth(2);
+                GL.LineWidth(mf.ABLine.lineWidth);
                 GL.Color3(0.930f, 0.92f, 0.260f);
                 GL.Begin(PrimitiveType.Lines);
                 for (int h = 0; h < ptCount; h++) GL.Vertex3(smooList[h].easting, smooList[h].northing, 0);
@@ -797,7 +793,7 @@ public void DrawCurve()
                     if (mf.yt.isYouTurnTriggered)
                     {
                         GL.Color3(0.95f, 0.95f, 0.25f);
-                        GL.LineWidth(4);
+                        GL.LineWidth(mf.ABLine.lineWidth);
                         ptCount = mf.yt.ytList.Count;
                         if (ptCount > 0)
                         {
@@ -815,4 +811,12 @@ public void DrawCurve()
             GL.PointSize(1.0f);
         }
     }
+
+    public class CCurveLines
+    {
+        public List<vec3> curvePts = new List<vec3>();
+        public double aveHeading = 3;
+        public string Name = "aa";
+    }
+
 }
\ No newline at end of file
diff --git a/SourceCode/GPS/Classes/CABLine.cs b/SourceCode/GPS/Classes/CABLine.cs
index f6ae178d8..36c86a57c 100644
--- a/SourceCode/GPS/Classes/CABLine.cs
+++ b/SourceCode/GPS/Classes/CABLine.cs
@@ -1,5 +1,6 @@
 using OpenTK.Graphics.OpenGL;
 using System;
+using System.Collections.Generic;
 
 namespace AgOpenGPS
 {
@@ -17,7 +18,11 @@ public class CABLine
         //pure pursuit values
         public vec2 goalPointAB = new vec2(0, 0);
 
-        public double howManyPathsAway;
+        //List of all available ABLines
+        public List<CABLines> lineArr = new List<CABLines>();
+        public int numABLines, numABLineSelected;
+
+        public double howManyPathsAway, moveDistance;
         public bool isABLineBeingSet;
         public bool isABLineSet, isABLineLoaded;
         public bool isABSameAsVehicleHeading = true;
@@ -41,6 +46,7 @@ public class CABLine
         public vec2 refPoint2 = new vec2(0.3, 0.3);
         public double snapDistance;
         public double steerAngleAB;
+        public float lineWidth;
 
         //tramlines
         //Color tramColor = Color.YellowGreen;
@@ -52,6 +58,7 @@ public CABLine(FormGPS _f)
             //constructor
             mf = _f;
             isOnTramLine = true;
+            lineWidth = Properties.Settings.Default.setDisplay_lineWidth;
         }
 
         public void DeleteAB()
@@ -100,7 +107,7 @@ public void DrawABLines()
                 GL.Disable(EnableCap.LineStipple);
 
                 //draw current AB Line
-                GL.LineWidth(3);
+                GL.LineWidth(lineWidth);
                 GL.Begin(PrimitiveType.Lines);
                 GL.Color3(0.9f, 0.0f, 0.0f);
 
@@ -138,7 +145,7 @@ public void DrawABLines()
                     double toolWidth = mf.vehicle.toolWidth - mf.vehicle.toolOverlap;
 
                     GL.Color3(0.0f, 0.90f, 0.50f);
-                    GL.LineWidth(1);
+                    GL.LineWidth(1*Properties.Settings.Default.setDisplay_lineWidth/10);
                     GL.Begin(PrimitiveType.Lines);
 
                     //precalculate sin cos
@@ -210,32 +217,32 @@ public void DrawABLines()
                 if (mf.isPureDisplayOn && !mf.isStanleyUsed)
                 {
                     //draw the guidance circle
-                    const int numSegments = 100;
-                    {
-                        if (ppRadiusAB < 50 && ppRadiusAB > -50 && mf.isPureDisplayOn)
-                        {
-                            GL.Color3(0.95f, 0.30f, 0.950f);
-                            double theta = glm.twoPI / numSegments;
-                            double c = Math.Cos(theta);//precalculate the sine and cosine
-                            double s = Math.Sin(theta);
-
-                            double x = ppRadiusAB;//we start at angle = 0
-                            double y = 0;
-                            GL.LineWidth(1);
-                            GL.Begin(PrimitiveType.LineLoop);
-                            for (int ii = 0; ii < numSegments; ii++)
-                            {
-                                //output vertex
-                                GL.Vertex3(x + radiusPointAB.easting, y + radiusPointAB.northing, 0.0);
-
-                                //apply the rotation matrix
-                                double t = x;
-                                x = (c * x) - (s * y);
-                                y = (s * t) + (c * y);
-                            }
-                            GL.End();
-                        }
-                    }
+                    //const int numSegments = 100;
+                    //{
+                    //    if (ppRadiusAB < 50 && ppRadiusAB > -50 && mf.isPureDisplayOn)
+                    //    {
+                    //        GL.Color3(0.95f, 0.30f, 0.950f);
+                    //        double theta = glm.twoPI / numSegments;
+                    //        double c = Math.Cos(theta);//precalculate the sine and cosine
+                    //        double s = Math.Sin(theta);
+
+                    //        double x = ppRadiusAB;//we start at angle = 0
+                    //        double y = 0;
+                    //        GL.LineWidth(1);
+                    //        GL.Begin(PrimitiveType.LineLoop);
+                    //        for (int ii = 0; ii < numSegments; ii++)
+                    //        {
+                    //            //output vertex
+                    //            GL.Vertex3(x + radiusPointAB.easting, y + radiusPointAB.northing, 0.0);
+
+                    //            //apply the rotation matrix
+                    //            double t = x;
+                    //            x = (c * x) - (s * y);
+                    //            y = (s * t) + (c * y);
+                    //        }
+                    //        GL.End();
+                    //    }
+                    //}
 
                     //Draw lookahead Point
                     GL.PointSize(8.0f);
@@ -252,7 +259,7 @@ public void DrawABLines()
                 if (mf.yt.isRecordingCustomYouTurn)
                 {
                     GL.Color3(0.05f, 0.05f, 0.95f);
-                    GL.PointSize(4.0f);
+                    GL.PointSize(2.0f);
                     int ptCount = mf.yt.youFileList.Count;
                     if (ptCount > 1)
                     {
@@ -649,4 +656,14 @@ public void SnapABLine()
             refPoint2.northing = refABLineP2.northing;
         }
     }
+
+        public class CABLines
+    {
+        public vec2 ref1 = new vec2();
+        public vec2 ref2 = new vec2();
+        public vec2 origin = new vec2();
+        public double heading = 0;
+        public string Name = "aa";
+    }
+
 }
\ No newline at end of file
diff --git a/SourceCode/GPS/Classes/CContour.cs b/SourceCode/GPS/Classes/CContour.cs
index 4ae2355d2..c5926b8df 100644
--- a/SourceCode/GPS/Classes/CContour.cs
+++ b/SourceCode/GPS/Classes/CContour.cs
@@ -1006,13 +1006,14 @@ public void DrawContourLine()
         {
             ////draw the guidance line
             int ptCount = ctList.Count;
-            GL.LineWidth(2);
+            if (ptCount < 2) return;
+            GL.LineWidth(mf.ABLine.lineWidth);
             GL.Color3(0.98f, 0.2f, 0.0f);
             GL.Begin(PrimitiveType.LineStrip);
             for (int h = 0; h < ptCount; h++) GL.Vertex3(ctList[h].easting, ctList[h].northing, 0);
             GL.End();
 
-            GL.PointSize(4.0f);
+            GL.PointSize(mf.ABLine.lineWidth);
             GL.Begin(PrimitiveType.Points);
 
             GL.Color3(0.7f, 0.7f, 0.25f);
@@ -1020,12 +1021,12 @@ public void DrawContourLine()
 
             GL.End();
 
-            GL.PointSize(6.0f);
-            GL.Begin(PrimitiveType.Points);
-            GL.Color3(1.0f, 0.95f, 0.095f);
-            GL.Vertex3(rEastCT, rNorthCT, 0.0);
-            GL.End();
-            GL.PointSize(1.0f);
+            //GL.PointSize(6.0f);
+            //GL.Begin(PrimitiveType.Points);
+            //GL.Color3(1.0f, 0.95f, 0.095f);
+            //GL.Vertex3(rEastCT, rNorthCT, 0.0);
+            //GL.End();
+            //GL.PointSize(1.0f);
 
             //GL.Color3(0.98f, 0.98f, 0.50f);
             //GL.Begin(PrimitiveType.LineStrip);
@@ -1080,30 +1081,30 @@ public void DrawContourLine()
 
             if (mf.isPureDisplayOn && distanceFromCurrentLine != 32000 && !mf.isStanleyUsed)
             {
-                if (ppRadiusCT < 50 && ppRadiusCT > -50)
-                {
-                    const int numSegments = 100;
-                    double theta = glm.twoPI / numSegments;
-                    double c = Math.Cos(theta);//precalculate the sine and cosine
-                    double s = Math.Sin(theta);
-                    double x = ppRadiusCT;//we start at angle = 0
-                    double y = 0;
-
-                    GL.LineWidth(1);
-                    GL.Color3(0.795f, 0.230f, 0.7950f);
-                    GL.Begin(PrimitiveType.LineLoop);
-                    for (int ii = 0; ii < numSegments; ii++)
-                    {
-                        //glVertex2f(x + cx, y + cy);//output vertex
-                        GL.Vertex3(x + radiusPointCT.easting, y + radiusPointCT.northing, 0);//output vertex
-
-                        //apply the rotation matrix
-                        double t = x;
-                        x = (c * x) - (s * y);
-                        y = (s * t) + (c * y);
-                    }
-                    GL.End();
-                }
+                //if (ppRadiusCT < 50 && ppRadiusCT > -50)
+                //{
+                //    const int numSegments = 100;
+                //    double theta = glm.twoPI / numSegments;
+                //    double c = Math.Cos(theta);//precalculate the sine and cosine
+                //    double s = Math.Sin(theta);
+                //    double x = ppRadiusCT;//we start at angle = 0
+                //    double y = 0;
+
+                //    GL.LineWidth(1);
+                //    GL.Color3(0.795f, 0.230f, 0.7950f);
+                //    GL.Begin(PrimitiveType.LineLoop);
+                //    for (int ii = 0; ii < numSegments; ii++)
+                //    {
+                //        //glVertex2f(x + cx, y + cy);//output vertex
+                //        GL.Vertex3(x + radiusPointCT.easting, y + radiusPointCT.northing, 0);//output vertex
+
+                //        //apply the rotation matrix
+                //        double t = x;
+                //        x = (c * x) - (s * y);
+                //        y = (s * t) + (c * y);
+                //    }
+                //    GL.End();
+                //}
 
                 //Draw lookahead Point
                 GL.PointSize(6.0f);
diff --git a/SourceCode/GPS/Classes/CTurn.cs b/SourceCode/GPS/Classes/CTurn.cs
index ddb60c1fa..dafcf4ef5 100644
--- a/SourceCode/GPS/Classes/CTurn.cs
+++ b/SourceCode/GPS/Classes/CTurn.cs
@@ -330,7 +330,7 @@ public void BuildTurnLines()
 
         public void DrawTurnLines()
         {
-            GL.LineWidth(1);
+            GL.LineWidth(mf.ABLine.lineWidth);
             GL.Color3(0.3555f, 0.6232f, 0.20f);
             //GL.PointSize(2);
 
diff --git a/SourceCode/GPS/Classes/CYouTurn.cs b/SourceCode/GPS/Classes/CYouTurn.cs
index c51c4d853..573dc48c2 100644
--- a/SourceCode/GPS/Classes/CYouTurn.cs
+++ b/SourceCode/GPS/Classes/CYouTurn.cs
@@ -1330,6 +1330,7 @@ public void CompleteYouTurn()
             mf.AutoYouTurnButtonsReset();
             mf.seq.ResetSequenceEventTriggers();
             mf.seq.isSequenceTriggered = false;
+            mf.isBoundAlarming = false;
         }
 
         //something went seriously wrong so reset everything
@@ -1341,6 +1342,7 @@ public void ResetYouTurn()
             mf.AutoYouTurnButtonsReset();
             ResetCreatedYouTurn();
             turnDistanceAdjuster = 0;
+            mf.isBoundAlarming = false;
 
             //reset sequence
             mf.seq.ResetSequenceEventTriggers();
@@ -1817,8 +1819,7 @@ public void DrawYouTurn()
 
                 int ptCount = ytList.Count;
                 if (ptCount < 3) return;
-                GL.LineWidth(4);
-                GL.PointSize(4);
+                GL.PointSize(mf.ABLine.lineWidth);
 
                 if (isYouTurnTriggered)
                 {
diff --git a/SourceCode/GPS/Dependencies/Audio/Boundary.wav b/SourceCode/GPS/Dependencies/Audio/Boundary.wav
new file mode 100644
index 000000000..bd0d7e433
Binary files /dev/null and b/SourceCode/GPS/Dependencies/Audio/Boundary.wav differ
diff --git a/SourceCode/GPS/Forms/FormABCurve.Designer.cs b/SourceCode/GPS/Forms/FormABCurve.Designer.cs
index d8144ff80..0f6f011bc 100644
--- a/SourceCode/GPS/Forms/FormABCurve.Designer.cs
+++ b/SourceCode/GPS/Forms/FormABCurve.Designer.cs
@@ -35,7 +35,6 @@ private void InitializeComponent()
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.lblEnterCurveName = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
-            this.btnMulti = new System.Windows.Forms.Button();
             this.btnPausePlay = new System.Windows.Forms.Button();
             this.btnCancel = new System.Windows.Forms.Button();
             this.btnBPoint = new System.Windows.Forms.Button();
@@ -43,8 +42,9 @@ private void InitializeComponent()
             this.btnListUse = new System.Windows.Forms.Button();
             this.btnAddToFile = new System.Windows.Forms.Button();
             this.btnListDelete = new System.Windows.Forms.Button();
-            this.btnABLineOk = new System.Windows.Forms.Button();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.btnAddAndGo = new System.Windows.Forms.Button();
+            this.btnNewCurve = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
             // lblCurveExists
@@ -52,7 +52,7 @@ private void InitializeComponent()
             this.lblCurveExists.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.lblCurveExists.AutoSize = true;
             this.lblCurveExists.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblCurveExists.Location = new System.Drawing.Point(482, 14);
+            this.lblCurveExists.Location = new System.Drawing.Point(454, 23);
             this.lblCurveExists.Name = "lblCurveExists";
             this.lblCurveExists.Size = new System.Drawing.Size(98, 25);
             this.lblCurveExists.TabIndex = 87;
@@ -61,26 +61,25 @@ private void InitializeComponent()
             // 
             // lvLines
             // 
-            this.lvLines.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.lvLines.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.chField});
-            this.lvLines.Font = new System.Drawing.Font("Tahoma", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lvLines.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lvLines.FullRowSelect = true;
             this.lvLines.GridLines = true;
             this.lvLines.HideSelection = false;
             this.lvLines.ImeMode = System.Windows.Forms.ImeMode.Off;
             this.lvLines.LabelWrap = false;
-            this.lvLines.Location = new System.Drawing.Point(121, 121);
+            this.lvLines.Location = new System.Drawing.Point(101, 109);
             this.lvLines.Margin = new System.Windows.Forms.Padding(0);
             this.lvLines.MultiSelect = false;
             this.lvLines.Name = "lvLines";
-            this.lvLines.Size = new System.Drawing.Size(246, 258);
+            this.lvLines.Size = new System.Drawing.Size(256, 262);
             this.lvLines.TabIndex = 141;
             this.lvLines.TileSize = new System.Drawing.Size(240, 40);
             this.lvLines.UseCompatibleStateImageBehavior = false;
             this.lvLines.View = System.Windows.Forms.View.Tile;
             this.lvLines.Visible = false;
+            this.lvLines.SelectedIndexChanged += new System.EventHandler(this.lvLines_SelectedIndexChanged);
             // 
             // chField
             // 
@@ -89,29 +88,26 @@ private void InitializeComponent()
             // 
             // textBox1
             // 
-            this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.textBox1.BackColor = System.Drawing.Color.White;
             this.textBox1.CausesValidation = false;
-            this.textBox1.Font = new System.Drawing.Font("Tahoma", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBox1.Location = new System.Drawing.Point(120, 54);
+            this.textBox1.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.textBox1.Location = new System.Drawing.Point(101, 64);
             this.textBox1.Margin = new System.Windows.Forms.Padding(0);
             this.textBox1.MaxLength = 100;
             this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(246, 40);
+            this.textBox1.Size = new System.Drawing.Size(256, 33);
             this.textBox1.TabIndex = 145;
             this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.textBox1.Visible = false;
+            this.textBox1.Enter += new System.EventHandler(this.textBox1_Enter);
             // 
             // lblEnterCurveName
             // 
-            this.lblEnterCurveName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.lblEnterCurveName.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblEnterCurveName.Location = new System.Drawing.Point(120, 14);
+            this.lblEnterCurveName.Location = new System.Drawing.Point(107, 3);
             this.lblEnterCurveName.Margin = new System.Windows.Forms.Padding(0);
             this.lblEnterCurveName.Name = "lblEnterCurveName";
-            this.lblEnterCurveName.Size = new System.Drawing.Size(246, 39);
+            this.lblEnterCurveName.Size = new System.Drawing.Size(214, 59);
             this.lblEnterCurveName.TabIndex = 146;
             this.lblEnterCurveName.Text = "Enter Curve Name";
             this.lblEnterCurveName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -122,30 +118,13 @@ private void InitializeComponent()
             this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label2.Location = new System.Drawing.Point(399, 14);
+            this.label2.Location = new System.Drawing.Point(371, 23);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(94, 25);
             this.label2.TabIndex = 148;
             this.label2.Text = "Status: ";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // btnMulti
-            // 
-            this.btnMulti.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnMulti.BackColor = System.Drawing.SystemColors.ControlLight;
-            this.btnMulti.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnMulti.Image = global::AgOpenGPS.Properties.Resources.ArrowRight;
-            this.btnMulti.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
-            this.btnMulti.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnMulti.Location = new System.Drawing.Point(397, 167);
-            this.btnMulti.Name = "btnMulti";
-            this.btnMulti.Size = new System.Drawing.Size(90, 90);
-            this.btnMulti.TabIndex = 147;
-            this.btnMulti.Text = "Show";
-            this.btnMulti.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.btnMulti.UseVisualStyleBackColor = false;
-            this.btnMulti.Click += new System.EventHandler(this.BtnMulti_Click);
-            // 
             // btnPausePlay
             // 
             this.btnPausePlay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -155,9 +134,9 @@ private void InitializeComponent()
             this.btnPausePlay.Image = global::AgOpenGPS.Properties.Resources.boundaryPause;
             this.btnPausePlay.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
             this.btnPausePlay.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnPausePlay.Location = new System.Drawing.Point(536, 167);
+            this.btnPausePlay.Location = new System.Drawing.Point(432, 216);
             this.btnPausePlay.Name = "btnPausePlay";
-            this.btnPausePlay.Size = new System.Drawing.Size(90, 90);
+            this.btnPausePlay.Size = new System.Drawing.Size(82, 87);
             this.btnPausePlay.TabIndex = 140;
             this.btnPausePlay.Text = "Pause";
             this.btnPausePlay.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -169,11 +148,11 @@ private void InitializeComponent()
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.btnCancel.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnCancel.Image = global::AgOpenGPS.Properties.Resources.Cancel64;
+            this.btnCancel.Image = global::AgOpenGPS.Properties.Resources.SwitchOff;
             this.btnCancel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnCancel.Location = new System.Drawing.Point(397, 288);
+            this.btnCancel.Location = new System.Drawing.Point(376, 234);
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(90, 90);
+            this.btnCancel.Size = new System.Drawing.Size(87, 98);
             this.btnCancel.TabIndex = 86;
             this.btnCancel.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.btnCancel.UseVisualStyleBackColor = true;
@@ -186,9 +165,9 @@ private void InitializeComponent()
             this.btnBPoint.Font = new System.Drawing.Font("Tahoma", 14.25F);
             this.btnBPoint.Image = global::AgOpenGPS.Properties.Resources.LetterBBlue;
             this.btnBPoint.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnBPoint.Location = new System.Drawing.Point(536, 44);
+            this.btnBPoint.Location = new System.Drawing.Point(482, 87);
             this.btnBPoint.Name = "btnBPoint";
-            this.btnBPoint.Size = new System.Drawing.Size(90, 90);
+            this.btnBPoint.Size = new System.Drawing.Size(87, 98);
             this.btnBPoint.TabIndex = 64;
             this.btnBPoint.UseVisualStyleBackColor = true;
             this.btnBPoint.Click += new System.EventHandler(this.btnBPoint_Click);
@@ -199,9 +178,9 @@ private void InitializeComponent()
             this.btnAPoint.Font = new System.Drawing.Font("Tahoma", 14.25F);
             this.btnAPoint.Image = global::AgOpenGPS.Properties.Resources.LetterABlue;
             this.btnAPoint.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnAPoint.Location = new System.Drawing.Point(397, 44);
+            this.btnAPoint.Location = new System.Drawing.Point(376, 87);
             this.btnAPoint.Name = "btnAPoint";
-            this.btnAPoint.Size = new System.Drawing.Size(90, 90);
+            this.btnAPoint.Size = new System.Drawing.Size(87, 98);
             this.btnAPoint.TabIndex = 63;
             this.btnAPoint.UseVisualStyleBackColor = true;
             this.btnAPoint.Click += new System.EventHandler(this.btnAPoint_Click);
@@ -212,14 +191,13 @@ private void InitializeComponent()
             this.btnListUse.Image = global::AgOpenGPS.Properties.Resources.FileUse;
             this.btnListUse.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
             this.btnListUse.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnListUse.Location = new System.Drawing.Point(9, 278);
+            this.btnListUse.Location = new System.Drawing.Point(3, 299);
             this.btnListUse.Margin = new System.Windows.Forms.Padding(0);
             this.btnListUse.Name = "btnListUse";
-            this.btnListUse.Size = new System.Drawing.Size(90, 90);
+            this.btnListUse.Size = new System.Drawing.Size(78, 74);
             this.btnListUse.TabIndex = 144;
             this.btnListUse.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.btnListUse.UseVisualStyleBackColor = true;
-            this.btnListUse.Visible = false;
             this.btnListUse.Click += new System.EventHandler(this.btnListUse_Click);
             // 
             // btnAddToFile
@@ -230,14 +208,13 @@ private void InitializeComponent()
             this.btnAddToFile.Image = global::AgOpenGPS.Properties.Resources.FileNew;
             this.btnAddToFile.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
             this.btnAddToFile.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnAddToFile.Location = new System.Drawing.Point(10, 10);
+            this.btnAddToFile.Location = new System.Drawing.Point(3, 91);
             this.btnAddToFile.Margin = new System.Windows.Forms.Padding(0);
             this.btnAddToFile.Name = "btnAddToFile";
-            this.btnAddToFile.Size = new System.Drawing.Size(90, 90);
+            this.btnAddToFile.Size = new System.Drawing.Size(78, 74);
             this.btnAddToFile.TabIndex = 143;
             this.btnAddToFile.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.btnAddToFile.UseVisualStyleBackColor = false;
-            this.btnAddToFile.Visible = false;
             this.btnAddToFile.Click += new System.EventHandler(this.btnAddToFile_Click);
             // 
             // btnListDelete
@@ -246,46 +223,63 @@ private void InitializeComponent()
             this.btnListDelete.Image = global::AgOpenGPS.Properties.Resources.FileDelete;
             this.btnListDelete.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
             this.btnListDelete.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnListDelete.Location = new System.Drawing.Point(9, 144);
+            this.btnListDelete.Location = new System.Drawing.Point(3, 195);
             this.btnListDelete.Margin = new System.Windows.Forms.Padding(0);
             this.btnListDelete.Name = "btnListDelete";
-            this.btnListDelete.Size = new System.Drawing.Size(90, 90);
+            this.btnListDelete.Size = new System.Drawing.Size(78, 74);
             this.btnListDelete.TabIndex = 142;
             this.btnListDelete.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.btnListDelete.UseVisualStyleBackColor = true;
-            this.btnListDelete.Visible = false;
             this.btnListDelete.Click += new System.EventHandler(this.btnListDelete_Click);
             // 
-            // btnABLineOk
-            // 
-            this.btnABLineOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnABLineOk.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.btnABLineOk.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold);
-            this.btnABLineOk.Image = global::AgOpenGPS.Properties.Resources.OK64;
-            this.btnABLineOk.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnABLineOk.Location = new System.Drawing.Point(536, 288);
-            this.btnABLineOk.Name = "btnABLineOk";
-            this.btnABLineOk.Size = new System.Drawing.Size(90, 90);
-            this.btnABLineOk.TabIndex = 65;
-            this.btnABLineOk.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnABLineOk.UseVisualStyleBackColor = true;
-            this.btnABLineOk.Click += new System.EventHandler(this.btnABLineOk_Click);
-            // 
             // timer1
             // 
             this.timer1.Enabled = true;
             this.timer1.Interval = 300;
             this.timer1.Tick += new System.EventHandler(this.Timer1_Tick);
             // 
+            // btnAddAndGo
+            // 
+            this.btnAddAndGo.BackColor = System.Drawing.Color.Transparent;
+            this.btnAddAndGo.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Bold);
+            this.btnAddAndGo.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.btnAddAndGo.Image = global::AgOpenGPS.Properties.Resources.FileNewAndGo;
+            this.btnAddAndGo.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
+            this.btnAddAndGo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.btnAddAndGo.Location = new System.Drawing.Point(3, 3);
+            this.btnAddAndGo.Margin = new System.Windows.Forms.Padding(0);
+            this.btnAddAndGo.Name = "btnAddAndGo";
+            this.btnAddAndGo.Size = new System.Drawing.Size(78, 74);
+            this.btnAddAndGo.TabIndex = 149;
+            this.btnAddAndGo.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.btnAddAndGo.UseVisualStyleBackColor = false;
+            this.btnAddAndGo.Click += new System.EventHandler(this.btnAddAndGo_Click);
+            // 
+            // btnNewCurve
+            // 
+            this.btnNewCurve.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnNewCurve.BackColor = System.Drawing.SystemColors.ControlLight;
+            this.btnNewCurve.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnNewCurve.Image = global::AgOpenGPS.Properties.Resources.AddNew;
+            this.btnNewCurve.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.btnNewCurve.Location = new System.Drawing.Point(482, 234);
+            this.btnNewCurve.Name = "btnNewCurve";
+            this.btnNewCurve.Size = new System.Drawing.Size(87, 98);
+            this.btnNewCurve.TabIndex = 150;
+            this.btnNewCurve.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.btnNewCurve.UseVisualStyleBackColor = false;
+            this.btnNewCurve.Click += new System.EventHandler(this.btnNewCurve_Click);
+            // 
             // FormABCurve
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(637, 400);
+            this.ClientSize = new System.Drawing.Size(581, 376);
             this.ControlBox = false;
+            this.Controls.Add(this.btnNewCurve);
+            this.Controls.Add(this.btnAddAndGo);
             this.Controls.Add(this.lblCurveExists);
             this.Controls.Add(this.label2);
-            this.Controls.Add(this.btnMulti);
             this.Controls.Add(this.btnPausePlay);
             this.Controls.Add(this.btnCancel);
             this.Controls.Add(this.btnBPoint);
@@ -296,7 +290,6 @@ private void InitializeComponent()
             this.Controls.Add(this.btnAddToFile);
             this.Controls.Add(this.btnListDelete);
             this.Controls.Add(this.lvLines);
-            this.Controls.Add(this.btnABLineOk);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
@@ -305,6 +298,7 @@ private void InitializeComponent()
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "AB Curve";
             this.TopMost = true;
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormABCurve_FormClosing);
             this.Load += new System.EventHandler(this.FormABCurve_Load);
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -315,7 +309,6 @@ private void InitializeComponent()
 
         private System.Windows.Forms.Button btnBPoint;
         private System.Windows.Forms.Button btnAPoint;
-        private System.Windows.Forms.Button btnABLineOk;
         private System.Windows.Forms.Button btnCancel;
         private System.Windows.Forms.Label lblCurveExists;
         private System.Windows.Forms.Button btnPausePlay;
@@ -326,8 +319,9 @@ private void InitializeComponent()
         private System.Windows.Forms.Button btnListUse;
         private System.Windows.Forms.TextBox textBox1;
         private System.Windows.Forms.Label lblEnterCurveName;
-        private System.Windows.Forms.Button btnMulti;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Timer timer1;
+        private System.Windows.Forms.Button btnAddAndGo;
+        private System.Windows.Forms.Button btnNewCurve;
     }
 }
diff --git a/SourceCode/GPS/Forms/FormABCurve.cs b/SourceCode/GPS/Forms/FormABCurve.cs
index b6c945461..d44a7002c 100644
--- a/SourceCode/GPS/Forms/FormABCurve.cs
+++ b/SourceCode/GPS/Forms/FormABCurve.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Globalization;
 using System.IO;
 using System.Windows.Forms;
@@ -8,47 +9,54 @@ namespace AgOpenGPS
 {
     public partial class FormABCurve : Form
     {
-        public List<CurveLineSaved> curveArr = new List<CurveLineSaved>();
-
         //access to the main GPS form and all its variables
         private readonly FormGPS mf;
 
-        private string filename = "";
-
         public FormABCurve(Form _mf)
         {
             mf = _mf as FormGPS;
             InitializeComponent();
 
             lblEnterCurveName.Text = gStr.gsEnterCurveName;
-            btnMulti.Text = gStr.gsShow;
             btnPausePlay.Text = gStr.gsPause;
         }
 
         private void FormABCurve_Load(object sender, EventArgs e)
         {
             btnPausePlay.Enabled = false;
-            btnAPoint.Enabled = true;
+            btnAPoint.Enabled = false;
             btnBPoint.Enabled = false;
+            btnAddToFile.Enabled = false;
+            btnAddAndGo.Enabled = false;
+            textBox1.Enabled = false;
+
             mf.curve.isOkToAddPoints = false;
 
             if (mf.curve.refList.Count > 3)
             {
                 lblCurveExists.Text = "Curve Set";
-                btnABLineOk.Enabled = true;
             }
             else
             {
                 mf.curve.ResetCurveLine();
                 lblCurveExists.Text = " > Off <";
-                btnABLineOk.Enabled = false;
             }
+
             lvLines.Clear();
-            curveArr.Clear();
-            FormABCurve_LoadCurves();
+            ListViewItem itm;
 
-            this.Size = new System.Drawing.Size(280, 440);
-            btnMulti.Image = Properties.Resources.ArrowLeft;
+            foreach (var item in mf.curve.curveArr)
+            {
+                itm = new ListViewItem(item.Name);
+                lvLines.Items.Add(itm);
+            }
+
+            // go to bottom of list - if there is a bottom
+            if (lvLines.Items.Count > 0) lvLines.Items[lvLines.Items.Count - 1].EnsureVisible();
+
+            ShowSavedPanel(true);
+            //this.Size = new System.Drawing.Size(280, 440);
+            //btnMulti.Image = Properties.Resources.ArrowLeft;
         }
 
         //for calculating for display the averaged new line
@@ -96,109 +104,112 @@ public void SmoothAB(int smPts)
             }
         }
 
-        private void btnABLineOk_Click(object sender, System.EventArgs e)
+        private void btnAddToFile_Click(object sender, EventArgs e)
         {
-            if (mf.curve.refList.Count < 3)
+            if (mf.curve.refList.Count > 0)
             {
-                mf.curve.isCurveBtnOn = false;
-                mf.btnCurve.Image = Properties.Resources.CurveOff;
+                if (textBox1.Text.Length > 0)
+                {
+                    mf.curve.curveArr.Add(new CCurveLines());
 
-                mf.curve.ResetCurveLine();
-                mf.DisableYouTurnButtons();
-                mf.FileSaveCurveLine();
-                Close();
+                    mf.curve.numCurveLines = mf.curve.curveArr.Count;
+                    if (mf.curve.numCurveLineSelected > mf.curve.numCurveLines) mf.curve.numCurveLineSelected = mf.curve.numCurveLines;
+
+                    //array number is 1 less since it starts at zero
+                    int cnt = mf.curve.curveArr.Count-1;
+
+                    mf.curve.curveArr[cnt].Name = textBox1.Text.Trim();
+                    mf.curve.curveArr[cnt].aveHeading = mf.curve.aveLineHeading;
+
+                    //write out the Curve Points
+                    foreach (var item in mf.curve.refList)
+                    {
+                        mf.curve.curveArr[cnt].curvePts.Add(item);
+                    }
+
+                    //update the listbox with new curve name
+                    ListViewItem itm = new ListViewItem(mf.curve.curveArr[cnt].Name);
+                    lvLines.Items.Add(itm);
+                    lvLines.Enabled = true;
+                    textBox1.BackColor = SystemColors.Window;
+                    textBox1.Text = "";
+                    textBox1.Enabled = false;
+                    btnAddAndGo.Enabled = false;
+                    btnAddToFile.Enabled = false;
+                    btnAPoint.Enabled = false;
+                    btnCancel.Enabled = true;
+                    btnNewCurve.Enabled = true;
+                    lvLines.SelectedItems.Clear();
+                    btnNewCurve.Enabled = true;
+
+                    mf.FileSaveCurveLines();
+                }
             }
             else
             {
-                mf.curve.isCurveSet = true;
-                mf.EnableYouTurnButtons();
-                mf.FileSaveCurveLine();
-                Close();
-            }
+                var form2 = new FormTimedMessage(2000, gStr.gsNoABCurveCreated, gStr.gsCompleteAnABCurveLineFirst);
+                form2.Show();
+                textBox1.BackColor = SystemColors.Window;
+            }            
         }
-
-        private void btnAddToFile_Click(object sender, EventArgs e)
+        private void btnAddAndGo_Click(object sender, EventArgs e)
         {
-            //get the directory and make sure it exists, create if not
-            string dirField = mf.fieldsDirectory + mf.currentFieldDirectory + "\\";
-            string directoryName = Path.GetDirectoryName(dirField);
+            if (mf.curve.refList.Count > 0)
+            {
+                if (textBox1.Text.Length > 0)
+                {
+                    mf.curve.curveArr.Add(new CCurveLines());
 
-            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-            { Directory.CreateDirectory(directoryName); }
+                    mf.curve.numCurveLines = mf.curve.curveArr.Count;
+                    mf.curve.numCurveLineSelected = mf.curve.numCurveLines;
 
-            filename = directoryName + "\\CurveLines.txt";
+                    //array number is 1 less since it starts at zero
+                    int idx = mf.curve.curveArr.Count - 1;
 
-            //use Streamwriter to create and overwrite existing curveLines file
-            using (StreamWriter writer = new StreamWriter(filename, true))
-            {
-                try
-                {
-                    if (mf.curve.refList.Count > 0)
-                    {
-                        if (textBox1.Text.Length > 0)
-                        {
-                            curveArr.Add(new CurveLineSaved());
-                            curveArr[curveArr.Count - 1].Name = textBox1.Text;
-                            curveArr[curveArr.Count - 1].aveHeading = mf.curve.aveLineHeading;
-
-                            ListViewItem itm = new ListViewItem(curveArr[curveArr.Count - 1].Name);
-                            lvLines.Items.Add(itm);
-
-                            //write out the ABLine
-                            writer.WriteLine(textBox1.Text);
-
-                            //write out the aveheading
-                            writer.WriteLine(mf.curve.aveLineHeading.ToString(CultureInfo.InvariantCulture));
-
-                            //write out the points of ref line
-                            writer.WriteLine(mf.curve.refList.Count.ToString(CultureInfo.InvariantCulture));
-
-                            for (int j = 0; j < mf.curve.refList.Count; j++)
-                            {
-                                curveArr[curveArr.Count - 1].curvePts.Add(mf.curve.refList[j]);
-                                writer.WriteLine(Math.Round(mf.curve.refList[j].easting, 3).ToString(CultureInfo.InvariantCulture) + "," +
-                                                        Math.Round(mf.curve.refList[j].northing, 3).ToString(CultureInfo.InvariantCulture) + "," +
-                                                            Math.Round(mf.curve.refList[j].heading, 5).ToString(CultureInfo.InvariantCulture));
-                            }
-                        }
-                        else
-                        {
-                            //MessageBox.Show("Currently no ABCurve name\n      create ABCurve name");
-                            var form2 = new FormTimedMessage(2000, gStr.gsNoNameEntered, gStr.gsEnterUniqueABCurveName);
-                            form2.Show();
-                        }
-                        textBox1.Clear();
-                    }
-                    else
+                    mf.curve.curveArr[idx].Name = textBox1.Text.Trim();
+                    mf.curve.curveArr[idx].aveHeading = mf.curve.aveLineHeading;
+
+                    //write out the Curve Points
+                    foreach (var item in mf.curve.refList)
                     {
-                        var form2 = new FormTimedMessage(2000, gStr.gsNoABCurveCreated, gStr.gsCompleteAnABCurveLineFirst);
-                        form2.Show();
+                        mf.curve.curveArr[idx].curvePts.Add(item);
                     }
-                }
-                catch (Exception er)
-                {
-                    mf.WriteErrorLog("Saving Curve Line" + er.ToString());
 
-                    return;
+                    mf.curve.isCurveSet = true;
+
+                    mf.FileSaveCurveLines();
+
+                    Close();
                 }
             }
+            else
+            {
+                var form2 = new FormTimedMessage(2000, gStr.gsNoABCurveCreated, gStr.gsCompleteAnABCurveLineFirst);
+                form2.Show();
+                textBox1.BackColor = SystemColors.Window;
+            }
+
+        }
+        private void btnNewCurve_Click(object sender, EventArgs e)
+        {
+            ShowSavedPanel(false);
+            btnNewCurve.Enabled = false;
+            btnCancel.Enabled = false;
+            btnAPoint.Enabled = true;
         }
 
         private void btnAPoint_Click(object sender, System.EventArgs e)
         {
+            mf.curve.moveDistance = 0;
             //clear out the reference list
             lblCurveExists.Text = "Driving";
             mf.curve.ResetCurveLine();
 
-            mf.curve.isOkToAddPoints = true;
-            btnBPoint.Enabled = true;
             btnAPoint.Enabled = false;
-            btnMulti.Enabled = false;
-            btnABLineOk.Enabled = false;
-            btnCancel.Enabled = false;
+            mf.curve.isOkToAddPoints = true;
             btnPausePlay.Enabled = true;
-
-            ShowSavedPanel(false);
+            btnPausePlay.Visible = true;
+            btnBPoint.Enabled = true;
         }
 
         private void btnBPoint_Click(object sender, System.EventArgs e)
@@ -206,12 +217,10 @@ private void btnBPoint_Click(object sender, System.EventArgs e)
             mf.curve.aveLineHeading = 0;
             mf.curve.isOkToAddPoints = false;
             btnBPoint.Enabled = false;
-            btnAPoint.Enabled = true;
-            btnABLineOk.Enabled = true;
+            btnAPoint.Enabled = false;
             btnPausePlay.Enabled = false;
-            btnMulti.Enabled = true;
-            btnABLineOk.Enabled = true;
-            btnCancel.Enabled = true;
+            btnCancel.Enabled = false;
+            lvLines.Enabled = false;
 
             int cnt = mf.curve.refList.Count;
             if (cnt > 3)
@@ -245,6 +254,7 @@ private void btnBPoint_Click(object sender, System.EventArgs e)
                 x /= mf.curve.refList.Count;
                 y /= mf.curve.refList.Count;
                 mf.curve.aveLineHeading = Math.Atan2(y, x);
+                if (mf.curve.aveLineHeading < 0) mf.curve.aveLineHeading += glm.twoPI;
 
                 //build the tail extensions
                 mf.curve.AddFirstLastPoints();
@@ -253,99 +263,102 @@ private void btnBPoint_Click(object sender, System.EventArgs e)
 
                 mf.curve.isCurveSet = true;
                 mf.EnableYouTurnButtons();
-                mf.FileSaveCurveLine();
+                //mf.FileSaveCurveLine();
                 lblCurveExists.Text = "Curve Set";
+
+                ShowSavedPanel(true);
+
+                btnAddAndGo.Enabled = true;
+                btnAddToFile.Enabled = true;
+                btnAPoint.Enabled = false;
+                btnBPoint.Enabled = false;
+                btnPausePlay.Enabled = false;
+
+                textBox1.BackColor = Color.LightGreen;
+                textBox1.Enabled = true;
+                textBox1.Text = (Math.Round(glm.toDegrees(mf.curve.aveLineHeading), 1)).ToString(CultureInfo.InvariantCulture) 
+                    + "\u00B0" + FindDirection(mf.curve.aveLineHeading) 
+                    + DateTime.Now.ToString("hh:mm:ss", CultureInfo.InvariantCulture);
             }
             else
             {
                 mf.curve.isCurveSet = false;
                 mf.curve.refList?.Clear();
+
                 lblCurveExists.Text = " > Off <";
+                ShowSavedPanel(true);
+                btnNewCurve.Enabled = true;
+                btnCancel.Enabled = true;
+                lvLines.Enabled = true;
             }
-            //Close();
+
+            lvLines.SelectedItems.Clear();
+        }
+        private void textBox1_Enter(object sender, EventArgs e)
+        {
+            textBox1.Text = "";
         }
 
         private void btnCancel_Click(object sender, System.EventArgs e)
         {
             mf.curve.isOkToAddPoints = false;
             mf.curve.isCurveSet = false;
+            mf.curve.refList?.Clear();
+            mf.curve.isCurveSet = false;
             mf.DisableYouTurnButtons();
             mf.btnContourPriority.Enabled = false;
             //mf.curve.ResetCurveLine();
             mf.curve.isCurveBtnOn = false;
             mf.btnCurve.Image = Properties.Resources.CurveOff;
+            if (mf.isAutoSteerBtnOn) mf.btnAutoSteer.PerformClick();
+            if (mf.yt.isYouTurnBtnOn) mf.btnEnableAutoYouTurn.PerformClick();
+
+            mf.curve.numCurveLineSelected = 0;
             Close();
         }
 
         private void btnListDelete_Click(object sender, EventArgs e)
         {
-            //get the directory and make sure it exists, create if not
-            string dirField = mf.fieldsDirectory + mf.currentFieldDirectory + "\\";
-            string directoryName = Path.GetDirectoryName(dirField);
-
-            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-            { Directory.CreateDirectory(directoryName); }
-
-            filename = directoryName + "\\CurveLines.txt";
-
-            int count = lvLines.SelectedItems.Count;
-            if (count > 0)
+            if (lvLines.SelectedItems.Count > 0)
             {
                 int num = lvLines.SelectedIndices[0];
-                curveArr.RemoveAt(num);
+                mf.curve.curveArr.RemoveAt(num);
                 lvLines.SelectedItems[0].Remove();
-            }
-            using (StreamWriter writer = new StreamWriter(filename, false))
-            {
-                try
+
+                //everything changed, so make sure its right
+                mf.curve.numCurveLines = mf.curve.curveArr.Count;
+                if (mf.curve.numCurveLineSelected > mf.curve.numCurveLines) mf.curve.numCurveLineSelected = mf.curve.numCurveLines;
+
+                //if there are no saved oned, empty out current curve line and turn off
+                if (mf.curve.numCurveLines == 0)
                 {
-                    writer.WriteLine("$CurveLines");
-                    for (int i = 0; i < curveArr.Count; i++)
-                    {
-                        //curveArrs[i].curveArr
-
-                        //write out the Name
-                        writer.WriteLine(curveArr[i].Name);
-
-                        //write out the aveheading
-                        writer.WriteLine(curveArr[i].aveHeading.ToString(CultureInfo.InvariantCulture));
-
-                        //write out the points of ref line
-                        writer.WriteLine(curveArr[i].curvePts.Count.ToString(CultureInfo.InvariantCulture));
-                        if (curveArr[i].curvePts.Count > 0)
-                        {
-                            for (int j = 0; j < curveArr[i].curvePts.Count; j++)
-                                writer.WriteLine(Math.Round(curveArr[i].curvePts[j].easting, 3).ToString(CultureInfo.InvariantCulture) + "," +
-                                                    Math.Round(curveArr[i].curvePts[j].northing, 3).ToString(CultureInfo.InvariantCulture) + "," +
-                                                        Math.Round(curveArr[i].curvePts[j].heading, 5).ToString(CultureInfo.InvariantCulture));
-                        }
-                    }
+                    mf.curve.ResetCurveLine();
+                    if (mf.isAutoSteerBtnOn) mf.btnAutoSteer.PerformClick();
+                    if (mf.yt.isYouTurnBtnOn) mf.btnEnableAutoYouTurn.PerformClick();
                 }
-                catch (Exception er)
-                {
-                    mf.WriteErrorLog("Saving Curve Line" + er.ToString());
 
-                    return;
-                }
-            }
+                mf.FileSaveCurveLines();
+            }            
         }
 
         private void btnListUse_Click(object sender, EventArgs e)
         {
+            mf.curve.moveDistance = 0;
+
             int count = lvLines.SelectedItems.Count;
 
             if (count > 0)
             {
-                int aa = lvLines.SelectedIndices[0];
-
-                mf.curve.aveLineHeading = curveArr[aa].aveHeading;
+                int idx = lvLines.SelectedIndices[0];
+                mf.curve.numCurveLineSelected = idx + 1;
+                mf.curve.aveLineHeading = mf.curve.curveArr[idx].aveHeading;
 
                 mf.curve.refList?.Clear();
-
-                for (int i = 0; i < curveArr[aa].curvePts.Count; i++)
+                for (int i = 0; i < mf.curve.curveArr[idx].curvePts.Count; i++)
                 {
-                    mf.curve.refList.Add(curveArr[aa].curvePts[i]);
+                    mf.curve.refList.Add(mf.curve.curveArr[idx].curvePts[i]);
                 }
+
                 if (mf.curve.refList.Count < 3)
                 {
                     mf.btnCurve.PerformClick();
@@ -355,11 +368,9 @@ private void btnListUse_Click(object sender, EventArgs e)
                 else
                 {
                     mf.curve.isCurveSet = true;
-                    mf.EnableYouTurnButtons();
-                    mf.FileSaveCurveLine();
+                    //mf.EnableYouTurnButtons();
                 }
-                //can go back to Mainform without seeing ABLine form.
-                //DialogResult = DialogResult.Yes;
+                //can go back to Mainform without seeing form.
                 Close();
             }
 
@@ -370,18 +381,6 @@ private void btnListUse_Click(object sender, EventArgs e)
             }
         }
 
-        private void BtnMulti_Click(object sender, EventArgs e)
-        {
-            if (this.Size.Width < 640)
-            {
-                ShowSavedPanel(true);
-            }
-            else
-            {
-                ShowSavedPanel(false);
-            }
-        }
-
         private void btnPausePlay_Click(object sender, EventArgs e)
         {
             if (mf.curve.isOkToAddPoints)
@@ -400,124 +399,35 @@ private void btnPausePlay_Click(object sender, EventArgs e)
             }
         }
 
-
-        private void FormABCurve_LoadCurves()
-        {
-            //get the directory and make sure it exists, create if not
-            string dirField = mf.fieldsDirectory + mf.currentFieldDirectory + "\\";
-            string directoryName = Path.GetDirectoryName(dirField);
-
-            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-            { Directory.CreateDirectory(directoryName); }
-
-            filename = directoryName + "\\CurveLines.txt";
-
-            if (!File.Exists(filename))
-            {
-                using (StreamWriter writer = new StreamWriter(filename))
-                {
-                    writer.WriteLine("$CurveLines");
-                }
-            }
-
-            //get the file of previous AB Lines
-            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-            { Directory.CreateDirectory(directoryName); }
-            if (!File.Exists(filename))
-            {
-                mf.TimedMessageBox(2000, gStr.gsFileError, gStr.gsMissingABCurveFile);
-            }
-            else
-            {
-                using (StreamReader reader = new StreamReader(filename))
-                {
-                    try
-                    {
-                        ListViewItem itm;
-                        string line;
-                        int num = 0;
-
-                        //read header $CurveLine
-                        line = reader.ReadLine();
-
-                        while (!reader.EndOfStream)
-                        {
-                            curveArr.Add(new CurveLineSaved());
-
-                            //read header $CurveLine
-                            curveArr[num].Name = reader.ReadLine();
-                            // get the average heading
-                            line = reader.ReadLine();
-                            curveArr[num].aveHeading = double.Parse(line, CultureInfo.InvariantCulture);
-
-                            line = reader.ReadLine();
-                            int numPoints = int.Parse(line);
-
-                            if (numPoints > 1)
-                            {
-                                itm = new ListViewItem(curveArr[num].Name);
-                                lvLines.Items.Add(itm);
-
-                                curveArr[num].curvePts?.Clear();
-
-                                for (int i = 0; i < numPoints; i++)
-                                {
-                                    line = reader.ReadLine();
-                                    string[] words = line.Split(',');
-                                    vec3 vecPt = new vec3(double.Parse(words[0], CultureInfo.InvariantCulture),
-                                        double.Parse(words[1], CultureInfo.InvariantCulture),
-                                        double.Parse(words[2], CultureInfo.InvariantCulture));
-                                    curveArr[num].curvePts.Add(vecPt);
-                                }
-                                num++;
-                            }
-                            else
-                            {
-                                if (curveArr.Count > 0)
-                                {
-                                    curveArr.RemoveAt(num);
-                                }
-                            }
-                        }
-                    }
-                    catch (Exception er)
-                    {
-                        var form = new FormTimedMessage(2000, gStr.gsCurveLineFileIsCorrupt, gStr.gsButFieldIsLoaded);
-                        form.Show();
-                        mf.WriteErrorLog("Load Curve Line" + er.ToString());
-                    }
-                }
-
-                // go to bottom of list - if there is a bottom
-                if (lvLines.Items.Count > 0) lvLines.Items[lvLines.Items.Count - 1].EnsureVisible();
-            }
-        }
-
         private void ShowSavedPanel(bool showPanel)
         {
             if (showPanel)
             {
-                this.Size = new System.Drawing.Size(650, 440);
+                this.Size = new System.Drawing.Size(597, 415);
                 btnAddToFile.Visible = true;
+                btnAddAndGo.Visible = true;
                 btnListDelete.Visible = true;
                 btnListUse.Visible = true;
                 lblEnterCurveName.Visible = true;
                 textBox1.Visible = true;
                 lvLines.Visible = true;
-                btnMulti.Text = gStr.gsHide;
-                btnMulti.Image = Properties.Resources.ArrowRight;
+                btnCancel.Visible = true;
+                btnNewCurve.Visible = true;
+                btnPausePlay.Visible = false;
             }
             else
             {
-                this.Size = new System.Drawing.Size(280, 440);
+                this.Size = new System.Drawing.Size(232, 350);
                 btnAddToFile.Visible = false;
+                btnAddAndGo.Visible = false;
                 btnListDelete.Visible = false;
                 btnListUse.Visible = false;
                 lblEnterCurveName.Visible = false;
                 textBox1.Visible = false;
                 lvLines.Visible = false;
-                btnMulti.Text = gStr.gsShow;
-                btnMulti.Image = Properties.Resources.ArrowLeft;
+                btnCancel.Visible = false;
+                btnNewCurve.Visible = false;
+                btnPausePlay.Visible = false;
             }
         }
 
@@ -535,12 +445,92 @@ private void Timer1_Tick(object sender, EventArgs e)
                 btnListUse.Enabled = false;
             }
         }
-    }
 
-    public class CurveLineSaved
-    {
-        public List<vec3> curvePts = new List<vec3>();
-        public double aveHeading = 3;
-        public string Name = "aa";
+        private string FindDirection(double heading)
+        {
+            if (heading < 0) heading += glm.twoPI;
+
+            heading = glm.toDegrees(heading);
+
+            if (heading > 337.5 || heading < 22.5)
+            {
+                return " North ";
+            }
+            if (heading > 22.5 && heading < 67.5)
+            {
+                return " N_East ";
+            }
+            if (heading > 67.5 && heading < 111.5)
+            {
+                return " East ";
+            }
+            if (heading > 111.5 && heading < 157.5)
+            {
+                return " S_East ";
+            }
+            if (heading > 157.5 && heading < 202.5)
+            {
+                return " South ";
+            }
+            if (heading > 202.5 && heading < 247.5)
+            {
+                return " S_West ";
+            }
+            if (heading > 247.5 && heading < 292.5)
+            {
+                return "West";
+            }
+            if (heading > 292.5 && heading < 337.5)
+            {
+                return " N_West ";
+            }
+            return " Lost ";
+        }
+        
+        private void FormABCurve_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (this.Width < 300) e.Cancel = true;
+        }
+
+        private void lvLines_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            mf.curve.moveDistance = 0;
+
+            int count = lvLines.SelectedItems.Count;
+
+            if (count > 0)
+            {
+                int idx = lvLines.SelectedIndices[0];
+                mf.curve.numCurveLineSelected = idx + 1;
+                mf.curve.aveLineHeading = mf.curve.curveArr[idx].aveHeading;
+
+                mf.curve.refList?.Clear();
+                for (int i = 0; i < mf.curve.curveArr[idx].curvePts.Count; i++)
+                {
+                    mf.curve.refList.Add(mf.curve.curveArr[idx].curvePts[i]);
+                }
+
+                if (mf.curve.refList.Count < 3)
+                {
+                    mf.btnCurve.PerformClick();
+                    mf.curve.ResetCurveLine();
+                    //mf.DisableYouTurnButtons();
+                }
+                else
+                {
+                    mf.curve.isCurveSet = true;
+                    //mf.EnableYouTurnButtons();
+                }
+                //can go back to Mainform without seeing form.
+            }
+
+            //no item selected
+            else
+            {
+                return;
+            }
+
+        }
+
     }
 }
\ No newline at end of file
diff --git a/SourceCode/GPS/Forms/FormABDraw.cs b/SourceCode/GPS/Forms/FormABDraw.cs
index da9ff1228..4725140f7 100644
--- a/SourceCode/GPS/Forms/FormABDraw.cs
+++ b/SourceCode/GPS/Forms/FormABDraw.cs
@@ -14,18 +14,12 @@ public partial class FormABDraw : Form
         //access to the main GPS form and all its variables
         private readonly FormGPS mf = null;
 
-        public List<CurveLinePick> curveArr = new List<CurveLinePick>();
-
-        public List<ABLinePick> lineArr = new List<ABLinePick>();
-
         private double maxFieldX, maxFieldY, minFieldX, minFieldY, fieldCenterX, fieldCenterY, maxFieldDistance;
         private Point fixPt;
 
         private bool isA = true, isMakingAB = false, isMakingCurve = false;
         public double low = 0, high = 1;
-        private int A, B, C, D, E, start = 99999, end = 99999;
-
-        private int numABLines = 0, numCurves = 0, numABSelected = 0, numCurveSelected = 0;
+        private int A, B, C, D, E, start = 99999, end = 99999;     
 
         //list of coordinates of boundary line
         public List<vec3> turnLine = new List<vec3>();
@@ -34,21 +28,21 @@ public partial class FormABDraw : Form
 
         private void FixLabelsCurve()
         {
-            lblNumCu.Text = numCurves.ToString();
-            lblCurveSelected.Text = numCurveSelected.ToString();
+            lblNumCu.Text = mf.curve.numCurveLines.ToString();
+            lblCurveSelected.Text = mf.curve.numCurveLineSelected.ToString();
 
-            if (numCurveSelected > 0)
-                lblCurveName.Text = curveArr[numCurveSelected - 1].Name;
+            if (mf.curve.numCurveLineSelected > 0)
+                lblCurveName.Text = mf.curve.curveArr[mf.curve.numCurveLineSelected - 1].Name;
             else
                 lblCurveName.Text = "***";
         }
 
         private void FixLabelsABLine()
         {
-            lblNumAB.Text = numABLines.ToString();
-            lblABSelected.Text = numABSelected.ToString();
+            lblNumAB.Text = mf.ABLine.numABLines.ToString();
+            lblABSelected.Text = mf.ABLine.numABLineSelected.ToString();
 
-            if (numABSelected > 0) lblABLineName.Text = lineArr[numABSelected - 1].Name;
+            if (mf.ABLine.numABLineSelected > 0) lblABLineName.Text = mf.ABLine.lineArr[mf.ABLine.numABLineSelected - 1].Name;
             else lblABLineName.Text = "***";
         }
 
@@ -64,7 +58,7 @@ private string FindDirection(double heading)
             }
             if (heading > 22.5 && heading < 67.5)
             {
-                return " NW ";
+                return " N_East ";
             }
             if (heading > 67.5 && heading < 111.5)
             {
@@ -72,7 +66,7 @@ private string FindDirection(double heading)
             }
             if (heading > 111.5 && heading < 157.5)
             {
-                return " SE ";
+                return " S_East ";
             }
             if (heading > 157.5 && heading < 202.5)
             {
@@ -80,7 +74,7 @@ private string FindDirection(double heading)
             }
             if (heading > 202.5 && heading < 247.5)
             {
-                return " SW ";
+                return " S_West ";
             }
             if (heading > 247.5 && heading < 292.5)
             {
@@ -88,21 +82,21 @@ private string FindDirection(double heading)
             }
             if (heading > 292.5 && heading < 337.5)
             {
-                return " NW ";
+                return " N_West ";
             }
             return " Lost ";
         }
 
         private void btnSelectCurve_Click(object sender, EventArgs e)
         {
-            if (numCurves > 0)
+            if (mf.curve.numCurveLines > 0)
             {
-                numCurveSelected++;
-                if (numCurveSelected > numCurves) numCurveSelected = 1;
+                mf.curve.numCurveLineSelected++;
+                if (mf.curve.numCurveLineSelected > mf.curve.numCurveLines) mf.curve.numCurveLineSelected = 1;
             }
             else
             {
-                numCurveSelected = 0;
+                mf.curve.numCurveLineSelected = 0;
             }
 
             FixLabelsCurve();
@@ -110,14 +104,14 @@ private void btnSelectCurve_Click(object sender, EventArgs e)
 
         private void btnSelectABLine_Click(object sender, EventArgs e)
         {
-            if (numABLines > 0)
+            if (mf.ABLine.numABLines > 0)
             {
-                numABSelected++;
-                if (numABSelected > numABLines) numABSelected = 1;
+                mf.ABLine.numABLineSelected++;
+                if (mf.ABLine.numABLineSelected > mf.ABLine.numABLines) mf.ABLine.numABLineSelected = 1;
             }
             else
             {
-                numABSelected = 0;
+                mf.ABLine.numABLineSelected = 0;
             }
 
             FixLabelsABLine();
@@ -132,8 +126,6 @@ private void btnCancelTouch_Click(object sender, EventArgs e)
             isA = true;
             start = 99999; end = 99999;
 
-            LoadLines();
-            LoadCurves();
             btnCancelTouch.Enabled = false;
         }
 
@@ -146,112 +138,32 @@ private void nudDistance_Enter(object sender, EventArgs e)
 
         private void btnDeleteCurve_Click(object sender, EventArgs e)
         {
-            if (curveArr.Count > 0 && numCurveSelected > 0)
+            if (mf.curve.curveArr.Count > 0 && mf.curve.numCurveLineSelected > 0)
             {
-                curveArr.RemoveAt(numCurveSelected - 1);
-                numCurves--;
-
-                string dirField = mf.fieldsDirectory + mf.currentFieldDirectory + "\\";
-                string directoryName = Path.GetDirectoryName(dirField).ToString(CultureInfo.InvariantCulture);
-
-                if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-                { Directory.CreateDirectory(directoryName); }
-
-                string filename = directoryName + "\\CurveLines.txt";
+                mf.curve.curveArr.RemoveAt(mf.curve.numCurveLineSelected - 1);
+                mf.curve.numCurveLines--;
 
-                using (StreamWriter writer = new StreamWriter(filename, false))
-                {
-                    try
-                    {
-                        if (curveArr.Count > 0)
-                        {
-                            writer.WriteLine("$CurveLines");
-
-                            for (int i = 0; i < curveArr.Count; i++)
-                            {
-                                //write out the Name
-                                writer.WriteLine(curveArr[i].Name);
-
-                                //write out the aveheading
-                                writer.WriteLine(curveArr[i].aveHeading.ToString(CultureInfo.InvariantCulture));
-
-                                //write out the points of ref line
-                                writer.WriteLine(curveArr[i].curvePts.Count.ToString(CultureInfo.InvariantCulture));
-                                if (curveArr[i].curvePts.Count > 0)
-                                {
-                                    for (int j = 0; j < curveArr[i].curvePts.Count; j++)
-                                        writer.WriteLine(Math.Round(curveArr[i].curvePts[j].easting, 3).ToString(CultureInfo.InvariantCulture) + "," +
-                                                            Math.Round(curveArr[i].curvePts[j].northing, 3).ToString(CultureInfo.InvariantCulture) + "," +
-                                                                Math.Round(curveArr[i].curvePts[j].heading, 5).ToString(CultureInfo.InvariantCulture));
-                                }
-                            }
-                        }
-                        else
-                        {
-                            writer.WriteLine("$CurveLines");
-                        }
-                    }
-                    catch (Exception er)
-                    {
-                        mf.WriteErrorLog("Saving Curve Line" + er.ToString());
-
-                        return;
-                    }
-                }
             }
 
-            if (numCurves > 0) numCurveSelected = 1;
-            else numCurveSelected = 0;
+            if (mf.curve.numCurveLines > 0) mf.curve.numCurveLineSelected = 1;
+            else mf.curve.numCurveLineSelected = 0;
 
             FixLabelsCurve();
         }
 
         private void btnDeleteABLine_Click(object sender, EventArgs e)
         {
-            if (lineArr.Count > 0 && numABSelected > 0)
+            if (mf.ABLine.lineArr.Count > 0 && mf.ABLine.numABLineSelected > 0)
             {
-                lineArr.RemoveAt(numABSelected - 1);
-                numABLines--;
-                numABSelected--;
-
-                //make sure at least a global blank AB Line file exists
-                string dirField = mf.fieldsDirectory + mf.currentFieldDirectory + "\\";
-                string directoryName = Path.GetDirectoryName(dirField).ToString(CultureInfo.InvariantCulture);
-
-                //get the file of previous AB Lines
-                if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-                { Directory.CreateDirectory(directoryName); }
-
-                string filename = directoryName + "\\ABLines.txt";
-
-                using (StreamWriter writer = new StreamWriter(filename, false))
-                {
-                    if (numABLines > 0)
-                    {
-                        for (int i = 0; i < numABLines; i++)
-                        {
-                            foreach (var item in lineArr)
-                            {
-                                //make it culture invariant
-                                string line = item.Name
-                                    + ',' + (Math.Round(glm.toDegrees(item.heading), 8)).ToString(CultureInfo.InvariantCulture)
-                                    + ',' + (Math.Round(item.origin.easting, 3)).ToString(CultureInfo.InvariantCulture)
-                                    + ',' + (Math.Round(item.origin.northing, 3)).ToString(CultureInfo.InvariantCulture);
-
-                                //write out to file
-                                writer.WriteLine(line);
-                            }
-                        }
-                    }
-                }
+                mf.ABLine.lineArr.RemoveAt(mf.ABLine.numABLineSelected - 1);
+                mf.ABLine.numABLines--;
+                mf.ABLine.numABLineSelected--;
             }
 
-            if (numABLines > 0) numABSelected = 1;
-            else numABSelected = 0;
+            if (mf.ABLine.numABLines > 0) mf.ABLine.numABLineSelected = 1;
+            else mf.ABLine.numABLineSelected = 0;
 
             FixLabelsABLine();
-
-            //LoadLines();
         }
 
         public vec3 pint = new vec3(0.0, 1.0, 0.0);
@@ -268,7 +180,6 @@ public FormABDraw(Form callingForm)
             label5.Text = gStr.gsToolWidth;
 
             nudDistance.Controls[0].Enabled = false;
-
         }
 
         private void FormABDraw_Load(object sender, EventArgs e)
@@ -290,11 +201,9 @@ private void FormABDraw_Load(object sender, EventArgs e)
                 arr[i].heading = mf.bnd.bndArr[0].bndLine[i - cnt].heading;
             }
 
-            curveArr?.Clear();
-            lineArr?.Clear();
-            LoadCurves();
-            LoadLines();
             nudDistance.Value = (decimal)(mf.vehicle.toolWidth * 100);
+            FixLabelsABLine();
+            FixLabelsCurve();
         }
 
         private void oglSelf_MouseDown(object sender, MouseEventArgs e)
@@ -412,180 +321,11 @@ private void oglSelf_MouseDown(object sender, MouseEventArgs e)
             }
         }
 
-        private void LoadLines()
-        {
-            lineArr?.Clear();
-            numABLines = 0;
-
-            //make sure at least a global blank AB Line file exists
-            string dirField = mf.fieldsDirectory + mf.currentFieldDirectory + "\\";
-            string directoryName = Path.GetDirectoryName(dirField).ToString(CultureInfo.InvariantCulture);
-
-            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-            { Directory.CreateDirectory(directoryName); }
-
-            string filename = directoryName + "\\ABLines.txt";
-
-            if (!File.Exists(filename))
-            {
-                using (StreamWriter writer = new StreamWriter(filename))
-                {
-                }
-            }
-
-            if (!File.Exists(filename))
-            {
-                mf.TimedMessageBox(2000, gStr.gsFileError, gStr.gsMissingABLinesFile);
-            }
-            else
-            {
-                using (StreamReader reader = new StreamReader(filename))
-                {
-                    try
-                    {
-                        string line;
-                        numABLines = 0;
-
-                        //read all the lines
-                        for (int i = 0; !reader.EndOfStream; i++)
-                        {
-
-                            line = reader.ReadLine();
-                            string[] words = line.Split(',');
-
-                            if (words.Length != 4) break;
-
-                            lineArr.Add(new ABLinePick());
-
-                            lineArr[i].Name = words[0];
-
-
-                            lineArr[i].heading = glm.toRadians(double.Parse(words[1], CultureInfo.InvariantCulture));
-                            lineArr[i].origin.easting = double.Parse(words[2], CultureInfo.InvariantCulture);
-                            lineArr[i].origin.northing = double.Parse(words[3], CultureInfo.InvariantCulture);
-
-                            lineArr[i].ref1.easting = lineArr[i].origin.easting - (Math.Sin(lineArr[i].heading) * 2000.0);
-                            lineArr[i].ref1.northing = lineArr[i].origin.northing - (Math.Cos(lineArr[i].heading) * 2000.0);
-
-                            lineArr[i].ref2.easting = lineArr[i].origin.easting + (Math.Sin(lineArr[i].heading) * 2000.0);
-                            lineArr[i].ref2.northing = lineArr[i].origin.northing + (Math.Cos(lineArr[i].heading) * 2000.0);
-                            numABLines++;
-                        }
-                    }
-                    catch (Exception er)
-                    {
-                        var form = new FormTimedMessage(2000, gStr.gsABLineFileIsCorrupt, "Please delete it!!!");
-                        form.Show();
-                        mf.WriteErrorLog("FieldOpen, Loading ABLine, Corrupt ABLine File" + er);
-                    }
-                }
-            }
-
-            if (numABLines > 0) numABSelected = 1;
-            else numABSelected = 0;
-
-            FixLabelsABLine();        }
-
-        private void LoadCurves()
-        {
-            curveArr?.Clear();
-            numCurves = 0;
-
-            //get the directory and make sure it exists, create if not
-            string dirField = mf.fieldsDirectory + mf.currentFieldDirectory + "\\";
-            string directoryName = Path.GetDirectoryName(dirField);
-
-            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-            { Directory.CreateDirectory(directoryName); }
-
-            string filename = directoryName + "\\CurveLines.txt";
-
-            if (!File.Exists(filename))
-            {
-                using (StreamWriter writer = new StreamWriter(filename))
-                {
-                    writer.WriteLine("$CurveLines");
-                }
-            }
-
-            //get the file of previous AB Lines
-            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-            { Directory.CreateDirectory(directoryName); }
-
-            if (!File.Exists(filename))
-            {
-                mf.TimedMessageBox(2000, gStr.gsFileError, gStr.gsMissingABCurveFile);
-            }
-            else
-            {
-                using (StreamReader reader = new StreamReader(filename))
-                {
-                    try
-                    {
-                        string line;
-                        numCurves = 0;
-
-                        //read header $CurveLine
-                        line = reader.ReadLine();
-
-                        while (!reader.EndOfStream)
-                        {
-                            curveArr.Add(new CurveLinePick());
-
-                            //read header $CurveLine
-                            curveArr[numCurves].Name = reader.ReadLine();
-                            // get the average heading
-                            line = reader.ReadLine();
-                            curveArr[numCurves].aveHeading = double.Parse(line, CultureInfo.InvariantCulture);
-
-                            line = reader.ReadLine();
-                            int numPoints = int.Parse(line);
-
-                            if (numPoints > 1)
-                            {
-                                curveArr[numCurves].curvePts?.Clear();
-
-                                for (int i = 0; i < numPoints; i++)
-                                {
-                                    line = reader.ReadLine();
-                                    string[] words = line.Split(',');
-                                    vec3 vecPt = new vec3(double.Parse(words[0], CultureInfo.InvariantCulture),
-                                        double.Parse(words[1], CultureInfo.InvariantCulture),
-                                        double.Parse(words[2], CultureInfo.InvariantCulture));
-                                    curveArr[numCurves].curvePts.Add(vecPt);
-                                }
-                                numCurves++;
-                            }
-                            else
-                            {
-                                if (curveArr.Count > 0)
-                                {
-                                    curveArr.RemoveAt(numCurves);
-                                }
-                            }
-                        }
-                    }
-                    catch (Exception er)
-                    {
-                        var form = new FormTimedMessage(2000, gStr.gsCurveLineFileIsCorrupt, gStr.gsButFieldIsLoaded);
-                        form.Show();
-                        mf.WriteErrorLog("Load Curve Line" + er.ToString());
-                    }
-                }
-            }
-
-            if (numCurves > 0) numCurveSelected = 1;
-            else numCurveSelected = 0;
-
-            FixLabelsCurve();
-        }
-
         private void BtnMakeCurve_Click(object sender, EventArgs e)
         {
             btnCancelTouch.Enabled = false;
 
             mf.curve.refList?.Clear();
-
             vec3 chk = new vec3(arr[start]);
 
             for (int i = start; i < end; i++)
@@ -619,6 +359,7 @@ private void BtnMakeCurve_Click(object sender, EventArgs e)
                 //calculate average heading of line
                 double x = 0, y = 0;
                 mf.curve.isCurveSet = true;
+
                 foreach (var pt in mf.curve.refList)
                 {
                     x += Math.Cos(pt.heading);
@@ -627,6 +368,7 @@ private void BtnMakeCurve_Click(object sender, EventArgs e)
                 x /= mf.curve.refList.Count;
                 y /= mf.curve.refList.Count;
                 mf.curve.aveLineHeading = Math.Atan2(y, x);
+                if (mf.curve.aveLineHeading < 0) mf.curve.aveLineHeading += glm.twoPI;
 
                 //build the tail extensions
                 mf.curve.AddFirstLastPoints();
@@ -638,14 +380,15 @@ private void BtnMakeCurve_Click(object sender, EventArgs e)
                 double offset = ((double)nudDistance.Value) / 200.0;
 
                 //calculate the heading 90 degrees to ref ABLine heading
-                double headingAt90 = glm.PIBy2 + mf.curve.aveLineHeading;
+                double headingAt90 = mf.curve.aveLineHeading + glm.PIBy2;
 
                 chk.easting = (Math.Sin(headingAt90) * Math.Abs(offset)) + chk.easting;
                 chk.northing = (Math.Cos(headingAt90) * Math.Abs(offset)) + chk.northing;
 
-                if (!mf.bnd.bndArr[0].IsPointInsideBoundary(chk)) headingAt90 *=-1;
+                if (!mf.bnd.bndArr[0].IsPointInsideBoundary(chk)) headingAt90 = mf.curve.aveLineHeading - glm.PIBy2;
 
                 cnt = mf.curve.refList.Count;
+
                 vec3[] arrMove = new vec3[cnt];
                 mf.curve.refList.CopyTo(arrMove);
                 mf.curve.refList.Clear();
@@ -657,70 +400,35 @@ private void BtnMakeCurve_Click(object sender, EventArgs e)
                     mf.curve.refList.Add(arrMove[i]);
                 }
 
-                mf.FileSaveCurveLine();
+                mf.curve.curveArr.Add(new CCurveLines());
+                mf.curve.numCurveLines = mf.curve.curveArr.Count;
+                mf.curve.numCurveLineSelected = mf.curve.numCurveLines;
 
-                btnMakeABLine.Enabled = false;
-                btnMakeCurve.Enabled = false;
-
-                isMakingCurve = true;
-                isMakingAB = false;
+                //array number is 1 less since it starts at zero
+                int idx = mf.curve.curveArr.Count - 1;
 
-                //get the directory and make sure it exists, create if not
-                string dirField = mf.fieldsDirectory + mf.currentFieldDirectory + "\\";
-                string directoryName = Path.GetDirectoryName(dirField);
+                //create a name
+                mf.curve.curveArr[idx].Name = (Math.Round(glm.toDegrees(mf.curve.aveLineHeading), 1)).ToString(CultureInfo.InvariantCulture)
+                     + "\u00B0" + FindDirection(mf.curve.aveLineHeading) + DateTime.Now.ToString("hh:mm:ss", CultureInfo.InvariantCulture);
 
-                if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-                { Directory.CreateDirectory(directoryName); }
+                mf.curve.curveArr[idx].aveHeading = mf.curve.aveLineHeading;
 
-                string filename = directoryName + "\\CurveLines.txt";
-
-                if (!File.Exists(filename))
+                //write out the Curve Points
+                foreach (var item in mf.curve.refList)
                 {
-                    using (StreamWriter writer = new StreamWriter(filename))
-                    {
-                        writer.WriteLine("$CurveLines");
-                    }
+                    mf.curve.curveArr[idx].curvePts.Add(item);
                 }
 
-                //use Streamwriter to append to curveLines file
-                using (StreamWriter writer = new StreamWriter(filename, true))
-                {
-                    try
-                    {
-                        //write out the ABLine
-                        writer.WriteLine(mf.curve.refList.Count.ToString() + "_Pts "
-                            + DateTime.Now.ToString("mm_ss", CultureInfo.InvariantCulture));
-
-                        //write out the aveheading
-                        writer.WriteLine(mf.curve.aveLineHeading.ToString(CultureInfo.InvariantCulture));
-
-                        //write out the points of ref line
-                        writer.WriteLine(mf.curve.refList.Count.ToString(CultureInfo.InvariantCulture));
-
-                        for (int j = 0; j < mf.curve.refList.Count; j++)
-                        {
-                            writer.WriteLine(Math.Round(mf.curve.refList[j].easting, 3).ToString(CultureInfo.InvariantCulture) + "," +
-                                             Math.Round(mf.curve.refList[j].northing, 3).ToString(CultureInfo.InvariantCulture) + "," +
-                                             Math.Round(mf.curve.refList[j].heading, 5).ToString(CultureInfo.InvariantCulture));
-                        }
-                    }
-                    catch (Exception er)
-                    {
-                        Console.WriteLine(er.Message + "\n Cannot write to file.");
-                        mf.WriteErrorLog("Saving Curve Line" + er.ToString());
-                        return;
-                    }
-                }
+                mf.FileSaveCurveLines();
 
                 //update the arrays
-                LoadCurves();
-                numCurveSelected = numCurves;
-
-                FixLabelsCurve();
-
+                btnMakeABLine.Enabled = false;
+                btnMakeCurve.Enabled = false;
                 isMakingCurve = false;
                 isMakingAB = false;
                 start = 99999; end = 99999;
+
+                FixLabelsCurve();
             }
             else
             {
@@ -742,76 +450,43 @@ private void BtnMakeABLine_Click(object sender, EventArgs e)
 
             double headingCalc = abHead + glm.PIBy2;
 
-            lineArr.Add(new ABLinePick());
-            numABLines++;
-            numABSelected = numABLines;
+            mf.ABLine.lineArr.Add(new CABLines());
+            mf.ABLine.numABLines = mf.ABLine.lineArr.Count;
+            mf.ABLine.numABLineSelected = mf.ABLine.numABLines;
 
-            int idx = numABLines - 1;
+            int idx = mf.ABLine.numABLines - 1;
 
-            lineArr[idx].heading = abHead;
+            mf.ABLine.lineArr[idx].heading = abHead;
             //calculate the new points for the reference line and points
-            lineArr[idx].origin.easting = (Math.Sin(headingCalc) * Math.Abs(offset)) + arr[A].easting;
-            lineArr[idx].origin.northing = (Math.Cos(headingCalc) * Math.Abs(offset)) + arr[A].northing;
+            mf.ABLine.lineArr[idx].origin.easting = (Math.Sin(headingCalc) * Math.Abs(offset)) + arr[A].easting;
+            mf.ABLine.lineArr[idx].origin.northing = (Math.Cos(headingCalc) * Math.Abs(offset)) + arr[A].northing;
 
-            if (!mf.bnd.bndArr[0].IsPointInsideBoundary(lineArr[idx].origin))
+            if (!mf.bnd.bndArr[0].IsPointInsideBoundary(mf.ABLine.lineArr[idx].origin))
             {
                 headingCalc = abHead - glm.PIBy2;
-                lineArr[idx].origin.easting = (Math.Sin(headingCalc) * Math.Abs(offset)) + arr[A].easting;
-                lineArr[idx].origin.northing = (Math.Cos(headingCalc) * Math.Abs(offset)) + arr[A].northing;
+                mf.ABLine.lineArr[idx].origin.easting = (Math.Sin(headingCalc) * Math.Abs(offset)) + arr[A].easting;
+                mf.ABLine.lineArr[idx].origin.northing = (Math.Cos(headingCalc) * Math.Abs(offset)) + arr[A].northing;
             }
 
             //sin x cos z for endpoints, opposite for additional lines
-            lineArr[idx].ref1.easting =   lineArr[idx].origin.easting - (Math.Sin(lineArr[idx].heading) * 2000.0);
-            lineArr[idx].ref1.northing = lineArr[idx].origin.northing - (Math.Cos(lineArr[idx].heading) * 2000.0);
-            lineArr[idx].ref2.easting =  lineArr[idx].origin.easting +  (Math.Sin(lineArr[idx].heading) * 2000.0);
-            lineArr[idx].ref2.northing = lineArr[idx].origin.northing + (Math.Cos(lineArr[idx].heading) * 2000.0);
+            mf.ABLine.lineArr[idx].ref1.easting =   mf.ABLine.lineArr[idx].origin.easting - (Math.Sin(mf.ABLine.lineArr[idx].heading) * 2000.0);
+            mf.ABLine.lineArr[idx].ref1.northing = mf.ABLine.lineArr[idx].origin.northing - (Math.Cos(mf.ABLine.lineArr[idx].heading) * 2000.0);
+            mf.ABLine.lineArr[idx].ref2.easting =  mf.ABLine.lineArr[idx].origin.easting +  (Math.Sin(mf.ABLine.lineArr[idx].heading) * 2000.0);
+            mf.ABLine.lineArr[idx].ref2.northing = mf.ABLine.lineArr[idx].origin.northing + (Math.Cos(mf.ABLine.lineArr[idx].heading) * 2000.0);
 
             //create a name
-            lineArr[idx].Name = (Math.Round(glm.toDegrees(lineArr[idx].heading), 1)).ToString(CultureInfo.InvariantCulture) 
-                + FindDirection(lineArr[idx].heading) + DateTime.Now.ToString("mm_ss", CultureInfo.InvariantCulture);
+            mf.ABLine.lineArr[idx].Name = (Math.Round(glm.toDegrees(mf.ABLine.lineArr[idx].heading), 1)).ToString(CultureInfo.InvariantCulture)
+                 + "\u00B0" + FindDirection(mf.ABLine.lineArr[idx].heading) + DateTime.Now.ToString("hh:mm:ss", CultureInfo.InvariantCulture);
 
             //clean up gui
             btnMakeABLine.Enabled = false;
             btnMakeCurve.Enabled = false;
-            isMakingCurve = false;
-            isMakingAB = true;
-
-            //make sure at least a global blank AB Line file exists
-            string dirField = mf.fieldsDirectory + mf.currentFieldDirectory + "\\";
-            string directoryName = Path.GetDirectoryName(dirField).ToString(CultureInfo.InvariantCulture);
-
-            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-            { Directory.CreateDirectory(directoryName); }
-
-            string filename = directoryName + "\\ABLines.txt";
-
-            using (StreamWriter writer = new StreamWriter(filename, true))
-            {
-                try
-                {
-                    //make it culture invariant
-                    string line = lineArr[idx].Name.Trim()
-                        + ',' + (Math.Round(glm.toDegrees(lineArr[idx].heading), 8)).ToString(CultureInfo.InvariantCulture)
-                        + ',' + (Math.Round(lineArr[idx].origin.easting, 3)).ToString(CultureInfo.InvariantCulture)
-                        + ',' + (Math.Round(lineArr[idx].origin.northing, 3)).ToString(CultureInfo.InvariantCulture);
-
-                    //write out to file
-                    writer.WriteLine(line);
-                }
-                catch (Exception er)
-                {
-                    Console.WriteLine(er.Message + "\n Cannot write to file.");
-                    mf.WriteErrorLog("Saving ABLines Draw append" + er.ToString());
-                    return;
-                }
-            }
 
             isMakingCurve = false;
             isMakingAB = false;
+            start = 99999; end = 99999;
 
             FixLabelsABLine();
-
-            start = 99999; end = 99999;
         }
 
         private void oglSelf_Paint(object sender, PaintEventArgs e)
@@ -838,38 +513,9 @@ private void oglSelf_Paint(object sender, PaintEventArgs e)
             if (start != 99999 || end != 99999) DrawABTouchLine();
 
             //draw the actual built lines
-            if (start == 99999 && end == 99999) DrawBuiltLines();
-            {
-
-                ////draw the ABLine
-                //if (mf.ABLine.isABLineLoaded)
-                //{
-                //    //Draw reference AB line ref
-                //    GL.LineWidth(2);
-                //    GL.Enable(EnableCap.LineStipple);
-                //    GL.LineStipple(1, 0x00F0);
-                //    GL.Begin(PrimitiveType.Lines);
-                //    GL.Color3(0.9f, 0.915f, 0.17f);
-                //    GL.Vertex3(mf.ABLine.refABLineP1.easting, mf.ABLine.refABLineP1.northing, 0);
-                //    GL.Color3(0.92f, 0.95f, 0.17f);
-                //    GL.Vertex3(mf.ABLine.refABLineP2.easting, mf.ABLine.refABLineP2.northing, 0);
-                //    GL.End();
-                //    GL.Disable(EnableCap.LineStipple);
-
-                //}
-
-                ////if (mf.curve.isCurveSet)
-                //{
-                //    int ptCount = mf.curve.refList.Count;
-                //    if (ptCount > 0)
-                //    {
-                //        GL.LineWidth(2);
-                //        GL.Color3(0.30f, 0.7692f, 0.760f);
-                //        GL.Begin(PrimitiveType.LineStrip);
-                //        for (int h = 0; h < ptCount; h++) GL.Vertex3(mf.curve.refList[h].easting, mf.curve.refList[h].northing, 0);
-                //        GL.End();
-                //    }
-                //}
+            if (start == 99999 && end == 99999) 
+            {                
+                DrawBuiltLines();
             }
 
             GL.Flush();
@@ -878,7 +524,7 @@ private void oglSelf_Paint(object sender, PaintEventArgs e)
 
         private void DrawBuiltLines()
         {
-            int numLines = lineArr.Count;
+            int numLines = mf.ABLine.lineArr.Count;
 
             if (numLines > 0)
             {
@@ -891,7 +537,7 @@ private void DrawBuiltLines()
                     GL.LineWidth(2);
                     GL.Begin(PrimitiveType.Lines);
 
-                    foreach (var item in lineArr)
+                    foreach (var item in mf.ABLine.lineArr)
                     {
                         GL.Vertex3(item.ref1.easting, item.ref1.northing, 0);
                         GL.Vertex3(item.ref2.easting, item.ref2.northing, 0);
@@ -901,23 +547,23 @@ private void DrawBuiltLines()
 
                 GL.Disable(EnableCap.LineStipple);
 
-                if (numABSelected > 0)
+                if (mf.ABLine.numABLineSelected > 0)
                 {
                     GL.Color3(1.0f, 0.0f, 0.0f);
 
                     GL.LineWidth(4);
                     GL.Begin(PrimitiveType.Lines);
 
-                    foreach (var item in lineArr)
+                    foreach (var item in mf.ABLine.lineArr)
                     {
-                        GL.Vertex3(lineArr[numABSelected - 1].ref1.easting, lineArr[numABSelected - 1].ref1.northing, 0);
-                        GL.Vertex3(lineArr[numABSelected - 1].ref2.easting, lineArr[numABSelected - 1].ref2.northing, 0);
+                        GL.Vertex3(mf.ABLine.lineArr[mf.ABLine.numABLineSelected - 1].ref1.easting, mf.ABLine.lineArr[mf.ABLine.numABLineSelected - 1].ref1.northing, 0);
+                        GL.Vertex3(mf.ABLine.lineArr[mf.ABLine.numABLineSelected - 1].ref2.easting, mf.ABLine.lineArr[mf.ABLine.numABLineSelected - 1].ref2.northing, 0);
                     }
                     GL.End();
                 }
             }
 
-            int numCurv = curveArr.Count;
+            int numCurv = mf.curve.curveArr.Count;
 
             if (numCurv > 0)
             {
@@ -929,7 +575,7 @@ private void DrawBuiltLines()
                     GL.LineWidth(2);
                     GL.Color3(0.0f, 1.0f, 0.0f);
                     GL.Begin(PrimitiveType.LineStrip);
-                    foreach (var item in curveArr[i].curvePts)
+                    foreach (var item in mf.curve.curveArr[i].curvePts)
                     {
                         GL.Vertex3(item.easting, item.northing, 0);
                     }
@@ -938,18 +584,17 @@ private void DrawBuiltLines()
 
                 GL.Disable(EnableCap.LineStipple);
 
-                if (numCurveSelected > 0)
+                if (mf.curve.numCurveLineSelected > 0)
                 {
                     GL.LineWidth(4);
                     GL.Color3(0.0f, 1.0f, 0.0f);
                     GL.Begin(PrimitiveType.LineStrip);
-                    foreach (var item in curveArr[numCurveSelected - 1].curvePts)
+                    foreach (var item in mf.curve.curveArr[mf.curve.numCurveLineSelected - 1].curvePts)
                     {
                         GL.Vertex3(item.easting, item.northing, 0);
                     }
                     GL.End();
                 }
-
             }
         }
 
@@ -996,43 +641,75 @@ private void timer1_Tick(object sender, EventArgs e)
 
         private void btnExit_Click(object sender, EventArgs e)
         {
-            if (numABSelected > 0)
+            if (mf.ABLine.numABLineSelected > 0 )
             {
-                mf.ABLine.refPoint1 = lineArr[numABSelected - 1].origin;
-                //mf.ABLine.refPoint2 = lineArr[numABSelected - 1].ref2;
-                mf.ABLine.abHeading = lineArr[numABSelected - 1].heading;
+                mf.ABLine.refPoint1 = mf.ABLine.lineArr[mf.ABLine.numABLineSelected - 1].origin;
+                mf.ABLine.abHeading = mf.ABLine.lineArr[mf.ABLine.numABLineSelected - 1].heading;
                 mf.ABLine.SetABLineByHeading();
-                mf.FileSaveABLine();
-                mf.ABLine.isABLineSet = false;
-                mf.ABLine.isABLineLoaded = true;
+
+                if (mf.ABLine.isBtnABLineOn)
+                {
+                    mf.ABLine.isABLineSet = true;
+                    mf.ABLine.isABLineLoaded = true;
+                }
+                else
+                {
+                    mf.ABLine.isABLineSet = false;
+                }
             }
             else
             {
+                mf.ABLine.DeleteAB();
                 mf.ABLine.isABLineSet = false;
                 mf.ABLine.isABLineLoaded = false;
             }
 
+            mf.FileSaveABLines();
+
 
             //curve
-            if (numCurveSelected > 0)
+            if (mf.curve.numCurveLineSelected > 0)
+            {
+                int idx = mf.curve.numCurveLineSelected - 1;
+                mf.curve.aveLineHeading = mf.curve.curveArr[idx].aveHeading;
+                mf.curve.refList?.Clear();
+                foreach (vec3 v in mf.curve.curveArr[idx].curvePts) mf.curve.refList.Add(v);
+                mf.curve.isCurveSet = true;
+            }
+            else
             {
-                int aa = numCurveSelected - 1;
-                mf.curve.aveLineHeading = curveArr[aa].aveHeading;
-
                 mf.curve.refList?.Clear();
+                mf.curve.isCurveSet = false;
+            }
+
+            mf.FileSaveCurveLines();
 
-                for (int i = 0; i < curveArr[aa].curvePts.Count; i++)
+            if (mf.ABLine.isBtnABLineOn)
+            {
+                if (mf.ABLine.numABLineSelected == 0)
                 {
-                    mf.curve.refList.Add(curveArr[aa].curvePts[i]);
+                    if (mf.isAutoSteerBtnOn) mf.btnAutoSteer.PerformClick();
+                    if (mf.yt.isYouTurnBtnOn) mf.btnEnableAutoYouTurn.PerformClick();
+                    mf.ABLine.isABLineSet = false;
+                    mf.ABLine.isABLineLoaded = false;
+                    mf.btnABLine.Image = Properties.Resources.ABLineOff;
+                    mf.ABLine.isBtnABLineOn = false;
                 }
-                    mf.curve.isCurveSet = true;
-                    mf.FileSaveCurveLine();
             }
-            else
+
+            if (mf.curve.isCurveBtnOn)
             {
-                mf.curve.isCurveSet = false;
-                mf.curve.refList?.Clear();
+                if (mf.curve.numCurveLineSelected == 0)
+                {
+                    if (mf.isAutoSteerBtnOn) mf.btnAutoSteer.PerformClick();
+                    if (mf.yt.isYouTurnBtnOn) mf.btnEnableAutoYouTurn.PerformClick();
+                    mf.curve.isCurveSet = false;
+                    mf.curve.refList?.Clear();
+                    mf.curve.isCurveBtnOn = false;
+                    mf.btnCurve.Image = Properties.Resources.CurveOff;
+                }
             }
+            
             Close();
         }
 
@@ -1140,20 +817,4 @@ private void CalculateMinMax()
             }
         }
     }
-
-    public class CurveLinePick
-    {
-        public List<vec3> curvePts = new List<vec3>();
-        public double aveHeading = 3;
-        public string Name = "aa";
-    }
-
-    public class ABLinePick
-    {
-        public vec2 ref1 = new vec2();
-        public vec2 ref2 = new vec2();
-        public vec2 origin = new vec2();
-        public double heading = 0;
-        public string Name = "aa";
-    }
 }
\ No newline at end of file
diff --git a/SourceCode/GPS/Forms/FormABLine.Designer.cs b/SourceCode/GPS/Forms/FormABLine.Designer.cs
index 3d3ecaa53..b6776427a 100644
--- a/SourceCode/GPS/Forms/FormABLine.Designer.cs
+++ b/SourceCode/GPS/Forms/FormABLine.Designer.cs
@@ -36,27 +36,22 @@ private void InitializeComponent()
             this.nudBasedOnPass = new System.Windows.Forms.NumericUpDown();
             this.nudTramRepeats = new System.Windows.Forms.NumericUpDown();
             this.label3 = new System.Windows.Forms.Label();
-            this.btnTurnOffAB = new System.Windows.Forms.Button();
-            this.btnBPoint = new System.Windows.Forms.Button();
-            this.btnAPoint = new System.Windows.Forms.Button();
-            this.btnABLineOk = new System.Windows.Forms.Button();
-            this.btnAddToFile = new System.Windows.Forms.Button();
             this.tboxHeading = new System.Windows.Forms.TextBox();
-            this.lvLines = new System.Windows.Forms.ListView();
-            this.chName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.chAngle = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.chEasting = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.chNorthing = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.btnListDelete = new System.Windows.Forms.Button();
-            this.btnListUse = new System.Windows.Forms.Button();
-            this.btnPlus90 = new System.Windows.Forms.Button();
             this.btnDnABHeadingBy1 = new System.Windows.Forms.Button();
             this.btnUpABHeadingBy1 = new System.Windows.Forms.Button();
-            this.btnShow = new System.Windows.Forms.Button();
-            this.btnNewABLine = new System.Windows.Forms.Button();
             this.lblEnterName = new System.Windows.Forms.Label();
             this.tboxABLineName = new System.Windows.Forms.TextBox();
-            this.btnGetABForm = new System.Windows.Forms.Button();
+            this.lvLines = new System.Windows.Forms.ListView();
+            this.chField = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.label1 = new System.Windows.Forms.Label();
+            this.btnAddAndGo = new System.Windows.Forms.Button();
+            this.btnNewABLine = new System.Windows.Forms.Button();
+            this.btnListUse = new System.Windows.Forms.Button();
+            this.btnListDelete = new System.Windows.Forms.Button();
+            this.btnAddToFile = new System.Windows.Forms.Button();
+            this.btnTurnOffAB = new System.Windows.Forms.Button();
+            this.btnBPoint = new System.Windows.Forms.Button();
+            this.btnAPoint = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.nudBasedOnPass)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.nudTramRepeats)).BeginInit();
             this.SuspendLayout();
@@ -64,7 +59,7 @@ private void InitializeComponent()
             // timer1
             // 
             this.timer1.Enabled = true;
-            this.timer1.Interval = 200;
+            this.timer1.Interval = 500;
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
             // lblFixHeading
@@ -72,7 +67,7 @@ private void InitializeComponent()
             this.lblFixHeading.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.lblFixHeading.AutoSize = true;
             this.lblFixHeading.Font = new System.Drawing.Font("Tahoma", 20.25F, System.Drawing.FontStyle.Bold);
-            this.lblFixHeading.Location = new System.Drawing.Point(541, 6);
+            this.lblFixHeading.Location = new System.Drawing.Point(379, 3);
             this.lblFixHeading.Name = "lblFixHeading";
             this.lblFixHeading.Size = new System.Drawing.Size(32, 33);
             this.lblFixHeading.TabIndex = 64;
@@ -83,7 +78,7 @@ private void InitializeComponent()
             this.lblKeepGoing.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.lblKeepGoing.AutoSize = true;
             this.lblKeepGoing.Font = new System.Drawing.Font("Tahoma", 15.75F);
-            this.lblKeepGoing.Location = new System.Drawing.Point(711, 6);
+            this.lblKeepGoing.Location = new System.Drawing.Point(533, 6);
             this.lblKeepGoing.Name = "lblKeepGoing";
             this.lblKeepGoing.Size = new System.Drawing.Size(22, 25);
             this.lblKeepGoing.TabIndex = 74;
@@ -94,7 +89,7 @@ private void InitializeComponent()
             this.label2.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("Tahoma", 12F);
-            this.label2.Location = new System.Drawing.Point(162, 406);
+            this.label2.Location = new System.Drawing.Point(154, 385);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(64, 19);
             this.label2.TabIndex = 76;
@@ -105,7 +100,7 @@ private void InitializeComponent()
             this.nudBasedOnPass.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.nudBasedOnPass.BackColor = System.Drawing.Color.MediumOrchid;
             this.nudBasedOnPass.Font = new System.Drawing.Font("Tahoma", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.nudBasedOnPass.Location = new System.Drawing.Point(69, 410);
+            this.nudBasedOnPass.Location = new System.Drawing.Point(70, 389);
             this.nudBasedOnPass.Minimum = new decimal(new int[] {
             100,
             0,
@@ -121,7 +116,7 @@ private void InitializeComponent()
             this.nudTramRepeats.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.nudTramRepeats.BackColor = System.Drawing.Color.Lime;
             this.nudTramRepeats.Font = new System.Drawing.Font("Tahoma", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.nudTramRepeats.Location = new System.Drawing.Point(232, 410);
+            this.nudTramRepeats.Location = new System.Drawing.Point(224, 389);
             this.nudTramRepeats.Name = "nudTramRepeats";
             this.nudTramRepeats.Size = new System.Drawing.Size(67, 52);
             this.nudTramRepeats.TabIndex = 75;
@@ -132,189 +127,35 @@ private void InitializeComponent()
             this.label3.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("Tahoma", 12F);
-            this.label3.Location = new System.Drawing.Point(21, 406);
+            this.label3.Location = new System.Drawing.Point(-67, 406);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(42, 19);
             this.label3.TabIndex = 78;
             this.label3.Text = "Start";
             // 
-            // btnTurnOffAB
-            // 
-            this.btnTurnOffAB.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnTurnOffAB.BackColor = System.Drawing.Color.Transparent;
-            this.btnTurnOffAB.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold);
-            this.btnTurnOffAB.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.btnTurnOffAB.Image = global::AgOpenGPS.Properties.Resources.Cancel64;
-            this.btnTurnOffAB.Location = new System.Drawing.Point(509, 383);
-            this.btnTurnOffAB.Name = "btnTurnOffAB";
-            this.btnTurnOffAB.Size = new System.Drawing.Size(100, 80);
-            this.btnTurnOffAB.TabIndex = 0;
-            this.btnTurnOffAB.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.btnTurnOffAB.UseVisualStyleBackColor = false;
-            this.btnTurnOffAB.Click += new System.EventHandler(this.btnTurnOffAB_Click);
-            // 
-            // btnBPoint
-            // 
-            this.btnBPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnBPoint.Font = new System.Drawing.Font("Tahoma", 14.25F);
-            this.btnBPoint.Image = global::AgOpenGPS.Properties.Resources.LetterBBlue;
-            this.btnBPoint.Location = new System.Drawing.Point(664, 38);
-            this.btnBPoint.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.btnBPoint.Name = "btnBPoint";
-            this.btnBPoint.Size = new System.Drawing.Size(100, 80);
-            this.btnBPoint.TabIndex = 58;
-            this.btnBPoint.UseVisualStyleBackColor = true;
-            this.btnBPoint.Click += new System.EventHandler(this.btnBPoint_Click);
-            // 
-            // btnAPoint
-            // 
-            this.btnAPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnAPoint.Font = new System.Drawing.Font("Tahoma", 14.25F);
-            this.btnAPoint.Image = global::AgOpenGPS.Properties.Resources.LetterABlue;
-            this.btnAPoint.Location = new System.Drawing.Point(506, 38);
-            this.btnAPoint.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.btnAPoint.Name = "btnAPoint";
-            this.btnAPoint.Size = new System.Drawing.Size(100, 80);
-            this.btnAPoint.TabIndex = 57;
-            this.btnAPoint.UseVisualStyleBackColor = true;
-            this.btnAPoint.Click += new System.EventHandler(this.btnAPoint_Click);
-            // 
-            // btnABLineOk
-            // 
-            this.btnABLineOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnABLineOk.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold);
-            this.btnABLineOk.Image = global::AgOpenGPS.Properties.Resources.OK64;
-            this.btnABLineOk.Location = new System.Drawing.Point(642, 382);
-            this.btnABLineOk.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
-            this.btnABLineOk.Name = "btnABLineOk";
-            this.btnABLineOk.Size = new System.Drawing.Size(125, 80);
-            this.btnABLineOk.TabIndex = 62;
-            this.btnABLineOk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.btnABLineOk.UseVisualStyleBackColor = true;
-            this.btnABLineOk.Click += new System.EventHandler(this.btnABLineOk_Click);
-            // 
-            // btnAddToFile
-            // 
-            this.btnAddToFile.BackColor = System.Drawing.Color.Transparent;
-            this.btnAddToFile.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Bold);
-            this.btnAddToFile.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.btnAddToFile.Image = global::AgOpenGPS.Properties.Resources.FileNew;
-            this.btnAddToFile.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
-            this.btnAddToFile.Location = new System.Drawing.Point(7, 17);
-            this.btnAddToFile.Name = "btnAddToFile";
-            this.btnAddToFile.Size = new System.Drawing.Size(95, 88);
-            this.btnAddToFile.TabIndex = 82;
-            this.btnAddToFile.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.btnAddToFile.UseVisualStyleBackColor = false;
-            this.btnAddToFile.Click += new System.EventHandler(this.btnAddToFile_Click);
-            // 
             // tboxHeading
             // 
             this.tboxHeading.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.tboxHeading.BackColor = System.Drawing.Color.AliceBlue;
             this.tboxHeading.Font = new System.Drawing.Font("Tahoma", 21.75F);
-            this.tboxHeading.Location = new System.Drawing.Point(547, 135);
+            this.tboxHeading.Location = new System.Drawing.Point(379, 142);
             this.tboxHeading.MaxLength = 10;
             this.tboxHeading.Name = "tboxHeading";
-            this.tboxHeading.Size = new System.Drawing.Size(176, 43);
+            this.tboxHeading.Size = new System.Drawing.Size(185, 43);
             this.tboxHeading.TabIndex = 83;
             this.tboxHeading.Text = "359.123456";
             this.tboxHeading.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.tboxHeading.TextChanged += new System.EventHandler(this.tboxHeading_TextChanged);
             this.tboxHeading.Enter += new System.EventHandler(this.TboxHeading_Enter);
             // 
-            // lvLines
-            // 
-            this.lvLines.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.lvLines.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.chName,
-            this.chAngle,
-            this.chEasting,
-            this.chNorthing});
-            this.lvLines.Font = new System.Drawing.Font("Tahoma", 15.75F);
-            this.lvLines.FullRowSelect = true;
-            this.lvLines.GridLines = true;
-            this.lvLines.HideSelection = false;
-            this.lvLines.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.lvLines.Location = new System.Drawing.Point(113, 93);
-            this.lvLines.MultiSelect = false;
-            this.lvLines.Name = "lvLines";
-            this.lvLines.Size = new System.Drawing.Size(359, 264);
-            this.lvLines.TabIndex = 84;
-            this.lvLines.UseCompatibleStateImageBehavior = false;
-            this.lvLines.View = System.Windows.Forms.View.Details;
-            // 
-            // chName
-            // 
-            this.chName.Text = "Name";
-            this.chName.Width = 260;
-            // 
-            // chAngle
-            // 
-            this.chAngle.Text = "Angle";
-            this.chAngle.Width = 100;
-            // 
-            // chEasting
-            // 
-            this.chEasting.Text = "X";
-            this.chEasting.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.chEasting.Width = 100;
-            // 
-            // chNorthing
-            // 
-            this.chNorthing.Text = "Y";
-            this.chNorthing.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            this.chNorthing.Width = 100;
-            // 
-            // btnListDelete
-            // 
-            this.btnListDelete.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Bold);
-            this.btnListDelete.Image = global::AgOpenGPS.Properties.Resources.FileDelete;
-            this.btnListDelete.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
-            this.btnListDelete.Location = new System.Drawing.Point(7, 156);
-            this.btnListDelete.Name = "btnListDelete";
-            this.btnListDelete.Size = new System.Drawing.Size(95, 93);
-            this.btnListDelete.TabIndex = 85;
-            this.btnListDelete.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.btnListDelete.UseVisualStyleBackColor = true;
-            this.btnListDelete.Click += new System.EventHandler(this.btnListDelete_Click);
-            // 
-            // btnListUse
-            // 
-            this.btnListUse.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Bold);
-            this.btnListUse.Image = global::AgOpenGPS.Properties.Resources.FileUse;
-            this.btnListUse.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
-            this.btnListUse.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnListUse.Location = new System.Drawing.Point(7, 281);
-            this.btnListUse.Name = "btnListUse";
-            this.btnListUse.Size = new System.Drawing.Size(95, 88);
-            this.btnListUse.TabIndex = 86;
-            this.btnListUse.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.btnListUse.UseVisualStyleBackColor = true;
-            this.btnListUse.Click += new System.EventHandler(this.btnListUse_Click);
-            // 
-            // btnPlus90
-            // 
-            this.btnPlus90.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnPlus90.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnPlus90.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
-            this.btnPlus90.Location = new System.Drawing.Point(693, 198);
-            this.btnPlus90.Name = "btnPlus90";
-            this.btnPlus90.Size = new System.Drawing.Size(70, 51);
-            this.btnPlus90.TabIndex = 87;
-            this.btnPlus90.Text = "+90";
-            this.btnPlus90.UseVisualStyleBackColor = true;
-            this.btnPlus90.Click += new System.EventHandler(this.btnPlus90_Click);
-            // 
             // btnDnABHeadingBy1
             // 
             this.btnDnABHeadingBy1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnDnABHeadingBy1.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnDnABHeadingBy1.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnDnABHeadingBy1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.btnDnABHeadingBy1.Location = new System.Drawing.Point(601, 198);
+            this.btnDnABHeadingBy1.Location = new System.Drawing.Point(484, 202);
             this.btnDnABHeadingBy1.Name = "btnDnABHeadingBy1";
-            this.btnDnABHeadingBy1.Size = new System.Drawing.Size(70, 51);
+            this.btnDnABHeadingBy1.Size = new System.Drawing.Size(80, 51);
             this.btnDnABHeadingBy1.TabIndex = 73;
             this.btnDnABHeadingBy1.Text = "+0.1";
             this.btnDnABHeadingBy1.UseVisualStyleBackColor = true;
@@ -323,104 +164,207 @@ private void InitializeComponent()
             // btnUpABHeadingBy1
             // 
             this.btnUpABHeadingBy1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnUpABHeadingBy1.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnUpABHeadingBy1.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnUpABHeadingBy1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.btnUpABHeadingBy1.Location = new System.Drawing.Point(509, 198);
+            this.btnUpABHeadingBy1.Location = new System.Drawing.Point(377, 202);
             this.btnUpABHeadingBy1.Name = "btnUpABHeadingBy1";
-            this.btnUpABHeadingBy1.Size = new System.Drawing.Size(70, 51);
+            this.btnUpABHeadingBy1.Size = new System.Drawing.Size(80, 51);
             this.btnUpABHeadingBy1.TabIndex = 72;
             this.btnUpABHeadingBy1.Text = "-0.1";
             this.btnUpABHeadingBy1.UseVisualStyleBackColor = true;
             this.btnUpABHeadingBy1.Click += new System.EventHandler(this.BtnUpABHeadingBy1_Click);
             // 
-            // btnShow
-            // 
-            this.btnShow.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnShow.BackColor = System.Drawing.SystemColors.ControlLight;
-            this.btnShow.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnShow.Image = global::AgOpenGPS.Properties.Resources.ArrowRight;
-            this.btnShow.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
-            this.btnShow.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnShow.Location = new System.Drawing.Point(509, 276);
-            this.btnShow.Name = "btnShow";
-            this.btnShow.Size = new System.Drawing.Size(100, 80);
-            this.btnShow.TabIndex = 148;
-            this.btnShow.Text = "Show";
-            this.btnShow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.btnShow.UseVisualStyleBackColor = false;
-            this.btnShow.Click += new System.EventHandler(this.BtnShow_Click);
+            // lblEnterName
+            // 
+            this.lblEnterName.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblEnterName.Location = new System.Drawing.Point(108, 8);
+            this.lblEnterName.Margin = new System.Windows.Forms.Padding(0);
+            this.lblEnterName.Name = "lblEnterName";
+            this.lblEnterName.Size = new System.Drawing.Size(246, 61);
+            this.lblEnterName.TabIndex = 151;
+            this.lblEnterName.Text = "Enter Line Name";
+            this.lblEnterName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.lblEnterName.Visible = false;
+            // 
+            // tboxABLineName
+            // 
+            this.tboxABLineName.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.tboxABLineName.Location = new System.Drawing.Point(104, 72);
+            this.tboxABLineName.Name = "tboxABLineName";
+            this.tboxABLineName.Size = new System.Drawing.Size(255, 33);
+            this.tboxABLineName.TabIndex = 152;
+            this.tboxABLineName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.tboxABLineName.Enter += new System.EventHandler(this.tboxABLineName_Enter);
+            // 
+            // lvLines
+            // 
+            this.lvLines.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.lvLines.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.chField});
+            this.lvLines.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lvLines.FullRowSelect = true;
+            this.lvLines.GridLines = true;
+            this.lvLines.HideSelection = false;
+            this.lvLines.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.lvLines.LabelWrap = false;
+            this.lvLines.Location = new System.Drawing.Point(104, 117);
+            this.lvLines.Margin = new System.Windows.Forms.Padding(0);
+            this.lvLines.MultiSelect = false;
+            this.lvLines.Name = "lvLines";
+            this.lvLines.Size = new System.Drawing.Size(255, 245);
+            this.lvLines.TabIndex = 153;
+            this.lvLines.TileSize = new System.Drawing.Size(240, 40);
+            this.lvLines.UseCompatibleStateImageBehavior = false;
+            this.lvLines.View = System.Windows.Forms.View.Tile;
+            this.lvLines.Visible = false;
+            this.lvLines.SelectedIndexChanged += new System.EventHandler(this.lvLines_SelectedIndexChanged);
+            // 
+            // chField
+            // 
+            this.chField.Text = "CurveLines";
+            this.chField.Width = 239;
+            // 
+            // label1
+            // 
+            this.label1.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("Tahoma", 12F);
+            this.label1.Location = new System.Drawing.Point(13, 385);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(46, 19);
+            this.label1.TabIndex = 154;
+            this.label1.Text = "Skips";
+            // 
+            // btnAddAndGo
+            // 
+            this.btnAddAndGo.BackColor = System.Drawing.Color.Transparent;
+            this.btnAddAndGo.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Bold);
+            this.btnAddAndGo.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.btnAddAndGo.Image = global::AgOpenGPS.Properties.Resources.FileNewAndGo;
+            this.btnAddAndGo.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
+            this.btnAddAndGo.Location = new System.Drawing.Point(7, 6);
+            this.btnAddAndGo.Name = "btnAddAndGo";
+            this.btnAddAndGo.Size = new System.Drawing.Size(78, 74);
+            this.btnAddAndGo.TabIndex = 155;
+            this.btnAddAndGo.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.btnAddAndGo.UseVisualStyleBackColor = false;
+            this.btnAddAndGo.Click += new System.EventHandler(this.btnAddAndGo_Click);
             // 
             // btnNewABLine
             // 
             this.btnNewABLine.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnNewABLine.BackColor = System.Drawing.SystemColors.ControlLight;
             this.btnNewABLine.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnNewABLine.Image = global::AgOpenGPS.Properties.Resources.back_button;
-            this.btnNewABLine.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
+            this.btnNewABLine.Image = global::AgOpenGPS.Properties.Resources.AddNew;
             this.btnNewABLine.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnNewABLine.Location = new System.Drawing.Point(664, 276);
+            this.btnNewABLine.Location = new System.Drawing.Point(484, 282);
             this.btnNewABLine.Name = "btnNewABLine";
-            this.btnNewABLine.Size = new System.Drawing.Size(100, 80);
+            this.btnNewABLine.Size = new System.Drawing.Size(80, 80);
             this.btnNewABLine.TabIndex = 149;
-            this.btnNewABLine.Text = "New";
             this.btnNewABLine.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.btnNewABLine.UseVisualStyleBackColor = false;
             this.btnNewABLine.Click += new System.EventHandler(this.BtnNewABLine_Click);
             // 
-            // lblEnterName
+            // btnListUse
             // 
-            this.lblEnterName.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblEnterName.Location = new System.Drawing.Point(146, 8);
-            this.lblEnterName.Margin = new System.Windows.Forms.Padding(0);
-            this.lblEnterName.Name = "lblEnterName";
-            this.lblEnterName.Size = new System.Drawing.Size(246, 39);
-            this.lblEnterName.TabIndex = 151;
-            this.lblEnterName.Text = "Enter Line Name";
-            this.lblEnterName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.lblEnterName.Visible = false;
+            this.btnListUse.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Bold);
+            this.btnListUse.Image = global::AgOpenGPS.Properties.Resources.FileUse;
+            this.btnListUse.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
+            this.btnListUse.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.btnListUse.Location = new System.Drawing.Point(7, 291);
+            this.btnListUse.Name = "btnListUse";
+            this.btnListUse.Size = new System.Drawing.Size(78, 74);
+            this.btnListUse.TabIndex = 86;
+            this.btnListUse.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.btnListUse.UseVisualStyleBackColor = true;
+            this.btnListUse.Click += new System.EventHandler(this.btnListUse_Click);
             // 
-            // tboxABLineName
+            // btnListDelete
             // 
-            this.tboxABLineName.Location = new System.Drawing.Point(151, 52);
-            this.tboxABLineName.Name = "tboxABLineName";
-            this.tboxABLineName.Size = new System.Drawing.Size(228, 30);
-            this.tboxABLineName.TabIndex = 152;
-            this.tboxABLineName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.btnListDelete.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Bold);
+            this.btnListDelete.Image = global::AgOpenGPS.Properties.Resources.FileDelete;
+            this.btnListDelete.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
+            this.btnListDelete.Location = new System.Drawing.Point(7, 187);
+            this.btnListDelete.Name = "btnListDelete";
+            this.btnListDelete.Size = new System.Drawing.Size(78, 74);
+            this.btnListDelete.TabIndex = 85;
+            this.btnListDelete.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.btnListDelete.UseVisualStyleBackColor = true;
+            this.btnListDelete.Click += new System.EventHandler(this.btnListDelete_Click);
+            // 
+            // btnAddToFile
+            // 
+            this.btnAddToFile.BackColor = System.Drawing.Color.Transparent;
+            this.btnAddToFile.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Bold);
+            this.btnAddToFile.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.btnAddToFile.Image = global::AgOpenGPS.Properties.Resources.FileNew;
+            this.btnAddToFile.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
+            this.btnAddToFile.Location = new System.Drawing.Point(7, 82);
+            this.btnAddToFile.Name = "btnAddToFile";
+            this.btnAddToFile.Size = new System.Drawing.Size(78, 74);
+            this.btnAddToFile.TabIndex = 82;
+            this.btnAddToFile.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.btnAddToFile.UseVisualStyleBackColor = false;
+            this.btnAddToFile.Click += new System.EventHandler(this.btnAddToFile_Click);
+            // 
+            // btnTurnOffAB
+            // 
+            this.btnTurnOffAB.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnTurnOffAB.BackColor = System.Drawing.Color.Transparent;
+            this.btnTurnOffAB.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold);
+            this.btnTurnOffAB.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.btnTurnOffAB.Image = global::AgOpenGPS.Properties.Resources.SwitchOff;
+            this.btnTurnOffAB.Location = new System.Drawing.Point(377, 282);
+            this.btnTurnOffAB.Name = "btnTurnOffAB";
+            this.btnTurnOffAB.Size = new System.Drawing.Size(80, 80);
+            this.btnTurnOffAB.TabIndex = 0;
+            this.btnTurnOffAB.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.btnTurnOffAB.UseVisualStyleBackColor = false;
+            this.btnTurnOffAB.Click += new System.EventHandler(this.btnTurnOffAB_Click);
+            // 
+            // btnBPoint
+            // 
+            this.btnBPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnBPoint.Font = new System.Drawing.Font("Tahoma", 14.25F);
+            this.btnBPoint.Image = global::AgOpenGPS.Properties.Resources.LetterBBlue;
+            this.btnBPoint.Location = new System.Drawing.Point(484, 38);
+            this.btnBPoint.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.btnBPoint.Name = "btnBPoint";
+            this.btnBPoint.Size = new System.Drawing.Size(80, 80);
+            this.btnBPoint.TabIndex = 58;
+            this.btnBPoint.UseVisualStyleBackColor = true;
+            this.btnBPoint.Click += new System.EventHandler(this.btnBPoint_Click);
             // 
-            // btnGetABForm
-            // 
-            this.btnGetABForm.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnGetABForm.BackColor = System.Drawing.SystemColors.ControlLight;
-            this.btnGetABForm.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnGetABForm.Image = global::AgOpenGPS.Properties.Resources.PointStart;
-            this.btnGetABForm.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
-            this.btnGetABForm.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnGetABForm.Location = new System.Drawing.Point(379, 387);
-            this.btnGetABForm.Name = "btnGetABForm";
-            this.btnGetABForm.Size = new System.Drawing.Size(80, 69);
-            this.btnGetABForm.TabIndex = 149;
-            this.btnGetABForm.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.btnGetABForm.UseVisualStyleBackColor = false;
-            this.btnGetABForm.Click += new System.EventHandler(this.BtnGetABForm_Click);
+            // btnAPoint
+            // 
+            this.btnAPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnAPoint.Font = new System.Drawing.Font("Tahoma", 14.25F);
+            this.btnAPoint.Image = global::AgOpenGPS.Properties.Resources.LetterABlue;
+            this.btnAPoint.Location = new System.Drawing.Point(377, 38);
+            this.btnAPoint.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.btnAPoint.Name = "btnAPoint";
+            this.btnAPoint.Size = new System.Drawing.Size(80, 80);
+            this.btnAPoint.TabIndex = 57;
+            this.btnAPoint.UseVisualStyleBackColor = true;
+            this.btnAPoint.Click += new System.EventHandler(this.btnAPoint_Click);
             // 
             // FormABLine
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.SystemColors.InactiveBorder;
-            this.ClientSize = new System.Drawing.Size(768, 462);
+            this.ClientSize = new System.Drawing.Size(572, 371);
             this.ControlBox = false;
+            this.Controls.Add(this.btnAddAndGo);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.lvLines);
             this.Controls.Add(this.tboxABLineName);
             this.Controls.Add(this.lblEnterName);
-            this.Controls.Add(this.btnGetABForm);
             this.Controls.Add(this.btnNewABLine);
-            this.Controls.Add(this.btnShow);
             this.Controls.Add(this.lblFixHeading);
-            this.Controls.Add(this.btnPlus90);
             this.Controls.Add(this.btnListUse);
             this.Controls.Add(this.btnListDelete);
             this.Controls.Add(this.label3);
-            this.Controls.Add(this.lvLines);
             this.Controls.Add(this.nudTramRepeats);
             this.Controls.Add(this.tboxHeading);
             this.Controls.Add(this.nudBasedOnPass);
@@ -432,10 +376,8 @@ private void InitializeComponent()
             this.Controls.Add(this.btnTurnOffAB);
             this.Controls.Add(this.btnBPoint);
             this.Controls.Add(this.btnAPoint);
-            this.Controls.Add(this.btnABLineOk);
             this.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.HelpButton = true;
             this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
@@ -445,6 +387,7 @@ private void InitializeComponent()
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "AB Line";
             this.TopMost = true;
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormABLine_FormClosing);
             this.Load += new System.EventHandler(this.FormABLine_Load);
             ((System.ComponentModel.ISupportInitialize)(this.nudBasedOnPass)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.nudTramRepeats)).EndInit();
@@ -458,7 +401,6 @@ private void InitializeComponent()
         private System.Windows.Forms.Button btnTurnOffAB;
         private System.Windows.Forms.Button btnBPoint;
         private System.Windows.Forms.Button btnAPoint;
-        private System.Windows.Forms.Button btnABLineOk;
         private System.Windows.Forms.Timer timer1;
         private System.Windows.Forms.Label lblFixHeading;
         private System.Windows.Forms.Label lblKeepGoing;
@@ -468,20 +410,16 @@ private void InitializeComponent()
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Button btnAddToFile;
         private System.Windows.Forms.TextBox tboxHeading;
-        private System.Windows.Forms.ListView lvLines;
-        private System.Windows.Forms.ColumnHeader chName;
-        private System.Windows.Forms.ColumnHeader chAngle;
         private System.Windows.Forms.Button btnListDelete;
         private System.Windows.Forms.Button btnListUse;
-        private System.Windows.Forms.ColumnHeader chEasting;
-        private System.Windows.Forms.ColumnHeader chNorthing;
-        private System.Windows.Forms.Button btnPlus90;
         private System.Windows.Forms.Button btnDnABHeadingBy1;
         private System.Windows.Forms.Button btnUpABHeadingBy1;
-        private System.Windows.Forms.Button btnShow;
         private System.Windows.Forms.Button btnNewABLine;
         private System.Windows.Forms.Label lblEnterName;
         private System.Windows.Forms.TextBox tboxABLineName;
-        private System.Windows.Forms.Button btnGetABForm;
+        private System.Windows.Forms.ListView lvLines;
+        private System.Windows.Forms.ColumnHeader chField;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Button btnAddAndGo;
     }
 }
\ No newline at end of file
diff --git a/SourceCode/GPS/Forms/FormABLine.cs b/SourceCode/GPS/Forms/FormABLine.cs
index 4e02a5774..1c8c4e037 100644
--- a/SourceCode/GPS/Forms/FormABLine.cs
+++ b/SourceCode/GPS/Forms/FormABLine.cs
@@ -1,6 +1,7 @@
 //Please, if you use this, share the improvements
 
 using System;
+using System.Drawing;
 using System.Globalization;
 using System.IO;
 using System.Text.RegularExpressions;
@@ -14,9 +15,7 @@ public partial class FormABLine : Form
         private readonly FormGPS mf = null;
 
         private double upDnHeading = 0;
-
-        //the abline stored file
-        private string filename = "";
+        private bool isFullPanel;
 
         public FormABLine(Form callingForm)
         {
@@ -26,36 +25,29 @@ public FormABLine(Form callingForm)
             InitializeComponent();
 
             lblEnterName.Text = gStr.gsEnterLineName;
-            btnNewABLine.Text = gStr.gsNew;
-            btnShow.Text = gStr.gsShow;
+            //btnNewABLine.Text = gStr.gsNew;
         }
 
         private void FormABLine_Load(object sender, EventArgs e)
         {
-            lvLines.Visible = false;
-            label2.Visible = false;
-            label3.Visible = false;
-            lblEnterName.Visible = false;
-            tboxABLineName.Visible = false;
-            nudBasedOnPass.Visible = false;
-            nudTramRepeats.Visible = false;
-            btnListDelete.Visible = false;
-            btnListUse.Visible = false;
-            btnAddToFile.Visible = false;
-            btnShow.Text = gStr.gsShow;
-            btnShow.Image = Properties.Resources.ArrowLeft;
-
-
+            //tboxABLineName.Enabled = false;
+            btnAddToFile.Enabled = false;
+            btnAddAndGo.Enabled = false;
+            btnAPoint.Enabled = false;
+            btnBPoint.Enabled = false;
+            btnUpABHeadingBy1.Enabled = false;
+            btnDnABHeadingBy1.Enabled = false;
+            tboxHeading.Enabled = false;
+            tboxABLineName.Text = "";
+            tboxABLineName.Enabled = false;
+            
             //small window
-            this.Size = new System.Drawing.Size(304, 510);
-
+            ShowFullPanel(true);
 
             //different start based on AB line already set or not
             if (mf.ABLine.isABLineSet)
             {
                 //AB line is on screen and set
-                btnAPoint.Enabled = false;
-                btnBPoint.Enabled = true;
                 upDnHeading = Math.Round(glm.toDegrees(mf.ABLine.abHeading), 6);
                 nudTramRepeats.Value = mf.ABLine.tramPassEvery;
                 nudBasedOnPass.Value = mf.ABLine.passBasedOn;
@@ -66,9 +58,8 @@ private void FormABLine_Load(object sender, EventArgs e)
             else
             {
                 //no AB line
-                btnAPoint.Enabled = true;
+                btnAPoint.Enabled = false;
                 btnBPoint.Enabled = false;
-                btnABLineOk.Enabled = false;
                 upDnHeading = Math.Round(glm.toDegrees(mf.fixHeading), 6);
                 nudTramRepeats.Value = 0;
                 nudBasedOnPass.Value = 0;
@@ -76,108 +67,51 @@ private void FormABLine_Load(object sender, EventArgs e)
                 mf.ABLine.passBasedOn = 0;
             }
 
-            //make sure at least a global blank AB Line file exists
-            string dirField = mf.fieldsDirectory + mf.currentFieldDirectory + "\\";
-            string directoryName = Path.GetDirectoryName(dirField).ToString(CultureInfo.InvariantCulture);
-
-            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-            { Directory.CreateDirectory(directoryName); }
-
-            filename = directoryName + "\\ABLines.txt";
+            lvLines.Clear();
+            ListViewItem itm;
 
-
-            if (!File.Exists(filename))
+            foreach (var item in mf.ABLine.lineArr)
             {
-                using (StreamWriter writer = new StreamWriter(filename))
-                {
-                }
+                itm = new ListViewItem(item.Name);
+                lvLines.Items.Add(itm);
             }
 
-            if (!File.Exists(filename))
-            {
-                mf.TimedMessageBox(2000, gStr.gsFileError, gStr.gsMissingABLinesFile);
-            }
-            else
-            {
-                using (StreamReader reader = new StreamReader(filename))
-                {
-                    try
-                    {
-                        string line;
-                        ListViewItem itm;
-
-                        //read all the lines
-                        while (!reader.EndOfStream)
-                        {
-                            line = reader.ReadLine();
-                            string[] words = line.Split(',');
-                            //listboxLines.Items.Add(line);
-                            itm = new ListViewItem(words);
-                            lvLines.Items.Add(itm);
-
-                            //coords.easting = double.Parse(words[0], CultureInfo.InvariantCulture);
-                            //coords.northing = double.Parse(words[1], CultureInfo.InvariantCulture);
-                            //youFileList.Add(coords);
-                        }
-                    }
-                    catch (Exception er)
-                    {
-                        var form = new FormTimedMessage(2000, "ABLine File is Corrupt", "Please delete it!!!");
-                        form.Show();
-                        mf.WriteErrorLog("FieldOpen, Loading ABLine, Corrupt ABLine File" + er);
-                    }
-                }
-
-                // go to bottom of list - if there is a bottom
-                if (lvLines.Items.Count > 0) lvLines.Items[lvLines.Items.Count - 1].EnsureVisible();
-            }
+            // go to bottom of list - if there is a bottom
+            if (lvLines.Items.Count > 0) lvLines.Items[lvLines.Items.Count - 1].EnsureVisible();
         }
 
-        private void BtnNewABLine_Click(object sender, EventArgs e)
+
+        private void btnAPoint_Click(object sender, EventArgs e)
         {
-            this.tboxHeading.TextChanged -= new System.EventHandler(this.tboxHeading_TextChanged);
-            tboxHeading.Text = "";
-            this.tboxHeading.TextChanged += new System.EventHandler(this.tboxHeading_TextChanged);
+            vec3 fix = new vec3();
+            fix = mf.pivotAxlePos;
 
-            mf.ABLine.DeleteAB();
-            btnAPoint.Enabled = true;
-            btnBPoint.Enabled = false;
-            btnABLineOk.Enabled = false;
-            nudTramRepeats.Value = 0;
-            nudBasedOnPass.Value = 0;
-            mf.ABLine.tramPassEvery = 0;
-            mf.ABLine.passBasedOn = 0;
+            tboxHeading.Enabled = true;
+            btnNewABLine.Image = Properties.Resources.OK64;
+            btnNewABLine.Text = "+";
+            btnUpABHeadingBy1.Enabled = true;
+            btnDnABHeadingBy1.Enabled = true;
+            btnNewABLine.Enabled = true;
 
-            //save the no ABLine;
-            mf.FileSaveABLine();
 
-        }
+            mf.ABLine.moveDistance = 0;
+            mf.ABLine.refPoint1.easting = fix.easting;
+            mf.ABLine.refPoint1.northing = fix.northing;
+            mf.ABLine.abHeading = fix.heading;
+            mf.ABLine.SetABLineByHeading();
 
-        private void btnAPoint_Click(object sender, EventArgs e)
-        {
-#pragma warning disable CS1690 // Accessing a member on a field of a marshal-by-reference class may cause a runtime exception
-            mf.ABLine.refPoint1.easting = mf.pivotAxlePos.easting;
-            mf.ABLine.refPoint1.northing = mf.pivotAxlePos.northing;
-            mf.ABLine.abHeading = mf.pivotAxlePos.heading;
-#pragma warning restore CS1690 // Accessing a member on a field of a marshal-by-reference class may cause a runtime exception
             btnAPoint.Enabled = false;
             upDnHeading = Math.Round(glm.toDegrees(mf.fixHeading), 1);
             this.tboxHeading.TextChanged -= new System.EventHandler(this.tboxHeading_TextChanged);
             tboxHeading.Text = upDnHeading.ToString();
             this.tboxHeading.TextChanged += new System.EventHandler(this.tboxHeading_TextChanged);
-            btnABLineOk.Enabled = false;
-            btnShow.Enabled = false;
-            mf.ABLine.SetABLineByHeading();
 
-            ShowSavedPanel(false);
+            ShowFullPanel(false);
         }
 
         private void btnBPoint_Click(object sender, EventArgs e)
         {
             mf.ABLine.SetABLineByBPoint();
-            btnABLineOk.Enabled = true;
-            btnShow.Enabled = true;
-            btnTurnOffAB.Enabled = true;
             upDnHeading = Math.Round(glm.toDegrees(mf.fixHeading), 3);
 
             //update the default
@@ -186,179 +120,87 @@ private void btnBPoint_Click(object sender, EventArgs e)
             this.tboxHeading.TextChanged -= new System.EventHandler(this.tboxHeading_TextChanged);
             tboxHeading.Text = glm.toDegrees(mf.ABLine.abHeading).ToString("N4");
             this.tboxHeading.TextChanged += new System.EventHandler(this.tboxHeading_TextChanged);
+            //mf.ABLine.SetABLineByHeading();
 
+            //ShowSavedPanel(true);
+            //tboxABLineName.BackColor = Color.LightGreen;
         }
 
-        private void btnABLineOk_Click(object sender, EventArgs e)
-        {
-            //save the ABLine
-            mf.FileSaveABLine();
-
-            if (mf.ABLine.isABLineLoaded)
-            {
-                //save the ABLine
-                mf.EnableYouTurnButtons();
-            }
-            else
-            {
-                mf.DisableYouTurnButtons();
-            }
-
-            if (mf.ABLine.tramPassEvery == 0) mf.mc.relayData[mf.mc.rdTramLine] = 0;
-            Close();
-        }
-
-        private void timer1_Tick(object sender, EventArgs e)
-        {
-            lblFixHeading.Text = Convert.ToString(Math.Round(glm.toDegrees(mf.fixHeading), 1)) + "°";
-            lblKeepGoing.Text = "";
-
-            //make sure we go at least 3 or so meters before allowing B reference point
-            if (!btnAPoint.Enabled && !btnBPoint.Enabled)
-            {
-                double pointAToFixDistance =
-                Math.Pow(mf.ABLine.refPoint1.easting - mf.pn.fix.easting, 2)
-                + Math.Pow(mf.ABLine.refPoint1.northing - mf.pn.fix.northing, 2);
 
-                if (pointAToFixDistance > 100) btnBPoint.Enabled = true;
-                else lblKeepGoing.Text = Convert.ToInt16(100 - pointAToFixDistance).ToString();
-            }
+        //private void btnPlus90_Click(object sender, EventArgs e)
+        //{
+        //    mf.ABLine.moveDistance = 0;
+        //    upDnHeading += 90;
+        //    if (upDnHeading > 359.999999) upDnHeading -= 360;
+        //    mf.ABLine.abHeading = glm.toRadians(upDnHeading);
+        //    mf.ABLine.SetABLineByHeading();
+        //    tboxHeading.Text = Convert.ToString(upDnHeading, CultureInfo.InvariantCulture);
+        //}
 
-            int count = lvLines.SelectedItems.Count;
-            if (count > 0)
-            {
-                btnListDelete.Enabled = true;
-                btnListUse.Enabled = true;
-            }
-            else
-            {
-                btnListDelete.Enabled = false;
-                btnListUse.Enabled = false;
-            }
-        }
-
-        private void nudTramRepeats_ValueChanged(object sender, EventArgs e)
-        {
-            mf.ABLine.tramPassEvery = (int)nudTramRepeats.Value;
-        }
-
-        private void nudBasedOnPass_ValueChanged(object sender, EventArgs e)
-        {
-            mf.ABLine.passBasedOn = (int)nudBasedOnPass.Value;
-        }
-
-        private void btnAddToFile_Click(object sender, EventArgs e)
+        private void BtnNewABLine_Click(object sender, EventArgs e)
         {
-            using (StreamWriter writer = new StreamWriter(filename, true))
+            //is button for adding ABLine set
+            if (btnNewABLine.Text == "+")
             {
-                if (mf.ABLine.isABLineSet)
-                {
-                    if (tboxABLineName.Text.Length > 0)
-                    {
-                        //make it culture invariant
-                        string line = tboxABLineName.Text.Trim()
-                            + ',' + (Math.Round(glm.toDegrees(mf.ABLine.abHeading), 8)).ToString(CultureInfo.InvariantCulture)
-                            + ',' + (Math.Round(mf.ABLine.refPoint1.easting, 3)).ToString(CultureInfo.InvariantCulture)
-                            + ',' + (Math.Round(mf.ABLine.refPoint1.northing, 3)).ToString(CultureInfo.InvariantCulture);
-
-                        //write out to file
-                        writer.WriteLine(line);
-
-                        //update the list box
-                        ListViewItem itm;
-                        string[] words = line.Split(',');
-                        itm = new ListViewItem(words);
-                        lvLines.Items.Add(itm);
-
-                        // go to bottom of list - if there is a bottom
-                        if (lvLines.Items.Count > 0) lvLines.Items[lvLines.Items.Count - 1].EnsureVisible();
-                    }
-                    else
-                    {
-                        //MessageBox.Show("Currently no ABCurve name\n      create ABCurve name");
-                        var form2 = new FormTimedMessage(2000, gStr.gsNoNameEntered, gStr.gsEnterLineName);
-                        form2.Show();
-                    }
-                }
-                else
-                {
-                    //MessageBox.Show("Currently no ABCurve name\n      create ABCurve name");
-                    var form2 = new FormTimedMessage(2000, gStr.gsNoABLineActive, gStr.gsPleaseCompleteABLine);
-                    form2.Show();
-                }
-                tboxABLineName.Clear();
+                btnNewABLine.Text = "";
+                btnNewABLine.Image = Properties.Resources.AddNew;
+                ShowFullPanel(true);
+                tboxABLineName.BackColor = Color.LightGreen;
+                //create a name
+                tboxABLineName.Enabled = true;
 
-            }
-        }
+                tboxHeading.Enabled = false;
 
+                btnAddToFile.Enabled = true;
+                btnAddAndGo.Enabled = true;
 
-        private void btnListDelete_Click(object sender, EventArgs e)
-        {
-            int count = lvLines.SelectedItems.Count;
-            if (count > 0)
-            {
-                lvLines.SelectedItems[0].Remove();
+                btnAPoint.Enabled = false;
+                btnBPoint.Enabled = false;
+                btnUpABHeadingBy1.Enabled = false;
+                btnDnABHeadingBy1.Enabled = false;
+                btnNewABLine.Enabled = false;
+                btnTurnOffAB.Enabled = false;
+                btnNewABLine.Enabled = false;
+
+                lvLines.Enabled = false;
+                btnAddToFile.Focus();
+                tboxABLineName.Text = (Math.Round(glm.toDegrees(mf.ABLine.abHeading), 1)).ToString(CultureInfo.InvariantCulture) 
+                    + "\u00B0" +
+                    FindDirection(mf.ABLine.abHeading) + DateTime.Now.ToString("hh:mm:ss", CultureInfo.InvariantCulture);
             }
-            using (StreamWriter writer = new StreamWriter(filename))
+            else // or used to initiate a new line
             {
-                string words;
-                count = lvLines.Items.Count;
-                if (count > 0)
-                {
-                    for (int i = 0; i < count; i++)
-                    {
-                        words = lvLines.Items[i].SubItems[0].Text + "," +
-                                lvLines.Items[i].SubItems[1].Text + "," +
-                                lvLines.Items[i].SubItems[2].Text + "," +
-                                lvLines.Items[i].SubItems[3].Text;
-                        //out to file
-                        writer.WriteLine(words);
-                    }
-                }
-            }
-        }
+                this.tboxHeading.TextChanged -= new System.EventHandler(this.tboxHeading_TextChanged);
+                tboxHeading.Text = "";
+                this.tboxHeading.TextChanged += new System.EventHandler(this.tboxHeading_TextChanged);
+                tboxHeading.Enabled = false;
 
-        private void btnListUse_Click(object sender, EventArgs e)
-        {
-            int count = lvLines.SelectedItems.Count;
-            if (count > 0)
-            {
-                double temp = double.Parse(lvLines.SelectedItems[0].SubItems[1].Text, CultureInfo.InvariantCulture);
-                mf.ABLine.abHeading = glm.toRadians(temp);
-                temp = double.Parse(lvLines.SelectedItems[0].SubItems[2].Text, CultureInfo.InvariantCulture);
-                mf.ABLine.refPoint1.easting = temp;
-                temp = double.Parse(lvLines.SelectedItems[0].SubItems[3].Text, CultureInfo.InvariantCulture);
-                mf.ABLine.refPoint1.northing = temp;
-                mf.ABLine.SetABLineByHeading();
+                mf.ABLine.DeleteAB();
+                lvLines.SelectedItems.Clear();
+
+                btnAPoint.Enabled = true;
+                btnBPoint.Enabled = false;
+                btnUpABHeadingBy1.Enabled = false;
+                btnDnABHeadingBy1.Enabled = false;
+                btnNewABLine.Enabled = false;
+                btnTurnOffAB.Enabled = false;
 
-                //save the ABLine
-                mf.FileSaveABLine();
+                nudTramRepeats.Value = 0;
+                nudBasedOnPass.Value = 0;
 
-                mf.EnableYouTurnButtons();
-                //Go back with Line enabled
-                Close();
-            }
+                mf.ABLine.tramPassEvery = 0;
+                mf.ABLine.passBasedOn = 0;
+                mf.ABLine.isABLineSet = false;
+                mf.ABLine.isABLineLoaded = false;
 
-            //no item selected
-            else
-            {
-                return;
+                ShowFullPanel(false);
             }
         }
 
-        private void btnPlus90_Click(object sender, EventArgs e)
-        {
-            upDnHeading += 90;
-            if (upDnHeading > 359.999999) upDnHeading -= 360;
-            mf.ABLine.abHeading = glm.toRadians(upDnHeading);
-            mf.ABLine.SetABLineByHeading();
-            tboxHeading.Text = Convert.ToString(upDnHeading, CultureInfo.InvariantCulture);
-            btnABLineOk.Enabled = true;
-        }
-
         private void BtnUpABHeadingBy1_Click(object sender, EventArgs e)
         {
-            upDnHeading-=0.1;
+            mf.ABLine.moveDistance = 0;
+            upDnHeading -= 0.1;
             upDnHeading = Math.Round(upDnHeading, 1);
             if (upDnHeading < 0)
             {
@@ -366,11 +208,12 @@ private void BtnUpABHeadingBy1_Click(object sender, EventArgs e)
             }
             mf.ABLine.abHeading = glm.toRadians(upDnHeading);
             tboxHeading.Text = Convert.ToString(upDnHeading, CultureInfo.InvariantCulture);
-            btnABLineOk.Enabled = true;
         }
 
         private void BtnDnABHeadingBy1_Click(object sender, EventArgs e)
         {
+            mf.ABLine.moveDistance = 0;
+
             upDnHeading += 0.1;
             upDnHeading = Math.Round(upDnHeading, 1);
             if ((upDnHeading) > 359.9)
@@ -380,8 +223,7 @@ private void BtnDnABHeadingBy1_Click(object sender, EventArgs e)
             //upDnHeading = (int)upDnHeading;
             mf.ABLine.abHeading = glm.toRadians(upDnHeading);
             tboxHeading.Text = Convert.ToString(upDnHeading, CultureInfo.InvariantCulture);
-            btnABLineOk.Enabled = true;
-        } 
+        }
 
         private void TboxHeading_Enter(object sender, EventArgs e)
         {
@@ -402,6 +244,7 @@ private void TboxHeading_Enter(object sender, EventArgs e)
             btnTurnOffAB.Focus();
 
         }
+
         private void tboxHeading_TextChanged(object sender, EventArgs e)
         {
             var textboxSender = (TextBox)sender;
@@ -414,36 +257,206 @@ private void tboxHeading_TextChanged(object sender, EventArgs e)
             upDnHeading = double.Parse(line, CultureInfo.InvariantCulture);
             mf.ABLine.abHeading = glm.toRadians(Math.Round(upDnHeading, 6));
             mf.ABLine.SetABLineByHeading();
+            //ShowSavedPanel(true);
+            tboxABLineName.BackColor = Color.LightGreen;
         }
 
-        private void BtnShow_Click(object sender, EventArgs e)
+        private void btnAddToFile_Click(object sender, EventArgs e)
         {
-            if (this.Size.Width < 790)
+            if (mf.ABLine.isABLineSet)
             {
-                ShowSavedPanel(true);
+                if (tboxABLineName.Text.Length > 0)
+                {
+                    mf.ABLine.lineArr.Add(new CABLines());
+                    mf.ABLine.numABLines = mf.ABLine.lineArr.Count;
+                    mf.ABLine.numABLineSelected = mf.ABLine.numABLines;
+
+                    //index to last one. 
+                    int idx = mf.ABLine.lineArr.Count - 1;
+
+                    mf.ABLine.lineArr[idx].heading = mf.ABLine.abHeading;
+                    //calculate the new points for the reference line and points
+                    mf.ABLine.lineArr[idx].origin.easting = mf.ABLine.refPoint1.easting;
+                    mf.ABLine.lineArr[idx].origin.northing = mf.ABLine.refPoint1.northing;
+
+                    //sin x cos z for endpoints, opposite for additional lines
+                    mf.ABLine.lineArr[idx].ref1.easting = mf.ABLine.lineArr[idx].origin.easting - (Math.Sin(mf.ABLine.lineArr[idx].heading) * 2000.0);
+                    mf.ABLine.lineArr[idx].ref1.northing = mf.ABLine.lineArr[idx].origin.northing - (Math.Cos(mf.ABLine.lineArr[idx].heading) * 2000.0);
+                    mf.ABLine.lineArr[idx].ref2.easting = mf.ABLine.lineArr[idx].origin.easting + (Math.Sin(mf.ABLine.lineArr[idx].heading) * 2000.0);
+                    mf.ABLine.lineArr[idx].ref2.northing = mf.ABLine.lineArr[idx].origin.northing + (Math.Cos(mf.ABLine.lineArr[idx].heading) * 2000.0);
+
+
+                    mf.ABLine.lineArr[idx].Name = tboxABLineName.Text.Trim();
+
+                    //update the list box
+                    ListViewItem itm;
+                    itm = new ListViewItem(mf.ABLine.lineArr[idx].Name);
+                    lvLines.Items.Add(itm);
+
+                    // go to bottom of list - if there is a bottom
+                    if (lvLines.Items.Count > 0) lvLines.Items[lvLines.Items.Count - 1].EnsureVisible();
+
+                    mf.FileSaveABLines();
+
+                    tboxABLineName.BackColor = SystemColors.Window;
+                    tboxABLineName.Text = "";
+
+                    btnAddToFile.Enabled = false;
+                    btnAddAndGo.Enabled = false;
+                    btnNewABLine.Enabled = true;
+
+                    tboxABLineName.Enabled = false;
+                    btnTurnOffAB.Enabled = true;
+                    lvLines.Enabled = false;
+                    tboxABLineName.Enabled = false;
+                    lvLines.Enabled = true;
+                    lvLines.Focus();
+                }
+                else
+                {
+                    //MessageBox.Show("Currently no ABCurve name\n      create ABCurve name");
+                    var form2 = new FormTimedMessage(2000, gStr.gsNoNameEntered, gStr.gsEnterLineName);
+                    form2.Show();
+                }
+            }
+            else
+            {
+                //MessageBox.Show("Currently no ABCurve name\n      create ABCurve name");
+                var form2 = new FormTimedMessage(2000, gStr.gsNoABLineActive, gStr.gsPleaseCompleteABLine);
+                form2.Show();
+            }
+
+            tboxABLineName.Clear();
+        }
+
+        private void btnAddAndGo_Click(object sender, EventArgs e)
+        {
+            if (mf.ABLine.isABLineSet)
+            {
+                if (tboxABLineName.Text.Length > 0)
+                {
+                    mf.ABLine.lineArr.Add(new CABLines());
+                    mf.ABLine.numABLines = mf.ABLine.lineArr.Count;
+                    mf.ABLine.numABLineSelected = mf.ABLine.numABLines;
+
+                    //index to last one. 
+                    int idx = mf.ABLine.lineArr.Count - 1;
+
+                    mf.ABLine.lineArr[idx].heading = mf.ABLine.abHeading;
+                    //calculate the new points for the reference line and points
+                    mf.ABLine.lineArr[idx].origin.easting = mf.ABLine.refPoint1.easting;
+                    mf.ABLine.lineArr[idx].origin.northing = mf.ABLine.refPoint1.northing;
+
+                    //sin x cos z for endpoints, opposite for additional lines
+                    mf.ABLine.lineArr[idx].ref1.easting = mf.ABLine.lineArr[idx].origin.easting - (Math.Sin(mf.ABLine.lineArr[idx].heading) * 2000.0);
+                    mf.ABLine.lineArr[idx].ref1.northing = mf.ABLine.lineArr[idx].origin.northing - (Math.Cos(mf.ABLine.lineArr[idx].heading) * 2000.0);
+                    mf.ABLine.lineArr[idx].ref2.easting = mf.ABLine.lineArr[idx].origin.easting + (Math.Sin(mf.ABLine.lineArr[idx].heading) * 2000.0);
+                    mf.ABLine.lineArr[idx].ref2.northing = mf.ABLine.lineArr[idx].origin.northing + (Math.Cos(mf.ABLine.lineArr[idx].heading) * 2000.0);
+
+
+                    mf.ABLine.lineArr[idx].Name = tboxABLineName.Text.Trim();
+
+                    mf.FileSaveABLines();
+
+                    //Often only 1 ABLine so just return to field
+                    //if (mf.ABLine.numABLines == 1)
+                    mf.ABLine.abHeading = mf.ABLine.lineArr[idx].heading;
+                    mf.ABLine.refPoint1 = mf.ABLine.lineArr[idx].origin;
+                    mf.ABLine.SetABLineByHeading();
+                    mf.EnableYouTurnButtons();
+
+                    Close();//Go back with Line enabled
+                }
+                else
+                {
+                    //MessageBox.Show("Currently no ABCurve name\n      create ABCurve name");
+                    var form2 = new FormTimedMessage(2000, gStr.gsNoNameEntered, gStr.gsEnterLineName);
+                    form2.Show();
+                }
+            }
+            else
+            {
+                //MessageBox.Show("Currently no ABCurve name\n      create ABCurve name");
+                var form2 = new FormTimedMessage(2000, gStr.gsNoABLineActive, gStr.gsPleaseCompleteABLine);
+                form2.Show();
+            }
+
+            tboxABLineName.Clear();
+        }
+
+        private void btnListDelete_Click(object sender, EventArgs e)
+        {
+            if (lvLines.SelectedItems.Count > 0)
+            {
+                int num = lvLines.SelectedIndices[0];
+                mf.ABLine.lineArr.RemoveAt(num);
+                lvLines.SelectedItems[0].Remove();
+
+                mf.ABLine.numABLines = mf.ABLine.lineArr.Count;
+                if (mf.ABLine.numABLineSelected > mf.ABLine.numABLines) mf.ABLine.numABLineSelected = mf.ABLine.numABLines;
+
+                if (mf.ABLine.numABLines == 0)
+                {
+                    mf.ABLine.DeleteAB();
+                    if (mf.isAutoSteerBtnOn) mf.btnAutoSteer.PerformClick();
+                    if (mf.yt.isYouTurnBtnOn) mf.btnEnableAutoYouTurn.PerformClick();
+                }
+                mf.FileSaveABLines();
+            }
+            else
+            {
+                if (mf.isAutoSteerBtnOn) mf.btnAutoSteer.PerformClick();
+                if (mf.yt.isYouTurnBtnOn) mf.btnEnableAutoYouTurn.PerformClick();
+            }
+        }
+
+        private void btnListUse_Click(object sender, EventArgs e)
+        {
+            mf.ABLine.moveDistance = 0;
+
+            int idx = lvLines.SelectedIndices[0];
+            mf.ABLine.numABLineSelected = idx + 1;
+
+            if (lvLines.SelectedItems.Count > 0)
+            {
+                mf.ABLine.abHeading = mf.ABLine.lineArr[idx].heading;
+                mf.ABLine.refPoint1 = mf.ABLine.lineArr[idx].origin;
+
+                mf.ABLine.SetABLineByHeading();
+
+                //mf.EnableYouTurnButtons();
+
+                //Go back with Line enabled
+                Close();
             }
+
+            //no item selected
             else
             {
-                ShowSavedPanel(false);
+                return;
             }
         }
 
         private void btnTurnOffAB_Click(object sender, EventArgs e)
         {
-            mf.ABLine.isABLineSet = false;
             mf.ABLine.tramPassEvery = 0;
             mf.ABLine.passBasedOn = 0;
             mf.btnABLine.Image = Properties.Resources.ABLineOff;
             mf.ABLine.isBtnABLineOn = false;
+            mf.ABLine.isABLineSet = false;
+            mf.ABLine.isABLineLoaded = false;
+            mf.ABLine.numABLineSelected = 0;
+            if (mf.isAutoSteerBtnOn) mf.btnAutoSteer.PerformClick();
+            if (mf.yt.isYouTurnBtnOn) mf.btnEnableAutoYouTurn.PerformClick();
             Close();
-
         }
 
-    private void ShowSavedPanel(bool showPanel)
+        private void ShowFullPanel(bool showPanel)
         {
             if (showPanel)
             {
-                this.Size = new System.Drawing.Size(820, 510);
+                isFullPanel = true;
+                this.Size = new System.Drawing.Size(588, 410);
                 lvLines.Visible = true;
                 label2.Visible = true;
                 label3.Visible = true;
@@ -454,13 +467,13 @@ private void ShowSavedPanel(bool showPanel)
                 btnListDelete.Visible = true;
                 btnListUse.Visible = true;
                 btnAddToFile.Visible = true;
-                btnShow.Text = gStr.gsHide;
-                btnShow.Image = Properties.Resources.ArrowRight;
+                btnAddAndGo.Visible = true;
 
             }
             else   //hide the panel
             {
-                this.Size = new System.Drawing.Size(304, 510);
+                isFullPanel = false;
+                this.Size = new System.Drawing.Size(218, 410);
                 lvLines.Visible = false;
                 label2.Visible = false;
                 label3.Visible = false;
@@ -471,16 +484,119 @@ private void ShowSavedPanel(bool showPanel)
                 btnListDelete.Visible = false;
                 btnListUse.Visible = false;
                 btnAddToFile.Visible = false;
-                btnShow.Text = gStr.gsShow;
-                btnShow.Image = Properties.Resources.ArrowLeft;
+                btnAddAndGo.Visible = false;
+            }
+        }
+        private void timer1_Tick(object sender, EventArgs e)
+        {
+            lblFixHeading.Text = Convert.ToString(Math.Round(glm.toDegrees(mf.fixHeading), 1)) + "°";
+            lblKeepGoing.Text = "";
+
+            if (!isFullPanel)
+            {
+                //make sure we go at least 3 or so meters before allowing B reference point
+                if (!btnAPoint.Enabled && !btnBPoint.Enabled)
+                {
+                    double pointAToFixDistance =
+                    Math.Pow(mf.ABLine.refPoint1.easting - mf.pn.fix.easting, 2)
+                    + Math.Pow(mf.ABLine.refPoint1.northing - mf.pn.fix.northing, 2);
+
+                    if (pointAToFixDistance > 100) btnBPoint.Enabled = true;
+                    else lblKeepGoing.Text = Convert.ToInt16(100 - pointAToFixDistance).ToString();
+                }
+            }
+            else
+            {
+                int count = lvLines.SelectedItems.Count;
+                if (count > 0)
+                {
+                    btnListDelete.Enabled = true;
+                    btnListUse.Enabled = true;
+                }
+                else
+                {
+                    btnListDelete.Enabled = false;
+                    btnListUse.Enabled = false;
+                }
             }
         }
 
-        private void BtnGetABForm_Click(object sender, EventArgs e)
+        private string FindDirection(double heading)
         {
-            Close();
-            mf.GetAB();
-            
+            if (heading < 0) heading += glm.twoPI;
+
+            heading = glm.toDegrees(heading);
+
+            if (heading > 337.5 || heading < 22.5)
+            {
+                return " North ";
+            }
+            if (heading > 22.5 && heading < 67.5)
+            {
+                return " N_East ";
+            }
+            if (heading > 67.5 && heading < 111.5)
+            {
+                return " East ";
+            }
+            if (heading > 111.5 && heading < 157.5)
+            {
+                return " S_East ";
+            }
+            if (heading > 157.5 && heading < 202.5)
+            {
+                return " South ";
+            }
+            if (heading > 202.5 && heading < 247.5)
+            {
+                return " S_West ";
+            }
+            if (heading > 247.5 && heading < 292.5)
+            {
+                return "West";
+            }
+            if (heading > 292.5 && heading < 337.5)
+            {
+                return " N_West ";
+            }
+            return " Lost ";
+        }
+
+        private void tboxABLineName_Enter(object sender, EventArgs e)
+        {
+            tboxABLineName.Text = "";
+        }
+
+        private void FormABLine_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (this.Width < 300) e.Cancel = true;
+        }
+
+        private void nudTramRepeats_ValueChanged(object sender, EventArgs e)
+        {
+            mf.ABLine.tramPassEvery = (int)nudTramRepeats.Value;
         }
+
+        private void nudBasedOnPass_ValueChanged(object sender, EventArgs e)
+        {
+            mf.ABLine.passBasedOn = (int)nudBasedOnPass.Value;
+        }
+
+        private void lvLines_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            //mf.ABLine.numABLineSelected = idx + 1;
+
+            if (lvLines.SelectedItems.Count > 0)
+            {
+                int idx = lvLines.SelectedIndices[0];
+                mf.ABLine.abHeading = mf.ABLine.lineArr[idx].heading;
+                mf.ABLine.refPoint1 = mf.ABLine.lineArr[idx].origin;
+
+                mf.ABLine.SetABLineByHeading();
+
+            }
+            //lvLines.SelectedItems.Clear();
+        }
+
     }
-}
\ No newline at end of file
+}
diff --git a/SourceCode/GPS/Forms/FormABPick.Designer.cs b/SourceCode/GPS/Forms/FormABPick.Designer.cs
deleted file mode 100644
index f2a7452d0..000000000
--- a/SourceCode/GPS/Forms/FormABPick.Designer.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-namespace AgOpenGPS
-{
-    partial class FormABPick
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.oglSelf = new OpenTK.GLControl();
-            this.timer1 = new System.Windows.Forms.Timer(this.components);
-            this.btnExit = new System.Windows.Forms.Button();
-            this.btnMakeABLine = new System.Windows.Forms.Button();
-            this.btnMakeCurve = new System.Windows.Forms.Button();
-            this.lblLineName = new System.Windows.Forms.Label();
-            this.tboxABLineSaveName = new System.Windows.Forms.TextBox();
-            this.btnSaveABLine = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // oglSelf
-            // 
-            this.oglSelf.BackColor = System.Drawing.Color.Black;
-            this.oglSelf.Cursor = System.Windows.Forms.Cursors.Cross;
-            this.oglSelf.Location = new System.Drawing.Point(5, 6);
-            this.oglSelf.Margin = new System.Windows.Forms.Padding(0);
-            this.oglSelf.Name = "oglSelf";
-            this.oglSelf.Size = new System.Drawing.Size(700, 700);
-            this.oglSelf.TabIndex = 183;
-            this.oglSelf.VSync = false;
-            this.oglSelf.Load += new System.EventHandler(this.oglSelf_Load);
-            this.oglSelf.Paint += new System.Windows.Forms.PaintEventHandler(this.oglSelf_Paint);
-            this.oglSelf.MouseDown += new System.Windows.Forms.MouseEventHandler(this.oglSelf_MouseDown);
-            this.oglSelf.Resize += new System.EventHandler(this.oglSelf_Resize);
-            // 
-            // timer1
-            // 
-            this.timer1.Enabled = true;
-            this.timer1.Interval = 500;
-            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
-            // 
-            // btnExit
-            // 
-            this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnExit.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnExit.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnExit.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
-            this.btnExit.Image = global::AgOpenGPS.Properties.Resources.OK64;
-            this.btnExit.Location = new System.Drawing.Point(875, 623);
-            this.btnExit.Name = "btnExit";
-            this.btnExit.Size = new System.Drawing.Size(90, 82);
-            this.btnExit.TabIndex = 234;
-            this.btnExit.UseVisualStyleBackColor = true;
-            this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
-            // 
-            // btnMakeABLine
-            // 
-            this.btnMakeABLine.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnMakeABLine.BackColor = System.Drawing.Color.Lavender;
-            this.btnMakeABLine.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.btnMakeABLine.Enabled = false;
-            this.btnMakeABLine.FlatAppearance.BorderColor = System.Drawing.SystemColors.HotTrack;
-            this.btnMakeABLine.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnMakeABLine.Font = new System.Drawing.Font("Tahoma", 14.25F);
-            this.btnMakeABLine.Image = global::AgOpenGPS.Properties.Resources.ABLineOn;
-            this.btnMakeABLine.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnMakeABLine.Location = new System.Drawing.Point(733, 12);
-            this.btnMakeABLine.Name = "btnMakeABLine";
-            this.btnMakeABLine.Size = new System.Drawing.Size(94, 95);
-            this.btnMakeABLine.TabIndex = 311;
-            this.btnMakeABLine.UseVisualStyleBackColor = false;
-            // 
-            // btnMakeCurve
-            // 
-            this.btnMakeCurve.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnMakeCurve.BackColor = System.Drawing.Color.Lavender;
-            this.btnMakeCurve.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.btnMakeCurve.Enabled = false;
-            this.btnMakeCurve.FlatAppearance.BorderColor = System.Drawing.SystemColors.HotTrack;
-            this.btnMakeCurve.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnMakeCurve.Font = new System.Drawing.Font("Tahoma", 14.25F);
-            this.btnMakeCurve.Image = global::AgOpenGPS.Properties.Resources.CurveOn;
-            this.btnMakeCurve.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnMakeCurve.Location = new System.Drawing.Point(864, 12);
-            this.btnMakeCurve.Name = "btnMakeCurve";
-            this.btnMakeCurve.Size = new System.Drawing.Size(94, 95);
-            this.btnMakeCurve.TabIndex = 313;
-            this.btnMakeCurve.UseVisualStyleBackColor = false;
-            // 
-            // lblLineName
-            // 
-            this.lblLineName.Enabled = false;
-            this.lblLineName.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblLineName.Location = new System.Drawing.Point(718, 118);
-            this.lblLineName.Margin = new System.Windows.Forms.Padding(0);
-            this.lblLineName.Name = "lblLineName";
-            this.lblLineName.Size = new System.Drawing.Size(246, 39);
-            this.lblLineName.TabIndex = 314;
-            this.lblLineName.Text = "Enter Line Name";
-            this.lblLineName.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            // 
-            // tboxABLineSaveName
-            // 
-            this.tboxABLineSaveName.Enabled = false;
-            this.tboxABLineSaveName.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.tboxABLineSaveName.Location = new System.Drawing.Point(733, 164);
-            this.tboxABLineSaveName.Name = "tboxABLineSaveName";
-            this.tboxABLineSaveName.Size = new System.Drawing.Size(225, 30);
-            this.tboxABLineSaveName.TabIndex = 312;
-            this.tboxABLineSaveName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
-            // btnSaveABLine
-            // 
-            this.btnSaveABLine.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSaveABLine.BackColor = System.Drawing.Color.Lavender;
-            this.btnSaveABLine.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.btnSaveABLine.Enabled = false;
-            this.btnSaveABLine.FlatAppearance.BorderColor = System.Drawing.SystemColors.HotTrack;
-            this.btnSaveABLine.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnSaveABLine.Font = new System.Drawing.Font("Tahoma", 14.25F);
-            this.btnSaveABLine.Image = global::AgOpenGPS.Properties.Resources.FileNew;
-            this.btnSaveABLine.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnSaveABLine.Location = new System.Drawing.Point(785, 212);
-            this.btnSaveABLine.Name = "btnSaveABLine";
-            this.btnSaveABLine.Size = new System.Drawing.Size(129, 76);
-            this.btnSaveABLine.TabIndex = 319;
-            this.btnSaveABLine.UseVisualStyleBackColor = false;
-            // 
-            // FormABPick
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.SystemColors.InactiveCaption;
-            this.ClientSize = new System.Drawing.Size(974, 712);
-            this.ControlBox = false;
-            this.Controls.Add(this.btnSaveABLine);
-            this.Controls.Add(this.tboxABLineSaveName);
-            this.Controls.Add(this.btnMakeCurve);
-            this.Controls.Add(this.btnMakeABLine);
-            this.Controls.Add(this.btnExit);
-            this.Controls.Add(this.oglSelf);
-            this.Controls.Add(this.lblLineName);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "FormABPick";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "Click 2 points on the Boundary to Begin";
-            this.TopMost = true;
-            this.Load += new System.EventHandler(this.FormABPick_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private OpenTK.GLControl oglSelf;
-        private System.Windows.Forms.Timer timer1;
-        private System.Windows.Forms.Button btnExit;
-        private System.Windows.Forms.Button btnMakeABLine;
-        private System.Windows.Forms.Button btnMakeCurve;
-        private System.Windows.Forms.Label lblLineName;
-        private System.Windows.Forms.TextBox tboxABLineSaveName;
-        private System.Windows.Forms.Button btnSaveABLine;
-    }
-}
\ No newline at end of file
diff --git a/SourceCode/GPS/Forms/FormABPick.cs b/SourceCode/GPS/Forms/FormABPick.cs
deleted file mode 100644
index c3821fc51..000000000
--- a/SourceCode/GPS/Forms/FormABPick.cs
+++ /dev/null
@@ -1,627 +0,0 @@
-using OpenTK;
-using OpenTK.Graphics.OpenGL;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Globalization;
-using System.IO;
-using System.Windows.Forms;
-
-namespace AgOpenGPS
-{
-    public partial class FormABPick : Form
-    {
-        //access to the main GPS form and all its variables
-        private readonly FormGPS mf = null;
-
-        //Array of all saved lines
-        public List<CurveLinePick> curveArr = new List<CurveLinePick>();
-
-        public List<ABLinePick> lineArr = new List<ABLinePick>();
-
-        private string filename = "";
-
-        private double maxFieldX, maxFieldY, minFieldX, minFieldY, fieldCenterX, fieldCenterY, maxFieldDistance, gain = 1;
-        private Point fixPt;
-
-        private bool isA = true, isB = false;
-        public double low = 0, high = 1;
-        private int A, B, C, D, E, start=99999, end=99999;
-        //list of coordinates of boundary line
-        public List<vec3> turnLine = new List<vec3>();
-
-        private vec3[] arr;
-
-        //the click point in ogl
-        public vec3 pint = new vec3(0.0, 1.0, 0.0);
-
-        public vec2 lastABLineP2 = new vec2(0.0, 1.0);
-
-        public FormABPick(Form callingForm)
-        {
-            //get copy of the calling main form
-            mf = callingForm as FormGPS;
-
-            InitializeComponent();
-
-            lblLineName.Text = gStr.gsEnterLineName;
-        }
-
-        private void FormABPick_Load(object sender, EventArgs e)
-        {
-
-            int cnt = mf.bnd.bndArr[0].bndLine.Count;
-            arr = new vec3[cnt*2];
-
-            for (int i = 0; i < cnt; i++)
-            {
-                arr[i].easting = mf.bnd.bndArr[0].bndLine[i].easting;
-                arr[i].northing = mf.bnd.bndArr[0].bndLine[i].northing;
-                arr[i].heading = mf.bnd.bndArr[0].bndLine[i].northing;
-            }
-
-            for (int i = cnt; i < cnt*2; i++)
-            {
-                arr[i].easting = mf.bnd.bndArr[0].bndLine[i-cnt].easting;
-                arr[i].northing = mf.bnd.bndArr[0].bndLine[i-cnt].northing;
-                arr[i].heading = mf.bnd.bndArr[0].bndLine[i-cnt].heading;
-            }
-
-            curveArr.Clear();
-            LoadCurves();
-            LoadLines();
-
-        }
-
-        private void oglSelf_MouseDown(object sender, MouseEventArgs e)
-        {
-            start = 99999; end = 99999;
-
-            btnMakeABLine.Enabled = false;
-            btnMakeCurve.Enabled = false;
-            tboxABLineSaveName.Enabled = false;
-            btnSaveABLine.Enabled = false;
-
-            Point pt = oglSelf.PointToClient(Cursor.Position);
-
-            fixPt.X = pt.X - 350;
-            fixPt.Y = (700 - pt.Y - 350);
-            vec3 plotPt = new vec3
-            {
-                //convert screen coordinates to field coordinates
-                easting = ((double)fixPt.X) * (double)maxFieldDistance / 632 * gain,
-                northing = ((double)fixPt.Y) * (double)maxFieldDistance / 632.0 * gain,
-                heading = 0
-            };
-
-            plotPt.easting += fieldCenterX;
-            plotPt.northing += fieldCenterY;
-
-            pint.easting = plotPt.easting;
-            pint.northing = plotPt.northing;
-
-            if (isA)
-            {
-                double minDistA = 1000000, minDistB = 1000000;
-
-                int ptCount = arr.Length;
-
-                if (ptCount > 0)
-                {
-                    //find the closest 2 points to current fix
-                    for (int t = 0; t < ptCount; t++)
-                    {
-                        double dist = ((pint.easting - arr[t].easting) * (pint.easting - arr[t].easting))
-                                        + ((pint.northing - arr[t].northing) * (pint.northing - arr[t].northing));
-                        if (dist < minDistA)
-                        {
-                            minDistB = minDistA;
-                            B = A;
-                            minDistA = dist;
-                            A = t;
-                        }
-                        else if (dist < minDistB)
-                        {
-                            minDistB = dist;
-                            B = t;
-                        }
-                    }
-
-                    //just need to make sure the points continue ascending or heading switches all over the place
-                    if (A > B) { E = A; A = B; B = E; }
-
-                    start = A;
-                }
-
-                isA = false;
-                isB = true;
-            }
-
-
-            else if (isB)
-            {
-                double minDistA = 1000000, minDistB = 1000000;
-
-                int ptCount = arr.Length;
-
-                if (ptCount > 0)
-                {
-                    //find the closest 2 points to current fix
-                    for (int t = 0; t < ptCount; t++)
-                    {
-                        double dist = ((pint.easting - arr[t].easting) * (pint.easting - arr[t].easting))
-                                        + ((pint.northing - arr[t].northing) * (pint.northing - arr[t].northing));
-                        if (dist < minDistA)
-                        {
-                            minDistB = minDistA;
-                            D = C;
-                            minDistA = dist;
-                            C = t;
-                        }
-                        else if (dist < minDistB)
-                        {
-                            minDistB = dist;
-                            D = t;
-                        }
-                    }
-
-                    //just need to make sure the points continue ascending or heading switches all over the place
-                    if (C > D) { E = C; C = D; D = E; }
-                }
-
-                isB = false;
-                isA = true;
-                int[] dubs = new int[4];
-
-                int A1 = Math.Abs(A-C);
-                int B1 = Math.Abs(A-D);
-                int C1 = Math.Abs(B-C);
-                int D1 = Math.Abs(B-D);
-
-                if (A1 <= B1 && A1 <= C1 && A1 <= D1) { start = A; end = C; }
-                else if (B1 <= A1 && B1 <= C1 && B1 <= D1) { start = A; end = D; }
-                else if (C1 <= B1 && C1 <= A1 && C1 <= D1) { start = B; end = C; }
-                else if (D1 <= B1 && D1 <= C1 && D1 <= A1) { start = B; end = D; }
-
-
-                if (start > end) { E = start; start = end; end = E; }
-
-                btnMakeABLine.Enabled = true;
-                btnMakeCurve.Enabled = true;
-            }
-        }
-
-        private void BtnHelp_Click(object sender, EventArgs e)
-        {
-            MessageBox.Show("Click 2 Points on the boundary then Choose either AB Line or Curve \r\n " +
-                            "Enter a name and Click Save if Required.\r\n" +
-                            " Click new points make more lines");
-        }
-
-
-
-        private void LoadLines()
-        {
-            //make sure at least a global blank AB Line file exists
-            string dirField = mf.fieldsDirectory + mf.currentFieldDirectory + "\\";
-            string directoryName = Path.GetDirectoryName(dirField).ToString(CultureInfo.InvariantCulture);
-
-            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-            { Directory.CreateDirectory(directoryName); }
-
-            filename = directoryName + "\\ABLines.txt";
-
-
-            if (!File.Exists(filename))
-            {
-                using (StreamWriter writer = new StreamWriter(filename))
-                {
-                }
-            }
-
-            if (!File.Exists(filename))
-            {
-                mf.TimedMessageBox(2000, gStr.gsFileError, gStr.gsMissingABLinesFile);
-            }
-            else
-            {
-                using (StreamReader reader = new StreamReader(filename))
-                {
-                    try
-                    {
-                        string line;
-
-                        //read all the lines
-                        for (int num = 0; !reader.EndOfStream; num++)
-                        {
-                            lineArr.Add(new ABLinePick());
-
-                            line = reader.ReadLine();
-                            string[] words = line.Split(',');
-
-                            lineArr[num].Name = words[0];
-
-                            lineArr[num].heading = glm.toRadians(double.Parse(words[1], CultureInfo.InvariantCulture));
-                            lineArr[num].origin.easting = double.Parse(words[2], CultureInfo.InvariantCulture);
-                            lineArr[num].origin.northing = double.Parse(words[3], CultureInfo.InvariantCulture);
-
-                            lineArr[num].ref1.easting = lineArr[num].origin.easting - (Math.Sin(lineArr[num].heading) * 2000.0);
-                            lineArr[num].ref1.northing = lineArr[num].origin.northing - (Math.Cos(lineArr[num].heading) * 2000.0);
-
-                            lineArr[num].ref2.easting = lineArr[num].origin.easting + (Math.Sin(lineArr[num].heading) * 2000.0);
-                            lineArr[num].ref2.northing = lineArr[num].origin.northing + (Math.Cos(lineArr[num].heading) * 2000.0);
-                        }
-                    }
-                    catch (Exception er)
-                    {
-                        var form = new FormTimedMessage(2000, gStr.gsABLineFileIsCorrupt, "Please delete it!!!");
-                        form.Show();
-                        mf.WriteErrorLog("FieldOpen, Loading ABLine, Corrupt ABLine File" + er);
-                    }
-                }
-            }
-        }
-
-        private void LoadCurves()
-        {
-            //get the directory and make sure it exists, create if not
-            string dirField = mf.fieldsDirectory + mf.currentFieldDirectory + "\\";
-            string directoryName = Path.GetDirectoryName(dirField);
-
-            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-            { Directory.CreateDirectory(directoryName); }
-
-            filename = directoryName + "\\CurveLines.txt";
-
-            if (!File.Exists(filename))
-            {
-                using (StreamWriter writer = new StreamWriter(filename))
-                {
-                    writer.WriteLine("$CurveLines");
-                }
-            }
-
-            //get the file of previous AB Lines
-            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-            { Directory.CreateDirectory(directoryName); }
-            if (!File.Exists(filename))
-            {
-                mf.TimedMessageBox(2000, gStr.gsFileError, gStr.gsMissingABCurveFile);
-            }
-            else
-            {
-                using (StreamReader reader = new StreamReader(filename))
-                {
-                    try
-                    {
-                        string line;
-                        int num = 0;
-                        Random rnd = new Random();
-
-                        //read header $CurveLine
-                        line = reader.ReadLine();
-
-                        while (!reader.EndOfStream)
-                        {
-                            curveArr.Add(new CurveLinePick());
-
-                            //read header $CurveLine
-                            curveArr[num].Name = reader.ReadLine();
-                            // get the average heading
-                            line = reader.ReadLine();
-                            curveArr[num].aveHeading = double.Parse(line, CultureInfo.InvariantCulture);
-
-                            line = reader.ReadLine();
-                            int numPoints = int.Parse(line);
-
-                            if (numPoints > 1)
-                            {
-                                curveArr[num].curvePts?.Clear();
-
-                                for (int i = 0; i < numPoints; i++)
-                                {
-                                    line = reader.ReadLine();
-                                    string[] words = line.Split(',');
-                                    vec3 vecPt = new vec3(double.Parse(words[0], CultureInfo.InvariantCulture),
-                                        double.Parse(words[1], CultureInfo.InvariantCulture),
-                                        double.Parse(words[2], CultureInfo.InvariantCulture));
-                                    curveArr[num].curvePts.Add(vecPt);
-                                }
-                                num++;
-                            }
-
-                            else
-                            {
-                                if (curveArr.Count > 0)
-                                {
-                                    curveArr.RemoveAt(num);
-                                }
-                            }
-                        }
-                    }
-                    catch (Exception er)
-                    {
-                        var form = new FormTimedMessage(2000, gStr.gsCurveLineFileIsCorrupt, gStr.gsButFieldIsLoaded);
-                        form.Show();
-                        mf.WriteErrorLog("Load Curve Line" + er.ToString());
-                    }
-                }
-            }
-        }
-
-        private void btnExit_Click(object sender, EventArgs e)
-        {
-            Close();
-        }
-
-        private void oglSelf_Paint(object sender, PaintEventArgs e)
-        {
-            oglSelf.MakeCurrent();
-
-            GL.Clear(ClearBufferMask.DepthBufferBit | ClearBufferMask.ColorBufferBit);
-            GL.LoadIdentity();                  // Reset The View
-
-            CalculateMinMax();
-
-            //back the camera up
-            GL.Translate(0, 0, -maxFieldDistance * gain);
-
-            //translate to that spot in the world
-            GL.Translate(-fieldCenterX, -fieldCenterY, 0);
-
-            GL.Color3(0, 0.6, 0.4);
-
-            //draw the ABLine
-            //if (mf.ABLine.isABLineLoaded)
-            //{
-            //    //Draw reference AB line ref
-            //    GL.LineWidth(2);
-            //    GL.Enable(EnableCap.LineStipple);
-            //    GL.LineStipple(1, 0x00F0);
-            //    GL.Begin(PrimitiveType.Lines);
-            //    GL.Color3(0.9f, 0.915f, 0.17f);
-            //    GL.Vertex3(mf.ABLine.refABLineP1.easting, mf.ABLine.refABLineP1.northing, 0);
-            //    GL.Color3(0.92f, 0.95f, 0.17f);
-            //    GL.Vertex3(mf.ABLine.refABLineP2.easting, mf.ABLine.refABLineP2.northing, 0);
-            //    GL.End();
-            //    GL.Disable(EnableCap.LineStipple);
-
-            //}
-
-            //if (mf.curve.isCurveSet)
-            //{
-            //    int ptCount = mf.curve.refList.Count;
-            //    if (ptCount > 0)
-            //    {
-            //        GL.LineWidth(2);
-            //        GL.Color3(0.30f, 0.7692f, 0.760f);
-            //        GL.Begin(PrimitiveType.LineStrip);
-            //        for (int h = 0; h < ptCount; h++) GL.Vertex3(mf.curve.refList[h].easting, mf.curve.refList[h].northing, 0);
-            //        GL.End();
-            //    }
-            //}
-
-            int numLines = lineArr.Count;
-
-            if (numLines > 2)
-            {
-                GL.Enable(EnableCap.LineStipple);
-                GL.LineStipple(1, 0x00F0);
-                GL.Color3(1.0f, 0.0f, 0.0f);
-
-                for (int i = 2; i < numLines; i++)
-                {
-
-                    GL.LineWidth(4);
-                    GL.Begin(PrimitiveType.Lines);
-
-                    foreach (var item in lineArr)
-                    {
-                        GL.Vertex3(item.ref1.easting, item.ref1.northing, 0);
-                        GL.Vertex3(item.ref2.easting, item.ref2.northing, 0);
-
-                    }
-                    GL.End();
-                }
-
-                GL.Disable(EnableCap.LineStipple);
-            }
-
-
-
-            int numCurves = curveArr.Count;
-
-            if (numCurves > 0 )
-            {
-                for (int i = 0; i < numCurves; i++)
-                {
-
-                    GL.LineWidth(4);
-                    GL.Color3(0,1,0);
-                    GL.Begin(PrimitiveType.LineStrip);
-                        foreach (var item in curveArr[i].curvePts)
-                        {
-                            GL.Vertex3(item.easting, item.northing, 0);
-
-                        }
-                    GL.End();
-                }
-            }
-
-            //draw all the boundaries
-            mf.bnd.DrawBoundaryLines();
-            DrawABTouchLine();
-
-            GL.Flush();
-            oglSelf.SwapBuffers();
-        }
-
-
-        public void DrawABTouchLine()
-        {
-            GL.Color3(0.65, 0.650, 0.0);
-            GL.PointSize(8);
-            GL.Begin(PrimitiveType.Points);
-
-            GL.Color3(0.95, 0.0, 0.0);
-            if (start != 99999) GL.Vertex3(arr[A].easting, arr[A].northing, 0);
-
-            GL.Color3(0.0, 096.0, 0.0);
-            if (end != 99999) GL.Vertex3(arr[C].easting, arr[C].northing, 0);
-            GL.End();
-
-            if (end == 99999) return;
-
-            GL.LineWidth(4.0f);
-            GL.Begin(PrimitiveType.LineStrip);
-            ////draw the turn line oject
-            //int i = 0;
-            int ptCount = arr.Length;
-
-            if (ptCount < 1) return;
-
-            int h = (int)(low * ptCount);
-            ptCount = (int)(high * ptCount);
-
-            for (int c = start; c < end; c++) GL.Vertex3(arr[c].easting, arr[c].northing, 0);
-
-            GL.End();
-
-
-            GL.LineWidth(2.0f);
-            GL.Begin(PrimitiveType.Lines);
-            GL.Color3(0.95, 0.50, 0.0);
-            if (start != 99999) GL.Vertex3(arr[A].easting, arr[A].northing, 0);
-
-            GL.Color3(0.0, 0.460, 0.90);
-            if (end != 99999) GL.Vertex3(arr[C].easting, arr[C].northing, 0);
-            GL.End();
-        }
-
-        private void timer1_Tick(object sender, EventArgs e)
-        {
-            oglSelf.Refresh();
-
-            //if (start == 99999 || end == 99999)
-            //{
-            //    btnMakeABLine.Enabled = false;
-            //    btnMakeCurve.Enabled = false;
-            //}
-
-            //else
-            //{
-            //    btnMakeABLine.Enabled = true;
-            //    btnMakeCurve.Enabled = true;
-            //}
-
-            //if (String.IsNullOrEmpty(tboxABLineSaveName.Text)) btnSaveABLine.Enabled = false;
-            //else btnSaveABLine.Enabled = true;
-            //if (String.IsNullOrEmpty(tboxCurveSaveName.Text)) btnSaveABCurve.Enabled = false;
-            //else btnSaveABCurve.Enabled = true;
-        }
-
-        private void oglSelf_Resize(object sender, EventArgs e)
-        {
-            oglSelf.MakeCurrent();
-            GL.MatrixMode(MatrixMode.Projection);
-            GL.LoadIdentity();
-
-            //58 degrees view
-            Matrix4 mat = Matrix4.CreatePerspectiveFieldOfView(1.01f, 1.0f, 1.0f, 20000);
-            GL.LoadMatrix(ref mat);
-
-            GL.MatrixMode(MatrixMode.Modelview);
-        }
-
-        private void oglSelf_Load(object sender, EventArgs e)
-        {
-            oglSelf.MakeCurrent();
-            GL.Enable(EnableCap.CullFace);
-            GL.CullFace(CullFaceMode.Back);
-            GL.ClearColor(0.23122f, 0.2318f, 0.2315f, 1.0f);
-        }
-
-        //determine mins maxs of patches and whole field.
-        private void CalculateMinMax()
-        {
-            minFieldX = 9999999; minFieldY = 9999999;
-            maxFieldX = -9999999; maxFieldY = -9999999;
-
-            //draw patches j= # of sections
-            for (int j = 0; j < mf.vehicle.numSuperSection; j++)
-            {
-                //every time the section turns off and on is a new patch
-                int patchCount = mf.section[j].patchList.Count;
-
-                if (patchCount > 0)
-                {
-                    //for every new chunk of patch
-                    foreach (var triList in mf.section[j].patchList)
-                    {
-                        int count2 = triList.Count;
-                        for (int i = 0; i < count2; i += 3)
-                        {
-                            double x = triList[i].easting;
-                            double y = triList[i].northing;
-
-                            //also tally the max/min of field x and z
-                            if (minFieldX > x) minFieldX = x;
-                            if (maxFieldX < x) maxFieldX = x;
-                            if (minFieldY > y) minFieldY = y;
-                            if (maxFieldY < y) maxFieldY = y;
-                        }
-                    }
-                }
-
-                //min max of the boundary
-                if (mf.bnd.bndArr[0].isSet)
-                {
-                    int bndCnt = mf.bnd.bndArr[0].bndLine.Count;
-                    for (int i = 0; i < bndCnt; i++)
-                    {
-                        double x = mf.bnd.bndArr[0].bndLine[i].easting;
-                        double y = mf.bnd.bndArr[0].bndLine[i].northing;
-
-                        //also tally the max/min of field x and z
-                        if (minFieldX > x) minFieldX = x;
-                        if (maxFieldX < x) maxFieldX = x;
-                        if (minFieldY > y) minFieldY = y;
-                        if (maxFieldY < y) maxFieldY = y;
-                    }
-                }
-
-                if (maxFieldX == -9999999 || minFieldX == 9999999 || maxFieldY == -9999999 || minFieldY == 9999999)
-                {
-                    maxFieldX = 0; minFieldX = 0; maxFieldY = 0; minFieldY = 0;
-                }
-                else
-                {
-                    //the largest distancew across field
-                    double dist = Math.Abs(minFieldX - maxFieldX);
-                    double dist2 = Math.Abs(minFieldY - maxFieldY);
-
-                    if (dist > dist2) maxFieldDistance = dist;
-                    else maxFieldDistance = dist2;
-
-                    if (maxFieldDistance < 100) maxFieldDistance = 100;
-                    if (maxFieldDistance > 19900) maxFieldDistance = 19900;
-                    //lblMax.Text = ((int)maxFieldDistance).ToString();
-
-                    fieldCenterX = (maxFieldX + minFieldX) / 2.0;
-                    fieldCenterY = (maxFieldY + minFieldY) / 2.0;
-                }
-
-                //if (isMetric)
-                //{
-                //    lblFieldWidthEastWest.Text = Math.Abs((maxFieldX - minFieldX)).ToString("N0") + " m";
-                //    lblFieldWidthNorthSouth.Text = Math.Abs((maxFieldY - minFieldY)).ToString("N0") + " m";
-                //}
-                //else
-                //{
-                //    lblFieldWidthEastWest.Text = Math.Abs((maxFieldX - minFieldX) * glm.m2ft).ToString("N0") + " ft";
-                //    lblFieldWidthNorthSouth.Text = Math.Abs((maxFieldY - minFieldY) * glm.m2ft).ToString("N0") + " ft";
-                //}
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/SourceCode/GPS/Forms/FormABPick.resx b/SourceCode/GPS/Forms/FormABPick.resx
deleted file mode 100644
index 3a9e5f0a3..000000000
--- a/SourceCode/GPS/Forms/FormABPick.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
-  </metadata>
-</root>
\ No newline at end of file
diff --git a/SourceCode/GPS/Forms/FormFieldDir.cs b/SourceCode/GPS/Forms/FormFieldDir.cs
index 9a9321396..34b914c58 100644
--- a/SourceCode/GPS/Forms/FormFieldDir.cs
+++ b/SourceCode/GPS/Forms/FormFieldDir.cs
@@ -191,8 +191,8 @@ private void btnSave_Click(object sender, EventArgs e)
                         mf.FileCreateContour();
                         mf.FileCreateElevation();
                         mf.FileSaveFlags();
-                        mf.FileSaveABLine();
-                        mf.FileSaveCurveLine();
+                        //mf.FileSaveABLine();
+                        //mf.FileSaveCurveLine();
                         //mf.FileSaveHeadland();
                     }
                 }
diff --git a/SourceCode/GPS/Forms/FormGPS.Designer.cs b/SourceCode/GPS/Forms/FormGPS.Designer.cs
index a4c6fd56d..e9f3d9499 100644
--- a/SourceCode/GPS/Forms/FormGPS.Designer.cs
+++ b/SourceCode/GPS/Forms/FormGPS.Designer.cs
@@ -35,6 +35,7 @@ private void InitializeComponent()
             this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
             this.googleEarthOpenGLContextMenu = new System.Windows.Forms.ToolStripMenuItem();
             this.txtDistanceOffABLine = new System.Windows.Forms.TextBox();
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
             this.menustripLanguage = new System.Windows.Forms.ToolStripMenuItem();
@@ -76,7 +77,6 @@ private void InitializeComponent()
             this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
             this.simulatorOnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
-            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
             this.tmrWatchdog = new System.Windows.Forms.Timer(this.components);
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();
             this.toolStripBatman = new System.Windows.Forms.ToolStripDropDownButton();
@@ -152,8 +152,9 @@ private void InitializeComponent()
             this.btnFileExplorer = new System.Windows.Forms.Button();
             this.btnPerimeter = new System.Windows.Forms.Button();
             this.DataPage = new System.Windows.Forms.TabPage();
+            this.label17 = new System.Windows.Forms.Label();
+            this.lblMoveDistance = new System.Windows.Forms.Label();
             this.lblTimeRemaining = new System.Windows.Forms.Label();
-            this.btnTinyAutoSteerConfig = new System.Windows.Forms.Button();
             this.pbarFieldAreaRemainPercent = new System.Windows.Forms.ProgressBar();
             this.label13 = new System.Windows.Forms.Label();
             this.label12 = new System.Windows.Forms.Label();
@@ -189,12 +190,14 @@ private void InitializeComponent()
             this.label10 = new System.Windows.Forms.Label();
             this.label9 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
-            this.btnGPSData = new System.Windows.Forms.Button();
             this.lblPercentRemaining = new System.Windows.Forms.Label();
+            this.btnTinyAutoSteerConfig = new System.Windows.Forms.Button();
+            this.btnGPSData = new System.Windows.Forms.Button();
             this.cboxpRowWidth = new System.Windows.Forms.ComboBox();
             this.oglZoom = new OpenTK.GLControl();
-            this.lblFixQuality = new System.Windows.Forms.Label();
             this.panelBatman = new System.Windows.Forms.Panel();
+            this.label11 = new System.Windows.Forms.Label();
+            this.lblMoveDistanceBatman = new System.Windows.Forms.Label();
             this.label26 = new System.Windows.Forms.Label();
             this.pbarUDPSmall = new System.Windows.Forms.ProgressBar();
             this.pbarSteerSmall = new System.Windows.Forms.ProgressBar();
@@ -246,8 +249,8 @@ private void InitializeComponent()
             this.oglMain = new OpenTK.GLControl();
             this.oglBack = new OpenTK.GLControl();
             this.lblHz = new System.Windows.Forms.Label();
+            this.btnCycleLines = new System.Windows.Forms.Button();
             this.btnMakeLinesFromBoundary = new System.Windows.Forms.Button();
-            this.btnZoomExtents = new System.Windows.Forms.Button();
             this.btnZoomIn = new ProXoft.WinForms.RepeatButton();
             this.btnZoomOut = new ProXoft.WinForms.RepeatButton();
             this.btnSwapDirection = new System.Windows.Forms.Button();
@@ -323,7 +326,7 @@ private void InitializeComponent()
             this.txtDistanceOffABLine.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.txtDistanceOffABLine.Font = new System.Drawing.Font("Tahoma", 21.75F);
             this.txtDistanceOffABLine.ForeColor = System.Drawing.Color.Green;
-            this.txtDistanceOffABLine.Location = new System.Drawing.Point(579, 3);
+            this.txtDistanceOffABLine.Location = new System.Drawing.Point(616, 3);
             this.txtDistanceOffABLine.Margin = new System.Windows.Forms.Padding(0, 0, 0, 4);
             this.txtDistanceOffABLine.Name = "txtDistanceOffABLine";
             this.txtDistanceOffABLine.ReadOnly = true;
@@ -332,6 +335,21 @@ private void InitializeComponent()
             this.txtDistanceOffABLine.Text = "00000";
             this.txtDistanceOffABLine.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
+            // menuStrip1
+            // 
+            this.menuStrip1.AutoSize = false;
+            this.menuStrip1.BackColor = System.Drawing.SystemColors.ScrollBar;
+            this.menuStrip1.Font = new System.Drawing.Font("Tahoma", 22F);
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.fileToolStripMenuItem,
+            this.settingsToolStripMenuItem});
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Padding = new System.Windows.Forms.Padding(0);
+            this.menuStrip1.Size = new System.Drawing.Size(1091, 40);
+            this.menuStrip1.TabIndex = 49;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
             // fileToolStripMenuItem
             // 
             this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -348,10 +366,11 @@ private void InitializeComponent()
             this.fieldToolStripMenuItem,
             this.aboutToolStripMenuItem,
             this.shortcutKeysToolStripMenuItem});
+            this.fileToolStripMenuItem.Image = global::AgOpenGPS.Properties.Resources.fileMenu;
+            this.fileToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
             this.fileToolStripMenuItem.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(69, 40);
-            this.fileToolStripMenuItem.Text = "File";
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(108, 40);
             // 
             // toolStripSeparator9
             // 
@@ -516,10 +535,11 @@ private void InitializeComponent()
             this.toolStripSeparator6,
             this.simulatorOnToolStripMenuItem,
             this.toolStripSeparator7});
+            this.settingsToolStripMenuItem.Image = global::AgOpenGPS.Properties.Resources.displayMenu;
+            this.settingsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
             this.settingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(118, 40);
-            this.settingsToolStripMenuItem.Text = "Display";
+            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(108, 40);
             // 
             // toolStripSeparator1
             // 
@@ -664,21 +684,6 @@ private void InitializeComponent()
             this.toolStripSeparator7.Name = "toolStripSeparator7";
             this.toolStripSeparator7.Size = new System.Drawing.Size(260, 6);
             // 
-            // menuStrip1
-            // 
-            this.menuStrip1.AutoSize = false;
-            this.menuStrip1.BackColor = System.Drawing.SystemColors.ScrollBar;
-            this.menuStrip1.Font = new System.Drawing.Font("Tahoma", 22F);
-            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.fileToolStripMenuItem,
-            this.settingsToolStripMenuItem});
-            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-            this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Padding = new System.Windows.Forms.Padding(0);
-            this.menuStrip1.Size = new System.Drawing.Size(1017, 40);
-            this.menuStrip1.TabIndex = 49;
-            this.menuStrip1.Text = "menuStrip1";
-            // 
             // tmrWatchdog
             // 
             this.tmrWatchdog.Interval = 15;
@@ -703,7 +708,7 @@ private void InitializeComponent()
             this.statusStrip1.Location = new System.Drawing.Point(0, 645);
             this.statusStrip1.Name = "statusStrip1";
             this.statusStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
-            this.statusStrip1.Size = new System.Drawing.Size(1017, 56);
+            this.statusStrip1.Size = new System.Drawing.Size(1091, 56);
             this.statusStrip1.TabIndex = 95;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -848,7 +853,7 @@ private void InitializeComponent()
             this.stripEqWidth.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.stripEqWidth.Margin = new System.Windows.Forms.Padding(0);
             this.stripEqWidth.Name = "stripEqWidth";
-            this.stripEqWidth.Size = new System.Drawing.Size(331, 56);
+            this.stripEqWidth.Size = new System.Drawing.Size(270, 56);
             this.stripEqWidth.Spring = true;
             this.stripEqWidth.Text = "Width";
             // 
@@ -1078,7 +1083,7 @@ private void InitializeComponent()
             this.toolstripField.Image = global::AgOpenGPS.Properties.Resources.JobActive;
             this.toolstripField.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.toolstripField.Name = "toolstripField";
-            this.toolstripField.Size = new System.Drawing.Size(300, 70);
+            this.toolstripField.Size = new System.Drawing.Size(316, 86);
             this.toolstripField.Text = "Field";
             this.toolstripField.Click += new System.EventHandler(this.toolstripField_Click);
             // 
@@ -1089,7 +1094,7 @@ private void InitializeComponent()
             this.toolstripBoundary.Image = global::AgOpenGPS.Properties.Resources.BoundaryMenu;
             this.toolstripBoundary.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.toolstripBoundary.Name = "toolstripBoundary";
-            this.toolstripBoundary.Size = new System.Drawing.Size(300, 70);
+            this.toolstripBoundary.Size = new System.Drawing.Size(316, 86);
             this.toolstripBoundary.Text = "Boundary";
             this.toolstripBoundary.Click += new System.EventHandler(this.toolstripBoundary_Click);
             // 
@@ -1100,17 +1105,17 @@ private void InitializeComponent()
             this.toolstripResetTrip.Image = global::AgOpenGPS.Properties.Resources.Cancel64;
             this.toolstripResetTrip.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.toolstripResetTrip.Name = "toolstripResetTrip";
-            this.toolstripResetTrip.Size = new System.Drawing.Size(300, 70);
+            this.toolstripResetTrip.Size = new System.Drawing.Size(316, 86);
             this.toolstripResetTrip.Text = ">0< Trip";
             this.toolstripResetTrip.Click += new System.EventHandler(this.toolstripResetTrip_Click_1);
             // 
             // toolstripExit
             // 
             this.toolstripExit.Font = new System.Drawing.Font("Tahoma", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.toolstripExit.Image = global::AgOpenGPS.Properties.Resources.Start64;
+            this.toolstripExit.Image = global::AgOpenGPS.Properties.Resources.SwitchOff;
             this.toolstripExit.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.toolstripExit.Name = "toolstripExit";
-            this.toolstripExit.Size = new System.Drawing.Size(300, 70);
+            this.toolstripExit.Size = new System.Drawing.Size(316, 86);
             this.toolstripExit.Text = "Exit";
             this.toolstripExit.Click += new System.EventHandler(this.ToolstripExit_Click);
             // 
@@ -1154,7 +1159,7 @@ private void InitializeComponent()
             this.lblSpeed.BackColor = System.Drawing.Color.Transparent;
             this.lblSpeed.Font = new System.Drawing.Font("Tahoma", 20F, System.Drawing.FontStyle.Bold);
             this.lblSpeed.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lblSpeed.Location = new System.Drawing.Point(777, 5);
+            this.lblSpeed.Location = new System.Drawing.Point(851, 5);
             this.lblSpeed.Name = "lblSpeed";
             this.lblSpeed.Size = new System.Drawing.Size(87, 31);
             this.lblSpeed.TabIndex = 116;
@@ -1301,7 +1306,7 @@ private void InitializeComponent()
             this.lblSpeedUnits.BackColor = System.Drawing.SystemColors.ScrollBar;
             this.lblSpeedUnits.Font = new System.Drawing.Font("Tahoma", 10F, System.Drawing.FontStyle.Bold);
             this.lblSpeedUnits.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lblSpeedUnits.Location = new System.Drawing.Point(863, 13);
+            this.lblSpeedUnits.Location = new System.Drawing.Point(937, 13);
             this.lblSpeedUnits.Name = "lblSpeedUnits";
             this.lblSpeedUnits.Size = new System.Drawing.Size(38, 17);
             this.lblSpeedUnits.TabIndex = 139;
@@ -1314,7 +1319,7 @@ private void InitializeComponent()
             this.lblHeading.BackColor = System.Drawing.Color.Transparent;
             this.lblHeading.Font = new System.Drawing.Font("Tahoma", 20.25F, System.Drawing.FontStyle.Bold);
             this.lblHeading.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lblHeading.Location = new System.Drawing.Point(906, 5);
+            this.lblHeading.Location = new System.Drawing.Point(980, 5);
             this.lblHeading.Name = "lblHeading";
             this.lblHeading.Size = new System.Drawing.Size(109, 31);
             this.lblHeading.TabIndex = 117;
@@ -1391,10 +1396,10 @@ private void InitializeComponent()
             this.tabControl1.Font = new System.Drawing.Font("Tahoma", 20.25F);
             this.tabControl1.ImageList = this.imageList1;
             this.tabControl1.ItemSize = new System.Drawing.Size(110, 68);
-            this.tabControl1.Location = new System.Drawing.Point(-3, 41);
+            this.tabControl1.Location = new System.Drawing.Point(-3, 47);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(340, 601);
+            this.tabControl1.Size = new System.Drawing.Size(340, 595);
             this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.tabControl1.TabIndex = 150;
             // 
@@ -1409,7 +1414,7 @@ private void InitializeComponent()
             this.autoPage4.ImageIndex = 3;
             this.autoPage4.Location = new System.Drawing.Point(4, 72);
             this.autoPage4.Name = "autoPage4";
-            this.autoPage4.Size = new System.Drawing.Size(332, 525);
+            this.autoPage4.Size = new System.Drawing.Size(332, 519);
             this.autoPage4.TabIndex = 4;
             // 
             // nudElevation
@@ -1518,7 +1523,7 @@ private void InitializeComponent()
             this.configPage1.Location = new System.Drawing.Point(4, 72);
             this.configPage1.Name = "configPage1";
             this.configPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.configPage1.Size = new System.Drawing.Size(332, 525);
+            this.configPage1.Size = new System.Drawing.Size(332, 519);
             this.configPage1.TabIndex = 0;
             // 
             // btnFixOffset
@@ -1626,8 +1631,9 @@ private void InitializeComponent()
             // DataPage
             // 
             this.DataPage.BackColor = System.Drawing.SystemColors.ControlLight;
+            this.DataPage.Controls.Add(this.label17);
+            this.DataPage.Controls.Add(this.lblMoveDistance);
             this.DataPage.Controls.Add(this.lblTimeRemaining);
-            this.DataPage.Controls.Add(this.btnTinyAutoSteerConfig);
             this.DataPage.Controls.Add(this.pbarFieldAreaRemainPercent);
             this.DataPage.Controls.Add(this.label13);
             this.DataPage.Controls.Add(this.label12);
@@ -1667,49 +1673,55 @@ private void InitializeComponent()
             this.DataPage.Controls.Add(this.label8);
             this.DataPage.Controls.Add(this.lblEasting);
             this.DataPage.Controls.Add(this.lblNorthing);
-            this.DataPage.Controls.Add(this.btnGPSData);
             this.DataPage.Controls.Add(this.lblPercentRemaining);
+            this.DataPage.Controls.Add(this.btnTinyAutoSteerConfig);
+            this.DataPage.Controls.Add(this.btnGPSData);
             this.DataPage.Cursor = System.Windows.Forms.Cursors.Arrow;
             this.DataPage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.DataPage.ImageIndex = 1;
             this.DataPage.Location = new System.Drawing.Point(4, 72);
             this.DataPage.Name = "DataPage";
-            this.DataPage.Size = new System.Drawing.Size(332, 525);
+            this.DataPage.Size = new System.Drawing.Size(332, 519);
             this.DataPage.TabIndex = 3;
             // 
+            // label17
+            // 
+            this.label17.AutoSize = true;
+            this.label17.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold);
+            this.label17.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.label17.Location = new System.Drawing.Point(180, 322);
+            this.label17.Name = "label17";
+            this.label17.Size = new System.Drawing.Size(32, 19);
+            this.label17.TabIndex = 317;
+            this.label17.Text = "cm";
+            // 
+            // lblMoveDistance
+            // 
+            this.lblMoveDistance.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblMoveDistance.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.lblMoveDistance.Location = new System.Drawing.Point(106, 319);
+            this.lblMoveDistance.Name = "lblMoveDistance";
+            this.lblMoveDistance.Size = new System.Drawing.Size(74, 23);
+            this.lblMoveDistance.TabIndex = 314;
+            this.lblMoveDistance.Text = "0.0";
+            this.lblMoveDistance.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
             // lblTimeRemaining
             // 
             this.lblTimeRemaining.AutoSize = true;
             this.lblTimeRemaining.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold);
             this.lblTimeRemaining.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lblTimeRemaining.Location = new System.Drawing.Point(4, 426);
+            this.lblTimeRemaining.Location = new System.Drawing.Point(4, 417);
             this.lblTimeRemaining.Name = "lblTimeRemaining";
             this.lblTimeRemaining.Size = new System.Drawing.Size(106, 19);
             this.lblTimeRemaining.TabIndex = 313;
             this.lblTimeRemaining.Text = "13.56 Hours";
             // 
-            // btnTinyAutoSteerConfig
-            // 
-            this.btnTinyAutoSteerConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnTinyAutoSteerConfig.BackColor = System.Drawing.Color.Lavender;
-            this.btnTinyAutoSteerConfig.BackgroundImage = global::AgOpenGPS.Properties.Resources.AutoSteerConf;
-            this.btnTinyAutoSteerConfig.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.btnTinyAutoSteerConfig.FlatAppearance.BorderColor = System.Drawing.SystemColors.HotTrack;
-            this.btnTinyAutoSteerConfig.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnTinyAutoSteerConfig.Font = new System.Drawing.Font("Tahoma", 14.25F);
-            this.btnTinyAutoSteerConfig.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnTinyAutoSteerConfig.Location = new System.Drawing.Point(4, 461);
-            this.btnTinyAutoSteerConfig.Name = "btnTinyAutoSteerConfig";
-            this.btnTinyAutoSteerConfig.Size = new System.Drawing.Size(70, 60);
-            this.btnTinyAutoSteerConfig.TabIndex = 310;
-            this.btnTinyAutoSteerConfig.UseVisualStyleBackColor = false;
-            this.btnTinyAutoSteerConfig.Click += new System.EventHandler(this.BtnTinyAutoSteerConfig_Click);
-            // 
             // pbarFieldAreaRemainPercent
             // 
             this.pbarFieldAreaRemainPercent.BackColor = System.Drawing.Color.Maroon;
             this.pbarFieldAreaRemainPercent.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.pbarFieldAreaRemainPercent.Location = new System.Drawing.Point(6, 447);
+            this.pbarFieldAreaRemainPercent.Location = new System.Drawing.Point(6, 438);
             this.pbarFieldAreaRemainPercent.Name = "pbarFieldAreaRemainPercent";
             this.pbarFieldAreaRemainPercent.Size = new System.Drawing.Size(322, 5);
             this.pbarFieldAreaRemainPercent.Step = 1;
@@ -1721,7 +1733,7 @@ private void InitializeComponent()
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label13.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.label13.Location = new System.Drawing.Point(150, 483);
+            this.label13.Location = new System.Drawing.Point(150, 474);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(34, 13);
             this.label13.TabIndex = 309;
@@ -1732,7 +1744,7 @@ private void InitializeComponent()
             this.label12.AutoSize = true;
             this.label12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label12.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.label12.Location = new System.Drawing.Point(157, 505);
+            this.label12.Location = new System.Drawing.Point(157, 496);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(27, 13);
             this.label12.TabIndex = 308;
@@ -1743,7 +1755,7 @@ private void InitializeComponent()
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label7.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.label7.Location = new System.Drawing.Point(151, 460);
+            this.label7.Location = new System.Drawing.Point(151, 451);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(33, 13);
             this.label7.TabIndex = 307;
@@ -1754,7 +1766,7 @@ private void InitializeComponent()
             this.pbarUDPComm.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.pbarUDPComm.BackColor = System.Drawing.Color.Maroon;
             this.pbarUDPComm.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.pbarUDPComm.Location = new System.Drawing.Point(187, 506);
+            this.pbarUDPComm.Location = new System.Drawing.Point(187, 491);
             this.pbarUDPComm.Name = "pbarUDPComm";
             this.pbarUDPComm.Size = new System.Drawing.Size(60, 10);
             this.pbarUDPComm.TabIndex = 306;
@@ -1764,7 +1776,7 @@ private void InitializeComponent()
             this.pbarAutoSteerComm.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.pbarAutoSteerComm.BackColor = System.Drawing.Color.Maroon;
             this.pbarAutoSteerComm.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.pbarAutoSteerComm.Location = new System.Drawing.Point(187, 462);
+            this.pbarAutoSteerComm.Location = new System.Drawing.Point(187, 447);
             this.pbarAutoSteerComm.Name = "pbarAutoSteerComm";
             this.pbarAutoSteerComm.Size = new System.Drawing.Size(60, 10);
             this.pbarAutoSteerComm.TabIndex = 305;
@@ -1774,7 +1786,7 @@ private void InitializeComponent()
             this.pbarRelayComm.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.pbarRelayComm.BackColor = System.Drawing.Color.Maroon;
             this.pbarRelayComm.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.pbarRelayComm.Location = new System.Drawing.Point(187, 484);
+            this.pbarRelayComm.Location = new System.Drawing.Point(187, 469);
             this.pbarRelayComm.Name = "pbarRelayComm";
             this.pbarRelayComm.Size = new System.Drawing.Size(60, 10);
             this.pbarRelayComm.TabIndex = 304;
@@ -1793,7 +1805,7 @@ private void InitializeComponent()
             // 
             this.lblActualSteerAngle2.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold);
             this.lblActualSteerAngle2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lblActualSteerAngle2.Location = new System.Drawing.Point(76, 494);
+            this.lblActualSteerAngle2.Location = new System.Drawing.Point(76, 485);
             this.lblActualSteerAngle2.Margin = new System.Windows.Forms.Padding(0);
             this.lblActualSteerAngle2.Name = "lblActualSteerAngle2";
             this.lblActualSteerAngle2.Size = new System.Drawing.Size(69, 23);
@@ -1805,7 +1817,7 @@ private void InitializeComponent()
             // 
             this.lblSetpointSteerAngle2.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold);
             this.lblSetpointSteerAngle2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lblSetpointSteerAngle2.Location = new System.Drawing.Point(76, 463);
+            this.lblSetpointSteerAngle2.Location = new System.Drawing.Point(76, 454);
             this.lblSetpointSteerAngle2.Margin = new System.Windows.Forms.Padding(0);
             this.lblSetpointSteerAngle2.Name = "lblSetpointSteerAngle2";
             this.lblSetpointSteerAngle2.Size = new System.Drawing.Size(69, 23);
@@ -2114,6 +2126,34 @@ private void InitializeComponent()
             this.label8.TabIndex = 2;
             this.label8.Text = "GPS:";
             // 
+            // lblPercentRemaining
+            // 
+            this.lblPercentRemaining.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold);
+            this.lblPercentRemaining.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.lblPercentRemaining.Location = new System.Drawing.Point(240, 417);
+            this.lblPercentRemaining.Name = "lblPercentRemaining";
+            this.lblPercentRemaining.Size = new System.Drawing.Size(83, 19);
+            this.lblPercentRemaining.TabIndex = 312;
+            this.lblPercentRemaining.Text = "55.6885";
+            this.lblPercentRemaining.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // btnTinyAutoSteerConfig
+            // 
+            this.btnTinyAutoSteerConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnTinyAutoSteerConfig.BackColor = System.Drawing.Color.Lavender;
+            this.btnTinyAutoSteerConfig.BackgroundImage = global::AgOpenGPS.Properties.Resources.AutoSteerConf;
+            this.btnTinyAutoSteerConfig.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.btnTinyAutoSteerConfig.FlatAppearance.BorderColor = System.Drawing.SystemColors.HotTrack;
+            this.btnTinyAutoSteerConfig.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnTinyAutoSteerConfig.Font = new System.Drawing.Font("Tahoma", 14.25F);
+            this.btnTinyAutoSteerConfig.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.btnTinyAutoSteerConfig.Location = new System.Drawing.Point(4, 452);
+            this.btnTinyAutoSteerConfig.Name = "btnTinyAutoSteerConfig";
+            this.btnTinyAutoSteerConfig.Size = new System.Drawing.Size(70, 60);
+            this.btnTinyAutoSteerConfig.TabIndex = 310;
+            this.btnTinyAutoSteerConfig.UseVisualStyleBackColor = false;
+            this.btnTinyAutoSteerConfig.Click += new System.EventHandler(this.BtnTinyAutoSteerConfig_Click);
+            // 
             // btnGPSData
             // 
             this.btnGPSData.BackColor = System.Drawing.Color.Lavender;
@@ -2124,7 +2164,7 @@ private void InitializeComponent()
             this.btnGPSData.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnGPSData.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
             this.btnGPSData.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnGPSData.Location = new System.Drawing.Point(256, 459);
+            this.btnGPSData.Location = new System.Drawing.Point(256, 450);
             this.btnGPSData.Name = "btnGPSData";
             this.btnGPSData.Size = new System.Drawing.Size(72, 64);
             this.btnGPSData.TabIndex = 138;
@@ -2132,17 +2172,6 @@ private void InitializeComponent()
             this.btnGPSData.UseVisualStyleBackColor = false;
             this.btnGPSData.Click += new System.EventHandler(this.btnGPSData_Click);
             // 
-            // lblPercentRemaining
-            // 
-            this.lblPercentRemaining.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold);
-            this.lblPercentRemaining.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lblPercentRemaining.Location = new System.Drawing.Point(240, 426);
-            this.lblPercentRemaining.Name = "lblPercentRemaining";
-            this.lblPercentRemaining.Size = new System.Drawing.Size(83, 19);
-            this.lblPercentRemaining.TabIndex = 312;
-            this.lblPercentRemaining.Text = "55.6885";
-            this.lblPercentRemaining.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
             // cboxpRowWidth
             // 
             this.cboxpRowWidth.BackColor = System.Drawing.Color.Lavender;
@@ -2172,7 +2201,7 @@ private void InitializeComponent()
             // oglZoom
             // 
             this.oglZoom.BackColor = System.Drawing.Color.Black;
-            this.oglZoom.Location = new System.Drawing.Point(0, 2);
+            this.oglZoom.Location = new System.Drawing.Point(0, 1);
             this.oglZoom.Margin = new System.Windows.Forms.Padding(0);
             this.oglZoom.Name = "oglZoom";
             this.oglZoom.Size = new System.Drawing.Size(240, 240);
@@ -2182,23 +2211,13 @@ private void InitializeComponent()
             this.oglZoom.Paint += new System.Windows.Forms.PaintEventHandler(this.oglZoom_Paint);
             this.oglZoom.Resize += new System.EventHandler(this.oglZoom_Resize);
             // 
-            // lblFixQuality
-            // 
-            this.lblFixQuality.AutoSize = true;
-            this.lblFixQuality.BackColor = System.Drawing.Color.Transparent;
-            this.lblFixQuality.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold);
-            this.lblFixQuality.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lblFixQuality.Location = new System.Drawing.Point(365, 9);
-            this.lblFixQuality.Name = "lblFixQuality";
-            this.lblFixQuality.Size = new System.Drawing.Size(53, 25);
-            this.lblFixQuality.TabIndex = 181;
-            this.lblFixQuality.Text = "PPS";
-            // 
             // panelBatman
             // 
             this.panelBatman.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.panelBatman.BackColor = System.Drawing.SystemColors.ScrollBar;
+            this.panelBatman.Controls.Add(this.label11);
+            this.panelBatman.Controls.Add(this.lblMoveDistanceBatman);
             this.panelBatman.Controls.Add(this.label26);
             this.panelBatman.Controls.Add(this.pbarUDPSmall);
             this.panelBatman.Controls.Add(this.pbarSteerSmall);
@@ -2233,12 +2252,34 @@ private void InitializeComponent()
             this.panelBatman.Controls.Add(this.label14);
             this.panelBatman.Controls.Add(this.label20);
             this.panelBatman.Controls.Add(this.label15);
-            this.panelBatman.Location = new System.Drawing.Point(0, 40);
+            this.panelBatman.Location = new System.Drawing.Point(0, 46);
             this.panelBatman.Name = "panelBatman";
-            this.panelBatman.Size = new System.Drawing.Size(241, 600);
+            this.panelBatman.Size = new System.Drawing.Size(241, 592);
             this.panelBatman.TabIndex = 182;
             this.panelBatman.Visible = false;
             // 
+            // label11
+            // 
+            this.label11.AutoSize = true;
+            this.label11.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold);
+            this.label11.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.label11.Location = new System.Drawing.Point(132, 428);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(32, 19);
+            this.label11.TabIndex = 316;
+            this.label11.Text = "cm";
+            // 
+            // lblMoveDistanceBatman
+            // 
+            this.lblMoveDistanceBatman.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblMoveDistanceBatman.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.lblMoveDistanceBatman.Location = new System.Drawing.Point(66, 425);
+            this.lblMoveDistanceBatman.Name = "lblMoveDistanceBatman";
+            this.lblMoveDistanceBatman.Size = new System.Drawing.Size(64, 23);
+            this.lblMoveDistanceBatman.TabIndex = 315;
+            this.lblMoveDistanceBatman.Text = "0.0";
+            this.lblMoveDistanceBatman.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
             // label26
             // 
             this.label26.AutoSize = true;
@@ -2255,7 +2296,7 @@ private void InitializeComponent()
             this.pbarUDPSmall.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.pbarUDPSmall.BackColor = System.Drawing.Color.Maroon;
             this.pbarUDPSmall.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.pbarUDPSmall.Location = new System.Drawing.Point(22, 523);
+            this.pbarUDPSmall.Location = new System.Drawing.Point(22, 515);
             this.pbarUDPSmall.Name = "pbarUDPSmall";
             this.pbarUDPSmall.Size = new System.Drawing.Size(60, 10);
             this.pbarUDPSmall.TabIndex = 308;
@@ -2265,7 +2306,7 @@ private void InitializeComponent()
             this.pbarSteerSmall.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.pbarSteerSmall.BackColor = System.Drawing.Color.Maroon;
             this.pbarSteerSmall.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.pbarSteerSmall.Location = new System.Drawing.Point(22, 511);
+            this.pbarSteerSmall.Location = new System.Drawing.Point(22, 503);
             this.pbarSteerSmall.Name = "pbarSteerSmall";
             this.pbarSteerSmall.Size = new System.Drawing.Size(60, 10);
             this.pbarSteerSmall.TabIndex = 307;
@@ -2280,7 +2321,7 @@ private void InitializeComponent()
             this.btnSmallSnapRight.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnSmallSnapRight.Font = new System.Drawing.Font("Tahoma", 14.25F);
             this.btnSmallSnapRight.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnSmallSnapRight.Location = new System.Drawing.Point(128, 404);
+            this.btnSmallSnapRight.Location = new System.Drawing.Point(128, 387);
             this.btnSmallSnapRight.Name = "btnSmallSnapRight";
             this.btnSmallSnapRight.Size = new System.Drawing.Size(90, 35);
             this.btnSmallSnapRight.TabIndex = 278;
@@ -2299,7 +2340,7 @@ private void InitializeComponent()
             this.btnSmallSnapLeft.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnSmallSnapLeft.Font = new System.Drawing.Font("Tahoma", 14.25F);
             this.btnSmallSnapLeft.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnSmallSnapLeft.Location = new System.Drawing.Point(15, 404);
+            this.btnSmallSnapLeft.Location = new System.Drawing.Point(15, 387);
             this.btnSmallSnapLeft.Name = "btnSmallSnapLeft";
             this.btnSmallSnapLeft.Size = new System.Drawing.Size(91, 35);
             this.btnSmallSnapLeft.TabIndex = 277;
@@ -2318,7 +2359,7 @@ private void InitializeComponent()
             this.btnSnapRight.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnSnapRight.Font = new System.Drawing.Font("Tahoma", 14.25F);
             this.btnSnapRight.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnSnapRight.Location = new System.Drawing.Point(128, 467);
+            this.btnSnapRight.Location = new System.Drawing.Point(128, 450);
             this.btnSnapRight.Name = "btnSnapRight";
             this.btnSnapRight.Size = new System.Drawing.Size(90, 35);
             this.btnSnapRight.TabIndex = 276;
@@ -2333,7 +2374,7 @@ private void InitializeComponent()
             this.lblUturnByte.AutoSize = true;
             this.lblUturnByte.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold);
             this.lblUturnByte.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lblUturnByte.Location = new System.Drawing.Point(150, 523);
+            this.lblUturnByte.Location = new System.Drawing.Point(150, 515);
             this.lblUturnByte.Name = "lblUturnByte";
             this.lblUturnByte.Size = new System.Drawing.Size(69, 19);
             this.lblUturnByte.TabIndex = 272;
@@ -2345,7 +2386,7 @@ private void InitializeComponent()
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("Tahoma", 12F);
             this.label6.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.label6.Location = new System.Drawing.Point(94, 523);
+            this.label6.Location = new System.Drawing.Point(94, 515);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(60, 19);
             this.label6.TabIndex = 275;
@@ -2357,7 +2398,7 @@ private void InitializeComponent()
             this.lblWatch.AutoSize = true;
             this.lblWatch.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold);
             this.lblWatch.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lblWatch.Location = new System.Drawing.Point(95, 549);
+            this.lblWatch.Location = new System.Drawing.Point(95, 541);
             this.lblWatch.Name = "lblWatch";
             this.lblWatch.Size = new System.Drawing.Size(94, 13);
             this.lblWatch.TabIndex = 274;
@@ -2367,7 +2408,7 @@ private void InitializeComponent()
             // 
             this.btnStartStopNtrip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnStartStopNtrip.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnStartStopNtrip.Location = new System.Drawing.Point(10, 537);
+            this.btnStartStopNtrip.Location = new System.Drawing.Point(10, 529);
             this.btnStartStopNtrip.Name = "btnStartStopNtrip";
             this.btnStartStopNtrip.Size = new System.Drawing.Size(75, 33);
             this.btnStartStopNtrip.TabIndex = 250;
@@ -2381,7 +2422,7 @@ private void InitializeComponent()
             this.lblNTRIPSeconds.AutoSize = true;
             this.lblNTRIPSeconds.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold);
             this.lblNTRIPSeconds.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lblNTRIPSeconds.Location = new System.Drawing.Point(95, 571);
+            this.lblNTRIPSeconds.Location = new System.Drawing.Point(95, 563);
             this.lblNTRIPSeconds.Name = "lblNTRIPSeconds";
             this.lblNTRIPSeconds.Size = new System.Drawing.Size(60, 13);
             this.lblNTRIPSeconds.TabIndex = 273;
@@ -2397,7 +2438,7 @@ private void InitializeComponent()
             this.btnSnapLeft.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnSnapLeft.Font = new System.Drawing.Font("Tahoma", 14.25F);
             this.btnSnapLeft.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnSnapLeft.Location = new System.Drawing.Point(15, 467);
+            this.btnSnapLeft.Location = new System.Drawing.Point(15, 450);
             this.btnSnapLeft.Name = "btnSnapLeft";
             this.btnSnapLeft.Size = new System.Drawing.Size(91, 35);
             this.btnSnapLeft.TabIndex = 251;
@@ -2412,7 +2453,7 @@ private void InitializeComponent()
             this.lblNtripBytes.AutoSize = true;
             this.lblNtripBytes.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold);
             this.lblNtripBytes.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lblNtripBytes.Location = new System.Drawing.Point(7, 572);
+            this.lblNtripBytes.Location = new System.Drawing.Point(7, 564);
             this.lblNtripBytes.Name = "lblNtripBytes";
             this.lblNtripBytes.Size = new System.Drawing.Size(31, 13);
             this.lblNtripBytes.TabIndex = 271;
@@ -2423,7 +2464,7 @@ private void InitializeComponent()
             this.pbarNtrip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.pbarNtrip.BackColor = System.Drawing.Color.Maroon;
             this.pbarNtrip.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.pbarNtrip.Location = new System.Drawing.Point(7, 589);
+            this.pbarNtrip.Location = new System.Drawing.Point(7, 581);
             this.pbarNtrip.Maximum = 256;
             this.pbarNtrip.Name = "pbarNtrip";
             this.pbarNtrip.Size = new System.Drawing.Size(202, 8);
@@ -2578,7 +2619,7 @@ private void InitializeComponent()
             this.label20.AutoSize = true;
             this.label20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold);
             this.label20.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.label20.Location = new System.Drawing.Point(6, 521);
+            this.label20.Location = new System.Drawing.Point(6, 513);
             this.label20.Name = "label20";
             this.label20.Size = new System.Drawing.Size(15, 13);
             this.label20.TabIndex = 310;
@@ -2590,7 +2631,7 @@ private void InitializeComponent()
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold);
             this.label15.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.label15.Location = new System.Drawing.Point(6, 508);
+            this.label15.Location = new System.Drawing.Point(6, 500);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(14, 13);
             this.label15.TabIndex = 309;
@@ -2910,7 +2951,7 @@ private void InitializeComponent()
             this.oglMain.Location = new System.Drawing.Point(338, 41);
             this.oglMain.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.oglMain.Name = "oglMain";
-            this.oglMain.Size = new System.Drawing.Size(596, 601);
+            this.oglMain.Size = new System.Drawing.Size(669, 601);
             this.oglMain.TabIndex = 180;
             this.oglMain.VSync = false;
             this.oglMain.Load += new System.EventHandler(this.oglMain_Load);
@@ -2922,7 +2963,7 @@ private void InitializeComponent()
             // 
             this.oglBack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.oglBack.BackColor = System.Drawing.Color.Black;
-            this.oglBack.Location = new System.Drawing.Point(291, 111);
+            this.oglBack.Location = new System.Drawing.Point(365, 111);
             this.oglBack.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.oglBack.Name = "oglBack";
             this.oglBack.Size = new System.Drawing.Size(500, 500);
@@ -2936,13 +2977,35 @@ private void InitializeComponent()
             // 
             this.lblHz.AutoSize = true;
             this.lblHz.BackColor = System.Drawing.Color.Transparent;
-            this.lblHz.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold);
+            this.lblHz.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lblHz.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.lblHz.Location = new System.Drawing.Point(273, 9);
+            this.lblHz.Location = new System.Drawing.Point(228, 0);
             this.lblHz.Name = "lblHz";
-            this.lblHz.Size = new System.Drawing.Size(90, 25);
+            this.lblHz.Size = new System.Drawing.Size(70, 38);
             this.lblHz.TabIndex = 249;
-            this.lblHz.Text = "5 Hz 32";
+            this.lblHz.Text = "5 Hz 32\r\nPPS";
+            // 
+            // btnCycleLines
+            // 
+            this.btnCycleLines.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCycleLines.BackColor = System.Drawing.Color.Lavender;
+            this.btnCycleLines.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
+            this.btnCycleLines.Enabled = false;
+            this.btnCycleLines.FlatAppearance.BorderColor = System.Drawing.Color.RoyalBlue;
+            this.btnCycleLines.FlatAppearance.BorderSize = 3;
+            this.btnCycleLines.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnCycleLines.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold);
+            this.btnCycleLines.Image = global::AgOpenGPS.Properties.Resources.ABLineCycle;
+            this.btnCycleLines.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
+            this.btnCycleLines.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.btnCycleLines.Location = new System.Drawing.Point(921, 201);
+            this.btnCycleLines.Name = "btnCycleLines";
+            this.btnCycleLines.Size = new System.Drawing.Size(80, 80);
+            this.btnCycleLines.TabIndex = 251;
+            this.btnCycleLines.Text = "-";
+            this.btnCycleLines.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.btnCycleLines.UseVisualStyleBackColor = false;
+            this.btnCycleLines.Click += new System.EventHandler(this.btnCycleLines_Click);
             // 
             // btnMakeLinesFromBoundary
             // 
@@ -2956,7 +3019,7 @@ private void InitializeComponent()
             this.btnMakeLinesFromBoundary.Font = new System.Drawing.Font("Tahoma", 12F);
             this.btnMakeLinesFromBoundary.Image = global::AgOpenGPS.Properties.Resources.PointStart;
             this.btnMakeLinesFromBoundary.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnMakeLinesFromBoundary.Location = new System.Drawing.Point(847, 186);
+            this.btnMakeLinesFromBoundary.Location = new System.Drawing.Point(921, 94);
             this.btnMakeLinesFromBoundary.Name = "btnMakeLinesFromBoundary";
             this.btnMakeLinesFromBoundary.Size = new System.Drawing.Size(80, 80);
             this.btnMakeLinesFromBoundary.TabIndex = 250;
@@ -2964,24 +3027,6 @@ private void InitializeComponent()
             this.btnMakeLinesFromBoundary.UseVisualStyleBackColor = false;
             this.btnMakeLinesFromBoundary.Click += new System.EventHandler(this.BtnMakeLinesFromBoundary_Click);
             // 
-            // btnZoomExtents
-            // 
-            this.btnZoomExtents.BackColor = System.Drawing.Color.Lavender;
-            this.btnZoomExtents.ContextMenuStrip = this.contextMenuStripFlag;
-            this.btnZoomExtents.FlatAppearance.BorderColor = System.Drawing.SystemColors.HotTrack;
-            this.btnZoomExtents.FlatAppearance.BorderSize = 2;
-            this.btnZoomExtents.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnZoomExtents.Font = new System.Drawing.Font("Tahoma", 14.25F);
-            this.btnZoomExtents.Image = global::AgOpenGPS.Properties.Resources.Extents;
-            this.btnZoomExtents.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnZoomExtents.Location = new System.Drawing.Point(339, 476);
-            this.btnZoomExtents.Name = "btnZoomExtents";
-            this.btnZoomExtents.Size = new System.Drawing.Size(64, 64);
-            this.btnZoomExtents.TabIndex = 248;
-            this.btnZoomExtents.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.btnZoomExtents.UseVisualStyleBackColor = false;
-            this.btnZoomExtents.Click += new System.EventHandler(this.btnZoomExtents_Click);
-            // 
             // btnZoomIn
             // 
             this.btnZoomIn.BackColor = System.Drawing.Color.Lavender;
@@ -3018,7 +3063,7 @@ private void InitializeComponent()
             // 
             // btnSwapDirection
             // 
-            this.btnSwapDirection.BackColor = System.Drawing.Color.LightSkyBlue;
+            this.btnSwapDirection.BackColor = System.Drawing.Color.Indigo;
             this.btnSwapDirection.ContextMenuStrip = this.contextMenuStripFlag;
             this.btnSwapDirection.FlatAppearance.BorderColor = System.Drawing.SystemColors.HotTrack;
             this.btnSwapDirection.FlatAppearance.BorderSize = 2;
@@ -3026,10 +3071,10 @@ private void InitializeComponent()
             this.btnSwapDirection.Font = new System.Drawing.Font("Tahoma", 14.25F);
             this.btnSwapDirection.Image = global::AgOpenGPS.Properties.Resources.YouTurnReverse;
             this.btnSwapDirection.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnSwapDirection.Location = new System.Drawing.Point(565, 94);
+            this.btnSwapDirection.Location = new System.Drawing.Point(565, 111);
             this.btnSwapDirection.Margin = new System.Windows.Forms.Padding(0);
             this.btnSwapDirection.Name = "btnSwapDirection";
-            this.btnSwapDirection.Size = new System.Drawing.Size(96, 64);
+            this.btnSwapDirection.Size = new System.Drawing.Size(79, 53);
             this.btnSwapDirection.TabIndex = 179;
             this.btnSwapDirection.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.btnSwapDirection.UseVisualStyleBackColor = false;
@@ -3047,7 +3092,7 @@ private void InitializeComponent()
             this.btnContourPriority.Font = new System.Drawing.Font("Tahoma", 14.25F);
             this.btnContourPriority.Image = global::AgOpenGPS.Properties.Resources.Snap2;
             this.btnContourPriority.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnContourPriority.Location = new System.Drawing.Point(935, 43);
+            this.btnContourPriority.Location = new System.Drawing.Point(1009, 43);
             this.btnContourPriority.Name = "btnContourPriority";
             this.btnContourPriority.Size = new System.Drawing.Size(80, 80);
             this.btnContourPriority.TabIndex = 178;
@@ -3064,10 +3109,10 @@ private void InitializeComponent()
             this.btnCurve.FlatAppearance.BorderColor = System.Drawing.Color.RoyalBlue;
             this.btnCurve.FlatAppearance.BorderSize = 3;
             this.btnCurve.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnCurve.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnCurve.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnCurve.Image = global::AgOpenGPS.Properties.Resources.CurveOff;
             this.btnCurve.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnCurve.Location = new System.Drawing.Point(935, 138);
+            this.btnCurve.Location = new System.Drawing.Point(1009, 141);
             this.btnCurve.Name = "btnCurve";
             this.btnCurve.Size = new System.Drawing.Size(80, 80);
             this.btnCurve.TabIndex = 173;
@@ -3080,13 +3125,13 @@ private void InitializeComponent()
             this.btnLeftYouTurn.BackColor = System.Drawing.Color.LightSteelBlue;
             this.btnLeftYouTurn.ContextMenuStrip = this.contextMenuStripFlag;
             this.btnLeftYouTurn.Enabled = false;
-            this.btnLeftYouTurn.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold);
+            this.btnLeftYouTurn.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnLeftYouTurn.Image = global::AgOpenGPS.Properties.Resources.ArrowLeft;
             this.btnLeftYouTurn.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
             this.btnLeftYouTurn.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnLeftYouTurn.Location = new System.Drawing.Point(479, 113);
+            this.btnLeftYouTurn.Location = new System.Drawing.Point(479, 138);
             this.btnLeftYouTurn.Name = "btnLeftYouTurn";
-            this.btnLeftYouTurn.Size = new System.Drawing.Size(94, 86);
+            this.btnLeftYouTurn.Size = new System.Drawing.Size(80, 65);
             this.btnLeftYouTurn.TabIndex = 143;
             this.btnLeftYouTurn.Text = "8888 ft";
             this.btnLeftYouTurn.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -3104,9 +3149,9 @@ private void InitializeComponent()
             this.btnEnableAutoYouTurn.Font = new System.Drawing.Font("Tahoma", 14.25F);
             this.btnEnableAutoYouTurn.Image = global::AgOpenGPS.Properties.Resources.YouTurnNo;
             this.btnEnableAutoYouTurn.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnEnableAutoYouTurn.Location = new System.Drawing.Point(847, 351);
+            this.btnEnableAutoYouTurn.Location = new System.Drawing.Point(921, 366);
             this.btnEnableAutoYouTurn.Name = "btnEnableAutoYouTurn";
-            this.btnEnableAutoYouTurn.Size = new System.Drawing.Size(80, 100);
+            this.btnEnableAutoYouTurn.Size = new System.Drawing.Size(80, 80);
             this.btnEnableAutoYouTurn.TabIndex = 132;
             this.btnEnableAutoYouTurn.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.btnEnableAutoYouTurn.UseVisualStyleBackColor = false;
@@ -3124,7 +3169,7 @@ private void InitializeComponent()
             this.btnSectionOffAutoOn.Font = new System.Drawing.Font("Tahoma", 15.75F);
             this.btnSectionOffAutoOn.Image = global::AgOpenGPS.Properties.Resources.SectionMasterOff;
             this.btnSectionOffAutoOn.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnSectionOffAutoOn.Location = new System.Drawing.Point(935, 521);
+            this.btnSectionOffAutoOn.Location = new System.Drawing.Point(1009, 533);
             this.btnSectionOffAutoOn.Margin = new System.Windows.Forms.Padding(0);
             this.btnSectionOffAutoOn.Name = "btnSectionOffAutoOn";
             this.btnSectionOffAutoOn.Size = new System.Drawing.Size(80, 100);
@@ -3168,7 +3213,6 @@ private void InitializeComponent()
             // 
             // btnFlag
             // 
-            this.btnFlag.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnFlag.BackColor = System.Drawing.Color.Lavender;
             this.btnFlag.ContextMenuStrip = this.contextMenuStripFlag;
             this.btnFlag.FlatAppearance.BorderColor = System.Drawing.SystemColors.HotTrack;
@@ -3177,9 +3221,9 @@ private void InitializeComponent()
             this.btnFlag.Font = new System.Drawing.Font("Tahoma", 14.25F);
             this.btnFlag.Image = global::AgOpenGPS.Properties.Resources.FlagRed;
             this.btnFlag.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnFlag.Location = new System.Drawing.Point(847, 87);
+            this.btnFlag.Location = new System.Drawing.Point(339, 473);
             this.btnFlag.Name = "btnFlag";
-            this.btnFlag.Size = new System.Drawing.Size(80, 80);
+            this.btnFlag.Size = new System.Drawing.Size(64, 70);
             this.btnFlag.TabIndex = 121;
             this.btnFlag.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.btnFlag.UseVisualStyleBackColor = false;
@@ -3197,7 +3241,7 @@ private void InitializeComponent()
             this.btnAutoSteer.Image = global::AgOpenGPS.Properties.Resources.AutoSteerOff;
             this.btnAutoSteer.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
             this.btnAutoSteer.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnAutoSteer.Location = new System.Drawing.Point(847, 463);
+            this.btnAutoSteer.Location = new System.Drawing.Point(921, 463);
             this.btnAutoSteer.Margin = new System.Windows.Forms.Padding(0);
             this.btnAutoSteer.Name = "btnAutoSteer";
             this.btnAutoSteer.Size = new System.Drawing.Size(80, 100);
@@ -3212,13 +3256,13 @@ private void InitializeComponent()
             this.btnRightYouTurn.BackColor = System.Drawing.Color.LightSteelBlue;
             this.btnRightYouTurn.ContextMenuStrip = this.contextMenuStripFlag;
             this.btnRightYouTurn.Enabled = false;
-            this.btnRightYouTurn.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold);
+            this.btnRightYouTurn.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnRightYouTurn.Image = global::AgOpenGPS.Properties.Resources.ArrowRight;
             this.btnRightYouTurn.ImageAlign = System.Drawing.ContentAlignment.TopCenter;
             this.btnRightYouTurn.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnRightYouTurn.Location = new System.Drawing.Point(720, 113);
+            this.btnRightYouTurn.Location = new System.Drawing.Point(794, 138);
             this.btnRightYouTurn.Name = "btnRightYouTurn";
-            this.btnRightYouTurn.Size = new System.Drawing.Size(94, 86);
+            this.btnRightYouTurn.Size = new System.Drawing.Size(80, 65);
             this.btnRightYouTurn.TabIndex = 142;
             this.btnRightYouTurn.Text = "8888 ft";
             this.btnRightYouTurn.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -3234,10 +3278,10 @@ private void InitializeComponent()
             this.btnContour.FlatAppearance.BorderColor = System.Drawing.SystemColors.HotTrack;
             this.btnContour.FlatAppearance.BorderSize = 2;
             this.btnContour.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnContour.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold);
+            this.btnContour.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnContour.Image = global::AgOpenGPS.Properties.Resources.ContourOff;
             this.btnContour.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnContour.Location = new System.Drawing.Point(935, 233);
+            this.btnContour.Location = new System.Drawing.Point(1009, 239);
             this.btnContour.Name = "btnContour";
             this.btnContour.Size = new System.Drawing.Size(80, 80);
             this.btnContour.TabIndex = 105;
@@ -3257,7 +3301,7 @@ private void InitializeComponent()
             this.btnManualOffOn.Font = new System.Drawing.Font("Tahoma", 14.25F);
             this.btnManualOffOn.Image = global::AgOpenGPS.Properties.Resources.ManualOff;
             this.btnManualOffOn.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnManualOffOn.Location = new System.Drawing.Point(935, 425);
+            this.btnManualOffOn.Location = new System.Drawing.Point(1009, 435);
             this.btnManualOffOn.Name = "btnManualOffOn";
             this.btnManualOffOn.Size = new System.Drawing.Size(80, 80);
             this.btnManualOffOn.TabIndex = 98;
@@ -3276,7 +3320,7 @@ private void InitializeComponent()
             this.btnABLine.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btnABLine.Image = global::AgOpenGPS.Properties.Resources.ABLineOff;
             this.btnABLine.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.btnABLine.Location = new System.Drawing.Point(935, 329);
+            this.btnABLine.Location = new System.Drawing.Point(1009, 337);
             this.btnABLine.Name = "btnABLine";
             this.btnABLine.Size = new System.Drawing.Size(80, 80);
             this.btnABLine.TabIndex = 0;
@@ -3289,15 +3333,12 @@ private void InitializeComponent()
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.SystemColors.ScrollBar;
-            this.ClientSize = new System.Drawing.Size(1017, 701);
-            this.Controls.Add(this.tabControl1);
-            this.Controls.Add(this.panelBatman);
+            this.ClientSize = new System.Drawing.Size(1091, 701);
+            this.Controls.Add(this.lblHz);
+            this.Controls.Add(this.btnCycleLines);
             this.Controls.Add(this.btnMakeLinesFromBoundary);
-            this.Controls.Add(this.lblFixQuality);
-            this.Controls.Add(this.btnZoomExtents);
             this.Controls.Add(this.btnZoomIn);
             this.Controls.Add(this.btnZoomOut);
-            this.Controls.Add(this.lblHz);
             this.Controls.Add(this.panelSimControls);
             this.Controls.Add(this.cboxpRowWidth);
             this.Controls.Add(this.btnSwapDirection);
@@ -3333,14 +3374,16 @@ private void InitializeComponent()
             this.Controls.Add(this.btnSection10Man);
             this.Controls.Add(this.btnSection9Man);
             this.Controls.Add(this.oglMain);
+            this.Controls.Add(this.panelBatman);
             this.Controls.Add(this.oglBack);
+            this.Controls.Add(this.tabControl1);
             this.Font = new System.Drawing.Font("Tahoma", 12F);
             this.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MainMenuStrip = this.menuStrip1;
             this.MinimumSize = new System.Drawing.Size(800, 740);
             this.Name = "FormGPS";
-            this.Text = "AgOpenGPS - Be So Good They Can\'t Ignore You";
+            this.Text = "AgOpenGPS - No Field Loaded";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormGPS_FormClosing);
             this.Load += new System.EventHandler(this.FormGPS_Load);
             this.Resize += new System.EventHandler(this.FormGPS_Resize);
@@ -3466,7 +3509,6 @@ private void InitializeComponent()
         private System.Windows.Forms.Label lblLatitude;
         private System.Windows.Forms.Label label16;
         private System.Windows.Forms.Label lblAltitude;
-        private System.Windows.Forms.Label lblFixQuality;
         private System.Windows.Forms.Label lblSats;
         public System.Windows.Forms.Button btnSectionOffAutoOn;
         private System.Windows.Forms.ToolStripStatusLabel stripEqWidth;
@@ -3539,7 +3581,6 @@ private void InitializeComponent()
         private System.Windows.Forms.Label label39;
         private System.Windows.Forms.Button btnFlagsGoogleEarth;
         private System.Windows.Forms.Panel panelSimControls;
-        private System.Windows.Forms.Button btnZoomExtents;
         private System.Windows.Forms.Label lblHz;
         private System.Windows.Forms.Label label14;
         private System.Windows.Forms.Label lblpFieldAreaRemain;
@@ -3600,6 +3641,11 @@ private void InitializeComponent()
         private System.Windows.Forms.Label lblPercentRemaining;
         private System.Windows.Forms.Label lblTimeRemaining;
         public System.Windows.Forms.ToolStripMenuItem menustripLanguage;
+        private System.Windows.Forms.Label lblMoveDistance;
+        private System.Windows.Forms.Label lblMoveDistanceBatman;
+        private System.Windows.Forms.Label label17;
+        private System.Windows.Forms.Label label11;
+        public System.Windows.Forms.Button btnCycleLines;
     }
 }
 
diff --git a/SourceCode/GPS/Forms/FormGPS.cs b/SourceCode/GPS/Forms/FormGPS.cs
index c030fd783..7512174cc 100644
--- a/SourceCode/GPS/Forms/FormGPS.cs
+++ b/SourceCode/GPS/Forms/FormGPS.cs
@@ -4,10 +4,12 @@
 using OpenTK;
 using OpenTK.Graphics.OpenGL;
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
+using System.Media;
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
@@ -217,6 +219,12 @@ public partial class FormGPS : Form
         /// </summary>
         public CWorkSwitch workSwitch;
 
+        /// <summary>
+        /// Sound for approaching boundary
+        /// </summary>
+        public SoundPlayer sndBoundaryAlarm;
+
+
         #endregion // Class Props and instances
 
         // Constructor, Initializes a new instance of the "FormGPS" class.
@@ -228,7 +236,7 @@ public FormGPS()
             btnManualAutoDrive.Text = gStr.gsAbout;
 
             //file menu
-            fileToolStripMenuItem.Text = gStr.gsFile;
+            //fileToolStripMenuItem.Text = gStr.gsFile;
             setWorkingDirectoryToolStripMenuItem.Text = gStr.gsDirectories;
             enterSimCoordsToolStripMenuItem.Text = gStr.gsEnterSimCoords;
             loadVehicleToolStripMenuItem.Text = gStr.gsLoadVehicle;
@@ -239,7 +247,7 @@ public FormGPS()
             menustripLanguage.Text = gStr.gsLanguage;
                 
             //Display Menu
-            settingsToolStripMenuItem.Text = gStr.gsDisplay;
+            //settingsToolStripMenuItem.Text = gStr.gsDisplay;
             resetALLToolStripMenuItem.Text = gStr.gsResetAll;
             colorsToolStripMenuItem.Text = gStr.gsColors;
             toolStripUnitsMenu.Text = gStr.gsUnits;
@@ -400,10 +408,6 @@ private void ZoomByMouseWheel(object sender, MouseEventArgs e)
         //Initialize items before the form Loads or is visible
         private void FormGPS_Load(object sender, EventArgs e)
         {
-            //tooltips of controls
-            ToolTip ToolTip1 = new ToolTip();
-            ToolTip1.SetToolTip(btnABLine, "Set and configure\n an ABLine");
-
             this.MouseWheel += ZoomByMouseWheel;
 
             if (Settings.Default.setF_workingDirectory == "Default")
@@ -436,6 +440,17 @@ private void FormGPS_Load(object sender, EventArgs e)
                 }
             }
 
+            string directoryName = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+            string wave = Path.Combine(directoryName, "Dependencies\\Audio", "Boundary.Wav");
+            if (File.Exists(wave))
+            {
+                 sndBoundaryAlarm = new SoundPlayer(wave);
+            }
+            else
+            {
+                 sndBoundaryAlarm = new SoundPlayer(Properties.Resources.Alarm10);
+            }
+
             //grab the current vehicle filename - make sure it exists
             vehiclefileName = Vehicle.Default.setVehicle_Name;
 
@@ -631,6 +646,8 @@ private void FormGPS_Resize(object sender, EventArgs e)
         // Procedures and Functions ---------------------------------------
         public uint LoadGLTextures()
         {
+            //sndRedAlert.Play();
+
             GL.Enable(EnableCap.Texture2D);
             try
             {
@@ -839,21 +856,20 @@ private void NudElevation_ValueChanged(object sender, EventArgs e)
             sim.altitude = (double)nudElevation.Value;
         }
 
-
         public void GetAB()
         {
             curve.isOkToAddPoints = false;
-            curve.isCurveSet = false;
-            DisableYouTurnButtons();
+            //curve.isCurveSet = false;
+            //DisableYouTurnButtons();
             btnContourPriority.Enabled = false;
-            curve.isCurveBtnOn = false;
-            btnCurve.Image = Properties.Resources.CurveOff;
+            //curve.isCurveBtnOn = false;
+            //btnCurve.Image = Properties.Resources.CurveOff;
 
-            ABLine.isABLineSet = false;
+            //ABLine.isABLineSet = false;
             ABLine.tramPassEvery = 0;
             ABLine.passBasedOn = 0;
-            btnABLine.Image = Properties.Resources.ABLineOff;
-            ABLine.isBtnABLineOn = false;
+            //btnABLine.Image = Properties.Resources.ABLineOff;
+            //ABLine.isBtnABLineOn = false;
 
             if (ct.isContourBtnOn) { if (ct.isContourBtnOn) btnContour.PerformClick(); }
 
@@ -864,7 +880,13 @@ public void GetAB()
                 if (result == DialogResult.OK)
                 {
                 }
+                ABLine.moveDistance = 0;
+                curve.moveDistance = 0;
             }
+
+            if (curve.isCurveBtnOn) btnCycleLines.Text = "Cu-" + curve.numCurveLineSelected;
+            if (ABLine.isBtnABLineOn) btnCycleLines.Text = "AB-" + ABLine.numABLineSelected;
+
         }
 
         public void KeypadToNUD(NumericUpDown sender)
@@ -1037,6 +1059,7 @@ public void JobNew()
             btnContour.Enabled = true;
             btnCurve.Enabled = true;
             btnMakeLinesFromBoundary.Enabled = true;
+            btnCycleLines.Enabled = true;
 
 
             ABLine.abHeading = 0.00;
@@ -1155,6 +1178,7 @@ public void JobClose()
             ct.isContourOn = false;
 
             btnMakeLinesFromBoundary.Enabled = false;
+            btnCycleLines.Enabled = false;
 
             //AutoSteer
             btnAutoSteer.Enabled = false;
diff --git a/SourceCode/GPS/Forms/FormGPS.resx b/SourceCode/GPS/Forms/FormGPS.resx
index 2afec12a2..964aa452d 100644
--- a/SourceCode/GPS/Forms/FormGPS.resx
+++ b/SourceCode/GPS/Forms/FormGPS.resx
@@ -143,7 +143,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO
-        MgAAAk1TRnQBSQFMAgEBBAEAAYgBJAGIASQBQAEAAUABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        MgAAAk1TRnQBSQFMAgEBBAEAAZABJQGQASUBQAEAAUABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         BAABAQIAAYADAAEBAQABCAYAAYAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -361,9 +361,6 @@
         AQEY/wH+AQED/wH4AQABDxn/AQMD/wH4AQABfxn/AYcD/wH4AQEe/wH8AT8W/ws=
 </value>
   </data>
-  <metadata name="tabControl1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="oglZoom.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
diff --git a/SourceCode/GPS/Forms/FormMakeBndCon.Designer.cs b/SourceCode/GPS/Forms/FormMakeBndCon.Designer.cs
index ccadacef5..ed9d7803f 100644
--- a/SourceCode/GPS/Forms/FormMakeBndCon.Designer.cs
+++ b/SourceCode/GPS/Forms/FormMakeBndCon.Designer.cs
@@ -56,6 +56,7 @@ private void InitializeComponent()
             this.nudPass.Name = "nudPass";
             this.nudPass.Size = new System.Drawing.Size(120, 85);
             this.nudPass.TabIndex = 5;
+            this.nudPass.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.nudPass.Value = new decimal(new int[] {
             1,
             0,
@@ -93,15 +94,21 @@ private void InitializeComponent()
             // 
             this.nudSpacing.BackColor = System.Drawing.Color.AliceBlue;
             this.nudSpacing.Font = new System.Drawing.Font("Tahoma", 48F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.nudSpacing.Location = new System.Drawing.Point(37, 246);
+            this.nudSpacing.Location = new System.Drawing.Point(30, 246);
+            this.nudSpacing.Maximum = new decimal(new int[] {
+            4000,
+            0,
+            0,
+            0});
             this.nudSpacing.Minimum = new decimal(new int[] {
             1,
             0,
             0,
             0});
             this.nudSpacing.Name = "nudSpacing";
-            this.nudSpacing.Size = new System.Drawing.Size(120, 85);
+            this.nudSpacing.Size = new System.Drawing.Size(166, 85);
             this.nudSpacing.TabIndex = 252;
+            this.nudSpacing.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.nudSpacing.Value = new decimal(new int[] {
             20,
             0,
diff --git a/SourceCode/GPS/Forms/FormSettings.Designer.cs b/SourceCode/GPS/Forms/FormSettings.Designer.cs
index 75a34e457..4f25d93d3 100644
--- a/SourceCode/GPS/Forms/FormSettings.Designer.cs
+++ b/SourceCode/GPS/Forms/FormSettings.Designer.cs
@@ -101,6 +101,8 @@ private void InitializeComponent()
             this.nudSection1 = new System.Windows.Forms.NumericUpDown();
             this.label2 = new System.Windows.Forms.Label();
             this.tabGuidance = new System.Windows.Forms.TabPage();
+            this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.nudLineWidth = new System.Windows.Forms.NumericUpDown();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.nudLightbarCmPerPixel = new System.Windows.Forms.NumericUpDown();
             this.groupBox9 = new System.Windows.Forms.GroupBox();
@@ -157,6 +159,8 @@ private void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.nudSection2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.nudSection1)).BeginInit();
             this.tabGuidance.SuspendLayout();
+            this.groupBox4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.nudLineWidth)).BeginInit();
             this.groupBox2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.nudLightbarCmPerPixel)).BeginInit();
             this.groupBox9.SuspendLayout();
@@ -1440,6 +1444,7 @@ private void InitializeComponent()
             // tabGuidance
             // 
             this.tabGuidance.BackColor = System.Drawing.SystemColors.Window;
+            this.tabGuidance.Controls.Add(this.groupBox4);
             this.tabGuidance.Controls.Add(this.groupBox2);
             this.tabGuidance.Controls.Add(this.groupBox9);
             this.tabGuidance.Controls.Add(this.groupBox8);
@@ -1451,13 +1456,51 @@ private void InitializeComponent()
             this.tabGuidance.TabIndex = 13;
             this.tabGuidance.Text = " Guidance ";
             // 
+            // groupBox4
+            // 
+            this.groupBox4.Controls.Add(this.nudLineWidth);
+            this.groupBox4.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.groupBox4.Location = new System.Drawing.Point(714, 59);
+            this.groupBox4.Name = "groupBox4";
+            this.groupBox4.Size = new System.Drawing.Size(232, 172);
+            this.groupBox4.TabIndex = 124;
+            this.groupBox4.TabStop = false;
+            this.groupBox4.Text = "Guidance Line Width";
+            // 
+            // nudLineWidth
+            // 
+            this.nudLineWidth.BackColor = System.Drawing.Color.AliceBlue;
+            this.nudLineWidth.Font = new System.Drawing.Font("Tahoma", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.nudLineWidth.InterceptArrowKeys = false;
+            this.nudLineWidth.Location = new System.Drawing.Point(44, 76);
+            this.nudLineWidth.Maximum = new decimal(new int[] {
+            8,
+            0,
+            0,
+            0});
+            this.nudLineWidth.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.nudLineWidth.Name = "nudLineWidth";
+            this.nudLineWidth.Size = new System.Drawing.Size(148, 65);
+            this.nudLineWidth.TabIndex = 118;
+            this.nudLineWidth.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.nudLineWidth.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.nudLineWidth.Enter += new System.EventHandler(this.nudLineWidth_Enter);
+            // 
             // groupBox2
             // 
             this.groupBox2.Controls.Add(this.nudLightbarCmPerPixel);
             this.groupBox2.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.groupBox2.Location = new System.Drawing.Point(414, 59);
+            this.groupBox2.Location = new System.Drawing.Point(394, 59);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(341, 142);
+            this.groupBox2.Size = new System.Drawing.Size(250, 172);
             this.groupBox2.TabIndex = 123;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "cm / Lightbar Pixel";
@@ -1467,7 +1510,7 @@ private void InitializeComponent()
             this.nudLightbarCmPerPixel.BackColor = System.Drawing.Color.AliceBlue;
             this.nudLightbarCmPerPixel.Font = new System.Drawing.Font("Tahoma", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.nudLightbarCmPerPixel.InterceptArrowKeys = false;
-            this.nudLightbarCmPerPixel.Location = new System.Drawing.Point(23, 40);
+            this.nudLightbarCmPerPixel.Location = new System.Drawing.Point(26, 73);
             this.nudLightbarCmPerPixel.Maximum = new decimal(new int[] {
             20,
             0,
@@ -1494,9 +1537,9 @@ private void InitializeComponent()
             // 
             this.groupBox9.Controls.Add(this.cboxAutoSteerAuto);
             this.groupBox9.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.groupBox9.Location = new System.Drawing.Point(415, 262);
+            this.groupBox9.Location = new System.Drawing.Point(394, 288);
             this.groupBox9.Name = "groupBox9";
-            this.groupBox9.Size = new System.Drawing.Size(340, 192);
+            this.groupBox9.Size = new System.Drawing.Size(250, 192);
             this.groupBox9.TabIndex = 92;
             this.groupBox9.TabStop = false;
             this.groupBox9.Text = "Auto/Manual AutoSteer Button";
@@ -1509,7 +1552,7 @@ private void InitializeComponent()
             this.cboxAutoSteerAuto.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.cboxAutoSteerAuto.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.cboxAutoSteerAuto.Image = global::AgOpenGPS.Properties.Resources.AutoSteerOn;
-            this.cboxAutoSteerAuto.Location = new System.Drawing.Point(60, 65);
+            this.cboxAutoSteerAuto.Location = new System.Drawing.Point(60, 79);
             this.cboxAutoSteerAuto.Name = "cboxAutoSteerAuto";
             this.cboxAutoSteerAuto.Size = new System.Drawing.Size(86, 96);
             this.cboxAutoSteerAuto.TabIndex = 0;
@@ -1524,7 +1567,7 @@ private void InitializeComponent()
             this.groupBox8.Font = new System.Drawing.Font("Tahoma", 15.75F);
             this.groupBox8.Location = new System.Drawing.Point(45, 59);
             this.groupBox8.Name = "groupBox8";
-            this.groupBox8.Size = new System.Drawing.Size(317, 142);
+            this.groupBox8.Size = new System.Drawing.Size(279, 172);
             this.groupBox8.TabIndex = 91;
             this.groupBox8.TabStop = false;
             this.groupBox8.Text = "< > Snap Distance (cm)";
@@ -1534,7 +1577,7 @@ private void InitializeComponent()
             this.nudSnapDistanceSmall.BackColor = System.Drawing.Color.AliceBlue;
             this.nudSnapDistanceSmall.Font = new System.Drawing.Font("Tahoma", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.nudSnapDistanceSmall.InterceptArrowKeys = false;
-            this.nudSnapDistanceSmall.Location = new System.Drawing.Point(23, 40);
+            this.nudSnapDistanceSmall.Location = new System.Drawing.Point(23, 73);
             this.nudSnapDistanceSmall.Maximum = new decimal(new int[] {
             500,
             0,
@@ -1556,9 +1599,9 @@ private void InitializeComponent()
             // 
             this.groupBox1.Controls.Add(this.nudSnapDistance);
             this.groupBox1.Font = new System.Drawing.Font("Tahoma", 15.75F);
-            this.groupBox1.Location = new System.Drawing.Point(45, 262);
+            this.groupBox1.Location = new System.Drawing.Point(45, 288);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(317, 142);
+            this.groupBox1.Size = new System.Drawing.Size(279, 168);
             this.groupBox1.TabIndex = 90;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "<< >> Snap Distance";
@@ -1568,7 +1611,7 @@ private void InitializeComponent()
             this.nudSnapDistance.BackColor = System.Drawing.Color.AliceBlue;
             this.nudSnapDistance.Font = new System.Drawing.Font("Tahoma", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.nudSnapDistance.InterceptArrowKeys = false;
-            this.nudSnapDistance.Location = new System.Drawing.Point(23, 32);
+            this.nudSnapDistance.Location = new System.Drawing.Point(23, 73);
             this.nudSnapDistance.Maximum = new decimal(new int[] {
             500,
             0,
@@ -1833,6 +1876,8 @@ private void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.nudSection2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.nudSection1)).EndInit();
             this.tabGuidance.ResumeLayout(false);
+            this.groupBox4.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.nudLineWidth)).EndInit();
             this.groupBox2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.nudLightbarCmPerPixel)).EndInit();
             this.groupBox9.ResumeLayout(false);
@@ -1947,5 +1992,7 @@ private void InitializeComponent()
         private System.Windows.Forms.NumericUpDown nudLightbarCmPerPixel;
         private System.Windows.Forms.Label label25;
         private System.Windows.Forms.ComboBox cboxNumSections;
+        private System.Windows.Forms.NumericUpDown nudLineWidth;
+        private System.Windows.Forms.GroupBox groupBox4;
     }
 }
\ No newline at end of file
diff --git a/SourceCode/GPS/Forms/FormSettings.cs b/SourceCode/GPS/Forms/FormSettings.cs
index 055d9194e..3618592c2 100644
--- a/SourceCode/GPS/Forms/FormSettings.cs
+++ b/SourceCode/GPS/Forms/FormSettings.cs
@@ -119,6 +119,7 @@ public FormSettings(Form callingForm, int page)
             nudTankHitch.Controls[0].Enabled = false;
             nudTurnOffDelay.Controls[0].Enabled = false;
             nudWheelbase.Controls[0].Enabled = false;
+            nudLineWidth.Controls[0].Enabled = false;
 
             if (mf.isMetric)
             {
@@ -204,8 +205,6 @@ private void FormSettings_Load(object sender, EventArgs e)
 
             numberOfSections = Properties.Vehicle.Default.setVehicle_numSections;
             temp = numberOfSections;
-            //if (nudNumberOfSections.CheckValue(ref temp)) nudNumberOfSections.BackColor = System.Drawing.Color.OrangeRed;
-            //numberOfSections = (int)temp;
 
             cutoffSpeed = Properties.Vehicle.Default.setVehicle_slowSpeedCutoff / cutoffMetricImperial;
             temp = (decimal)cutoffSpeed;
@@ -338,11 +337,6 @@ private void FormSettings_Load(object sender, EventArgs e)
             nudLookAhead.Value = (decimal)(toolLookAhead);
             nudLookAhead.ValueChanged += nudLookAhead_ValueChanged;
 
-            //grab number of sections
-            //nudNumberOfSections.ValueChanged -= nudNumberOfSections_ValueChanged;
-            //nudNumberOfSections.Value = numberOfSections;
-            //nudNumberOfSections.ValueChanged += nudNumberOfSections_ValueChanged;
-
             cboxNumSections.Text = numberOfSections.ToString();
 
             //calc the 8 section widths based on settings.settings also meters to inches
@@ -388,6 +382,8 @@ private void FormSettings_Load(object sender, EventArgs e)
             nudCutoffSpeed.ValueChanged -= nudCutoffSpeed_ValueChanged;
             nudCutoffSpeed.Value = (decimal)cutoffSpeed;
             nudCutoffSpeed.ValueChanged += nudCutoffSpeed_ValueChanged;
+
+            nudLineWidth.Value = Properties.Settings.Default.setDisplay_lineWidth;                
         }
 
         private void btnOK_Click(object sender, EventArgs e)
@@ -514,6 +510,9 @@ private void btnOK_Click(object sender, EventArgs e)
             Properties.Vehicle.Default.setVehicle_slowSpeedCutoff = cutoffSpeed * cutoffMetricImperial;
             mf.vehicle.slowSpeedCutoff = cutoffSpeed * cutoffMetricImperial;
 
+            Properties.Settings.Default.setDisplay_lineWidth = (int)(nudLineWidth.Value);
+            mf.ABLine.lineWidth = (float)(nudLineWidth.Value);
+
             Properties.Settings.Default.Save();
             Properties.Vehicle.Default.Save();
 
@@ -720,6 +719,12 @@ private void NudLightbarCmPerPixel_Enter(object sender, EventArgs e)
             btnCancel.Focus();
         }
 
+        private void nudLineWidth_Enter(object sender, EventArgs e)
+        {
+            mf.KeypadToNUD((NumericUpDown)sender);
+            btnCancel.Focus();
+        }
+
         private void CboxNumSections_SelectedIndexChanged(object sender, EventArgs e)
         {
             numberOfSections = cboxNumSections.SelectedIndex + 1;
diff --git a/SourceCode/GPS/Forms/FormShortcutKeys.Designer.cs b/SourceCode/GPS/Forms/FormShortcutKeys.Designer.cs
index dd8628a6c..8b2bda481 100644
--- a/SourceCode/GPS/Forms/FormShortcutKeys.Designer.cs
+++ b/SourceCode/GPS/Forms/FormShortcutKeys.Designer.cs
@@ -28,9 +28,9 @@ protected override void Dispose(bool disposing)
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormShortcutKeys));
             this.textBox1 = new System.Windows.Forms.TextBox();
             this.textBox2 = new System.Windows.Forms.TextBox();
-            this.btnExit = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
             // textBox1
@@ -39,57 +39,44 @@ private void InitializeComponent()
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.textBox1.BackColor = System.Drawing.Color.AliceBlue;
-            this.textBox1.Font = new System.Drawing.Font("Tahoma", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBox1.Location = new System.Drawing.Point(56, 10);
+            this.textBox1.Font = new System.Drawing.Font("Tahoma", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.textBox1.Location = new System.Drawing.Point(153, 10);
             this.textBox1.Margin = new System.Windows.Forms.Padding(5);
             this.textBox1.Multiline = true;
             this.textBox1.Name = "textBox1";
             this.textBox1.ReadOnly = true;
-            this.textBox1.Size = new System.Drawing.Size(281, 434);
+            this.textBox1.Size = new System.Drawing.Size(245, 719);
             this.textBox1.TabIndex = 2;
-            this.textBox1.Text = "Auto Section On Off\r\n\r\nAuto Steer On Off\r\nAuto Steer Config\r\nAuto Steer Chart\r\n\r\n" +
-    "Field Open/Close\r\nSnap\r\nFlag Mark\r\n\r\nUTurn Settings\r\nVehicle Settings";
+            this.textBox1.Text = resources.GetString("textBox1.Text");
             // 
             // textBox2
             // 
             this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.textBox2.BackColor = System.Drawing.Color.AliceBlue;
-            this.textBox2.Font = new System.Drawing.Font("Tahoma", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.textBox2.Font = new System.Drawing.Font("Tahoma", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.textBox2.Location = new System.Drawing.Point(14, 10);
             this.textBox2.Margin = new System.Windows.Forms.Padding(5);
             this.textBox2.Multiline = true;
             this.textBox2.Name = "textBox2";
             this.textBox2.ReadOnly = true;
-            this.textBox2.Size = new System.Drawing.Size(37, 434);
+            this.textBox2.Size = new System.Drawing.Size(129, 719);
             this.textBox2.TabIndex = 1;
-            this.textBox2.Text = "D\r\n\r\nA\r\nS\r\nC\r\n\r\nF\r\nP\r\nG\r\n\r\nU\r\nV";
-            // 
-            // btnExit
-            // 
-            this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnExit.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnExit.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnExit.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
-            this.btnExit.Image = global::AgOpenGPS.Properties.Resources.Cancel64;
-            this.btnExit.Location = new System.Drawing.Point(240, 464);
-            this.btnExit.Name = "btnExit";
-            this.btnExit.Size = new System.Drawing.Size(97, 70);
-            this.btnExit.TabIndex = 0;
-            this.btnExit.UseVisualStyleBackColor = true;
-            this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
+            this.textBox2.Text = "N\r\nM\r\n\r\nA\r\nS\r\nC\r\n\r\nF\r\nP\r\nG\r\n\r\nU\r\nV\r\nNumPad 0\r\nNumPad 1\r\n\r\n\r\nUp\r\nDown\r\nLeft\r\nRight" +
+    "\r\nPeriod .\r\n?\r\nL";
+            this.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             // 
             // FormShortcutKeys
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 23F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(351, 546);
-            this.ControlBox = false;
-            this.Controls.Add(this.btnExit);
+            this.ClientSize = new System.Drawing.Size(402, 733);
             this.Controls.Add(this.textBox2);
             this.Controls.Add(this.textBox1);
             this.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Margin = new System.Windows.Forms.Padding(5);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
             this.Name = "FormShortcutKeys";
             this.ShowInTaskbar = false;
             this.Text = "Shortcut Keys";
@@ -103,6 +90,5 @@ private void InitializeComponent()
 
         private System.Windows.Forms.TextBox textBox1;
         private System.Windows.Forms.TextBox textBox2;
-        private System.Windows.Forms.Button btnExit;
     }
 }
\ No newline at end of file
diff --git a/SourceCode/GPS/Forms/FormShortcutKeys.resx b/SourceCode/GPS/Forms/FormShortcutKeys.resx
index 1af7de150..b18a0ce6b 100644
--- a/SourceCode/GPS/Forms/FormShortcutKeys.resx
+++ b/SourceCode/GPS/Forms/FormShortcutKeys.resx
@@ -117,4 +117,30 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="textBox1.Text" xml:space="preserve">
+    <value>Auto Section On/Off
+Manual On/Off
+
+Auto Steer On/Off
+Auto Steer Config
+Auto Steer Chart
+
+Field Open/Close
+Snap
+Flag Mark
+
+UTurn Settings
+Vehicle Settings
+Section Auto On/Off
+Manual On/Off
+
+Sim Controls:
+Speed Up
+Slow Down
+Turn Left
+Turn Right
+Stop
+Go Straight
+Reset Sim</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/SourceCode/GPS/Forms/FormSmoothAB.cs b/SourceCode/GPS/Forms/FormSmoothAB.cs
index 10a52529e..2750ee529 100644
--- a/SourceCode/GPS/Forms/FormSmoothAB.cs
+++ b/SourceCode/GPS/Forms/FormSmoothAB.cs
@@ -63,7 +63,7 @@ private void btnSave_Click(object sender, EventArgs e)
             mf.curve.isSmoothWindowOpen = false;
             mf.curve.SaveSmoothAsRefList();
             mf.curve.smooList?.Clear();
-            mf.FileSaveCurveLine();
+            //mf.FileSaveCurveLine();
             Close();
         }
     }
diff --git a/SourceCode/GPS/Forms/GUI.Designer.cs b/SourceCode/GPS/Forms/GUI.Designer.cs
index 41a006ee4..1a6555bbf 100644
--- a/SourceCode/GPS/Forms/GUI.Designer.cs
+++ b/SourceCode/GPS/Forms/GUI.Designer.cs
@@ -150,66 +150,101 @@ private void ManualAllBtnsUpdate()
 
         //hide the left panel
         public void SwapBatmanPanels()
-        {
-            if (Properties.Settings.Default.setDisplay_isLargePanel)
-            {
-                //Batman mini-panel shows
-                panelSimControls.Left = 245;
-                oglMain.Left = 240;
-                oglMain.Width = Width - 240 - 102;
-                btnpTiltDown.Left = 245;
-                btnpTiltUp.Left = 245;
-                btnZoomIn.Left = 245;
-                btnZoomOut.Left = 245;
-                btnZoomExtents.Left = 245;
-                cboxpRowWidth.Left = 245;
-                txtDistanceOffABLine.Left = (Width - 245 - 100) / 2 + 185;
-                btnSwapDirection.Left = (Width - 245 - 100) / 2 + 190;
-                panelBatman.Visible = true;
-                tabControl1.Visible = false;
-                Properties.Settings.Default.setDisplay_isLargePanel = false;
+        {                
+            if (Properties.Settings.Default.setDisplay_panelStatus++ > 1) Properties.Settings.Default.setDisplay_panelStatus = 0;
                 Properties.Settings.Default.Save();
-                LineUpManualBtns();
-            }
-            else
-            {
-                //Big tab will be visible
-                panelSimControls.Left = 345;
-                oglMain.Left = 340;
-                oglMain.Width = Width - 340 - 102;
-                btnpTiltDown.Left = 345;
-                btnpTiltUp.Left = 345;
-                btnZoomIn.Left = 345;
-                btnZoomOut.Left = 345;
-                btnZoomExtents.Left = 345;
-                cboxpRowWidth.Left = 345;
-                txtDistanceOffABLine.Left = (Width - 345 - 100)/2 + 287;
-                btnSwapDirection.Left = (Width - 345 - 100) / 2 + 292;
-                txtDistanceOffABLine.Top = -1;
-                tabControl1.SelectedIndex = 2;
-                panelBatman.Visible = false;
-                tabControl1.Visible = true;
-                Properties.Settings.Default.setDisplay_isLargePanel = true;
-                Properties.Settings.Default.Save();
-                LineUpManualBtns();
 
+            switch (Properties.Settings.Default.setDisplay_panelStatus)
+            {
+                case 0:
+                    //no side panel
+                    panelSimControls.Left = 0;
+                    oglMain.Left = 5;
+                    oglMain.Width = Width - 107;
+                    btnpTiltDown.Left = 8;
+                    btnpTiltUp.Left = 8;
+                    btnZoomIn.Left = 8;
+                    btnZoomOut.Left = 8;
+                    btnFlag.Left = 8;
+                    cboxpRowWidth.Left = 8;
+                    txtDistanceOffABLine.Left = (Width - 200) / 2;
+                    txtDistanceOffABLine.Top = -1;
+                    panelBatman.Visible = false;
+                    tabControl1.Visible = false;
+                    LineUpManualBtns();
+
+                    break;
+
+                case 1:
+                    //Batman mini-panel shows
+                    panelSimControls.Left = 245;
+                    oglMain.Left = 240;
+                    oglMain.Width = Width - 240 - 102;
+                    btnpTiltDown.Left = 245;
+                    btnpTiltUp.Left = 245;
+                    btnZoomIn.Left = 245;
+                    btnZoomOut.Left = 245;
+                    btnFlag.Left = 245;
+                    cboxpRowWidth.Left = 245;
+                    txtDistanceOffABLine.Left = (Width - 245 - 100) / 2 + 185;
+                    btnSwapDirection.Left = (Width - 245 - 100) / 2 + 190;
+                    panelBatman.Visible = true;
+                    tabControl1.Visible = false;
+                    LineUpManualBtns();
+                    break;
+
+                case 2:
+                    //Big tab will be visible
+                    panelSimControls.Left = 345;
+                    oglMain.Left = 340;
+                    oglMain.Width = Width - 340 - 102;
+                    btnpTiltDown.Left = 345;
+                    btnpTiltUp.Left = 345;
+                    btnZoomIn.Left = 345;
+                    btnZoomOut.Left = 345;
+                    btnFlag.Left = 345;
+                    cboxpRowWidth.Left = 345;
+                    txtDistanceOffABLine.Left = (Width - 345 - 100) / 2 + 287;
+                    btnSwapDirection.Left = (Width - 345 - 100) / 2 + 292;
+                    txtDistanceOffABLine.Top = -1;
+                    tabControl1.SelectedIndex = 2;
+                    panelBatman.Visible = false;
+                    tabControl1.Visible = true;
+                    LineUpManualBtns();
+                    break;
+
+
+                default:
+                    break;
             }
         }
 
         //line up section On Off Auto buttons based on how many there are
         public void LineUpManualBtns()
         {
+            int first2Thirds = 0;
+
             if (tabControl1.Visible)
             {
-                btnRightYouTurn.Left = (Width - 440) / 2 + 475;
-                btnLeftYouTurn.Left = (Width - 440) / 2 + 115;
-                btnSwapDirection.Left = (Width - 440) / 2 + 292;
+                btnRightYouTurn.Left = (Width + 450) / 2;
+                btnLeftYouTurn.Left = (Width - 135) / 2;
+                btnSwapDirection.Left = (Width - 440) / 2 + 302;
+                first2Thirds = (Width - 535) / 2 + 385;
             }
+            else if (panelBatman.Visible)
+            {
+                btnRightYouTurn.Left = (Width+350) / 2 ;
+                btnLeftYouTurn.Left = (Width-240) / 2;
+                btnSwapDirection.Left = (Width - 340) / 2 + 200;
+                first2Thirds = (Width - 395) / 2 + 260;
+            }
+
             else
             {
-                btnRightYouTurn.Left = (Width-340) / 2 + 362;
-                btnLeftYouTurn.Left = (Width-340) / 2 + 10;
-                btnSwapDirection.Left = (Width - 340) / 2 + 190;
+                btnRightYouTurn.Left = (Width+140) / 2;
+                btnLeftYouTurn.Left = (Width-500) / 2;
+                btnSwapDirection.Left = (Width-185) / 2;
+                first2Thirds = (Width - 118) / 2;
             }
 
             int top = 0;
@@ -232,9 +267,6 @@ public void LineUpManualBtns()
             btnSection7Man.Top = Height - top;
             btnSection8Man.Top = Height - top;
 
-            int first2Thirds;
-            if (tabControl1.Visible) first2Thirds = (Width - 535) / 2 + 385;
-            else first2Thirds = (Width-395) / 2 + 260;
 
             int even = 60;
             int offset = 7;
@@ -987,6 +1019,8 @@ private void btnAutoSteer_Click(object sender, EventArgs e)
 
         private void BtnMakeLinesFromBoundary_Click(object sender, EventArgs e)
         {
+            if (ct.isContourBtnOn) return;
+
             if (!bnd.bndArr[0].isSet)
             {
                 TimedMessageBox(2000, gStr.gsNoBoundary, gStr.gsCreateABoundaryFirst);
@@ -995,9 +1029,44 @@ private void BtnMakeLinesFromBoundary_Click(object sender, EventArgs e)
 
             GetAB();
         }
+        private void btnCycleLines_Click(object sender, EventArgs e)
+        {
+            if (ABLine.isBtnABLineOn && ABLine.numABLines > 0)
+            {
+                ABLine.numABLineSelected++;
+                if (ABLine.numABLineSelected > ABLine.numABLines) ABLine.numABLineSelected = 1;
+                ABLine.refPoint1 = ABLine.lineArr[ABLine.numABLineSelected - 1].origin;
+                //ABLine.refPoint2 = ABLine.lineArr[ABLine.numABLineSelected - 1].ref2;
+                ABLine.abHeading = ABLine.lineArr[ABLine.numABLineSelected - 1].heading;
+                ABLine.SetABLineByHeading();
+                ABLine.isABLineSet = true;
+                ABLine.isABLineLoaded = true;
+                yt.ResetYouTurn();
+                btnCycleLines.Text = "AB-" + ABLine.numABLineSelected;
+            }
+            else if (curve.isCurveBtnOn && curve.numCurveLines > 0)
+            {
+                curve.numCurveLineSelected++;
+                if (curve.numCurveLineSelected > curve.numCurveLines) curve.numCurveLineSelected = 1;
+
+                int idx = curve.numCurveLineSelected - 1;
+                curve.aveLineHeading = curve.curveArr[idx].aveHeading;
+                curve.refList?.Clear();
+                for (int i = 0; i < curve.curveArr[idx].curvePts.Count; i++)
+                {
+                    curve.refList.Add(curve.curveArr[idx].curvePts[i]);
+                }
+                curve.isCurveSet = true;
+                yt.ResetYouTurn();
+                btnCycleLines.Text = "Cur-" + curve.numCurveLineSelected;
+            }
+        }
+
 
         private void btnABLine_Click(object sender, EventArgs e)
         {
+            btnCycleLines.Text = "AB-" + ABLine.numABLineSelected;
+
             //check if window already exists
             Form f = Application.OpenForms["FormABCurve"];
 
@@ -1007,27 +1076,30 @@ private void btnABLine_Click(object sender, EventArgs e)
                 return;
             }
 
+            Form af = Application.OpenForms["FormABLine"];
+
+            if (af != null)
+            {
+                af.Close();
+                return;
+            }
+
+
             //if contour is on, turn it off
             if (ct.isContourBtnOn) { if (ct.isContourBtnOn) btnContour.PerformClick(); }
             btnContourPriority.Enabled = true;
 
             //make sure the other stuff is off
             curve.isOkToAddPoints = false;
-            curve.isCurveSet = false;
-            DisableYouTurnButtons();
                 
             curve.isCurveBtnOn = false;
             btnCurve.Image = Properties.Resources.CurveOff;
 
-            //new direction so reset where to put turn diagnostic
-            yt.ResetCreatedYouTurn();
-
             //if there is a line in memory, just use it.
             if (ABLine.isBtnABLineOn == false && ABLine.isABLineLoaded)
             {                
                 ABLine.isABLineSet = true;
                 EnableYouTurnButtons();
-                FileSaveABLine();
                 btnABLine.Image = Properties.Resources.ABLineOn;
                 ABLine.isBtnABLineOn = true;
                 return;
@@ -1047,8 +1119,8 @@ private void btnABLine_Click(object sender, EventArgs e)
             btnABLine.Image = Properties.Resources.ABLineOn;
 
             //turn off youturn...
-            DisableYouTurnButtons();
-            yt.ResetYouTurn();
+            //DisableYouTurnButtons();
+            //yt.ResetYouTurn();
 
             var form = new FormABLine(this);
                 form.Show();
@@ -1056,7 +1128,10 @@ private void btnABLine_Click(object sender, EventArgs e)
 
         private void btnCurve_Click(object sender, EventArgs e)
         {
+            btnCycleLines.Text = "Cur-" + curve.numCurveLineSelected;
+
             //check if window already exists, return if true
+
             Form f = Application.OpenForms["FormABLine"];
 
             if (f != null)
@@ -1065,28 +1140,36 @@ private void btnCurve_Click(object sender, EventArgs e)
                 return;
             }
 
+            //check if window already exists
+            Form cf = Application.OpenForms["FormABCurve"];
+
+            if (cf != null)
+            {
+                cf.Close();
+                return;
+            }
+
+
             //if contour is on, turn it off
             if (ct.isContourBtnOn) { if (ct.isContourBtnOn) btnContour.PerformClick(); }
 
-                //turn off ABLine 
-                ABLine.isABLineBeingSet = false;
-                ABLine.isABLineSet = false;
-                txtDistanceOffABLine.Visible = false;
+            //turn off ABLine 
+            ABLine.isABLineBeingSet = false;
+            ABLine.isABLineSet = false;
+            txtDistanceOffABLine.Visible = false;
 
-                //change image to reflect on off
-                btnABLine.Image = Properties.Resources.ABLineOff;
-                ABLine.isBtnABLineOn = false;
+            //change image to reflect on off
+            btnABLine.Image = Properties.Resources.ABLineOff;
+            ABLine.isBtnABLineOn = false;
 
             //new direction so reset where to put turn diagnostic
-            yt.ResetCreatedYouTurn();
+            //yt.ResetCreatedYouTurn();
 
-            if (curve.isCurveBtnOn == false && curve.refList.Count > 3)
+            if (curve.isCurveBtnOn == false && curve.isCurveSet)
             {
-
                 //display the curve
                 curve.isCurveSet = true;
                 EnableYouTurnButtons();
-                FileSaveCurveLine();
                 btnCurve.Image = Properties.Resources.CurveOn;
                 curve.isCurveBtnOn = true;
                 return;
@@ -1102,22 +1185,10 @@ private void btnCurve_Click(object sender, EventArgs e)
                 return;
             }
 
-            //curve.isCurveBtnOn = !curve.isCurveBtnOn;
             curve.isCurveBtnOn = true;
             btnCurve.Image = Properties.Resources.CurveOn;
 
-            //turn off youturn...
-            btnRightYouTurn.Enabled = false;
-            btnLeftYouTurn.Enabled = false;
-            btnRightYouTurn.Visible = false;
-            btnLeftYouTurn.Visible = false;
-
-            btnEnableAutoYouTurn.Enabled = false;
-            yt.isYouTurnBtnOn = false;
-            btnEnableAutoYouTurn.Image = Properties.Resources.YouTurnNo;
-            yt.ResetYouTurn();
-
-            if (isAutoSteerBtnOn) btnAutoSteer.PerformClick();
+            EnableYouTurnButtons();
             btnContourPriority.Enabled = true;
 
             Form form = new FormABCurve(this);
@@ -1222,7 +1293,7 @@ private void btnContourPriority_Click(object sender, EventArgs e)
                     //                            MessageBoxDefaultButton.Button2);
                     //if (result3 == DialogResult.Yes)
                     {
-                        FileSaveABLine();
+                        //FileSaveABLine();
                     }
                 }
                 else if (curve.isCurveSet)
@@ -1266,7 +1337,9 @@ private void SnapSmallLeft()
                     double dist = 0.01 * Properties.Settings.Default.setDisplay_snapDistanceSmall;
 
                     ABLine.MoveABLine(-dist);
-                    FileSaveABLine();
+
+                    ABLine.moveDistance -= dist;
+                    //FileSaveABLine();
                 }
                 else if (curve.isCurveSet)
                 {
@@ -1275,6 +1348,7 @@ private void SnapSmallLeft()
                     double dist = 0.01 * Properties.Settings.Default.setDisplay_snapDistanceSmall;
 
                     curve.MoveABCurve(-dist);
+                    curve.moveDistance -= dist;
                 }
                 else
                 {
@@ -1293,7 +1367,9 @@ private void SnapSmallRight()
                     yt.ResetCreatedYouTurn();
                     double dist = 0.01 * Properties.Settings.Default.setDisplay_snapDistanceSmall;
                     ABLine.MoveABLine(dist);
-                    FileSaveABLine();
+                    ABLine.moveDistance += dist;
+
+                    //FileSaveABLine();
                 }
                 else if (curve.isCurveSet)
                 {
@@ -1301,6 +1377,8 @@ private void SnapSmallRight()
                     yt.ResetCreatedYouTurn();
                     double dist = 0.01 * Properties.Settings.Default.setDisplay_snapDistanceSmall;
                     curve.MoveABCurve(dist);
+                    curve.moveDistance += dist;
+
                 }
                 else
                 {
@@ -1320,7 +1398,8 @@ private void SnapRight()
                     double dist = 0.01 * Properties.Settings.Default.setDisplay_snapDistance;
 
                     ABLine.MoveABLine(dist);
-                    FileSaveABLine();
+                    ABLine.moveDistance += dist;
+                    //FileSaveABLine();
                 }
                 else if (curve.isCurveSet)
                 {
@@ -1328,6 +1407,8 @@ private void SnapRight()
                     yt.ResetCreatedYouTurn();
                     double dist = 0.01 * Properties.Settings.Default.setDisplay_snapDistance;
                     curve.MoveABCurve(dist);
+                    curve.moveDistance += dist;
+
                 }
                 else
                 {
@@ -1348,7 +1429,9 @@ private void SnapLeft()
                     double dist = 0.01 * Properties.Settings.Default.setDisplay_snapDistance;
 
                     ABLine.MoveABLine(-dist);
-                    FileSaveABLine();
+                    ABLine.moveDistance -= dist;
+
+                    //FileSaveABLine();
                 }
                 else if (curve.isCurveSet)
                 {
@@ -1357,6 +1440,8 @@ private void SnapLeft()
                     double dist = 0.01 * Properties.Settings.Default.setDisplay_snapDistance;
 
                     curve.MoveABCurve(-dist);
+                    curve.moveDistance -= dist;
+
                 }
                 else
                 {
@@ -1364,7 +1449,6 @@ private void SnapLeft()
                     form.Show();
                 }
             }
-
         }
 
         private void btnSmallSnapLeft_Click(object sender, EventArgs e)
@@ -1900,21 +1984,21 @@ private void btnEnableAutoYouTurn_Click(object sender, EventArgs e)
         public void AutoYouTurnButtonsRightTurn()
         {
             btnRightYouTurn.BackColor = Color.Yellow;
-            btnRightYouTurn.Height = 110;
-            btnRightYouTurn.Width = 110;
-            btnLeftYouTurn.Height = 90;
-            btnLeftYouTurn.Width = 96;
+            btnRightYouTurn.Height = 95;
+            btnRightYouTurn.Width = 95;
+            btnLeftYouTurn.Height = 66;
+            btnLeftYouTurn.Width = 80;
             btnLeftYouTurn.Text = "";
             btnLeftYouTurn.BackColor = Color.LightSteelBlue;
         }
         public void AutoYouTurnButtonsLeftTurn()
         {
             btnRightYouTurn.BackColor = Color.LightSteelBlue;
-            btnRightYouTurn.Height = 90;
-            btnRightYouTurn.Width = 96;
+            btnRightYouTurn.Height = 66;
+            btnRightYouTurn.Width = 80;
             btnRightYouTurn.Text = "";
-            btnLeftYouTurn.Height = 110;
-            btnLeftYouTurn.Width = 110;
+            btnLeftYouTurn.Height = 95;
+            btnLeftYouTurn.Width = 95;
             btnLeftYouTurn.BackColor = Color.Yellow;
         }
         public void AutoYouTurnButtonsReset()
@@ -1925,10 +2009,10 @@ public void AutoYouTurnButtonsReset()
             //fix the buttons
             btnLeftYouTurn.BackColor = Color.LightSteelBlue;
             btnRightYouTurn.BackColor = Color.LightSteelBlue;
-            btnLeftYouTurn.Height = 90;
-            btnLeftYouTurn.Width = 96;
-            btnRightYouTurn.Height = 90;
-            btnRightYouTurn.Width = 96;
+            btnLeftYouTurn.Height = 66;
+            btnLeftYouTurn.Width = 80;
+            btnRightYouTurn.Height = 66;
+            btnRightYouTurn.Width = 80;
             btnLeftYouTurn.Text = "";
             btnRightYouTurn.Text = "";
 
@@ -1958,6 +2042,7 @@ public void EnableYouTurnButtons()
 
             //turn off youturn...
             btnEnableAutoYouTurn.Enabled = true;
+            yt.isYouTurnBtnOn = false;
             btnEnableAutoYouTurn.Image = Properties.Resources.YouTurnNo;
         }
         public void DisableYouTurnButtons()
@@ -2659,17 +2744,6 @@ private void toolStripBtnMakeBndContour_Click(object sender, EventArgs e)
                 if (result == DialogResult.OK) { }
             }
         }
-        private void toolStripBtnSnap_Click(object sender, EventArgs e)
-        {
-            if (ABLine.isABLineSet) ABLine.SnapABLine();
-            else if (curve.isCurveSet) curve.SnapABCurve();
-            else
-            {
-                var form = new FormTimedMessage(2000, (gStr.gsNoGuidanceLines), (gStr.gsTurnOnContourOrMakeABLine));
-                form.Show();
-            }
-        }
-        
         private void toolstripYouTurnConfig_Click(object sender, EventArgs e)
         {
             var form = new FormYouTurn(this);
@@ -2692,8 +2766,7 @@ private void treePlanterToolStripMenuItem_Click(object sender, EventArgs e)
             form.Show();
 
         }
-
-
+        
         private void toolstripAutoSteerConfig_Click(object sender, EventArgs e)
         {
             //check if window already exists
@@ -2724,7 +2797,6 @@ private void toolStripAutoSteerChart_Click(object sender, EventArgs e)
             Form formG = new FormSteerGraph(this);
             formG.Show();
         }
-
         private void toolStripNTRIPConfig_Click(object sender, EventArgs e)
         {
             SettingsNTRIP();
@@ -2737,8 +2809,7 @@ private void deleteContourPathsToolStripMenuItem_Click(object sender, EventArgs
             ct.ctList?.Clear();
             contourSaveList?.Clear();
         }
-
-
+        
         private void toolstripVehicleConfig_Click(object sender, EventArgs e)
         {
             using (var form = new FormSettings(this, 0))
@@ -2899,16 +2970,16 @@ public string FixQuality
             get
             {
                 if (timerSim.Enabled)
-                    return "Simulator: ";
+                    return "Sim: ";
                 else if (pn.fixQuality == 0) return "Invalid: ";
-                else if (pn.fixQuality == 1) return "GPS fix: ";
-                else if (pn.fixQuality == 2) return "DGPS fix: ";
-                else if (pn.fixQuality == 3) return "PPS fix: ";
+                else if (pn.fixQuality == 1) return "GPS single: ";
+                else if (pn.fixQuality == 2) return "DGPS : ";
+                else if (pn.fixQuality == 3) return "PPS : ";
                 else if (pn.fixQuality == 4) return "RTK fix: ";
-                else if (pn.fixQuality == 5) return "Flt RTK: ";
+                else if (pn.fixQuality == 5) return "Float: ";
                 else if (pn.fixQuality == 6) return "Estimate: ";
                 else if (pn.fixQuality == 7) return "Man IP: ";
-                else if (pn.fixQuality == 8) return "Simulator: ";
+                else if (pn.fixQuality == 8) return "Sim: ";
                 else return "Unknown: ";
             }
         }
@@ -3068,6 +3139,11 @@ private void tmrWatchdog_tick(object sender, EventArgs e)
                             lblpBoundaryArea.Text = fd.AreaBoundaryLessInnersHectares;
                             lblpAreaWorked.Text = fd.WorkedHectares;
                             lblpFieldAreaRemain.Text = fd.WorkedAreaRemainHectares;
+
+                            if (ABLine.isBtnABLineOn) lblMoveDistanceBatman.Text = (ABLine.moveDistance * 100).ToString("N0");
+                            else if (curve.isCurveBtnOn) lblMoveDistanceBatman.Text = (curve.moveDistance * 100).ToString("N0");
+                            else lblMoveDistance.Text = "*";
+
                         }
                         else //imperial
                         {
@@ -3100,6 +3176,10 @@ private void tmrWatchdog_tick(object sender, EventArgs e)
                         if (isMetric)
                         {
                             lblAltitude.Text = Altitude;
+                            if (ABLine.isBtnABLineOn) lblMoveDistance.Text = (ABLine.moveDistance*100).ToString("N0");
+                            else if (curve.isCurveBtnOn) lblMoveDistance.Text = (curve.moveDistance*100).ToString("N0");
+                            else lblMoveDistance.Text = "*";
+
                             //lblBoundaryArea.Text = fd.AreaBoundaryLessInnersHectares;
                             //lblBoundaryDistanceAway.Text = ((int)(distancePivotToTurnLine)) + " m";
                             //if (distPivot > 0) lblBoundaryDistanceAway.Text = ((int)(distPivot)) + " m";
@@ -3189,11 +3269,11 @@ private void tmrWatchdog_tick(object sender, EventArgs e)
                         //lblMachineControl.Text = Convert.ToString(mc.machineControlData[mc.cnPedalControl], 2).PadLeft(8, '0');
                         //lblLookAhead.Text = lookaheadActual.ToString("N1") + " m";
 
-                        //txtBoxRecvAutoSteer.Text = mc.serialRecvAutoSteerStr;
-                        //txtBoxSendAutoSteer.Text = mc.autoSteerData[mc.sdRelayLo] + ", " + mc.autoSteerData[mc.sdSpeed]
-                        // + ", " + guidanceLineDistanceOff + ", " + guidanceLineSteerAngle + ", " + mc.machineControlData[mc.cnYouTurn];
+                            //txtBoxRecvAutoSteer.Text = mc.serialRecvAutoSteerStr;
+                            //txtBoxSendAutoSteer.Text = mc.autoSteerData[mc.sdRelayLo] + ", " + mc.autoSteerData[mc.sdSpeed]
+                            // + ", " + guidanceLineDistanceOff + ", " + guidanceLineSteerAngle + ", " + mc.machineControlData[mc.cnYouTurn];
 
-                        //Low means steer switch on
+                            //Low means steer switch on
                         if (mc.steerSwitchValue == 0)
                         {
                             this.btnTinyAutoSteerConfig.BackColor = System.Drawing.Color.LightBlue;
@@ -3331,7 +3411,7 @@ private void tmrWatchdog_tick(object sender, EventArgs e)
                             lblSpeedUnits.BackColor = SystemColors.ControlLight;
                             txtDistanceOffABLine.BackColor = SystemColors.ControlLight;
                             lblHz.BackColor = SystemColors.ControlLight;
-                            lblFixQuality.BackColor = SystemColors.ControlLight;
+                            //lblFixQuality.BackColor = SystemColors.ControlLight;
                             //lblTest.BackColor = SystemColors.ControlLight;
                         }
                         else
@@ -3343,15 +3423,15 @@ private void tmrWatchdog_tick(object sender, EventArgs e)
                             lblSpeedUnits.BackColor = Color.Tomato;
                             txtDistanceOffABLine.BackColor = Color.Tomato;
                             lblHz.BackColor = Color.Tomato;
-                            lblFixQuality.BackColor = Color.Tomato;
+                            //lblFixQuality.BackColor = Color.Tomato;
                             //lblTest.BackColor = Color.Tomato;
                         }
                     }
 
                     //not Metric/Standard units sensitive
-                    lblFixQuality.Text = FixQuality + HzTime.ToString("N1") + " Hz";
+                    //lblFixQuality.Text = ;
                     lblLidarDistance.Text = (mc.lidarDistance * 0.01).ToString();
-                    lblHz.Text = NMEAHz + "Hz " + (int)(frameTime);
+                    lblHz.Text = NMEAHz + "Hz " + (int)(frameTime) + "\r\n" + FixQuality + HzTime.ToString("N1") + " Hz";
 
 
                 }
diff --git a/SourceCode/GPS/Forms/OpenGL.Designer.cs b/SourceCode/GPS/Forms/OpenGL.Designer.cs
index 8b2eb8216..e878add3b 100644
--- a/SourceCode/GPS/Forms/OpenGL.Designer.cs
+++ b/SourceCode/GPS/Forms/OpenGL.Designer.cs
@@ -278,15 +278,13 @@ private void oglMain_Paint(object sender, PaintEventArgs e)
                         GL.Disable(EnableCap.Texture2D);
                     }
                 }
-
-
-
+                               
                 if (isLightbarOn)
                 //{ }
                 //else
                 {
-                    double set = guidanceLineSteerAngle * 0.01 * (100/vehicle.maxSteerAngle);
-                    double actual = actualSteerAngleDisp * 0.01 * (100 / vehicle.maxSteerAngle);
+                    double set = guidanceLineSteerAngle * 0.01 * (50/vehicle.maxSteerAngle);
+                    double actual = actualSteerAngleDisp * 0.01 * (50 / vehicle.maxSteerAngle);
                     double hiit = 0;
 
                     GL.PushMatrix();
@@ -298,7 +296,7 @@ private void oglMain_Paint(object sender, PaintEventArgs e)
 
                     GL.LineWidth(1);
                     GL.Color3(0.54f, 0.54f, 0.54f);
-                    double wiid = 100;
+                    double wiid = 50;
 
                     GL.Begin(PrimitiveType.LineStrip);
                     GL.Vertex2(-wiid, 25);
@@ -309,7 +307,6 @@ private void oglMain_Paint(object sender, PaintEventArgs e)
 
                     GL.Translate(0, 10, 0);
 
-                    //if (!simulatorOnToolStripMenuItem.Checked)
                     {
                         if (actualSteerAngleDisp > 0)
                         {
@@ -318,8 +315,8 @@ private void oglMain_Paint(object sender, PaintEventArgs e)
 
                             GL.Color3(0.0f, 0.75930f, 0.0f);
                             GL.Vertex2(0, hiit);
-                            GL.Vertex2(actual, hiit + 15);
-                            GL.Vertex2(0, hiit + 30);
+                            GL.Vertex2(actual, hiit + 8);
+                            GL.Vertex2(0, hiit + 16);
                             GL.Vertex2(0, hiit);
 
                             GL.End();
@@ -332,8 +329,8 @@ private void oglMain_Paint(object sender, PaintEventArgs e)
 
                             GL.Color3(0.75930f, 0.0f, 0.0f);
                             GL.Vertex2(-0, hiit);
-                            GL.Vertex2(actual, hiit + 15);
-                            GL.Vertex2(-0, hiit + 30);
+                            GL.Vertex2(actual, hiit + 8);
+                            GL.Vertex2(-0, hiit + 16);
                             GL.Vertex2(-0, hiit);
 
                             GL.End();
@@ -347,8 +344,8 @@ private void oglMain_Paint(object sender, PaintEventArgs e)
 
                         GL.Color3(0.75930f, 0.75930f, 0.0f);
                         GL.Vertex2(0, hiit);
-                        GL.Vertex2(set, hiit + 15);
-                        GL.Vertex2(0, hiit + 30);
+                        GL.Vertex2(set, hiit + 8);
+                        GL.Vertex2(0, hiit + 16);
                         GL.Vertex2(0, hiit);
 
                         GL.End();
@@ -360,8 +357,8 @@ private void oglMain_Paint(object sender, PaintEventArgs e)
 
                         GL.Color3(0.75930f, 0.75930f, 0.0f);
                         GL.Vertex2(-0, hiit);
-                        GL.Vertex2(set, hiit + 15);
-                        GL.Vertex2(-0, hiit + 30);
+                        GL.Vertex2(set, hiit + 8);
+                        GL.Vertex2(-0, hiit + 16);
                         GL.Vertex2(-0, hiit);
 
                         GL.End();
@@ -370,11 +367,8 @@ private void oglMain_Paint(object sender, PaintEventArgs e)
                     //return back
                     GL.PopMatrix();
                     GL.LineWidth(1);
-
                 }
 
-
-
                 //LightBar if AB Line is set and turned on or contour
                 if (isLightbarOn)
                 {
@@ -998,7 +992,7 @@ private void oglZoom_Paint(object sender, PaintEventArgs e)
             } //end of section patches
 
             //draw the ABLine
-            if (ABLine.isABLineSet | ABLine.isABLineBeingSet)
+            if ((ABLine.isABLineSet | ABLine.isABLineBeingSet) && ABLine.isBtnABLineOn)
             {
                 //Draw reference AB line
                 GL.LineWidth(1);
@@ -1014,20 +1008,20 @@ private void oglZoom_Paint(object sender, PaintEventArgs e)
 
                 //raw current AB Line
                 GL.Begin(PrimitiveType.Lines);
-                GL.Color3(0.9f, 0.0f, 0.0f);
+                GL.Color3(0.9f, 0.20f, 0.0f);
                 GL.Vertex3(ABLine.currentABLineP1.easting, ABLine.currentABLineP1.northing, 0.0);
                 GL.Vertex3(ABLine.currentABLineP2.easting, ABLine.currentABLineP2.northing, 0.0);
                 GL.End();
             }
 
             //draw curve if there is one
-            if (curve.isCurveSet)
+            if (curve.isCurveSet && curve.isCurveBtnOn)
             {
                 int ptC = curve.curList.Count;
                 if (ptC > 0)
                 {
                     GL.LineWidth(2);
-                    GL.Color3(0.95f, 0.2f, 0.0f);
+                    GL.Color3(0.25f, 0.92f, 0.0f);
                     GL.Begin(PrimitiveType.LineStrip);
                     for (int h = 0; h < ptC; h++) GL.Vertex3(curve.curList[h].easting, curve.curList[h].northing, 0);
                     GL.End();
diff --git a/SourceCode/GPS/Forms/Position.designer.cs b/SourceCode/GPS/Forms/Position.designer.cs
index 01115ad49..0a604c956 100644
--- a/SourceCode/GPS/Forms/Position.designer.cs
+++ b/SourceCode/GPS/Forms/Position.designer.cs
@@ -468,9 +468,20 @@ private void UpdateFixPosition()
                                 //distance from current pivot to first point of youturn pattern
                                 distancePivotToTurnLine = glm.Distance(yt.ytList[0], steerAxlePos);
 
+                                if ((distancePivotToTurnLine <= 20.0) && (distancePivotToTurnLine >= 18.0) && !yt.isYouTurnTriggered)
+
+                                    if (!isBoundAlarming)
+                                    {
+                                        sndBoundaryAlarm.Play();
+                                        isBoundAlarming = true;
+                                    }
+
                                 //if we are close enough to pattern, trigger.
                                 if ((distancePivotToTurnLine <= 1.0) && (distancePivotToTurnLine >= 0) && !yt.isYouTurnTriggered)
+                                {
                                     yt.YouTurnTrigger();
+                                    isBoundAlarming = false;
+                                }
                             }
                         }
                     } // end of isInWorkingArea
@@ -507,6 +518,8 @@ private void UpdateFixPosition()
             frameTime = (double)swFrame.ElapsedTicks / (double)System.Diagnostics.Stopwatch.Frequency * 1000;
         }
 
+        public bool isBoundAlarming;
+
 
         //all the hitch, pivot, section, trailing hitch, headings and fixes
         private void CalculatePositionHeading()
diff --git a/SourceCode/GPS/Forms/SaveOpen.Designer.cs b/SourceCode/GPS/Forms/SaveOpen.Designer.cs
index b25de17b3..acae05c46 100644
--- a/SourceCode/GPS/Forms/SaveOpen.Designer.cs
+++ b/SourceCode/GPS/Forms/SaveOpen.Designer.cs
@@ -11,12 +11,381 @@ namespace AgOpenGPS
     
     public partial class FormGPS
     {
+        //public void FileAppendCurveLine(string curveName)
+        //{
+        //    //get the directory and make sure it exists, create if not
+        //    string dirField = fieldsDirectory + currentFieldDirectory + "\\";
+        //    string directoryName = Path.GetDirectoryName(dirField);
+
+        //    if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
+        //    { Directory.CreateDirectory(directoryName); }
+
+        //    string filename = directoryName + "\\CurveLines.txt";
+
+        //    //use Streamwriter to create and append to existing curveLines file
+        //    using (StreamWriter writer = new StreamWriter(filename, true))
+        //    {
+        //        try
+        //        {
+        //            if (curve.refList.Count > 0)
+        //            {
+        //                if (curveName.Length > 0)
+        //                {
+        //                    curve.curveArr.Add(new CCurveLines());
+        //                    curve.curveArr[curve.curveArr.Count - 1].Name = curveName;
+        //                    curve.curveArr[curve.curveArr.Count - 1].aveHeading = curve.aveLineHeading;
+
+        //                    //write out the ABLine
+        //                    writer.WriteLine(curveName);
+
+        //                    //write out the aveheading
+        //                    writer.WriteLine(curve.aveLineHeading.ToString(CultureInfo.InvariantCulture));
+
+        //                    //write out the points of ref line
+        //                    writer.WriteLine(curve.refList.Count.ToString(CultureInfo.InvariantCulture));
+
+        //                    for (int j = 0; j < curve.refList.Count; j++)
+        //                    {
+        //                        curve.curveArr[curve.curveArr.Count - 1].curvePts.Add(curve.refList[j]);
+        //                        writer.WriteLine(Math.Round(curve.refList[j].easting, 3).ToString(CultureInfo.InvariantCulture) + "," +
+        //                                                Math.Round(curve.refList[j].northing, 3).ToString(CultureInfo.InvariantCulture) + "," +
+        //                                                    Math.Round(curve.refList[j].heading, 5).ToString(CultureInfo.InvariantCulture));
+        //                    }
+        //                }
+        //                else
+        //                {
+        //                    //MessageBox.Show("Currently no ABCurve name\n      create ABCurve name");
+        //                    var form2 = new FormTimedMessage(2000, gStr.gsNoNameEntered, gStr.gsEnterUniqueABCurveName);
+        //                    form2.Show();
+        //                }
+        //            }
+        //            else
+        //            {
+        //                var form2 = new FormTimedMessage(2000, gStr.gsNoABCurveCreated, gStr.gsCompleteAnABCurveLineFirst);
+        //                form2.Show();
+        //            }
+        //        }
+        //        catch (Exception er)
+        //        {
+        //            WriteErrorLog("Saving Curve Line" + er.ToString());
+
+        //            return;
+        //        }
+        //    }
+
+        //    if (curve.numCurveLines == 0) curve.numCurveLineSelected = 0;
+        //    if (curve.numCurveLineSelected > curve.numCurveLines) curve.numCurveLineSelected = curve.numCurveLines;
+
+        //}
+        //public void FileAppendABLine()
+        //{
+        //    //make sure at least a global blank AB Line file exists
+        //    string dirField = fieldsDirectory + currentFieldDirectory + "\\";
+        //    string directoryName = Path.GetDirectoryName(dirField).ToString(CultureInfo.InvariantCulture);
+
+        //    if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
+        //    { Directory.CreateDirectory(directoryName); }
+
+        //    string filename = directoryName + "\\ABLines.txt";
+
+        //    ABLine.numABLines = ABLine.lineArr.Count;
+
+        //    if (ABLine.numABLines > 0)
+        //    {
+        //        int idx = ABLine.numABLines - 1;
+
+        //        using (StreamWriter writer = new StreamWriter(filename, true))
+        //        {
+        //            try
+        //            {
+
+        //                //make it culture invariant
+        //                string line = ABLine.lineArr[idx].Name.Trim()
+        //                    + ',' + (Math.Round(glm.toDegrees(ABLine.lineArr[idx].heading), 8)).ToString(CultureInfo.InvariantCulture)
+        //                    + ',' + (Math.Round(ABLine.lineArr[idx].origin.easting, 3)).ToString(CultureInfo.InvariantCulture)
+        //                    + ',' + (Math.Round(ABLine.lineArr[idx].origin.northing, 3)).ToString(CultureInfo.InvariantCulture);
+
+        //                //write out to file
+        //                writer.WriteLine(line);
+        //            }
+        //            catch (Exception er)
+        //            {
+        //                Console.WriteLine(er.Message + "\n Cannot write to file.");
+        //                WriteErrorLog("Saving ABLines Draw append" + er.ToString());
+        //                return;
+        //            }
+        //        }
+        //    }
+
+        //    if (ABLine.numABLines == 0) ABLine.numABLines = 0;
+        //    if (ABLine.numABLineSelected > ABLine.numABLines) ABLine.numABLineSelected = ABLine.numABLines;
+        //}
+
         //list of the list of patch data individual triangles for field sections
         public List<List<vec2>> patchSaveList = new List<List<vec2>>();
 
         //list of the list of patch data individual triangles for contour tracking
         public List<List<vec3>> contourSaveList = new List<List<vec3>>();
 
+        public void FileSaveCurveLines()
+        {
+            string dirField = fieldsDirectory + currentFieldDirectory + "\\";
+            string directoryName = Path.GetDirectoryName(dirField).ToString(CultureInfo.InvariantCulture);
+
+            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
+            { Directory.CreateDirectory(directoryName); }
+
+            string filename = directoryName + "\\CurveLines.txt";
+
+            int cnt = curve.curveArr.Count;
+            curve.numCurveLines = cnt;
+
+            using (StreamWriter writer = new StreamWriter(filename, false))
+            {
+                try
+                {
+                    if (cnt > 0)
+                    {
+                        writer.WriteLine("$CurveLines");
+
+                        for (int i = 0; i < cnt; i++)
+                        {
+                            //write out the Name
+                            writer.WriteLine(curve.curveArr[i].Name);
+
+                            //write out the aveheading
+                            writer.WriteLine(curve.curveArr[i].aveHeading.ToString(CultureInfo.InvariantCulture));
+
+                            //write out the points of ref line
+                            int cnt2 = curve.curveArr[i].curvePts.Count;
+
+                            writer.WriteLine(cnt2.ToString(CultureInfo.InvariantCulture));
+                            if (curve.curveArr[i].curvePts.Count > 0)
+                            {
+                                for (int j = 0; j < cnt2; j++)
+                                    writer.WriteLine(Math.Round(curve.curveArr[i].curvePts[j].easting, 3).ToString(CultureInfo.InvariantCulture) + "," +
+                                                        Math.Round(curve.curveArr[i].curvePts[j].northing, 3).ToString(CultureInfo.InvariantCulture) + "," +
+                                                            Math.Round(curve.curveArr[i].curvePts[j].heading, 5).ToString(CultureInfo.InvariantCulture));
+                            }
+                        }
+                    }
+                    else
+                    {
+                        writer.WriteLine("$CurveLines");
+                    }
+                }
+                catch (Exception er)
+                {
+                    WriteErrorLog("Saving Curve Line" + er.ToString());
+
+                    return;
+                }
+            }
+
+            if (curve.numCurveLines == 0) curve.numCurveLineSelected = 0;
+            if (curve.numCurveLineSelected > curve.numCurveLines) curve.numCurveLineSelected = curve.numCurveLines;
+
+        }
+
+        public void FileLoadCurveLines()
+        {
+            curve.curveArr?.Clear();
+            curve.numCurveLines = 0;
+
+            //get the directory and make sure it exists, create if not
+            string dirField = fieldsDirectory + currentFieldDirectory + "\\";
+            string directoryName = Path.GetDirectoryName(dirField);
+
+            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
+            { Directory.CreateDirectory(directoryName); }
+
+            string filename = directoryName + "\\CurveLines.txt";
+
+            if (!File.Exists(filename))
+            {
+                using (StreamWriter writer = new StreamWriter(filename))
+                {
+                    writer.WriteLine("$CurveLines");
+                }
+            }
+
+            //get the file of previous AB Lines
+            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
+            { Directory.CreateDirectory(directoryName); }
+
+            if (!File.Exists(filename))
+            {
+                TimedMessageBox(2000, gStr.gsFileError, gStr.gsMissingABCurveFile);
+            }
+            else
+            {
+                using (StreamReader reader = new StreamReader(filename))
+                {
+                    try
+                    {
+                        string line;
+
+                        //read header $CurveLine
+                        line = reader.ReadLine();
+
+                        while (!reader.EndOfStream)
+                        {
+                            curve.curveArr.Add(new CCurveLines());
+
+                            //read header $CurveLine
+                            curve.curveArr[curve.numCurveLines].Name = reader.ReadLine();
+                            // get the average heading
+                            line = reader.ReadLine();
+                            curve.curveArr[curve.numCurveLines].aveHeading = double.Parse(line, CultureInfo.InvariantCulture);
+
+                            line = reader.ReadLine();
+                            int numPoints = int.Parse(line);
+
+                            if (numPoints > 1)
+                            {
+                                curve.curveArr[curve.numCurveLines].curvePts?.Clear();
+
+                                for (int i = 0; i < numPoints; i++)
+                                {
+                                    line = reader.ReadLine();
+                                    string[] words = line.Split(',');
+                                    vec3 vecPt = new vec3(double.Parse(words[0], CultureInfo.InvariantCulture),
+                                        double.Parse(words[1], CultureInfo.InvariantCulture),
+                                        double.Parse(words[2], CultureInfo.InvariantCulture));
+                                    curve.curveArr[curve.numCurveLines].curvePts.Add(vecPt);
+                                }
+                                curve.numCurveLines++;
+                            }
+                            else
+                            {
+                                if (curve.curveArr.Count > 0)
+                                {
+                                    curve.curveArr.RemoveAt(curve.numCurveLines);
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception er)
+                    {
+                        var form = new FormTimedMessage(2000, gStr.gsCurveLineFileIsCorrupt, gStr.gsButFieldIsLoaded);
+                        form.Show();
+                        WriteErrorLog("Load Curve Line" + er.ToString());
+                    }
+                }
+            }
+
+            if (curve.numCurveLines == 0) curve.numCurveLineSelected = 0;
+            if (curve.numCurveLineSelected > curve.numCurveLines) curve.numCurveLineSelected = curve.numCurveLines;
+        }
+
+        public void FileSaveABLines()
+        {
+            //make sure at least a global blank AB Line file exists
+            string dirField = fieldsDirectory + currentFieldDirectory + "\\";
+            string directoryName = Path.GetDirectoryName(dirField).ToString(CultureInfo.InvariantCulture);
+
+            //get the file of previous AB Lines
+            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
+            { Directory.CreateDirectory(directoryName); }
+
+            string filename = directoryName + "\\ABLines.txt";
+            int cnt = ABLine.lineArr.Count;
+
+            using (StreamWriter writer = new StreamWriter(filename, false))
+            {
+                if (cnt > 0)
+                {
+                    foreach (var item in ABLine.lineArr)
+                    {
+                        //make it culture invariant
+                        string line = item.Name
+                            + ',' + (Math.Round(glm.toDegrees(item.heading), 8)).ToString(CultureInfo.InvariantCulture)
+                            + ',' + (Math.Round(item.origin.easting, 3)).ToString(CultureInfo.InvariantCulture)
+                            + ',' + (Math.Round(item.origin.northing, 3)).ToString(CultureInfo.InvariantCulture);
+
+                        //write out to file
+                        writer.WriteLine(line);
+                    }
+                }
+            }
+
+            if (ABLine.numABLines == 0) ABLine.numABLineSelected = 0;
+            if (ABLine.numABLineSelected > ABLine.numABLines) ABLine.numABLineSelected = ABLine.numABLines;
+        }
+
+        public void FileLoadABLines()
+        {
+            //make sure at least a global blank AB Line file exists
+            string dirField = fieldsDirectory + currentFieldDirectory + "\\";
+            string directoryName = Path.GetDirectoryName(dirField).ToString(CultureInfo.InvariantCulture);
+
+            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
+            { Directory.CreateDirectory(directoryName); }
+
+            string filename = directoryName + "\\ABLines.txt";
+
+            if (!File.Exists(filename))
+            {
+                using (StreamWriter writer = new StreamWriter(filename))
+                {
+                }
+            }
+
+            if (!File.Exists(filename))
+            {
+                TimedMessageBox(2000, gStr.gsFileError, gStr.gsMissingABLinesFile);
+            }
+            else
+            {
+                using (StreamReader reader = new StreamReader(filename))
+                {
+                    try
+                    {
+                        string line;
+                        ABLine.numABLines = 0;
+                        ABLine.numABLineSelected = 0;
+                        ABLine.lineArr?.Clear();
+
+                        //read all the lines
+                        for (int i = 0; !reader.EndOfStream; i++)
+                        {
+
+                            line = reader.ReadLine();
+                            string[] words = line.Split(',');
+
+                            if (words.Length != 4) break;
+
+                            ABLine.lineArr.Add(new CABLines());
+
+                            ABLine.lineArr[i].Name = words[0];
+
+
+                            ABLine.lineArr[i].heading = glm.toRadians(double.Parse(words[1], CultureInfo.InvariantCulture));
+                            ABLine.lineArr[i].origin.easting = double.Parse(words[2], CultureInfo.InvariantCulture);
+                            ABLine.lineArr[i].origin.northing = double.Parse(words[3], CultureInfo.InvariantCulture);
+
+                            ABLine.lineArr[i].ref1.easting = ABLine.lineArr[i].origin.easting - (Math.Sin(ABLine.lineArr[i].heading) * 2000.0);
+                            ABLine.lineArr[i].ref1.northing = ABLine.lineArr[i].origin.northing - (Math.Cos(ABLine.lineArr[i].heading) * 2000.0);
+
+                            ABLine.lineArr[i].ref2.easting = ABLine.lineArr[i].origin.easting + (Math.Sin(ABLine.lineArr[i].heading) * 2000.0);
+                            ABLine.lineArr[i].ref2.northing = ABLine.lineArr[i].origin.northing + (Math.Cos(ABLine.lineArr[i].heading) * 2000.0);
+                            ABLine.numABLines++;
+                        }
+                    }
+                    catch (Exception er)
+                    {
+                        var form = new FormTimedMessage(2000, gStr.gsABLineFileIsCorrupt, "Please delete it!!!");
+                        form.Show();
+                        WriteErrorLog("FieldOpen, Loading ABLine, Corrupt ABLine File" + er);
+                    }
+                }
+            }
+
+            if (ABLine.numABLines == 0) ABLine.numABLineSelected = 0;
+            if (ABLine.numABLineSelected > ABLine.numABLines) ABLine.numABLineSelected = ABLine.numABLines;
+
+        }
+
         //function that save vehicle and section settings
         public void FileSaveVehicle()
         {
@@ -705,12 +1074,183 @@ public void FileOpenField(string _openType)
                     WriteErrorLog("While Opening Field" + e.ToString());
 
                     var form = new FormTimedMessage(2000, gStr.gsFieldFileIsCorrupt, gStr.gsChooseADifferentField);
+
                     form.Show();
                     JobClose();
                     return;
                 }
             }
 
+            // ABLine -------------------------------------------------------------------------------------------------
+            FileLoadABLines();
+
+            if (ABLine.lineArr.Count > 0)
+            {
+                ABLine.numABLineSelected = 1;
+                ABLine.refPoint1 = ABLine.lineArr[ABLine.numABLineSelected - 1].origin;
+                //ABLine.refPoint2 = ABLine.lineArr[ABLine.numABLineSelected - 1].ref2;
+                ABLine.abHeading = ABLine.lineArr[ABLine.numABLineSelected - 1].heading;
+                ABLine.SetABLineByHeading();
+                ABLine.isABLineSet = false;
+                ABLine.isABLineLoaded = true;
+            }
+            else
+            {
+                ABLine.isABLineSet = false;
+                ABLine.isABLineLoaded = false;
+            }
+
+
+            //CurveLines
+            FileLoadCurveLines();
+            if (curve.curveArr.Count > 0)
+            {
+                curve.numCurveLineSelected = 1;
+                int idx = curve.numCurveLineSelected - 1;
+                curve.aveLineHeading = curve.curveArr[idx].aveHeading;
+
+                curve.refList?.Clear();
+                for (int i = 0; i < curve.curveArr[idx].curvePts.Count; i++)
+                {
+                    curve.refList.Add(curve.curveArr[idx].curvePts[i]);
+                }
+                curve.isCurveSet = true;
+            }
+            else
+            {
+                curve.isCurveSet = false;
+                curve.refList?.Clear();
+            }
+
+            ////Either exit or update running save
+            //fileAndDirectory = fieldsDirectory + currentFieldDirectory + "\\ABLine.txt";
+            //if (!File.Exists(fileAndDirectory))
+            //{
+            //    var form = new FormTimedMessage(2000, gStr.gsMissingABLinesFile, gStr.gsButFieldIsLoaded);
+            //    form.Show();
+            //}
+
+            //else
+            //{
+            //    using (StreamReader reader = new StreamReader(fileAndDirectory))
+            //    {
+            //        try
+            //        {
+            //            ABLine.isABLineLoaded = false;
+
+            //            //read header
+            //            line = reader.ReadLine();
+
+            //            line = reader.ReadLine();
+            //            bool isAB = bool.Parse(line);
+
+            //            if (isAB)
+            //            {
+            //                //Heading  , ,refPoint2x,z                    
+            //                line = reader.ReadLine();
+            //                ABLine.abHeading = double.Parse(line, CultureInfo.InvariantCulture);
+
+            //                //refPoint1x,z
+            //                line = reader.ReadLine();
+            //                string[] words = line.Split(',');
+            //                ABLine.refPoint1.easting = double.Parse(words[0], CultureInfo.InvariantCulture);
+            //                ABLine.refPoint1.northing = double.Parse(words[1], CultureInfo.InvariantCulture);
+
+            //                //refPoint2x,z
+            //                line = reader.ReadLine();
+            //                words = line.Split(',');
+            //                ABLine.refPoint2.easting = double.Parse(words[0], CultureInfo.InvariantCulture);
+            //                ABLine.refPoint2.northing = double.Parse(words[1], CultureInfo.InvariantCulture);
+
+            //                //Tramline
+            //                line = reader.ReadLine();
+            //                words = line.Split(',');
+            //                ABLine.tramPassEvery = int.Parse(words[0]);
+            //                ABLine.passBasedOn = int.Parse(words[1]);
+
+            //                ABLine.refABLineP1.easting = ABLine.refPoint1.easting - Math.Sin(ABLine.abHeading) * 4000.0;
+            //                ABLine.refABLineP1.northing = ABLine.refPoint1.northing - Math.Cos(ABLine.abHeading) * 4000.0;
+
+            //                ABLine.refABLineP2.easting = ABLine.refPoint1.easting + Math.Sin(ABLine.abHeading) * 4000.0;
+            //                ABLine.refABLineP2.northing = ABLine.refPoint1.northing + Math.Cos(ABLine.abHeading) * 4000.0;
+
+            //                ABLine.isABLineLoaded = true;
+
+            //            }
+
+            //            //clean up from last field maybe
+            //            ABLine.isABLineSet = false;
+            //            ABLine.isBtnABLineOn = false;
+            //            DisableYouTurnButtons();
+            //            btnContourPriority.Enabled = true;
+            //            btnABLine.Image = global::AgOpenGPS.Properties.Resources.ABLineOff;
+            //        }
+
+            //        catch (Exception e)
+            //        {
+            //            var form = new FormTimedMessage(2000, gStr.gsABLineFileIsCorrupt, gStr.gsButFieldIsLoaded);
+            //            form.Show();
+            //            WriteErrorLog("Load AB Line" + e.ToString());
+
+            //        }
+            //    }
+            //}
+            //// CurveLine  -------------------------------------------------------------------------------------------------
+
+            ////Either exit or update running save
+            //fileAndDirectory = fieldsDirectory + currentFieldDirectory + "\\CurveLine.txt";
+            //if (!File.Exists(fileAndDirectory))
+            //{
+            //    var form = new FormTimedMessage(2000, gStr.gsMissingABCurveFile, gStr.gsButFieldIsLoaded);
+            //    form.Show();
+            //}
+
+            //else
+            //{
+            //    using (StreamReader reader = new StreamReader(fileAndDirectory))
+            //    {
+            //        try
+            //        {
+            //            //read header
+            //            line = reader.ReadLine();
+
+            //            // get the average heading
+            //            line = reader.ReadLine();
+            //            curve.aveLineHeading = double.Parse(line, CultureInfo.InvariantCulture);
+
+
+            //            line = reader.ReadLine();
+            //            int numPoints = int.Parse(line);
+
+            //            if (numPoints > 0)
+            //            {
+            //                curve.refList?.Clear();
+
+            //                //load the line
+            //                for (int i = 0; i < numPoints; i++)
+            //                {
+            //                    line = reader.ReadLine();
+            //                    string[] words = line.Split(',');
+            //                    vec3 vecPt = new vec3(
+            //                    double.Parse(words[0], CultureInfo.InvariantCulture),
+            //                    double.Parse(words[1], CultureInfo.InvariantCulture),
+            //                    double.Parse(words[2], CultureInfo.InvariantCulture));
+
+            //                    curve.refList.Add(vecPt);
+            //                }
+            //            }
+            //        }
+
+            //        catch (Exception e)
+            //        {
+            //            var form = new FormTimedMessage(2000, gStr.gsCurveLineFileIsCorrupt, gStr.gsButFieldIsLoaded);
+            //            form.Show();
+            //            WriteErrorLog("Load Boundary Line" + e.ToString());
+
+            //        }
+            //    }
+            //}
+
             //section patches
             fileAndDirectory = fieldsDirectory + currentFieldDirectory + "\\Sections.txt";
             if (!File.Exists(fileAndDirectory))
@@ -888,82 +1428,6 @@ public void FileOpenField(string _openType)
             }
 
 
-            // ABLine -------------------------------------------------------------------------------------------------
-
-            //Either exit or update running save
-            fileAndDirectory = fieldsDirectory + currentFieldDirectory + "\\ABLine.txt";
-            if (!File.Exists(fileAndDirectory))
-            {
-                var form = new FormTimedMessage(2000, gStr.gsMissingABLinesFile, gStr.gsButFieldIsLoaded);
-                form.Show();
-            }
-
-            else
-            {
-                using (StreamReader reader = new StreamReader(fileAndDirectory))
-                {
-                    try
-                    {
-                        ABLine.isABLineLoaded = false;
-
-                        //read header
-                        line = reader.ReadLine();
-
-                        line = reader.ReadLine();
-                        bool isAB = bool.Parse(line);
-
-                        if (isAB)
-                        {
-                            //Heading  , ,refPoint2x,z                    
-                            line = reader.ReadLine();
-                            ABLine.abHeading = double.Parse(line, CultureInfo.InvariantCulture);
-
-                            //refPoint1x,z
-                            line = reader.ReadLine();
-                            string[] words = line.Split(',');
-                            ABLine.refPoint1.easting = double.Parse(words[0], CultureInfo.InvariantCulture);
-                            ABLine.refPoint1.northing = double.Parse(words[1], CultureInfo.InvariantCulture);
-
-                            //refPoint2x,z
-                            line = reader.ReadLine();
-                            words = line.Split(',');
-                            ABLine.refPoint2.easting = double.Parse(words[0], CultureInfo.InvariantCulture);
-                            ABLine.refPoint2.northing = double.Parse(words[1], CultureInfo.InvariantCulture);
-
-                            //Tramline
-                            line = reader.ReadLine();
-                            words = line.Split(',');
-                            ABLine.tramPassEvery = int.Parse(words[0]);
-                            ABLine.passBasedOn = int.Parse(words[1]);
-
-                            ABLine.refABLineP1.easting = ABLine.refPoint1.easting - Math.Sin(ABLine.abHeading) * 4000.0;
-                            ABLine.refABLineP1.northing = ABLine.refPoint1.northing - Math.Cos(ABLine.abHeading) * 4000.0;
-
-                            ABLine.refABLineP2.easting = ABLine.refPoint1.easting + Math.Sin(ABLine.abHeading) * 4000.0;
-                            ABLine.refABLineP2.northing = ABLine.refPoint1.northing + Math.Cos(ABLine.abHeading) * 4000.0;
-
-                            ABLine.isABLineLoaded = true;
-
-                        }
-
-                        //clean up from last field maybe
-                        ABLine.isABLineSet = false;
-                        ABLine.isBtnABLineOn = false;
-                        DisableYouTurnButtons();
-                        btnContourPriority.Enabled = true;
-                        btnABLine.Image = global::AgOpenGPS.Properties.Resources.ABLineOff;
-                    }
-
-                    catch (Exception e)
-                    {
-                        var form = new FormTimedMessage(2000, gStr.gsABLineFileIsCorrupt, gStr.gsButFieldIsLoaded);
-                        form.Show();
-                        WriteErrorLog("Load AB Line" + e.ToString());
-
-                    }
-                }
-            }
-
             //Boundaries
             //Either exit or update running save
                 fileAndDirectory = fieldsDirectory + currentFieldDirectory + "\\Boundary.txt";
@@ -1150,61 +1614,7 @@ public void FileOpenField(string _openType)
                 }
             }
 
-            // CurveLine  -------------------------------------------------------------------------------------------------
-
-            //Either exit or update running save
-            fileAndDirectory = fieldsDirectory + currentFieldDirectory + "\\CurveLine.txt";
-            if (!File.Exists(fileAndDirectory))
-            {
-                var form = new FormTimedMessage(2000, gStr.gsMissingABCurveFile, gStr.gsButFieldIsLoaded);
-                form.Show();
-            }
-
-            else
-            {
-                using (StreamReader reader = new StreamReader(fileAndDirectory))
-                {
-                    try
-                    {
-                        //read header
-                        line = reader.ReadLine();
-
-                        // get the average heading
-                        line = reader.ReadLine();
-                        curve.aveLineHeading = double.Parse(line, CultureInfo.InvariantCulture);
-
-
-                        line = reader.ReadLine();
-                        int numPoints = int.Parse(line);
-
-                        if (numPoints > 0)
-                        {
-                            curve.refList?.Clear();
 
-                            //load the line
-                            for (int i = 0; i < numPoints; i++)
-                            {
-                                line = reader.ReadLine();
-                                string[] words = line.Split(',');
-                                vec3 vecPt = new vec3(
-                                double.Parse(words[0], CultureInfo.InvariantCulture),
-                                double.Parse(words[1], CultureInfo.InvariantCulture),
-                                double.Parse(words[2], CultureInfo.InvariantCulture));
-
-                                curve.refList.Add(vecPt);
-                            }
-                        }
-                    }
-
-                    catch (Exception e)
-                    {
-                        var form = new FormTimedMessage(2000, gStr.gsCurveLineFileIsCorrupt, gStr.gsButFieldIsLoaded);
-                        form.Show();
-                        WriteErrorLog("Load Boundary Line" + e.ToString());
-
-                    }
-                }
-            }
         }//end of open file
 
         //creates the field file when starting new field
@@ -1578,89 +1988,89 @@ public void FileSaveFlags()
         }
 
         //save all the flag markers
-        public void FileSaveABLine()
-        {
-            //Saturday, February 11, 2017  -->  7:26:52 AM
+        //public void FileSaveABLine()
+        //{
+        //    //Saturday, February 11, 2017  -->  7:26:52 AM
 
-            //get the directory and make sure it exists, create if not
-            string dirField = fieldsDirectory + currentFieldDirectory + "\\";
+        //    //get the directory and make sure it exists, create if not
+        //    string dirField = fieldsDirectory + currentFieldDirectory + "\\";
 
-            string directoryName = Path.GetDirectoryName(dirField);
-            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-            { Directory.CreateDirectory(directoryName); }
+        //    string directoryName = Path.GetDirectoryName(dirField);
+        //    if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
+        //    { Directory.CreateDirectory(directoryName); }
 
-            //use Streamwriter to create and overwrite existing ABLine file
-            using (StreamWriter writer = new StreamWriter(dirField + "ABLine.txt"))
-            {
-                try
-                {
-                    //write out the ABLine
-                    writer.WriteLine("$ABLine");
+        //    //use Streamwriter to create and overwrite existing ABLine file
+        //    using (StreamWriter writer = new StreamWriter(dirField + "ABLine.txt"))
+        //    {
+        //        try
+        //        {
+        //            //write out the ABLine
+        //            writer.WriteLine("$ABLine");
 
-                    //true or false if ABLine is set
-                    if (ABLine.isABLineSet) writer.WriteLine(true);
-                    else writer.WriteLine(false);
+        //            //true or false if ABLine is set
+        //            if (ABLine.isABLineSet) writer.WriteLine(true);
+        //            else writer.WriteLine(false);
 
-                    writer.WriteLine(ABLine.abHeading.ToString(CultureInfo.InvariantCulture));
-                    writer.WriteLine(ABLine.refPoint1.easting.ToString(CultureInfo.InvariantCulture) + "," + ABLine.refPoint1.northing.ToString(CultureInfo.InvariantCulture));
-                    writer.WriteLine(ABLine.refPoint2.easting.ToString(CultureInfo.InvariantCulture) + "," + ABLine.refPoint2.northing.ToString(CultureInfo.InvariantCulture));
-                    writer.WriteLine(ABLine.tramPassEvery.ToString(CultureInfo.InvariantCulture) + "," + ABLine.passBasedOn.ToString(CultureInfo.InvariantCulture));
-                }
+        //            writer.WriteLine(ABLine.abHeading.ToString(CultureInfo.InvariantCulture));
+        //            writer.WriteLine(ABLine.refPoint1.easting.ToString(CultureInfo.InvariantCulture) + "," + ABLine.refPoint1.northing.ToString(CultureInfo.InvariantCulture));
+        //            writer.WriteLine(ABLine.refPoint2.easting.ToString(CultureInfo.InvariantCulture) + "," + ABLine.refPoint2.northing.ToString(CultureInfo.InvariantCulture));
+        //            writer.WriteLine(ABLine.tramPassEvery.ToString(CultureInfo.InvariantCulture) + "," + ABLine.passBasedOn.ToString(CultureInfo.InvariantCulture));
+        //        }
 
-                catch (Exception e)
-                {
-                    Console.WriteLine(e.Message + "\n Cannot write to file.");
-                    WriteErrorLog("Saving AB Line" + e.ToString());
+        //        catch (Exception e)
+        //        {
+        //            Console.WriteLine(e.Message + "\n Cannot write to file.");
+        //            WriteErrorLog("Saving AB Line" + e.ToString());
 
-                    return;
-                }
+        //            return;
+        //        }
 
-            }
-        }
+        //    }
+        //}
 
         //save all the flag markers
-        public void FileSaveCurveLine()
-        {
-            //Saturday, February 11, 2017  -->  7:26:52 AM
+        //public void FileSaveCurveLine()
+        //{
+        //    //Saturday, February 11, 2017  -->  7:26:52 AM
 
-            //get the directory and make sure it exists, create if not
-            string dirField = fieldsDirectory + currentFieldDirectory + "\\";
+        //    //get the directory and make sure it exists, create if not
+        //    string dirField = fieldsDirectory + currentFieldDirectory + "\\";
 
-            string directoryName = Path.GetDirectoryName(dirField);
-            if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
-            { Directory.CreateDirectory(directoryName); }
+        //    string directoryName = Path.GetDirectoryName(dirField);
+        //    if ((directoryName.Length > 0) && (!Directory.Exists(directoryName)))
+        //    { Directory.CreateDirectory(directoryName); }
 
-            //use Streamwriter to create and overwrite existing ABLine file
-            using (StreamWriter writer = new StreamWriter(dirField + "CurveLine.txt"))
-            {
-                try
-                {
-                    //write out the ABLine
-                    writer.WriteLine("$CurveLine");
+        //    //use Streamwriter to create and overwrite existing ABLine file
+        //    using (StreamWriter writer = new StreamWriter(dirField + "CurveLine.txt"))
+        //    {
+        //        try
+        //        {
+        //            //write out the ABLine
+        //            writer.WriteLine("$CurveLine");
 
-                    //write out the aveheading
-                    writer.WriteLine(curve.aveLineHeading.ToString(CultureInfo.InvariantCulture));
+        //            //write out the aveheading
+        //            writer.WriteLine(curve.aveLineHeading.ToString(CultureInfo.InvariantCulture));
 
-                    //write out the points of ref line
-                    writer.WriteLine(curve.refList.Count.ToString(CultureInfo.InvariantCulture));
-                    if (curve.refList.Count > 0)
-                    {
-                        for (int j = 0; j < curve.refList.Count; j++)
-                            writer.WriteLine(Math.Round(curve.refList[j].easting, 3).ToString(CultureInfo.InvariantCulture) + "," +
-                                                Math.Round(curve.refList[j].northing, 3).ToString(CultureInfo.InvariantCulture) + "," +
-                                                    Math.Round(curve.refList[j].heading, 5).ToString(CultureInfo.InvariantCulture));
-                    }
-                }
+        //            //write out the points of ref line
+        //            writer.WriteLine(curve.refList.Count.ToString(CultureInfo.InvariantCulture));
+        //            if (curve.refList.Count > 0)
+        //            {
+        //                for (int j = 0; j < curve.refList.Count; j++)
+        //                    writer.WriteLine(Math.Round(curve.refList[j].easting, 3).ToString(CultureInfo.InvariantCulture) + "," +
+        //                                        Math.Round(curve.refList[j].northing, 3).ToString(CultureInfo.InvariantCulture) + "," +
+        //                                            Math.Round(curve.refList[j].heading, 5).ToString(CultureInfo.InvariantCulture));
+        //            }
+        //        }
 
-                catch (Exception e)
-                {
-                    WriteErrorLog("Saving Curve Line" + e.ToString());
+        //        catch (Exception e)
+        //        {
+        //            WriteErrorLog("Saving Curve Line" + e.ToString());
 
-                    return;
-                }
+        //            return;
+        //        }
 
-            }
-        }
+        //    }
+        //}
 
         //save nmea sentences
         public void FileSaveNMEA()
diff --git a/SourceCode/GPS/Forms/UDPComm.Designer.cs b/SourceCode/GPS/Forms/UDPComm.Designer.cs
index ae692fa4a..ebe0cfd06 100644
--- a/SourceCode/GPS/Forms/UDPComm.Designer.cs
+++ b/SourceCode/GPS/Forms/UDPComm.Designer.cs
@@ -222,6 +222,161 @@ private void UpdateRecvMessage(int port, byte[] data)
             }
         }
 
+        #region keystrokes
+        //keystrokes for easy and quick startup
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            //reset Sim
+            if (keyData == Keys.L)
+            {
+                btnResetSim.PerformClick();
+                return true;
+            }
+
+            //speed up
+            if (keyData == Keys.Up)
+            {
+                sim.stepDistance += 0.05;
+                if (sim.stepDistance > 4.8) sim.stepDistance = 4.8;
+                hsbarStepDistance.Value = (int)(sim.stepDistance * 10.0 * fixUpdateHz);
+
+                return true;
+            }
+
+            //Stop
+            if (keyData == Keys.OemPeriod)
+            {
+                sim.stepDistance = 0;
+                hsbarStepDistance.Value = 0;
+                return true;
+            }
+
+            //slow down
+            if (keyData == Keys.Down)
+            {
+                sim.stepDistance -= 0.05;
+                if (sim.stepDistance < 0) sim.stepDistance = 0;
+                hsbarStepDistance.Value = (int)(sim.stepDistance * 10.0 * fixUpdateHz);
+                return true;
+            }
+
+            //turn right
+            if (keyData == Keys.Right)
+            {
+                sim.steerAngle++;
+                if (sim.steerAngle > 30) sim.steerAngle = 30;
+                if (sim.steerAngle < -30) sim.steerAngle = -30;
+                sim.steerAngleScrollBar = sim.steerAngle;
+                btnResetSteerAngle.Text = sim.steerAngle.ToString();
+                hsbarSteerAngle.Value = (int)(10 * sim.steerAngle) + 300;
+                return true;
+            }
+
+            //turn left
+            if (keyData == Keys.Left)
+            {
+                sim.steerAngle--;
+                if (sim.steerAngle > 30) sim.steerAngle = 30;
+                if (sim.steerAngle < -30) sim.steerAngle = -30;
+                sim.steerAngleScrollBar = sim.steerAngle;
+                btnResetSteerAngle.Text = sim.steerAngle.ToString();
+                hsbarSteerAngle.Value = (int)(10 * sim.steerAngle) + 300;
+                return true;
+            }
+
+            //zero steering
+            if (keyData == Keys.OemQuestion)
+            {
+                sim.steerAngle = 0.0;
+                sim.steerAngleScrollBar = sim.steerAngle;
+                btnResetSteerAngle.Text = sim.steerAngle.ToString();
+                hsbarSteerAngle.Value = (int)(10 * sim.steerAngle) + 300;
+                return true;
+            }
+
+            if (keyData == (Keys.F))
+            {
+                JobNewOpenResume();
+                return true;    // indicate that you handled this keystroke
+            }
+
+            if (keyData == (Keys.A)) //autosteer button on off
+            {
+                btnAutoSteer.PerformClick();
+                return true;    // indicate that you handled this keystroke
+            }
+
+            //if (keyData == (Keys.S)) //open the steer chart
+            //{
+            //    toolstripAutoSteerConfig.PerformClick();
+            //    return true;    // indicate that you handled this keystroke
+            //}
+
+            if (keyData == (Keys.S)) //open the steer chart
+            {
+                btnContourPriority.PerformClick();
+                return true;    // indicate that you handled this keystroke
+            }
+
+            if (keyData == (Keys.C)) //open the steer chart
+            {
+                toolStripAutoSteerChart.PerformClick();
+                return true;    // indicate that you handled this keystroke
+            }
+
+            if (keyData == (Keys.V)) //open the vehicle Settings
+            {
+                toolstripVehicleConfig.PerformClick();
+                return true;    // indicate that you handled this keystroke
+            }
+
+            if (keyData == (Keys.U)) //open the UTurn Settings
+            {
+                toolstripYouTurnConfig.PerformClick();
+                return true;    // indicate that you handled this keystroke
+            }
+
+            if (keyData == (Keys.NumPad1)) //auto section on off
+            {
+                btnSectionOffAutoOn.PerformClick();
+                return true;    // indicate that you handled this keystroke
+            }
+
+            if (keyData == (Keys.N)) //auto section on off
+            {
+                btnSectionOffAutoOn.PerformClick();
+                return true;    // indicate that you handled this keystroke
+            }
+
+            if (keyData == (Keys.NumPad0)) //auto section on off
+            {
+                btnManualOffOn.PerformClick();
+                return true;    // indicate that you handled this keystroke
+            }
+
+            if (keyData == (Keys.M)) //auto section on off
+            {
+                btnManualOffOn.PerformClick();
+                return true;    // indicate that you handled this keystroke
+            }
+
+            if (keyData == (Keys.G)) // Flag click
+            {
+                btnFlag.PerformClick();
+                return true;    // indicate that you handled this keystroke
+            }
+
+            if (keyData == (Keys.P)) // Snap/Prioritu click
+            {
+                btnContourPriority.PerformClick();
+                return true;    // indicate that you handled this keystroke
+            }
+
+            // Call the base class
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+        #endregion
+
         #region Gesture
 
         // Private variables used to maintain the state of gestures
@@ -580,135 +735,5 @@ private bool DecodeGesture(ref Message m)
 
         #endregion Gesture
 
-        #region keystrokes
-        //keystrokes for easy and quick startup
-        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
-        {
-            //reset Sim
-            if (keyData == Keys.L)
-            {
-                btnResetSim.PerformClick();
-                return true;
-            }
-
-            //speed up
-            if (keyData == Keys.Up)
-            {
-                sim.stepDistance += 0.05;
-                if (sim.stepDistance > 4.8) sim.stepDistance = 4.8;
-                hsbarStepDistance.Value = (int)(sim.stepDistance * 10.0 * fixUpdateHz);
-
-                return true;
-            }
-
-            //Stop
-            if (keyData == Keys.OemPeriod)
-            {
-                sim.stepDistance = 0;
-                hsbarStepDistance.Value = 0;
-                return true;
-            }
-
-            //slow down
-            if (keyData == Keys.Down)
-            {
-                sim.stepDistance -= 0.05;
-                if (sim.stepDistance < 0) sim.stepDistance = 0;
-                hsbarStepDistance.Value = (int)(sim.stepDistance * 10.0 * fixUpdateHz);
-                return true;
-            }
-
-            //turn right
-            if (keyData == Keys.Right)
-            {
-                sim.steerAngle++;
-                if (sim.steerAngle > 30) sim.steerAngle = 30;
-                if (sim.steerAngle < -30) sim.steerAngle = -30;
-                sim.steerAngleScrollBar = sim.steerAngle;
-                btnResetSteerAngle.Text = sim.steerAngle.ToString();
-                hsbarSteerAngle.Value = (int)(10 * sim.steerAngle) + 300;
-                return true;
-            }
-
-            //turn left
-            if (keyData == Keys.Left)
-            {
-                sim.steerAngle--;
-                if (sim.steerAngle > 30) sim.steerAngle = 30;
-                if (sim.steerAngle < -30) sim.steerAngle = -30;
-                sim.steerAngleScrollBar = sim.steerAngle;
-                btnResetSteerAngle.Text = sim.steerAngle.ToString();
-                hsbarSteerAngle.Value = (int)(10 * sim.steerAngle) + 300;
-                return true;
-            }
-
-            //zero steering
-            if (keyData == Keys.OemQuestion)
-            {
-                sim.steerAngle = 0.0;
-                sim.steerAngleScrollBar = sim.steerAngle;
-                btnResetSteerAngle.Text = sim.steerAngle.ToString();
-                hsbarSteerAngle.Value = (int)(10 * sim.steerAngle) + 300;
-                return true;
-            }
-
-            if (keyData == (Keys.F))
-            {
-                JobNewOpenResume();
-                return true;    // indicate that you handled this keystroke
-            }
-
-            if (keyData == (Keys.A)) //autosteer button on off
-            {
-                btnAutoSteer.PerformClick();
-                return true;    // indicate that you handled this keystroke
-            }
-
-            //if (keyData == (Keys.S)) //open the steer chart
-            //{
-            //    toolstripAutoSteerConfig.PerformClick();
-            //    return true;    // indicate that you handled this keystroke
-            //}
-
-            if (keyData == (Keys.S)) //open the steer chart
-            {
-                btnContourPriority.PerformClick();
-                return true;    // indicate that you handled this keystroke
-            }
-
-            if (keyData == (Keys.C)) //open the steer chart
-            {
-                toolStripAutoSteerChart.PerformClick();
-                return true;    // indicate that you handled this keystroke
-            }
-
-            if (keyData == (Keys.V)) //open the vehicle Settings
-            {
-                toolstripVehicleConfig.PerformClick();
-                return true;    // indicate that you handled this keystroke
-            }
-
-            if (keyData == (Keys.U)) //open the UTurn Settings
-            {
-                toolstripYouTurnConfig.PerformClick();
-                return true;    // indicate that you handled this keystroke
-            }
-
-            if (keyData == (Keys.NumPad1)) //auto section on off
-            {
-                btnSectionOffAutoOn.PerformClick();
-                return true;    // indicate that you handled this keystroke
-            }
-
-            if (keyData == (Keys.G)) // Flag click
-            {
-                btnFlag.PerformClick();
-                return true;    // indicate that you handled this keystroke
-            }
-
-            // Call the base class
-            return base.ProcessCmdKey(ref msg, keyData);
-        }
-        #endregion
     }
 }
diff --git a/SourceCode/GPS/Properties/Resources.Designer.cs b/SourceCode/GPS/Properties/Resources.Designer.cs
index b41674daa..f167822bb 100644
--- a/SourceCode/GPS/Properties/Resources.Designer.cs
+++ b/SourceCode/GPS/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace AgOpenGPS.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -60,6 +60,16 @@ internal Resources() {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ABLineCycle {
+            get {
+                object obj = ResourceManager.GetObject("ABLineCycle", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -80,6 +90,16 @@ internal static System.Drawing.Bitmap ABLineOn {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ABLineTurnOff {
+            get {
+                object obj = ResourceManager.GetObject("ABLineTurnOff", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -90,6 +110,25 @@ internal static System.Drawing.Bitmap ABSmooth {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap AddNew {
+            get {
+                object obj = ResourceManager.GetObject("AddNew", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
+        /// </summary>
+        internal static System.IO.UnmanagedMemoryStream Alarm10 {
+            get {
+                return ResourceManager.GetStream("Alarm10", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -450,6 +489,16 @@ internal static System.Drawing.Bitmap CurveOn {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap CurveTurnOff {
+            get {
+                object obj = ResourceManager.GetObject("CurveTurnOff", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -460,6 +509,16 @@ internal static System.Drawing.Bitmap Custom {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap displayMenu {
+            get {
+                object obj = ResourceManager.GetObject("displayMenu", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -520,6 +579,16 @@ internal static System.Drawing.Bitmap FileExplorerWindows {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap fileMenu {
+            get {
+                object obj = ResourceManager.GetObject("fileMenu", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -530,6 +599,16 @@ internal static System.Drawing.Bitmap FileNew {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap FileNewAndGo {
+            get {
+                object obj = ResourceManager.GetObject("FileNewAndGo", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -1200,6 +1279,26 @@ internal static System.Drawing.Bitmap Stop {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SwitchOff {
+            get {
+                object obj = ResourceManager.GetObject("SwitchOff", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap SwitchOn {
+            get {
+                object obj = ResourceManager.GetObject("SwitchOn", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/SourceCode/GPS/Properties/Resources.resx b/SourceCode/GPS/Properties/Resources.resx
index 53b02c044..17462b7ad 100644
--- a/SourceCode/GPS/Properties/Resources.resx
+++ b/SourceCode/GPS/Properties/Resources.resx
@@ -118,421 +118,451 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="ABLineOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ABLineOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ZoomIn48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ZoomIn48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ABLineOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ABLineOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Youturn80" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Youturn80.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ABSmooth" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ABSmooth.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SetupStatusStrip" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\SetupStatusStrip.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="AreaSide" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\AreaSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="RateControlOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\RateControlOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArrowLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ArrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SectionMasterOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\SectionMasterOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArrowRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ArrowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SteerAhead" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\SteerAhead.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArrowTurnLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ArrowTurnLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Play" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ArrowTurnRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ArrowTurnRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SectionSettingsBackground" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\SectionSettingsBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="AutoGo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\AutoGo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="CurveTurnOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\CurveTurnOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ArrowTurnLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ArrowTurnLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="AutoSteerConf" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\btnImages\AutoSteerConf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="AutoSteerOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\AutoSteerOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Settings48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Settings48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="AutoSteerOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\AutoSteerOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="VehicleSettingsAntenna" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\VehicleSettingsAntenna.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="AutoStop" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\AutoStop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ContourPriorityRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ContourPriorityRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Batman48" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Batman48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Camera3D64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Camera3D64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="BoundaryDelete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\BoundaryDelete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="TiltDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\TiltDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="BoundaryLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\btnImages\BoundaryLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="BoundaryMenu" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\BoundaryMenu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FileOpen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FileOpen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="BoundaryOuter" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\BoundaryOuter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="boundaryPause" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\boundaryPause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="BoundaryRecord" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\btnImages\BoundaryRecord.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="BoundaryRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\BoundaryRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Snap2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Snap2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Camera2D64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Camera2D64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="WideReturn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\WideReturn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Camera3D64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Camera3D64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Extents" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Extents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Camera54" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Camera54.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FlagRed" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FlagRed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CameraNorth64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\CameraNorth64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="DnArrow64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\DnArrow64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Cancel64" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\btnImages\Cancel64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Chart" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Chart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="TiltUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\TiltUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Color" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="AreaSide" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\AreaSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ColorField" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ColorField.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="LetterABlue" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\LetterABlue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ComPorts" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ComPorts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Custom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Custom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ContourOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ContourOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FlagYel" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FlagYel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ContourOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ContourOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="HideContour" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\HideContour.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ContourPriorityLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ContourPriorityLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="MakeBoundary" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\MakeBoundary.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ContourPriorityRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ContourPriorityRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="BoundaryMenu" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\BoundaryMenu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CurveOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\CurveOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Chart" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Chart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CurveOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\CurveOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ZoomOut48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ZoomOut48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Custom" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Custom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="BoundaryRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\BoundaryRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="DnArrow64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\DnArrow64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="BoundaryDelete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\BoundaryDelete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Examples" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Examples.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Rate64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Rate64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Extents" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Extents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Settings641" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Settings64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FileDelete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FileDelete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="RecPath" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\RecPath.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FileDontSave" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FileDontSave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="back_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\back-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FileExplorerWindows" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FileExplorerWindows.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="PointStart" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\PointStart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FileNew" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FileNew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ArrowRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ArrowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FileOpen" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FileOpen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ComPorts" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ComPorts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FilePrevious" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FilePrevious.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Headland" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Headland.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FileSave" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FileSave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="PeriDone" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\PeriDone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FileUse" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FileUse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="MakeBoundaryContour" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\MakeBoundaryContour.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FlagDelete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FlagDelete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="start" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\start.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FlagDeleteAll" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FlagDeleteAll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ArrowLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ArrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FlagGrn" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FlagGrn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Settings64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Settings64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FlagRed" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FlagRed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ManualOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ManualOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FlagYel" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FlagYel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="KeyHole" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\KeyHole.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FlowMeterDual" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FlowMeterDual.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Examples" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Examples.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FlowMeterSingle" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\FlowMeterSingle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="PointDelete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\PointDelete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="GoogleEarth" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\GoogleEarth.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="UpArrow64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\UpArrow64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="GoogleEarth1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\GoogleEarth.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SettingsGear32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\SettingsGear32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Headland" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Headland.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="LonLat" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\LonLat.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="HideContour" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\HideContour.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ContourPriorityLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ContourPriorityLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Home64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Home64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FlagDeleteAll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FlagDeleteAll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="YouTurnNo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\YouTurnNo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SwitchOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\SwitchOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="AutoStop" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\AutoStop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="displayMenu" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\displayMenu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ImplementSettings" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\btnImages\ImplementSettings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="JobActive" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\JobActive.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Batman48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Batman48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="KeyHole" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\KeyHole.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ABLineTurnOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ABLineTurnOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="LetterABlue" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\LetterABlue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ZeroPitchRoll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ZeroPitchRoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SectionMasterOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\SectionMasterOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="radar-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\radar-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ArrowTurnRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ArrowTurnRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="LetterBBlue" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\btnImages\LetterBBlue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="LonLat" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\LonLat.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ToolSettings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ToolSettings.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="MakeBoundary" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\MakeBoundary.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="RateControlOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\RateControlOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="MakeBoundaryContour" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\MakeBoundaryContour.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FlowMeterDual" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FlowMeterDual.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ManualOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ManualOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="YouTurnBackground" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\YouTurnBackground.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ManualOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ManualOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ABLineOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ABLineOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Menu5" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Menu5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Youturn64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Youturn64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="NtripSettings" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\NtripSettings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="BoundaryOuter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\BoundaryOuter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="OK64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\OK64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Home64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Home64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="PeriArea" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\PeriArea.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="AutoGo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\AutoGo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="PeriDone" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\PeriDone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="tire" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\tire.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="PeriDraw" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\PeriDraw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FileUse" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FileUse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="PivotBehind" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\PivotBehind.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="GoogleEarth1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\GoogleEarth.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="AutoSteerOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\AutoSteerOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="NtripSettings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\NtripSettings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ManualOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ManualOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="PivotAhead" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\btnImages\PivotAhead.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="PivotBehind" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\PivotBehind.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="fileMenu" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\fileMenu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Play" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="VehHitched64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\VehHitched64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="PointDelete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\PointDelete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="JobActive" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\JobActive.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ABSmooth" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ABSmooth.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="AutoSteerOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\AutoSteerOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="PointDone" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\btnImages\PointDone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="PointStart" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\PointStart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="WorkSwitch" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\WorkSwitch.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Start48" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Start48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Rate1Select" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\btnImages\Rate1Select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Rate64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Rate64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="RateControlOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\RateControlOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="RateControlOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\RateControlOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="CameraNorth64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\CameraNorth64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="RateSelect2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\RateSelect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FilePrevious" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FilePrevious.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="RecPath" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\RecPath.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Webcam" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Webcam.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Satellite64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Satellite64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="CurveOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\CurveOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SectionMasterOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\SectionMasterOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ABLineOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ABLineOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SectionMasterOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\SectionMasterOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FileSave" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FileSave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SectionSettingsBackground" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\SectionSettingsBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SteerBehind" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\SteerBehind.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="SemiCircle" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\btnImages\SemiCircle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Settings48" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Settings48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Settings64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Settings64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Settings641" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Settings64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="SettingsGear32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\SettingsGear32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="SettingsGear64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\SettingsGear64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Camera54" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Camera54.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SetupStatusStrip" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\SetupStatusStrip.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SwitchOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\SwitchOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Snap2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Snap2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SpecialFunctions" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\SpecialFunctions.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ColorField" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ColorField.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Start48" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Start48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="AddNew" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\AddNew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Start64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Start64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="TripOdometer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\TripOdometer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SteerAhead" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\SteerAhead.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="YouTurnReverse" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\YouTurnReverse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SteerBehind" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\SteerBehind.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FlagDelete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FlagDelete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Stop" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FileDelete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FileDelete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="TiltDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\TiltDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="OK64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\OK64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="TiltUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\TiltUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="RateSelect2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\RateSelect2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ToolSettings" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ToolSettings.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FileExplorerWindows" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FileExplorerWindows.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="TripOdometer" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\TripOdometer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="GoogleEarth" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\GoogleEarth.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="UDPConfig" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\UDPConfig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="PeriDraw" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\PeriDraw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="UpArrow64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\UpArrow64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="VehicleSettings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\VehicleSettings.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="VehAft64" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\btnImages\VehAft64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="VehFore64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\VehFore64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="boundaryStop" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\boundaryStop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="VehHitched64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\VehHitched64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FlagGrn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FlagGrn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="boundaryPlay" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\boundaryPlay.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="VehRigid64" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\btnImages\VehRigid64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="VehicleSettings" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\VehicleSettings.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ABLineCycle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ABLineCycle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="VehicleSettingsAntenna" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\VehicleSettingsAntenna.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Webcam" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Webcam.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SpecialFunctions" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\SpecialFunctions.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="WideReturn" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\WideReturn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FlowMeterSingle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FlowMeterSingle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="WorkSwitch" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\WorkSwitch.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FileDontSave" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FileDontSave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="YouTurnBackground" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\YouTurnBackground.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FileNew" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FileNew.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="YouTurnNo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\YouTurnNo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Start64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Start64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="YouTurnReverse" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\YouTurnReverse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="gyro" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\gyro.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Youturn64" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Youturn64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Color" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Youturn80" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Youturn80.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Menu5" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Menu5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ZeroPitchRoll" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ZeroPitchRoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="VehFore64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\VehFore64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ZoomIn48" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ZoomIn48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ContourOn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ContourOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ZoomOut48" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\ZoomOut48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="skull" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\skull.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="back_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\back-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="UDPConfig" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\UDPConfig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="boundaryPause" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\boundaryPause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Camera2D64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Camera2D64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="boundaryPlay" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\boundaryPlay.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="CurveOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\CurveOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="boundaryStop" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\boundaryStop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="tree" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\tree.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="gyro" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\gyro.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SettingsGear64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\SettingsGear64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="radar-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\radar-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ContourOff" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\ContourOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="skull" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\skull.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="PeriArea" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\PeriArea.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="start" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\start.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Satellite64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\Satellite64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="tire" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\tire.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FileNewAndGo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\btnImages\FileNewAndGo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="tree" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\tree.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Alarm10" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Alarm10.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/SourceCode/GPS/Properties/Settings.Designer.cs b/SourceCode/GPS/Properties/Settings.Designer.cs
index 81a8cfbdb..4be629bdd 100644
--- a/SourceCode/GPS/Properties/Settings.Designer.cs
+++ b/SourceCode/GPS/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace AgOpenGPS.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.2.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -1069,13 +1069,13 @@ public double setRate_rateLeft {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool setDisplay_isLargePanel {
+        [global::System.Configuration.DefaultSettingValueAttribute("1")]
+        public int setDisplay_panelStatus {
             get {
-                return ((bool)(this["setDisplay_isLargePanel"]));
+                return ((int)(this["setDisplay_panelStatus"]));
             }
             set {
-                this["setDisplay_isLargePanel"] = value;
+                this["setDisplay_panelStatus"] = value;
             }
         }
         
@@ -1090,5 +1090,17 @@ public bool isJRK {
                 this["isJRK"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("2")]
+        public int setDisplay_lineWidth {
+            get {
+                return ((int)(this["setDisplay_lineWidth"]));
+            }
+            set {
+                this["setDisplay_lineWidth"] = value;
+            }
+        }
     }
 }
diff --git a/SourceCode/GPS/Properties/Settings.settings b/SourceCode/GPS/Properties/Settings.settings
index 8c063928b..baabbc527 100644
--- a/SourceCode/GPS/Properties/Settings.settings
+++ b/SourceCode/GPS/Properties/Settings.settings
@@ -263,11 +263,14 @@
     <Setting Name="setRate_rateLeft" Type="System.Double" Scope="User">
       <Value Profile="(Default)">50</Value>
     </Setting>
-    <Setting Name="setDisplay_isLargePanel" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
+    <Setting Name="setDisplay_panelStatus" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">1</Value>
     </Setting>
     <Setting Name="isJRK" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="setDisplay_lineWidth" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">2</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/SourceCode/GPS/Resources/Alarm10.wav b/SourceCode/GPS/Resources/Alarm10.wav
new file mode 100644
index 000000000..bd0d7e433
Binary files /dev/null and b/SourceCode/GPS/Resources/Alarm10.wav differ
diff --git a/SourceCode/GPS/aChangeLog.txt b/SourceCode/GPS/aChangeLog.txt
index fea141720..893f3ac9d 100644
--- a/SourceCode/GPS/aChangeLog.txt
+++ b/SourceCode/GPS/aChangeLog.txt
@@ -3,6 +3,12 @@
 * Source contains all packages for release to be created
 * Ready to start intial releases.
 * Add tool width to Touch lines.
+* Single curves and AB Lines no longer saved in separate file
+* CurveLines and ABLines text files contain all lines and are all loaded into lists.
+* Added no panel option
+* Page thru all lines or curves depending on guidance mode
+* Made uturn controls much smaller. 
+* Added distance alarm at 20 meters before uturn.
 
 v3.0 October
 
diff --git a/SourceCode/GPS/app.config b/SourceCode/GPS/app.config
index fd8c489d2..023b1765c 100644
--- a/SourceCode/GPS/app.config
+++ b/SourceCode/GPS/app.config
@@ -565,12 +565,15 @@
             <setting name="setRate_rateLeft" serializeAs="String">
                 <value>50</value>
             </setting>
-            <setting name="setDisplay_isLargePanel" serializeAs="String">
-                <value>False</value>
+            <setting name="setDisplay_panelStatus" serializeAs="String">
+                <value>1</value>
             </setting>
             <setting name="isJRK" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="setDisplay_lineWidth" serializeAs="String">
+                <value>2</value>
+            </setting>
         </AgOpenGPS.Properties.Settings>
   </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/SourceCode/GPS/btnImages/ABLineCycle.png b/SourceCode/GPS/btnImages/ABLineCycle.png
new file mode 100644
index 000000000..bf2cfc0d4
Binary files /dev/null and b/SourceCode/GPS/btnImages/ABLineCycle.png differ
diff --git a/SourceCode/GPS/btnImages/ABLineTurnOff.png b/SourceCode/GPS/btnImages/ABLineTurnOff.png
new file mode 100644
index 000000000..44a8ecea6
Binary files /dev/null and b/SourceCode/GPS/btnImages/ABLineTurnOff.png differ
diff --git a/SourceCode/GPS/btnImages/AddNew.png b/SourceCode/GPS/btnImages/AddNew.png
new file mode 100644
index 000000000..406daee9b
Binary files /dev/null and b/SourceCode/GPS/btnImages/AddNew.png differ
diff --git a/SourceCode/GPS/btnImages/ArrowLeft.png b/SourceCode/GPS/btnImages/ArrowLeft.png
index 61ed7dc7d..b42c8c5ab 100644
Binary files a/SourceCode/GPS/btnImages/ArrowLeft.png and b/SourceCode/GPS/btnImages/ArrowLeft.png differ
diff --git a/SourceCode/GPS/btnImages/ArrowRight.png b/SourceCode/GPS/btnImages/ArrowRight.png
index 11ead7394..fabe2be1d 100644
Binary files a/SourceCode/GPS/btnImages/ArrowRight.png and b/SourceCode/GPS/btnImages/ArrowRight.png differ
diff --git a/SourceCode/GPS/btnImages/CurveTurnOff.png b/SourceCode/GPS/btnImages/CurveTurnOff.png
new file mode 100644
index 000000000..3113a557a
Binary files /dev/null and b/SourceCode/GPS/btnImages/CurveTurnOff.png differ
diff --git a/SourceCode/GPS/btnImages/FileNewAndGo.png b/SourceCode/GPS/btnImages/FileNewAndGo.png
new file mode 100644
index 000000000..913650b8d
Binary files /dev/null and b/SourceCode/GPS/btnImages/FileNewAndGo.png differ
diff --git a/SourceCode/GPS/btnImages/PointStart.png b/SourceCode/GPS/btnImages/PointStart.png
index b0517bf6a..7fc372872 100644
Binary files a/SourceCode/GPS/btnImages/PointStart.png and b/SourceCode/GPS/btnImages/PointStart.png differ
diff --git a/SourceCode/GPS/btnImages/SwitchOff.png b/SourceCode/GPS/btnImages/SwitchOff.png
index 0f50a3414..83cf46478 100644
Binary files a/SourceCode/GPS/btnImages/SwitchOff.png and b/SourceCode/GPS/btnImages/SwitchOff.png differ
diff --git a/SourceCode/GPS/btnImages/SwitchOn.png b/SourceCode/GPS/btnImages/SwitchOn.png
index 6b82ae045..8c1e6ecec 100644
Binary files a/SourceCode/GPS/btnImages/SwitchOn.png and b/SourceCode/GPS/btnImages/SwitchOn.png differ
diff --git a/SourceCode/GPS/btnImages/displayMenu.png b/SourceCode/GPS/btnImages/displayMenu.png
new file mode 100644
index 000000000..96d160ea7
Binary files /dev/null and b/SourceCode/GPS/btnImages/displayMenu.png differ
diff --git a/SourceCode/GPS/btnImages/fileMenu.png b/SourceCode/GPS/btnImages/fileMenu.png
new file mode 100644
index 000000000..a35fcc235
Binary files /dev/null and b/SourceCode/GPS/btnImages/fileMenu.png differ