From 122d5fb18e8d76827f1fcbe64bba7e7e31dbefa1 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 27 Jul 2020 15:22:36 +0200
Subject: [PATCH] gui: moving aux and cycles to separate tab in Job Window

---
 VECTO/GUI/VectoJobForm.Designer.vb | 676 +++++++++++++++--------------
 VECTO/GUI/VectoJobForm.resx        |   6 +-
 VECTO/GUI/VectoJobForm.vb          |  10 +-
 3 files changed, 361 insertions(+), 331 deletions(-)

diff --git a/VECTO/GUI/VectoJobForm.Designer.vb b/VECTO/GUI/VectoJobForm.Designer.vb
index 7a5ff7f742..a7eab6bd24 100644
--- a/VECTO/GUI/VectoJobForm.Designer.vb
+++ b/VECTO/GUI/VectoJobForm.Designer.vb
@@ -37,7 +37,7 @@ Partial Class VectoJobForm
         Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
         Me.BtDRIrem = New System.Windows.Forms.Button()
         Me.BtDRIadd = New System.Windows.Forms.Button()
-        Me.GrAux = New System.Windows.Forms.GroupBox()
+        Me.GrAuxMech = New System.Windows.Forms.GroupBox()
         Me.Label9 = New System.Windows.Forms.Label()
         Me.TbAuxPAdd = New System.Windows.Forms.TextBox()
         Me.Label8 = New System.Windows.Forms.Label()
@@ -64,9 +64,9 @@ Partial Class VectoJobForm
         Me.ButtonVEH = New System.Windows.Forms.Button()
         Me.ButtonGBX = New System.Windows.Forms.Button()
         Me.ButtonMAP = New System.Windows.Forms.Button()
-        Me.TabControl1 = New System.Windows.Forms.TabControl()
+        Me.tcJob = New System.Windows.Forms.TabControl()
         Me.TabPgDriver = New System.Windows.Forms.TabPage()
-        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+        Me.gbShiftStrategy = New System.Windows.Forms.GroupBox()
         Me.cbGearshiftStrategy = New System.Windows.Forms.ComboBox()
         Me.GrVACC = New System.Windows.Forms.GroupBox()
         Me.Label15 = New System.Windows.Forms.Label()
@@ -92,7 +92,7 @@ Partial Class VectoJobForm
         Me.tbLacPreviewFactor = New System.Windows.Forms.TextBox()
         Me.tbLacDfVelocityDropFile = New System.Windows.Forms.TextBox()
         Me.CbLookAhead = New System.Windows.Forms.CheckBox()
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.gbOverspeed = New System.Windows.Forms.GroupBox()
         Me.PnEcoRoll = New System.Windows.Forms.Panel()
         Me.Label21 = New System.Windows.Forms.Label()
         Me.Label14 = New System.Windows.Forms.Label()
@@ -174,37 +174,39 @@ Partial Class VectoJobForm
         Me.TbMass = New System.Windows.Forms.TextBox()
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
         Me.lblEngineCharacteristics = New System.Windows.Forms.Label()
-        Me.TabPgGen.SuspendLayout
-        Me.GrCycles.SuspendLayout
-        Me.GrAux.SuspendLayout
-        CType(Me.picAuxInfo,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.TabControl1.SuspendLayout
-        Me.TabPgDriver.SuspendLayout
-        Me.GroupBox3.SuspendLayout
-        Me.GrVACC.SuspendLayout
-        Me.GrLAC.SuspendLayout
-        Me.pnLookAheadCoasting.SuspendLayout
-        Me.GroupBox1.SuspendLayout
-        Me.PnEcoRoll.SuspendLayout
-        Me.TabPgADAS.SuspendLayout
-        Me.gbPCC.SuspendLayout
-        Me.gbEcoRoll.SuspendLayout
-        Me.gbEngineStopStart.SuspendLayout
-        Me.StatusStrip1.SuspendLayout
-        Me.ToolStrip1.SuspendLayout
-        CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.CmOpenFile.SuspendLayout
-        CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).BeginInit
-        CType(Me.PicBox,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.SuspendLayout
+        Me.tpAuxiliaries = New System.Windows.Forms.TabPage()
+        Me.tpCycles = New System.Windows.Forms.TabPage()
+        Me.TabPgGen.SuspendLayout()
+        Me.GrCycles.SuspendLayout()
+        Me.GrAuxMech.SuspendLayout()
+        CType(Me.picAuxInfo, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.tcJob.SuspendLayout()
+        Me.TabPgDriver.SuspendLayout()
+        Me.gbShiftStrategy.SuspendLayout()
+        Me.GrVACC.SuspendLayout()
+        Me.GrLAC.SuspendLayout()
+        Me.pnLookAheadCoasting.SuspendLayout()
+        Me.gbOverspeed.SuspendLayout()
+        Me.PnEcoRoll.SuspendLayout()
+        Me.TabPgADAS.SuspendLayout()
+        Me.gbPCC.SuspendLayout()
+        Me.gbEcoRoll.SuspendLayout()
+        Me.gbEngineStopStart.SuspendLayout()
+        Me.StatusStrip1.SuspendLayout()
+        Me.ToolStrip1.SuspendLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.CmOpenFile.SuspendLayout()
+        CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.tpAuxiliaries.SuspendLayout()
+        Me.tpCycles.SuspendLayout()
+        Me.SuspendLayout()
         '
         'TabPgGen
         '
         Me.TabPgGen.Controls.Add(Me.TbShiftStrategyParams)
         Me.TabPgGen.Controls.Add(Me.BtnShiftParamsForm)
         Me.TabPgGen.Controls.Add(Me.BtnShiftStrategyParams)
-        Me.TabPgGen.Controls.Add(Me.GrCycles)
-        Me.TabPgGen.Controls.Add(Me.GrAux)
         Me.TabPgGen.Controls.Add(Me.TbGBX)
         Me.TabPgGen.Controls.Add(Me.TbENG)
         Me.TabPgGen.Controls.Add(Me.TbVEH)
@@ -220,12 +222,12 @@ Partial Class VectoJobForm
         Me.TabPgGen.Size = New System.Drawing.Size(527, 512)
         Me.TabPgGen.TabIndex = 0
         Me.TabPgGen.Text = "General"
-        Me.TabPgGen.UseVisualStyleBackColor = true
+        Me.TabPgGen.UseVisualStyleBackColor = True
         '
         'TbShiftStrategyParams
         '
-        Me.TbShiftStrategyParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TbShiftStrategyParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.TbShiftStrategyParams.Location = New System.Drawing.Point(85, 87)
         Me.TbShiftStrategyParams.Name = "TbShiftStrategyParams"
         Me.TbShiftStrategyParams.Size = New System.Drawing.Size(411, 20)
@@ -237,41 +239,41 @@ Partial Class VectoJobForm
         Me.BtnShiftParamsForm.Name = "BtnShiftParamsForm"
         Me.BtnShiftParamsForm.Size = New System.Drawing.Size(72, 21)
         Me.BtnShiftParamsForm.TabIndex = 11
-        Me.BtnShiftParamsForm.TabStop = false
+        Me.BtnShiftParamsForm.TabStop = False
         Me.BtnShiftParamsForm.Text = "Shift Parameters"
-        Me.BtnShiftParamsForm.UseVisualStyleBackColor = true
+        Me.BtnShiftParamsForm.UseVisualStyleBackColor = True
         '
         'BtnShiftStrategyParams
         '
-        Me.BtnShiftStrategyParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.BtnShiftStrategyParams.Image = CType(resources.GetObject("BtnShiftStrategyParams.Image"),System.Drawing.Image)
+        Me.BtnShiftStrategyParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.BtnShiftStrategyParams.Image = CType(resources.GetObject("BtnShiftStrategyParams.Image"), System.Drawing.Image)
         Me.BtnShiftStrategyParams.Location = New System.Drawing.Point(497, 85)
         Me.BtnShiftStrategyParams.Name = "BtnShiftStrategyParams"
         Me.BtnShiftStrategyParams.Size = New System.Drawing.Size(24, 24)
         Me.BtnShiftStrategyParams.TabIndex = 13
-        Me.BtnShiftStrategyParams.TabStop = false
-        Me.BtnShiftStrategyParams.UseVisualStyleBackColor = true
+        Me.BtnShiftStrategyParams.TabStop = False
+        Me.BtnShiftStrategyParams.UseVisualStyleBackColor = True
         '
         'GrCycles
         '
-        Me.GrCycles.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.GrCycles.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.GrCycles.Controls.Add(Me.Label2)
         Me.GrCycles.Controls.Add(Me.LvCycles)
         Me.GrCycles.Controls.Add(Me.BtDRIrem)
         Me.GrCycles.Controls.Add(Me.BtDRIadd)
-        Me.GrCycles.Location = New System.Drawing.Point(5, 368)
+        Me.GrCycles.Location = New System.Drawing.Point(6, 6)
         Me.GrCycles.Name = "GrCycles"
         Me.GrCycles.Size = New System.Drawing.Size(515, 138)
         Me.GrCycles.TabIndex = 10
-        Me.GrCycles.TabStop = false
+        Me.GrCycles.TabStop = False
         Me.GrCycles.Text = "Cycles"
         '
         'Label2
         '
-        Me.Label2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.Label2.AutoSize = true
+        Me.Label2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label2.AutoSize = True
         Me.Label2.Location = New System.Drawing.Point(391, 109)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(118, 13)
@@ -280,22 +282,22 @@ Partial Class VectoJobForm
         '
         'LvCycles
         '
-        Me.LvCycles.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom)  _
-            Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.LvCycles.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.LvCycles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1})
-        Me.LvCycles.FullRowSelect = true
-        Me.LvCycles.GridLines = true
+        Me.LvCycles.FullRowSelect = True
+        Me.LvCycles.GridLines = True
         Me.LvCycles.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
