From 146f5f516b86de98690b819a4ec53daa9a31c9a2 Mon Sep 17 00:00:00 2001
From: Michael Krisper <michael.krisper@tugraz.at>
Date: Thu, 17 Mar 2022 11:06:43 +0100
Subject: [PATCH] Changed Top VECTO logo with graphical text to simple Main
 Logo with a label (label intersected with underlying graphical text).

---
 VECTO/GUI/VectoJobForm.Designer.vb |  811 ++++++++------------
 VECTO/GUI/VehicleForm.Designer.vb  | 1133 ++++++++++++----------------
 2 files changed, 803 insertions(+), 1141 deletions(-)

diff --git a/VECTO/GUI/VectoJobForm.Designer.vb b/VECTO/GUI/VectoJobForm.Designer.vb
index 6f2a747b32..4e54b32183 100644
--- a/VECTO/GUI/VectoJobForm.Designer.vb
+++ b/VECTO/GUI/VectoJobForm.Designer.vb
@@ -254,11 +254,10 @@ Partial Class VectoJobForm
         Me.TabPgGen.Controls.Add(Me.pnEngine)
         Me.TabPgGen.Controls.Add(Me.pnGearbox)
         Me.TabPgGen.Controls.Add(Me.pnShiftParams)
-        Me.TabPgGen.Location = New System.Drawing.Point(4, 29)
-        Me.TabPgGen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TabPgGen.Location = New System.Drawing.Point(4, 22)
         Me.TabPgGen.Name = "TabPgGen"
-        Me.TabPgGen.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.TabPgGen.Size = New System.Drawing.Size(792, 767)
+        Me.TabPgGen.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.TabPgGen.Size = New System.Drawing.Size(525, 494)
         Me.TabPgGen.TabIndex = 0
         Me.TabPgGen.Text = "General"
         Me.TabPgGen.UseVisualStyleBackColor = true
@@ -268,18 +267,16 @@ Partial Class VectoJobForm
         Me.pnHybridStrategy.Controls.Add(Me.btnOpenHybridStrategyParameters)
         Me.pnHybridStrategy.Controls.Add(Me.tbHybridStrategyParams)
         Me.pnHybridStrategy.Controls.Add(Me.btnBrowseHybridStrategyParams)
-        Me.pnHybridStrategy.Location = New System.Drawing.Point(6, 192)
-        Me.pnHybridStrategy.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnHybridStrategy.Location = New System.Drawing.Point(4, 125)
         Me.pnHybridStrategy.Name = "pnHybridStrategy"
-        Me.pnHybridStrategy.Size = New System.Drawing.Size(774, 40)
+        Me.pnHybridStrategy.Size = New System.Drawing.Size(516, 26)
         Me.pnHybridStrategy.TabIndex = 4
         '
         'btnOpenHybridStrategyParameters
         '
-        Me.btnOpenHybridStrategyParameters.Location = New System.Drawing.Point(4, 5)
-        Me.btnOpenHybridStrategyParameters.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnOpenHybridStrategyParameters.Location = New System.Drawing.Point(3, 3)
         Me.btnOpenHybridStrategyParameters.Name = "btnOpenHybridStrategyParameters"
-        Me.btnOpenHybridStrategyParameters.Size = New System.Drawing.Size(108, 32)
+        Me.btnOpenHybridStrategyParameters.Size = New System.Drawing.Size(72, 21)
         Me.btnOpenHybridStrategyParameters.TabIndex = 0
         Me.btnOpenHybridStrategyParameters.Text = "Hyb. Str. P."
         Me.btnOpenHybridStrategyParameters.UseVisualStyleBackColor = true
@@ -288,20 +285,18 @@ Partial Class VectoJobForm
         '
         Me.tbHybridStrategyParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
             Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.tbHybridStrategyParams.Location = New System.Drawing.Point(122, 5)
-        Me.tbHybridStrategyParams.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbHybridStrategyParams.Location = New System.Drawing.Point(81, 3)
         Me.tbHybridStrategyParams.Name = "tbHybridStrategyParams"
-        Me.tbHybridStrategyParams.Size = New System.Drawing.Size(607, 26)
+        Me.tbHybridStrategyParams.Size = New System.Drawing.Size(406, 20)
         Me.tbHybridStrategyParams.TabIndex = 1
         '
         'btnBrowseHybridStrategyParams
         '
         Me.btnBrowseHybridStrategyParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
         Me.btnBrowseHybridStrategyParams.Image = CType(resources.GetObject("btnBrowseHybridStrategyParams.Image"),System.Drawing.Image)
-        Me.btnBrowseHybridStrategyParams.Location = New System.Drawing.Point(734, 2)
-        Me.btnBrowseHybridStrategyParams.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnBrowseHybridStrategyParams.Location = New System.Drawing.Point(489, 1)
         Me.btnBrowseHybridStrategyParams.Name = "btnBrowseHybridStrategyParams"
-        Me.btnBrowseHybridStrategyParams.Size = New System.Drawing.Size(36, 37)
+        Me.btnBrowseHybridStrategyParams.Size = New System.Drawing.Size(24, 24)
         Me.btnBrowseHybridStrategyParams.TabIndex = 2
         Me.btnBrowseHybridStrategyParams.UseVisualStyleBackColor = true
         '
@@ -310,18 +305,16 @@ Partial Class VectoJobForm
         Me.pnVehicle.Controls.Add(Me.ButOpenVEH)
         Me.pnVehicle.Controls.Add(Me.ButtonVEH)
         Me.pnVehicle.Controls.Add(Me.TbVEH)
-        Me.pnVehicle.Location = New System.Drawing.Point(6, 11)
-        Me.pnVehicle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnVehicle.Location = New System.Drawing.Point(4, 7)
         Me.pnVehicle.Name = "pnVehicle"
-        Me.pnVehicle.Size = New System.Drawing.Size(777, 42)
+        Me.pnVehicle.Size = New System.Drawing.Size(518, 27)
         Me.pnVehicle.TabIndex = 0
         '
         'ButOpenVEH
         '
-        Me.ButOpenVEH.Location = New System.Drawing.Point(6, 5)
-        Me.ButOpenVEH.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButOpenVEH.Location = New System.Drawing.Point(4, 3)
         Me.ButOpenVEH.Name = "ButOpenVEH"
-        Me.ButOpenVEH.Size = New System.Drawing.Size(108, 32)
+        Me.ButOpenVEH.Size = New System.Drawing.Size(72, 21)
         Me.ButOpenVEH.TabIndex = 0
         Me.ButOpenVEH.Text = "Vehicle"
         Me.ButOpenVEH.UseVisualStyleBackColor = true
@@ -330,10 +323,9 @@ Partial Class VectoJobForm
         '
         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(738, 3)
-        Me.ButtonVEH.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButtonVEH.Location = New System.Drawing.Point(492, 2)
         Me.ButtonVEH.Name = "ButtonVEH"
-        Me.ButtonVEH.Size = New System.Drawing.Size(36, 37)
+        Me.ButtonVEH.Size = New System.Drawing.Size(24, 24)
         Me.ButtonVEH.TabIndex = 2
         Me.ButtonVEH.UseVisualStyleBackColor = true
         '
@@ -341,10 +333,9 @@ Partial Class VectoJobForm
         '
         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(123, 6)
-        Me.TbVEH.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbVEH.Location = New System.Drawing.Point(82, 4)
         Me.TbVEH.Name = "TbVEH"
-        Me.TbVEH.Size = New System.Drawing.Size(604, 26)
+        Me.TbVEH.Size = New System.Drawing.Size(404, 20)
         Me.TbVEH.TabIndex = 1
         '
         'pnEngine
@@ -352,18 +343,16 @@ Partial Class VectoJobForm
         Me.pnEngine.Controls.Add(Me.ButOpenENG)
         Me.pnEngine.Controls.Add(Me.ButtonMAP)
         Me.pnEngine.Controls.Add(Me.TbENG)
-        Me.pnEngine.Location = New System.Drawing.Point(6, 57)
-        Me.pnEngine.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnEngine.Location = New System.Drawing.Point(4, 37)
         Me.pnEngine.Name = "pnEngine"
-        Me.pnEngine.Size = New System.Drawing.Size(778, 42)
+        Me.pnEngine.Size = New System.Drawing.Size(519, 27)
         Me.pnEngine.TabIndex = 1
         '
         'ButOpenENG
         '
-        Me.ButOpenENG.Location = New System.Drawing.Point(6, 5)
-        Me.ButOpenENG.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButOpenENG.Location = New System.Drawing.Point(4, 3)
         Me.ButOpenENG.Name = "ButOpenENG"
-        Me.ButOpenENG.Size = New System.Drawing.Size(108, 32)
+        Me.ButOpenENG.Size = New System.Drawing.Size(72, 21)
         Me.ButOpenENG.TabIndex = 0
         Me.ButOpenENG.Text = "Engine"
         Me.ButOpenENG.UseVisualStyleBackColor = true
@@ -372,10 +361,9 @@ Partial Class VectoJobForm
         '
         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(738, 2)
-        Me.ButtonMAP.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButtonMAP.Location = New System.Drawing.Point(492, 1)
         Me.ButtonMAP.Name = "ButtonMAP"
-        Me.ButtonMAP.Size = New System.Drawing.Size(36, 37)
+        Me.ButtonMAP.Size = New System.Drawing.Size(24, 24)
         Me.ButtonMAP.TabIndex = 2
         Me.ButtonMAP.UseVisualStyleBackColor = true
         '
@@ -383,10 +371,9 @@ Partial Class VectoJobForm
         '
         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(123, 5)
-        Me.TbENG.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbENG.Location = New System.Drawing.Point(82, 3)
         Me.TbENG.Name = "TbENG"
-        Me.TbENG.Size = New System.Drawing.Size(604, 26)
+        Me.TbENG.Size = New System.Drawing.Size(404, 20)
         Me.TbENG.TabIndex = 1
         '
         'pnGearbox
@@ -394,18 +381,16 @@ Partial Class VectoJobForm
         Me.pnGearbox.Controls.Add(Me.ButOpenGBX)
         Me.pnGearbox.Controls.Add(Me.ButtonGBX)
         Me.pnGearbox.Controls.Add(Me.TbGBX)
-        Me.pnGearbox.Location = New System.Drawing.Point(4, 102)
-        Me.pnGearbox.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnGearbox.Location = New System.Drawing.Point(3, 66)
         Me.pnGearbox.Name = "pnGearbox"
-        Me.pnGearbox.Size = New System.Drawing.Size(776, 43)
+        Me.pnGearbox.Size = New System.Drawing.Size(517, 28)
         Me.pnGearbox.TabIndex = 2
         '
         'ButOpenGBX
         '
-        Me.ButOpenGBX.Location = New System.Drawing.Point(6, 5)
-        Me.ButOpenGBX.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButOpenGBX.Location = New System.Drawing.Point(4, 3)
         Me.ButOpenGBX.Name = "ButOpenGBX"
-        Me.ButOpenGBX.Size = New System.Drawing.Size(108, 32)
+        Me.ButOpenGBX.Size = New System.Drawing.Size(72, 21)
         Me.ButOpenGBX.TabIndex = 0
         Me.ButOpenGBX.Text = "Gearbox"
         Me.ButOpenGBX.UseVisualStyleBackColor = true
@@ -414,10 +399,9 @@ Partial Class VectoJobForm
         '
         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(738, 2)
-        Me.ButtonGBX.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButtonGBX.Location = New System.Drawing.Point(492, 1)
         Me.ButtonGBX.Name = "ButtonGBX"
-        Me.ButtonGBX.Size = New System.Drawing.Size(36, 37)
+        Me.ButtonGBX.Size = New System.Drawing.Size(24, 24)
         Me.ButtonGBX.TabIndex = 2
         Me.ButtonGBX.UseVisualStyleBackColor = true
         '
@@ -425,10 +409,9 @@ Partial Class VectoJobForm
         '
         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(123, 5)
-        Me.TbGBX.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbGBX.Location = New System.Drawing.Point(82, 3)
         Me.TbGBX.Name = "TbGBX"
-        Me.TbGBX.Size = New System.Drawing.Size(604, 26)
+        Me.TbGBX.Size = New System.Drawing.Size(404, 20)
         Me.TbGBX.TabIndex = 1
         '
         'pnShiftParams
@@ -436,18 +419,16 @@ Partial Class VectoJobForm
         Me.pnShiftParams.Controls.Add(Me.BtnShiftParamsForm)
         Me.pnShiftParams.Controls.Add(Me.TbShiftStrategyParams)
         Me.pnShiftParams.Controls.Add(Me.BtnShiftStrategyParams)
-        Me.pnShiftParams.Location = New System.Drawing.Point(6, 148)
-        Me.pnShiftParams.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnShiftParams.Location = New System.Drawing.Point(4, 96)
         Me.pnShiftParams.Name = "pnShiftParams"
-        Me.pnShiftParams.Size = New System.Drawing.Size(774, 40)
+        Me.pnShiftParams.Size = New System.Drawing.Size(516, 26)
         Me.pnShiftParams.TabIndex = 3
         '
         'BtnShiftParamsForm
         '
-        Me.BtnShiftParamsForm.Location = New System.Drawing.Point(4, 5)
-        Me.BtnShiftParamsForm.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.BtnShiftParamsForm.Location = New System.Drawing.Point(3, 3)
         Me.BtnShiftParamsForm.Name = "BtnShiftParamsForm"
-        Me.BtnShiftParamsForm.Size = New System.Drawing.Size(108, 32)
+        Me.BtnShiftParamsForm.Size = New System.Drawing.Size(72, 21)
         Me.BtnShiftParamsForm.TabIndex = 0
         Me.BtnShiftParamsForm.Text = "Shift Parameters"
         Me.BtnShiftParamsForm.UseVisualStyleBackColor = true
@@ -456,20 +437,18 @@ Partial Class VectoJobForm
         '
         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(122, 5)
-        Me.TbShiftStrategyParams.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbShiftStrategyParams.Location = New System.Drawing.Point(81, 3)
         Me.TbShiftStrategyParams.Name = "TbShiftStrategyParams"
-        Me.TbShiftStrategyParams.Size = New System.Drawing.Size(607, 26)
+        Me.TbShiftStrategyParams.Size = New System.Drawing.Size(406, 20)
         Me.TbShiftStrategyParams.TabIndex = 1
         '
         '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.Location = New System.Drawing.Point(734, 2)
-        Me.BtnShiftStrategyParams.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.BtnShiftStrategyParams.Location = New System.Drawing.Point(489, 1)
         Me.BtnShiftStrategyParams.Name = "BtnShiftStrategyParams"
-        Me.BtnShiftStrategyParams.Size = New System.Drawing.Size(36, 37)
+        Me.BtnShiftStrategyParams.Size = New System.Drawing.Size(24, 24)
         Me.BtnShiftStrategyParams.TabIndex = 2
         Me.BtnShiftStrategyParams.UseVisualStyleBackColor = true
         '
@@ -481,11 +460,9 @@ Partial Class VectoJobForm
         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(9, 9)
-        Me.GrCycles.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GrCycles.Location = New System.Drawing.Point(6, 6)
         Me.GrCycles.Name = "GrCycles"
-        Me.GrCycles.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GrCycles.Size = New System.Drawing.Size(772, 212)
+        Me.GrCycles.Size = New System.Drawing.Size(515, 138)
         Me.GrCycles.TabIndex = 0
         Me.GrCycles.TabStop = false
         Me.GrCycles.Text = "Cycles"
@@ -495,10 +472,9 @@ Partial Class VectoJobForm
         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(586, 168)
-        Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label2.Location = New System.Drawing.Point(391, 109)
         Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(177, 20)
+        Me.Label2.Size = New System.Drawing.Size(118, 13)
         Me.Label2.TabIndex = 3
         Me.Label2.Text = "(Right-Click for Options)"
         '
@@ -513,11 +489,10 @@ Partial Class VectoJobForm
         Me.LvCycles.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
         Me.LvCycles.HideSelection = false
         Me.LvCycles.LabelEdit = true
-        Me.LvCycles.Location = New System.Drawing.Point(9, 29)
-        Me.LvCycles.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.LvCycles.Location = New System.Drawing.Point(6, 19)
         Me.LvCycles.MultiSelect = false
         Me.LvCycles.Name = "LvCycles"
-        Me.LvCycles.Size = New System.Drawing.Size(752, 135)
+        Me.LvCycles.Size = New System.Drawing.Size(503, 89)
         Me.LvCycles.TabIndex = 0
         Me.LvCycles.TabStop = false
         Me.LvCycles.UseCompatibleStateImageBehavior = false
@@ -533,10 +508,9 @@ Partial Class VectoJobForm
         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(44, 168)
-        Me.BtDRIrem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.BtDRIrem.Location = New System.Drawing.Point(29, 109)
         Me.BtDRIrem.Name = "BtDRIrem"
-        Me.BtDRIrem.Size = New System.Drawing.Size(36, 37)
+        Me.BtDRIrem.Size = New System.Drawing.Size(24, 24)
         Me.BtDRIrem.TabIndex = 2
         Me.BtDRIrem.UseVisualStyleBackColor = true
         '
@@ -545,10 +519,9 @@ Partial Class VectoJobForm
         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(8, 168)
-        Me.BtDRIadd.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.BtDRIadd.Location = New System.Drawing.Point(5, 109)
         Me.BtDRIadd.Name = "BtDRIadd"
-        Me.BtDRIadd.Size = New System.Drawing.Size(36, 37)
+        Me.BtDRIadd.Size = New System.Drawing.Size(24, 24)
         Me.BtDRIadd.TabIndex = 1
         Me.BtDRIadd.UseVisualStyleBackColor = true
         '
@@ -558,11 +531,9 @@ Partial Class VectoJobForm
             Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
         Me.GrAuxMech.Controls.Add(Me.pnAuxDeclarationMode)
         Me.GrAuxMech.Controls.Add(Me.pnAuxEngineering)
-        Me.GrAuxMech.Location = New System.Drawing.Point(9, 25)
-        Me.GrAuxMech.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GrAuxMech.Location = New System.Drawing.Point(6, 16)
         Me.GrAuxMech.Name = "GrAuxMech"
-        Me.GrAuxMech.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GrAuxMech.Size = New System.Drawing.Size(772, 431)
+        Me.GrAuxMech.Size = New System.Drawing.Size(515, 280)
         Me.GrAuxMech.TabIndex = 0
         Me.GrAuxMech.TabStop = false
         Me.GrAuxMech.Text = "Mechanical Auxiliaries"
@@ -571,10 +542,9 @@ Partial Class VectoJobForm
         '
         Me.pnAuxDeclarationMode.Controls.Add(Me.LvAux)
         Me.pnAuxDeclarationMode.Controls.Add(Me.Label32)
-        Me.pnAuxDeclarationMode.Location = New System.Drawing.Point(9, 160)
-        Me.pnAuxDeclarationMode.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnAuxDeclarationMode.Location = New System.Drawing.Point(6, 104)
         Me.pnAuxDeclarationMode.Name = "pnAuxDeclarationMode"
-        Me.pnAuxDeclarationMode.Size = New System.Drawing.Size(754, 262)
+        Me.pnAuxDeclarationMode.Size = New System.Drawing.Size(503, 170)
         Me.pnAuxDeclarationMode.TabIndex = 40
         '
         'LvAux
@@ -586,11 +556,10 @@ Partial Class VectoJobForm
         Me.LvAux.FullRowSelect = true
         Me.LvAux.GridLines = true
         Me.LvAux.HideSelection = false
-        Me.LvAux.Location = New System.Drawing.Point(4, 5)
-        Me.LvAux.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.LvAux.Location = New System.Drawing.Point(3, 3)
         Me.LvAux.MultiSelect = false
         Me.LvAux.Name = "LvAux"
-        Me.LvAux.Size = New System.Drawing.Size(754, 221)
+        Me.LvAux.Size = New System.Drawing.Size(504, 145)
         Me.LvAux.TabIndex = 0
         Me.LvAux.TabStop = false
         Me.LvAux.UseCompatibleStateImageBehavior = false
@@ -616,10 +585,9 @@ Partial Class VectoJobForm
         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(14, 232)
-        Me.Label32.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label32.Location = New System.Drawing.Point(9, 151)
         Me.Label32.Name = "Label32"
-        Me.Label32.Size = New System.Drawing.Size(158, 20)
+        Me.Label32.Size = New System.Drawing.Size(106, 13)
         Me.Label32.TabIndex = 3
         Me.Label32.Text = "(Double-Click to Edit)"
         '
@@ -634,93 +602,83 @@ Partial Class VectoJobForm
         Me.pnAuxEngineering.Controls.Add(Me.TbAuxPAuxICEOn)
         Me.pnAuxEngineering.Controls.Add(Me.lblAuxICEOnUnit)
         Me.pnAuxEngineering.Controls.Add(Me.lblAuxICEOn)
-        Me.pnAuxEngineering.Location = New System.Drawing.Point(9, 29)
-        Me.pnAuxEngineering.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnAuxEngineering.Location = New System.Drawing.Point(6, 19)
         Me.pnAuxEngineering.Name = "pnAuxEngineering"
-        Me.pnAuxEngineering.Size = New System.Drawing.Size(750, 123)
+        Me.pnAuxEngineering.Size = New System.Drawing.Size(500, 80)
         Me.pnAuxEngineering.TabIndex = 0
         '
         'tbPAuxStandstillICEOff
         '
-        Me.tbPAuxStandstillICEOff.Location = New System.Drawing.Point(255, 85)
-        Me.tbPAuxStandstillICEOff.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPAuxStandstillICEOff.Location = New System.Drawing.Point(170, 55)
         Me.tbPAuxStandstillICEOff.Name = "tbPAuxStandstillICEOff"
-        Me.tbPAuxStandstillICEOff.Size = New System.Drawing.Size(112, 26)
+        Me.tbPAuxStandstillICEOff.Size = New System.Drawing.Size(76, 20)
         Me.tbPAuxStandstillICEOff.TabIndex = 2
         '
         'lblAuxStandstillICEOffUnit
         '
         Me.lblAuxStandstillICEOffUnit.AutoSize = true
-        Me.lblAuxStandstillICEOffUnit.Location = New System.Drawing.Point(378, 89)
-        Me.lblAuxStandstillICEOffUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblAuxStandstillICEOffUnit.Location = New System.Drawing.Point(252, 58)
         Me.lblAuxStandstillICEOffUnit.Name = "lblAuxStandstillICEOffUnit"
-        Me.lblAuxStandstillICEOffUnit.Size = New System.Drawing.Size(32, 20)
+        Me.lblAuxStandstillICEOffUnit.Size = New System.Drawing.Size(24, 13)
         Me.lblAuxStandstillICEOffUnit.TabIndex = 50
         Me.lblAuxStandstillICEOffUnit.Text = "[W]"
         '
         'lblAuxStandstillICEOff
         '
         Me.lblAuxStandstillICEOff.AutoSize = true
-        Me.lblAuxStandstillICEOff.Location = New System.Drawing.Point(4, 89)
-        Me.lblAuxStandstillICEOff.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblAuxStandstillICEOff.Location = New System.Drawing.Point(3, 58)
         Me.lblAuxStandstillICEOff.Name = "lblAuxStandstillICEOff"
-        Me.lblAuxStandstillICEOff.Size = New System.Drawing.Size(216, 20)
+        Me.lblAuxStandstillICEOff.Size = New System.Drawing.Size(143, 13)
         Me.lblAuxStandstillICEOff.TabIndex = 48
         Me.lblAuxStandstillICEOff.Text = "Aux Load (Standstill, ICE Off)"
         '
         'tbPAuxDrivingICEOff
         '
-        Me.tbPAuxDrivingICEOff.Location = New System.Drawing.Point(255, 45)
-        Me.tbPAuxDrivingICEOff.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPAuxDrivingICEOff.Location = New System.Drawing.Point(170, 29)
         Me.tbPAuxDrivingICEOff.Name = "tbPAuxDrivingICEOff"
-        Me.tbPAuxDrivingICEOff.Size = New System.Drawing.Size(112, 26)
+        Me.tbPAuxDrivingICEOff.Size = New System.Drawing.Size(76, 20)
         Me.tbPAuxDrivingICEOff.TabIndex = 1
         '
         'lblAuxDrivingICEOffUnit
         '
         Me.lblAuxDrivingICEOffUnit.AutoSize = true
-        Me.lblAuxDrivingICEOffUnit.Location = New System.Drawing.Point(378, 49)
-        Me.lblAuxDrivingICEOffUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblAuxDrivingICEOffUnit.Location = New System.Drawing.Point(252, 32)
         Me.lblAuxDrivingICEOffUnit.Name = "lblAuxDrivingICEOffUnit"
-        Me.lblAuxDrivingICEOffUnit.Size = New System.Drawing.Size(32, 20)
+        Me.lblAuxDrivingICEOffUnit.Size = New System.Drawing.Size(24, 13)
         Me.lblAuxDrivingICEOffUnit.TabIndex = 47
         Me.lblAuxDrivingICEOffUnit.Text = "[W]"
         '
         'lblAuxDrivingICEOff
         '
         Me.lblAuxDrivingICEOff.AutoSize = true
-        Me.lblAuxDrivingICEOff.Location = New System.Drawing.Point(4, 49)
-        Me.lblAuxDrivingICEOff.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblAuxDrivingICEOff.Location = New System.Drawing.Point(3, 32)
         Me.lblAuxDrivingICEOff.Name = "lblAuxDrivingICEOff"
-        Me.lblAuxDrivingICEOff.Size = New System.Drawing.Size(199, 20)
+        Me.lblAuxDrivingICEOff.Size = New System.Drawing.Size(134, 13)
         Me.lblAuxDrivingICEOff.TabIndex = 45
         Me.lblAuxDrivingICEOff.Text = "Aux Load (Driving, ICE Off)"
         '
         'TbAuxPAuxICEOn
         '
