From 5f0b29034a74d234cdc079cd6f554df0ba34bd36 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Mon, 2 May 2022 13:35:59 +0200
Subject: [PATCH] VehicleForm: updated visibility of Engine Stop/Start, EcoRoll
 and ATLockupClutch components based on VehicleType (Conventional, HEV, BEV)

---
 VECTO/GUI/VehicleForm.Designer.vb | 711 +++++++++++++++---------------
 VECTO/GUI/VehicleForm.vb          |  35 +-
 2 files changed, 380 insertions(+), 366 deletions(-)

diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index abc48dcf9a..c3c928c6de 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -203,10 +203,11 @@ Partial Class VehicleForm
 		Me.btDelMaxTorqueEntry = New System.Windows.Forms.Button()
 		Me.tpADAS = New System.Windows.Forms.TabPage()
 		Me.gbADAS = New System.Windows.Forms.GroupBox()
-		Me.cbAtEcoRollReleaseLockupClutch = New System.Windows.Forms.CheckBox()
-		Me.cbPcc = New System.Windows.Forms.ComboBox()
+		Me.pnEcoRoll = New System.Windows.Forms.Panel()
 		Me.cbEcoRoll = New System.Windows.Forms.ComboBox()
 		Me.Label22 = New System.Windows.Forms.Label()
+		Me.cbAtEcoRollReleaseLockupClutch = New System.Windows.Forms.CheckBox()
+		Me.cbPcc = New System.Windows.Forms.ComboBox()
 		Me.cbEngineStopStart = New System.Windows.Forms.CheckBox()
 		Me.lblPCC = New System.Windows.Forms.Label()
 		Me.tpRoadSweeper = New System.Windows.Forms.TabPage()
@@ -228,52 +229,53 @@ Partial Class VehicleForm
 		Me.cbLegislativeClass = New System.Windows.Forms.ComboBox()
 		Me.Label21 = New System.Windows.Forms.Label()
 		Me.lblTitle = New System.Windows.Forms.Label()
-		Me.GroupBox6.SuspendLayout
-		Me.ToolStrip1.SuspendLayout
-		Me.gbRetarderLosses.SuspendLayout
-		Me.PnRt.SuspendLayout
-		Me.GroupBox8.SuspendLayout
-		Me.PnWheelDiam.SuspendLayout
-		Me.StatusStrip1.SuspendLayout
-		Me.GroupBox1.SuspendLayout
-		Me.PnLoad.SuspendLayout
-		Me.GrAirRes.SuspendLayout
-		Me.PnCdATrTr.SuspendLayout
-		CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
-		Me.CmOpenFile.SuspendLayout
-		Me.GroupBox3.SuspendLayout
-		Me.gbAngledrive.SuspendLayout
-		Me.pnAngledriveFields.SuspendLayout
-		CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).BeginInit
-		Me.tcVehicleComponents.SuspendLayout
-		Me.tpGeneral.SuspendLayout
-		Me.tpPowertrain.SuspendLayout
-		Me.gbVehicleIdlingSpeed.SuspendLayout
-		Me.Panel1.SuspendLayout
-		Me.gbTankSystem.SuspendLayout
-		Me.tpElectricComponents.SuspendLayout
-		Me.gbBattery.SuspendLayout
-		Me.gpElectricMotor.SuspendLayout
-		Me.gbRatiosPerGear.SuspendLayout
-		Me.pnElectricMotor.SuspendLayout
-		Me.tpGensetComponents.SuspendLayout
-		Me.gbGenSet.SuspendLayout
-		Me.pnGenSetEM.SuspendLayout
-		Me.tpTorqueLimits.SuspendLayout
-		Me.gbPropulsionTorque.SuspendLayout
-		Me.gbEMTorqueLimits.SuspendLayout
-		Me.bgVehicleTorqueLimits.SuspendLayout
-		Me.tpADAS.SuspendLayout
-		Me.gbADAS.SuspendLayout
-		Me.tpRoadSweeper.SuspendLayout
-		Me.pnPTO.SuspendLayout
-		Me.gbPTODrive.SuspendLayout
-		Me.gbPTO.SuspendLayout
-		Me.SuspendLayout
+		Me.GroupBox6.SuspendLayout()
+		Me.ToolStrip1.SuspendLayout()
+		Me.gbRetarderLosses.SuspendLayout()
+		Me.PnRt.SuspendLayout()
+		Me.GroupBox8.SuspendLayout()
+		Me.PnWheelDiam.SuspendLayout()
+		Me.StatusStrip1.SuspendLayout()
+		Me.GroupBox1.SuspendLayout()
+		Me.PnLoad.SuspendLayout()
+		Me.GrAirRes.SuspendLayout()
+		Me.PnCdATrTr.SuspendLayout()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.CmOpenFile.SuspendLayout()
+		Me.GroupBox3.SuspendLayout()
+		Me.gbAngledrive.SuspendLayout()
+		Me.pnAngledriveFields.SuspendLayout()
+		CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.tcVehicleComponents.SuspendLayout()
+		Me.tpGeneral.SuspendLayout()
+		Me.tpPowertrain.SuspendLayout()
+		Me.gbVehicleIdlingSpeed.SuspendLayout()
+		Me.Panel1.SuspendLayout()
+		Me.gbTankSystem.SuspendLayout()
+		Me.tpElectricComponents.SuspendLayout()
+		Me.gbBattery.SuspendLayout()
+		Me.gpElectricMotor.SuspendLayout()
+		Me.gbRatiosPerGear.SuspendLayout()
+		Me.pnElectricMotor.SuspendLayout()
+		Me.tpGensetComponents.SuspendLayout()
+		Me.gbGenSet.SuspendLayout()
+		Me.pnGenSetEM.SuspendLayout()
+		Me.tpTorqueLimits.SuspendLayout()
+		Me.gbPropulsionTorque.SuspendLayout()
+		Me.gbEMTorqueLimits.SuspendLayout()
+		Me.bgVehicleTorqueLimits.SuspendLayout()
+		Me.tpADAS.SuspendLayout()
+		Me.gbADAS.SuspendLayout()
+		Me.pnEcoRoll.SuspendLayout()
+		Me.tpRoadSweeper.SuspendLayout()
+		Me.pnPTO.SuspendLayout()
+		Me.gbPTODrive.SuspendLayout()
+		Me.gbPTO.SuspendLayout()
+		Me.SuspendLayout()
 		'
 		'Label1
 		'
-		Me.Label1.AutoSize = true
+		Me.Label1.AutoSize = True
 		Me.Label1.Location = New System.Drawing.Point(6, 22)
 		Me.Label1.Name = "Label1"
 		Me.Label1.Size = New System.Drawing.Size(177, 13)
@@ -289,7 +291,7 @@ Partial Class VehicleForm
 		'
 		'Label2
 		'
-		Me.Label2.AutoSize = true
+		Me.Label2.AutoSize = True
 		Me.Label2.Location = New System.Drawing.Point(128, 31)
 		Me.Label2.Name = "Label2"
 		Me.Label2.Size = New System.Drawing.Size(45, 13)
@@ -305,7 +307,7 @@ Partial Class VehicleForm
 		'
 		'Label3
 		'
-		Me.Label3.AutoSize = true
+		Me.Label3.AutoSize = True
 		Me.Label3.Location = New System.Drawing.Point(10, 6)
 		Me.Label3.Name = "Label3"
 		Me.Label3.Size = New System.Drawing.Size(38, 13)
@@ -321,7 +323,7 @@ Partial Class VehicleForm
 		'
 		'Label13
 		'
-		Me.Label13.AutoSize = true
+		Me.Label13.AutoSize = True
 		Me.Label13.Location = New System.Drawing.Point(136, 6)
 		Me.Label13.Name = "Label13"
 		Me.Label13.Size = New System.Drawing.Size(40, 13)
@@ -337,28 +339,28 @@ Partial Class VehicleForm
 		'
 		'ButOK
 		'
-		Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		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(498, 577)
 		Me.ButOK.Name = "ButOK"
 		Me.ButOK.Size = New System.Drawing.Size(75, 23)
 		Me.ButOK.TabIndex = 6
 		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(579, 577)
 		Me.ButCancel.Name = "ButCancel"
 		Me.ButCancel.Size = New System.Drawing.Size(75, 23)
 		Me.ButCancel.TabIndex = 7
 		Me.ButCancel.Text = "Cancel"
-		Me.ButCancel.UseVisualStyleBackColor = true
+		Me.ButCancel.UseVisualStyleBackColor = True
 		'
 		'Label14
 		'
-		Me.Label14.AutoSize = true
+		Me.Label14.AutoSize = True
 		Me.Label14.Location = New System.Drawing.Point(247, 22)
 		Me.Label14.Name = "Label14"
 		Me.Label14.Size = New System.Drawing.Size(25, 13)
@@ -367,7 +369,7 @@ Partial Class VehicleForm
 		'
 		'Label31
 		'
-		Me.Label31.AutoSize = true
+		Me.Label31.AutoSize = True
 		Me.Label31.Location = New System.Drawing.Point(241, 31)
 		Me.Label31.Name = "Label31"
 		Me.Label31.Size = New System.Drawing.Size(25, 13)
@@ -376,7 +378,7 @@ Partial Class VehicleForm
 		'
 		'Label35
 		'
-		Me.Label35.AutoSize = true
+		Me.Label35.AutoSize = True
 		Me.Label35.Location = New System.Drawing.Point(244, 6)
 		Me.Label35.Name = "Label35"
 		Me.Label35.Size = New System.Drawing.Size(29, 13)
@@ -385,11 +387,11 @@ Partial Class VehicleForm
 		'
 		'CbCdMode
 		'
-		Me.CbCdMode.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.CbCdMode.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.CbCdMode.DisplayMember = "Value"
 		Me.CbCdMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.CbCdMode.FormattingEnabled = true
+		Me.CbCdMode.FormattingEnabled = True
 		Me.CbCdMode.Items.AddRange(New Object() {"No Correction", "Speed dependent (User-defined)", "Speed dependent (Declaration Mode)", "Vair & Beta Input"})
 		Me.CbCdMode.Location = New System.Drawing.Point(6, 19)
 		Me.CbCdMode.Name = "CbCdMode"