-        Me.LvCycles.HideSelection = false
-        Me.LvCycles.LabelEdit = true
+        Me.LvCycles.HideSelection = False
+        Me.LvCycles.LabelEdit = True
         Me.LvCycles.Location = New System.Drawing.Point(6, 19)
-        Me.LvCycles.MultiSelect = false
+        Me.LvCycles.MultiSelect = False
         Me.LvCycles.Name = "LvCycles"
         Me.LvCycles.Size = New System.Drawing.Size(503, 89)
         Me.LvCycles.TabIndex = 0
-        Me.LvCycles.TabStop = false
-        Me.LvCycles.UseCompatibleStateImageBehavior = false
+        Me.LvCycles.TabStop = False
+        Me.LvCycles.UseCompatibleStateImageBehavior = False
         Me.LvCycles.View = System.Windows.Forms.View.Details
         '
         'ColumnHeader1
@@ -305,54 +307,54 @@ Partial Class VectoJobForm
         '
         'BtDRIrem
         '
-        Me.BtDRIrem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.BtDRIrem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.BtDRIrem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
         Me.BtDRIrem.Location = New System.Drawing.Point(29, 109)
         Me.BtDRIrem.Name = "BtDRIrem"
         Me.BtDRIrem.Size = New System.Drawing.Size(24, 24)
         Me.BtDRIrem.TabIndex = 2
-        Me.BtDRIrem.UseVisualStyleBackColor = true
+        Me.BtDRIrem.UseVisualStyleBackColor = True
         '
         'BtDRIadd
         '
-        Me.BtDRIadd.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.BtDRIadd.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.BtDRIadd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
         Me.BtDRIadd.Location = New System.Drawing.Point(5, 109)
         Me.BtDRIadd.Name = "BtDRIadd"
         Me.BtDRIadd.Size = New System.Drawing.Size(24, 24)
         Me.BtDRIadd.TabIndex = 1
-        Me.BtDRIadd.UseVisualStyleBackColor = true
-        '
-        'GrAux
-        '
-        Me.GrAux.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.GrAux.Controls.Add(Me.Label9)
-        Me.GrAux.Controls.Add(Me.TbAuxPAdd)
-        Me.GrAux.Controls.Add(Me.Label8)
-        Me.GrAux.Controls.Add(Me.btnAAUXOpen)
-        Me.GrAux.Controls.Add(Me.Label1)
-        Me.GrAux.Controls.Add(Me.btnBrowseAAUXFile)
-        Me.GrAux.Controls.Add(Me.txtAdvancedAuxiliaryFile)
-        Me.GrAux.Controls.Add(Me.picAuxInfo)
-        Me.GrAux.Controls.Add(Me.cboAdvancedAuxiliaries)
-        Me.GrAux.Controls.Add(Me.lbAdvancedAuxiliaries)
-        Me.GrAux.Controls.Add(Me.Label32)
-        Me.GrAux.Controls.Add(Me.LvAux)
-        Me.GrAux.Controls.Add(Me.ButAuxRem)
-        Me.GrAux.Controls.Add(Me.ButAuxAdd)
-        Me.GrAux.Location = New System.Drawing.Point(5, 117)
-        Me.GrAux.Name = "GrAux"
-        Me.GrAux.Size = New System.Drawing.Size(515, 245)
-        Me.GrAux.TabIndex = 9
-        Me.GrAux.TabStop = false
-        Me.GrAux.Text = "Auxiliaries"
+        Me.BtDRIadd.UseVisualStyleBackColor = True
+        '
+        'GrAuxMech
+        '
+        Me.GrAuxMech.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.GrAuxMech.Controls.Add(Me.Label9)
+        Me.GrAuxMech.Controls.Add(Me.TbAuxPAdd)
+        Me.GrAuxMech.Controls.Add(Me.Label8)
+        Me.GrAuxMech.Controls.Add(Me.btnAAUXOpen)
+        Me.GrAuxMech.Controls.Add(Me.Label1)
+        Me.GrAuxMech.Controls.Add(Me.btnBrowseAAUXFile)
+        Me.GrAuxMech.Controls.Add(Me.txtAdvancedAuxiliaryFile)
+        Me.GrAuxMech.Controls.Add(Me.picAuxInfo)
+        Me.GrAuxMech.Controls.Add(Me.cboAdvancedAuxiliaries)
+        Me.GrAuxMech.Controls.Add(Me.lbAdvancedAuxiliaries)
+        Me.GrAuxMech.Controls.Add(Me.Label32)
+        Me.GrAuxMech.Controls.Add(Me.LvAux)
+        Me.GrAuxMech.Controls.Add(Me.ButAuxRem)
+        Me.GrAuxMech.Controls.Add(Me.ButAuxAdd)
+        Me.GrAuxMech.Location = New System.Drawing.Point(6, 16)
+        Me.GrAuxMech.Name = "GrAuxMech"
+        Me.GrAuxMech.Size = New System.Drawing.Size(515, 245)
+        Me.GrAuxMech.TabIndex = 9
+        Me.GrAuxMech.TabStop = False
+        Me.GrAuxMech.Text = "Mechanical Auxiliaries"
         '
         'Label9
         '
-        Me.Label9.AutoSize = true
+        Me.Label9.AutoSize = True
         Me.Label9.Location = New System.Drawing.Point(191, 74)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(24, 13)
@@ -368,7 +370,7 @@ Partial Class VectoJobForm
         '
         'Label8
         '
-        Me.Label8.AutoSize = true
+        Me.Label8.AutoSize = True
         Me.Label8.Location = New System.Drawing.Point(7, 74)
         Me.Label8.Name = "Label8"
         Me.Label8.Size = New System.Drawing.Size(97, 13)
@@ -382,11 +384,11 @@ Partial Class VectoJobForm
         Me.btnAAUXOpen.Name = "btnAAUXOpen"
         Me.btnAAUXOpen.Size = New System.Drawing.Size(24, 24)
         Me.btnAAUXOpen.TabIndex = 41
-        Me.btnAAUXOpen.UseVisualStyleBackColor = true
+        Me.btnAAUXOpen.UseVisualStyleBackColor = True
         '
         'Label1
         '
-        Me.Label1.AutoSize = true
+        Me.Label1.AutoSize = True
         Me.Label1.Location = New System.Drawing.Point(8, 48)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(96, 13)
@@ -401,7 +403,7 @@ Partial Class VectoJobForm
         Me.btnBrowseAAUXFile.Size = New System.Drawing.Size(24, 24)
         Me.btnBrowseAAUXFile.TabIndex = 39
         Me.ToolTip1.SetToolTip(Me.btnBrowseAAUXFile, "Configure/Browser  Advanced Auxiliary Files")
-        Me.btnBrowseAAUXFile.UseVisualStyleBackColor = true
+        Me.btnBrowseAAUXFile.UseVisualStyleBackColor = True
         '
         'txtAdvancedAuxiliaryFile
         '
@@ -419,11 +421,11 @@ Partial Class VectoJobForm
         Me.picAuxInfo.Size = New System.Drawing.Size(16, 16)
         Me.picAuxInfo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
         Me.picAuxInfo.TabIndex = 37
-        Me.picAuxInfo.TabStop = false
+        Me.picAuxInfo.TabStop = False
         '
         'cboAdvancedAuxiliaries
         '
-        Me.cboAdvancedAuxiliaries.FormattingEnabled = true
+        Me.cboAdvancedAuxiliaries.FormattingEnabled = True
         Me.cboAdvancedAuxiliaries.Location = New System.Drawing.Point(109, 18)
         Me.cboAdvancedAuxiliaries.Name = "cboAdvancedAuxiliaries"
         Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(351, 21)
@@ -431,7 +433,7 @@ Partial Class VectoJobForm
         '
         'lbAdvancedAuxiliaries
         '
-        Me.lbAdvancedAuxiliaries.AutoSize = true
+        Me.lbAdvancedAuxiliaries.AutoSize = True
         Me.lbAdvancedAuxiliaries.Location = New System.Drawing.Point(32, 21)
         Me.lbAdvancedAuxiliaries.Name = "lbAdvancedAuxiliaries"
         Me.lbAdvancedAuxiliaries.Size = New System.Drawing.Size(72, 13)
@@ -440,9 +442,9 @@ Partial Class VectoJobForm
         '
         'Label32
         '
-        Me.Label32.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.Label32.AutoSize = true
+        Me.Label32.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label32.AutoSize = True
         Me.Label32.Location = New System.Drawing.Point(403, 217)
         Me.Label32.Name = "Label32"
         Me.Label32.Size = New System.Drawing.Size(106, 13)