-        Me.TbAuxPAuxICEOn.Location = New System.Drawing.Point(255, 5)
-        Me.TbAuxPAuxICEOn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbAuxPAuxICEOn.Location = New System.Drawing.Point(170, 3)
         Me.TbAuxPAuxICEOn.Name = "TbAuxPAuxICEOn"
-        Me.TbAuxPAuxICEOn.Size = New System.Drawing.Size(112, 26)
+        Me.TbAuxPAuxICEOn.Size = New System.Drawing.Size(76, 20)
         Me.TbAuxPAuxICEOn.TabIndex = 0
         '
         'lblAuxICEOnUnit
         '
         Me.lblAuxICEOnUnit.AutoSize = true
-        Me.lblAuxICEOnUnit.Location = New System.Drawing.Point(378, 9)
-        Me.lblAuxICEOnUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblAuxICEOnUnit.Location = New System.Drawing.Point(252, 6)
         Me.lblAuxICEOnUnit.Name = "lblAuxICEOnUnit"
-        Me.lblAuxICEOnUnit.Size = New System.Drawing.Size(32, 20)
+        Me.lblAuxICEOnUnit.Size = New System.Drawing.Size(24, 13)
         Me.lblAuxICEOnUnit.TabIndex = 44
         Me.lblAuxICEOnUnit.Text = "[W]"
         '
         'lblAuxICEOn
         '
         Me.lblAuxICEOn.AutoSize = true
-        Me.lblAuxICEOn.Location = New System.Drawing.Point(4, 9)
-        Me.lblAuxICEOn.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblAuxICEOn.Location = New System.Drawing.Point(3, 6)
         Me.lblAuxICEOn.Name = "lblAuxICEOn"
-        Me.lblAuxICEOn.Size = New System.Drawing.Size(142, 20)
+        Me.lblAuxICEOn.Size = New System.Drawing.Size(95, 13)
         Me.lblAuxICEOn.TabIndex = 42
         Me.lblAuxICEOn.Text = "Aux Load (ICE On)"
         '
@@ -743,7 +701,7 @@ Partial Class VectoJobForm
         '
         Me.TbAuxPAdd.Location = New System.Drawing.Point(0, 0)
         Me.TbAuxPAdd.Name = "TbAuxPAdd"
-        Me.TbAuxPAdd.Size = New System.Drawing.Size(100, 26)
+        Me.TbAuxPAdd.Size = New System.Drawing.Size(100, 20)
         Me.TbAuxPAdd.TabIndex = 0
         '
         'Label8
@@ -778,7 +736,7 @@ Partial Class VectoJobForm
         '
         Me.txtAdvancedAuxiliaryFile.Location = New System.Drawing.Point(0, 0)
         Me.txtAdvancedAuxiliaryFile.Name = "txtAdvancedAuxiliaryFile"
-        Me.txtAdvancedAuxiliaryFile.Size = New System.Drawing.Size(100, 26)
+        Me.txtAdvancedAuxiliaryFile.Size = New System.Drawing.Size(100, 20)
         Me.txtAdvancedAuxiliaryFile.TabIndex = 0
         '
         'picAuxInfo
@@ -793,7 +751,7 @@ Partial Class VectoJobForm
         '
         Me.cboAdvancedAuxiliaries.Location = New System.Drawing.Point(0, 0)
         Me.cboAdvancedAuxiliaries.Name = "cboAdvancedAuxiliaries"
-        Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(121, 28)
+        Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(121, 21)
         Me.cboAdvancedAuxiliaries.TabIndex = 0
         '
         'lbAdvancedAuxiliaries
@@ -812,11 +770,10 @@ Partial Class VectoJobForm
         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(2, 120)
-        Me.tcJob.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tcJob.Location = New System.Drawing.Point(1, 78)
         Me.tcJob.Name = "tcJob"
         Me.tcJob.SelectedIndex = 0
-        Me.tcJob.Size = New System.Drawing.Size(800, 800)
+        Me.tcJob.Size = New System.Drawing.Size(533, 520)
         Me.tcJob.SizeMode = System.Windows.Forms.TabSizeMode.Fixed
         Me.tcJob.TabIndex = 0
         '
@@ -825,11 +782,10 @@ Partial Class VectoJobForm
         Me.tpAuxiliaries.Controls.Add(Me.gbBusAux)
         Me.tpAuxiliaries.Controls.Add(Me.gbElectricAux)
         Me.tpAuxiliaries.Controls.Add(Me.GrAuxMech)
-        Me.tpAuxiliaries.Location = New System.Drawing.Point(4, 29)
-        Me.tpAuxiliaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tpAuxiliaries.Location = New System.Drawing.Point(4, 22)
         Me.tpAuxiliaries.Name = "tpAuxiliaries"
-        Me.tpAuxiliaries.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tpAuxiliaries.Size = New System.Drawing.Size(792, 767)
+        Me.tpAuxiliaries.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.tpAuxiliaries.Size = New System.Drawing.Size(525, 494)
         Me.tpAuxiliaries.TabIndex = 9
         Me.tpAuxiliaries.Text = "Auxiliaries"
         Me.tpAuxiliaries.UseVisualStyleBackColor = true
@@ -838,11 +794,9 @@ Partial Class VectoJobForm
         '
         Me.gbBusAux.Controls.Add(Me.cbEnableBusAux)
         Me.gbBusAux.Controls.Add(Me.pnBusAux)
-        Me.gbBusAux.Location = New System.Drawing.Point(9, 465)
-        Me.gbBusAux.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbBusAux.Location = New System.Drawing.Point(6, 302)
         Me.gbBusAux.Name = "gbBusAux"
-        Me.gbBusAux.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbBusAux.Size = New System.Drawing.Size(772, 120)
+        Me.gbBusAux.Size = New System.Drawing.Size(515, 78)
         Me.gbBusAux.TabIndex = 1
         Me.gbBusAux.TabStop = false
         Me.gbBusAux.Text = "Bus Auxiliaries"
@@ -850,10 +804,9 @@ Partial Class VectoJobForm
         'cbEnableBusAux
         '
         Me.cbEnableBusAux.AutoSize = true
-        Me.cbEnableBusAux.Location = New System.Drawing.Point(15, 26)
-        Me.cbEnableBusAux.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbEnableBusAux.Location = New System.Drawing.Point(10, 17)
         Me.cbEnableBusAux.Name = "cbEnableBusAux"
-        Me.cbEnableBusAux.Size = New System.Drawing.Size(170, 24)
+        Me.cbEnableBusAux.Size = New System.Drawing.Size(115, 17)
         Me.cbEnableBusAux.TabIndex = 0
         Me.cbEnableBusAux.Text = "Use Bus Auxiliaries"
         Me.cbEnableBusAux.UseVisualStyleBackColor = true
@@ -864,18 +817,16 @@ Partial Class VectoJobForm
         Me.pnBusAux.Controls.Add(Me.tbBusAuxParams)
         Me.pnBusAux.Controls.Add(Me.btnBrowsBusAuxParams)
         Me.pnBusAux.Enabled = false
-        Me.pnBusAux.Location = New System.Drawing.Point(9, 62)
-        Me.pnBusAux.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnBusAux.Location = New System.Drawing.Point(6, 40)
         Me.pnBusAux.Name = "pnBusAux"
-        Me.pnBusAux.Size = New System.Drawing.Size(754, 40)
+        Me.pnBusAux.Size = New System.Drawing.Size(503, 26)
         Me.pnBusAux.TabIndex = 1
         '
         'btnBusAuxP
         '
-        Me.btnBusAuxP.Location = New System.Drawing.Point(4, 5)
-        Me.btnBusAuxP.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnBusAuxP.Location = New System.Drawing.Point(3, 3)
         Me.btnBusAuxP.Name = "btnBusAuxP"
-        Me.btnBusAuxP.Size = New System.Drawing.Size(108, 32)
+        Me.btnBusAuxP.Size = New System.Drawing.Size(72, 21)
         Me.btnBusAuxP.TabIndex = 0
         Me.btnBusAuxP.TabStop = false
         Me.btnBusAuxP.Text = "BusAux P."
@@ -885,20 +836,18 @@ Partial Class VectoJobForm
         '
         Me.tbBusAuxParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
             Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.tbBusAuxParams.Location = New System.Drawing.Point(122, 5)
-        Me.tbBusAuxParams.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbBusAuxParams.Location = New System.Drawing.Point(81, 3)
         Me.tbBusAuxParams.Name = "tbBusAuxParams"
-        Me.tbBusAuxParams.Size = New System.Drawing.Size(588, 26)
+        Me.tbBusAuxParams.Size = New System.Drawing.Size(393, 20)
         Me.tbBusAuxParams.TabIndex = 1
         '
         'btnBrowsBusAuxParams
         '
         Me.btnBrowsBusAuxParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
         Me.btnBrowsBusAuxParams.Image = CType(resources.GetObject("btnBrowsBusAuxParams.Image"),System.Drawing.Image)
-        Me.btnBrowsBusAuxParams.Location = New System.Drawing.Point(714, 2)
-        Me.btnBrowsBusAuxParams.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnBrowsBusAuxParams.Location = New System.Drawing.Point(476, 1)
         Me.btnBrowsBusAuxParams.Name = "btnBrowsBusAuxParams"
-        Me.btnBrowsBusAuxParams.Size = New System.Drawing.Size(36, 37)
+        Me.btnBrowsBusAuxParams.Size = New System.Drawing.Size(24, 24)
         Me.btnBrowsBusAuxParams.TabIndex = 2
         Me.btnBrowsBusAuxParams.UseVisualStyleBackColor = true
         '
@@ -908,11 +857,9 @@ Partial Class VectoJobForm
         Me.gbElectricAux.Controls.Add(Me.lblElAuxConstUnit)
         Me.gbElectricAux.Controls.Add(Me.tbElectricAuxConstant)
         Me.gbElectricAux.Controls.Add(Me.lblElAuxConst)
-        Me.gbElectricAux.Location = New System.Drawing.Point(9, 594)
-        Me.gbElectricAux.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbElectricAux.Location = New System.Drawing.Point(6, 386)
         Me.gbElectricAux.Name = "gbElectricAux"
-        Me.gbElectricAux.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbElectricAux.Size = New System.Drawing.Size(772, 85)
+        Me.gbElectricAux.Size = New System.Drawing.Size(515, 55)
         Me.gbElectricAux.TabIndex = 2
         Me.gbElectricAux.TabStop = false
         Me.gbElectricAux.Text = "Electric Auxiliaries"
@@ -922,49 +869,44 @@ Partial Class VectoJobForm
         '
         Me.Label46.AutoSize = true
         Me.Label46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.Label46.Location = New System.Drawing.Point(352, 34)
-        Me.Label46.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label46.Location = New System.Drawing.Point(235, 22)
         Me.Label46.Name = "Label46"
-        Me.Label46.Size = New System.Drawing.Size(169, 20)
+        Me.Label46.Size = New System.Drawing.Size(106, 13)
         Me.Label46.TabIndex = 48
         Me.Label46.Text = "(high voltage system)"
         '
         'lblElAuxConstUnit
         '
         Me.lblElAuxConstUnit.AutoSize = true
-        Me.lblElAuxConstUnit.Location = New System.Drawing.Point(286, 34)
-        Me.lblElAuxConstUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblElAuxConstUnit.Location = New System.Drawing.Point(191, 22)
         Me.lblElAuxConstUnit.Name = "lblElAuxConstUnit"
-        Me.lblElAuxConstUnit.Size = New System.Drawing.Size(32, 20)
+        Me.lblElAuxConstUnit.Size = New System.Drawing.Size(24, 13)
         Me.lblElAuxConstUnit.TabIndex = 47
         Me.lblElAuxConstUnit.Text = "[W]"
         '
         'tbElectricAuxConstant
         '
-        Me.tbElectricAuxConstant.Location = New System.Drawing.Point(164, 29)
-        Me.tbElectricAuxConstant.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbElectricAuxConstant.Location = New System.Drawing.Point(109, 19)
         Me.tbElectricAuxConstant.Name = "tbElectricAuxConstant"
-        Me.tbElectricAuxConstant.Size = New System.Drawing.Size(112, 26)
+        Me.tbElectricAuxConstant.Size = New System.Drawing.Size(76, 20)
         Me.tbElectricAuxConstant.TabIndex = 0
         '
         'lblElAuxConst
         '
         Me.lblElAuxConst.AutoSize = true
-        Me.lblElAuxConst.Location = New System.Drawing.Point(10, 34)
-        Me.lblElAuxConst.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblElAuxConst.Location = New System.Drawing.Point(7, 22)
         Me.lblElAuxConst.Name = "lblElAuxConst"
-        Me.lblElAuxConst.Size = New System.Drawing.Size(145, 20)
+        Me.lblElAuxConst.Size = New System.Drawing.Size(97, 13)
         Me.lblElAuxConst.TabIndex = 45
         Me.lblElAuxConst.Text = "Constant Aux Load"
         '
         'tpCycles
         '
         Me.tpCycles.Controls.Add(Me.GrCycles)
-        Me.tpCycles.Location = New System.Drawing.Point(4, 29)
-        Me.tpCycles.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tpCycles.Location = New System.Drawing.Point(4, 22)
         Me.tpCycles.Name = "tpCycles"
-        Me.tpCycles.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tpCycles.Size = New System.Drawing.Size(792, 767)
+        Me.tpCycles.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.tpCycles.Size = New System.Drawing.Size(525, 494)
         Me.tpCycles.TabIndex = 10
         Me.tpCycles.Text = "Cycles"
         Me.tpCycles.UseVisualStyleBackColor = true
@@ -974,11 +916,10 @@ Partial Class VectoJobForm
         Me.TabPgDriver.Controls.Add(Me.GrVACC)
         Me.TabPgDriver.Controls.Add(Me.GrLAC)
         Me.TabPgDriver.Controls.Add(Me.gbOverspeed)
-        Me.TabPgDriver.Location = New System.Drawing.Point(4, 29)
-        Me.TabPgDriver.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TabPgDriver.Location = New System.Drawing.Point(4, 22)
         Me.TabPgDriver.Name = "TabPgDriver"
-        Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.TabPgDriver.Size = New System.Drawing.Size(792, 767)
+        Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.TabPgDriver.Size = New System.Drawing.Size(525, 494)
         Me.TabPgDriver.TabIndex = 7
         Me.TabPgDriver.Text = "Driver Model"
         Me.TabPgDriver.UseVisualStyleBackColor = true
@@ -989,11 +930,9 @@ Partial Class VectoJobForm
         Me.GrVACC.Controls.Add(Me.TbDesMaxFile)
         Me.GrVACC.Controls.Add(Me.BtDesMaxBr)
         Me.GrVACC.Controls.Add(Me.BtAccOpen)
-        Me.GrVACC.Location = New System.Drawing.Point(14, 417)
-        Me.GrVACC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GrVACC.Location = New System.Drawing.Point(9, 271)
         Me.GrVACC.Name = "GrVACC"
-        Me.GrVACC.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GrVACC.Size = New System.Drawing.Size(772, 106)
+        Me.GrVACC.Size = New System.Drawing.Size(515, 69)
         Me.GrVACC.TabIndex = 2
         Me.GrVACC.TabStop = false
         Me.GrVACC.Text = "Max. acceleration and brake curves"
@@ -1001,10 +940,9 @@ Partial Class VectoJobForm
         'Label15
         '
         Me.Label15.AutoSize = true
-        Me.Label15.Location = New System.Drawing.Point(4, 31)
-        Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label15.Location = New System.Drawing.Point(3, 20)
         Me.Label15.Name = "Label15"
-        Me.Label15.Size = New System.Drawing.Size(319, 20)
+        Me.Label15.Size = New System.Drawing.Size(220, 13)
         Me.Label15.TabIndex = 4
         Me.Label15.Text = "Driver Acceleration/Deceleration File (.vacc):"
         '
@@ -1012,20 +950,18 @@ Partial Class VectoJobForm
         '
         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(9, 55)
-        Me.TbDesMaxFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbDesMaxFile.Location = New System.Drawing.Point(6, 36)
         Me.TbDesMaxFile.Name = "TbDesMaxFile"
-        Me.TbDesMaxFile.Size = New System.Drawing.Size(673, 26)
+        Me.TbDesMaxFile.Size = New System.Drawing.Size(450, 20)
         Me.TbDesMaxFile.TabIndex = 0
         '
         'BtDesMaxBr
         '
         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(686, 52)
-        Me.BtDesMaxBr.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.BtDesMaxBr.Location = New System.Drawing.Point(457, 34)
         Me.BtDesMaxBr.Name = "BtDesMaxBr"
-        Me.BtDesMaxBr.Size = New System.Drawing.Size(36, 37)
+        Me.BtDesMaxBr.Size = New System.Drawing.Size(24, 24)
         Me.BtDesMaxBr.TabIndex = 1
         Me.BtDesMaxBr.UseVisualStyleBackColor = true
         '
@@ -1033,10 +969,9 @@ Partial Class VectoJobForm
         '
         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(722, 52)
-        Me.BtAccOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.BtAccOpen.Location = New System.Drawing.Point(481, 34)
         Me.BtAccOpen.Name = "BtAccOpen"
-        Me.BtAccOpen.Size = New System.Drawing.Size(36, 37)
+        Me.BtAccOpen.Size = New System.Drawing.Size(24, 24)
         Me.BtAccOpen.TabIndex = 2
         Me.BtAccOpen.UseVisualStyleBackColor = true
         '
@@ -1044,11 +979,9 @@ Partial Class VectoJobForm
         '
         Me.GrLAC.Controls.Add(Me.pnLookAheadCoasting)
         Me.GrLAC.Controls.Add(Me.CbLookAhead)
-        Me.GrLAC.Location = New System.Drawing.Point(14, 142)
-        Me.GrLAC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GrLAC.Location = New System.Drawing.Point(9, 92)
         Me.GrLAC.Name = "GrLAC"
-        Me.GrLAC.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GrLAC.Size = New System.Drawing.Size(771, 266)
+        Me.GrLAC.Size = New System.Drawing.Size(514, 173)
         Me.GrLAC.TabIndex = 1
         Me.GrLAC.TabStop = false
         Me.GrLAC.Text = "Look-Ahead Coasting"
@@ -1071,126 +1004,113 @@ Partial Class VectoJobForm
         Me.pnLookAheadCoasting.Controls.Add(Me.btnDfTargetSpeed)
         Me.pnLookAheadCoasting.Controls.Add(Me.tbLacPreviewFactor)
         Me.pnLookAheadCoasting.Controls.Add(Me.tbLacDfVelocityDropFile)
-        Me.pnLookAheadCoasting.Location = New System.Drawing.Point(22, 29)
-        Me.pnLookAheadCoasting.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnLookAheadCoasting.Location = New System.Drawing.Point(15, 19)
         Me.pnLookAheadCoasting.Name = "pnLookAheadCoasting"
-        Me.pnLookAheadCoasting.Size = New System.Drawing.Size(740, 198)
+        Me.pnLookAheadCoasting.Size = New System.Drawing.Size(493, 129)
         Me.pnLookAheadCoasting.TabIndex = 0
         '
         'Label7
         '
         Me.Label7.AutoSize = true
-        Me.Label7.Location = New System.Drawing.Point(368, 9)
-        Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label7.Location = New System.Drawing.Point(245, 6)
         Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(51, 20)
+        Me.Label7.Size = New System.Drawing.Size(38, 13)
         Me.Label7.TabIndex = 4
         Me.Label7.Text = "[km/h]"
         '
         'Label6
         '
         Me.Label6.AutoSize = true
-        Me.Label6.Location = New System.Drawing.Point(159, 8)
-        Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label6.Location = New System.Drawing.Point(106, 5)
         Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(97, 20)
+        Me.Label6.Size = New System.Drawing.Size(67, 13)
         Me.Label6.TabIndex = 33
         Me.Label6.Text = "Min. Velocity"
         Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         '
         'tbLacMinSpeed
         '
-        Me.tbLacMinSpeed.Location = New System.Drawing.Point(268, 5)
-        Me.tbLacMinSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbLacMinSpeed.Location = New System.Drawing.Point(179, 3)
         Me.tbLacMinSpeed.Name = "tbLacMinSpeed"
-        Me.tbLacMinSpeed.Size = New System.Drawing.Size(94, 26)
+        Me.tbLacMinSpeed.Size = New System.Drawing.Size(64, 20)
         Me.tbLacMinSpeed.TabIndex = 0
         '
         '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.Location = New System.Drawing.Point(699, 120)
-        Me.btnDfVelocityDrop.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnDfVelocityDrop.Location = New System.Drawing.Point(466, 78)
         Me.btnDfVelocityDrop.Name = "btnDfVelocityDrop"
-        Me.btnDfVelocityDrop.Size = New System.Drawing.Size(36, 37)
+        Me.btnDfVelocityDrop.Size = New System.Drawing.Size(24, 24)
         Me.btnDfVelocityDrop.TabIndex = 5
         Me.btnDfVelocityDrop.UseVisualStyleBackColor = true
         '
         'Label12
         '
         Me.Label12.AutoSize = true
-        Me.Label12.Location = New System.Drawing.Point(426, 169)
-        Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label12.Location = New System.Drawing.Point(284, 110)
         Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(190, 20)
+        Me.Label12.Size = New System.Drawing.Size(130, 13)
         Me.Label12.TabIndex = 31
         Me.Label12.Text = "* DF_vTarget * DF_vDrop"
         '
         'tbDfCoastingScale
         '
-        Me.tbDfCoastingScale.Location = New System.Drawing.Point(362, 165)
-        Me.tbDfCoastingScale.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbDfCoastingScale.Location = New System.Drawing.Point(241, 107)
         Me.tbDfCoastingScale.Name = "tbDfCoastingScale"
-        Me.tbDfCoastingScale.Size = New System.Drawing.Size(54, 26)
+        Me.tbDfCoastingScale.Size = New System.Drawing.Size(37, 20)
         Me.tbDfCoastingScale.TabIndex = 7
         '
         'Label11
         '
         Me.Label11.AutoSize = true
-        Me.Label11.Location = New System.Drawing.Point(336, 168)
-        Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label11.Location = New System.Drawing.Point(224, 109)
         Me.Label11.Name = "Label11"
-        Me.Label11.Size = New System.Drawing.Size(18, 20)
+        Me.Label11.Size = New System.Drawing.Size(13, 13)
         Me.Label11.TabIndex = 29
         Me.Label11.Text = "- "
         '
         'Label3
         '
         Me.Label3.AutoSize = true
-        Me.Label3.Location = New System.Drawing.Point(82, 46)
-        Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label3.Location = New System.Drawing.Point(55, 30)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(172, 20)
+        Me.Label3.Size = New System.Drawing.Size(118, 13)
         Me.Label3.TabIndex = 20
         Me.Label3.Text = "Preview distance factor"
         Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         '
         'tbDfCoastingOffset
         '
-        Me.tbDfCoastingOffset.Location = New System.Drawing.Point(270, 165)
-        Me.tbDfCoastingOffset.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbDfCoastingOffset.Location = New System.Drawing.Point(180, 107)
         Me.tbDfCoastingOffset.Name = "tbDfCoastingOffset"
-        Me.tbDfCoastingOffset.Size = New System.Drawing.Size(54, 26)
+        Me.tbDfCoastingOffset.Size = New System.Drawing.Size(37, 20)
         Me.tbDfCoastingOffset.TabIndex = 6
         '
         '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.Location = New System.Drawing.Point(268, 83)
-        Me.tbLacDfTargetSpeedFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbLacDfTargetSpeedFile.Location = New System.Drawing.Point(179, 54)
         Me.tbLacDfTargetSpeedFile.Name = "tbLacDfTargetSpeedFile"
-        Me.tbLacDfTargetSpeedFile.Size = New System.Drawing.Size(427, 26)
+        Me.tbLacDfTargetSpeedFile.Size = New System.Drawing.Size(286, 20)
         Me.tbLacDfTargetSpeedFile.TabIndex = 2
         '
         'Label10
         '
         Me.Label10.AutoSize = true
-        Me.Label10.Location = New System.Drawing.Point(141, 168)
-        Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label10.Location = New System.Drawing.Point(94, 109)
         Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(117, 20)
+        Me.Label10.Size = New System.Drawing.Size(79, 13)
         Me.Label10.TabIndex = 27
         Me.Label10.Text = "DF_coasting = "
         '
         'Label4
         '
         Me.Label4.AutoSize = true
-        Me.Label4.Location = New System.Drawing.Point(27, 86)
-        Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label4.Location = New System.Drawing.Point(18, 56)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(230, 20)
+        Me.Label4.Size = New System.Drawing.Size(155, 13)
         Me.Label4.TabIndex = 24
         Me.Label4.Text = "Decision Factor - Target Speed"
         Me.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -1198,10 +1118,9 @@ Partial Class VectoJobForm
         'Label5
         '
         Me.Label5.AutoSize = true
-        Me.Label5.Location = New System.Drawing.Point(30, 128)
-        Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label5.Location = New System.Drawing.Point(20, 83)
         Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(227, 20)
+        Me.Label5.Size = New System.Drawing.Size(153, 13)
         Me.Label5.TabIndex = 26
         Me.Label5.Text = "Decision Factor - Velocity Drop"
         Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -1210,29 +1129,26 @@ Partial Class VectoJobForm
         '
         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(699, 80)
-        Me.btnDfTargetSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnDfTargetSpeed.Location = New System.Drawing.Point(466, 52)
         Me.btnDfTargetSpeed.Name = "btnDfTargetSpeed"