@@ -399,9 +401,9 @@ Partial Class VehicleForm
 		'
 		'TbCdFile
 		'
-		Me.TbCdFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.TbCdFile.Enabled = false
+		Me.TbCdFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbCdFile.Enabled = False
 		Me.TbCdFile.Location = New System.Drawing.Point(9, 65)
 		Me.TbCdFile.Name = "TbCdFile"
 		Me.TbCdFile.Size = New System.Drawing.Size(276, 20)
@@ -409,14 +411,14 @@ Partial Class VehicleForm
 		'
 		'BtCdFileBrowse
 		'
-		Me.BtCdFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.BtCdFileBrowse.Enabled = false
+		Me.BtCdFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtCdFileBrowse.Enabled = False
 		Me.BtCdFileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
 		Me.BtCdFileBrowse.Location = New System.Drawing.Point(291, 62)
 		Me.BtCdFileBrowse.Name = "BtCdFileBrowse"
 		Me.BtCdFileBrowse.Size = New System.Drawing.Size(24, 24)
 		Me.BtCdFileBrowse.TabIndex = 2
-		Me.BtCdFileBrowse.UseVisualStyleBackColor = true
+		Me.BtCdFileBrowse.UseVisualStyleBackColor = True
 		'
 		'GroupBox6
 		'
@@ -429,23 +431,23 @@ Partial Class VehicleForm
 		Me.GroupBox6.Name = "GroupBox6"
 		Me.GroupBox6.Size = New System.Drawing.Size(346, 96)
 		Me.GroupBox6.TabIndex = 3
-		Me.GroupBox6.TabStop = false
+		Me.GroupBox6.TabStop = False
 		Me.GroupBox6.Text = "Cross Wind Correction"
 		'
 		'BtCdFileOpen
 		'
-		Me.BtCdFileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.BtCdFileOpen.Enabled = false
+		Me.BtCdFileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtCdFileOpen.Enabled = False
 		Me.BtCdFileOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
 		Me.BtCdFileOpen.Location = New System.Drawing.Point(315, 62)
 		Me.BtCdFileOpen.Name = "BtCdFileOpen"
 		Me.BtCdFileOpen.Size = New System.Drawing.Size(24, 24)
 		Me.BtCdFileOpen.TabIndex = 3
-		Me.BtCdFileOpen.UseVisualStyleBackColor = true
+		Me.BtCdFileOpen.UseVisualStyleBackColor = True
 		'
 		'LbCdMode
 		'
-		Me.LbCdMode.AutoSize = true
+		Me.LbCdMode.AutoSize = True
 		Me.LbCdMode.Location = New System.Drawing.Point(6, 47)
 		Me.LbCdMode.Name = "LbCdMode"
 		Me.LbCdMode.Size = New System.Drawing.Size(59, 13)
@@ -542,14 +544,14 @@ Partial Class VehicleForm
 		Me.gbRetarderLosses.Name = "gbRetarderLosses"
 		Me.gbRetarderLosses.Size = New System.Drawing.Size(310, 111)
 		Me.gbRetarderLosses.TabIndex = 1
-		Me.gbRetarderLosses.TabStop = false
+		Me.gbRetarderLosses.TabStop = False
 		Me.gbRetarderLosses.Text = "Retarder Losses"
 		'
 		'PnRt
 		'
-		Me.PnRt.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.PnRt.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.PnRt.Controls.Add(Me.Label15)
 		Me.PnRt.Controls.Add(Me.BtRtBrowse)
 		Me.PnRt.Controls.Add(Me.TbRtPath)
@@ -563,8 +565,8 @@ Partial Class VehicleForm
 		'
 		'Label15
 		'
-		Me.Label15.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.Label15.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.Label15.Location = New System.Drawing.Point(2, 23)
 		Me.Label15.Name = "Label15"
 		Me.Label15.Size = New System.Drawing.Size(232, 16)
@@ -574,18 +576,18 @@ Partial Class VehicleForm
 		'
 		'BtRtBrowse
 		'
-		Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.BtRtBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
 		Me.BtRtBrowse.Location = New System.Drawing.Point(272, 37)
 		Me.BtRtBrowse.Name = "BtRtBrowse"
 		Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24)
 		Me.BtRtBrowse.TabIndex = 2
-		Me.BtRtBrowse.UseVisualStyleBackColor = true
+		Me.BtRtBrowse.UseVisualStyleBackColor = True
 		'
 		'TbRtPath
 		'
-		Me.TbRtPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.TbRtPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.TbRtPath.Location = New System.Drawing.Point(3, 39)
 		Me.TbRtPath.Name = "TbRtPath"
 		Me.TbRtPath.Size = New System.Drawing.Size(269, 20)
@@ -593,8 +595,8 @@ Partial Class VehicleForm
 		'
 		'Label45
 		'
-		Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.Label45.AutoSize = true
+		Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label45.AutoSize = True
 		Me.Label45.Location = New System.Drawing.Point(263, 5)
 		Me.Label45.Name = "Label45"
 		Me.Label45.Size = New System.Drawing.Size(16, 13)
@@ -603,7 +605,7 @@ Partial Class VehicleForm
 		'
 		'LbRtRatio
 		'
-		Me.LbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.LbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.LbRtRatio.Location = New System.Drawing.Point(35, 5)
 		Me.LbRtRatio.Name = "LbRtRatio"
 		Me.LbRtRatio.Size = New System.Drawing.Size(167, 17)
@@ -613,7 +615,7 @@ Partial Class VehicleForm
 		'
 		'TbRtRatio
 		'
-		Me.TbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.TbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.TbRtRatio.Location = New System.Drawing.Point(205, 3)
 		Me.TbRtRatio.Name = "TbRtRatio"
 		Me.TbRtRatio.Size = New System.Drawing.Size(56, 20)
@@ -621,8 +623,8 @@ Partial Class VehicleForm
 		'
 		'CbRtType
 		'
-		Me.CbRtType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.CbRtType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.CbRtType.DisplayMember = "Value"
 		Me.CbRtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
 		Me.CbRtType.Items.AddRange(New Object() {"Included in Transmission Loss Maps", "Primary Retarder", "Secondary Retarder"})
@@ -634,7 +636,7 @@ Partial Class VehicleForm
 		'
 		'Label46
 		'
-		Me.Label46.AutoSize = true
+		Me.Label46.AutoSize = True
 		Me.Label46.Location = New System.Drawing.Point(32, 5)
 		Me.Label46.Name = "Label46"
 		Me.Label46.Size = New System.Drawing.Size(145, 13)
@@ -643,7 +645,7 @@ Partial Class VehicleForm
 		'
 		'Label50
 		'
-		Me.Label50.AutoSize = true
+		Me.Label50.AutoSize = True
 		Me.Label50.Location = New System.Drawing.Point(241, 5)
 		Me.Label50.Name = "Label50"
 		Me.Label50.Size = New System.Drawing.Size(25, 13)
@@ -667,13 +669,13 @@ Partial Class VehicleForm
 		Me.GroupBox8.Name = "GroupBox8"
 		Me.GroupBox8.Size = New System.Drawing.Size(633, 182)
 		Me.GroupBox8.TabIndex = 4
-		Me.GroupBox8.TabStop = false
+		Me.GroupBox8.TabStop = False
 		Me.GroupBox8.Text = "Axles / Wheels"
 		'
 		'Label6
 		'
-		Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.Label6.AutoSize = true
+		Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label6.AutoSize = True
 		Me.Label6.Location = New System.Drawing.Point(525, 152)
 		Me.Label6.Name = "Label6"
 		Me.Label6.Size = New System.Drawing.Size(106, 13)
@@ -682,30 +684,30 @@ Partial Class VehicleForm
 		'
 		'ButAxlRem
 		'
-		Me.ButAxlRem.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+		Me.ButAxlRem.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.ButAxlRem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
 		Me.ButAxlRem.Location = New System.Drawing.Point(29, 151)
 		Me.ButAxlRem.Name = "ButAxlRem"
 		Me.ButAxlRem.Size = New System.Drawing.Size(24, 24)
 		Me.ButAxlRem.TabIndex = 2
-		Me.ButAxlRem.UseVisualStyleBackColor = true
+		Me.ButAxlRem.UseVisualStyleBackColor = True
 		'
 		'LvRRC
 		'
-		Me.LvRRC.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.LvRRC.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.LvRRC.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader7, Me.ColumnHeader8, Me.ColumnHeader2, Me.ColumnHeader9, Me.ColumnHeader1, Me.ColumnHeader3, Me.ColumnHeader4, Me.ColumnHeader10})
-		Me.LvRRC.FullRowSelect = true
-		Me.LvRRC.GridLines = true
-		Me.LvRRC.HideSelection = false
+		Me.LvRRC.FullRowSelect = True
+		Me.LvRRC.GridLines = True
+		Me.LvRRC.HideSelection = False
 		Me.LvRRC.Location = New System.Drawing.Point(6, 19)
-		Me.LvRRC.MultiSelect = false
+		Me.LvRRC.MultiSelect = False
 		Me.LvRRC.Name = "LvRRC"
 		Me.LvRRC.Size = New System.Drawing.Size(621, 131)
 		Me.LvRRC.TabIndex = 0
-		Me.LvRRC.TabStop = false
-		Me.LvRRC.UseCompatibleStateImageBehavior = false
+		Me.LvRRC.TabStop = False
+		Me.LvRRC.UseCompatibleStateImageBehavior = False
 		Me.LvRRC.View = System.Windows.Forms.View.Details
 		'
 		'ColumnHeader7
@@ -749,13 +751,13 @@ Partial Class VehicleForm
 		'
 		'ButAxlAdd
 		'
-		Me.ButAxlAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+		Me.ButAxlAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.ButAxlAdd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
 		Me.ButAxlAdd.Location = New System.Drawing.Point(5, 151)
 		Me.ButAxlAdd.Name = "ButAxlAdd"
 		Me.ButAxlAdd.Size = New System.Drawing.Size(24, 24)
 		Me.ButAxlAdd.TabIndex = 1
-		Me.ButAxlAdd.UseVisualStyleBackColor = true
+		Me.ButAxlAdd.UseVisualStyleBackColor = True
 		'
 		'PnWheelDiam
 		'