@@ -451,20 +453,20 @@ Partial Class VectoJobForm
         '
         'LvAux
         '
-        Me.LvAux.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom)  _
-            Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.LvAux.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.LvAux.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5, Me.ColumnHeader6})
-        Me.LvAux.FullRowSelect = true
-        Me.LvAux.GridLines = true
-        Me.LvAux.HideSelection = false
+        Me.LvAux.FullRowSelect = True
+        Me.LvAux.GridLines = True
+        Me.LvAux.HideSelection = False
         Me.LvAux.Location = New System.Drawing.Point(6, 103)
-        Me.LvAux.MultiSelect = false
+        Me.LvAux.MultiSelect = False
         Me.LvAux.Name = "LvAux"
         Me.LvAux.Size = New System.Drawing.Size(503, 113)
         Me.LvAux.TabIndex = 0
-        Me.LvAux.TabStop = false
-        Me.LvAux.UseCompatibleStateImageBehavior = false
+        Me.LvAux.TabStop = False
+        Me.LvAux.UseCompatibleStateImageBehavior = False
         Me.LvAux.View = System.Windows.Forms.View.Details
         '
         'ColumnHeader4
@@ -484,30 +486,30 @@ Partial Class VectoJobForm
         '
         'ButAuxRem
         '
-        Me.ButAuxRem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.ButAuxRem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.ButAuxRem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
         Me.ButAuxRem.Location = New System.Drawing.Point(29, 217)
         Me.ButAuxRem.Name = "ButAuxRem"
         Me.ButAuxRem.Size = New System.Drawing.Size(24, 24)
         Me.ButAuxRem.TabIndex = 2
-        Me.ButAuxRem.UseVisualStyleBackColor = true
+        Me.ButAuxRem.UseVisualStyleBackColor = True
         '
         'ButAuxAdd
         '
-        Me.ButAuxAdd.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.ButAuxAdd.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.ButAuxAdd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
         Me.ButAuxAdd.Location = New System.Drawing.Point(5, 217)
         Me.ButAuxAdd.Name = "ButAuxAdd"
         Me.ButAuxAdd.Size = New System.Drawing.Size(24, 24)
         Me.ButAuxAdd.TabIndex = 1
-        Me.ButAuxAdd.UseVisualStyleBackColor = true
+        Me.ButAuxAdd.UseVisualStyleBackColor = True
         '
         'TbGBX
         '
-        Me.TbGBX.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TbGBX.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.TbGBX.Location = New System.Drawing.Point(84, 60)
         Me.TbGBX.Name = "TbGBX"
         Me.TbGBX.Size = New System.Drawing.Size(411, 20)
@@ -515,8 +517,8 @@ Partial Class VectoJobForm
         '
         'TbENG
         '
-        Me.TbENG.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TbENG.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.TbENG.Location = New System.Drawing.Point(84, 33)
         Me.TbENG.Name = "TbENG"
         Me.TbENG.Size = New System.Drawing.Size(411, 20)
@@ -524,8 +526,8 @@ Partial Class VectoJobForm
         '
         'TbVEH
         '
-        Me.TbVEH.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TbVEH.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.TbVEH.Location = New System.Drawing.Point(84, 7)
         Me.TbVEH.Name = "TbVEH"
         Me.TbVEH.Size = New System.Drawing.Size(411, 20)
@@ -537,9 +539,9 @@ Partial Class VectoJobForm
         Me.ButOpenGBX.Name = "ButOpenGBX"
         Me.ButOpenGBX.Size = New System.Drawing.Size(72, 21)
         Me.ButOpenGBX.TabIndex = 6
-        Me.ButOpenGBX.TabStop = false
+        Me.ButOpenGBX.TabStop = False
         Me.ButOpenGBX.Text = "Gearbox"
-        Me.ButOpenGBX.UseVisualStyleBackColor = true
+        Me.ButOpenGBX.UseVisualStyleBackColor = True
         '
         'ButOpenENG
         '
@@ -547,9 +549,9 @@ Partial Class VectoJobForm
         Me.ButOpenENG.Name = "ButOpenENG"
         Me.ButOpenENG.Size = New System.Drawing.Size(72, 21)
         Me.ButOpenENG.TabIndex = 3
-        Me.ButOpenENG.TabStop = false
+        Me.ButOpenENG.TabStop = False
         Me.ButOpenENG.Text = "Engine"
-        Me.ButOpenENG.UseVisualStyleBackColor = true
+        Me.ButOpenENG.UseVisualStyleBackColor = True
         '
         'ButOpenVEH
         '
@@ -557,84 +559,86 @@ Partial Class VectoJobForm
         Me.ButOpenVEH.Name = "ButOpenVEH"
         Me.ButOpenVEH.Size = New System.Drawing.Size(72, 21)
         Me.ButOpenVEH.TabIndex = 0
-        Me.ButOpenVEH.TabStop = false
+        Me.ButOpenVEH.TabStop = False
         Me.ButOpenVEH.Text = "Vehicle"
-        Me.ButOpenVEH.UseVisualStyleBackColor = true
+        Me.ButOpenVEH.UseVisualStyleBackColor = True
         '
         'ButtonVEH
         '
-        Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.ButtonVEH.Image = CType(resources.GetObject("ButtonVEH.Image"),System.Drawing.Image)
+        Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.ButtonVEH.Image = CType(resources.GetObject("ButtonVEH.Image"), System.Drawing.Image)
         Me.ButtonVEH.Location = New System.Drawing.Point(496, 5)
         Me.ButtonVEH.Name = "ButtonVEH"
         Me.ButtonVEH.Size = New System.Drawing.Size(24, 24)
         Me.ButtonVEH.TabIndex = 2
-        Me.ButtonVEH.TabStop = false
-        Me.ButtonVEH.UseVisualStyleBackColor = true
+        Me.ButtonVEH.TabStop = False
+        Me.ButtonVEH.UseVisualStyleBackColor = True
         '
         'ButtonGBX
         '
-        Me.ButtonGBX.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.ButtonGBX.Image = CType(resources.GetObject("ButtonGBX.Image"),System.Drawing.Image)
+        Me.ButtonGBX.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.ButtonGBX.Image = CType(resources.GetObject("ButtonGBX.Image"), System.Drawing.Image)
         Me.ButtonGBX.Location = New System.Drawing.Point(496, 58)
         Me.ButtonGBX.Name = "ButtonGBX"
         Me.ButtonGBX.Size = New System.Drawing.Size(24, 24)
         Me.ButtonGBX.TabIndex = 8
-        Me.ButtonGBX.TabStop = false
-        Me.ButtonGBX.UseVisualStyleBackColor = true
+        Me.ButtonGBX.TabStop = False
+        Me.ButtonGBX.UseVisualStyleBackColor = True
         '
         'ButtonMAP
         '
-        Me.ButtonMAP.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.ButtonMAP.Image = CType(resources.GetObject("ButtonMAP.Image"),System.Drawing.Image)
+        Me.ButtonMAP.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.ButtonMAP.Image = CType(resources.GetObject("ButtonMAP.Image"), System.Drawing.Image)
         Me.ButtonMAP.Location = New System.Drawing.Point(496, 31)
         Me.ButtonMAP.Name = "ButtonMAP"
         Me.ButtonMAP.Size = New System.Drawing.Size(24, 24)
         Me.ButtonMAP.TabIndex = 5
-        Me.ButtonMAP.TabStop = false
-        Me.ButtonMAP.UseVisualStyleBackColor = true
-        '
-        'TabControl1
-        '
-        Me.TabControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.TabControl1.Controls.Add(Me.TabPgGen)
-        Me.TabControl1.Controls.Add(Me.TabPgDriver)
-        Me.TabControl1.Controls.Add(Me.TabPgADAS)
-        Me.TabControl1.Location = New System.Drawing.Point(1, 107)
-        Me.TabControl1.Name = "TabControl1"
-        Me.TabControl1.SelectedIndex = 0
-        Me.TabControl1.Size = New System.Drawing.Size(535, 538)
-        Me.TabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed
-        Me.TabControl1.TabIndex = 0
+        Me.ButtonMAP.TabStop = False
+        Me.ButtonMAP.UseVisualStyleBackColor = True
+        '
+        'tcJob
+        '
+        Me.tcJob.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.tcJob.Controls.Add(Me.TabPgGen)
+        Me.tcJob.Controls.Add(Me.tpAuxiliaries)
+        Me.tcJob.Controls.Add(Me.tpCycles)
+        Me.tcJob.Controls.Add(Me.TabPgDriver)
+        Me.tcJob.Controls.Add(Me.TabPgADAS)
+        Me.tcJob.Location = New System.Drawing.Point(1, 107)
+        Me.tcJob.Name = "tcJob"
+        Me.tcJob.SelectedIndex = 0
+        Me.tcJob.Size = New System.Drawing.Size(535, 498)
+        Me.tcJob.SizeMode = System.Windows.Forms.TabSizeMode.Fixed
+        Me.tcJob.TabIndex = 0
         '
         'TabPgDriver
         '
-        Me.TabPgDriver.Controls.Add(Me.GroupBox3)
+        Me.TabPgDriver.Controls.Add(Me.gbShiftStrategy)
         Me.TabPgDriver.Controls.Add(Me.GrVACC)
         Me.TabPgDriver.Controls.Add(Me.GrLAC)