-        Me.btnDfTargetSpeed.Size = New System.Drawing.Size(36, 37)
+        Me.btnDfTargetSpeed.Size = New System.Drawing.Size(24, 24)
         Me.btnDfTargetSpeed.TabIndex = 3
         Me.btnDfTargetSpeed.UseVisualStyleBackColor = true
         '
         'tbLacPreviewFactor
         '
-        Me.tbLacPreviewFactor.Location = New System.Drawing.Point(268, 43)
-        Me.tbLacPreviewFactor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbLacPreviewFactor.Location = New System.Drawing.Point(179, 28)
         Me.tbLacPreviewFactor.Name = "tbLacPreviewFactor"
-        Me.tbLacPreviewFactor.Size = New System.Drawing.Size(94, 26)
+        Me.tbLacPreviewFactor.Size = New System.Drawing.Size(64, 20)
         Me.tbLacPreviewFactor.TabIndex = 1
         '
         '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.Location = New System.Drawing.Point(268, 125)
-        Me.tbLacDfVelocityDropFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbLacDfVelocityDropFile.Location = New System.Drawing.Point(179, 81)
         Me.tbLacDfVelocityDropFile.Name = "tbLacDfVelocityDropFile"
-        Me.tbLacDfVelocityDropFile.Size = New System.Drawing.Size(427, 26)
+        Me.tbLacDfVelocityDropFile.Size = New System.Drawing.Size(286, 20)
         Me.tbLacDfVelocityDropFile.TabIndex = 4
         '
         'CbLookAhead
@@ -1240,10 +1156,9 @@ Partial Class VectoJobForm
         Me.CbLookAhead.AutoSize = true
         Me.CbLookAhead.Checked = true
         Me.CbLookAhead.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.CbLookAhead.Location = New System.Drawing.Point(24, 32)
-        Me.CbLookAhead.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.CbLookAhead.Location = New System.Drawing.Point(16, 21)
         Me.CbLookAhead.Name = "CbLookAhead"
-        Me.CbLookAhead.Size = New System.Drawing.Size(94, 24)
+        Me.CbLookAhead.Size = New System.Drawing.Size(65, 17)
         Me.CbLookAhead.TabIndex = 0
         Me.CbLookAhead.Text = "Enabled"
         Me.CbLookAhead.UseVisualStyleBackColor = true
@@ -1253,11 +1168,9 @@ Partial Class VectoJobForm
         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(14, 14)
-        Me.gbOverspeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbOverspeed.Location = New System.Drawing.Point(9, 9)
         Me.gbOverspeed.Name = "gbOverspeed"
-        Me.gbOverspeed.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbOverspeed.Size = New System.Drawing.Size(772, 118)
+        Me.gbOverspeed.Size = New System.Drawing.Size(515, 77)
         Me.gbOverspeed.TabIndex = 0
         Me.gbOverspeed.TabStop = false
         Me.gbOverspeed.Text = "Overspeed"
@@ -1270,65 +1183,58 @@ Partial Class VectoJobForm
         Me.PnEcoRoll.Controls.Add(Me.TbOverspeed)
         Me.PnEcoRoll.Controls.Add(Me.Label23)
         Me.PnEcoRoll.Controls.Add(Me.Label13)
-        Me.PnEcoRoll.Location = New System.Drawing.Point(136, 26)
-        Me.PnEcoRoll.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PnEcoRoll.Location = New System.Drawing.Point(91, 17)
         Me.PnEcoRoll.Name = "PnEcoRoll"
-        Me.PnEcoRoll.Size = New System.Drawing.Size(348, 83)
+        Me.PnEcoRoll.Size = New System.Drawing.Size(232, 54)
         Me.PnEcoRoll.TabIndex = 2
         '
         'Label21
         '
         Me.Label21.AutoSize = true
-        Me.Label21.Location = New System.Drawing.Point(255, 48)
-        Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label21.Location = New System.Drawing.Point(170, 31)
         Me.Label21.Name = "Label21"
-        Me.Label21.Size = New System.Drawing.Size(51, 20)
+        Me.Label21.Size = New System.Drawing.Size(38, 13)
         Me.Label21.TabIndex = 3
         Me.Label21.Text = "[km/h]"
         '
         'Label14
         '
         Me.Label14.AutoSize = true
-        Me.Label14.Location = New System.Drawing.Point(255, 8)
-        Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label14.Location = New System.Drawing.Point(170, 5)
         Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(51, 20)
+        Me.Label14.Size = New System.Drawing.Size(38, 13)
         Me.Label14.TabIndex = 3
         Me.Label14.Text = "[km/h]"
         '
         'TbVmin
         '
-        Me.TbVmin.Location = New System.Drawing.Point(156, 43)
-        Me.TbVmin.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbVmin.Location = New System.Drawing.Point(104, 28)
         Me.TbVmin.Name = "TbVmin"
-        Me.TbVmin.Size = New System.Drawing.Size(94, 26)
+        Me.TbVmin.Size = New System.Drawing.Size(64, 20)
         Me.TbVmin.TabIndex = 1
         '
         'TbOverspeed
         '
-        Me.TbOverspeed.Location = New System.Drawing.Point(156, 3)
-        Me.TbOverspeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbOverspeed.Location = New System.Drawing.Point(104, 2)
         Me.TbOverspeed.Name = "TbOverspeed"
-        Me.TbOverspeed.Size = New System.Drawing.Size(94, 26)
+        Me.TbOverspeed.Size = New System.Drawing.Size(64, 20)
         Me.TbOverspeed.TabIndex = 0
         '
         'Label23
         '
         Me.Label23.AutoSize = true
-        Me.Label23.Location = New System.Drawing.Point(27, 48)
-        Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label23.Location = New System.Drawing.Point(18, 31)
         Me.Label23.Name = "Label23"
-        Me.Label23.Size = New System.Drawing.Size(120, 20)
+        Me.Label23.Size = New System.Drawing.Size(80, 13)
         Me.Label23.TabIndex = 1
         Me.Label23.Text = "Minimum speed"
         '
         'Label13
         '
         Me.Label13.AutoSize = true
-        Me.Label13.Location = New System.Drawing.Point(20, 8)
-        Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label13.Location = New System.Drawing.Point(13, 5)
         Me.Label13.Name = "Label13"
-        Me.Label13.Size = New System.Drawing.Size(123, 20)
+        Me.Label13.Size = New System.Drawing.Size(85, 13)
         Me.Label13.TabIndex = 1
         Me.Label13.Text = "Max. Overspeed"
         '
@@ -1336,10 +1242,9 @@ Partial Class VectoJobForm
         '
         Me.RdOverspeed.AutoSize = true
         Me.RdOverspeed.Checked = true
-        Me.RdOverspeed.Location = New System.Drawing.Point(24, 68)
-        Me.RdOverspeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.RdOverspeed.Location = New System.Drawing.Point(16, 44)
         Me.RdOverspeed.Name = "RdOverspeed"
-        Me.RdOverspeed.Size = New System.Drawing.Size(111, 24)
+        Me.RdOverspeed.Size = New System.Drawing.Size(77, 17)
         Me.RdOverspeed.TabIndex = 1
         Me.RdOverspeed.TabStop = true
         Me.RdOverspeed.Text = "Overspeed"
@@ -1348,10 +1253,9 @@ Partial Class VectoJobForm
         'RdOff
         '
         Me.RdOff.AutoSize = true
-        Me.RdOff.Location = New System.Drawing.Point(24, 32)
-        Me.RdOff.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.RdOff.Location = New System.Drawing.Point(16, 21)
         Me.RdOff.Name = "RdOff"
-        Me.RdOff.Size = New System.Drawing.Size(56, 24)
+        Me.RdOff.Size = New System.Drawing.Size(39, 17)
         Me.RdOff.TabIndex = 0
         Me.RdOff.Text = "Off"
         Me.RdOff.UseVisualStyleBackColor = true
@@ -1361,10 +1265,9 @@ Partial Class VectoJobForm
         Me.TabPgADAS.Controls.Add(Me.gbPCC)
         Me.TabPgADAS.Controls.Add(Me.gbEcoRoll)
         Me.TabPgADAS.Controls.Add(Me.gbEngineStopStart)
-        Me.TabPgADAS.Location = New System.Drawing.Point(4, 29)
-        Me.TabPgADAS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TabPgADAS.Location = New System.Drawing.Point(4, 22)
         Me.TabPgADAS.Name = "TabPgADAS"
-        Me.TabPgADAS.Size = New System.Drawing.Size(792, 767)
+        Me.TabPgADAS.Size = New System.Drawing.Size(525, 494)
         Me.TabPgADAS.TabIndex = 8
         Me.TabPgADAS.Text = "ADAS Parameters"
         Me.TabPgADAS.UseVisualStyleBackColor = true
@@ -1391,11 +1294,9 @@ Partial Class VectoJobForm
         Me.gbPCC.Controls.Add(Me.Label20)
         Me.gbPCC.Controls.Add(Me.Label22)
         Me.gbPCC.Controls.Add(Me.tbPCCUnderspeed)
-        Me.gbPCC.Location = New System.Drawing.Point(10, 414)
-        Me.gbPCC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbPCC.Location = New System.Drawing.Point(7, 269)
         Me.gbPCC.Name = "gbPCC"
-        Me.gbPCC.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbPCC.Size = New System.Drawing.Size(772, 334)
+        Me.gbPCC.Size = New System.Drawing.Size(515, 217)
         Me.gbPCC.TabIndex = 2
         Me.gbPCC.TabStop = false
         Me.gbPCC.Text = "Predictive Cruise Control"
@@ -1404,10 +1305,9 @@ Partial Class VectoJobForm
         '
         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(58, 302)
-        Me.Label43.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label43.Location = New System.Drawing.Point(39, 196)
         Me.Label43.Name = "Label43"
-        Me.Label43.Size = New System.Drawing.Size(248, 20)
+        Me.Label43.Size = New System.Drawing.Size(157, 13)
         Me.Label43.TabIndex = 30
         Me.Label43.Text = "(cf. column HW in driving cycle)"
         '
@@ -1415,10 +1315,9 @@ Partial Class VectoJobForm
         '
         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(10, 278)
-        Me.Label42.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label42.Location = New System.Drawing.Point(7, 181)
         Me.Label42.Name = "Label42"
-        Me.Label42.Size = New System.Drawing.Size(631, 20)
+        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 "& _ 
     "cycle"
@@ -1426,169 +1325,151 @@ Partial Class VectoJobForm
         'Label40
         '
         Me.Label40.AutoSize = true
-        Me.Label40.Location = New System.Drawing.Point(458, 234)
-        Me.Label40.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label40.Location = New System.Drawing.Point(305, 152)
         Me.Label40.Name = "Label40"
-        Me.Label40.Size = New System.Drawing.Size(30, 20)
+        Me.Label40.Size = New System.Drawing.Size(21, 13)
         Me.Label40.TabIndex = 28
         Me.Label40.Text = "[m]"
         '
         'Label41
         '
         Me.Label41.AutoSize = true
-        Me.Label41.Location = New System.Drawing.Point(10, 234)
-        Me.Label41.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label41.Location = New System.Drawing.Point(7, 152)
         Me.Label41.Name = "Label41"
-        Me.Label41.Size = New System.Drawing.Size(212, 20)
+        Me.Label41.Size = New System.Drawing.Size(146, 13)
         Me.Label41.TabIndex = 26
         Me.Label41.Text = "Preview distance use case 2:"
         '
         'tbPCCPreviewUseCase2
         '
-        Me.tbPCCPreviewUseCase2.Location = New System.Drawing.Point(370, 229)
-        Me.tbPCCPreviewUseCase2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPCCPreviewUseCase2.Location = New System.Drawing.Point(247, 149)
         Me.tbPCCPreviewUseCase2.Name = "tbPCCPreviewUseCase2"
-        Me.tbPCCPreviewUseCase2.Size = New System.Drawing.Size(76, 26)
+        Me.tbPCCPreviewUseCase2.Size = New System.Drawing.Size(52, 20)
         Me.tbPCCPreviewUseCase2.TabIndex = 5
         '
         'Label38
         '
         Me.Label38.AutoSize = true
-        Me.Label38.Location = New System.Drawing.Point(458, 194)
-        Me.Label38.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label38.Location = New System.Drawing.Point(305, 126)
         Me.Label38.Name = "Label38"
-        Me.Label38.Size = New System.Drawing.Size(30, 20)
+        Me.Label38.Size = New System.Drawing.Size(21, 13)
         Me.Label38.TabIndex = 25
         Me.Label38.Text = "[m]"
         '
         'Label39
         '
         Me.Label39.AutoSize = true
-        Me.Label39.Location = New System.Drawing.Point(10, 194)
-        Me.Label39.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label39.Location = New System.Drawing.Point(7, 126)
         Me.Label39.Name = "Label39"
-        Me.Label39.Size = New System.Drawing.Size(212, 20)
+        Me.Label39.Size = New System.Drawing.Size(146, 13)
         Me.Label39.TabIndex = 23
         Me.Label39.Text = "Preview distance use case 1:"
         '
         'tbPCCPreviewUseCase1
         '
-        Me.tbPCCPreviewUseCase1.Location = New System.Drawing.Point(370, 189)
-        Me.tbPCCPreviewUseCase1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPCCPreviewUseCase1.Location = New System.Drawing.Point(247, 123)
         Me.tbPCCPreviewUseCase1.Name = "tbPCCPreviewUseCase1"
-        Me.tbPCCPreviewUseCase1.Size = New System.Drawing.Size(76, 26)
+        Me.tbPCCPreviewUseCase1.Size = New System.Drawing.Size(52, 20)
         Me.tbPCCPreviewUseCase1.TabIndex = 4
         '
         'Label36
         '
         Me.Label36.AutoSize = true
-        Me.Label36.Location = New System.Drawing.Point(458, 154)
-        Me.Label36.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label36.Location = New System.Drawing.Point(305, 100)
         Me.Label36.Name = "Label36"
-        Me.Label36.Size = New System.Drawing.Size(51, 20)
+        Me.Label36.Size = New System.Drawing.Size(38, 13)
         Me.Label36.TabIndex = 22
         Me.Label36.Text = "[km/h]"
         '
         'Label37
         '
         Me.Label37.AutoSize = true
-        Me.Label37.Location = New System.Drawing.Point(10, 154)
-        Me.Label37.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label37.Location = New System.Drawing.Point(7, 100)
         Me.Label37.Name = "Label37"
-        Me.Label37.Size = New System.Drawing.Size(124, 20)
+        Me.Label37.Size = New System.Drawing.Size(83, 13)
         Me.Label37.TabIndex = 20
         Me.Label37.Text = "Minimum speed:"
         '
         'tbPCCMinSpeed
         '
-        Me.tbPCCMinSpeed.Location = New System.Drawing.Point(370, 149)
-        Me.tbPCCMinSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPCCMinSpeed.Location = New System.Drawing.Point(247, 97)
         Me.tbPCCMinSpeed.Name = "tbPCCMinSpeed"
-        Me.tbPCCMinSpeed.Size = New System.Drawing.Size(76, 26)
+        Me.tbPCCMinSpeed.Size = New System.Drawing.Size(52, 20)
         Me.tbPCCMinSpeed.TabIndex = 3
         '
         'Label34
         '
         Me.Label34.AutoSize = true
-        Me.Label34.Location = New System.Drawing.Point(458, 114)
-        Me.Label34.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label34.Location = New System.Drawing.Point(305, 74)
         Me.Label34.Name = "Label34"
-        Me.Label34.Size = New System.Drawing.Size(51, 20)
+        Me.Label34.Size = New System.Drawing.Size(38, 13)
         Me.Label34.TabIndex = 19
         Me.Label34.Text = "[km/h]"
         '
         'Label35
         '
         Me.Label35.AutoSize = true
-        Me.Label35.Location = New System.Drawing.Point(10, 114)
-        Me.Label35.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label35.Location = New System.Drawing.Point(7, 74)
         Me.Label35.Name = "Label35"
-        Me.Label35.Size = New System.Drawing.Size(164, 20)
+        Me.Label35.Size = New System.Drawing.Size(113, 13)
         Me.Label35.TabIndex = 17
         Me.Label35.Text = "PCC enabling velocity:"
         '
         'tbPCCEnableSpeed
         '
-        Me.tbPCCEnableSpeed.Location = New System.Drawing.Point(370, 109)
-        Me.tbPCCEnableSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPCCEnableSpeed.Location = New System.Drawing.Point(247, 71)
         Me.tbPCCEnableSpeed.Name = "tbPCCEnableSpeed"
-        Me.tbPCCEnableSpeed.Size = New System.Drawing.Size(76, 26)
+        Me.tbPCCEnableSpeed.Size = New System.Drawing.Size(52, 20)
         Me.tbPCCEnableSpeed.TabIndex = 2
         '
         'Label31
         '
         Me.Label31.AutoSize = true
-        Me.Label31.Location = New System.Drawing.Point(458, 74)
-        Me.Label31.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label31.Location = New System.Drawing.Point(305, 48)
         Me.Label31.Name = "Label31"
-        Me.Label31.Size = New System.Drawing.Size(51, 20)
+        Me.Label31.Size = New System.Drawing.Size(38, 13)
         Me.Label31.TabIndex = 16
         Me.Label31.Text = "[km/h]"
         '
         'Label33
         '
         Me.Label33.AutoSize = true
-        Me.Label33.Location = New System.Drawing.Point(10, 74)
-        Me.Label33.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label33.Location = New System.Drawing.Point(7, 48)
         Me.Label33.Name = "Label33"
-        Me.Label33.Size = New System.Drawing.Size(146, 20)
+        Me.Label33.Size = New System.Drawing.Size(100, 13)
         Me.Label33.TabIndex = 14
         Me.Label33.Text = "Allowed overspeed:"
         '
         'tbPCCOverspeed
         '
-        Me.tbPCCOverspeed.Location = New System.Drawing.Point(370, 69)
-        Me.tbPCCOverspeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPCCOverspeed.Location = New System.Drawing.Point(247, 45)
         Me.tbPCCOverspeed.Name = "tbPCCOverspeed"
-        Me.tbPCCOverspeed.Size = New System.Drawing.Size(76, 26)
+        Me.tbPCCOverspeed.Size = New System.Drawing.Size(52, 20)
         Me.tbPCCOverspeed.TabIndex = 1
         '
         'Label20
         '
         Me.Label20.AutoSize = true
-        Me.Label20.Location = New System.Drawing.Point(458, 34)
-        Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label20.Location = New System.Drawing.Point(305, 22)
         Me.Label20.Name = "Label20"
-        Me.Label20.Size = New System.Drawing.Size(51, 20)
+        Me.Label20.Size = New System.Drawing.Size(38, 13)
         Me.Label20.TabIndex = 13
         Me.Label20.Text = "[km/h]"
         '
         'Label22
         '
         Me.Label22.AutoSize = true
-        Me.Label22.Location = New System.Drawing.Point(10, 34)
-        Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label22.Location = New System.Drawing.Point(7, 22)
         Me.Label22.Name = "Label22"
-        Me.Label22.Size = New System.Drawing.Size(157, 20)
+        Me.Label22.Size = New System.Drawing.Size(106, 13)
         Me.Label22.TabIndex = 11
         Me.Label22.Text = "Allowed underspeed:"
         '
         'tbPCCUnderspeed
         '
-        Me.tbPCCUnderspeed.Location = New System.Drawing.Point(370, 29)
-        Me.tbPCCUnderspeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPCCUnderspeed.Location = New System.Drawing.Point(247, 19)
         Me.tbPCCUnderspeed.Name = "tbPCCUnderspeed"
-        Me.tbPCCUnderspeed.Size = New System.Drawing.Size(76, 26)
+        Me.tbPCCUnderspeed.Size = New System.Drawing.Size(52, 20)
         Me.tbPCCUnderspeed.TabIndex = 0
         '
         'gbEcoRoll
@@ -1605,11 +1486,9 @@ Partial Class VectoJobForm
         Me.gbEcoRoll.Controls.Add(Me.Label25)
         Me.gbEcoRoll.Controls.Add(Me.Label26)
         Me.gbEcoRoll.Controls.Add(Me.tbEcoRollMinSpeed)
-        Me.gbEcoRoll.Location = New System.Drawing.Point(10, 209)
-        Me.gbEcoRoll.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbEcoRoll.Location = New System.Drawing.Point(7, 136)
         Me.gbEcoRoll.Name = "gbEcoRoll"
-        Me.gbEcoRoll.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbEcoRoll.Size = New System.Drawing.Size(772, 195)
+        Me.gbEcoRoll.Size = New System.Drawing.Size(515, 127)
         Me.gbEcoRoll.TabIndex = 1
         Me.gbEcoRoll.TabStop = false
         Me.gbEcoRoll.Text = "Eco-Roll"
@@ -1617,38 +1496,34 @@ Partial Class VectoJobForm
         'Label44
         '
         Me.Label44.AutoSize = true
-        Me.Label44.Location = New System.Drawing.Point(458, 115)
-        Me.Label44.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label44.Location = New System.Drawing.Point(305, 75)
         Me.Label44.Name = "Label44"
-        Me.Label44.Size = New System.Drawing.Size(47, 20)
+        Me.Label44.Size = New System.Drawing.Size(34, 13)
         Me.Label44.TabIndex = 19
         Me.Label44.Text = "[m/s²]"
         '
         'Label45
         '
         Me.Label45.AutoSize = true
-        Me.Label45.Location = New System.Drawing.Point(10, 115)
-        Me.Label45.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label45.Location = New System.Drawing.Point(7, 75)
         Me.Label45.Name = "Label45"
-        Me.Label45.Size = New System.Drawing.Size(186, 20)
+        Me.Label45.Size = New System.Drawing.Size(125, 13)
         Me.Label45.TabIndex = 17
         Me.Label45.Text = "Upper Acceleration Limit:"
         '
         'tbEcoRollMaxAcc
         '
-        Me.tbEcoRollMaxAcc.Location = New System.Drawing.Point(370, 111)
-        Me.tbEcoRollMaxAcc.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbEcoRollMaxAcc.Location = New System.Drawing.Point(247, 72)
         Me.tbEcoRollMaxAcc.Name = "tbEcoRollMaxAcc"
-        Me.tbEcoRollMaxAcc.Size = New System.Drawing.Size(76, 26)
+        Me.tbEcoRollMaxAcc.Size = New System.Drawing.Size(52, 20)
         Me.tbEcoRollMaxAcc.TabIndex = 2
         '
         'Label29
         '
         Me.Label29.AutoSize = true
-        Me.Label29.Location = New System.Drawing.Point(458, 154)
-        Me.Label29.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label29.Location = New System.Drawing.Point(305, 100)
         Me.Label29.Name = "Label29"
-        Me.Label29.Size = New System.Drawing.Size(51, 20)
+        Me.Label29.Size = New System.Drawing.Size(38, 13)
         Me.Label29.TabIndex = 16
         Me.Label29.Text = "[km/h]"
         Me.Label29.Visible = false
@@ -1656,77 +1531,69 @@ Partial Class VectoJobForm
         'Label30
         '
         Me.Label30.AutoSize = true
-        Me.Label30.Location = New System.Drawing.Point(10, 154)
-        Me.Label30.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label30.Location = New System.Drawing.Point(7, 100)
         Me.Label30.Name = "Label30"
-        Me.Label30.Size = New System.Drawing.Size(171, 20)
+        Me.Label30.Size = New System.Drawing.Size(114, 13)
         Me.Label30.TabIndex = 14
         Me.Label30.Text = "Underspeed threshold:"
         Me.Label30.Visible = false
         '
         'tbEcoRollUnderspeed
         '
-        Me.tbEcoRollUnderspeed.Location = New System.Drawing.Point(370, 149)
-        Me.tbEcoRollUnderspeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbEcoRollUnderspeed.Location = New System.Drawing.Point(247, 97)
         Me.tbEcoRollUnderspeed.Name = "tbEcoRollUnderspeed"
-        Me.tbEcoRollUnderspeed.Size = New System.Drawing.Size(76, 26)
+        Me.tbEcoRollUnderspeed.Size = New System.Drawing.Size(52, 20)
         Me.tbEcoRollUnderspeed.TabIndex = 3
         Me.tbEcoRollUnderspeed.Visible = false
         '
         'Label27
         '
         Me.Label27.AutoSize = true
-        Me.Label27.Location = New System.Drawing.Point(458, 74)
-        Me.Label27.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label27.Location = New System.Drawing.Point(305, 48)
         Me.Label27.Name = "Label27"
-        Me.Label27.Size = New System.Drawing.Size(25, 20)
+        Me.Label27.Size = New System.Drawing.Size(18, 13)
         Me.Label27.TabIndex = 13
         Me.Label27.Text = "[s]"
         '
         'Label28
         '
         Me.Label28.AutoSize = true
-        Me.Label28.Location = New System.Drawing.Point(10, 74)
-        Me.Label28.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label28.Location = New System.Drawing.Point(7, 48)
         Me.Label28.Name = "Label28"
-        Me.Label28.Size = New System.Drawing.Size(123, 20)
+        Me.Label28.Size = New System.Drawing.Size(85, 13)
         Me.Label28.TabIndex = 11
         Me.Label28.Text = "Activation delay:"
         '
         'tbEcoRollActivationDelay
         '
-        Me.tbEcoRollActivationDelay.Location = New System.Drawing.Point(370, 69)
-        Me.tbEcoRollActivationDelay.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbEcoRollActivationDelay.Location = New System.Drawing.Point(247, 45)
         Me.tbEcoRollActivationDelay.Name = "tbEcoRollActivationDelay"