@@ -772,7 +774,7 @@ Partial Class VehicleForm
 		'
 		Me.CbAxleConfig.DisplayMember = "Value"
 		Me.CbAxleConfig.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.CbAxleConfig.FormattingEnabled = true
+		Me.CbAxleConfig.FormattingEnabled = True
 		Me.CbAxleConfig.Items.AddRange(New Object() {"-", "4x2", "4x4", "6x2", "6x4", "6x6", "8x2", "8x4", "8x6", "8x8"})
 		Me.CbAxleConfig.Location = New System.Drawing.Point(153, 80)
 		Me.CbAxleConfig.Name = "CbAxleConfig"
@@ -784,7 +786,7 @@ Partial Class VehicleForm
 		'
 		Me.CbCat.DisplayMember = "Value"
 		Me.CbCat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.CbCat.FormattingEnabled = true
+		Me.CbCat.FormattingEnabled = True
 		Me.CbCat.Items.AddRange(New Object() {"-", "Rigid Truck", "Tractor", "City Bus", "Interurban Bus", "Coach"})
 		Me.CbCat.Location = New System.Drawing.Point(12, 80)
 		Me.CbCat.Name = "CbCat"
@@ -794,7 +796,7 @@ Partial Class VehicleForm
 		'
 		'Label5
 		'
-		Me.Label5.AutoSize = true
+		Me.Label5.AutoSize = True
 		Me.Label5.Location = New System.Drawing.Point(31, 108)
 		Me.Label5.Name = "Label5"
 		Me.Label5.Size = New System.Drawing.Size(116, 13)
@@ -803,7 +805,7 @@ Partial Class VehicleForm
 		'
 		'Label9
 		'
-		Me.Label9.AutoSize = true
+		Me.Label9.AutoSize = True
 		Me.Label9.Location = New System.Drawing.Point(197, 114)
 		Me.Label9.Name = "Label9"
 		Me.Label9.Size = New System.Drawing.Size(16, 13)
@@ -825,7 +827,7 @@ Partial Class VehicleForm
 		Me.StatusStrip1.Location = New System.Drawing.Point(0, 603)
 		Me.StatusStrip1.Name = "StatusStrip1"
 		Me.StatusStrip1.Size = New System.Drawing.Size(666, 22)
-		Me.StatusStrip1.SizingGrip = false
+		Me.StatusStrip1.SizingGrip = False
 		Me.StatusStrip1.TabIndex = 36
 		Me.StatusStrip1.Text = "StatusStrip1"
 		'
@@ -839,10 +841,10 @@ Partial Class VehicleForm
 		'
 		Me.TbHDVclass.Location = New System.Drawing.Point(153, 141)
 		Me.TbHDVclass.Name = "TbHDVclass"
-		Me.TbHDVclass.ReadOnly = true
+		Me.TbHDVclass.ReadOnly = True
 		Me.TbHDVclass.Size = New System.Drawing.Size(42, 20)
 		Me.TbHDVclass.TabIndex = 3
-		Me.TbHDVclass.TabStop = false
+		Me.TbHDVclass.TabStop = False
 		Me.TbHDVclass.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
 		'
 		'GroupBox1
@@ -855,7 +857,7 @@ Partial Class VehicleForm
 		Me.GroupBox1.Name = "GroupBox1"
 		Me.GroupBox1.Size = New System.Drawing.Size(278, 118)
 		Me.GroupBox1.TabIndex = 0
-		Me.GroupBox1.TabStop = false
+		Me.GroupBox1.TabStop = False
 		Me.GroupBox1.Text = "Masses / Loading"
 		'
 		'PnLoad
@@ -878,7 +880,7 @@ Partial Class VehicleForm
 		Me.GrAirRes.Name = "GrAirRes"
 		Me.GrAirRes.Size = New System.Drawing.Size(349, 72)
 		Me.GrAirRes.TabIndex = 2
-		Me.GrAirRes.TabStop = false
+		Me.GrAirRes.TabStop = False
 		Me.GrAirRes.Text = "Air Resistance"
 		'
 		'PnCdATrTr
@@ -904,7 +906,7 @@ Partial Class VehicleForm
 		'
 		'Label11
 		'
-		Me.Label11.AutoSize = true
+		Me.Label11.AutoSize = True
 		Me.Label11.Location = New System.Drawing.Point(117, 32)
 		Me.Label11.Name = "Label11"
 		Me.Label11.Size = New System.Drawing.Size(21, 13)
@@ -913,7 +915,7 @@ Partial Class VehicleForm
 		'
 		'Label20
 		'
-		Me.Label20.AutoSize = true
+		Me.Label20.AutoSize = True
 		Me.Label20.Location = New System.Drawing.Point(10, 32)
 		Me.Label20.Name = "Label20"
 		Me.Label20.Size = New System.Drawing.Size(38, 13)
@@ -922,7 +924,7 @@ Partial Class VehicleForm
 		'
 		'Label38
 		'
-		Me.Label38.AutoSize = true
+		Me.Label38.AutoSize = True
 		Me.Label38.Location = New System.Drawing.Point(117, 6)
 		Me.Label38.Name = "Label38"
 		Me.Label38.Size = New System.Drawing.Size(24, 13)
@@ -937,14 +939,14 @@ Partial Class VehicleForm
 		Me.PictureBox1.Name = "PictureBox1"
 		Me.PictureBox1.Size = New System.Drawing.Size(666, 40)
 		Me.PictureBox1.TabIndex = 37
-		Me.PictureBox1.TabStop = false
+		Me.PictureBox1.TabStop = False
 		'
 		'CmOpenFile
 		'
 		Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
 		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
@@ -966,7 +968,7 @@ Partial Class VehicleForm
 		Me.GroupBox3.Name = "GroupBox3"
 		Me.GroupBox3.Size = New System.Drawing.Size(278, 50)
 		Me.GroupBox3.TabIndex = 1
-		Me.GroupBox3.TabStop = false
+		Me.GroupBox3.TabStop = False
 		Me.GroupBox3.Text = "Dynamic Tyre Radius"
 		'
 		'gbAngledrive
@@ -977,14 +979,14 @@ Partial Class VehicleForm
 		Me.gbAngledrive.Name = "gbAngledrive"
 		Me.gbAngledrive.Size = New System.Drawing.Size(313, 111)
 		Me.gbAngledrive.TabIndex = 3
-		Me.gbAngledrive.TabStop = false
+		Me.gbAngledrive.TabStop = False
 		Me.gbAngledrive.Text = "Angledrive"
 		'
 		'pnAngledriveFields
 		'
-		Me.pnAngledriveFields.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.pnAngledriveFields.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.pnAngledriveFields.Controls.Add(Me.Label4)
 		Me.pnAngledriveFields.Controls.Add(Me.Label10)
 		Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveRatio)
@@ -998,8 +1000,8 @@ Partial Class VehicleForm
 		'
 		'Label4
 		'
-		Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.Label4.AutoSize = true
+		Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label4.AutoSize = True
 		Me.Label4.Location = New System.Drawing.Point(277, 6)
 		Me.Label4.Name = "Label4"
 		Me.Label4.Size = New System.Drawing.Size(16, 13)
@@ -1008,7 +1010,7 @@ Partial Class VehicleForm
 		'
 		'Label10
 		'
-		Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.Label10.Location = New System.Drawing.Point(170, 6)
 		Me.Label10.Name = "Label10"
 		Me.Label10.Size = New System.Drawing.Size(44, 18)
@@ -1018,7 +1020,7 @@ Partial Class VehicleForm
 		'
 		'tbAngledriveRatio
 		'
-		Me.tbAngledriveRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.tbAngledriveRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.tbAngledriveRatio.Location = New System.Drawing.Point(219, 4)
 		Me.tbAngledriveRatio.Name = "tbAngledriveRatio"
 		Me.tbAngledriveRatio.Size = New System.Drawing.Size(56, 20)
@@ -1026,18 +1028,18 @@ Partial Class VehicleForm
 		'
 		'btAngledriveLossMapBrowse
 		'
-		Me.btAngledriveLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.btAngledriveLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.btAngledriveLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
 		Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(276, 39)
 		Me.btAngledriveLossMapBrowse.Name = "btAngledriveLossMapBrowse"
 		Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(24, 24)
 		Me.btAngledriveLossMapBrowse.TabIndex = 2
-		Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = true
+		Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = True
 		'
 		'tbAngledriveLossMapPath
 		'
-		Me.tbAngledriveLossMapPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.tbAngledriveLossMapPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(3, 41)
 		Me.tbAngledriveLossMapPath.Name = "tbAngledriveLossMapPath"
 		Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(273, 20)
@@ -1045,8 +1047,8 @@ Partial Class VehicleForm
 		'
 		'Label12
 		'
-		Me.Label12.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.Label12.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.Label12.Location = New System.Drawing.Point(0, 24)
 		Me.Label12.Name = "Label12"
 		Me.Label12.Size = New System.Drawing.Size(294, 16)
@@ -1056,8 +1058,8 @@ Partial Class VehicleForm
 		'
 		'cbAngledriveType
 		'
-		Me.cbAngledriveType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.cbAngledriveType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.cbAngledriveType.DisplayMember = "Value"
 		Me.cbAngledriveType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
 		Me.cbAngledriveType.Location = New System.Drawing.Point(6, 19)
@@ -1075,11 +1077,11 @@ Partial Class VehicleForm
 		Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
 		Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
 		Me.PicVehicle.TabIndex = 39
-		Me.PicVehicle.TabStop = false
+		Me.PicVehicle.TabStop = False
 		'
 		'Label8
 		'
-		Me.Label8.AutoSize = true
+		Me.Label8.AutoSize = True
 		Me.Label8.Location = New System.Drawing.Point(85, 144)
 		Me.Label8.Name = "Label8"
 		Me.Label8.Size = New System.Drawing.Size(62, 13)
@@ -1088,8 +1090,8 @@ Partial Class VehicleForm
 		'
 		'cbPTOType
 		'
-		Me.cbPTOType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.cbPTOType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.cbPTOType.DisplayMember = "Value"
 		Me.cbPTOType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
 		Me.cbPTOType.Location = New System.Drawing.Point(6, 24)