-        Me.TabPgDriver.Controls.Add(Me.GroupBox1)
+        Me.TabPgDriver.Controls.Add(Me.gbOverspeed)
         Me.TabPgDriver.Location = New System.Drawing.Point(4, 22)
         Me.TabPgDriver.Name = "TabPgDriver"
         Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPgDriver.Size = New System.Drawing.Size(527, 512)
+        Me.TabPgDriver.Size = New System.Drawing.Size(527, 472)
         Me.TabPgDriver.TabIndex = 7
         Me.TabPgDriver.Text = "Driver Model"
-        Me.TabPgDriver.UseVisualStyleBackColor = true
+        Me.TabPgDriver.UseVisualStyleBackColor = True
         '
-        'GroupBox3
+        'gbShiftStrategy
         '
-        Me.GroupBox3.Controls.Add(Me.cbGearshiftStrategy)
-        Me.GroupBox3.Location = New System.Drawing.Point(9, 347)
-        Me.GroupBox3.Name = "GroupBox3"
-        Me.GroupBox3.Size = New System.Drawing.Size(514, 50)
-        Me.GroupBox3.TabIndex = 4
-        Me.GroupBox3.TabStop = false
-        Me.GroupBox3.Text = "Gearshift Strategy"
+        Me.gbShiftStrategy.Controls.Add(Me.cbGearshiftStrategy)
+        Me.gbShiftStrategy.Location = New System.Drawing.Point(9, 347)
+        Me.gbShiftStrategy.Name = "gbShiftStrategy"
+        Me.gbShiftStrategy.Size = New System.Drawing.Size(514, 50)
+        Me.gbShiftStrategy.TabIndex = 4
+        Me.gbShiftStrategy.TabStop = False
+        Me.gbShiftStrategy.Text = "Gearshift Strategy"
         '
         'cbGearshiftStrategy
         '
-        Me.cbGearshiftStrategy.FormattingEnabled = true
+        Me.cbGearshiftStrategy.FormattingEnabled = True
         Me.cbGearshiftStrategy.Location = New System.Drawing.Point(6, 19)
         Me.cbGearshiftStrategy.Name = "cbGearshiftStrategy"
         Me.cbGearshiftStrategy.Size = New System.Drawing.Size(270, 21)
@@ -650,12 +654,12 @@ Partial Class VectoJobForm
         Me.GrVACC.Name = "GrVACC"
         Me.GrVACC.Size = New System.Drawing.Size(515, 69)
         Me.GrVACC.TabIndex = 3
-        Me.GrVACC.TabStop = false
+        Me.GrVACC.TabStop = False
         Me.GrVACC.Text = "Max. acceleration and brake curves"
         '
         'Label15
         '
-        Me.Label15.AutoSize = true
+        Me.Label15.AutoSize = True
         Me.Label15.Location = New System.Drawing.Point(3, 20)
         Me.Label15.Name = "Label15"
         Me.Label15.Size = New System.Drawing.Size(220, 13)
@@ -664,8 +668,8 @@ Partial Class VectoJobForm
         '
         'TbDesMaxFile
         '
-        Me.TbDesMaxFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TbDesMaxFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.TbDesMaxFile.Location = New System.Drawing.Point(6, 36)
         Me.TbDesMaxFile.Name = "TbDesMaxFile"
         Me.TbDesMaxFile.Size = New System.Drawing.Size(450, 20)
@@ -673,24 +677,24 @@ Partial Class VectoJobForm
         '
         'BtDesMaxBr
         '
-        Me.BtDesMaxBr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.BtDesMaxBr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.BtDesMaxBr.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
         Me.BtDesMaxBr.Location = New System.Drawing.Point(457, 34)
         Me.BtDesMaxBr.Name = "BtDesMaxBr"
         Me.BtDesMaxBr.Size = New System.Drawing.Size(24, 24)
         Me.BtDesMaxBr.TabIndex = 1
-        Me.BtDesMaxBr.UseVisualStyleBackColor = true
+        Me.BtDesMaxBr.UseVisualStyleBackColor = True
         '
         'BtAccOpen
         '
-        Me.BtAccOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.BtAccOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.BtAccOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
         Me.BtAccOpen.Location = New System.Drawing.Point(481, 34)
         Me.BtAccOpen.Name = "BtAccOpen"
         Me.BtAccOpen.Size = New System.Drawing.Size(24, 24)
         Me.BtAccOpen.TabIndex = 2
-        Me.BtAccOpen.TabStop = false
-        Me.BtAccOpen.UseVisualStyleBackColor = true
+        Me.BtAccOpen.TabStop = False
+        Me.BtAccOpen.UseVisualStyleBackColor = True
         '
         'GrLAC
         '
@@ -700,7 +704,7 @@ Partial Class VectoJobForm
         Me.GrLAC.Name = "GrLAC"
         Me.GrLAC.Size = New System.Drawing.Size(514, 173)
         Me.GrLAC.TabIndex = 2
-        Me.GrLAC.TabStop = false
+        Me.GrLAC.TabStop = False
         Me.GrLAC.Text = "Look-Ahead Coasting"
         '
         'pnLookAheadCoasting
@@ -728,7 +732,7 @@ Partial Class VectoJobForm
         '
         'Label7
         '
-        Me.Label7.AutoSize = true
+        Me.Label7.AutoSize = True
         Me.Label7.Location = New System.Drawing.Point(245, 6)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(38, 13)
@@ -737,7 +741,7 @@ Partial Class VectoJobForm
         '
         'Label6
         '
-        Me.Label6.AutoSize = true
+        Me.Label6.AutoSize = True
         Me.Label6.Location = New System.Drawing.Point(106, 5)
         Me.Label6.Name = "Label6"
         Me.Label6.Size = New System.Drawing.Size(67, 13)
@@ -754,18 +758,18 @@ Partial Class VectoJobForm
         '
         'btnDfVelocityDrop
         '
-        Me.btnDfVelocityDrop.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.btnDfVelocityDrop.Image = CType(resources.GetObject("btnDfVelocityDrop.Image"),System.Drawing.Image)
+        Me.btnDfVelocityDrop.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnDfVelocityDrop.Image = CType(resources.GetObject("btnDfVelocityDrop.Image"), System.Drawing.Image)
         Me.btnDfVelocityDrop.Location = New System.Drawing.Point(466, 78)
         Me.btnDfVelocityDrop.Name = "btnDfVelocityDrop"
         Me.btnDfVelocityDrop.Size = New System.Drawing.Size(24, 24)
         Me.btnDfVelocityDrop.TabIndex = 32
-        Me.btnDfVelocityDrop.TabStop = false
-        Me.btnDfVelocityDrop.UseVisualStyleBackColor = true
+        Me.btnDfVelocityDrop.TabStop = False
+        Me.btnDfVelocityDrop.UseVisualStyleBackColor = True
         '
         'Label12
         '
-        Me.Label12.AutoSize = true
+        Me.Label12.AutoSize = True
         Me.Label12.Location = New System.Drawing.Point(284, 110)
         Me.Label12.Name = "Label12"
         Me.Label12.Size = New System.Drawing.Size(130, 13)
@@ -781,7 +785,7 @@ Partial Class VectoJobForm
         '
         'Label11
         '
-        Me.Label11.AutoSize = true
+        Me.Label11.AutoSize = True
         Me.Label11.Location = New System.Drawing.Point(224, 109)
         Me.Label11.Name = "Label11"
         Me.Label11.Size = New System.Drawing.Size(13, 13)
@@ -790,7 +794,7 @@ Partial Class VectoJobForm
         '
         'Label3
         '
-        Me.Label3.AutoSize = true
+        Me.Label3.AutoSize = True
         Me.Label3.Location = New System.Drawing.Point(55, 30)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(118, 13)
@@ -807,8 +811,8 @@ Partial Class VectoJobForm
         '
         'tbLacDfTargetSpeedFile
         '
-        Me.tbLacDfTargetSpeedFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.tbLacDfTargetSpeedFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.tbLacDfTargetSpeedFile.Location = New System.Drawing.Point(179, 54)
         Me.tbLacDfTargetSpeedFile.Name = "tbLacDfTargetSpeedFile"
         Me.tbLacDfTargetSpeedFile.Size = New System.Drawing.Size(286, 20)
@@ -816,7 +820,7 @@ Partial Class VectoJobForm
         '
         'Label10
         '
-        Me.Label10.AutoSize = true
+        Me.Label10.AutoSize = True
         Me.Label10.Location = New System.Drawing.Point(94, 109)
         Me.Label10.Name = "Label10"
         Me.Label10.Size = New System.Drawing.Size(79, 13)
@@ -825,7 +829,7 @@ Partial Class VectoJobForm
         '
         'Label4
         '
-        Me.Label4.AutoSize = true
+        Me.Label4.AutoSize = True
         Me.Label4.Location = New System.Drawing.Point(18, 56)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(155, 13)
@@ -835,7 +839,7 @@ Partial Class VectoJobForm
         '
         'Label5
         '
-        Me.Label5.AutoSize = true
+        Me.Label5.AutoSize = True
         Me.Label5.Location = New System.Drawing.Point(20, 83)
         Me.Label5.Name = "Label5"
         Me.Label5.Size = New System.Drawing.Size(153, 13)