-        Me.tbEcoRollActivationDelay.Size = New System.Drawing.Size(76, 26)
+        Me.tbEcoRollActivationDelay.Size = New System.Drawing.Size(52, 20)
         Me.tbEcoRollActivationDelay.TabIndex = 1
         '
         'Label25
         '
         Me.Label25.AutoSize = true
-        Me.Label25.Location = New System.Drawing.Point(458, 34)
-        Me.Label25.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label25.Location = New System.Drawing.Point(305, 22)
         Me.Label25.Name = "Label25"
-        Me.Label25.Size = New System.Drawing.Size(51, 20)
+        Me.Label25.Size = New System.Drawing.Size(38, 13)
         Me.Label25.TabIndex = 10
         Me.Label25.Text = "[km/h]"
         '
         'Label26
         '
         Me.Label26.AutoSize = true
-        Me.Label26.Location = New System.Drawing.Point(10, 34)
-        Me.Label26.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label26.Location = New System.Drawing.Point(7, 22)
         Me.Label26.Name = "Label26"
-        Me.Label26.Size = New System.Drawing.Size(124, 20)
+        Me.Label26.Size = New System.Drawing.Size(83, 13)
         Me.Label26.TabIndex = 8
         Me.Label26.Text = "Minimum speed:"
         '
         'tbEcoRollMinSpeed
         '
-        Me.tbEcoRollMinSpeed.Location = New System.Drawing.Point(370, 29)
-        Me.tbEcoRollMinSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbEcoRollMinSpeed.Location = New System.Drawing.Point(247, 19)
         Me.tbEcoRollMinSpeed.Name = "tbEcoRollMinSpeed"
-        Me.tbEcoRollMinSpeed.Size = New System.Drawing.Size(76, 26)
+        Me.tbEcoRollMinSpeed.Size = New System.Drawing.Size(52, 20)
         Me.tbEcoRollMinSpeed.TabIndex = 0
         '
         'gbEngineStopStart
@@ -1741,104 +1608,92 @@ Partial Class VectoJobForm
         Me.gbEngineStopStart.Controls.Add(Me.Label17)
         Me.gbEngineStopStart.Controls.Add(Me.tbEngineStopStartActivationDelay)
         Me.gbEngineStopStart.Controls.Add(Me.Label16)
-        Me.gbEngineStopStart.Location = New System.Drawing.Point(10, 14)
-        Me.gbEngineStopStart.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbEngineStopStart.Location = New System.Drawing.Point(7, 9)
         Me.gbEngineStopStart.Name = "gbEngineStopStart"
-        Me.gbEngineStopStart.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbEngineStopStart.Size = New System.Drawing.Size(772, 186)
+        Me.gbEngineStopStart.Size = New System.Drawing.Size(515, 121)
         Me.gbEngineStopStart.TabIndex = 0
         Me.gbEngineStopStart.TabStop = false
         Me.gbEngineStopStart.Text = "Engine Stop/Start"
         '
         'tbESSUtilityFactorDriving
         '
-        Me.tbESSUtilityFactorDriving.Location = New System.Drawing.Point(370, 146)
-        Me.tbESSUtilityFactorDriving.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbESSUtilityFactorDriving.Location = New System.Drawing.Point(247, 95)
         Me.tbESSUtilityFactorDriving.Name = "tbESSUtilityFactorDriving"
-        Me.tbESSUtilityFactorDriving.Size = New System.Drawing.Size(76, 26)
+        Me.tbESSUtilityFactorDriving.Size = New System.Drawing.Size(52, 20)
         Me.tbESSUtilityFactorDriving.TabIndex = 3
         '
         'lblESSUtilityFactorDriving
         '
         Me.lblESSUtilityFactorDriving.AutoSize = true
-        Me.lblESSUtilityFactorDriving.Location = New System.Drawing.Point(10, 151)
-        Me.lblESSUtilityFactorDriving.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblESSUtilityFactorDriving.Location = New System.Drawing.Point(7, 98)
         Me.lblESSUtilityFactorDriving.Name = "lblESSUtilityFactorDriving"
-        Me.lblESSUtilityFactorDriving.Size = New System.Drawing.Size(307, 20)
+        Me.lblESSUtilityFactorDriving.Size = New System.Drawing.Size(208, 13)
         Me.lblESSUtilityFactorDriving.TabIndex = 8
         Me.lblESSUtilityFactorDriving.Text = "Engie stop/start utility factor (while driving):"
         '
         'tbEssUtility
         '
-        Me.tbEssUtility.Location = New System.Drawing.Point(370, 106)
-        Me.tbEssUtility.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbEssUtility.Location = New System.Drawing.Point(247, 69)
         Me.tbEssUtility.Name = "tbEssUtility"
-        Me.tbEssUtility.Size = New System.Drawing.Size(76, 26)
+        Me.tbEssUtility.Size = New System.Drawing.Size(52, 20)
         Me.tbEssUtility.TabIndex = 2
         '
         'Label24
         '
         Me.Label24.AutoSize = true
-        Me.Label24.Location = New System.Drawing.Point(10, 111)
-        Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label24.Location = New System.Drawing.Point(7, 72)
         Me.Label24.Name = "Label24"
-        Me.Label24.Size = New System.Drawing.Size(306, 20)
+        Me.Label24.Size = New System.Drawing.Size(207, 13)
         Me.Label24.TabIndex = 6
         Me.Label24.Text = "Engie stop/start utility factor (vehicle stop):"
         '
         'Label18
         '
         Me.Label18.AutoSize = true
-        Me.Label18.Location = New System.Drawing.Point(458, 71)
-        Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label18.Location = New System.Drawing.Point(305, 46)
         Me.Label18.Name = "Label18"
-        Me.Label18.Size = New System.Drawing.Size(25, 20)
+        Me.Label18.Size = New System.Drawing.Size(18, 13)
         Me.Label18.TabIndex = 5
         Me.Label18.Text = "[s]"
         '
         'tbMaxEngineOffTimespan
         '
-        Me.tbMaxEngineOffTimespan.Location = New System.Drawing.Point(370, 66)
-        Me.tbMaxEngineOffTimespan.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbMaxEngineOffTimespan.Location = New System.Drawing.Point(247, 43)
         Me.tbMaxEngineOffTimespan.Name = "tbMaxEngineOffTimespan"
-        Me.tbMaxEngineOffTimespan.Size = New System.Drawing.Size(76, 26)
+        Me.tbMaxEngineOffTimespan.Size = New System.Drawing.Size(52, 20)
         Me.tbMaxEngineOffTimespan.TabIndex = 1
         '
         'Label19
         '
         Me.Label19.AutoSize = true
-        Me.Label19.Location = New System.Drawing.Point(10, 71)
-        Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label19.Location = New System.Drawing.Point(7, 46)
         Me.Label19.Name = "Label19"
-        Me.Label19.Size = New System.Drawing.Size(156, 20)
+        Me.Label19.Size = New System.Drawing.Size(105, 13)
         Me.Label19.TabIndex = 3
         Me.Label19.Text = "Max. engine-off time:"
         '
         'Label17
         '
         Me.Label17.AutoSize = true
-        Me.Label17.Location = New System.Drawing.Point(458, 31)
-        Me.Label17.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label17.Location = New System.Drawing.Point(305, 20)
         Me.Label17.Name = "Label17"
-        Me.Label17.Size = New System.Drawing.Size(25, 20)
+        Me.Label17.Size = New System.Drawing.Size(18, 13)
         Me.Label17.TabIndex = 2
         Me.Label17.Text = "[s]"
         '
         'tbEngineStopStartActivationDelay
         '
-        Me.tbEngineStopStartActivationDelay.Location = New System.Drawing.Point(370, 26)
-        Me.tbEngineStopStartActivationDelay.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbEngineStopStartActivationDelay.Location = New System.Drawing.Point(247, 17)
         Me.tbEngineStopStartActivationDelay.Name = "tbEngineStopStartActivationDelay"
-        Me.tbEngineStopStartActivationDelay.Size = New System.Drawing.Size(76, 26)
+        Me.tbEngineStopStartActivationDelay.Size = New System.Drawing.Size(52, 20)
         Me.tbEngineStopStartActivationDelay.TabIndex = 0
         '
         'Label16
         '
         Me.Label16.AutoSize = true
-        Me.Label16.Location = New System.Drawing.Point(10, 31)
-        Me.Label16.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label16.Location = New System.Drawing.Point(7, 20)
         Me.Label16.Name = "Label16"
-        Me.Label16.Size = New System.Drawing.Size(129, 20)
+        Me.Label16.Size = New System.Drawing.Size(87, 13)
         Me.Label16.TabIndex = 0
         Me.Label16.Text = "Delay engine-off:"
         '
@@ -1876,17 +1731,16 @@ Partial Class VectoJobForm
         '
         Me.TbUnderSpeed.Location = New System.Drawing.Point(0, 0)
         Me.TbUnderSpeed.Name = "TbUnderSpeed"
-        Me.TbUnderSpeed.Size = New System.Drawing.Size(100, 26)
+        Me.TbUnderSpeed.Size = New System.Drawing.Size(100, 20)
         Me.TbUnderSpeed.TabIndex = 0
         '
         'StatusStrip1
         '
         Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 939)
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 609)
         Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
-        Me.StatusStrip1.Size = New System.Drawing.Size(1416, 32)
+        Me.StatusStrip1.Size = New System.Drawing.Size(944, 22)
         Me.StatusStrip1.SizingGrip = false
         Me.StatusStrip1.TabIndex = 6
         Me.StatusStrip1.Text = "StatusStrip1"
@@ -1894,16 +1748,15 @@ Partial Class VectoJobForm
         'ToolStripStatusLabelGEN
         '
         Me.ToolStripStatusLabelGEN.Name = "ToolStripStatusLabelGEN"
-        Me.ToolStripStatusLabelGEN.Size = New System.Drawing.Size(180, 25)
+        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(1164, 866)
-        Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButOK.Location = New System.Drawing.Point(776, 563)
         Me.ButOK.Name = "ButOK"
-        Me.ButOK.Size = New System.Drawing.Size(112, 35)
+        Me.ButOK.Size = New System.Drawing.Size(75, 23)
         Me.ButOK.TabIndex = 1
         Me.ButOK.Text = "Save"
         Me.ButOK.UseVisualStyleBackColor = true
@@ -1912,10 +1765,9 @@ Partial Class VectoJobForm
         '
         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(1286, 866)
-        Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButCancel.Location = New System.Drawing.Point(857, 563)
         Me.ButCancel.Name = "ButCancel"
-        Me.ButCancel.Size = New System.Drawing.Size(112, 35)
+        Me.ButCancel.Size = New System.Drawing.Size(75, 23)
         Me.ButCancel.TabIndex = 2
         Me.ButCancel.Text = "Cancel"
         Me.ButCancel.UseVisualStyleBackColor = true
@@ -1927,8 +1779,8 @@ Partial Class VectoJobForm
         Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator1, Me.ToolStripBtSendTo, Me.ToolStripSeparator2, Me.ToolStripButton1})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
         Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0)
-        Me.ToolStrip1.Size = New System.Drawing.Size(1416, 38)
+        Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
+        Me.ToolStrip1.Size = New System.Drawing.Size(944, 31)
         Me.ToolStrip1.TabIndex = 20
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -1938,7 +1790,7 @@ Partial Class VectoJobForm
         Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
         Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripBtNew.Name = "ToolStripBtNew"
-        Me.ToolStripBtNew.Size = New System.Drawing.Size(34, 33)
+        Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtNew.Text = "New"
         Me.ToolStripBtNew.ToolTipText = "New"
         '
@@ -1948,7 +1800,7 @@ Partial Class VectoJobForm
         Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
         Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
-        Me.ToolStripBtOpen.Size = New System.Drawing.Size(34, 33)
+        Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtOpen.Text = "Open"
         Me.ToolStripBtOpen.ToolTipText = "Open..."
         '
@@ -1958,7 +1810,7 @@ Partial Class VectoJobForm
         Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
         Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripBtSave.Name = "ToolStripBtSave"
-        Me.ToolStripBtSave.Size = New System.Drawing.Size(34, 33)
+        Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtSave.Text = "Save"
         Me.ToolStripBtSave.ToolTipText = "Save"
         '
@@ -1968,14 +1820,14 @@ Partial Class VectoJobForm
         Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
         Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
-        Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(34, 33)
+        Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtSaveAs.Text = "Save As"
         Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
         '
         'ToolStripSeparator1
         '
         Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 38)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripBtSendTo
         '
@@ -1983,14 +1835,14 @@ Partial Class VectoJobForm
         Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
         Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
-        Me.ToolStripBtSendTo.Size = New System.Drawing.Size(34, 33)
+        Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtSendTo.Text = "Send to Job List"
         Me.ToolStripBtSendTo.ToolTipText = "Send to Job List"
         '
         'ToolStripSeparator2
         '
         Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 38)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripButton1
         '
@@ -1998,7 +1850,7 @@ Partial Class VectoJobForm
         Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
         Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(34, 33)
+        Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton1.Text = "Help"
         '
         'PictureBox1
@@ -2006,11 +1858,10 @@ Partial Class VectoJobForm
         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, 43)
-        Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
+        Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
         Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(1413, 62)
+        Me.PictureBox1.Size = New System.Drawing.Size(944, 40)
         Me.PictureBox1.TabIndex = 21
         Me.PictureBox1.TabStop = false
         '
@@ -2020,28 +1871,27 @@ Partial Class VectoJobForm
         Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
         Me.CmOpenFile.Name = "CmOpenFile"
         Me.CmOpenFile.ShowImageMargin = false
-        Me.CmOpenFile.Size = New System.Drawing.Size(178, 68)
+        Me.CmOpenFile.Size = New System.Drawing.Size(128, 48)
         '
         'OpenWithToolStripMenuItem
         '
         Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
-        Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(177, 32)
+        Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
         Me.OpenWithToolStripMenuItem.Text = "Open with ..."
         '
         'ShowInFolderToolStripMenuItem
         '
         Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
-        Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(177, 32)
+        Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
         Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
         '
         'PicVehicle
         '
         Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
         Me.PicVehicle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.PicVehicle.Location = New System.Drawing.Point(6, 5)
-        Me.PicVehicle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PicVehicle.Location = New System.Drawing.Point(4, 3)
         Me.PicVehicle.Name = "PicVehicle"
-        Me.PicVehicle.Size = New System.Drawing.Size(449, 134)
+        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
@@ -2050,74 +1900,66 @@ Partial Class VectoJobForm
         '
         Me.PicBox.BackColor = System.Drawing.Color.LightGray
         Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.PicBox.Location = New System.Drawing.Point(6, 222)
-        Me.PicBox.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PicBox.Location = New System.Drawing.Point(4, 144)
         Me.PicBox.Name = "PicBox"
-        Me.PicBox.Size = New System.Drawing.Size(584, 454)
+        Me.PicBox.Size = New System.Drawing.Size(390, 296)
         Me.PicBox.TabIndex = 36
         Me.PicBox.TabStop = false
         '
         'TbEngTxt
         '
-        Me.TbEngTxt.Location = New System.Drawing.Point(6, 143)
-        Me.TbEngTxt.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbEngTxt.Location = New System.Drawing.Point(4, 93)
         Me.TbEngTxt.Name = "TbEngTxt"
         Me.TbEngTxt.ReadOnly = true
-        Me.TbEngTxt.Size = New System.Drawing.Size(583, 26)
+        Me.TbEngTxt.Size = New System.Drawing.Size(390, 20)
         Me.TbEngTxt.TabIndex = 6
         '
         'TbVehCat
         '
-        Me.TbVehCat.Location = New System.Drawing.Point(460, 5)
-        Me.TbVehCat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbVehCat.Location = New System.Drawing.Point(307, 3)
         Me.TbVehCat.Name = "TbVehCat"
         Me.TbVehCat.ReadOnly = true
-        Me.TbVehCat.Size = New System.Drawing.Size(128, 26)
+        Me.TbVehCat.Size = New System.Drawing.Size(87, 20)
         Me.TbVehCat.TabIndex = 2
         '
         'TbAxleConf
         '
-        Me.TbAxleConf.Location = New System.Drawing.Point(544, 45)
-        Me.TbAxleConf.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbAxleConf.Location = New System.Drawing.Point(363, 29)
         Me.TbAxleConf.Name = "TbAxleConf"
         Me.TbAxleConf.ReadOnly = true
-        Me.TbAxleConf.Size = New System.Drawing.Size(44, 26)
+        Me.TbAxleConf.Size = New System.Drawing.Size(31, 20)
         Me.TbAxleConf.TabIndex = 4
         '
         'TbHVCclass
         '
-        Me.TbHVCclass.Location = New System.Drawing.Point(460, 102)
-        Me.TbHVCclass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbHVCclass.Location = New System.Drawing.Point(307, 66)
         Me.TbHVCclass.Name = "TbHVCclass"
         Me.TbHVCclass.ReadOnly = true
-        Me.TbHVCclass.Size = New System.Drawing.Size(128, 26)
+        Me.TbHVCclass.Size = New System.Drawing.Size(87, 20)
         Me.TbHVCclass.TabIndex = 5
         '
         'TbGbxTxt
         '
-        Me.TbGbxTxt.Location = New System.Drawing.Point(6, 182)
-        Me.TbGbxTxt.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbGbxTxt.Location = New System.Drawing.Point(4, 118)
         Me.TbGbxTxt.Name = "TbGbxTxt"
         Me.TbGbxTxt.ReadOnly = true
-        Me.TbGbxTxt.Size = New System.Drawing.Size(583, 26)
+        Me.TbGbxTxt.Size = New System.Drawing.Size(390, 20)
         Me.TbGbxTxt.TabIndex = 7
         '
         'TbMass
         '
-        Me.TbMass.Location = New System.Drawing.Point(460, 45)
-        Me.TbMass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbMass.Location = New System.Drawing.Point(307, 29)
         Me.TbMass.Name = "TbMass"
         Me.TbMass.ReadOnly = true
-        Me.TbMass.Size = New System.Drawing.Size(73, 26)
+        Me.TbMass.Size = New System.Drawing.Size(50, 20)
         Me.TbMass.TabIndex = 3
         '
         'lblEngineCharacteristics
         '
         Me.lblEngineCharacteristics.AutoSize = true
-        Me.lblEngineCharacteristics.Location = New System.Drawing.Point(10, 685)
-        Me.lblEngineCharacteristics.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblEngineCharacteristics.Location = New System.Drawing.Point(7, 445)
         Me.lblEngineCharacteristics.Name = "lblEngineCharacteristics"
-        Me.lblEngineCharacteristics.Size = New System.Drawing.Size(0, 20)
+        Me.lblEngineCharacteristics.Size = New System.Drawing.Size(0, 13)
         Me.lblEngineCharacteristics.TabIndex = 37
         '
         'lblTitle
@@ -2125,10 +1967,9 @@ Partial Class VectoJobForm
         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.Location = New System.Drawing.Point(171, 49)
-        Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblTitle.Location = New System.Drawing.Point(114, 34)
         Me.lblTitle.Name = "lblTitle"
-        Me.lblTitle.Size = New System.Drawing.Size(477, 40)
+        Me.lblTitle.Size = New System.Drawing.Size(320, 29)
         Me.lblTitle.TabIndex = 38
         Me.lblTitle.Text = "Job Editor - VEHICLE_TYPE"
         '
@@ -2142,19 +1983,18 @@ Partial Class VectoJobForm
         Me.pnJobInfo.Controls.Add(Me.PicBox)
         Me.pnJobInfo.Controls.Add(Me.TbGbxTxt)
         Me.pnJobInfo.Controls.Add(Me.TbEngTxt)
-        Me.pnJobInfo.Location = New System.Drawing.Point(798, 120)
-        Me.pnJobInfo.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnJobInfo.Location = New System.Drawing.Point(532, 78)
         Me.pnJobInfo.Name = "pnJobInfo"
-        Me.pnJobInfo.Size = New System.Drawing.Size(596, 725)
+        Me.pnJobInfo.Size = New System.Drawing.Size(397, 471)
         Me.pnJobInfo.TabIndex = 39
         '
         'VectoJobForm
         '
         Me.AcceptButton = Me.ButOK
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.CancelButton = Me.ButCancel
-        Me.ClientSize = New System.Drawing.Size(1416, 971)
+        Me.ClientSize = New System.Drawing.Size(944, 631)
         Me.Controls.Add(Me.pnJobInfo)
         Me.Controls.Add(Me.lblTitle)
         Me.Controls.Add(Me.tcJob)
@@ -2166,7 +2006,6 @@ Partial Class VectoJobForm
         Me.Controls.Add(Me.StatusStrip1)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
         Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
-        Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.MaximizeBox = false
         Me.Name = "VectoJobForm"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index 68f644fe74..746b7ffb86 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -169,6 +169,20 @@ Partial Class VehicleForm
         Me.btnOpenElectricMotor = New System.Windows.Forms.Button()
         Me.btnBrowseElectricMotor = New System.Windows.Forms.Button()
         Me.tbElectricMotor = New System.Windows.Forms.TextBox()
+        Me.tpGensetComponents = New System.Windows.Forms.TabPage()
+        Me.tbGenSetICE = New System.Windows.Forms.TextBox()
+        Me.gbGenSet = New System.Windows.Forms.GroupBox()
+        Me.btnGenSetLossMap = New System.Windows.Forms.Button()
+        Me.tbGenSetADC = New System.Windows.Forms.TextBox()
+        Me.lblGenSetADC = New System.Windows.Forms.Label()
+        Me.tbGenSetRatio = New System.Windows.Forms.TextBox()
+        Me.lblGenSetRatio = New System.Windows.Forms.Label()
+        Me.tbGenSetCount = New System.Windows.Forms.TextBox()
+        Me.lblGenSetCount = New System.Windows.Forms.Label()
+        Me.pnGenSetEM = New System.Windows.Forms.Panel()
+        Me.btnOpenGenSetEM = New System.Windows.Forms.Button()
+        Me.btnBrowseGenSetEM = New System.Windows.Forms.Button()
+        Me.tbGenSetEM = New System.Windows.Forms.TextBox()
         Me.tpTorqueLimits = New System.Windows.Forms.TabPage()
         Me.gbPropulsionTorque = New System.Windows.Forms.GroupBox()
         Me.btnPropulsionTorqueLimit = New System.Windows.Forms.Button()
@@ -210,20 +224,6 @@ 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.tpGensetComponents = New System.Windows.Forms.TabPage()
-        Me.gbGenSet = New System.Windows.Forms.GroupBox()
-        Me.btnGenSetLossMap = New System.Windows.Forms.Button()
-        Me.tbGenSetADC = New System.Windows.Forms.TextBox()
-        Me.lblGenSetADC = New System.Windows.Forms.Label()
-        Me.tbGenSetRatio = New System.Windows.Forms.TextBox()
-        Me.lblGenSetRatio = New System.Windows.Forms.Label()
-        Me.tbGenSetCount = New System.Windows.Forms.TextBox()
-        Me.lblGenSetCount = New System.Windows.Forms.Label()
-        Me.pnGenSetEM = New System.Windows.Forms.Panel()
-        Me.btnOpenGenSetEM = New System.Windows.Forms.Button()
-        Me.btnBrowseGenSetEM = New System.Windows.Forms.Button()
-        Me.tbGenSetEM = New System.Windows.Forms.TextBox()
-        Me.tbGenSetICE = New System.Windows.Forms.TextBox()
         Me.GroupBox6.SuspendLayout
         Me.ToolStrip1.SuspendLayout
         Me.GroupBox7.SuspendLayout
@@ -252,6 +252,9 @@ Partial Class VehicleForm
         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
@@ -262,90 +265,78 @@ Partial Class VehicleForm
         Me.pnPTO.SuspendLayout
         Me.gbPTODrive.SuspendLayout
         Me.gbPTO.SuspendLayout
-        Me.tpGensetComponents.SuspendLayout
-        Me.gbGenSet.SuspendLayout
-        Me.pnGenSetEM.SuspendLayout
         Me.SuspendLayout
         '
         'Label1
         '
         Me.Label1.AutoSize = true
-        Me.Label1.Location = New System.Drawing.Point(9, 34)
-        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label1.Location = New System.Drawing.Point(6, 22)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(264, 20)
+        Me.Label1.Size = New System.Drawing.Size(177, 13)
         Me.Label1.TabIndex = 0
         Me.Label1.Text = "Corrected Actual Curb Mass Vehicle"
         '
         'TbMass
         '
-        Me.TbMass.Location = New System.Drawing.Point(282, 29)
-        Me.TbMass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbMass.Location = New System.Drawing.Point(188, 19)
         Me.TbMass.Name = "TbMass"
-        Me.TbMass.Size = New System.Drawing.Size(84, 26)
+        Me.TbMass.Size = New System.Drawing.Size(57, 20)
         Me.TbMass.TabIndex = 0
         '
         'Label2
         '
         Me.Label2.AutoSize = true
-        Me.Label2.Location = New System.Drawing.Point(192, 48)
-        Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label2.Location = New System.Drawing.Point(128, 31)
         Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(66, 20)
+        Me.Label2.Size = New System.Drawing.Size(45, 13)
         Me.Label2.TabIndex = 2
         Me.Label2.Text = "Loading"
         '
         'TbLoad
         '
-        Me.TbLoad.Location = New System.Drawing.Point(273, 43)
-        Me.TbLoad.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbLoad.Location = New System.Drawing.Point(182, 28)
         Me.TbLoad.Name = "TbLoad"
-        Me.TbLoad.Size = New System.Drawing.Size(84, 26)
+        Me.TbLoad.Size = New System.Drawing.Size(57, 20)
         Me.TbLoad.TabIndex = 1
         '
         'Label3
         '
         Me.Label3.AutoSize = true