@@ -1151,7 +1153,7 @@ Partial Class VehicleForm
 		Me.tpGeneral.Size = New System.Drawing.Size(648, 374)
 		Me.tpGeneral.TabIndex = 0
 		Me.tpGeneral.Text = "General"
-		Me.tpGeneral.UseVisualStyleBackColor = true
+		Me.tpGeneral.UseVisualStyleBackColor = True
 		'
 		'tpPowertrain
 		'
@@ -1165,7 +1167,7 @@ Partial Class VehicleForm
 		Me.tpPowertrain.Size = New System.Drawing.Size(648, 374)
 		Me.tpPowertrain.TabIndex = 1
 		Me.tpPowertrain.Text = "Powertrain"
-		Me.tpPowertrain.UseVisualStyleBackColor = true
+		Me.tpPowertrain.UseVisualStyleBackColor = True
 		'
 		'gbVehicleIdlingSpeed
 		'
@@ -1174,7 +1176,7 @@ Partial Class VehicleForm
 		Me.gbVehicleIdlingSpeed.Name = "gbVehicleIdlingSpeed"
 		Me.gbVehicleIdlingSpeed.Size = New System.Drawing.Size(310, 63)
 		Me.gbVehicleIdlingSpeed.TabIndex = 0
-		Me.gbVehicleIdlingSpeed.TabStop = false
+		Me.gbVehicleIdlingSpeed.TabStop = False
 		Me.gbVehicleIdlingSpeed.Text = "Vehicle Idling Speed"
 		'
 		'Panel1
@@ -1197,7 +1199,7 @@ Partial Class VehicleForm
 		'
 		'Label18
 		'
-		Me.Label18.AutoSize = true
+		Me.Label18.AutoSize = True
 		Me.Label18.Location = New System.Drawing.Point(233, 6)
 		Me.Label18.Name = "Label18"
 		Me.Label18.Size = New System.Drawing.Size(30, 13)
@@ -1206,7 +1208,7 @@ Partial Class VehicleForm
 		'
 		'Label19
 		'
-		Me.Label19.AutoSize = true
+		Me.Label19.AutoSize = True
 		Me.Label19.Location = New System.Drawing.Point(73, 6)
 		Me.Label19.Name = "Label19"
 		Me.Label19.Size = New System.Drawing.Size(94, 13)
@@ -1221,13 +1223,13 @@ Partial Class VehicleForm
 		Me.gbTankSystem.Name = "gbTankSystem"
 		Me.gbTankSystem.Size = New System.Drawing.Size(310, 63)
 		Me.gbTankSystem.TabIndex = 2
-		Me.gbTankSystem.TabStop = false
+		Me.gbTankSystem.TabStop = False
 		Me.gbTankSystem.Text = "Tank System"
 		'
 		'cbTankSystem
 		'
-		Me.cbTankSystem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.cbTankSystem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.cbTankSystem.DisplayMember = "Value"
 		Me.cbTankSystem.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
 		Me.cbTankSystem.Location = New System.Drawing.Point(6, 19)
@@ -1238,8 +1240,8 @@ Partial Class VehicleForm
 		'
 		'Label23
 		'
-		Me.Label23.AutoSize = true
-		Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+		Me.Label23.AutoSize = True
+		Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
 		Me.Label23.Location = New System.Drawing.Point(3, 43)
 		Me.Label23.Name = "Label23"
 		Me.Label23.Size = New System.Drawing.Size(187, 13)
@@ -1256,7 +1258,7 @@ Partial Class VehicleForm
 		Me.tpElectricComponents.Size = New System.Drawing.Size(648, 374)
 		Me.tpElectricComponents.TabIndex = 4
 		Me.tpElectricComponents.Text = "Electric Powertrain Components"
-		Me.tpElectricComponents.UseVisualStyleBackColor = true
+		Me.tpElectricComponents.UseVisualStyleBackColor = True
 		'
 		'gbBattery
 		'
@@ -1271,24 +1273,24 @@ Partial Class VehicleForm
 		Me.gbBattery.Name = "gbBattery"
 		Me.gbBattery.Size = New System.Drawing.Size(633, 187)
 		Me.gbBattery.TabIndex = 2
-		Me.gbBattery.TabStop = false
+		Me.gbBattery.TabStop = False
 		Me.gbBattery.Text = "Electric Energy Storage system"
 		'
 		'lvREESSPacks
 		'
-		Me.lvREESSPacks.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.lvREESSPacks.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.lvREESSPacks.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.chReessPackPack, Me.chReessPackCount, Me.chReessPackStringId})
-		Me.lvREESSPacks.FullRowSelect = true
-		Me.lvREESSPacks.GridLines = true
-		Me.lvREESSPacks.HideSelection = false
+		Me.lvREESSPacks.FullRowSelect = True
+		Me.lvREESSPacks.GridLines = True
+		Me.lvREESSPacks.HideSelection = False
 		Me.lvREESSPacks.Location = New System.Drawing.Point(6, 45)
-		Me.lvREESSPacks.MultiSelect = false
+		Me.lvREESSPacks.MultiSelect = False
 		Me.lvREESSPacks.Name = "lvREESSPacks"
 		Me.lvREESSPacks.Size = New System.Drawing.Size(553, 102)
 		Me.lvREESSPacks.TabIndex = 31
-		Me.lvREESSPacks.TabStop = false
-		Me.lvREESSPacks.UseCompatibleStateImageBehavior = false
+		Me.lvREESSPacks.TabStop = False
+		Me.lvREESSPacks.UseCompatibleStateImageBehavior = False
 		Me.lvREESSPacks.View = System.Windows.Forms.View.Details
 		'
 		'chReessPackPack
@@ -1313,11 +1315,11 @@ Partial Class VehicleForm
 		Me.btnAddReessPack.Name = "btnAddReessPack"
 		Me.btnAddReessPack.Size = New System.Drawing.Size(24, 24)
 		Me.btnAddReessPack.TabIndex = 1
-		Me.btnAddReessPack.UseVisualStyleBackColor = true
+		Me.btnAddReessPack.UseVisualStyleBackColor = True
 		'
 		'lblEditReessPack
 		'
-		Me.lblEditReessPack.AutoSize = true
+		Me.lblEditReessPack.AutoSize = True
 		Me.lblEditReessPack.Location = New System.Drawing.Point(451, 159)
 		Me.lblEditReessPack.Name = "lblEditReessPack"
 		Me.lblEditReessPack.Size = New System.Drawing.Size(106, 13)
@@ -1331,11 +1333,11 @@ Partial Class VehicleForm
 		Me.btnRemoveReessPack.Name = "btnRemoveReessPack"
 		Me.btnRemoveReessPack.Size = New System.Drawing.Size(24, 24)
 		Me.btnRemoveReessPack.TabIndex = 2
-		Me.btnRemoveReessPack.UseVisualStyleBackColor = true
+		Me.btnRemoveReessPack.UseVisualStyleBackColor = True
 		'
 		'lblInitialSoCUnit
 		'
-		Me.lblInitialSoCUnit.AutoSize = true
+		Me.lblInitialSoCUnit.AutoSize = True
 		Me.lblInitialSoCUnit.Location = New System.Drawing.Point(265, 21)
 		Me.lblInitialSoCUnit.Name = "lblInitialSoCUnit"
 		Me.lblInitialSoCUnit.Size = New System.Drawing.Size(21, 13)
@@ -1351,7 +1353,7 @@ Partial Class VehicleForm
 		'
 		'lblInitialSoC
 		'
-		Me.lblInitialSoC.AutoSize = true
+		Me.lblInitialSoC.AutoSize = True
 		Me.lblInitialSoC.Location = New System.Drawing.Point(7, 22)
 		Me.lblInitialSoC.Name = "lblInitialSoC"
 		Me.lblInitialSoC.RightToLeft = System.Windows.Forms.RightToLeft.Yes
@@ -1378,13 +1380,13 @@ Partial Class VehicleForm
 		Me.gpElectricMotor.Name = "gpElectricMotor"
 		Me.gpElectricMotor.Size = New System.Drawing.Size(633, 163)
 		Me.gpElectricMotor.TabIndex = 0
-		Me.gpElectricMotor.TabStop = false
+		Me.gpElectricMotor.TabStop = False
 		Me.gpElectricMotor.Text = "Electric Machine"
 		'
 		'Label33
 		'
-		Me.Label33.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.Label33.AutoSize = true
+		Me.Label33.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label33.AutoSize = True
 		Me.Label33.Location = New System.Drawing.Point(203, 108)
 		Me.Label33.Name = "Label33"
 		Me.Label33.Size = New System.Drawing.Size(16, 13)
@@ -1393,8 +1395,8 @@ Partial Class VehicleForm
 		'
 		'Label32
 		'
-		Me.Label32.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.Label32.AutoSize = true
+		Me.Label32.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label32.AutoSize = True
 		Me.Label32.Location = New System.Drawing.Point(203, 82)
 		Me.Label32.Name = "Label32"
 		Me.Label32.Size = New System.Drawing.Size(16, 13)
@@ -1411,24 +1413,24 @@ Partial Class VehicleForm
 		Me.gbRatiosPerGear.Name = "gbRatiosPerGear"
 		Me.gbRatiosPerGear.Size = New System.Drawing.Size(181, 145)
 		Me.gbRatiosPerGear.TabIndex = 1
-		Me.gbRatiosPerGear.TabStop = false
+		Me.gbRatiosPerGear.TabStop = False
 		Me.gbRatiosPerGear.Text = "Transmission Ratio per Gear"
 		'
 		'lvRatioPerGear
 		'
-		Me.lvRatioPerGear.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.lvRatioPerGear.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.lvRatioPerGear.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader11, Me.ColumnHeader12})
-		Me.lvRatioPerGear.FullRowSelect = true
-		Me.lvRatioPerGear.GridLines = true
-		Me.lvRatioPerGear.HideSelection = false
+		Me.lvRatioPerGear.FullRowSelect = True
+		Me.lvRatioPerGear.GridLines = True
+		Me.lvRatioPerGear.HideSelection = False
 		Me.lvRatioPerGear.Location = New System.Drawing.Point(6, 16)
-		Me.lvRatioPerGear.MultiSelect = false
+		Me.lvRatioPerGear.MultiSelect = False
 		Me.lvRatioPerGear.Name = "lvRatioPerGear"
 		Me.lvRatioPerGear.Size = New System.Drawing.Size(169, 94)
 		Me.lvRatioPerGear.TabIndex = 7