@@ -845,14 +849,14 @@ Partial Class VectoJobForm
         '
         'btnDfTargetSpeed
         '
-        Me.btnDfTargetSpeed.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.btnDfTargetSpeed.Image = CType(resources.GetObject("btnDfTargetSpeed.Image"),System.Drawing.Image)
+        Me.btnDfTargetSpeed.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnDfTargetSpeed.Image = CType(resources.GetObject("btnDfTargetSpeed.Image"), System.Drawing.Image)
         Me.btnDfTargetSpeed.Location = New System.Drawing.Point(466, 52)
         Me.btnDfTargetSpeed.Name = "btnDfTargetSpeed"
         Me.btnDfTargetSpeed.Size = New System.Drawing.Size(24, 24)
         Me.btnDfTargetSpeed.TabIndex = 23
-        Me.btnDfTargetSpeed.TabStop = false
-        Me.btnDfTargetSpeed.UseVisualStyleBackColor = true
+        Me.btnDfTargetSpeed.TabStop = False
+        Me.btnDfTargetSpeed.UseVisualStyleBackColor = True
         '
         'tbLacPreviewFactor
         '
@@ -863,8 +867,8 @@ Partial Class VectoJobForm
         '
         'tbLacDfVelocityDropFile
         '
-        Me.tbLacDfVelocityDropFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.tbLacDfVelocityDropFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.tbLacDfVelocityDropFile.Location = New System.Drawing.Point(179, 81)
         Me.tbLacDfVelocityDropFile.Name = "tbLacDfVelocityDropFile"
         Me.tbLacDfVelocityDropFile.Size = New System.Drawing.Size(286, 20)
@@ -872,27 +876,27 @@ Partial Class VectoJobForm
         '
         'CbLookAhead
         '
-        Me.CbLookAhead.AutoSize = true
-        Me.CbLookAhead.Checked = true
+        Me.CbLookAhead.AutoSize = True
+        Me.CbLookAhead.Checked = True
         Me.CbLookAhead.CheckState = System.Windows.Forms.CheckState.Checked
         Me.CbLookAhead.Location = New System.Drawing.Point(16, 21)
         Me.CbLookAhead.Name = "CbLookAhead"
         Me.CbLookAhead.Size = New System.Drawing.Size(65, 17)
         Me.CbLookAhead.TabIndex = 0
         Me.CbLookAhead.Text = "Enabled"
-        Me.CbLookAhead.UseVisualStyleBackColor = true
+        Me.CbLookAhead.UseVisualStyleBackColor = True
         '
-        'GroupBox1
+        'gbOverspeed
         '
-        Me.GroupBox1.Controls.Add(Me.PnEcoRoll)
-        Me.GroupBox1.Controls.Add(Me.RdOverspeed)
-        Me.GroupBox1.Controls.Add(Me.RdOff)
-        Me.GroupBox1.Location = New System.Drawing.Point(9, 9)
-        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(515, 77)
-        Me.GroupBox1.TabIndex = 1
-        Me.GroupBox1.TabStop = false
-        Me.GroupBox1.Text = "Overspeed"
+        Me.gbOverspeed.Controls.Add(Me.PnEcoRoll)
+        Me.gbOverspeed.Controls.Add(Me.RdOverspeed)
+        Me.gbOverspeed.Controls.Add(Me.RdOff)
+        Me.gbOverspeed.Location = New System.Drawing.Point(9, 9)
+        Me.gbOverspeed.Name = "gbOverspeed"
+        Me.gbOverspeed.Size = New System.Drawing.Size(515, 77)
+        Me.gbOverspeed.TabIndex = 1
+        Me.gbOverspeed.TabStop = False
+        Me.gbOverspeed.Text = "Overspeed"
         '
         'PnEcoRoll
         '
@@ -909,7 +913,7 @@ Partial Class VectoJobForm
         '
         'Label21
         '
-        Me.Label21.AutoSize = true
+        Me.Label21.AutoSize = True
         Me.Label21.Location = New System.Drawing.Point(170, 31)
         Me.Label21.Name = "Label21"
         Me.Label21.Size = New System.Drawing.Size(38, 13)
@@ -918,7 +922,7 @@ Partial Class VectoJobForm
         '
         'Label14
         '
-        Me.Label14.AutoSize = true
+        Me.Label14.AutoSize = True
         Me.Label14.Location = New System.Drawing.Point(170, 5)
         Me.Label14.Name = "Label14"
         Me.Label14.Size = New System.Drawing.Size(38, 13)
@@ -941,7 +945,7 @@ Partial Class VectoJobForm
         '
         'Label23
         '
-        Me.Label23.AutoSize = true
+        Me.Label23.AutoSize = True
         Me.Label23.Location = New System.Drawing.Point(18, 31)
         Me.Label23.Name = "Label23"
         Me.Label23.Size = New System.Drawing.Size(80, 13)
@@ -950,7 +954,7 @@ Partial Class VectoJobForm
         '
         'Label13
         '
-        Me.Label13.AutoSize = true
+        Me.Label13.AutoSize = True
         Me.Label13.Location = New System.Drawing.Point(13, 5)
         Me.Label13.Name = "Label13"
         Me.Label13.Size = New System.Drawing.Size(85, 13)
@@ -959,25 +963,25 @@ Partial Class VectoJobForm
         '
         'RdOverspeed
         '
-        Me.RdOverspeed.AutoSize = true
-        Me.RdOverspeed.Checked = true
+        Me.RdOverspeed.AutoSize = True
+        Me.RdOverspeed.Checked = True
         Me.RdOverspeed.Location = New System.Drawing.Point(16, 44)
         Me.RdOverspeed.Name = "RdOverspeed"
         Me.RdOverspeed.Size = New System.Drawing.Size(77, 17)
         Me.RdOverspeed.TabIndex = 1
-        Me.RdOverspeed.TabStop = true
+        Me.RdOverspeed.TabStop = True
         Me.RdOverspeed.Text = "Overspeed"
-        Me.RdOverspeed.UseVisualStyleBackColor = true
+        Me.RdOverspeed.UseVisualStyleBackColor = True
         '
         'RdOff
         '
-        Me.RdOff.AutoSize = true
+        Me.RdOff.AutoSize = True
         Me.RdOff.Location = New System.Drawing.Point(16, 21)
         Me.RdOff.Name = "RdOff"
         Me.RdOff.Size = New System.Drawing.Size(39, 17)
         Me.RdOff.TabIndex = 0
         Me.RdOff.Text = "Off"
-        Me.RdOff.UseVisualStyleBackColor = true
+        Me.RdOff.UseVisualStyleBackColor = True
         '
         'TabPgADAS
         '
@@ -986,10 +990,10 @@ Partial Class VectoJobForm
         Me.TabPgADAS.Controls.Add(Me.gbEngineStopStart)
         Me.TabPgADAS.Location = New System.Drawing.Point(4, 22)
         Me.TabPgADAS.Name = "TabPgADAS"
-        Me.TabPgADAS.Size = New System.Drawing.Size(527, 512)
+        Me.TabPgADAS.Size = New System.Drawing.Size(527, 472)
         Me.TabPgADAS.TabIndex = 8
         Me.TabPgADAS.Text = "ADAS Parameters"
-        Me.TabPgADAS.UseVisualStyleBackColor = true
+        Me.TabPgADAS.UseVisualStyleBackColor = True
         '
         'gbPCC
         '
@@ -1017,13 +1021,13 @@ Partial Class VectoJobForm
         Me.gbPCC.Name = "gbPCC"
         Me.gbPCC.Size = New System.Drawing.Size(515, 217)
         Me.gbPCC.TabIndex = 7
-        Me.gbPCC.TabStop = false
+        Me.gbPCC.TabStop = False
         Me.gbPCC.Text = "Predictive Cruise Control"
         '
         'Label43
         '
-        Me.Label43.AutoSize = true
-        Me.Label43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.Label43.AutoSize = True
+        Me.Label43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label43.Location = New System.Drawing.Point(39, 196)
         Me.Label43.Name = "Label43"
         Me.Label43.Size = New System.Drawing.Size(157, 13)
@@ -1032,18 +1036,18 @@ Partial Class VectoJobForm
         '
         'Label42
         '
-        Me.Label42.AutoSize = true
-        Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.Label42.AutoSize = True
+        Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label42.Location = New System.Drawing.Point(7, 181)
         Me.Label42.Name = "Label42"
         Me.Label42.Size = New System.Drawing.Size(400, 13)
         Me.Label42.TabIndex = 29
-        Me.Label42.Text = "Note: Predictive cruise conrol is only activated on highway parts of the driving "& _ 
+        Me.Label42.Text = "Note: Predictive cruise conrol is only activated on highway parts of the driving " &
     "cycle"
         '
         'Label40
         '
-        Me.Label40.AutoSize = true
+        Me.Label40.AutoSize = True
         Me.Label40.Location = New System.Drawing.Point(305, 152)
         Me.Label40.Name = "Label40"
         Me.Label40.Size = New System.Drawing.Size(21, 13)
@@ -1052,7 +1056,7 @@ Partial Class VectoJobForm
         '
         'Label41
         '