-        Me.Label3.Location = New System.Drawing.Point(112, 9)
-        Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label3.Location = New System.Drawing.Point(75, 6)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(55, 20)
+        Me.Label3.Size = New System.Drawing.Size(38, 13)
         Me.Label3.TabIndex = 8
         Me.Label3.Text = "Cd x A"
         '
         'TBcdA
         '
-        Me.TBcdA.Location = New System.Drawing.Point(178, 5)
-        Me.TBcdA.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TBcdA.Location = New System.Drawing.Point(119, 3)
         Me.TBcdA.Name = "TBcdA"
-        Me.TBcdA.Size = New System.Drawing.Size(84, 26)
+        Me.TBcdA.Size = New System.Drawing.Size(57, 20)
         Me.TBcdA.TabIndex = 0
         '
         'Label13
         '
         Me.Label13.AutoSize = true
-        Me.Label13.Location = New System.Drawing.Point(204, 9)
-        Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label13.Location = New System.Drawing.Point(136, 6)
         Me.Label13.Name = "Label13"
-        Me.Label13.Size = New System.Drawing.Size(59, 20)
+        Me.Label13.Size = New System.Drawing.Size(40, 13)
         Me.Label13.TabIndex = 6
         Me.Label13.Text = "Radius"
         '
         'TBrdyn
         '
-        Me.TBrdyn.Location = New System.Drawing.Point(278, 5)
-        Me.TBrdyn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TBrdyn.Location = New System.Drawing.Point(185, 3)
         Me.TBrdyn.Name = "TBrdyn"
-        Me.TBrdyn.Size = New System.Drawing.Size(84, 26)
+        Me.TBrdyn.Size = New System.Drawing.Size(57, 20)
         Me.TBrdyn.TabIndex = 0
         '
         '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(747, 888)
-        Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButOK.Location = New System.Drawing.Point(498, 577)
         Me.ButOK.Name = "ButOK"
-        Me.ButOK.Size = New System.Drawing.Size(112, 35)
+        Me.ButOK.Size = New System.Drawing.Size(75, 23)
         Me.ButOK.TabIndex = 6
         Me.ButOK.Text = "Save"
         Me.ButOK.UseVisualStyleBackColor = true
@@ -354,10 +345,9 @@ Partial Class VehicleForm
         '
         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(868, 888)
-        Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButCancel.Location = New System.Drawing.Point(579, 577)
         Me.ButCancel.Name = "ButCancel"
-        Me.ButCancel.Size = New System.Drawing.Size(112, 35)
+        Me.ButCancel.Size = New System.Drawing.Size(75, 23)
         Me.ButCancel.TabIndex = 7
         Me.ButCancel.Text = "Cancel"
         Me.ButCancel.UseVisualStyleBackColor = true
@@ -365,30 +355,27 @@ Partial Class VehicleForm
         'Label14
         '
         Me.Label14.AutoSize = true
-        Me.Label14.Location = New System.Drawing.Point(370, 34)
-        Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label14.Location = New System.Drawing.Point(247, 22)
         Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(34, 20)
+        Me.Label14.Size = New System.Drawing.Size(25, 13)
         Me.Label14.TabIndex = 24
         Me.Label14.Text = "[kg]"
         '
         'Label31
         '
         Me.Label31.AutoSize = true
-        Me.Label31.Location = New System.Drawing.Point(362, 48)
-        Me.Label31.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label31.Location = New System.Drawing.Point(241, 31)
         Me.Label31.Name = "Label31"
-        Me.Label31.Size = New System.Drawing.Size(34, 20)
+        Me.Label31.Size = New System.Drawing.Size(25, 13)
         Me.Label31.TabIndex = 24
         Me.Label31.Text = "[kg]"
         '
         'Label35
         '
         Me.Label35.AutoSize = true
-        Me.Label35.Location = New System.Drawing.Point(366, 9)
-        Me.Label35.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label35.Location = New System.Drawing.Point(244, 6)
         Me.Label35.Name = "Label35"
-        Me.Label35.Size = New System.Drawing.Size(43, 20)
+        Me.Label35.Size = New System.Drawing.Size(29, 13)
         Me.Label35.TabIndex = 24
         Me.Label35.Text = "[mm]"
         '
@@ -397,20 +384,18 @@ Partial Class VehicleForm
         Me.CbCdMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         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(9, 29)
-        Me.CbCdMode.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.CbCdMode.Location = New System.Drawing.Point(6, 19)
         Me.CbCdMode.Name = "CbCdMode"
-        Me.CbCdMode.Size = New System.Drawing.Size(398, 28)
+        Me.CbCdMode.Size = New System.Drawing.Size(267, 21)
         Me.CbCdMode.TabIndex = 0
         '
         'TbCdFile
         '
         Me.TbCdFile.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.TbCdFile.Enabled = false
-        Me.TbCdFile.Location = New System.Drawing.Point(14, 100)
-        Me.TbCdFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbCdFile.Location = New System.Drawing.Point(9, 65)
         Me.TbCdFile.Name = "TbCdFile"
-        Me.TbCdFile.Size = New System.Drawing.Size(313, 26)
+        Me.TbCdFile.Size = New System.Drawing.Size(210, 20)
         Me.TbCdFile.TabIndex = 1
         '
         'BtCdFileBrowse
@@ -418,10 +403,9 @@ Partial Class VehicleForm
         Me.BtCdFileBrowse.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.BtCdFileBrowse.Enabled = false
         Me.BtCdFileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.BtCdFileBrowse.Location = New System.Drawing.Point(338, 95)
-        Me.BtCdFileBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.BtCdFileBrowse.Location = New System.Drawing.Point(225, 62)
         Me.BtCdFileBrowse.Name = "BtCdFileBrowse"
-        Me.BtCdFileBrowse.Size = New System.Drawing.Size(36, 37)
+        Me.BtCdFileBrowse.Size = New System.Drawing.Size(24, 24)
         Me.BtCdFileBrowse.TabIndex = 2
         Me.BtCdFileBrowse.UseVisualStyleBackColor = true
         '
@@ -432,11 +416,9 @@ Partial Class VehicleForm
         Me.GroupBox6.Controls.Add(Me.CbCdMode)
         Me.GroupBox6.Controls.Add(Me.BtCdFileBrowse)
         Me.GroupBox6.Controls.Add(Me.TbCdFile)
-        Me.GroupBox6.Location = New System.Drawing.Point(435, 129)
-        Me.GroupBox6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox6.Location = New System.Drawing.Point(290, 84)
         Me.GroupBox6.Name = "GroupBox6"
-        Me.GroupBox6.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox6.Size = New System.Drawing.Size(422, 148)
+        Me.GroupBox6.Size = New System.Drawing.Size(281, 96)
         Me.GroupBox6.TabIndex = 3
         Me.GroupBox6.TabStop = false
         Me.GroupBox6.Text = "Cross Wind Correction"
@@ -446,20 +428,18 @@ Partial Class VehicleForm
         Me.BtCdFileOpen.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.BtCdFileOpen.Enabled = false
         Me.BtCdFileOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
-        Me.BtCdFileOpen.Location = New System.Drawing.Point(374, 95)
-        Me.BtCdFileOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.BtCdFileOpen.Location = New System.Drawing.Point(249, 62)
         Me.BtCdFileOpen.Name = "BtCdFileOpen"
-        Me.BtCdFileOpen.Size = New System.Drawing.Size(36, 37)
+        Me.BtCdFileOpen.Size = New System.Drawing.Size(24, 24)
         Me.BtCdFileOpen.TabIndex = 3
         Me.BtCdFileOpen.UseVisualStyleBackColor = true
         '
         'LbCdMode
         '
         Me.LbCdMode.AutoSize = true
-        Me.LbCdMode.Location = New System.Drawing.Point(9, 72)
-        Me.LbCdMode.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.LbCdMode.Location = New System.Drawing.Point(6, 47)
         Me.LbCdMode.Name = "LbCdMode"
-        Me.LbCdMode.Size = New System.Drawing.Size(87, 20)
+        Me.LbCdMode.Size = New System.Drawing.Size(59, 13)
         Me.LbCdMode.TabIndex = 28
         Me.LbCdMode.Text = "LbCdMode"
         Me.LbCdMode.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -471,8 +451,8 @@ Partial Class VehicleForm
         Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
         Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0)
-        Me.ToolStrip1.Size = New System.Drawing.Size(999, 38)
+        Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
+        Me.ToolStrip1.Size = New System.Drawing.Size(666, 31)
         Me.ToolStrip1.TabIndex = 29
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -482,7 +462,7 @@ Partial Class VehicleForm
         Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
         Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripBtNew.Name = "ToolStripBtNew"
-        Me.ToolStripBtNew.Size = New System.Drawing.Size(34, 33)
+        Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtNew.Text = "ToolStripButton1"
         Me.ToolStripBtNew.ToolTipText = "New"
         '
@@ -492,7 +472,7 @@ Partial Class VehicleForm
         Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
         Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
-        Me.ToolStripBtOpen.Size = New System.Drawing.Size(34, 33)
+        Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtOpen.Text = "ToolStripButton1"
         Me.ToolStripBtOpen.ToolTipText = "Open..."
         '
@@ -502,7 +482,7 @@ Partial Class VehicleForm
         Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
         Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripBtSave.Name = "ToolStripBtSave"
-        Me.ToolStripBtSave.Size = New System.Drawing.Size(34, 33)
+        Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtSave.Text = "ToolStripButton1"
         Me.ToolStripBtSave.ToolTipText = "Save"
         '
@@ -512,14 +492,14 @@ Partial Class VehicleForm
         Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
         Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
-        Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(34, 33)
+        Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
         Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
         '
         'ToolStripSeparator3
         '
         Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 38)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripBtSendTo
         '
@@ -527,14 +507,14 @@ Partial Class VehicleForm
         Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
         Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
-        Me.ToolStripBtSendTo.Size = New System.Drawing.Size(34, 33)
+        Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtSendTo.Text = "Send to Job Editor"
         Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor"
         '
         'ToolStripSeparator1
         '
         Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 38)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripButton1
         '
@@ -542,18 +522,16 @@ Partial Class VehicleForm
         Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
         Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(34, 33)
+        Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton1.Text = "Help"
         '
         'GroupBox7
         '
         Me.GroupBox7.Controls.Add(Me.PnRt)
         Me.GroupBox7.Controls.Add(Me.CbRtType)
-        Me.GroupBox7.Location = New System.Drawing.Point(9, 117)
-        Me.GroupBox7.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox7.Location = New System.Drawing.Point(6, 76)
         Me.GroupBox7.Name = "GroupBox7"
-        Me.GroupBox7.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox7.Size = New System.Drawing.Size(418, 171)
+        Me.GroupBox7.Size = New System.Drawing.Size(279, 111)
         Me.GroupBox7.TabIndex = 1
         Me.GroupBox7.TabStop = false
         Me.GroupBox7.Text = "Retarder Losses"
@@ -566,18 +544,16 @@ Partial Class VehicleForm
         Me.PnRt.Controls.Add(Me.Label45)
         Me.PnRt.Controls.Add(Me.LbRtRatio)
         Me.PnRt.Controls.Add(Me.TbRtRatio)
-        Me.PnRt.Location = New System.Drawing.Point(4, 65)
-        Me.PnRt.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PnRt.Location = New System.Drawing.Point(3, 42)
         Me.PnRt.Name = "PnRt"
-        Me.PnRt.Size = New System.Drawing.Size(402, 97)
+        Me.PnRt.Size = New System.Drawing.Size(268, 63)
         Me.PnRt.TabIndex = 1
         '
         'Label15
         '
-        Me.Label15.Location = New System.Drawing.Point(9, 35)
-        Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label15.Location = New System.Drawing.Point(6, 23)
         Me.Label15.Name = "Label15"
-        Me.Label15.Size = New System.Drawing.Size(302, 25)
+        Me.Label15.Size = New System.Drawing.Size(201, 16)
         Me.Label15.TabIndex = 15
         Me.Label15.Text = "Retarder Loss Map"
         Me.Label15.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -586,39 +562,35 @@ Partial Class VehicleForm
         '
         Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
         Me.BtRtBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.BtRtBrowse.Location = New System.Drawing.Point(354, 60)
-        Me.BtRtBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.BtRtBrowse.Location = New System.Drawing.Point(236, 39)
         Me.BtRtBrowse.Name = "BtRtBrowse"
-        Me.BtRtBrowse.Size = New System.Drawing.Size(36, 37)
+        Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24)
         Me.BtRtBrowse.TabIndex = 2
         Me.BtRtBrowse.UseVisualStyleBackColor = true
         '
         'TbRtPath
         '
         Me.TbRtPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
-        Me.TbRtPath.Location = New System.Drawing.Point(9, 63)
-        Me.TbRtPath.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbRtPath.Location = New System.Drawing.Point(6, 41)
         Me.TbRtPath.Name = "TbRtPath"
-        Me.TbRtPath.Size = New System.Drawing.Size(334, 26)
+        Me.TbRtPath.Size = New System.Drawing.Size(224, 20)
         Me.TbRtPath.TabIndex = 1
         '
         '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.Location = New System.Drawing.Point(348, 8)
-        Me.Label45.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label45.Location = New System.Drawing.Point(232, 5)
         Me.Label45.Name = "Label45"
-        Me.Label45.Size = New System.Drawing.Size(22, 20)
+        Me.Label45.Size = New System.Drawing.Size(16, 13)
         Me.Label45.TabIndex = 10
         Me.Label45.Text = "[-]"
         '
         'LbRtRatio
         '
-        Me.LbRtRatio.Location = New System.Drawing.Point(6, 8)
-        Me.LbRtRatio.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.LbRtRatio.Location = New System.Drawing.Point(4, 5)
         Me.LbRtRatio.Name = "LbRtRatio"
-        Me.LbRtRatio.Size = New System.Drawing.Size(250, 26)
+        Me.LbRtRatio.Size = New System.Drawing.Size(167, 17)
         Me.LbRtRatio.TabIndex = 1
         Me.LbRtRatio.Text = "Ratio"
         Me.LbRtRatio.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -626,10 +598,9 @@ 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.Location = New System.Drawing.Point(261, 5)
-        Me.TbRtRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbRtRatio.Location = New System.Drawing.Point(174, 3)
         Me.TbRtRatio.Name = "TbRtRatio"
-        Me.TbRtRatio.Size = New System.Drawing.Size(82, 26)
+        Me.TbRtRatio.Size = New System.Drawing.Size(56, 20)
         Me.TbRtRatio.TabIndex = 0
         '
         'CbRtType
@@ -637,38 +608,34 @@ Partial Class VehicleForm
         Me.CbRtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.CbRtType.FormattingEnabled = true
         Me.CbRtType.Items.AddRange(New Object() {"Included in Transmission Loss Maps", "Primary Retarder", "Secondary Retarder"})
-        Me.CbRtType.Location = New System.Drawing.Point(9, 29)
-        Me.CbRtType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.CbRtType.Location = New System.Drawing.Point(6, 19)
         Me.CbRtType.Name = "CbRtType"
-        Me.CbRtType.Size = New System.Drawing.Size(397, 28)
+        Me.CbRtType.Size = New System.Drawing.Size(266, 21)
         Me.CbRtType.TabIndex = 0
         '
         'Label46
         '
         Me.Label46.AutoSize = true
-        Me.Label46.Location = New System.Drawing.Point(48, 8)
-        Me.Label46.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label46.Location = New System.Drawing.Point(32, 5)
         Me.Label46.Name = "Label46"
-        Me.Label46.Size = New System.Drawing.Size(213, 20)
+        Me.Label46.Size = New System.Drawing.Size(145, 13)
         Me.Label46.TabIndex = 31
         Me.Label46.Text = "Curb Mass Extra Trailer/Body"
         '
         'Label50
         '
         Me.Label50.AutoSize = true
-        Me.Label50.Location = New System.Drawing.Point(362, 8)
-        Me.Label50.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label50.Location = New System.Drawing.Point(241, 5)
         Me.Label50.Name = "Label50"
-        Me.Label50.Size = New System.Drawing.Size(34, 20)
+        Me.Label50.Size = New System.Drawing.Size(25, 13)
         Me.Label50.TabIndex = 24
         Me.Label50.Text = "[kg]"
         '
         'TbMassExtra
         '
-        Me.TbMassExtra.Location = New System.Drawing.Point(273, 3)
-        Me.TbMassExtra.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbMassExtra.Location = New System.Drawing.Point(182, 2)
         Me.TbMassExtra.Name = "TbMassExtra"
-        Me.TbMassExtra.Size = New System.Drawing.Size(84, 26)
+        Me.TbMassExtra.Size = New System.Drawing.Size(57, 20)
         Me.TbMassExtra.TabIndex = 0
         '
         'GroupBox8
@@ -677,11 +644,9 @@ Partial Class VehicleForm
         Me.GroupBox8.Controls.Add(Me.ButAxlRem)
         Me.GroupBox8.Controls.Add(Me.LvRRC)
         Me.GroupBox8.Controls.Add(Me.ButAxlAdd)
-        Me.GroupBox8.Location = New System.Drawing.Point(9, 286)
-        Me.GroupBox8.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox8.Location = New System.Drawing.Point(6, 186)
         Me.GroupBox8.Name = "GroupBox8"
-        Me.GroupBox8.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox8.Size = New System.Drawing.Size(846, 232)
+        Me.GroupBox8.Size = New System.Drawing.Size(564, 151)
         Me.GroupBox8.TabIndex = 4
         Me.GroupBox8.TabStop = false
         Me.GroupBox8.Text = "Axles / Wheels"
@@ -689,20 +654,18 @@ Partial Class VehicleForm
         'Label6
         '
         Me.Label6.AutoSize = true
-        Me.Label6.Location = New System.Drawing.Point(675, 186)
-        Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label6.Location = New System.Drawing.Point(450, 121)
         Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(158, 20)
+        Me.Label6.Size = New System.Drawing.Size(106, 13)
         Me.Label6.TabIndex = 3
         Me.Label6.Text = "(Double-Click to Edit)"
         '
         'ButAxlRem
         '
         Me.ButAxlRem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.ButAxlRem.Location = New System.Drawing.Point(44, 188)
-        Me.ButAxlRem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButAxlRem.Location = New System.Drawing.Point(29, 122)
         Me.ButAxlRem.Name = "ButAxlRem"
-        Me.ButAxlRem.Size = New System.Drawing.Size(36, 37)
+        Me.ButAxlRem.Size = New System.Drawing.Size(24, 24)
         Me.ButAxlRem.TabIndex = 2
         Me.ButAxlRem.UseVisualStyleBackColor = true
         '
@@ -714,11 +677,10 @@ Partial Class VehicleForm
         Me.LvRRC.FullRowSelect = true
         Me.LvRRC.GridLines = true
         Me.LvRRC.HideSelection = false
-        Me.LvRRC.Location = New System.Drawing.Point(9, 29)
-        Me.LvRRC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.LvRRC.Location = New System.Drawing.Point(6, 19)
         Me.LvRRC.MultiSelect = false
         Me.LvRRC.Name = "LvRRC"
-        Me.LvRRC.Size = New System.Drawing.Size(826, 155)
+        Me.LvRRC.Size = New System.Drawing.Size(552, 102)
         Me.LvRRC.TabIndex = 0
         Me.LvRRC.TabStop = false
         Me.LvRRC.UseCompatibleStateImageBehavior = false
@@ -766,10 +728,9 @@ Partial Class VehicleForm
         'ButAxlAdd
         '
         Me.ButAxlAdd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.ButAxlAdd.Location = New System.Drawing.Point(8, 188)
-        Me.ButAxlAdd.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButAxlAdd.Location = New System.Drawing.Point(5, 122)
         Me.ButAxlAdd.Name = "ButAxlAdd"
-        Me.ButAxlAdd.Size = New System.Drawing.Size(36, 37)
+        Me.ButAxlAdd.Size = New System.Drawing.Size(24, 24)
         Me.ButAxlAdd.TabIndex = 1
         Me.ButAxlAdd.UseVisualStyleBackColor = true
         '
@@ -779,10 +740,9 @@ Partial Class VehicleForm
         Me.PnWheelDiam.Controls.Add(Me.TBrdyn)
         Me.PnWheelDiam.Controls.Add(Me.Label35)
         Me.PnWheelDiam.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.PnWheelDiam.Location = New System.Drawing.Point(4, 24)
-        Me.PnWheelDiam.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PnWheelDiam.Location = New System.Drawing.Point(3, 16)
         Me.PnWheelDiam.Name = "PnWheelDiam"
-        Me.PnWheelDiam.Size = New System.Drawing.Size(409, 48)
+        Me.PnWheelDiam.Size = New System.Drawing.Size(272, 31)
         Me.PnWheelDiam.TabIndex = 0
         '
         'CbAxleConfig
@@ -790,10 +750,9 @@ Partial Class VehicleForm
         Me.CbAxleConfig.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         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(230, 123)
-        Me.CbAxleConfig.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.CbAxleConfig.Location = New System.Drawing.Point(153, 80)
         Me.CbAxleConfig.Name = "CbAxleConfig"
-        Me.CbAxleConfig.Size = New System.Drawing.Size(88, 28)
+        Me.CbAxleConfig.Size = New System.Drawing.Size(60, 21)
         Me.CbAxleConfig.TabIndex = 1
         '
         'CbCat
@@ -801,49 +760,44 @@ Partial Class VehicleForm
         Me.CbCat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         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(18, 123)
-        Me.CbCat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.CbCat.Location = New System.Drawing.Point(12, 80)
         Me.CbCat.Name = "CbCat"
-        Me.CbCat.Size = New System.Drawing.Size(200, 28)
+        Me.CbCat.Size = New System.Drawing.Size(135, 21)
         Me.CbCat.TabIndex = 0
         '
         'Label5
         '
         Me.Label5.AutoSize = true
-        Me.Label5.Location = New System.Drawing.Point(46, 166)
-        Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label5.Location = New System.Drawing.Point(31, 108)
         Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(170, 20)
+        Me.Label5.Size = New System.Drawing.Size(116, 13)
         Me.Label5.TabIndex = 2
         Me.Label5.Text = "Technically Permissible"
         '
         'Label9
         '
         Me.Label9.AutoSize = true
-        Me.Label9.Location = New System.Drawing.Point(296, 175)
-        Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label9.Location = New System.Drawing.Point(197, 114)
         Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(22, 20)
+        Me.Label9.Size = New System.Drawing.Size(16, 13)
         Me.Label9.TabIndex = 3
         Me.Label9.Text = "[t]"
         Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'TbMassMass
         '
-        Me.TbMassMass.Location = New System.Drawing.Point(230, 171)
-        Me.TbMassMass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbMassMass.Location = New System.Drawing.Point(153, 111)
         Me.TbMassMass.Name = "TbMassMass"
-        Me.TbMassMass.Size = New System.Drawing.Size(61, 26)
+        Me.TbMassMass.Size = New System.Drawing.Size(42, 20)
         Me.TbMassMass.TabIndex = 2
         '
         'StatusStrip1
         '
         Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 930)
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 603)
         Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
-        Me.StatusStrip1.Size = New System.Drawing.Size(999, 32)
+        Me.StatusStrip1.Size = New System.Drawing.Size(666, 22)
         Me.StatusStrip1.SizingGrip = false
         Me.StatusStrip1.TabIndex = 36
         Me.StatusStrip1.Text = "StatusStrip1"
@@ -851,16 +805,15 @@ Partial Class VehicleForm
         'LbStatus
         '
         Me.LbStatus.Name = "LbStatus"
-        Me.LbStatus.Size = New System.Drawing.Size(60, 25)
+        Me.LbStatus.Size = New System.Drawing.Size(39, 17)
         Me.LbStatus.Text = "Status"
         '
         'TbHDVclass
         '
-        Me.TbHDVclass.Location = New System.Drawing.Point(230, 217)
-        Me.TbHDVclass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbHDVclass.Location = New System.Drawing.Point(153, 141)
         Me.TbHDVclass.Name = "TbHDVclass"
         Me.TbHDVclass.ReadOnly = true
-        Me.TbHDVclass.Size = New System.Drawing.Size(61, 26)
+        Me.TbHDVclass.Size = New System.Drawing.Size(42, 20)
         Me.TbHDVclass.TabIndex = 3
         Me.TbHDVclass.TabStop = false
         Me.TbHDVclass.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
@@ -871,11 +824,9 @@ Partial Class VehicleForm
         Me.GroupBox1.Controls.Add(Me.TbMass)
         Me.GroupBox1.Controls.Add(Me.Label1)
         Me.GroupBox1.Controls.Add(Me.Label14)
-        Me.GroupBox1.Location = New System.Drawing.Point(9, 9)
-        Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox1.Location = New System.Drawing.Point(6, 6)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox1.Size = New System.Drawing.Size(417, 182)
+        Me.GroupBox1.Size = New System.Drawing.Size(278, 118)
         Me.GroupBox1.TabIndex = 0
         Me.GroupBox1.TabStop = false
         Me.GroupBox1.Text = "Masses / Loading"
@@ -888,20 +839,17 @@ Partial Class VehicleForm
         Me.PnLoad.Controls.Add(Me.TbMassExtra)
         Me.PnLoad.Controls.Add(Me.Label50)
         Me.PnLoad.Controls.Add(Me.Label46)
-        Me.PnLoad.Location = New System.Drawing.Point(9, 66)
-        Me.PnLoad.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PnLoad.Location = New System.Drawing.Point(6, 43)
         Me.PnLoad.Name = "PnLoad"
-        Me.PnLoad.Size = New System.Drawing.Size(404, 89)
+        Me.PnLoad.Size = New System.Drawing.Size(269, 58)
         Me.PnLoad.TabIndex = 1
         '
         'GrAirRes
         '
         Me.GrAirRes.Controls.Add(Me.PnCdATrTr)