-		Me.lvRatioPerGear.TabStop = false
-		Me.lvRatioPerGear.UseCompatibleStateImageBehavior = false
+		Me.lvRatioPerGear.TabStop = False
+		Me.lvRatioPerGear.UseCompatibleStateImageBehavior = False
 		Me.lvRatioPerGear.View = System.Windows.Forms.View.Details
 		'
 		'ColumnHeader11
@@ -1448,11 +1450,11 @@ Partial Class VehicleForm
 		Me.btnAddEMRatio.Name = "btnAddEMRatio"
 		Me.btnAddEMRatio.Size = New System.Drawing.Size(24, 24)
 		Me.btnAddEMRatio.TabIndex = 4
-		Me.btnAddEMRatio.UseVisualStyleBackColor = true
+		Me.btnAddEMRatio.UseVisualStyleBackColor = True
 		'
 		'Label29
 		'
-		Me.Label29.AutoSize = true
+		Me.Label29.AutoSize = True
 		Me.Label29.Location = New System.Drawing.Point(71, 121)
 		Me.Label29.Name = "Label29"
 		Me.Label29.Size = New System.Drawing.Size(106, 13)
@@ -1466,17 +1468,17 @@ Partial Class VehicleForm
 		Me.btnRemoveEMRatio.Name = "btnRemoveEMRatio"
 		Me.btnRemoveEMRatio.Size = New System.Drawing.Size(24, 24)
 		Me.btnRemoveEMRatio.TabIndex = 5
-		Me.btnRemoveEMRatio.UseVisualStyleBackColor = true
+		Me.btnRemoveEMRatio.UseVisualStyleBackColor = True
 		'
 		'btnEmADCLossMap
 		'
-		Me.btnEmADCLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+		Me.btnEmADCLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.btnEmADCLossMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
 		Me.btnEmADCLossMap.Location = New System.Drawing.Point(346, 129)
 		Me.btnEmADCLossMap.Name = "btnEmADCLossMap"
 		Me.btnEmADCLossMap.Size = New System.Drawing.Size(24, 24)
 		Me.btnEmADCLossMap.TabIndex = 5
-		Me.btnEmADCLossMap.UseVisualStyleBackColor = true
+		Me.btnEmADCLossMap.UseVisualStyleBackColor = True
 		'
 		'tbEmADCLossMap
 		'
@@ -1487,7 +1489,7 @@ Partial Class VehicleForm
 		'
 		'lblEmADCLossmap
 		'
-		Me.lblEmADCLossmap.AutoSize = true
+		Me.lblEmADCLossmap.AutoSize = True
 		Me.lblEmADCLossmap.Location = New System.Drawing.Point(7, 134)
 		Me.lblEmADCLossmap.Name = "lblEmADCLossmap"
 		Me.lblEmADCLossmap.Size = New System.Drawing.Size(100, 13)
@@ -1503,7 +1505,7 @@ Partial Class VehicleForm
 		'
 		'lblRatioEm
 		'
-		Me.lblRatioEm.AutoSize = true
+		Me.lblRatioEm.AutoSize = True
 		Me.lblRatioEm.Location = New System.Drawing.Point(7, 108)
 		Me.lblRatioEm.Name = "lblRatioEm"
 		Me.lblRatioEm.Size = New System.Drawing.Size(79, 13)
@@ -1521,7 +1523,7 @@ Partial Class VehicleForm
 		'
 		Me.cbEmPos.DisplayMember = "Value"
 		Me.cbEmPos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.cbEmPos.FormattingEnabled = true
+		Me.cbEmPos.FormattingEnabled = True
 		Me.cbEmPos.Location = New System.Drawing.Point(110, 52)
 		Me.cbEmPos.Name = "cbEmPos"
 		Me.cbEmPos.Size = New System.Drawing.Size(153, 21)
@@ -1530,7 +1532,7 @@ Partial Class VehicleForm
 		'
 		'lblEmCount
 		'
-		Me.lblEmCount.AutoSize = true
+		Me.lblEmCount.AutoSize = True
 		Me.lblEmCount.Location = New System.Drawing.Point(7, 82)
 		Me.lblEmCount.Name = "lblEmCount"
 		Me.lblEmCount.Size = New System.Drawing.Size(83, 13)
@@ -1539,7 +1541,7 @@ Partial Class VehicleForm
 		'
 		'lblEmPosition
 		'
-		Me.lblEmPosition.AutoSize = true
+		Me.lblEmPosition.AutoSize = True
 		Me.lblEmPosition.Location = New System.Drawing.Point(7, 56)
 		Me.lblEmPosition.Name = "lblEmPosition"
 		Me.lblEmPosition.Size = New System.Drawing.Size(47, 13)
@@ -1563,22 +1565,22 @@ Partial Class VehicleForm
 		Me.btnOpenElectricMotor.Size = New System.Drawing.Size(94, 21)
 		Me.btnOpenElectricMotor.TabIndex = 0
 		Me.btnOpenElectricMotor.Text = "Electric Machine"
-		Me.btnOpenElectricMotor.UseVisualStyleBackColor = true
+		Me.btnOpenElectricMotor.UseVisualStyleBackColor = True
 		'
 		'btnBrowseElectricMotor
 		'
-		Me.btnBrowseElectricMotor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.btnBrowseElectricMotor.Image = CType(resources.GetObject("btnBrowseElectricMotor.Image"),System.Drawing.Image)
+		Me.btnBrowseElectricMotor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.btnBrowseElectricMotor.Image = CType(resources.GetObject("btnBrowseElectricMotor.Image"), System.Drawing.Image)
 		Me.btnBrowseElectricMotor.Location = New System.Drawing.Point(406, 2)
 		Me.btnBrowseElectricMotor.Name = "btnBrowseElectricMotor"
 		Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(24, 24)
 		Me.btnBrowseElectricMotor.TabIndex = 2
-		Me.btnBrowseElectricMotor.UseVisualStyleBackColor = true
+		Me.btnBrowseElectricMotor.UseVisualStyleBackColor = True
 		'
 		'tbElectricMotor
 		'
-		Me.tbElectricMotor.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.tbElectricMotor.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.tbElectricMotor.Location = New System.Drawing.Point(104, 4)
 		Me.tbElectricMotor.Name = "tbElectricMotor"
 		Me.tbElectricMotor.Size = New System.Drawing.Size(300, 20)
@@ -1594,17 +1596,17 @@ Partial Class VehicleForm
 		Me.tpGensetComponents.Size = New System.Drawing.Size(648, 374)
 		Me.tpGensetComponents.TabIndex = 5
 		Me.tpGensetComponents.Text = "GenSet Components"
-		Me.tpGensetComponents.UseVisualStyleBackColor = true
+		Me.tpGensetComponents.UseVisualStyleBackColor = True
 		'
 		'Label30
 		'
-		Me.Label30.AutoSize = true
+		Me.Label30.AutoSize = True
 		Me.Label30.Location = New System.Drawing.Point(13, 153)
 		Me.Label30.Name = "Label30"
 		Me.Label30.Size = New System.Drawing.Size(429, 13)
 		Me.Label30.TabIndex = 21
-		Me.Label30.Text = "Note: The internal combustion engine of the GenSet is configured in the Job-Edito"& _ 
-    "r dialog."
+		Me.Label30.Text = "Note: The internal combustion engine of the GenSet is configured in the Job-Edito" &
+	"r dialog."
 		'
 		'gbGenSet
 		'
@@ -1622,13 +1624,13 @@ Partial Class VehicleForm
 		Me.gbGenSet.Name = "gbGenSet"
 		Me.gbGenSet.Size = New System.Drawing.Size(633, 135)
 		Me.gbGenSet.TabIndex = 1
-		Me.gbGenSet.TabStop = false
+		Me.gbGenSet.TabStop = False
 		Me.gbGenSet.Text = "Electric Machine"
 		'
 		'Label36
 		'
-		Me.Label36.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.Label36.AutoSize = true
+		Me.Label36.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label36.AutoSize = True
 		Me.Label36.Location = New System.Drawing.Point(203, 83)
 		Me.Label36.Name = "Label36"
 		Me.Label36.Size = New System.Drawing.Size(16, 13)
@@ -1637,8 +1639,8 @@ Partial Class VehicleForm
 		'
 		'Label34
 		'
-		Me.Label34.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.Label34.AutoSize = true
+		Me.Label34.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label34.AutoSize = True
 		Me.Label34.Location = New System.Drawing.Point(203, 57)
 		Me.Label34.Name = "Label34"
 		Me.Label34.Size = New System.Drawing.Size(16, 13)
@@ -1647,13 +1649,13 @@ Partial Class VehicleForm
 		'
 		'btnGenSetLossMap
 		'
-		Me.btnGenSetLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+		Me.btnGenSetLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.btnGenSetLossMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
 		Me.btnGenSetLossMap.Location = New System.Drawing.Point(412, 105)
 		Me.btnGenSetLossMap.Name = "btnGenSetLossMap"
 		Me.btnGenSetLossMap.Size = New System.Drawing.Size(24, 24)
 		Me.btnGenSetLossMap.TabIndex = 5
-		Me.btnGenSetLossMap.UseVisualStyleBackColor = true
+		Me.btnGenSetLossMap.UseVisualStyleBackColor = True
 		'
 		'tbGenSetADC
 		'
@@ -1664,7 +1666,7 @@ Partial Class VehicleForm
 		'
 		'lblGenSetADC
 		'
-		Me.lblGenSetADC.AutoSize = true
+		Me.lblGenSetADC.AutoSize = True
 		Me.lblGenSetADC.Location = New System.Drawing.Point(7, 110)
 		Me.lblGenSetADC.Name = "lblGenSetADC"
 		Me.lblGenSetADC.Size = New System.Drawing.Size(100, 13)
@@ -1680,7 +1682,7 @@ Partial Class VehicleForm
 		'
 		'lblGenSetRatio
 		'
-		Me.lblGenSetRatio.AutoSize = true
+		Me.lblGenSetRatio.AutoSize = True
 		Me.lblGenSetRatio.Location = New System.Drawing.Point(7, 84)
 		Me.lblGenSetRatio.Name = "lblGenSetRatio"
 		Me.lblGenSetRatio.Size = New System.Drawing.Size(79, 13)