-        Me.Label41.AutoSize = true
+        Me.Label41.AutoSize = True
         Me.Label41.Location = New System.Drawing.Point(7, 152)
         Me.Label41.Name = "Label41"
         Me.Label41.Size = New System.Drawing.Size(146, 13)
@@ -1068,7 +1072,7 @@ Partial Class VectoJobForm
         '
         'Label38
         '
-        Me.Label38.AutoSize = true
+        Me.Label38.AutoSize = True
         Me.Label38.Location = New System.Drawing.Point(305, 126)
         Me.Label38.Name = "Label38"
         Me.Label38.Size = New System.Drawing.Size(21, 13)
@@ -1077,7 +1081,7 @@ Partial Class VectoJobForm
         '
         'Label39
         '
-        Me.Label39.AutoSize = true
+        Me.Label39.AutoSize = True
         Me.Label39.Location = New System.Drawing.Point(7, 126)
         Me.Label39.Name = "Label39"
         Me.Label39.Size = New System.Drawing.Size(146, 13)
@@ -1093,7 +1097,7 @@ Partial Class VectoJobForm
         '
         'Label36
         '
-        Me.Label36.AutoSize = true
+        Me.Label36.AutoSize = True
         Me.Label36.Location = New System.Drawing.Point(305, 100)
         Me.Label36.Name = "Label36"
         Me.Label36.Size = New System.Drawing.Size(38, 13)
@@ -1102,7 +1106,7 @@ Partial Class VectoJobForm
         '
         'Label37
         '
-        Me.Label37.AutoSize = true
+        Me.Label37.AutoSize = True
         Me.Label37.Location = New System.Drawing.Point(7, 100)
         Me.Label37.Name = "Label37"
         Me.Label37.Size = New System.Drawing.Size(83, 13)
@@ -1118,7 +1122,7 @@ Partial Class VectoJobForm
         '
         'Label34
         '
-        Me.Label34.AutoSize = true
+        Me.Label34.AutoSize = True
         Me.Label34.Location = New System.Drawing.Point(305, 74)
         Me.Label34.Name = "Label34"
         Me.Label34.Size = New System.Drawing.Size(38, 13)
@@ -1127,7 +1131,7 @@ Partial Class VectoJobForm
         '
         'Label35
         '
-        Me.Label35.AutoSize = true
+        Me.Label35.AutoSize = True
         Me.Label35.Location = New System.Drawing.Point(7, 74)
         Me.Label35.Name = "Label35"
         Me.Label35.Size = New System.Drawing.Size(113, 13)
@@ -1143,7 +1147,7 @@ Partial Class VectoJobForm
         '
         'Label31
         '
-        Me.Label31.AutoSize = true
+        Me.Label31.AutoSize = True
         Me.Label31.Location = New System.Drawing.Point(305, 48)
         Me.Label31.Name = "Label31"
         Me.Label31.Size = New System.Drawing.Size(38, 13)
@@ -1152,7 +1156,7 @@ Partial Class VectoJobForm
         '
         'Label33
         '
-        Me.Label33.AutoSize = true
+        Me.Label33.AutoSize = True
         Me.Label33.Location = New System.Drawing.Point(7, 48)
         Me.Label33.Name = "Label33"
         Me.Label33.Size = New System.Drawing.Size(100, 13)
@@ -1168,7 +1172,7 @@ Partial Class VectoJobForm
         '
         'Label20
         '
-        Me.Label20.AutoSize = true
+        Me.Label20.AutoSize = True
         Me.Label20.Location = New System.Drawing.Point(305, 22)
         Me.Label20.Name = "Label20"
         Me.Label20.Size = New System.Drawing.Size(38, 13)
@@ -1177,7 +1181,7 @@ Partial Class VectoJobForm
         '
         'Label22
         '
-        Me.Label22.AutoSize = true
+        Me.Label22.AutoSize = True
         Me.Label22.Location = New System.Drawing.Point(7, 22)
         Me.Label22.Name = "Label22"
         Me.Label22.Size = New System.Drawing.Size(106, 13)
@@ -1209,12 +1213,12 @@ Partial Class VectoJobForm
         Me.gbEcoRoll.Name = "gbEcoRoll"
         Me.gbEcoRoll.Size = New System.Drawing.Size(515, 127)
         Me.gbEcoRoll.TabIndex = 6
-        Me.gbEcoRoll.TabStop = false
+        Me.gbEcoRoll.TabStop = False
         Me.gbEcoRoll.Text = "Eco-Roll"
         '
         'Label44
         '
-        Me.Label44.AutoSize = true
+        Me.Label44.AutoSize = True
         Me.Label44.Location = New System.Drawing.Point(305, 75)
         Me.Label44.Name = "Label44"
         Me.Label44.Size = New System.Drawing.Size(34, 13)
@@ -1223,7 +1227,7 @@ Partial Class VectoJobForm
         '
         'Label45
         '
-        Me.Label45.AutoSize = true
+        Me.Label45.AutoSize = True
         Me.Label45.Location = New System.Drawing.Point(7, 75)
         Me.Label45.Name = "Label45"
         Me.Label45.Size = New System.Drawing.Size(125, 13)
@@ -1239,23 +1243,23 @@ Partial Class VectoJobForm
         '
         'Label29
         '
-        Me.Label29.AutoSize = true
+        Me.Label29.AutoSize = True
         Me.Label29.Location = New System.Drawing.Point(305, 100)
         Me.Label29.Name = "Label29"
         Me.Label29.Size = New System.Drawing.Size(38, 13)
         Me.Label29.TabIndex = 16
         Me.Label29.Text = "[km/h]"
-        Me.Label29.Visible = false
+        Me.Label29.Visible = False
         '
         'Label30
         '
-        Me.Label30.AutoSize = true
+        Me.Label30.AutoSize = True
         Me.Label30.Location = New System.Drawing.Point(7, 100)
         Me.Label30.Name = "Label30"
         Me.Label30.Size = New System.Drawing.Size(114, 13)
         Me.Label30.TabIndex = 14
         Me.Label30.Text = "Underspeed threshold:"
-        Me.Label30.Visible = false
+        Me.Label30.Visible = False
         '
         'tbEcoRollUnderspeed
         '
@@ -1263,11 +1267,11 @@ Partial Class VectoJobForm
         Me.tbEcoRollUnderspeed.Name = "tbEcoRollUnderspeed"
         Me.tbEcoRollUnderspeed.Size = New System.Drawing.Size(52, 20)
         Me.tbEcoRollUnderspeed.TabIndex = 15
-        Me.tbEcoRollUnderspeed.Visible = false
+        Me.tbEcoRollUnderspeed.Visible = False
         '
         'Label27
         '
-        Me.Label27.AutoSize = true
+        Me.Label27.AutoSize = True
         Me.Label27.Location = New System.Drawing.Point(305, 48)
         Me.Label27.Name = "Label27"
         Me.Label27.Size = New System.Drawing.Size(18, 13)
@@ -1276,7 +1280,7 @@ Partial Class VectoJobForm
         '
         'Label28
         '
-        Me.Label28.AutoSize = true
+        Me.Label28.AutoSize = True
         Me.Label28.Location = New System.Drawing.Point(7, 48)
         Me.Label28.Name = "Label28"
         Me.Label28.Size = New System.Drawing.Size(85, 13)
@@ -1292,7 +1296,7 @@ Partial Class VectoJobForm
         '
         'Label25
         '
-        Me.Label25.AutoSize = true
+        Me.Label25.AutoSize = True
         Me.Label25.Location = New System.Drawing.Point(305, 22)
         Me.Label25.Name = "Label25"
         Me.Label25.Size = New System.Drawing.Size(38, 13)
@@ -1301,7 +1305,7 @@ Partial Class VectoJobForm
         '
         'Label26
         '
-        Me.Label26.AutoSize = true
+        Me.Label26.AutoSize = True
         Me.Label26.Location = New System.Drawing.Point(7, 22)
         Me.Label26.Name = "Label26"
         Me.Label26.Size = New System.Drawing.Size(83, 13)
@@ -1329,7 +1333,7 @@ Partial Class VectoJobForm
         Me.gbEngineStopStart.Name = "gbEngineStopStart"
         Me.gbEngineStopStart.Size = New System.Drawing.Size(515, 100)
         Me.gbEngineStopStart.TabIndex = 5
-        Me.gbEngineStopStart.TabStop = false
+        Me.gbEngineStopStart.TabStop = False
         Me.gbEngineStopStart.Text = "Engine Stop/Start"
         '
         'tbEssUtility
@@ -1341,7 +1345,7 @@ Partial Class VectoJobForm
         '
         'Label24
         '
-        Me.Label24.AutoSize = true
+        Me.Label24.AutoSize = True
         Me.Label24.Location = New System.Drawing.Point(7, 72)
         Me.Label24.Name = "Label24"
         Me.Label24.Size = New System.Drawing.Size(141, 13)
@@ -1350,7 +1354,7 @@ Partial Class VectoJobForm
         '
         'Label18
         '
-        Me.Label18.AutoSize = true
+        Me.Label18.AutoSize = True
         Me.Label18.Location = New System.Drawing.Point(305, 46)
         Me.Label18.Name = "Label18"
         Me.Label18.Size = New System.Drawing.Size(18, 13)