-        Me.GrAirRes.Location = New System.Drawing.Point(435, 9)
-        Me.GrAirRes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GrAirRes.Location = New System.Drawing.Point(290, 6)
         Me.GrAirRes.Name = "GrAirRes"
-        Me.GrAirRes.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GrAirRes.Size = New System.Drawing.Size(420, 111)
+        Me.GrAirRes.Size = New System.Drawing.Size(280, 72)
         Me.GrAirRes.TabIndex = 2
         Me.GrAirRes.TabStop = false
         Me.GrAirRes.Text = "Air Resistance"
@@ -915,58 +863,52 @@ Partial Class VehicleForm
         Me.PnCdATrTr.Controls.Add(Me.Label38)
         Me.PnCdATrTr.Controls.Add(Me.Label3)
         Me.PnCdATrTr.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.PnCdATrTr.Location = New System.Drawing.Point(4, 24)
-        Me.PnCdATrTr.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PnCdATrTr.Location = New System.Drawing.Point(3, 16)
         Me.PnCdATrTr.Name = "PnCdATrTr"
-        Me.PnCdATrTr.Size = New System.Drawing.Size(412, 82)
+        Me.PnCdATrTr.Size = New System.Drawing.Size(274, 53)
         Me.PnCdATrTr.TabIndex = 0
         '
         'tbVehicleHeight
         '
-        Me.tbVehicleHeight.Location = New System.Drawing.Point(178, 45)
-        Me.tbVehicleHeight.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbVehicleHeight.Location = New System.Drawing.Point(119, 29)
         Me.tbVehicleHeight.Name = "tbVehicleHeight"
-        Me.tbVehicleHeight.Size = New System.Drawing.Size(84, 26)
+        Me.tbVehicleHeight.Size = New System.Drawing.Size(57, 20)
         Me.tbVehicleHeight.TabIndex = 1
         '
         'Label11
         '
         Me.Label11.AutoSize = true
-        Me.Label11.Location = New System.Drawing.Point(273, 49)
-        Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label11.Location = New System.Drawing.Point(182, 32)
         Me.Label11.Name = "Label11"
-        Me.Label11.Size = New System.Drawing.Size(30, 20)
+        Me.Label11.Size = New System.Drawing.Size(21, 13)
         Me.Label11.TabIndex = 27
         Me.Label11.Text = "[m]"
         '
         'Label20
         '
         Me.Label20.AutoSize = true
-        Me.Label20.Location = New System.Drawing.Point(112, 49)
-        Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label20.Location = New System.Drawing.Point(75, 32)
         Me.Label20.Name = "Label20"
-        Me.Label20.Size = New System.Drawing.Size(56, 20)
+        Me.Label20.Size = New System.Drawing.Size(38, 13)
         Me.Label20.TabIndex = 26
         Me.Label20.Text = "Height"
         '
         'Label38
         '
         Me.Label38.AutoSize = true
-        Me.Label38.Location = New System.Drawing.Point(273, 9)
-        Me.Label38.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label38.Location = New System.Drawing.Point(182, 6)
         Me.Label38.Name = "Label38"
-        Me.Label38.Size = New System.Drawing.Size(35, 20)
+        Me.Label38.Size = New System.Drawing.Size(24, 13)
         Me.Label38.TabIndex = 24
         Me.Label38.Text = "[m²]"
         '
         'PictureBox1
         '
         Me.PictureBox1.BackColor = System.Drawing.Color.White
-        Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_VEH
-        Me.PictureBox1.Location = New System.Drawing.Point(0, 43)
-        Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
+        Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
         Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(906, 62)
+        Me.PictureBox1.Size = New System.Drawing.Size(666, 40)
         Me.PictureBox1.TabIndex = 37
         Me.PictureBox1.TabStop = false
         '
@@ -976,28 +918,26 @@ Partial Class VehicleForm
         Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
         Me.CmOpenFile.Name = "CmOpenFile"
         Me.CmOpenFile.ShowImageMargin = false
-        Me.CmOpenFile.Size = New System.Drawing.Size(178, 68)
+        Me.CmOpenFile.Size = New System.Drawing.Size(128, 48)
         '
         'OpenWithToolStripMenuItem
         '
         Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
-        Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(177, 32)
+        Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
         Me.OpenWithToolStripMenuItem.Text = "Open with ..."
         '
         'ShowInFolderToolStripMenuItem
         '
         Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
-        Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(177, 32)
+        Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
         Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
         '
         'GroupBox3
         '
         Me.GroupBox3.Controls.Add(Me.PnWheelDiam)
-        Me.GroupBox3.Location = New System.Drawing.Point(9, 200)
-        Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox3.Location = New System.Drawing.Point(6, 130)
         Me.GroupBox3.Name = "GroupBox3"
-        Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox3.Size = New System.Drawing.Size(417, 77)
+        Me.GroupBox3.Size = New System.Drawing.Size(278, 50)
         Me.GroupBox3.TabIndex = 1
         Me.GroupBox3.TabStop = false
         Me.GroupBox3.Text = "Dynamic Tyre Radius"
@@ -1006,11 +946,9 @@ Partial Class VehicleForm
         '
         Me.GroupBox2.Controls.Add(Me.pnAngledriveFields)
         Me.GroupBox2.Controls.Add(Me.cbAngledriveType)
-        Me.GroupBox2.Location = New System.Drawing.Point(436, 117)
-        Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox2.Location = New System.Drawing.Point(291, 76)
         Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox2.Size = New System.Drawing.Size(423, 171)
+        Me.GroupBox2.Size = New System.Drawing.Size(282, 111)
         Me.GroupBox2.TabIndex = 3
         Me.GroupBox2.TabStop = false
         Me.GroupBox2.Text = "Angledrive"
@@ -1023,39 +961,35 @@ Partial Class VehicleForm
         Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveRatio)
         Me.pnAngledriveFields.Controls.Add(Me.btAngledriveLossMapBrowse)
         Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveLossMapPath)
-        Me.pnAngledriveFields.Location = New System.Drawing.Point(4, 65)
-        Me.pnAngledriveFields.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnAngledriveFields.Location = New System.Drawing.Point(3, 42)
         Me.pnAngledriveFields.Name = "pnAngledriveFields"
-        Me.pnAngledriveFields.Size = New System.Drawing.Size(408, 97)
+        Me.pnAngledriveFields.Size = New System.Drawing.Size(272, 63)
         Me.pnAngledriveFields.TabIndex = 1
         '
         '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.Location = New System.Drawing.Point(369, 9)
-        Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label4.Location = New System.Drawing.Point(246, 6)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(22, 20)
+        Me.Label4.Size = New System.Drawing.Size(16, 13)
         Me.Label4.TabIndex = 16
         Me.Label4.Text = "[-]"
         '
         'Label12
         '
-        Me.Label12.Location = New System.Drawing.Point(9, 35)
-        Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label12.Location = New System.Drawing.Point(6, 23)
         Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(394, 25)
+        Me.Label12.Size = New System.Drawing.Size(263, 16)
         Me.Label12.TabIndex = 17
         Me.Label12.Text = "Transmission Loss Map or Efficiency Value [0..1]"
         Me.Label12.TextAlign = System.Drawing.ContentAlignment.BottomLeft
         '
         'Label10
         '
-        Me.Label10.Location = New System.Drawing.Point(208, 9)
-        Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label10.Location = New System.Drawing.Point(139, 6)
         Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(66, 28)
+        Me.Label10.Size = New System.Drawing.Size(44, 18)
         Me.Label10.TabIndex = 15
         Me.Label10.Text = "Ratio"
         Me.Label10.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -1063,50 +997,45 @@ 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.Location = New System.Drawing.Point(282, 6)
-        Me.tbAngledriveRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbAngledriveRatio.Location = New System.Drawing.Point(188, 4)
         Me.tbAngledriveRatio.Name = "tbAngledriveRatio"
-        Me.tbAngledriveRatio.Size = New System.Drawing.Size(82, 26)
+        Me.tbAngledriveRatio.Size = New System.Drawing.Size(56, 20)
         Me.tbAngledriveRatio.TabIndex = 0
         '
         'btAngledriveLossMapBrowse
         '
         Me.btAngledriveLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
         Me.btAngledriveLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(368, 60)
-        Me.btAngledriveLossMapBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(245, 39)
         Me.btAngledriveLossMapBrowse.Name = "btAngledriveLossMapBrowse"
-        Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(36, 37)
+        Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(24, 24)
         Me.btAngledriveLossMapBrowse.TabIndex = 2
         Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = true
         '
         'tbAngledriveLossMapPath
         '
         Me.tbAngledriveLossMapPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
-        Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(9, 63)
-        Me.tbAngledriveLossMapPath.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(6, 41)
         Me.tbAngledriveLossMapPath.Name = "tbAngledriveLossMapPath"
-        Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(356, 26)
+        Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(239, 20)
         Me.tbAngledriveLossMapPath.TabIndex = 1
         '
         'cbAngledriveType
         '
         Me.cbAngledriveType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.cbAngledriveType.FormattingEnabled = true
-        Me.cbAngledriveType.Location = New System.Drawing.Point(9, 29)
-        Me.cbAngledriveType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbAngledriveType.Location = New System.Drawing.Point(6, 19)
         Me.cbAngledriveType.Name = "cbAngledriveType"
-        Me.cbAngledriveType.Size = New System.Drawing.Size(397, 28)
+        Me.cbAngledriveType.Size = New System.Drawing.Size(266, 21)
         Me.cbAngledriveType.TabIndex = 0
         '
         'PicVehicle
         '
         Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
         Me.PicVehicle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.PicVehicle.Location = New System.Drawing.Point(422, 108)
-        Me.PicVehicle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PicVehicle.Location = New System.Drawing.Point(281, 70)
         Me.PicVehicle.Name = "PicVehicle"
-        Me.PicVehicle.Size = New System.Drawing.Size(449, 134)
+        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
@@ -1114,47 +1043,42 @@ Partial Class VehicleForm
         'Label8
         '
         Me.Label8.AutoSize = true
-        Me.Label8.Location = New System.Drawing.Point(128, 222)
-        Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label8.Location = New System.Drawing.Point(85, 144)
         Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(93, 20)
+        Me.Label8.Size = New System.Drawing.Size(62, 13)
         Me.Label8.TabIndex = 10
         Me.Label8.Text = "HDV Group"
         '
         'cbPTOType
         '
         Me.cbPTOType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cbPTOType.Location = New System.Drawing.Point(9, 26)
-        Me.cbPTOType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbPTOType.Location = New System.Drawing.Point(6, 17)
         Me.cbPTOType.Name = "cbPTOType"
-        Me.cbPTOType.Size = New System.Drawing.Size(823, 28)
+        Me.cbPTOType.Size = New System.Drawing.Size(550, 21)
         Me.cbPTOType.TabIndex = 0
         Me.ToolTip1.SetToolTip(Me.cbPTOType, "Transmission type to the PTO consumer")
         '
         'tbPTOCycle
         '
-        Me.tbPTOCycle.Location = New System.Drawing.Point(9, 109)
-        Me.tbPTOCycle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPTOCycle.Location = New System.Drawing.Point(6, 71)
         Me.tbPTOCycle.Name = "tbPTOCycle"
-        Me.tbPTOCycle.Size = New System.Drawing.Size(356, 26)
+        Me.tbPTOCycle.Size = New System.Drawing.Size(239, 20)
         Me.tbPTOCycle.TabIndex = 2
         Me.ToolTip1.SetToolTip(Me.tbPTOCycle, "PTO Consumer Loss Map")
         '
         'tbPTOLossMap
         '
-        Me.tbPTOLossMap.Location = New System.Drawing.Point(9, 37)
-        Me.tbPTOLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPTOLossMap.Location = New System.Drawing.Point(6, 24)
         Me.tbPTOLossMap.Name = "tbPTOLossMap"
-        Me.tbPTOLossMap.Size = New System.Drawing.Size(356, 26)
+        Me.tbPTOLossMap.Size = New System.Drawing.Size(239, 20)
         Me.tbPTOLossMap.TabIndex = 0
         Me.ToolTip1.SetToolTip(Me.tbPTOLossMap, "PTO Consumer Loss Map")
         '
         'tbPTODrive
         '
-        Me.tbPTODrive.Location = New System.Drawing.Point(9, 282)
-        Me.tbPTODrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPTODrive.Location = New System.Drawing.Point(6, 183)
         Me.tbPTODrive.Name = "tbPTODrive"
-        Me.tbPTODrive.Size = New System.Drawing.Size(356, 26)
+        Me.tbPTODrive.Size = New System.Drawing.Size(239, 20)
         Me.tbPTODrive.TabIndex = 5
         Me.ToolTip1.SetToolTip(Me.tbPTODrive, "PTO Consumer Loss Map")
         '
@@ -1167,11 +1091,10 @@ Partial Class VehicleForm
         Me.tcVehicleComponents.Controls.Add(Me.tpTorqueLimits)
         Me.tcVehicleComponents.Controls.Add(Me.tpADAS)
         Me.tcVehicleComponents.Controls.Add(Me.tpRoadSweeper)
-        Me.tcVehicleComponents.Location = New System.Drawing.Point(8, 266)
-        Me.tcVehicleComponents.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tcVehicleComponents.Location = New System.Drawing.Point(5, 173)
         Me.tcVehicleComponents.Name = "tcVehicleComponents"
         Me.tcVehicleComponents.SelectedIndex = 0
-        Me.tcVehicleComponents.Size = New System.Drawing.Size(984, 615)
+        Me.tcVehicleComponents.Size = New System.Drawing.Size(656, 400)
         Me.tcVehicleComponents.TabIndex = 5
         '
         'tpGeneral
@@ -1181,11 +1104,10 @@ Partial Class VehicleForm
         Me.tpGeneral.Controls.Add(Me.GroupBox6)
         Me.tpGeneral.Controls.Add(Me.GroupBox8)
         Me.tpGeneral.Controls.Add(Me.GrAirRes)
-        Me.tpGeneral.Location = New System.Drawing.Point(4, 29)
-        Me.tpGeneral.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tpGeneral.Location = New System.Drawing.Point(4, 22)
         Me.tpGeneral.Name = "tpGeneral"
-        Me.tpGeneral.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tpGeneral.Size = New System.Drawing.Size(976, 582)
+        Me.tpGeneral.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.tpGeneral.Size = New System.Drawing.Size(648, 374)
         Me.tpGeneral.TabIndex = 0
         Me.tpGeneral.Text = "General"
         Me.tpGeneral.UseVisualStyleBackColor = true
@@ -1196,11 +1118,10 @@ Partial Class VehicleForm
         Me.tpPowertrain.Controls.Add(Me.GroupBox9)
         Me.tpPowertrain.Controls.Add(Me.GroupBox7)
         Me.tpPowertrain.Controls.Add(Me.GroupBox2)
-        Me.tpPowertrain.Location = New System.Drawing.Point(4, 29)
-        Me.tpPowertrain.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tpPowertrain.Location = New System.Drawing.Point(4, 22)
         Me.tpPowertrain.Name = "tpPowertrain"
-        Me.tpPowertrain.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tpPowertrain.Size = New System.Drawing.Size(976, 579)
+        Me.tpPowertrain.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.tpPowertrain.Size = New System.Drawing.Size(648, 374)
         Me.tpPowertrain.TabIndex = 1
         Me.tpPowertrain.Text = "Powertrain"
         Me.tpPowertrain.UseVisualStyleBackColor = true
@@ -1208,11 +1129,9 @@ Partial Class VehicleForm
         'GroupBox4
         '
         Me.GroupBox4.Controls.Add(Me.Panel1)
-        Me.GroupBox4.Location = New System.Drawing.Point(9, 11)
-        Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox4.Location = New System.Drawing.Point(6, 7)
         Me.GroupBox4.Name = "GroupBox4"
-        Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox4.Size = New System.Drawing.Size(418, 97)
+        Me.GroupBox4.Size = New System.Drawing.Size(279, 63)
         Me.GroupBox4.TabIndex = 0
         Me.GroupBox4.TabStop = false
         Me.GroupBox4.Text = "Vehicle Idling Speed"
@@ -1223,37 +1142,33 @@ Partial Class VehicleForm
         Me.Panel1.Controls.Add(Me.Label18)
         Me.Panel1.Controls.Add(Me.Label19)
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Panel1.Location = New System.Drawing.Point(4, 24)
-        Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.Panel1.Location = New System.Drawing.Point(3, 16)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(410, 68)
+        Me.Panel1.Size = New System.Drawing.Size(273, 44)
         Me.Panel1.TabIndex = 0
         '
         'tbVehIdlingSpeed
         '
-        Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(260, 5)
-        Me.tbVehIdlingSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(173, 3)
         Me.tbVehIdlingSpeed.Name = "tbVehIdlingSpeed"
-        Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(84, 26)
+        Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(57, 20)
         Me.tbVehIdlingSpeed.TabIndex = 0
         '
         'Label18
         '
         Me.Label18.AutoSize = true
-        Me.Label18.Location = New System.Drawing.Point(350, 9)
-        Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label18.Location = New System.Drawing.Point(233, 6)
         Me.Label18.Name = "Label18"
-        Me.Label18.Size = New System.Drawing.Size(44, 20)
+        Me.Label18.Size = New System.Drawing.Size(30, 13)
         Me.Label18.TabIndex = 24
         Me.Label18.Text = "[rpm]"
         '
         'Label19
         '
         Me.Label19.AutoSize = true
-        Me.Label19.Location = New System.Drawing.Point(110, 9)
-        Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label19.Location = New System.Drawing.Point(73, 6)
         Me.Label19.Name = "Label19"
-        Me.Label19.Size = New System.Drawing.Size(140, 20)
+        Me.Label19.Size = New System.Drawing.Size(94, 13)
         Me.Label19.TabIndex = 8
         Me.Label19.Text = "Engine Idle Speed"
         '
@@ -1261,11 +1176,9 @@ Partial Class VehicleForm
         '
         Me.GroupBox9.Controls.Add(Me.cbTankSystem)
         Me.GroupBox9.Controls.Add(Me.Label23)
-        Me.GroupBox9.Location = New System.Drawing.Point(459, 11)
-        Me.GroupBox9.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox9.Location = New System.Drawing.Point(306, 7)
         Me.GroupBox9.Name = "GroupBox9"
-        Me.GroupBox9.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox9.Size = New System.Drawing.Size(396, 97)
+        Me.GroupBox9.Size = New System.Drawing.Size(264, 63)
         Me.GroupBox9.TabIndex = 2
         Me.GroupBox9.TabStop = false
         Me.GroupBox9.Text = "Tank System"
@@ -1273,20 +1186,18 @@ Partial Class VehicleForm
         'cbTankSystem
         '
         Me.cbTankSystem.FormattingEnabled = true
-        Me.cbTankSystem.Location = New System.Drawing.Point(14, 51)
-        Me.cbTankSystem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbTankSystem.Location = New System.Drawing.Point(9, 33)
         Me.cbTankSystem.Name = "cbTankSystem"
-        Me.cbTankSystem.Size = New System.Drawing.Size(368, 28)
+        Me.cbTankSystem.Size = New System.Drawing.Size(247, 21)
         Me.cbTankSystem.TabIndex = 1
         '
         '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.Location = New System.Drawing.Point(9, 25)
-        Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label23.Location = New System.Drawing.Point(6, 16)
         Me.Label23.Name = "Label23"
-        Me.Label23.Size = New System.Drawing.Size(277, 20)
+        Me.Label23.Size = New System.Drawing.Size(187, 13)
         Me.Label23.TabIndex = 0
         Me.Label23.Text = "Only applicable for NG engines!"
         '
@@ -1294,11 +1205,10 @@ Partial Class VehicleForm
         '
         Me.tpElectricComponents.Controls.Add(Me.gbBattery)
         Me.tpElectricComponents.Controls.Add(Me.gpElectricMotor)
-        Me.tpElectricComponents.Location = New System.Drawing.Point(4, 29)
-        Me.tpElectricComponents.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tpElectricComponents.Location = New System.Drawing.Point(4, 22)
         Me.tpElectricComponents.Name = "tpElectricComponents"
-        Me.tpElectricComponents.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tpElectricComponents.Size = New System.Drawing.Size(976, 582)
+        Me.tpElectricComponents.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.tpElectricComponents.Size = New System.Drawing.Size(648, 374)
         Me.tpElectricComponents.TabIndex = 4
         Me.tpElectricComponents.Text = "Electric Powertrain Components"
         Me.tpElectricComponents.UseVisualStyleBackColor = true
@@ -1312,11 +1222,9 @@ Partial Class VehicleForm
         Me.gbBattery.Controls.Add(Me.lblInitialSoCUnit)
         Me.gbBattery.Controls.Add(Me.tbInitialSoC)
         Me.gbBattery.Controls.Add(Me.lblInitialSoC)
-        Me.gbBattery.Location = New System.Drawing.Point(9, 269)
-        Me.gbBattery.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbBattery.Location = New System.Drawing.Point(6, 175)
         Me.gbBattery.Name = "gbBattery"
-        Me.gbBattery.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbBattery.Size = New System.Drawing.Size(950, 288)
+        Me.gbBattery.Size = New System.Drawing.Size(633, 187)
         Me.gbBattery.TabIndex = 2
         Me.gbBattery.TabStop = false
         Me.gbBattery.Text = "Electric Energy Storage system"
@@ -1329,11 +1237,10 @@ Partial Class VehicleForm
         Me.lvREESSPacks.FullRowSelect = true
         Me.lvREESSPacks.GridLines = true
         Me.lvREESSPacks.HideSelection = false
-        Me.lvREESSPacks.Location = New System.Drawing.Point(9, 69)
-        Me.lvREESSPacks.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.lvREESSPacks.Location = New System.Drawing.Point(6, 45)
         Me.lvREESSPacks.MultiSelect = false
         Me.lvREESSPacks.Name = "lvREESSPacks"
-        Me.lvREESSPacks.Size = New System.Drawing.Size(828, 155)
+        Me.lvREESSPacks.Size = New System.Drawing.Size(553, 102)
         Me.lvREESSPacks.TabIndex = 31
         Me.lvREESSPacks.TabStop = false
         Me.lvREESSPacks.UseCompatibleStateImageBehavior = false
@@ -1357,59 +1264,53 @@ Partial Class VehicleForm
         'btnAddReessPack
         '
         Me.btnAddReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.btnAddReessPack.Location = New System.Drawing.Point(9, 235)
-        Me.btnAddReessPack.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnAddReessPack.Location = New System.Drawing.Point(6, 153)
         Me.btnAddReessPack.Name = "btnAddReessPack"
-        Me.btnAddReessPack.Size = New System.Drawing.Size(36, 37)
+        Me.btnAddReessPack.Size = New System.Drawing.Size(24, 24)
         Me.btnAddReessPack.TabIndex = 1
         Me.btnAddReessPack.UseVisualStyleBackColor = true
         '
         'lblEditReessPack
         '
         Me.lblEditReessPack.AutoSize = true
-        Me.lblEditReessPack.Location = New System.Drawing.Point(676, 245)
-        Me.lblEditReessPack.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblEditReessPack.Location = New System.Drawing.Point(451, 159)
         Me.lblEditReessPack.Name = "lblEditReessPack"
-        Me.lblEditReessPack.Size = New System.Drawing.Size(158, 20)
+        Me.lblEditReessPack.Size = New System.Drawing.Size(106, 13)
         Me.lblEditReessPack.TabIndex = 30
         Me.lblEditReessPack.Text = "(Double-Click to Edit)"
         '
         'btnRemoveReessPack
         '
         Me.btnRemoveReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.btnRemoveReessPack.Location = New System.Drawing.Point(50, 235)
-        Me.btnRemoveReessPack.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnRemoveReessPack.Location = New System.Drawing.Point(33, 153)
         Me.btnRemoveReessPack.Name = "btnRemoveReessPack"
-        Me.btnRemoveReessPack.Size = New System.Drawing.Size(36, 37)
+        Me.btnRemoveReessPack.Size = New System.Drawing.Size(24, 24)
         Me.btnRemoveReessPack.TabIndex = 2
         Me.btnRemoveReessPack.UseVisualStyleBackColor = true
         '
         'lblInitialSoCUnit
         '
         Me.lblInitialSoCUnit.AutoSize = true
-        Me.lblInitialSoCUnit.Location = New System.Drawing.Point(404, 34)
-        Me.lblInitialSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblInitialSoCUnit.Location = New System.Drawing.Point(269, 22)
         Me.lblInitialSoCUnit.Name = "lblInitialSoCUnit"
-        Me.lblInitialSoCUnit.Size = New System.Drawing.Size(31, 20)
+        Me.lblInitialSoCUnit.Size = New System.Drawing.Size(21, 13)
         Me.lblInitialSoCUnit.TabIndex = 27
         Me.lblInitialSoCUnit.Text = "[%]"
         '
         'tbInitialSoC
         '
-        Me.tbInitialSoC.Location = New System.Drawing.Point(306, 29)
-        Me.tbInitialSoC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbInitialSoC.Location = New System.Drawing.Point(204, 19)
         Me.tbInitialSoC.Name = "tbInitialSoC"
-        Me.tbInitialSoC.Size = New System.Drawing.Size(86, 26)
+        Me.tbInitialSoC.Size = New System.Drawing.Size(59, 20)
         Me.tbInitialSoC.TabIndex = 0
         '
         'lblInitialSoC
         '
         Me.lblInitialSoC.AutoSize = true
-        Me.lblInitialSoC.Location = New System.Drawing.Point(10, 34)
-        Me.lblInitialSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblInitialSoC.Location = New System.Drawing.Point(7, 22)
         Me.lblInitialSoC.Name = "lblInitialSoC"
         Me.lblInitialSoC.RightToLeft = System.Windows.Forms.RightToLeft.Yes