@@ -1696,7 +1698,7 @@ Partial Class VehicleForm
 		'
 		'lblGenSetCount
 		'
-		Me.lblGenSetCount.AutoSize = true
+		Me.lblGenSetCount.AutoSize = True
 		Me.lblGenSetCount.Location = New System.Drawing.Point(7, 58)
 		Me.lblGenSetCount.Name = "lblGenSetCount"
 		Me.lblGenSetCount.Size = New System.Drawing.Size(83, 13)
@@ -1720,22 +1722,22 @@ Partial Class VehicleForm
 		Me.btnOpenGenSetEM.Size = New System.Drawing.Size(94, 21)
 		Me.btnOpenGenSetEM.TabIndex = 0
 		Me.btnOpenGenSetEM.Text = "Electric Machine"
-		Me.btnOpenGenSetEM.UseVisualStyleBackColor = true
+		Me.btnOpenGenSetEM.UseVisualStyleBackColor = True
 		'
 		'btnBrowseGenSetEM
 		'
-		Me.btnBrowseGenSetEM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.btnBrowseGenSetEM.Image = CType(resources.GetObject("btnBrowseGenSetEM.Image"),System.Drawing.Image)
+		Me.btnBrowseGenSetEM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.btnBrowseGenSetEM.Image = CType(resources.GetObject("btnBrowseGenSetEM.Image"), System.Drawing.Image)
 		Me.btnBrowseGenSetEM.Location = New System.Drawing.Point(406, 2)
 		Me.btnBrowseGenSetEM.Name = "btnBrowseGenSetEM"
 		Me.btnBrowseGenSetEM.Size = New System.Drawing.Size(24, 24)
 		Me.btnBrowseGenSetEM.TabIndex = 2
-		Me.btnBrowseGenSetEM.UseVisualStyleBackColor = true
+		Me.btnBrowseGenSetEM.UseVisualStyleBackColor = True
 		'
 		'tbGenSetEM
 		'
-		Me.tbGenSetEM.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.tbGenSetEM.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.tbGenSetEM.Location = New System.Drawing.Point(109, 4)
 		Me.tbGenSetEM.Name = "tbGenSetEM"
 		Me.tbGenSetEM.Size = New System.Drawing.Size(296, 20)
@@ -1751,7 +1753,7 @@ Partial Class VehicleForm
 		Me.tpTorqueLimits.Size = New System.Drawing.Size(648, 374)
 		Me.tpTorqueLimits.TabIndex = 2
 		Me.tpTorqueLimits.Text = "Torque Limits"
-		Me.tpTorqueLimits.UseVisualStyleBackColor = true
+		Me.tpTorqueLimits.UseVisualStyleBackColor = True
 		'
 		'gbPropulsionTorque
 		'
@@ -1761,23 +1763,23 @@ Partial Class VehicleForm
 		Me.gbPropulsionTorque.Name = "gbPropulsionTorque"
 		Me.gbPropulsionTorque.Size = New System.Drawing.Size(403, 52)
 		Me.gbPropulsionTorque.TabIndex = 2
-		Me.gbPropulsionTorque.TabStop = false
+		Me.gbPropulsionTorque.TabStop = False
 		Me.gbPropulsionTorque.Text = "Propulsion Torque Limit"
 		'
 		'btnPropulsionTorqueLimit
 		'
-		Me.btnPropulsionTorqueLimit.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.btnPropulsionTorqueLimit.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.btnPropulsionTorqueLimit.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
 		Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(373, 18)
 		Me.btnPropulsionTorqueLimit.Name = "btnPropulsionTorqueLimit"
 		Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(24, 24)
 		Me.btnPropulsionTorqueLimit.TabIndex = 1
-		Me.btnPropulsionTorqueLimit.UseVisualStyleBackColor = true
+		Me.btnPropulsionTorqueLimit.UseVisualStyleBackColor = True
 		'
 		'tbPropulsionTorqueLimit
 		'
-		Me.tbPropulsionTorqueLimit.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.tbPropulsionTorqueLimit.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.tbPropulsionTorqueLimit.Location = New System.Drawing.Point(6, 20)
 		Me.tbPropulsionTorqueLimit.Name = "tbPropulsionTorqueLimit"
 		Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(365, 20)
@@ -1791,23 +1793,23 @@ Partial Class VehicleForm
 		Me.gbEMTorqueLimits.Name = "gbEMTorqueLimits"
 		Me.gbEMTorqueLimits.Size = New System.Drawing.Size(403, 52)
 		Me.gbEMTorqueLimits.TabIndex = 1
-		Me.gbEMTorqueLimits.TabStop = false
+		Me.gbEMTorqueLimits.TabStop = False
 		Me.gbEMTorqueLimits.Text = "Electric Machine Torque Limits"
 		'
 		'btnEmTorqueLimits
 		'
-		Me.btnEmTorqueLimits.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.btnEmTorqueLimits.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.btnEmTorqueLimits.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
 		Me.btnEmTorqueLimits.Location = New System.Drawing.Point(373, 17)
 		Me.btnEmTorqueLimits.Name = "btnEmTorqueLimits"
 		Me.btnEmTorqueLimits.Size = New System.Drawing.Size(24, 24)
 		Me.btnEmTorqueLimits.TabIndex = 1
-		Me.btnEmTorqueLimits.UseVisualStyleBackColor = true
+		Me.btnEmTorqueLimits.UseVisualStyleBackColor = True
 		'
 		'tbEmTorqueLimits
 		'
-		Me.tbEmTorqueLimits.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.tbEmTorqueLimits.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.tbEmTorqueLimits.Location = New System.Drawing.Point(6, 19)
 		Me.tbEmTorqueLimits.Name = "tbEmTorqueLimits"
 		Me.tbEmTorqueLimits.Size = New System.Drawing.Size(365, 20)
@@ -1823,25 +1825,25 @@ Partial Class VehicleForm
 		Me.bgVehicleTorqueLimits.Name = "bgVehicleTorqueLimits"
 		Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(221, 227)
 		Me.bgVehicleTorqueLimits.TabIndex = 0
-		Me.bgVehicleTorqueLimits.TabStop = false
+		Me.bgVehicleTorqueLimits.TabStop = False
 		Me.bgVehicleTorqueLimits.Text = "ICE Torque Limits"
 		'
 		'lvTorqueLimits
 		'
-		Me.lvTorqueLimits.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.lvTorqueLimits.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.lvTorqueLimits.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader5, Me.ColumnHeader6})
-		Me.lvTorqueLimits.FullRowSelect = true
-		Me.lvTorqueLimits.GridLines = true
-		Me.lvTorqueLimits.HideSelection = false
+		Me.lvTorqueLimits.FullRowSelect = True
+		Me.lvTorqueLimits.GridLines = True
+		Me.lvTorqueLimits.HideSelection = False
 		Me.lvTorqueLimits.Location = New System.Drawing.Point(6, 19)
-		Me.lvTorqueLimits.MultiSelect = false
+		Me.lvTorqueLimits.MultiSelect = False
 		Me.lvTorqueLimits.Name = "lvTorqueLimits"
 		Me.lvTorqueLimits.Size = New System.Drawing.Size(209, 169)
 		Me.lvTorqueLimits.TabIndex = 7
-		Me.lvTorqueLimits.TabStop = false
-		Me.lvTorqueLimits.UseCompatibleStateImageBehavior = false
+		Me.lvTorqueLimits.TabStop = False
+		Me.lvTorqueLimits.UseCompatibleStateImageBehavior = False
 		Me.lvTorqueLimits.View = System.Windows.Forms.View.Details
 		'
 		'ColumnHeader5
@@ -1857,18 +1859,18 @@ Partial Class VehicleForm
 		'
 		'btAddMaxTorqueEntry
 		'
-		Me.btAddMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+		Me.btAddMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.btAddMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
 		Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(6, 193)
 		Me.btAddMaxTorqueEntry.Name = "btAddMaxTorqueEntry"
 		Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
 		Me.btAddMaxTorqueEntry.TabIndex = 4
-		Me.btAddMaxTorqueEntry.UseVisualStyleBackColor = true
+		Me.btAddMaxTorqueEntry.UseVisualStyleBackColor = True
 		'
 		'Label17
 		'
-		Me.Label17.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.Label17.AutoSize = true
+		Me.Label17.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label17.AutoSize = True
 		Me.Label17.Location = New System.Drawing.Point(112, 190)
 		Me.Label17.Name = "Label17"
 		Me.Label17.Size = New System.Drawing.Size(106, 13)
@@ -1878,13 +1880,13 @@ Partial Class VehicleForm
 		'
 		'btDelMaxTorqueEntry
 		'
-		Me.btDelMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+		Me.btDelMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.btDelMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
 		Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(30, 193)
 		Me.btDelMaxTorqueEntry.Name = "btDelMaxTorqueEntry"
 		Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
 		Me.btDelMaxTorqueEntry.TabIndex = 5
-		Me.btDelMaxTorqueEntry.UseVisualStyleBackColor = true
+		Me.btDelMaxTorqueEntry.UseVisualStyleBackColor = True
 		'
 		'tpADAS
 		'
@@ -1895,16 +1897,15 @@ Partial Class VehicleForm
 		Me.tpADAS.Size = New System.Drawing.Size(648, 374)
 		Me.tpADAS.TabIndex = 3
 		Me.tpADAS.Text = "ADAS"
-		Me.tpADAS.UseVisualStyleBackColor = true
+		Me.tpADAS.UseVisualStyleBackColor = True
 		'
 		'gbADAS
 		'
-		Me.gbADAS.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.gbADAS.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.gbADAS.Controls.Add(Me.pnEcoRoll)
 		Me.gbADAS.Controls.Add(Me.cbAtEcoRollReleaseLockupClutch)
 		Me.gbADAS.Controls.Add(Me.cbPcc)
-		Me.gbADAS.Controls.Add(Me.cbEcoRoll)
-		Me.gbADAS.Controls.Add(Me.Label22)
 		Me.gbADAS.Controls.Add(Me.cbEngineStopStart)
 		Me.gbADAS.Controls.Add(Me.lblPCC)
 		Me.gbADAS.Location = New System.Drawing.Point(6, 6)