@@ -1366,7 +1370,7 @@ Partial Class VectoJobForm
         '
         'Label19
         '
-        Me.Label19.AutoSize = true
+        Me.Label19.AutoSize = True
         Me.Label19.Location = New System.Drawing.Point(7, 46)
         Me.Label19.Name = "Label19"
         Me.Label19.Size = New System.Drawing.Size(105, 13)
@@ -1375,7 +1379,7 @@ Partial Class VectoJobForm
         '
         'Label17
         '
-        Me.Label17.AutoSize = true
+        Me.Label17.AutoSize = True
         Me.Label17.Location = New System.Drawing.Point(305, 20)
         Me.Label17.Name = "Label17"
         Me.Label17.Size = New System.Drawing.Size(18, 13)
@@ -1391,7 +1395,7 @@ Partial Class VectoJobForm
         '
         'Label16
         '
-        Me.Label16.AutoSize = true
+        Me.Label16.AutoSize = True
         Me.Label16.Location = New System.Drawing.Point(7, 20)
         Me.Label16.Name = "Label16"
         Me.Label16.Size = New System.Drawing.Size(87, 13)
@@ -1401,39 +1405,39 @@ Partial Class VectoJobForm
         'StatusStrip1
         '
         Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 692)
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 614)
         Me.StatusStrip1.Name = "StatusStrip1"
         Me.StatusStrip1.Size = New System.Drawing.Size(944, 22)
-        Me.StatusStrip1.SizingGrip = false
+        Me.StatusStrip1.SizingGrip = False
         Me.StatusStrip1.TabIndex = 6
         Me.StatusStrip1.Text = "StatusStrip1"
         '
         'ToolStripStatusLabelGEN
         '
         Me.ToolStripStatusLabelGEN.Name = "ToolStripStatusLabelGEN"
-        Me.ToolStripStatusLabelGEN.Size = New System.Drawing.Size(120, 17)
+        Me.ToolStripStatusLabelGEN.Size = New System.Drawing.Size(119, 17)
         Me.ToolStripStatusLabelGEN.Text = "ToolStripStatusLabel1"
         '
         'ButOK
         '
-        Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.ButOK.Location = New System.Drawing.Point(778, 665)
+        Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.ButOK.Location = New System.Drawing.Point(778, 587)
         Me.ButOK.Name = "ButOK"
         Me.ButOK.Size = New System.Drawing.Size(75, 23)
         Me.ButOK.TabIndex = 0
         Me.ButOK.Text = "Save"
-        Me.ButOK.UseVisualStyleBackColor = true
+        Me.ButOK.UseVisualStyleBackColor = True
         '
         'ButCancel
         '
-        Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.ButCancel.Location = New System.Drawing.Point(859, 665)
+        Me.ButCancel.Location = New System.Drawing.Point(859, 587)
         Me.ButCancel.Name = "ButCancel"
         Me.ButCancel.Size = New System.Drawing.Size(75, 23)
         Me.ButCancel.TabIndex = 1
         Me.ButCancel.Text = "Cancel"
-        Me.ButCancel.UseVisualStyleBackColor = true
+        Me.ButCancel.UseVisualStyleBackColor = True
         '
         'ToolStrip1
         '
@@ -1516,31 +1520,31 @@ Partial Class VectoJobForm
         '
         'PictureBox1
         '
-        Me.PictureBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.PictureBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.PictureBox1.BackColor = System.Drawing.Color.White
         Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_VECTO
         Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
         Me.PictureBox1.Name = "PictureBox1"
         Me.PictureBox1.Size = New System.Drawing.Size(944, 40)
         Me.PictureBox1.TabIndex = 21
-        Me.PictureBox1.TabStop = false
+        Me.PictureBox1.TabStop = False
         '
         'CbEngOnly
         '
-        Me.CbEngOnly.AutoSize = true
+        Me.CbEngOnly.AutoSize = True
         Me.CbEngOnly.Location = New System.Drawing.Point(17, 84)
         Me.CbEngOnly.Name = "CbEngOnly"
         Me.CbEngOnly.Size = New System.Drawing.Size(113, 17)
         Me.CbEngOnly.TabIndex = 0
         Me.CbEngOnly.Text = "Engine Only Mode"
-        Me.CbEngOnly.UseVisualStyleBackColor = true
+        Me.CbEngOnly.UseVisualStyleBackColor = True
         '
         'CmOpenFile
         '
         Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
         Me.CmOpenFile.Name = "CmOpenFile"
-        Me.CmOpenFile.ShowImageMargin = false
+        Me.CmOpenFile.ShowImageMargin = False
         Me.CmOpenFile.Size = New System.Drawing.Size(128, 48)
         '
         'OpenWithToolStripMenuItem
@@ -1564,7 +1568,7 @@ Partial Class VectoJobForm
         Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
         Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
         Me.PicVehicle.TabIndex = 36
-        Me.PicVehicle.TabStop = false
+        Me.PicVehicle.TabStop = False
         '
         'PicBox
         '
@@ -1574,13 +1578,13 @@ Partial Class VectoJobForm
         Me.PicBox.Name = "PicBox"
         Me.PicBox.Size = New System.Drawing.Size(390, 296)
         Me.PicBox.TabIndex = 36
-        Me.PicBox.TabStop = false
+        Me.PicBox.TabStop = False
         '
         'TbEngTxt
         '
         Me.TbEngTxt.Location = New System.Drawing.Point(542, 218)
         Me.TbEngTxt.Name = "TbEngTxt"
-        Me.TbEngTxt.ReadOnly = true
+        Me.TbEngTxt.ReadOnly = True
         Me.TbEngTxt.Size = New System.Drawing.Size(390, 20)
         Me.TbEngTxt.TabIndex = 6
         '
@@ -1588,7 +1592,7 @@ Partial Class VectoJobForm
         '
         Me.TbVehCat.Location = New System.Drawing.Point(848, 131)
         Me.TbVehCat.Name = "TbVehCat"
-        Me.TbVehCat.ReadOnly = true
+        Me.TbVehCat.ReadOnly = True
         Me.TbVehCat.Size = New System.Drawing.Size(87, 20)
         Me.TbVehCat.TabIndex = 2
         '
@@ -1596,7 +1600,7 @@ Partial Class VectoJobForm
         '
         Me.TbAxleConf.Location = New System.Drawing.Point(904, 160)
         Me.TbAxleConf.Name = "TbAxleConf"
-        Me.TbAxleConf.ReadOnly = true
+        Me.TbAxleConf.ReadOnly = True
         Me.TbAxleConf.Size = New System.Drawing.Size(31, 20)
         Me.TbAxleConf.TabIndex = 4
         '
@@ -1604,7 +1608,7 @@ Partial Class VectoJobForm
         '
         Me.TbHVCclass.Location = New System.Drawing.Point(848, 189)
         Me.TbHVCclass.Name = "TbHVCclass"
-        Me.TbHVCclass.ReadOnly = true
+        Me.TbHVCclass.ReadOnly = True
         Me.TbHVCclass.Size = New System.Drawing.Size(87, 20)
         Me.TbHVCclass.TabIndex = 5
         '
@@ -1612,7 +1616,7 @@ Partial Class VectoJobForm
         '
         Me.TbGbxTxt.Location = New System.Drawing.Point(542, 241)
         Me.TbGbxTxt.Name = "TbGbxTxt"
-        Me.TbGbxTxt.ReadOnly = true
+        Me.TbGbxTxt.ReadOnly = True
         Me.TbGbxTxt.Size = New System.Drawing.Size(390, 20)
         Me.TbGbxTxt.TabIndex = 7
         '
@@ -1620,25 +1624,47 @@ Partial Class VectoJobForm
         '
         Me.TbMass.Location = New System.Drawing.Point(848, 160)
         Me.TbMass.Name = "TbMass"
-        Me.TbMass.ReadOnly = true
+        Me.TbMass.ReadOnly = True
         Me.TbMass.Size = New System.Drawing.Size(50, 20)
         Me.TbMass.TabIndex = 3
         '
         'lblEngineCharacteristics
         '
-        Me.lblEngineCharacteristics.AutoSize = true
+        Me.lblEngineCharacteristics.AutoSize = True
         Me.lblEngineCharacteristics.Location = New System.Drawing.Point(542, 565)
         Me.lblEngineCharacteristics.Name = "lblEngineCharacteristics"
         Me.lblEngineCharacteristics.Size = New System.Drawing.Size(0, 13)
         Me.lblEngineCharacteristics.TabIndex = 37
         '