-        Me.lblInitialSoC.Size = New System.Drawing.Size(81, 20)
+        Me.lblInitialSoC.Size = New System.Drawing.Size(54, 13)
         Me.lblInitialSoC.TabIndex = 25
         Me.lblInitialSoC.Text = "Initial SoC"
         '
@@ -1426,11 +1327,9 @@ Partial Class VehicleForm
         Me.gpElectricMotor.Controls.Add(Me.lblEmCount)
         Me.gpElectricMotor.Controls.Add(Me.lblEmPosition)
         Me.gpElectricMotor.Controls.Add(Me.pnElectricMotor)
-        Me.gpElectricMotor.Location = New System.Drawing.Point(9, 9)
-        Me.gpElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gpElectricMotor.Location = New System.Drawing.Point(6, 6)
         Me.gpElectricMotor.Name = "gpElectricMotor"
-        Me.gpElectricMotor.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gpElectricMotor.Size = New System.Drawing.Size(950, 251)
+        Me.gpElectricMotor.Size = New System.Drawing.Size(633, 163)
         Me.gpElectricMotor.TabIndex = 0
         Me.gpElectricMotor.TabStop = false
         Me.gpElectricMotor.Text = "Electric Machine"
@@ -1441,11 +1340,9 @@ Partial Class VehicleForm
         Me.gbRatiosPerGear.Controls.Add(Me.btnAddEMRatio)
         Me.gbRatiosPerGear.Controls.Add(Me.Label29)
         Me.gbRatiosPerGear.Controls.Add(Me.btnRemoveEMRatio)
-        Me.gbRatiosPerGear.Location = New System.Drawing.Point(666, 18)
-        Me.gbRatiosPerGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbRatiosPerGear.Location = New System.Drawing.Point(444, 12)
         Me.gbRatiosPerGear.Name = "gbRatiosPerGear"
-        Me.gbRatiosPerGear.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbRatiosPerGear.Size = New System.Drawing.Size(272, 223)
+        Me.gbRatiosPerGear.Size = New System.Drawing.Size(181, 145)
         Me.gbRatiosPerGear.TabIndex = 1
         Me.gbRatiosPerGear.TabStop = false
         Me.gbRatiosPerGear.Text = "Transmission Ratio per Gear"
@@ -1458,11 +1355,10 @@ Partial Class VehicleForm
         Me.lvRatioPerGear.FullRowSelect = true
         Me.lvRatioPerGear.GridLines = true
         Me.lvRatioPerGear.HideSelection = false
-        Me.lvRatioPerGear.Location = New System.Drawing.Point(9, 25)
-        Me.lvRatioPerGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.lvRatioPerGear.Location = New System.Drawing.Point(6, 16)
         Me.lvRatioPerGear.MultiSelect = false
         Me.lvRatioPerGear.Name = "lvRatioPerGear"
-        Me.lvRatioPerGear.Size = New System.Drawing.Size(252, 142)
+        Me.lvRatioPerGear.Size = New System.Drawing.Size(169, 94)
         Me.lvRatioPerGear.TabIndex = 7
         Me.lvRatioPerGear.TabStop = false
         Me.lvRatioPerGear.UseCompatibleStateImageBehavior = false
@@ -1481,30 +1377,27 @@ Partial Class VehicleForm
         'btnAddEMRatio
         '
         Me.btnAddEMRatio.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.btnAddEMRatio.Location = New System.Drawing.Point(9, 178)
-        Me.btnAddEMRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnAddEMRatio.Location = New System.Drawing.Point(6, 116)
         Me.btnAddEMRatio.Name = "btnAddEMRatio"
-        Me.btnAddEMRatio.Size = New System.Drawing.Size(36, 37)
+        Me.btnAddEMRatio.Size = New System.Drawing.Size(24, 24)
         Me.btnAddEMRatio.TabIndex = 4
         Me.btnAddEMRatio.UseVisualStyleBackColor = true
         '
         'Label29
         '
         Me.Label29.AutoSize = true
-        Me.Label29.Location = New System.Drawing.Point(106, 186)
-        Me.Label29.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label29.Location = New System.Drawing.Point(71, 121)
         Me.Label29.Name = "Label29"
-        Me.Label29.Size = New System.Drawing.Size(158, 20)
+        Me.Label29.Size = New System.Drawing.Size(106, 13)
         Me.Label29.TabIndex = 6
         Me.Label29.Text = "(Double-Click to Edit)"
         '
         'btnRemoveEMRatio
         '
         Me.btnRemoveEMRatio.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.btnRemoveEMRatio.Location = New System.Drawing.Point(50, 178)
-        Me.btnRemoveEMRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnRemoveEMRatio.Location = New System.Drawing.Point(33, 116)
         Me.btnRemoveEMRatio.Name = "btnRemoveEMRatio"
-        Me.btnRemoveEMRatio.Size = New System.Drawing.Size(36, 37)
+        Me.btnRemoveEMRatio.Size = New System.Drawing.Size(24, 24)
         Me.btnRemoveEMRatio.TabIndex = 5
         Me.btnRemoveEMRatio.UseVisualStyleBackColor = true
         '
@@ -1512,83 +1405,74 @@ Partial Class VehicleForm
         '
         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(621, 195)
-        Me.btnEmADCLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnEmADCLossMap.Location = New System.Drawing.Point(414, 127)
         Me.btnEmADCLossMap.Name = "btnEmADCLossMap"
-        Me.btnEmADCLossMap.Size = New System.Drawing.Size(36, 37)
+        Me.btnEmADCLossMap.Size = New System.Drawing.Size(24, 24)
         Me.btnEmADCLossMap.TabIndex = 5
         Me.btnEmADCLossMap.UseVisualStyleBackColor = true
         '
         'tbEmADCLossMap
         '
-        Me.tbEmADCLossMap.Location = New System.Drawing.Point(306, 202)
-        Me.tbEmADCLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbEmADCLossMap.Location = New System.Drawing.Point(204, 131)
         Me.tbEmADCLossMap.Name = "tbEmADCLossMap"
-        Me.tbEmADCLossMap.Size = New System.Drawing.Size(301, 26)
+        Me.tbEmADCLossMap.Size = New System.Drawing.Size(202, 20)
         Me.tbEmADCLossMap.TabIndex = 4
         '
         'lblEmADCLossmap
         '
         Me.lblEmADCLossmap.AutoSize = true
-        Me.lblEmADCLossmap.Location = New System.Drawing.Point(10, 206)
-        Me.lblEmADCLossmap.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblEmADCLossmap.Location = New System.Drawing.Point(7, 134)
         Me.lblEmADCLossmap.Name = "lblEmADCLossmap"
-        Me.lblEmADCLossmap.Size = New System.Drawing.Size(148, 20)
+        Me.lblEmADCLossmap.Size = New System.Drawing.Size(100, 13)
         Me.lblEmADCLossmap.TabIndex = 25
         Me.lblEmADCLossmap.Text = "Loss Map EM ADC:"
         '
         'tbRatioEm
         '
-        Me.tbRatioEm.Location = New System.Drawing.Point(306, 162)
-        Me.tbRatioEm.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbRatioEm.Location = New System.Drawing.Point(204, 105)
         Me.tbRatioEm.Name = "tbRatioEm"
-        Me.tbRatioEm.Size = New System.Drawing.Size(86, 26)
+        Me.tbRatioEm.Size = New System.Drawing.Size(59, 20)
         Me.tbRatioEm.TabIndex = 3
         '
         'lblRatioEm
         '
         Me.lblRatioEm.AutoSize = true
-        Me.lblRatioEm.Location = New System.Drawing.Point(10, 166)
-        Me.lblRatioEm.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblRatioEm.Location = New System.Drawing.Point(7, 108)
         Me.lblRatioEm.Name = "lblRatioEm"
-        Me.lblRatioEm.Size = New System.Drawing.Size(117, 20)
+        Me.lblRatioEm.Size = New System.Drawing.Size(79, 13)
         Me.lblRatioEm.TabIndex = 23
         Me.lblRatioEm.Text = "Ratio EM ADC:"
         '
         'tbEmCount
         '
-        Me.tbEmCount.Location = New System.Drawing.Point(306, 122)
-        Me.tbEmCount.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbEmCount.Location = New System.Drawing.Point(204, 79)
         Me.tbEmCount.Name = "tbEmCount"
-        Me.tbEmCount.Size = New System.Drawing.Size(86, 26)
+        Me.tbEmCount.Size = New System.Drawing.Size(59, 20)
         Me.tbEmCount.TabIndex = 2
         '
         'cbEmPos
         '
         Me.cbEmPos.FormattingEnabled = true
-        Me.cbEmPos.Location = New System.Drawing.Point(213, 80)
-        Me.cbEmPos.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbEmPos.Location = New System.Drawing.Point(142, 52)
         Me.cbEmPos.Name = "cbEmPos"
-        Me.cbEmPos.Size = New System.Drawing.Size(180, 28)
+        Me.cbEmPos.Size = New System.Drawing.Size(121, 21)
         Me.cbEmPos.TabIndex = 1
         '
         'lblEmCount
         '
         Me.lblEmCount.AutoSize = true
-        Me.lblEmCount.Location = New System.Drawing.Point(10, 126)
-        Me.lblEmCount.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblEmCount.Location = New System.Drawing.Point(7, 82)
         Me.lblEmCount.Name = "lblEmCount"
-        Me.lblEmCount.Size = New System.Drawing.Size(123, 20)
+        Me.lblEmCount.Size = New System.Drawing.Size(83, 13)
         Me.lblEmCount.TabIndex = 20
         Me.lblEmCount.Text = "Number of EMs:"
         '
         'lblEmPosition
         '
         Me.lblEmPosition.AutoSize = true
-        Me.lblEmPosition.Location = New System.Drawing.Point(10, 86)
-        Me.lblEmPosition.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblEmPosition.Location = New System.Drawing.Point(7, 56)
         Me.lblEmPosition.Name = "lblEmPosition"
-        Me.lblEmPosition.Size = New System.Drawing.Size(69, 20)
+        Me.lblEmPosition.Size = New System.Drawing.Size(47, 13)
         Me.lblEmPosition.TabIndex = 19
         Me.lblEmPosition.Text = "Position:"
         '
@@ -1597,18 +1481,16 @@ Partial Class VehicleForm
         Me.pnElectricMotor.Controls.Add(Me.btnOpenElectricMotor)
         Me.pnElectricMotor.Controls.Add(Me.btnBrowseElectricMotor)
         Me.pnElectricMotor.Controls.Add(Me.tbElectricMotor)
-        Me.pnElectricMotor.Location = New System.Drawing.Point(9, 29)
-        Me.pnElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnElectricMotor.Location = New System.Drawing.Point(6, 19)
         Me.pnElectricMotor.Name = "pnElectricMotor"
-        Me.pnElectricMotor.Size = New System.Drawing.Size(648, 42)
+        Me.pnElectricMotor.Size = New System.Drawing.Size(432, 27)
         Me.pnElectricMotor.TabIndex = 0
         '
         'btnOpenElectricMotor
         '
-        Me.btnOpenElectricMotor.Location = New System.Drawing.Point(6, 5)
-        Me.btnOpenElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnOpenElectricMotor.Location = New System.Drawing.Point(4, 3)
         Me.btnOpenElectricMotor.Name = "btnOpenElectricMotor"
-        Me.btnOpenElectricMotor.Size = New System.Drawing.Size(141, 32)
+        Me.btnOpenElectricMotor.Size = New System.Drawing.Size(94, 21)
         Me.btnOpenElectricMotor.TabIndex = 0
         Me.btnOpenElectricMotor.Text = "Electric Machine"
         Me.btnOpenElectricMotor.UseVisualStyleBackColor = true
@@ -1617,10 +1499,9 @@ Partial Class VehicleForm
         '
         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(609, 3)
-        Me.btnBrowseElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnBrowseElectricMotor.Location = New System.Drawing.Point(406, 2)
         Me.btnBrowseElectricMotor.Name = "btnBrowseElectricMotor"
-        Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(36, 37)
+        Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(24, 24)
         Me.btnBrowseElectricMotor.TabIndex = 2
         Me.btnBrowseElectricMotor.UseVisualStyleBackColor = true
         '
@@ -1628,21 +1509,159 @@ Partial Class VehicleForm
         '
         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(156, 6)
-        Me.tbElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbElectricMotor.Location = New System.Drawing.Point(104, 4)
         Me.tbElectricMotor.Name = "tbElectricMotor"
-        Me.tbElectricMotor.Size = New System.Drawing.Size(442, 26)
+        Me.tbElectricMotor.Size = New System.Drawing.Size(296, 20)
         Me.tbElectricMotor.TabIndex = 1
         '
+        'tpGensetComponents
+        '
+        Me.tpGensetComponents.Controls.Add(Me.tbGenSetICE)
+        Me.tpGensetComponents.Controls.Add(Me.gbGenSet)
+        Me.tpGensetComponents.Location = New System.Drawing.Point(4, 22)
+        Me.tpGensetComponents.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+        Me.tpGensetComponents.Name = "tpGensetComponents"
+        Me.tpGensetComponents.Size = New System.Drawing.Size(648, 374)
+        Me.tpGensetComponents.TabIndex = 5
+        Me.tpGensetComponents.Text = "GenSet Components"
+        Me.tpGensetComponents.UseVisualStyleBackColor = true
+        '
+        'tbGenSetICE
+        '
+        Me.tbGenSetICE.BackColor = System.Drawing.SystemColors.Window
+        Me.tbGenSetICE.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.tbGenSetICE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.tbGenSetICE.Location = New System.Drawing.Point(12, 153)
+        Me.tbGenSetICE.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+        Me.tbGenSetICE.Multiline = true
+        Me.tbGenSetICE.Name = "tbGenSetICE"
+        Me.tbGenSetICE.ReadOnly = true
+        Me.tbGenSetICE.Size = New System.Drawing.Size(472, 84)
+        Me.tbGenSetICE.TabIndex = 3
+        Me.tbGenSetICE.Text = "Note: The internal combustion engine of the GenSet is configured in the Job-Edito"& _ 
+    "r dialog."
+        '
+        'gbGenSet
+        '
+        Me.gbGenSet.Controls.Add(Me.btnGenSetLossMap)
+        Me.gbGenSet.Controls.Add(Me.tbGenSetADC)
+        Me.gbGenSet.Controls.Add(Me.lblGenSetADC)
+        Me.gbGenSet.Controls.Add(Me.tbGenSetRatio)
+        Me.gbGenSet.Controls.Add(Me.lblGenSetRatio)
+        Me.gbGenSet.Controls.Add(Me.tbGenSetCount)
+        Me.gbGenSet.Controls.Add(Me.lblGenSetCount)
+        Me.gbGenSet.Controls.Add(Me.pnGenSetEM)
+        Me.gbGenSet.Location = New System.Drawing.Point(6, 6)
+        Me.gbGenSet.Name = "gbGenSet"
+        Me.gbGenSet.Size = New System.Drawing.Size(633, 135)
+        Me.gbGenSet.TabIndex = 1
+        Me.gbGenSet.TabStop = false
+        Me.gbGenSet.Text = "Electric Machine"
+        '
+        'btnGenSetLossMap
+        '
+        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, 104)
+        Me.btnGenSetLossMap.Name = "btnGenSetLossMap"
+        Me.btnGenSetLossMap.Size = New System.Drawing.Size(24, 24)
+        Me.btnGenSetLossMap.TabIndex = 5
+        Me.btnGenSetLossMap.UseVisualStyleBackColor = true
+        '
+        'tbGenSetADC
+        '
+        Me.tbGenSetADC.Location = New System.Drawing.Point(205, 107)
+        Me.tbGenSetADC.Name = "tbGenSetADC"
+        Me.tbGenSetADC.Size = New System.Drawing.Size(202, 20)
+        Me.tbGenSetADC.TabIndex = 4
+        '
+        'lblGenSetADC
+        '
+        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)
+        Me.lblGenSetADC.TabIndex = 25
+        Me.lblGenSetADC.Text = "Loss Map EM ADC:"
+        '
+        'tbGenSetRatio
+        '
+        Me.tbGenSetRatio.Location = New System.Drawing.Point(205, 81)
+        Me.tbGenSetRatio.Name = "tbGenSetRatio"
+        Me.tbGenSetRatio.Size = New System.Drawing.Size(59, 20)
+        Me.tbGenSetRatio.TabIndex = 3
+        '
+        'lblGenSetRatio
+        '
+        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)
+        Me.lblGenSetRatio.TabIndex = 23
+        Me.lblGenSetRatio.Text = "Ratio EM ADC:"
+        '
+        'tbGenSetCount
+        '
+        Me.tbGenSetCount.Location = New System.Drawing.Point(205, 55)
+        Me.tbGenSetCount.Name = "tbGenSetCount"
+        Me.tbGenSetCount.Size = New System.Drawing.Size(59, 20)
+        Me.tbGenSetCount.TabIndex = 2
+        '
+        'lblGenSetCount
+        '
+        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)
+        Me.lblGenSetCount.TabIndex = 20
+        Me.lblGenSetCount.Text = "Number of EMs:"
+        '
+        'pnGenSetEM
+        '
+        Me.pnGenSetEM.Controls.Add(Me.btnOpenGenSetEM)
+        Me.pnGenSetEM.Controls.Add(Me.btnBrowseGenSetEM)
+        Me.pnGenSetEM.Controls.Add(Me.tbGenSetEM)
+        Me.pnGenSetEM.Location = New System.Drawing.Point(6, 19)
+        Me.pnGenSetEM.Name = "pnGenSetEM"
+        Me.pnGenSetEM.Size = New System.Drawing.Size(432, 27)
+        Me.pnGenSetEM.TabIndex = 0
+        '
+        'btnOpenGenSetEM
+        '
+        Me.btnOpenGenSetEM.Location = New System.Drawing.Point(4, 3)
+        Me.btnOpenGenSetEM.Name = "btnOpenGenSetEM"
+        Me.btnOpenGenSetEM.Size = New System.Drawing.Size(94, 21)
+        Me.btnOpenGenSetEM.TabIndex = 0
+        Me.btnOpenGenSetEM.Text = "Electric Machine"
+        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.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
+        '
+        '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.Location = New System.Drawing.Point(104, 4)
+        Me.tbGenSetEM.Name = "tbGenSetEM"
+        Me.tbGenSetEM.Size = New System.Drawing.Size(296, 20)
+        Me.tbGenSetEM.TabIndex = 1
+        '
         'tpTorqueLimits
         '
         Me.tpTorqueLimits.Controls.Add(Me.gbPropulsionTorque)
         Me.tpTorqueLimits.Controls.Add(Me.gbEMTorqueLimits)
         Me.tpTorqueLimits.Controls.Add(Me.bgVehicleTorqueLimits)
-        Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 29)
-        Me.tpTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 22)
         Me.tpTorqueLimits.Name = "tpTorqueLimits"
-        Me.tpTorqueLimits.Size = New System.Drawing.Size(976, 579)
+        Me.tpTorqueLimits.Size = New System.Drawing.Size(648, 374)
         Me.tpTorqueLimits.TabIndex = 2
         Me.tpTorqueLimits.Text = "Torque Limits"
         Me.tpTorqueLimits.UseVisualStyleBackColor = true
@@ -1651,11 +1670,9 @@ Partial Class VehicleForm
         '
         Me.gbPropulsionTorque.Controls.Add(Me.btnPropulsionTorqueLimit)
         Me.gbPropulsionTorque.Controls.Add(Me.tbPropulsionTorqueLimit)
-        Me.gbPropulsionTorque.Location = New System.Drawing.Point(4, 363)
-        Me.gbPropulsionTorque.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbPropulsionTorque.Location = New System.Drawing.Point(3, 236)
         Me.gbPropulsionTorque.Name = "gbPropulsionTorque"
-        Me.gbPropulsionTorque.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbPropulsionTorque.Size = New System.Drawing.Size(610, 80)
+        Me.gbPropulsionTorque.Size = New System.Drawing.Size(407, 52)
         Me.gbPropulsionTorque.TabIndex = 2
         Me.gbPropulsionTorque.TabStop = false
         Me.gbPropulsionTorque.Text = "Propulsion Torque Limit"
@@ -1663,30 +1680,26 @@ Partial Class VehicleForm
         'btnPropulsionTorqueLimit
         '
         Me.btnPropulsionTorqueLimit.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(496, 26)
-        Me.btnPropulsionTorqueLimit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(331, 17)
         Me.btnPropulsionTorqueLimit.Name = "btnPropulsionTorqueLimit"
-        Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(36, 37)
+        Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(24, 24)
         Me.btnPropulsionTorqueLimit.TabIndex = 1
         Me.btnPropulsionTorqueLimit.UseVisualStyleBackColor = true
         '
         'tbPropulsionTorqueLimit
         '
-        Me.tbPropulsionTorqueLimit.Location = New System.Drawing.Point(9, 31)
-        Me.tbPropulsionTorqueLimit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPropulsionTorqueLimit.Location = New System.Drawing.Point(6, 20)
         Me.tbPropulsionTorqueLimit.Name = "tbPropulsionTorqueLimit"
-        Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(476, 26)
+        Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(319, 20)
         Me.tbPropulsionTorqueLimit.TabIndex = 0
         '
         'gbEMTorqueLimits
         '
         Me.gbEMTorqueLimits.Controls.Add(Me.btnEmTorqueLimits)
         Me.gbEMTorqueLimits.Controls.Add(Me.tbEmTorqueLimits)
-        Me.gbEMTorqueLimits.Location = New System.Drawing.Point(4, 274)
-        Me.gbEMTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbEMTorqueLimits.Location = New System.Drawing.Point(3, 178)
         Me.gbEMTorqueLimits.Name = "gbEMTorqueLimits"
-        Me.gbEMTorqueLimits.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbEMTorqueLimits.Size = New System.Drawing.Size(610, 80)
+        Me.gbEMTorqueLimits.Size = New System.Drawing.Size(407, 52)
         Me.gbEMTorqueLimits.TabIndex = 1
         Me.gbEMTorqueLimits.TabStop = false
         Me.gbEMTorqueLimits.Text = "Electric Machine Torque Limits"
@@ -1694,19 +1707,17 @@ Partial Class VehicleForm
         'btnEmTorqueLimits
         '
         Me.btnEmTorqueLimits.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.btnEmTorqueLimits.Location = New System.Drawing.Point(496, 26)
-        Me.btnEmTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnEmTorqueLimits.Location = New System.Drawing.Point(331, 17)
         Me.btnEmTorqueLimits.Name = "btnEmTorqueLimits"
-        Me.btnEmTorqueLimits.Size = New System.Drawing.Size(36, 37)
+        Me.btnEmTorqueLimits.Size = New System.Drawing.Size(24, 24)
         Me.btnEmTorqueLimits.TabIndex = 1
         Me.btnEmTorqueLimits.UseVisualStyleBackColor = true
         '
         'tbEmTorqueLimits
         '
-        Me.tbEmTorqueLimits.Location = New System.Drawing.Point(9, 31)
-        Me.tbEmTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbEmTorqueLimits.Location = New System.Drawing.Point(6, 20)
         Me.tbEmTorqueLimits.Name = "tbEmTorqueLimits"
-        Me.tbEmTorqueLimits.Size = New System.Drawing.Size(476, 26)
+        Me.tbEmTorqueLimits.Size = New System.Drawing.Size(319, 20)
         Me.tbEmTorqueLimits.TabIndex = 0
         '
         'bgVehicleTorqueLimits
@@ -1715,11 +1726,9 @@ Partial Class VehicleForm
         Me.bgVehicleTorqueLimits.Controls.Add(Me.btAddMaxTorqueEntry)
         Me.bgVehicleTorqueLimits.Controls.Add(Me.Label17)
         Me.bgVehicleTorqueLimits.Controls.Add(Me.btDelMaxTorqueEntry)
-        Me.bgVehicleTorqueLimits.Location = New System.Drawing.Point(4, 14)
-        Me.bgVehicleTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.bgVehicleTorqueLimits.Location = New System.Drawing.Point(3, 9)
         Me.bgVehicleTorqueLimits.Name = "bgVehicleTorqueLimits"
-        Me.bgVehicleTorqueLimits.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(610, 251)
+        Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(407, 163)
         Me.bgVehicleTorqueLimits.TabIndex = 0
         Me.bgVehicleTorqueLimits.TabStop = false
         Me.bgVehicleTorqueLimits.Text = "ICE Torque Limits"
@@ -1732,11 +1741,10 @@ Partial Class VehicleForm
         Me.lvTorqueLimits.FullRowSelect = true
         Me.lvTorqueLimits.GridLines = true
         Me.lvTorqueLimits.HideSelection = false
-        Me.lvTorqueLimits.Location = New System.Drawing.Point(9, 29)
-        Me.lvTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.lvTorqueLimits.Location = New System.Drawing.Point(6, 19)
         Me.lvTorqueLimits.MultiSelect = false
         Me.lvTorqueLimits.Name = "lvTorqueLimits"
-        Me.lvTorqueLimits.Size = New System.Drawing.Size(421, 155)
+        Me.lvTorqueLimits.Size = New System.Drawing.Size(282, 102)
         Me.lvTorqueLimits.TabIndex = 7
         Me.lvTorqueLimits.TabStop = false
         Me.lvTorqueLimits.UseCompatibleStateImageBehavior = false
@@ -1755,41 +1763,37 @@ Partial Class VehicleForm
         'btAddMaxTorqueEntry
         '
         Me.btAddMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(9, 195)
-        Me.btAddMaxTorqueEntry.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(6, 127)
         Me.btAddMaxTorqueEntry.Name = "btAddMaxTorqueEntry"