@@ -1914,6 +1915,35 @@ Partial Class VehicleForm
 		Me.gbADAS.TabStop = False
 		Me.gbADAS.Text = "ADAS Options"
 		'
+		'pnEcoRoll
+		'
+		Me.pnEcoRoll.Controls.Add(Me.cbEcoRoll)
+		Me.pnEcoRoll.Controls.Add(Me.Label22)
+		Me.pnEcoRoll.Location = New System.Drawing.Point(0, 44)
+		Me.pnEcoRoll.Name = "pnEcoRoll"
+		Me.pnEcoRoll.Size = New System.Drawing.Size(300, 46)
+		Me.pnEcoRoll.TabIndex = 7
+		'
+		'cbEcoRoll
+		'
+		Me.cbEcoRoll.DisplayMember = "Value"
+		Me.cbEcoRoll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+		Me.cbEcoRoll.FormattingEnabled = True
+		Me.cbEcoRoll.Location = New System.Drawing.Point(10, 20)
+		Me.cbEcoRoll.Name = "cbEcoRoll"
+		Me.cbEcoRoll.Size = New System.Drawing.Size(266, 21)
+		Me.cbEcoRoll.TabIndex = 1
+		Me.cbEcoRoll.ValueMember = "Key"
+		'
+		'Label22
+		'
+		Me.Label22.AutoSize = True
+		Me.Label22.Location = New System.Drawing.Point(7, 5)
+		Me.Label22.Name = "Label22"
+		Me.Label22.Size = New System.Drawing.Size(50, 13)
+		Me.Label22.TabIndex = 6
+		Me.Label22.Text = "Eco-Roll:"
+		'
 		'cbAtEcoRollReleaseLockupClutch
 		'
 		Me.cbAtEcoRollReleaseLockupClutch.AutoSize = True
@@ -1935,26 +1965,6 @@ Partial Class VehicleForm
 		Me.cbPcc.TabIndex = 2
 		Me.cbPcc.ValueMember = "Key"
 		'
-		'cbEcoRoll
-		'
-		Me.cbEcoRoll.DisplayMember = "Value"
-		Me.cbEcoRoll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.cbEcoRoll.FormattingEnabled = True
-		Me.cbEcoRoll.Location = New System.Drawing.Point(10, 67)
-		Me.cbEcoRoll.Name = "cbEcoRoll"
-		Me.cbEcoRoll.Size = New System.Drawing.Size(266, 21)
-		Me.cbEcoRoll.TabIndex = 1
-		Me.cbEcoRoll.ValueMember = "Key"
-		'
-		'Label22
-		'
-		Me.Label22.AutoSize = True
-		Me.Label22.Location = New System.Drawing.Point(7, 51)
-		Me.Label22.Name = "Label22"
-		Me.Label22.Size = New System.Drawing.Size(50, 13)
-		Me.Label22.TabIndex = 6
-		Me.Label22.Text = "Eco-Roll:"
-		'
 		'cbEngineStopStart
 		'
 		Me.cbEngineStopStart.AutoSize = True
@@ -1983,7 +1993,7 @@ Partial Class VehicleForm
 		Me.tpRoadSweeper.Size = New System.Drawing.Size(648, 374)
 		Me.tpRoadSweeper.TabIndex = 4
 		Me.tpRoadSweeper.Text = "PTO"
-		Me.tpRoadSweeper.UseVisualStyleBackColor = true
+		Me.tpRoadSweeper.UseVisualStyleBackColor = True
 		'
 		'pnPTO
 		'
@@ -2014,12 +2024,12 @@ Partial Class VehicleForm
 		Me.gbPTODrive.Name = "gbPTODrive"
 		Me.gbPTODrive.Size = New System.Drawing.Size(633, 55)
 		Me.gbPTODrive.TabIndex = 4
-		Me.gbPTODrive.TabStop = false
+		Me.gbPTODrive.TabStop = False
 		Me.gbPTODrive.Text = "Working operation settings (PTO mode 2)"
 		'
 		'Label27
 		'
-		Me.Label27.AutoSize = true
+		Me.Label27.AutoSize = True
 		Me.Label27.Location = New System.Drawing.Point(446, 24)
 		Me.Label27.Name = "Label27"
 		Me.Label27.Size = New System.Drawing.Size(20, 13)
@@ -2036,7 +2046,7 @@ Partial Class VehicleForm
 		'
 		'Label26
 		'
-		Me.Label26.AutoSize = true
+		Me.Label26.AutoSize = True
 		Me.Label26.Location = New System.Drawing.Point(189, 24)
 		Me.Label26.Name = "Label26"
 		Me.Label26.Size = New System.Drawing.Size(30, 13)
@@ -2053,7 +2063,7 @@ Partial Class VehicleForm
 		'
 		'Label25
 		'
-		Me.Label25.AutoSize = true
+		Me.Label25.AutoSize = True
 		Me.Label25.Location = New System.Drawing.Point(297, 24)
 		Me.Label25.Name = "Label25"
 		Me.Label25.Size = New System.Drawing.Size(68, 13)
@@ -2062,7 +2072,7 @@ Partial Class VehicleForm
 		'
 		'Label24
 		'
-		Me.Label24.AutoSize = true
+		Me.Label24.AutoSize = True
 		Me.Label24.Location = New System.Drawing.Point(7, 24)
 		Me.Label24.Name = "Label24"
 		Me.Label24.Size = New System.Drawing.Size(97, 13)
@@ -2076,7 +2086,7 @@ Partial Class VehicleForm
 		Me.btPTOCycleDrive.Name = "btPTOCycleDrive"
 		Me.btPTOCycleDrive.Size = New System.Drawing.Size(24, 24)
 		Me.btPTOCycleDrive.TabIndex = 6
-		Me.btPTOCycleDrive.UseVisualStyleBackColor = true
+		Me.btPTOCycleDrive.UseVisualStyleBackColor = True
 		'
 		'Label28
 		'
@@ -2094,7 +2104,7 @@ Partial Class VehicleForm
 		Me.btPTOCycle.Name = "btPTOCycle"
 		Me.btPTOCycle.Size = New System.Drawing.Size(24, 24)
 		Me.btPTOCycle.TabIndex = 3
-		Me.btPTOCycle.UseVisualStyleBackColor = true
+		Me.btPTOCycle.UseVisualStyleBackColor = True
 		'
 		'Label16
 		'
@@ -2112,7 +2122,7 @@ Partial Class VehicleForm
 		Me.btPTOLossMapBrowse.Name = "btPTOLossMapBrowse"
 		Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(24, 24)
 		Me.btPTOLossMapBrowse.TabIndex = 1
-		Me.btPTOLossMapBrowse.UseVisualStyleBackColor = true
+		Me.btPTOLossMapBrowse.UseVisualStyleBackColor = True
 		'
 		'Label7
 		'
@@ -2130,14 +2140,14 @@ Partial Class VehicleForm
 		Me.gbPTO.Name = "gbPTO"
 		Me.gbPTO.Size = New System.Drawing.Size(633, 61)
 		Me.gbPTO.TabIndex = 0
-		Me.gbPTO.TabStop = false
+		Me.gbPTO.TabStop = False
 		Me.gbPTO.Text = "PTO Design Variant"
 		'
 		'cbLegislativeClass
 		'
 		Me.cbLegislativeClass.DisplayMember = "Value"
 		Me.cbLegislativeClass.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.cbLegislativeClass.FormattingEnabled = true
+		Me.cbLegislativeClass.FormattingEnabled = True
 		Me.cbLegislativeClass.Location = New System.Drawing.Point(220, 140)
 		Me.cbLegislativeClass.Name = "cbLegislativeClass"
 		Me.cbLegislativeClass.Size = New System.Drawing.Size(52, 21)
@@ -2146,7 +2156,7 @@ Partial Class VehicleForm
 		'
 		'Label21
 		'
-		Me.Label21.AutoSize = true
+		Me.Label21.AutoSize = True
 		Me.Label21.Location = New System.Drawing.Point(32, 123)
 		Me.Label21.Name = "Label21"
 		Me.Label21.Size = New System.Drawing.Size(112, 13)
@@ -2155,9 +2165,9 @@ Partial Class VehicleForm
 		'
 		'lblTitle
 		'
-		Me.lblTitle.AutoSize = true
+		Me.lblTitle.AutoSize = True
 		Me.lblTitle.BackColor = System.Drawing.Color.White
-		Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+		Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
 		Me.lblTitle.Location = New System.Drawing.Point(117, 34)
 		Me.lblTitle.Name = "lblTitle"
 		Me.lblTitle.Size = New System.Drawing.Size(166, 29)
@@ -2167,7 +2177,7 @@ Partial Class VehicleForm
 		'VehicleForm
 		'
 		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(666, 625)
@@ -2189,78 +2199,80 @@ Partial Class VehicleForm
 		Me.Controls.Add(Me.Label5)
 		Me.Controls.Add(Me.ToolStrip1)
 		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 = "VehicleForm"
 		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "F05_VEH"