+        'tpAuxiliaries
+        '
+        Me.tpAuxiliaries.Controls.Add(Me.GrAuxMech)
+        Me.tpAuxiliaries.Location = New System.Drawing.Point(4, 22)
+        Me.tpAuxiliaries.Name = "tpAuxiliaries"
+        Me.tpAuxiliaries.Padding = New System.Windows.Forms.Padding(3)
+        Me.tpAuxiliaries.Size = New System.Drawing.Size(527, 472)
+        Me.tpAuxiliaries.TabIndex = 9
+        Me.tpAuxiliaries.Text = "Auxiliaries"
+        Me.tpAuxiliaries.UseVisualStyleBackColor = True
+        '
+        'tpCycles
+        '
+        Me.tpCycles.Controls.Add(Me.GrCycles)
+        Me.tpCycles.Location = New System.Drawing.Point(4, 22)
+        Me.tpCycles.Name = "tpCycles"
+        Me.tpCycles.Padding = New System.Windows.Forms.Padding(3)
+        Me.tpCycles.Size = New System.Drawing.Size(527, 472)
+        Me.tpCycles.TabIndex = 10
+        Me.tpCycles.Text = "Cycles"
+        Me.tpCycles.UseVisualStyleBackColor = True
+        '
         'VectoJobForm
         '
         Me.AcceptButton = Me.ButOK
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.CancelButton = Me.ButCancel
-        Me.ClientSize = New System.Drawing.Size(944, 714)
+        Me.ClientSize = New System.Drawing.Size(944, 636)
         Me.Controls.Add(Me.lblEngineCharacteristics)
         Me.Controls.Add(Me.TbHVCclass)
         Me.Controls.Add(Me.TbMass)
@@ -1652,56 +1678,58 @@ Partial Class VectoJobForm
         Me.Controls.Add(Me.PictureBox1)
         Me.Controls.Add(Me.ToolStrip1)
         Me.Controls.Add(Me.ButCancel)
-        Me.Controls.Add(Me.TabControl1)
+        Me.Controls.Add(Me.tcJob)
         Me.Controls.Add(Me.ButOK)
         Me.Controls.Add(Me.StatusStrip1)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
-        Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
-        Me.MaximizeBox = false
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.MaximizeBox = False
         Me.Name = "VectoJobForm"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "Job Editor"
-        Me.TabPgGen.ResumeLayout(false)
-        Me.TabPgGen.PerformLayout
-        Me.GrCycles.ResumeLayout(false)
-        Me.GrCycles.PerformLayout
-        Me.GrAux.ResumeLayout(false)
-        Me.GrAux.PerformLayout
-        CType(Me.picAuxInfo,System.ComponentModel.ISupportInitialize).EndInit
-        Me.TabControl1.ResumeLayout(false)
-        Me.TabPgDriver.ResumeLayout(false)
-        Me.GroupBox3.ResumeLayout(false)
-        Me.GrVACC.ResumeLayout(false)
-        Me.GrVACC.PerformLayout
-        Me.GrLAC.ResumeLayout(false)
-        Me.GrLAC.PerformLayout
-        Me.pnLookAheadCoasting.ResumeLayout(false)
-        Me.pnLookAheadCoasting.PerformLayout
-        Me.GroupBox1.ResumeLayout(false)
-        Me.GroupBox1.PerformLayout
-        Me.PnEcoRoll.ResumeLayout(false)
-        Me.PnEcoRoll.PerformLayout
-        Me.TabPgADAS.ResumeLayout(false)
-        Me.gbPCC.ResumeLayout(false)
-        Me.gbPCC.PerformLayout
-        Me.gbEcoRoll.ResumeLayout(false)
-        Me.gbEcoRoll.PerformLayout
-        Me.gbEngineStopStart.ResumeLayout(false)
-        Me.gbEngineStopStart.PerformLayout
-        Me.StatusStrip1.ResumeLayout(false)
-        Me.StatusStrip1.PerformLayout
-        Me.ToolStrip1.ResumeLayout(false)
-        Me.ToolStrip1.PerformLayout
-        CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
-        Me.CmOpenFile.ResumeLayout(false)
-        CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.PicBox,System.ComponentModel.ISupportInitialize).EndInit
-        Me.ResumeLayout(false)
+        Me.TabPgGen.ResumeLayout(False)
+        Me.TabPgGen.PerformLayout()
+        Me.GrCycles.ResumeLayout(False)
+        Me.GrCycles.PerformLayout()
+        Me.GrAuxMech.ResumeLayout(False)
+        Me.GrAuxMech.PerformLayout()
+        CType(Me.picAuxInfo, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.tcJob.ResumeLayout(False)
+        Me.TabPgDriver.ResumeLayout(False)
+        Me.gbShiftStrategy.ResumeLayout(False)
+        Me.GrVACC.ResumeLayout(False)
+        Me.GrVACC.PerformLayout()
+        Me.GrLAC.ResumeLayout(False)
+        Me.GrLAC.PerformLayout()
+        Me.pnLookAheadCoasting.ResumeLayout(False)
+        Me.pnLookAheadCoasting.PerformLayout()
+        Me.gbOverspeed.ResumeLayout(False)
+        Me.gbOverspeed.PerformLayout()
+        Me.PnEcoRoll.ResumeLayout(False)
+        Me.PnEcoRoll.PerformLayout()
+        Me.TabPgADAS.ResumeLayout(False)
+        Me.gbPCC.ResumeLayout(False)
+        Me.gbPCC.PerformLayout()
+        Me.gbEcoRoll.ResumeLayout(False)
+        Me.gbEcoRoll.PerformLayout()
+        Me.gbEngineStopStart.ResumeLayout(False)
+        Me.gbEngineStopStart.PerformLayout()
+        Me.StatusStrip1.ResumeLayout(False)
+        Me.StatusStrip1.PerformLayout()
+        Me.ToolStrip1.ResumeLayout(False)
+        Me.ToolStrip1.PerformLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.CmOpenFile.ResumeLayout(False)
+        CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.tpAuxiliaries.ResumeLayout(False)
+        Me.tpCycles.ResumeLayout(False)
+        Me.ResumeLayout(False)
         Me.PerformLayout
 
 End Sub
 	Friend WithEvents TabPgGen As TabPage
-	Friend WithEvents TabControl1 As TabControl
+	Friend WithEvents tcJob As TabControl
 	Friend WithEvents StatusStrip1 As StatusStrip
 	Friend WithEvents ButtonVEH As Button
 	Friend WithEvents ButtonMAP As Button
@@ -1722,7 +1750,7 @@ End Sub
 	Friend WithEvents ToolStripBtSaveAs As ToolStripButton
 	Friend WithEvents ToolStripBtSendTo As ToolStripButton
 	Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
-	Friend WithEvents GrAux As GroupBox
+	Friend WithEvents GrAuxMech As GroupBox
 	Friend WithEvents LvAux As ListView
 	Friend WithEvents ColumnHeader4 As ColumnHeader
 	Friend WithEvents ColumnHeader5 As ColumnHeader
@@ -1748,7 +1776,7 @@ End Sub
 	Friend WithEvents ShowInFolderToolStripMenuItem As ToolStripMenuItem
 	Friend WithEvents GrLAC As GroupBox
 	Friend WithEvents CbLookAhead As CheckBox
-	Friend WithEvents GroupBox1 As GroupBox
+	Friend WithEvents gbOverspeed As GroupBox
 	Friend WithEvents Label21 As Label
 	Friend WithEvents Label14 As Label
 	Friend WithEvents TbVmin As TextBox
@@ -1845,6 +1873,8 @@ End Sub
     Friend WithEvents TbShiftStrategyParams As TextBox
     Friend WithEvents BtnShiftParamsForm As Button
     Friend WithEvents BtnShiftStrategyParams As Button
-    Friend WithEvents GroupBox3 As GroupBox
+    Friend WithEvents gbShiftStrategy As GroupBox
     Friend WithEvents cbGearshiftStrategy As ComboBox
+    Friend WithEvents tpAuxiliaries As TabPage
+    Friend WithEvents tpCycles As TabPage
 End Class
diff --git a/VECTO/GUI/VectoJobForm.resx b/VECTO/GUI/VectoJobForm.resx
index 4d5a0f15ba..791537197e 100644
--- a/VECTO/GUI/VectoJobForm.resx
+++ b/VECTO/GUI/VectoJobForm.resx
@@ -136,9 +136,6 @@
         eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
 </value>
   </data>
-  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>468, 15</value>
-  </metadata>
   <data name="ButtonVEH.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -193,6 +190,9 @@
         eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
 </value>
   </data>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>468, 15</value>
+  </metadata>
   <data name="btnDfVelocityDrop.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index 6364756051..ab4dbefc1b 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -65,8 +65,8 @@ Public Class VectoJobForm
 
 		_pgDriver = TabPgDriver
 
-		For x = 0 To TabControl1.TabCount - 1
-			TabControl1.TabPages(x).Show()
+		For x = 0 To tcJob.TabCount - 1
+			tcJob.TabPages(x).Show()
 		Next
 
 		LvAux.Columns(AuxViewColumns.AuxInputOrTech).Width = -2
@@ -172,12 +172,12 @@ Public Class VectoJobForm
 		If onOff Then
 			If Not _pgDriverOn Then
 				_pgDriverOn = True
-				TabControl1.TabPages.Insert(1, _pgDriver)
+				tcJob.TabPages.Insert(1, _pgDriver)
 			End If
 		Else
 			If _pgDriverOn Then
 				_pgDriverOn = False
-				TabControl1.Controls.Remove(_pgDriver)
+				tcJob.Controls.Remove(_pgDriver)
 			End If
 		End If
 	End Sub
@@ -1092,7 +1092,7 @@ lbDlog:
 		ButOpenGBX.Enabled = onOff
 		TbGBX.Enabled = onOff
 		ButtonGBX.Enabled = onOff
-		GrAux.Enabled = onOff
+		GrAuxMech.Enabled = onOff
 	End Sub
 
 	'LAC changed
-- 
GitLab