-        Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(36, 37)
+        Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
         Me.btAddMaxTorqueEntry.TabIndex = 4
         Me.btAddMaxTorqueEntry.UseVisualStyleBackColor = true
         '
         'Label17
         '
         Me.Label17.AutoSize = true
-        Me.Label17.Location = New System.Drawing.Point(273, 191)
-        Me.Label17.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label17.Location = New System.Drawing.Point(182, 124)
         Me.Label17.Name = "Label17"
-        Me.Label17.Size = New System.Drawing.Size(158, 20)
+        Me.Label17.Size = New System.Drawing.Size(106, 13)
         Me.Label17.TabIndex = 6
         Me.Label17.Text = "(Double-Click to Edit)"
         '
         'btDelMaxTorqueEntry
         '
         Me.btDelMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(45, 195)
-        Me.btDelMaxTorqueEntry.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(30, 127)
         Me.btDelMaxTorqueEntry.Name = "btDelMaxTorqueEntry"
-        Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(36, 37)
+        Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
         Me.btDelMaxTorqueEntry.TabIndex = 5
         Me.btDelMaxTorqueEntry.UseVisualStyleBackColor = true
         '
         'tpADAS
         '
         Me.tpADAS.Controls.Add(Me.gbADAS)
-        Me.tpADAS.Location = New System.Drawing.Point(4, 29)
-        Me.tpADAS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tpADAS.Location = New System.Drawing.Point(4, 22)
         Me.tpADAS.Name = "tpADAS"
-        Me.tpADAS.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tpADAS.Size = New System.Drawing.Size(976, 579)
+        Me.tpADAS.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.tpADAS.Size = New System.Drawing.Size(648, 374)
         Me.tpADAS.TabIndex = 3
         Me.tpADAS.Text = "ADAS"
         Me.tpADAS.UseVisualStyleBackColor = true
@@ -1802,11 +1806,9 @@ Partial Class VehicleForm
         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(9, 9)
-        Me.gbADAS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbADAS.Location = New System.Drawing.Point(6, 6)
         Me.gbADAS.Name = "gbADAS"
-        Me.gbADAS.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbADAS.Size = New System.Drawing.Size(848, 209)
+        Me.gbADAS.Size = New System.Drawing.Size(565, 136)
         Me.gbADAS.TabIndex = 0
         Me.gbADAS.TabStop = false
         Me.gbADAS.Text = "ADAS Options"
@@ -1814,10 +1816,9 @@ Partial Class VehicleForm
         'cbAtEcoRollReleaseLockupClutch
         '
         Me.cbAtEcoRollReleaseLockupClutch.AutoSize = true
-        Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(398, 29)
-        Me.cbAtEcoRollReleaseLockupClutch.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(265, 19)
         Me.cbAtEcoRollReleaseLockupClutch.Name = "cbAtEcoRollReleaseLockupClutch"
-        Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(356, 24)
+        Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(243, 17)
         Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 3
         Me.cbAtEcoRollReleaseLockupClutch.Text = "AT Gearbox: Eco-Roll Release Lockup Clutch"
         Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = true
@@ -1825,38 +1826,34 @@ Partial Class VehicleForm
         'cbPcc
         '
         Me.cbPcc.FormattingEnabled = true
-        Me.cbPcc.Location = New System.Drawing.Point(27, 160)
-        Me.cbPcc.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbPcc.Location = New System.Drawing.Point(18, 104)
         Me.cbPcc.Name = "cbPcc"
-        Me.cbPcc.Size = New System.Drawing.Size(266, 28)
+        Me.cbPcc.Size = New System.Drawing.Size(179, 21)
         Me.cbPcc.TabIndex = 2
         '
         'cbEcoRoll
         '
         Me.cbEcoRoll.FormattingEnabled = true
-        Me.cbEcoRoll.Location = New System.Drawing.Point(27, 89)
-        Me.cbEcoRoll.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbEcoRoll.Location = New System.Drawing.Point(18, 58)
         Me.cbEcoRoll.Name = "cbEcoRoll"
-        Me.cbEcoRoll.Size = New System.Drawing.Size(266, 28)
+        Me.cbEcoRoll.Size = New System.Drawing.Size(179, 21)
         Me.cbEcoRoll.TabIndex = 1
         '
         'Label22
         '
         Me.Label22.AutoSize = true
-        Me.Label22.Location = New System.Drawing.Point(9, 65)
-        Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label22.Location = New System.Drawing.Point(6, 42)
         Me.Label22.Name = "Label22"
-        Me.Label22.Size = New System.Drawing.Size(69, 20)
+        Me.Label22.Size = New System.Drawing.Size(47, 13)
         Me.Label22.TabIndex = 6
         Me.Label22.Text = "Eco-Roll"
         '
         'cbEngineStopStart
         '
         Me.cbEngineStopStart.AutoSize = true
-        Me.cbEngineStopStart.Location = New System.Drawing.Point(9, 29)
-        Me.cbEngineStopStart.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbEngineStopStart.Location = New System.Drawing.Point(6, 19)
         Me.cbEngineStopStart.Name = "cbEngineStopStart"
-        Me.cbEngineStopStart.Size = New System.Drawing.Size(297, 24)
+        Me.cbEngineStopStart.Size = New System.Drawing.Size(203, 17)
         Me.cbEngineStopStart.TabIndex = 0
         Me.cbEngineStopStart.Text = "Engine Stop/Start during vehicle stop"
         Me.cbEngineStopStart.UseVisualStyleBackColor = true
@@ -1864,10 +1861,9 @@ Partial Class VehicleForm
         'lblPCC
         '
         Me.lblPCC.AutoSize = true
-        Me.lblPCC.Location = New System.Drawing.Point(9, 135)
-        Me.lblPCC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblPCC.Location = New System.Drawing.Point(6, 88)
         Me.lblPCC.Name = "lblPCC"
-        Me.lblPCC.Size = New System.Drawing.Size(181, 20)
+        Me.lblPCC.Size = New System.Drawing.Size(122, 13)
         Me.lblPCC.TabIndex = 3
         Me.lblPCC.Text = "Predictive Cruise Control"
         '
@@ -1875,10 +1871,9 @@ Partial Class VehicleForm
         '
         Me.tpRoadSweeper.Controls.Add(Me.pnPTO)
         Me.tpRoadSweeper.Controls.Add(Me.gbPTO)
-        Me.tpRoadSweeper.Location = New System.Drawing.Point(4, 29)
-        Me.tpRoadSweeper.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tpRoadSweeper.Location = New System.Drawing.Point(4, 22)
         Me.tpRoadSweeper.Name = "tpRoadSweeper"
-        Me.tpRoadSweeper.Size = New System.Drawing.Size(976, 579)
+        Me.tpRoadSweeper.Size = New System.Drawing.Size(648, 374)
         Me.tpRoadSweeper.TabIndex = 4
         Me.tpRoadSweeper.Text = "PTO"
         Me.tpRoadSweeper.UseVisualStyleBackColor = true
@@ -1895,10 +1890,9 @@ Partial Class VehicleForm
         Me.pnPTO.Controls.Add(Me.btPTOLossMapBrowse)
         Me.pnPTO.Controls.Add(Me.Label7)
         Me.pnPTO.Controls.Add(Me.tbPTOLossMap)
-        Me.pnPTO.Location = New System.Drawing.Point(8, 112)
-        Me.pnPTO.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnPTO.Location = New System.Drawing.Point(5, 73)
         Me.pnPTO.Name = "pnPTO"
-        Me.pnPTO.Size = New System.Drawing.Size(849, 325)
+        Me.pnPTO.Size = New System.Drawing.Size(566, 211)
         Me.pnPTO.TabIndex = 1
         '
         'gbPTODrive
@@ -1909,11 +1903,9 @@ Partial Class VehicleForm
         Me.gbPTODrive.Controls.Add(Me.tbPtoEngineSpeed)
         Me.gbPTODrive.Controls.Add(Me.Label25)
         Me.gbPTODrive.Controls.Add(Me.Label24)
-        Me.gbPTODrive.Location = New System.Drawing.Point(4, 152)
-        Me.gbPTODrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbPTODrive.Location = New System.Drawing.Point(3, 99)
         Me.gbPTODrive.Name = "gbPTODrive"
-        Me.gbPTODrive.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbPTODrive.Size = New System.Drawing.Size(834, 85)
+        Me.gbPTODrive.Size = New System.Drawing.Size(556, 55)
         Me.gbPTODrive.TabIndex = 4
         Me.gbPTODrive.TabStop = false
         Me.gbPTODrive.Text = "Working operation settings (PTO mode 2)"
@@ -1921,77 +1913,69 @@ Partial Class VehicleForm
         'Label27
         '
         Me.Label27.AutoSize = true
-        Me.Label27.Location = New System.Drawing.Point(669, 37)
-        Me.Label27.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label27.Location = New System.Drawing.Point(446, 24)
         Me.Label27.Name = "Label27"
-        Me.Label27.Size = New System.Drawing.Size(26, 20)
+        Me.Label27.Size = New System.Drawing.Size(20, 13)
         Me.Label27.TabIndex = 6
         Me.Label27.Text = "[#]"
         Me.Label27.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'tbPtoGear
         '
-        Me.tbPtoGear.Location = New System.Drawing.Point(556, 32)
-        Me.tbPtoGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPtoGear.Location = New System.Drawing.Point(371, 21)
         Me.tbPtoGear.Name = "tbPtoGear"
-        Me.tbPtoGear.Size = New System.Drawing.Size(103, 26)
+        Me.tbPtoGear.Size = New System.Drawing.Size(70, 20)
         Me.tbPtoGear.TabIndex = 1
         '
         'Label26
         '
         Me.Label26.AutoSize = true
-        Me.Label26.Location = New System.Drawing.Point(294, 37)
-        Me.Label26.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label26.Location = New System.Drawing.Point(196, 24)
         Me.Label26.Name = "Label26"
-        Me.Label26.Size = New System.Drawing.Size(44, 20)
+        Me.Label26.Size = New System.Drawing.Size(30, 13)
         Me.Label26.TabIndex = 4
         Me.Label26.Text = "[rpm]"
         Me.Label26.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'tbPtoEngineSpeed
         '
-        Me.tbPtoEngineSpeed.Location = New System.Drawing.Point(180, 32)
-        Me.tbPtoEngineSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPtoEngineSpeed.Location = New System.Drawing.Point(120, 21)
         Me.tbPtoEngineSpeed.Name = "tbPtoEngineSpeed"
-        Me.tbPtoEngineSpeed.Size = New System.Drawing.Size(103, 26)
+        Me.tbPtoEngineSpeed.Size = New System.Drawing.Size(70, 20)
         Me.tbPtoEngineSpeed.TabIndex = 0
         '
         'Label25
         '
         Me.Label25.AutoSize = true
-        Me.Label25.Location = New System.Drawing.Point(446, 37)
-        Me.Label25.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label25.Location = New System.Drawing.Point(297, 24)
         Me.Label25.Name = "Label25"
-        Me.Label25.Size = New System.Drawing.Size(103, 20)
+        Me.Label25.Size = New System.Drawing.Size(68, 13)
         Me.Label25.TabIndex = 1
         Me.Label25.Text = "Gear number"
         '
         'Label24
         '
         Me.Label24.AutoSize = true
-        Me.Label24.Location = New System.Drawing.Point(10, 37)
-        Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label24.Location = New System.Drawing.Point(7, 24)
         Me.Label24.Name = "Label24"
-        Me.Label24.Size = New System.Drawing.Size(143, 20)
+        Me.Label24.Size = New System.Drawing.Size(97, 13)
         Me.Label24.TabIndex = 0
         Me.Label24.Text = "Min. Engine Speed"
         '
         'btPTOCycleDrive
         '
         Me.btPTOCycleDrive.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.btPTOCycleDrive.Location = New System.Drawing.Point(368, 278)
-        Me.btPTOCycleDrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btPTOCycleDrive.Location = New System.Drawing.Point(245, 181)
         Me.btPTOCycleDrive.Name = "btPTOCycleDrive"
-        Me.btPTOCycleDrive.Size = New System.Drawing.Size(36, 37)
+        Me.btPTOCycleDrive.Size = New System.Drawing.Size(24, 24)
         Me.btPTOCycleDrive.TabIndex = 6
         Me.btPTOCycleDrive.UseVisualStyleBackColor = true
         '
         'Label28
         '
-        Me.Label28.Location = New System.Drawing.Point(4, 252)
-        Me.Label28.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label28.Location = New System.Drawing.Point(3, 164)
         Me.Label28.Name = "Label28"
-        Me.Label28.Size = New System.Drawing.Size(399, 25)
+        Me.Label28.Size = New System.Drawing.Size(266, 16)
         Me.Label28.TabIndex = 21
         Me.Label28.Text = "PTO Cycle during driving (PTO mode 3) (.vptor)"
         Me.Label28.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -1999,19 +1983,17 @@ Partial Class VehicleForm
         'btPTOCycle
         '
         Me.btPTOCycle.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.btPTOCycle.Location = New System.Drawing.Point(368, 106)
-        Me.btPTOCycle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btPTOCycle.Location = New System.Drawing.Point(245, 69)
         Me.btPTOCycle.Name = "btPTOCycle"
-        Me.btPTOCycle.Size = New System.Drawing.Size(36, 37)
+        Me.btPTOCycle.Size = New System.Drawing.Size(24, 24)
         Me.btPTOCycle.TabIndex = 3
         Me.btPTOCycle.UseVisualStyleBackColor = true
         '
         'Label16
         '
-        Me.Label16.Location = New System.Drawing.Point(4, 80)
-        Me.Label16.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label16.Location = New System.Drawing.Point(3, 52)
         Me.Label16.Name = "Label16"
-        Me.Label16.Size = New System.Drawing.Size(399, 25)
+        Me.Label16.Size = New System.Drawing.Size(266, 16)
         Me.Label16.TabIndex = 18
         Me.Label16.Text = "PTO Cycle during standstill (PTO mode 1) (.vptoc)"
         Me.Label16.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -2019,19 +2001,17 @@ Partial Class VehicleForm
         'btPTOLossMapBrowse
         '
         Me.btPTOLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(368, 34)
-        Me.btPTOLossMapBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(245, 22)
         Me.btPTOLossMapBrowse.Name = "btPTOLossMapBrowse"
-        Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(36, 37)
+        Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(24, 24)
         Me.btPTOLossMapBrowse.TabIndex = 1
         Me.btPTOLossMapBrowse.UseVisualStyleBackColor = true
         '
         'Label7
         '
-        Me.Label7.Location = New System.Drawing.Point(4, 8)
-        Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label7.Location = New System.Drawing.Point(3, 5)
         Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(302, 25)
+        Me.Label7.Size = New System.Drawing.Size(201, 16)
         Me.Label7.TabIndex = 15
         Me.Label7.Text = "PTO Consumer Loss Map (.vptoi)"
         Me.Label7.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -2039,11 +2019,9 @@ Partial Class VehicleForm
         'gbPTO
         '
         Me.gbPTO.Controls.Add(Me.cbPTOType)
-        Me.gbPTO.Location = New System.Drawing.Point(8, 15)
-        Me.gbPTO.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbPTO.Location = New System.Drawing.Point(5, 10)
         Me.gbPTO.Name = "gbPTO"
-        Me.gbPTO.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbPTO.Size = New System.Drawing.Size(846, 88)
+        Me.gbPTO.Size = New System.Drawing.Size(564, 57)
         Me.gbPTO.TabIndex = 0
         Me.gbPTO.TabStop = false
         Me.gbPTO.Text = "PTO Design Variant"
@@ -2052,19 +2030,17 @@ Partial Class VehicleForm
         '
         Me.cbLegislativeClass.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.cbLegislativeClass.FormattingEnabled = true
-        Me.cbLegislativeClass.Location = New System.Drawing.Point(330, 215)
-        Me.cbLegislativeClass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbLegislativeClass.Location = New System.Drawing.Point(220, 140)
         Me.cbLegislativeClass.Name = "cbLegislativeClass"
-        Me.cbLegislativeClass.Size = New System.Drawing.Size(76, 28)
+        Me.cbLegislativeClass.Size = New System.Drawing.Size(52, 21)
         Me.cbLegislativeClass.TabIndex = 4
         '
         'Label21
         '
         Me.Label21.AutoSize = true
-        Me.Label21.Location = New System.Drawing.Point(48, 189)
-        Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label21.Location = New System.Drawing.Point(32, 123)
         Me.Label21.Name = "Label21"
-        Me.Label21.Size = New System.Drawing.Size(167, 20)
+        Me.Label21.Size = New System.Drawing.Size(112, 13)
         Me.Label21.TabIndex = 42
         Me.Label21.Text = "Maximum Laden Mass"
         '
@@ -2073,171 +2049,19 @@ Partial Class VehicleForm
         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.Location = New System.Drawing.Point(182, 52)
-        Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblTitle.Location = New System.Drawing.Point(117, 34)
         Me.lblTitle.Name = "lblTitle"
-        Me.lblTitle.Size = New System.Drawing.Size(242, 40)
+        Me.lblTitle.Size = New System.Drawing.Size(166, 29)
         Me.lblTitle.TabIndex = 43
         Me.lblTitle.Text = "Vehicle TITLE"
-        '
-        'tpGensetComponents
-        '
-        Me.tpGensetComponents.Controls.Add(Me.tbGenSetICE)
-        Me.tpGensetComponents.Controls.Add(Me.gbGenSet)
-        Me.tpGensetComponents.Location = New System.Drawing.Point(4, 29)
-        Me.tpGensetComponents.Name = "tpGensetComponents"
-        Me.tpGensetComponents.Size = New System.Drawing.Size(976, 582)
-        Me.tpGensetComponents.TabIndex = 5
-        Me.tpGensetComponents.Text = "GenSet Components"
-        Me.tpGensetComponents.UseVisualStyleBackColor = true
-        '
-        'gbGenSet
-        '
-        Me.gbGenSet.Controls.Add(Me.btnGenSetLossMap)
-        Me.gbGenSet.Controls.Add(Me.tbGenSetADC)
-        Me.gbGenSet.Controls.Add(Me.lblGenSetADC)
-        Me.gbGenSet.Controls.Add(Me.tbGenSetRatio)
-        Me.gbGenSet.Controls.Add(Me.lblGenSetRatio)
-        Me.gbGenSet.Controls.Add(Me.tbGenSetCount)
-        Me.gbGenSet.Controls.Add(Me.lblGenSetCount)
-        Me.gbGenSet.Controls.Add(Me.pnGenSetEM)
-        Me.gbGenSet.Location = New System.Drawing.Point(9, 9)
-        Me.gbGenSet.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbGenSet.Name = "gbGenSet"
-        Me.gbGenSet.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbGenSet.Size = New System.Drawing.Size(950, 207)
-        Me.gbGenSet.TabIndex = 1
-        Me.gbGenSet.TabStop = false
-        Me.gbGenSet.Text = "Electric Machine"
-        '
-        'btnGenSetLossMap
-        '
-        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(618, 160)
-        Me.btnGenSetLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.btnGenSetLossMap.Name = "btnGenSetLossMap"
-        Me.btnGenSetLossMap.Size = New System.Drawing.Size(36, 37)
-        Me.btnGenSetLossMap.TabIndex = 5
-        Me.btnGenSetLossMap.UseVisualStyleBackColor = true
-        '
-        'tbGenSetADC
-        '
-        Me.tbGenSetADC.Location = New System.Drawing.Point(307, 165)
-        Me.tbGenSetADC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbGenSetADC.Name = "tbGenSetADC"
-        Me.tbGenSetADC.Size = New System.Drawing.Size(301, 26)
-        Me.tbGenSetADC.TabIndex = 4
-        '
-        'lblGenSetADC
-        '
-        Me.lblGenSetADC.AutoSize = true
-        Me.lblGenSetADC.Location = New System.Drawing.Point(11, 169)
-        Me.lblGenSetADC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblGenSetADC.Name = "lblGenSetADC"
-        Me.lblGenSetADC.Size = New System.Drawing.Size(148, 20)
-        Me.lblGenSetADC.TabIndex = 25
-        Me.lblGenSetADC.Text = "Loss Map EM ADC:"
-        '
-        'tbGenSetRatio
-        '
-        Me.tbGenSetRatio.Location = New System.Drawing.Point(307, 125)
-        Me.tbGenSetRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbGenSetRatio.Name = "tbGenSetRatio"
-        Me.tbGenSetRatio.Size = New System.Drawing.Size(86, 26)
-        Me.tbGenSetRatio.TabIndex = 3
-        '
-        'lblGenSetRatio
-        '
-        Me.lblGenSetRatio.AutoSize = true
-        Me.lblGenSetRatio.Location = New System.Drawing.Point(11, 129)
-        Me.lblGenSetRatio.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblGenSetRatio.Name = "lblGenSetRatio"
-        Me.lblGenSetRatio.Size = New System.Drawing.Size(117, 20)
-        Me.lblGenSetRatio.TabIndex = 23
-        Me.lblGenSetRatio.Text = "Ratio EM ADC:"
-        '
-        'tbGenSetCount
-        '
-        Me.tbGenSetCount.Location = New System.Drawing.Point(307, 85)
-        Me.tbGenSetCount.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbGenSetCount.Name = "tbGenSetCount"
-        Me.tbGenSetCount.Size = New System.Drawing.Size(86, 26)
-        Me.tbGenSetCount.TabIndex = 2
-        '
-        'lblGenSetCount
-        '
-        Me.lblGenSetCount.AutoSize = true
-        Me.lblGenSetCount.Location = New System.Drawing.Point(11, 89)
-        Me.lblGenSetCount.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblGenSetCount.Name = "lblGenSetCount"
-        Me.lblGenSetCount.Size = New System.Drawing.Size(123, 20)
-        Me.lblGenSetCount.TabIndex = 20
-        Me.lblGenSetCount.Text = "Number of EMs:"
-        '
-        'pnGenSetEM
-        '
-        Me.pnGenSetEM.Controls.Add(Me.btnOpenGenSetEM)
-        Me.pnGenSetEM.Controls.Add(Me.btnBrowseGenSetEM)
-        Me.pnGenSetEM.Controls.Add(Me.tbGenSetEM)
-        Me.pnGenSetEM.Location = New System.Drawing.Point(9, 29)
-        Me.pnGenSetEM.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.pnGenSetEM.Name = "pnGenSetEM"
-        Me.pnGenSetEM.Size = New System.Drawing.Size(648, 42)
-        Me.pnGenSetEM.TabIndex = 0
-        '
-        'btnOpenGenSetEM
-        '
-        Me.btnOpenGenSetEM.Location = New System.Drawing.Point(6, 5)
-        Me.btnOpenGenSetEM.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.btnOpenGenSetEM.Name = "btnOpenGenSetEM"
-        Me.btnOpenGenSetEM.Size = New System.Drawing.Size(141, 32)
-        Me.btnOpenGenSetEM.TabIndex = 0
-        Me.btnOpenGenSetEM.Text = "Electric Machine"
-        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.Location = New System.Drawing.Point(609, 3)
-        Me.btnBrowseGenSetEM.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.btnBrowseGenSetEM.Name = "btnBrowseGenSetEM"
-        Me.btnBrowseGenSetEM.Size = New System.Drawing.Size(36, 37)
-        Me.btnBrowseGenSetEM.TabIndex = 2
-        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.Location = New System.Drawing.Point(156, 6)
-        Me.tbGenSetEM.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbGenSetEM.Name = "tbGenSetEM"
-        Me.tbGenSetEM.Size = New System.Drawing.Size(442, 26)
-        Me.tbGenSetEM.TabIndex = 1
-        '
-        'tbGenSetICE
-        '
-        Me.tbGenSetICE.BackColor = System.Drawing.SystemColors.Window
-        Me.tbGenSetICE.BorderStyle = System.Windows.Forms.BorderStyle.None
-        Me.tbGenSetICE.Font = New System.Drawing.Font("Microsoft Sans Serif", 12!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.tbGenSetICE.Location = New System.Drawing.Point(18, 236)
-        Me.tbGenSetICE.Multiline = true
-        Me.tbGenSetICE.Name = "tbGenSetICE"
-        Me.tbGenSetICE.ReadOnly = true
-        Me.tbGenSetICE.Size = New System.Drawing.Size(708, 130)
-        Me.tbGenSetICE.TabIndex = 3
-        Me.tbGenSetICE.Text = "Note: The internal combustion engine of the GenSet is configured in the Job-Edito"& _ 
-    "r dialog."
         '
         'VehicleForm
         '
         Me.AcceptButton = Me.ButOK
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.CancelButton = Me.ButCancel
-        Me.ClientSize = New System.Drawing.Size(999, 962)
+        Me.ClientSize = New System.Drawing.Size(666, 625)
         Me.Controls.Add(Me.lblTitle)
         Me.Controls.Add(Me.Label21)
         Me.Controls.Add(Me.cbLegislativeClass)
@@ -2257,7 +2081,6 @@ Partial Class VehicleForm
         Me.Controls.Add(Me.ToolStrip1)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
         Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
-        Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.MaximizeBox = false
         Me.Name = "VehicleForm"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
@@ -2306,6 +2129,12 @@ Partial Class VehicleForm
         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
@@ -2322,12 +2151,6 @@ Partial Class VehicleForm
         Me.gbPTODrive.ResumeLayout(false)
         Me.gbPTODrive.PerformLayout
         Me.gbPTO.ResumeLayout(false)
-        Me.tpGensetComponents.ResumeLayout(false)
-        Me.tpGensetComponents.PerformLayout
-        Me.gbGenSet.ResumeLayout(false)
-        Me.gbGenSet.PerformLayout
-        Me.pnGenSetEM.ResumeLayout(false)
-        Me.pnGenSetEM.PerformLayout
         Me.ResumeLayout(false)
         Me.PerformLayout
 
-- 
GitLab