-		Me.GroupBox6.ResumeLayout(false)
-		Me.GroupBox6.PerformLayout
-		Me.ToolStrip1.ResumeLayout(false)
-		Me.ToolStrip1.PerformLayout
-		Me.gbRetarderLosses.ResumeLayout(false)
-		Me.PnRt.ResumeLayout(false)
-		Me.PnRt.PerformLayout
-		Me.GroupBox8.ResumeLayout(false)
-		Me.GroupBox8.PerformLayout
-		Me.PnWheelDiam.ResumeLayout(false)
-		Me.PnWheelDiam.PerformLayout
-		Me.StatusStrip1.ResumeLayout(false)
-		Me.StatusStrip1.PerformLayout
-		Me.GroupBox1.ResumeLayout(false)
-		Me.GroupBox1.PerformLayout
-		Me.PnLoad.ResumeLayout(false)
-		Me.PnLoad.PerformLayout
-		Me.GrAirRes.ResumeLayout(false)
-		Me.PnCdATrTr.ResumeLayout(false)
-		Me.PnCdATrTr.PerformLayout
-		CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
-		Me.CmOpenFile.ResumeLayout(false)
-		Me.GroupBox3.ResumeLayout(false)
-		Me.gbAngledrive.ResumeLayout(false)
-		Me.pnAngledriveFields.ResumeLayout(false)
-		Me.pnAngledriveFields.PerformLayout
-		CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).EndInit
-		Me.tcVehicleComponents.ResumeLayout(false)
-		Me.tpGeneral.ResumeLayout(false)
-		Me.tpPowertrain.ResumeLayout(false)
-		Me.gbVehicleIdlingSpeed.ResumeLayout(false)
-		Me.Panel1.ResumeLayout(false)
-		Me.Panel1.PerformLayout
-		Me.gbTankSystem.ResumeLayout(false)
-		Me.gbTankSystem.PerformLayout
-		Me.tpElectricComponents.ResumeLayout(false)
-		Me.gbBattery.ResumeLayout(false)
-		Me.gbBattery.PerformLayout
-		Me.gpElectricMotor.ResumeLayout(false)
-		Me.gpElectricMotor.PerformLayout
-		Me.gbRatiosPerGear.ResumeLayout(false)
-		Me.gbRatiosPerGear.PerformLayout
-		Me.pnElectricMotor.ResumeLayout(false)
-		Me.pnElectricMotor.PerformLayout
-		Me.tpGensetComponents.ResumeLayout(false)
-		Me.tpGensetComponents.PerformLayout
-		Me.gbGenSet.ResumeLayout(false)
-		Me.gbGenSet.PerformLayout
-		Me.pnGenSetEM.ResumeLayout(false)
-		Me.pnGenSetEM.PerformLayout
-		Me.tpTorqueLimits.ResumeLayout(false)
-		Me.gbPropulsionTorque.ResumeLayout(false)
-		Me.gbPropulsionTorque.PerformLayout
-		Me.gbEMTorqueLimits.ResumeLayout(false)
-		Me.gbEMTorqueLimits.PerformLayout
-		Me.bgVehicleTorqueLimits.ResumeLayout(false)
-		Me.bgVehicleTorqueLimits.PerformLayout
-		Me.tpADAS.ResumeLayout(false)
-		Me.gbADAS.ResumeLayout(false)
-		Me.gbADAS.PerformLayout
-		Me.tpRoadSweeper.ResumeLayout(false)
-		Me.pnPTO.ResumeLayout(false)
-		Me.pnPTO.PerformLayout
-		Me.gbPTODrive.ResumeLayout(false)
-		Me.gbPTODrive.PerformLayout
-		Me.gbPTO.ResumeLayout(false)
-		Me.ResumeLayout(false)
+		Me.GroupBox6.ResumeLayout(False)
+		Me.GroupBox6.PerformLayout()
+		Me.ToolStrip1.ResumeLayout(False)
+		Me.ToolStrip1.PerformLayout()
+		Me.gbRetarderLosses.ResumeLayout(False)
+		Me.PnRt.ResumeLayout(False)
+		Me.PnRt.PerformLayout()
+		Me.GroupBox8.ResumeLayout(False)
+		Me.GroupBox8.PerformLayout()
+		Me.PnWheelDiam.ResumeLayout(False)
+		Me.PnWheelDiam.PerformLayout()
+		Me.StatusStrip1.ResumeLayout(False)
+		Me.StatusStrip1.PerformLayout()
+		Me.GroupBox1.ResumeLayout(False)
+		Me.GroupBox1.PerformLayout()
+		Me.PnLoad.ResumeLayout(False)
+		Me.PnLoad.PerformLayout()
+		Me.GrAirRes.ResumeLayout(False)
+		Me.PnCdATrTr.ResumeLayout(False)
+		Me.PnCdATrTr.PerformLayout()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.CmOpenFile.ResumeLayout(False)
+		Me.GroupBox3.ResumeLayout(False)
+		Me.gbAngledrive.ResumeLayout(False)
+		Me.pnAngledriveFields.ResumeLayout(False)
+		Me.pnAngledriveFields.PerformLayout()
+		CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.tcVehicleComponents.ResumeLayout(False)
+		Me.tpGeneral.ResumeLayout(False)
+		Me.tpPowertrain.ResumeLayout(False)
+		Me.gbVehicleIdlingSpeed.ResumeLayout(False)
+		Me.Panel1.ResumeLayout(False)
+		Me.Panel1.PerformLayout()
+		Me.gbTankSystem.ResumeLayout(False)
+		Me.gbTankSystem.PerformLayout()
+		Me.tpElectricComponents.ResumeLayout(False)
+		Me.gbBattery.ResumeLayout(False)
+		Me.gbBattery.PerformLayout()
+		Me.gpElectricMotor.ResumeLayout(False)
+		Me.gpElectricMotor.PerformLayout()
+		Me.gbRatiosPerGear.ResumeLayout(False)
+		Me.gbRatiosPerGear.PerformLayout()
+		Me.pnElectricMotor.ResumeLayout(False)
+		Me.pnElectricMotor.PerformLayout()
+		Me.tpGensetComponents.ResumeLayout(False)
+		Me.tpGensetComponents.PerformLayout()
+		Me.gbGenSet.ResumeLayout(False)
+		Me.gbGenSet.PerformLayout()
+		Me.pnGenSetEM.ResumeLayout(False)
+		Me.pnGenSetEM.PerformLayout()
+		Me.tpTorqueLimits.ResumeLayout(False)
+		Me.gbPropulsionTorque.ResumeLayout(False)
+		Me.gbPropulsionTorque.PerformLayout()
+		Me.gbEMTorqueLimits.ResumeLayout(False)
+		Me.gbEMTorqueLimits.PerformLayout()
+		Me.bgVehicleTorqueLimits.ResumeLayout(False)
+		Me.bgVehicleTorqueLimits.PerformLayout()
+		Me.tpADAS.ResumeLayout(False)
+		Me.gbADAS.ResumeLayout(False)
+		Me.gbADAS.PerformLayout()
+		Me.pnEcoRoll.ResumeLayout(False)
+		Me.pnEcoRoll.PerformLayout()
+		Me.tpRoadSweeper.ResumeLayout(False)
+		Me.pnPTO.ResumeLayout(False)
+		Me.pnPTO.PerformLayout()
+		Me.gbPTODrive.ResumeLayout(False)
+		Me.gbPTODrive.PerformLayout()
+		Me.gbPTO.ResumeLayout(False)
+		Me.ResumeLayout(False)
 		Me.PerformLayout
 
 End Sub
@@ -2474,5 +2486,6 @@ End Sub
 	Friend WithEvents Label32 As Label
 	Friend WithEvents Label36 As Label
 	Friend WithEvents Label34 As Label
+	Friend WithEvents pnEcoRoll As Panel
 	'>>>>>>> VECTO_CERT/master
 End Class
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index 907f62a905..7c4c7ad338 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -555,10 +555,9 @@ Public Class VehicleForm
 				gbEMTorqueLimits.Enabled = False
 
 				'ADAS ---------------------------------------------------------------------
-				cbEngineStopStart.Enabled = True
-				cbAtEcoRollReleaseLockupClutch.Enabled = True
-				cbEcoRoll.DataSource = EnumHelper.GetKeyValuePairs(Of EcoRollType)(Function(t) t.GetName())
-				cbEcoRoll.Enabled = True
+				cbEngineStopStart.Visible = True
+				cbAtEcoRollReleaseLockupClutch.Visible = True
+				pnEcoRoll.Visible = True
 
 			Case VectoSimulationJobType.ParallelHybridVehicle
 				lblTitle.Text = "Parallel Hybrid Vehicle"
@@ -580,10 +579,10 @@ Public Class VehicleForm
 				gbEMTorqueLimits.Enabled = True
 
 				'ADAS ---------------------------------------------------------------------
-				cbEngineStopStart.Enabled = True
-				cbAtEcoRollReleaseLockupClutch.Enabled = False
-				cbEcoRoll.DataSource = EnumHelper.GetKeyValuePairs(Of EcoRollType)(Function(t) t.GetName())
-				cbEcoRoll.Enabled = True
+				cbEngineStopStart.Visible = True
+				cbAtEcoRollReleaseLockupClutch.Visible = False
+				pnEcoRoll.Visible = False
+				cbEcoRoll.SelectedIndex = 0
 
 			Case VectoSimulationJobType.SerialHybridVehicle
 				lblTitle.Text = "Serial Hybrid Vehicle"
@@ -606,10 +605,10 @@ Public Class VehicleForm
 				tpTorqueLimits.Enabled = False
 
 				'ADAS ---------------------------------------------------------------------
-				cbEngineStopStart.Enabled = False
-				cbAtEcoRollReleaseLockupClutch.Enabled = False
-				cbEcoRoll.Enabled = False
-				cbEcoRoll.SelectedIndex = -1
+				cbEngineStopStart.Visible = False
+				cbAtEcoRollReleaseLockupClutch.Visible = False
+				pnEcoRoll.Visible = False
+				cbEcoRoll.SelectedIndex = 0
 
 			Case VectoSimulationJobType.BatteryElectricVehicle
 				lblTitle.Text = "Battery Electric Vehicle"
@@ -632,10 +631,10 @@ Public Class VehicleForm
 				tcVehicleComponents.TabPages.Remove(tpTorqueLimits)
 
 				'ADAS ---------------------------------------------------------------------
-				cbEngineStopStart.Enabled = False
-				cbAtEcoRollReleaseLockupClutch.Enabled = False
-				cbEcoRoll.Enabled = False
-				cbEcoRoll.SelectedIndex = -1
+				cbEngineStopStart.Visible = False
+				cbAtEcoRollReleaseLockupClutch.Visible = False
+				pnEcoRoll.Visible = False
+				cbEcoRoll.SelectedIndex = 0
 
 			Case Else
 				If Not tcVehicleComponents.TabPages.Contains(tpElectricComponents) Then
@@ -646,7 +645,9 @@ Public Class VehicleForm
 					tcVehicleComponents.TabPages.Insert(3, tpGensetComponents)
 					tpGensetComponents.BindingContext = BindingContext
 				End If
-
+				pnEcoRoll.Visible = True
+				cbAtEcoRollReleaseLockupClutch.Visible = True
+				cbEngineStopStart.Visible = True
 		End Select
 
 	End Sub
-- 
GitLab