diff --git a/VECTO/GUI/BatteryForm.Designer.vb b/VECTO/GUI/BatteryForm.Designer.vb
index 553552e108f794351c5a591c31a3fed26ab7cd93..b83c072c1e761b873c1735012a23d367c5d736b5 100644
--- a/VECTO/GUI/BatteryForm.Designer.vb
+++ b/VECTO/GUI/BatteryForm.Designer.vb
@@ -135,7 +135,7 @@ Partial Class BatteryForm
         Me.tbCapacity.Location = New System.Drawing.Point(90, 4)
         Me.tbCapacity.Name = "tbCapacity"
         Me.tbCapacity.Size = New System.Drawing.Size(57, 20)
-        Me.tbCapacity.TabIndex = 3
+        Me.tbCapacity.TabIndex = 0
         '
         'lblCapacityUnit
         '
@@ -159,20 +159,20 @@ Partial Class BatteryForm
         '
         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(811, 323)
+        Me.ButCancel.Location = New System.Drawing.Point(811, 321)
         Me.ButCancel.Name = "ButCancel"
         Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-        Me.ButCancel.TabIndex = 13
+        Me.ButCancel.TabIndex = 4
         Me.ButCancel.Text = "Cancel"
         Me.ButCancel.UseVisualStyleBackColor = true
         '
         '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(730, 323)
+        Me.ButOK.Location = New System.Drawing.Point(730, 321)
         Me.ButOK.Name = "ButOK"
         Me.ButOK.Size = New System.Drawing.Size(75, 23)
-        Me.ButOK.TabIndex = 12
+        Me.ButOK.TabIndex = 3
         Me.ButOK.Text = "Save"
         Me.ButOK.UseVisualStyleBackColor = true
         '
@@ -261,7 +261,7 @@ Partial Class BatteryForm
         '
         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, 349)
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 347)
         Me.StatusStrip1.Name = "StatusStrip1"
         Me.StatusStrip1.Size = New System.Drawing.Size(898, 22)
         Me.StatusStrip1.SizingGrip = false
@@ -327,14 +327,14 @@ Partial Class BatteryForm
         Me.pnInertia.Location = New System.Drawing.Point(3, 3)
         Me.pnInertia.Name = "pnInertia"
         Me.pnInertia.Size = New System.Drawing.Size(212, 30)
-        Me.pnInertia.TabIndex = 3
+        Me.pnInertia.TabIndex = 0
         '
         'tbSoCCurve
         '
         Me.tbSoCCurve.Location = New System.Drawing.Point(3, 123)
         Me.tbSoCCurve.Name = "tbSoCCurve"
         Me.tbSoCCurve.Size = New System.Drawing.Size(434, 20)
-        Me.tbSoCCurve.TabIndex = 5
+        Me.tbSoCCurve.TabIndex = 6
         '
         'lblSoCCurve
         '
@@ -351,8 +351,7 @@ Partial Class BatteryForm
         Me.btnBrowseSoCCurve.Location = New System.Drawing.Point(437, 122)
         Me.btnBrowseSoCCurve.Name = "btnBrowseSoCCurve"
         Me.btnBrowseSoCCurve.Size = New System.Drawing.Size(24, 24)
-        Me.btnBrowseSoCCurve.TabIndex = 6
-        Me.btnBrowseSoCCurve.TabStop = false
+        Me.btnBrowseSoCCurve.TabIndex = 7
         Me.btnBrowseSoCCurve.UseVisualStyleBackColor = true
         '
         'btnSoCCurveOpen
@@ -361,8 +360,7 @@ Partial Class BatteryForm
         Me.btnSoCCurveOpen.Location = New System.Drawing.Point(460, 122)
         Me.btnSoCCurveOpen.Name = "btnSoCCurveOpen"
         Me.btnSoCCurveOpen.Size = New System.Drawing.Size(24, 24)
-        Me.btnSoCCurveOpen.TabIndex = 7
-        Me.btnSoCCurveOpen.TabStop = false
+        Me.btnSoCCurveOpen.TabIndex = 8
         Me.btnSoCCurveOpen.UseVisualStyleBackColor = true
         '
         'btnRiMapOpen
@@ -371,8 +369,7 @@ Partial Class BatteryForm
         Me.btnRiMapOpen.Location = New System.Drawing.Point(460, 159)
         Me.btnRiMapOpen.Name = "btnRiMapOpen"
         Me.btnRiMapOpen.Size = New System.Drawing.Size(24, 24)
-        Me.btnRiMapOpen.TabIndex = 42
-        Me.btnRiMapOpen.TabStop = false
+        Me.btnRiMapOpen.TabIndex = 11
         Me.btnRiMapOpen.UseVisualStyleBackColor = true
         '
         'btnBrowseRiMap
@@ -381,8 +378,7 @@ Partial Class BatteryForm
         Me.btnBrowseRiMap.Location = New System.Drawing.Point(437, 159)
         Me.btnBrowseRiMap.Name = "btnBrowseRiMap"
         Me.btnBrowseRiMap.Size = New System.Drawing.Size(24, 24)
-        Me.btnBrowseRiMap.TabIndex = 41
-        Me.btnBrowseRiMap.TabStop = false
+        Me.btnBrowseRiMap.TabIndex = 10
         Me.btnBrowseRiMap.UseVisualStyleBackColor = true
         '
         'lblRiMap
@@ -399,7 +395,7 @@ Partial Class BatteryForm
         Me.tbRiCurve.Location = New System.Drawing.Point(3, 161)
         Me.tbRiCurve.Name = "tbRiCurve"
         Me.tbRiCurve.Size = New System.Drawing.Size(434, 20)
-        Me.tbRiCurve.TabIndex = 40
+        Me.tbRiCurve.TabIndex = 9
         '
         'lblTitle
         '
@@ -430,7 +426,7 @@ Partial Class BatteryForm
         Me.Panel1.Location = New System.Drawing.Point(3, 36)
         Me.Panel1.Name = "Panel1"
         Me.Panel1.Size = New System.Drawing.Size(212, 30)
-        Me.Panel1.TabIndex = 25
+        Me.Panel1.TabIndex = 1
         '
         'lblMinSoc
         '
@@ -455,7 +451,7 @@ Partial Class BatteryForm
         Me.tbSoCMin.Location = New System.Drawing.Point(90, 4)
         Me.tbSoCMin.Name = "tbSoCMin"
         Me.tbSoCMin.Size = New System.Drawing.Size(57, 20)
-        Me.tbSoCMin.TabIndex = 3
+        Me.tbSoCMin.TabIndex = 0
         '
         'Panel2
         '
@@ -465,7 +461,7 @@ Partial Class BatteryForm
         Me.Panel2.Location = New System.Drawing.Point(225, 36)
         Me.Panel2.Name = "Panel2"
         Me.Panel2.Size = New System.Drawing.Size(212, 30)
-        Me.Panel2.TabIndex = 25
+        Me.Panel2.TabIndex = 2
         '
         'lblSoCMax
         '
@@ -490,17 +486,17 @@ Partial Class BatteryForm
         Me.tbSoCMax.Location = New System.Drawing.Point(90, 4)
         Me.tbSoCMax.Name = "tbSoCMax"
         Me.tbSoCMax.Size = New System.Drawing.Size(57, 20)
-        Me.tbSoCMax.TabIndex = 3
+        Me.tbSoCMax.TabIndex = 0
         '
         'FlowLayoutPanel1
         '
         Me.FlowLayoutPanel1.Controls.Add(Me.pnBattery)
         Me.FlowLayoutPanel1.Controls.Add(Me.pnSuperCap)
         Me.FlowLayoutPanel1.Location = New System.Drawing.Point(8, 136)
-        Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+        Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(2)
         Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
         Me.FlowLayoutPanel1.Size = New System.Drawing.Size(495, 200)
-        Me.FlowLayoutPanel1.TabIndex = 50
+        Me.FlowLayoutPanel1.TabIndex = 2
         '
         'pnBattery
         '
@@ -520,7 +516,7 @@ Partial Class BatteryForm
         Me.pnBattery.Controls.Add(Me.btnRiMapOpen)
         Me.pnBattery.Controls.Add(Me.btnBrowseRiMap)
         Me.pnBattery.Location = New System.Drawing.Point(2, 2)
-        Me.pnBattery.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+        Me.pnBattery.Margin = New System.Windows.Forms.Padding(2)
         Me.pnBattery.Name = "pnBattery"
         Me.pnBattery.Size = New System.Drawing.Size(489, 188)
         Me.pnBattery.TabIndex = 0
@@ -530,7 +526,7 @@ Partial Class BatteryForm
         Me.tbMaxCurrentMap.Location = New System.Drawing.Point(4, 87)
         Me.tbMaxCurrentMap.Name = "tbMaxCurrentMap"
         Me.tbMaxCurrentMap.Size = New System.Drawing.Size(434, 20)
-        Me.tbMaxCurrentMap.TabIndex = 44
+        Me.tbMaxCurrentMap.TabIndex = 3
         '
         'lblMaxCurrentMap
         '
@@ -547,8 +543,7 @@ Partial Class BatteryForm
         Me.btnBrowseMaxCurrentMap.Location = New System.Drawing.Point(438, 85)
         Me.btnBrowseMaxCurrentMap.Name = "btnBrowseMaxCurrentMap"
         Me.btnBrowseMaxCurrentMap.Size = New System.Drawing.Size(24, 24)
-        Me.btnBrowseMaxCurrentMap.TabIndex = 45
-        Me.btnBrowseMaxCurrentMap.TabStop = false
+        Me.btnBrowseMaxCurrentMap.TabIndex = 4
         Me.btnBrowseMaxCurrentMap.UseVisualStyleBackColor = true
         '
         'btnMaxCurrentMapOpen
@@ -557,8 +552,7 @@ Partial Class BatteryForm
         Me.btnMaxCurrentMapOpen.Location = New System.Drawing.Point(461, 85)
         Me.btnMaxCurrentMapOpen.Name = "btnMaxCurrentMapOpen"
         Me.btnMaxCurrentMapOpen.Size = New System.Drawing.Size(24, 24)
-        Me.btnMaxCurrentMapOpen.TabIndex = 46
-        Me.btnMaxCurrentMapOpen.TabStop = false
+        Me.btnMaxCurrentMapOpen.TabIndex = 5
         Me.btnMaxCurrentMapOpen.UseVisualStyleBackColor = true
         '
         'pnSuperCap
@@ -570,7 +564,7 @@ Partial Class BatteryForm
         Me.pnSuperCap.Controls.Add(Me.pnSuperCapResistance)
         Me.pnSuperCap.Controls.Add(Me.pnSuperCapCapacity)
         Me.pnSuperCap.Location = New System.Drawing.Point(2, 194)
-        Me.pnSuperCap.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+        Me.pnSuperCap.Margin = New System.Windows.Forms.Padding(2)
         Me.pnSuperCap.Name = "pnSuperCap"
         Me.pnSuperCap.Size = New System.Drawing.Size(489, 110)
         Me.pnSuperCap.TabIndex = 1
@@ -583,7 +577,7 @@ Partial Class BatteryForm
         Me.Panel4.Location = New System.Drawing.Point(225, 76)
         Me.Panel4.Name = "Panel4"
         Me.Panel4.Size = New System.Drawing.Size(212, 30)
-        Me.Panel4.TabIndex = 27
+        Me.Panel4.TabIndex = 5
         '
         'lblMaxCurrentDischarge
         '
@@ -608,7 +602,7 @@ Partial Class BatteryForm
         Me.tbSuperCapMaxCurrentDischarge.Location = New System.Drawing.Point(108, 5)
         Me.tbSuperCapMaxCurrentDischarge.Name = "tbSuperCapMaxCurrentDischarge"
         Me.tbSuperCapMaxCurrentDischarge.Size = New System.Drawing.Size(57, 20)
-        Me.tbSuperCapMaxCurrentDischarge.TabIndex = 3
+        Me.tbSuperCapMaxCurrentDischarge.TabIndex = 0
         '
         'Panel3
         '
@@ -618,7 +612,7 @@ Partial Class BatteryForm
         Me.Panel3.Location = New System.Drawing.Point(3, 76)
         Me.Panel3.Name = "Panel3"
         Me.Panel3.Size = New System.Drawing.Size(212, 30)
-        Me.Panel3.TabIndex = 26
+        Me.Panel3.TabIndex = 2
         '
         'lblMaxCurrentChg
         '
@@ -643,7 +637,7 @@ Partial Class BatteryForm
         Me.tbSuperCapMaxCurrentCharge.Location = New System.Drawing.Point(90, 4)
         Me.tbSuperCapMaxCurrentCharge.Name = "tbSuperCapMaxCurrentCharge"
         Me.tbSuperCapMaxCurrentCharge.Size = New System.Drawing.Size(57, 20)
-        Me.tbSuperCapMaxCurrentCharge.TabIndex = 3
+        Me.tbSuperCapMaxCurrentCharge.TabIndex = 0
         '
         'pnSuperCapMaxV
         '
@@ -653,7 +647,7 @@ Partial Class BatteryForm
         Me.pnSuperCapMaxV.Location = New System.Drawing.Point(225, 40)
         Me.pnSuperCapMaxV.Name = "pnSuperCapMaxV"
         Me.pnSuperCapMaxV.Size = New System.Drawing.Size(212, 30)
-        Me.pnSuperCapMaxV.TabIndex = 26
+        Me.pnSuperCapMaxV.TabIndex = 4
         '
         'lblSuperCapMaxV
         '
@@ -678,7 +672,7 @@ Partial Class BatteryForm
         Me.tbSuperCapMaxV.Location = New System.Drawing.Point(108, 5)
         Me.tbSuperCapMaxV.Name = "tbSuperCapMaxV"
         Me.tbSuperCapMaxV.Size = New System.Drawing.Size(57, 20)
-        Me.tbSuperCapMaxV.TabIndex = 3
+        Me.tbSuperCapMaxV.TabIndex = 0
         '
         'pnSuperCapMinV
         '
@@ -688,7 +682,7 @@ Partial Class BatteryForm
         Me.pnSuperCapMinV.Location = New System.Drawing.Point(3, 40)
         Me.pnSuperCapMinV.Name = "pnSuperCapMinV"
         Me.pnSuperCapMinV.Size = New System.Drawing.Size(212, 30)
-        Me.pnSuperCapMinV.TabIndex = 25
+        Me.pnSuperCapMinV.TabIndex = 1
         '
         'lblSuperCapMinV
         '
@@ -713,7 +707,7 @@ Partial Class BatteryForm
         Me.tbSuperCapMinV.Location = New System.Drawing.Point(90, 4)
         Me.tbSuperCapMinV.Name = "tbSuperCapMinV"
         Me.tbSuperCapMinV.Size = New System.Drawing.Size(57, 20)
-        Me.tbSuperCapMinV.TabIndex = 3
+        Me.tbSuperCapMinV.TabIndex = 0
         '
         'pnSuperCapResistance
         '
@@ -723,7 +717,7 @@ Partial Class BatteryForm
         Me.pnSuperCapResistance.Location = New System.Drawing.Point(225, 3)
         Me.pnSuperCapResistance.Name = "pnSuperCapResistance"
         Me.pnSuperCapResistance.Size = New System.Drawing.Size(212, 30)
-        Me.pnSuperCapResistance.TabIndex = 25
+        Me.pnSuperCapResistance.TabIndex = 3
         '
         'lblSuperCapRi
         '
@@ -748,7 +742,7 @@ Partial Class BatteryForm
         Me.tbSuperCapRi.Location = New System.Drawing.Point(108, 5)
         Me.tbSuperCapRi.Name = "tbSuperCapRi"
         Me.tbSuperCapRi.Size = New System.Drawing.Size(57, 20)
-        Me.tbSuperCapRi.TabIndex = 3
+        Me.tbSuperCapRi.TabIndex = 0
         '
         'pnSuperCapCapacity
         '
@@ -758,7 +752,7 @@ Partial Class BatteryForm
         Me.pnSuperCapCapacity.Location = New System.Drawing.Point(3, 3)
         Me.pnSuperCapCapacity.Name = "pnSuperCapCapacity"
         Me.pnSuperCapCapacity.Size = New System.Drawing.Size(212, 30)
-        Me.pnSuperCapCapacity.TabIndex = 4
+        Me.pnSuperCapCapacity.TabIndex = 0
         '
         'lblSuperCapCapacity
         '
@@ -783,16 +777,16 @@ Partial Class BatteryForm
         Me.tbSuperCapCapacity.Location = New System.Drawing.Point(90, 4)
         Me.tbSuperCapCapacity.Name = "tbSuperCapCapacity"
         Me.tbSuperCapCapacity.Size = New System.Drawing.Size(57, 20)
-        Me.tbSuperCapCapacity.TabIndex = 3
+        Me.tbSuperCapCapacity.TabIndex = 0
         '
         'cbRESSType
         '
         Me.cbRESSType.FormattingEnabled = true
         Me.cbRESSType.Location = New System.Drawing.Point(111, 107)
-        Me.cbRESSType.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+        Me.cbRESSType.Margin = New System.Windows.Forms.Padding(2)
         Me.cbRESSType.Name = "cbRESSType"
         Me.cbRESSType.Size = New System.Drawing.Size(142, 21)
-        Me.cbRESSType.TabIndex = 51
+        Me.cbRESSType.TabIndex = 1
         '
         'lblRessType
         '
@@ -809,7 +803,7 @@ Partial Class BatteryForm
         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(898, 371)
+        Me.ClientSize = New System.Drawing.Size(898, 369)
         Me.Controls.Add(Me.lblRessType)
         Me.Controls.Add(Me.cbRESSType)
         Me.Controls.Add(Me.FlowLayoutPanel1)
diff --git a/VECTO/GUI/BusAuxiliariesEngParametersForm.Designer.vb b/VECTO/GUI/BusAuxiliariesEngParametersForm.Designer.vb
index 4b8a111e7e7ce45b1b8139841d467ef52836d4f9..33db7a9710096b07132a3d4ca1d0ab4d4bd6960a 100644
--- a/VECTO/GUI/BusAuxiliariesEngParametersForm.Designer.vb
+++ b/VECTO/GUI/BusAuxiliariesEngParametersForm.Designer.vb
@@ -158,30 +158,31 @@ Partial Class BusAuxiliariesEngParametersForm
         '
         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(936, 505)
+        Me.ButCancel.Location = New System.Drawing.Point(936, 398)
         Me.ButCancel.Name = "ButCancel"
         Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-        Me.ButCancel.TabIndex = 13
+        Me.ButCancel.TabIndex = 4
         Me.ButCancel.Text = "Cancel"
         Me.ButCancel.UseVisualStyleBackColor = true
         '
         '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(855, 505)
+        Me.ButOK.Location = New System.Drawing.Point(855, 398)
         Me.ButOK.Name = "ButOK"
         Me.ButOK.Size = New System.Drawing.Size(75, 23)
-        Me.ButOK.TabIndex = 12
+        Me.ButOK.TabIndex = 3
         Me.ButOK.Text = "Save"
         Me.ButOK.UseVisualStyleBackColor = true
         '
         'ToolStrip1
         '
         Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
         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.Size = New System.Drawing.Size(1023, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(1023, 31)
         Me.ToolStrip1.TabIndex = 30
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -191,7 +192,7 @@ Partial Class BusAuxiliariesEngParametersForm
         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(23, 22)
+        Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtNew.Text = "ToolStripButton1"
         Me.ToolStripBtNew.ToolTipText = "New"
         '
@@ -201,7 +202,7 @@ Partial Class BusAuxiliariesEngParametersForm
         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(23, 22)
+        Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtOpen.Text = "ToolStripButton1"
         Me.ToolStripBtOpen.ToolTipText = "Open..."
         '
@@ -211,7 +212,7 @@ Partial Class BusAuxiliariesEngParametersForm
         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(23, 22)
+        Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtSave.Text = "ToolStripButton1"
         Me.ToolStripBtSave.ToolTipText = "Save"
         '
@@ -221,14 +222,14 @@ Partial Class BusAuxiliariesEngParametersForm
         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(23, 22)
+        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, 25)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripBtSendTo
         '
@@ -236,14 +237,14 @@ Partial Class BusAuxiliariesEngParametersForm
         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(23, 22)
+        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, 25)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripButton1
         '
@@ -251,13 +252,14 @@ Partial Class BusAuxiliariesEngParametersForm
         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(23, 22)
+        Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton1.Text = "Help"
         '
         '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, 531)
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 424)
         Me.StatusStrip1.Name = "StatusStrip1"
         Me.StatusStrip1.Size = New System.Drawing.Size(1023, 22)
         Me.StatusStrip1.SizingGrip = false
@@ -282,6 +284,7 @@ Partial Class BusAuxiliariesEngParametersForm
         '
         'CmOpenFile
         '
+        Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
         Me.CmOpenFile.Name = "CmOpenFile"
         Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
@@ -321,8 +324,8 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.gbElectricSystem.Controls.Add(Me.pnCurrentDemand)
         Me.gbElectricSystem.Location = New System.Drawing.Point(12, 74)
         Me.gbElectricSystem.Name = "gbElectricSystem"
-        Me.gbElectricSystem.Size = New System.Drawing.Size(317, 403)
-        Me.gbElectricSystem.TabIndex = 49
+        Me.gbElectricSystem.Size = New System.Drawing.Size(317, 339)
+        Me.gbElectricSystem.TabIndex = 0
         Me.gbElectricSystem.TabStop = false
         Me.gbElectricSystem.Text = "Electric System"
         '
@@ -334,7 +337,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnDCDCEff.Location = New System.Drawing.Point(10, 294)
         Me.pnDCDCEff.Name = "pnDCDCEff"
         Me.pnDCDCEff.Size = New System.Drawing.Size(288, 28)
-        Me.pnDCDCEff.TabIndex = 26
+        Me.pnDCDCEff.TabIndex = 9
         '
         'lblDCDCEff
         '
@@ -367,7 +370,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnES_HEVREESS.Location = New System.Drawing.Point(10, 265)
         Me.pnES_HEVREESS.Name = "pnES_HEVREESS"
         Me.pnES_HEVREESS.Size = New System.Drawing.Size(288, 28)
-        Me.pnES_HEVREESS.TabIndex = 54
+        Me.pnES_HEVREESS.TabIndex = 8
         '
         'cbES_HEVREESS
         '
@@ -386,7 +389,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnAlternatorTechnology.Location = New System.Drawing.Point(10, 139)
         Me.pnAlternatorTechnology.Name = "pnAlternatorTechnology"
         Me.pnAlternatorTechnology.Size = New System.Drawing.Size(288, 28)
-        Me.pnAlternatorTechnology.TabIndex = 26
+        Me.pnAlternatorTechnology.TabIndex = 4
         '
         'cbAlternatorTechnology
         '
@@ -413,7 +416,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnSmartElectricParams.Location = New System.Drawing.Point(10, 168)
         Me.pnSmartElectricParams.Name = "pnSmartElectricParams"
         Me.pnSmartElectricParams.Size = New System.Drawing.Size(288, 96)
-        Me.pnSmartElectricParams.TabIndex = 27
+        Me.pnSmartElectricParams.TabIndex = 5
         '
         'pnBattEfficiency
         '
@@ -423,7 +426,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnBattEfficiency.Location = New System.Drawing.Point(0, 63)
         Me.pnBattEfficiency.Name = "pnBattEfficiency"
         Me.pnBattEfficiency.Size = New System.Drawing.Size(300, 28)
-        Me.pnBattEfficiency.TabIndex = 28
+        Me.pnBattEfficiency.TabIndex = 2
         '
         'lblBatEfficiency
         '
@@ -458,7 +461,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnElectricStorageCapacity.Location = New System.Drawing.Point(0, 33)
         Me.pnElectricStorageCapacity.Name = "pnElectricStorageCapacity"
         Me.pnElectricStorageCapacity.Size = New System.Drawing.Size(300, 28)
-        Me.pnElectricStorageCapacity.TabIndex = 27
+        Me.pnElectricStorageCapacity.TabIndex = 1
         '
         'lblElectricStorageCapacity
         '
@@ -493,7 +496,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnMaxAlternatorPower.Location = New System.Drawing.Point(0, 3)
         Me.pnMaxAlternatorPower.Name = "pnMaxAlternatorPower"
         Me.pnMaxAlternatorPower.Size = New System.Drawing.Size(288, 28)
-        Me.pnMaxAlternatorPower.TabIndex = 26
+        Me.pnMaxAlternatorPower.TabIndex = 0
         '
         'lblMaxAlternatorPower
         '
@@ -528,7 +531,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnAlternatorEfficiency.Location = New System.Drawing.Point(10, 109)
         Me.pnAlternatorEfficiency.Name = "pnAlternatorEfficiency"
         Me.pnAlternatorEfficiency.Size = New System.Drawing.Size(288, 28)
-        Me.pnAlternatorEfficiency.TabIndex = 25
+        Me.pnAlternatorEfficiency.TabIndex = 3
         '
         'lblAlternatorEfficiency
         '
@@ -563,7 +566,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnCurrentDemandEngineOffStandstill.Location = New System.Drawing.Point(10, 79)
         Me.pnCurrentDemandEngineOffStandstill.Name = "pnCurrentDemandEngineOffStandstill"
         Me.pnCurrentDemandEngineOffStandstill.Size = New System.Drawing.Size(288, 28)
-        Me.pnCurrentDemandEngineOffStandstill.TabIndex = 26
+        Me.pnCurrentDemandEngineOffStandstill.TabIndex = 2
         '
         'lblCurrentDemandEngineIffStandstill
         '
@@ -598,7 +601,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnCurrentDemandEngineOffDriving.Location = New System.Drawing.Point(10, 49)
         Me.pnCurrentDemandEngineOffDriving.Name = "pnCurrentDemandEngineOffDriving"
         Me.pnCurrentDemandEngineOffDriving.Size = New System.Drawing.Size(288, 28)
-        Me.pnCurrentDemandEngineOffDriving.TabIndex = 25
+        Me.pnCurrentDemandEngineOffDriving.TabIndex = 1
         '
         'lblCurrentDemandEngineOffDriving
         '
@@ -633,7 +636,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnCurrentDemand.Location = New System.Drawing.Point(10, 19)
         Me.pnCurrentDemand.Name = "pnCurrentDemand"
         Me.pnCurrentDemand.Size = New System.Drawing.Size(288, 28)
-        Me.pnCurrentDemand.TabIndex = 4
+        Me.pnCurrentDemand.TabIndex = 0
         '
         'lblCurrentDemand
         '
@@ -669,7 +672,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.bgPneumaticSystem.Location = New System.Drawing.Point(335, 74)
         Me.bgPneumaticSystem.Name = "bgPneumaticSystem"
         Me.bgPneumaticSystem.Size = New System.Drawing.Size(317, 181)
-        Me.bgPneumaticSystem.TabIndex = 51
+        Me.bgPneumaticSystem.TabIndex = 1
         Me.bgPneumaticSystem.TabStop = false
         Me.bgPneumaticSystem.Text = "Pneumatic System"
         '
@@ -679,7 +682,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnSmartCompressor.Location = New System.Drawing.Point(10, 141)
         Me.pnSmartCompressor.Name = "pnSmartCompressor"
         Me.pnSmartCompressor.Size = New System.Drawing.Size(288, 28)
-        Me.pnSmartCompressor.TabIndex = 53
+        Me.pnSmartCompressor.TabIndex = 3
         '
         'cbSmartCompressor
         '
@@ -699,7 +702,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnCompressorRatio.Location = New System.Drawing.Point(10, 111)
         Me.pnCompressorRatio.Name = "pnCompressorRatio"
         Me.pnCompressorRatio.Size = New System.Drawing.Size(288, 28)
-        Me.pnCompressorRatio.TabIndex = 52
+        Me.pnCompressorRatio.TabIndex = 2
         '
         'lblCompressorRatio
         '
@@ -734,7 +737,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnCompressorMap.Location = New System.Drawing.Point(10, 19)
         Me.pnCompressorMap.Name = "pnCompressorMap"
         Me.pnCompressorMap.Size = New System.Drawing.Size(288, 56)
-        Me.pnCompressorMap.TabIndex = 52
+        Me.pnCompressorMap.TabIndex = 0
         '
         'lblCompressorMap
         '
@@ -753,7 +756,6 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.btnBrowseCompressorMap.Name = "btnBrowseCompressorMap"
         Me.btnBrowseCompressorMap.Size = New System.Drawing.Size(24, 24)
         Me.btnBrowseCompressorMap.TabIndex = 2
-        Me.btnBrowseCompressorMap.TabStop = false
         Me.btnBrowseCompressorMap.UseVisualStyleBackColor = true
         '
         'tbCompressorMap
@@ -773,7 +775,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnAverageAirDemand.Location = New System.Drawing.Point(10, 81)
         Me.pnAverageAirDemand.Name = "pnAverageAirDemand"
         Me.pnAverageAirDemand.Size = New System.Drawing.Size(300, 28)
-        Me.pnAverageAirDemand.TabIndex = 51
+        Me.pnAverageAirDemand.TabIndex = 1
         '
         'lblAverageAirDemand
         '
@@ -809,7 +811,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.gbHVAC.Location = New System.Drawing.Point(658, 74)
         Me.gbHVAC.Name = "gbHVAC"
         Me.gbHVAC.Size = New System.Drawing.Size(317, 160)
-        Me.gbHVAC.TabIndex = 52
+        Me.gbHVAC.TabIndex = 2
         Me.gbHVAC.TabStop = false
         Me.gbHVAC.Text = "HVAC System"
         '
@@ -821,7 +823,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnHvacHeatingDemand.Location = New System.Drawing.Point(10, 109)
         Me.pnHvacHeatingDemand.Name = "pnHvacHeatingDemand"
         Me.pnHvacHeatingDemand.Size = New System.Drawing.Size(288, 28)
-        Me.pnHvacHeatingDemand.TabIndex = 27
+        Me.pnHvacHeatingDemand.TabIndex = 3
         '
         'lblHvacHeatingDemand
         '
@@ -856,7 +858,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnHvacAuxHeaterPwr.Location = New System.Drawing.Point(10, 79)
         Me.pnHvacAuxHeaterPwr.Name = "pnHvacAuxHeaterPwr"
         Me.pnHvacAuxHeaterPwr.Size = New System.Drawing.Size(288, 28)
-        Me.pnHvacAuxHeaterPwr.TabIndex = 27
+        Me.pnHvacAuxHeaterPwr.TabIndex = 2
         '
         'lblHvacAuxHEaterPwr
         '
@@ -891,7 +893,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnHvacElecPowerDemand.Location = New System.Drawing.Point(10, 49)
         Me.pnHvacElecPowerDemand.Name = "pnHvacElecPowerDemand"
         Me.pnHvacElecPowerDemand.Size = New System.Drawing.Size(288, 28)
-        Me.pnHvacElecPowerDemand.TabIndex = 27
+        Me.pnHvacElecPowerDemand.TabIndex = 1
         '
         'lblHvacElectricPowerDemand
         '
@@ -926,7 +928,7 @@ Partial Class BusAuxiliariesEngParametersForm
         Me.pnHvacMechPowerDemand.Location = New System.Drawing.Point(10, 19)
         Me.pnHvacMechPowerDemand.Name = "pnHvacMechPowerDemand"
         Me.pnHvacMechPowerDemand.Size = New System.Drawing.Size(288, 28)
-        Me.pnHvacMechPowerDemand.TabIndex = 27
+        Me.pnHvacMechPowerDemand.TabIndex = 0
         '
         'lblHvacMechPowerDemand
         '
@@ -959,7 +961,7 @@ Partial Class BusAuxiliariesEngParametersForm
         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(1023, 553)
+        Me.ClientSize = New System.Drawing.Size(1023, 446)
         Me.Controls.Add(Me.gbHVAC)
         Me.Controls.Add(Me.bgPneumaticSystem)
         Me.Controls.Add(Me.gbElectricSystem)
diff --git a/VECTO/GUI/EMGearRatioDialog.Designer.vb b/VECTO/GUI/EMGearRatioDialog.Designer.vb
index 1e407e203f3f59bc089b30cb353dda99277d105e..2cbecc5a7122a375531dbd689e74d3ba04eef5bb 100644
--- a/VECTO/GUI/EMGearRatioDialog.Designer.vb
+++ b/VECTO/GUI/EMGearRatioDialog.Designer.vb
@@ -67,7 +67,7 @@ Partial Class EMGearRatioDialog
         Me.OK_Button.Location = New System.Drawing.Point(3, 3)
         Me.OK_Button.Name = "OK_Button"
         Me.OK_Button.Size = New System.Drawing.Size(67, 23)
-        Me.OK_Button.TabIndex = 0
+        Me.OK_Button.TabIndex = 2
         Me.OK_Button.Text = "OK"
         '
         'Cancel_Button
@@ -77,7 +77,7 @@ Partial Class EMGearRatioDialog
         Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
         Me.Cancel_Button.Name = "Cancel_Button"
         Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
-        Me.Cancel_Button.TabIndex = 1
+        Me.Cancel_Button.TabIndex = 3
         Me.Cancel_Button.Text = "Cancel"
         '
         'Label3
@@ -94,7 +94,7 @@ Partial Class EMGearRatioDialog
         Me.tbGear.Location = New System.Drawing.Point(70, 12)
         Me.tbGear.Name = "tbGear"
         Me.tbGear.Size = New System.Drawing.Size(41, 20)
-        Me.tbGear.TabIndex = 2
+        Me.tbGear.TabIndex = 0
         Me.tbGear.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
         '
         'Label5
@@ -120,7 +120,7 @@ Partial Class EMGearRatioDialog
         Me.tbGearRatio.Location = New System.Drawing.Point(241, 13)
         Me.tbGearRatio.Name = "tbGearRatio"
         Me.tbGearRatio.Size = New System.Drawing.Size(84, 20)
-        Me.tbGearRatio.TabIndex = 3
+        Me.tbGearRatio.TabIndex = 1
         Me.tbGearRatio.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
         '
         'EMGearRatioDialog
diff --git a/VECTO/GUI/ElectricMotorForm.Designer.vb b/VECTO/GUI/ElectricMotorForm.Designer.vb
index 70818ca19372d4782f72896991e797ce838f401e..a978334f88ba8d214aa0cdd166abfb25240ad6ba 100644
--- a/VECTO/GUI/ElectricMotorForm.Designer.vb
+++ b/VECTO/GUI/ElectricMotorForm.Designer.vb
@@ -166,7 +166,7 @@ Partial Class ElectricMotorForm
         Me.ButCancel.Location = New System.Drawing.Point(811, 574)
         Me.ButCancel.Name = "ButCancel"
         Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-        Me.ButCancel.TabIndex = 13
+        Me.ButCancel.TabIndex = 11
         Me.ButCancel.Text = "Cancel"
         Me.ButCancel.UseVisualStyleBackColor = true
         '
@@ -176,7 +176,7 @@ Partial Class ElectricMotorForm
         Me.ButOK.Location = New System.Drawing.Point(730, 574)
         Me.ButOK.Name = "ButOK"
         Me.ButOK.Size = New System.Drawing.Size(75, 23)
-        Me.ButOK.TabIndex = 12
+        Me.ButOK.TabIndex = 10
         Me.ButOK.Text = "Save"
         Me.ButOK.UseVisualStyleBackColor = true
         '
@@ -331,14 +331,14 @@ Partial Class ElectricMotorForm
         Me.pnInertia.Location = New System.Drawing.Point(12, 108)
         Me.pnInertia.Name = "pnInertia"
         Me.pnInertia.Size = New System.Drawing.Size(221, 30)
-        Me.pnInertia.TabIndex = 3
+        Me.pnInertia.TabIndex = 1
         '
         'tbDragTorqueHi
         '
         Me.tbDragTorqueHi.Location = New System.Drawing.Point(6, 103)
         Me.tbDragTorqueHi.Name = "tbDragTorqueHi"
         Me.tbDragTorqueHi.Size = New System.Drawing.Size(406, 20)
-        Me.tbDragTorqueHi.TabIndex = 5
+        Me.tbDragTorqueHi.TabIndex = 4
         '
         'lblDragTorqueHi
         '
@@ -355,8 +355,7 @@ Partial Class ElectricMotorForm
         Me.btnBrowseDragCurveHi.Location = New System.Drawing.Point(420, 100)
         Me.btnBrowseDragCurveHi.Name = "btnBrowseDragCurveHi"
         Me.btnBrowseDragCurveHi.Size = New System.Drawing.Size(24, 24)
-        Me.btnBrowseDragCurveHi.TabIndex = 6
-        Me.btnBrowseDragCurveHi.TabStop = false
+        Me.btnBrowseDragCurveHi.TabIndex = 5
         Me.btnBrowseDragCurveHi.UseVisualStyleBackColor = true
         '
         'btnDragCurveOpenHi
@@ -365,8 +364,7 @@ Partial Class ElectricMotorForm
         Me.btnDragCurveOpenHi.Location = New System.Drawing.Point(443, 100)
         Me.btnDragCurveOpenHi.Name = "btnDragCurveOpenHi"
         Me.btnDragCurveOpenHi.Size = New System.Drawing.Size(24, 24)
-        Me.btnDragCurveOpenHi.TabIndex = 7
-        Me.btnDragCurveOpenHi.TabStop = false
+        Me.btnDragCurveOpenHi.TabIndex = 6
         Me.btnDragCurveOpenHi.UseVisualStyleBackColor = true
         '
         'btnEmMapOpenHi
@@ -375,8 +373,7 @@ Partial Class ElectricMotorForm
         Me.btnEmMapOpenHi.Location = New System.Drawing.Point(443, 141)
         Me.btnEmMapOpenHi.Name = "btnEmMapOpenHi"
         Me.btnEmMapOpenHi.Size = New System.Drawing.Size(24, 24)
-        Me.btnEmMapOpenHi.TabIndex = 42
-        Me.btnEmMapOpenHi.TabStop = false
+        Me.btnEmMapOpenHi.TabIndex = 9
         Me.btnEmMapOpenHi.UseVisualStyleBackColor = true
         '
         'btnBrowseEmMapHi
@@ -385,8 +382,7 @@ Partial Class ElectricMotorForm
         Me.btnBrowseEmMapHi.Location = New System.Drawing.Point(420, 141)
         Me.btnBrowseEmMapHi.Name = "btnBrowseEmMapHi"
         Me.btnBrowseEmMapHi.Size = New System.Drawing.Size(24, 24)
-        Me.btnBrowseEmMapHi.TabIndex = 41
-        Me.btnBrowseEmMapHi.TabStop = false
+        Me.btnBrowseEmMapHi.TabIndex = 8
         Me.btnBrowseEmMapHi.UseVisualStyleBackColor = true
         '
         'lblPowerMapHi
@@ -403,7 +399,7 @@ Partial Class ElectricMotorForm
         Me.tbMapHi.Location = New System.Drawing.Point(6, 144)
         Me.tbMapHi.Name = "tbMapHi"
         Me.tbMapHi.Size = New System.Drawing.Size(406, 20)
-        Me.tbMapHi.TabIndex = 40
+        Me.tbMapHi.TabIndex = 7
         '
         'btnMaxTorqueCurveOpenHi
         '
@@ -411,8 +407,7 @@ Partial Class ElectricMotorForm
         Me.btnMaxTorqueCurveOpenHi.Location = New System.Drawing.Point(443, 60)
         Me.btnMaxTorqueCurveOpenHi.Name = "btnMaxTorqueCurveOpenHi"
         Me.btnMaxTorqueCurveOpenHi.Size = New System.Drawing.Size(24, 24)
-        Me.btnMaxTorqueCurveOpenHi.TabIndex = 46
-        Me.btnMaxTorqueCurveOpenHi.TabStop = false
+        Me.btnMaxTorqueCurveOpenHi.TabIndex = 3
         Me.btnMaxTorqueCurveOpenHi.UseVisualStyleBackColor = true
         '
         'btnBrowseMaxTorqueHi
@@ -421,8 +416,7 @@ Partial Class ElectricMotorForm
         Me.btnBrowseMaxTorqueHi.Location = New System.Drawing.Point(420, 60)
         Me.btnBrowseMaxTorqueHi.Name = "btnBrowseMaxTorqueHi"
         Me.btnBrowseMaxTorqueHi.Size = New System.Drawing.Size(24, 24)
-        Me.btnBrowseMaxTorqueHi.TabIndex = 45
-        Me.btnBrowseMaxTorqueHi.TabStop = false
+        Me.btnBrowseMaxTorqueHi.TabIndex = 2
         Me.btnBrowseMaxTorqueHi.UseVisualStyleBackColor = true
         '
         'lblMaxTorqueHi
@@ -439,7 +433,7 @@ Partial Class ElectricMotorForm
         Me.tbMaxTorqueHi.Location = New System.Drawing.Point(6, 62)
         Me.tbMaxTorqueHi.Name = "tbMaxTorqueHi"
         Me.tbMaxTorqueHi.Size = New System.Drawing.Size(406, 20)
-        Me.tbMaxTorqueHi.TabIndex = 44
+        Me.tbMaxTorqueHi.TabIndex = 1
         '
         'lblTitle
         '
@@ -470,7 +464,7 @@ Partial Class ElectricMotorForm
         Me.Panel1.Location = New System.Drawing.Point(12, 144)
         Me.Panel1.Name = "Panel1"
         Me.Panel1.Size = New System.Drawing.Size(221, 30)
-        Me.Panel1.TabIndex = 25
+        Me.Panel1.TabIndex = 2
         '
         'lblContTq
         '
@@ -505,7 +499,7 @@ Partial Class ElectricMotorForm
         Me.Panel2.Location = New System.Drawing.Point(12, 206)
         Me.Panel2.Name = "Panel2"
         Me.Panel2.Size = New System.Drawing.Size(221, 30)
-        Me.Panel2.TabIndex = 25
+        Me.Panel2.TabIndex = 4
         '
         'lblOvlTime
         '
@@ -540,7 +534,7 @@ Partial Class ElectricMotorForm
         Me.Panel3.Location = New System.Drawing.Point(233, 206)
         Me.Panel3.Name = "Panel3"
         Me.Panel3.Size = New System.Drawing.Size(261, 30)
-        Me.Panel3.TabIndex = 26
+        Me.Panel3.TabIndex = 7
         '
         'lblOvlRecovery
         '
@@ -575,7 +569,7 @@ Partial Class ElectricMotorForm
         Me.Panel4.Location = New System.Drawing.Point(233, 144)
         Me.Panel4.Name = "Panel4"
         Me.Panel4.Size = New System.Drawing.Size(261, 30)
-        Me.Panel4.TabIndex = 26
+        Me.Panel4.TabIndex = 5
         '
         'lblRatedSpeed
         '
@@ -610,7 +604,7 @@ Partial Class ElectricMotorForm
         Me.pnOverloadTq.Location = New System.Drawing.Point(12, 175)
         Me.pnOverloadTq.Name = "pnOverloadTq"
         Me.pnOverloadTq.Size = New System.Drawing.Size(221, 30)
-        Me.pnOverloadTq.TabIndex = 26
+        Me.pnOverloadTq.TabIndex = 3
         '
         'lblOverloadTq
         '
@@ -645,7 +639,7 @@ Partial Class ElectricMotorForm
         Me.Panel6.Location = New System.Drawing.Point(233, 175)
         Me.Panel6.Name = "Panel6"
         Me.Panel6.Size = New System.Drawing.Size(261, 30)
-        Me.Panel6.TabIndex = 27
+        Me.Panel6.TabIndex = 6
         '
         'lblOverloadSpeed
         '
@@ -692,7 +686,7 @@ Partial Class ElectricMotorForm
         Me.gbVoltageLevelHi.Location = New System.Drawing.Point(12, 418)
         Me.gbVoltageLevelHi.Name = "gbVoltageLevelHi"
         Me.gbVoltageLevelHi.Size = New System.Drawing.Size(482, 170)
-        Me.gbVoltageLevelHi.TabIndex = 50
+        Me.gbVoltageLevelHi.TabIndex = 9
         Me.gbVoltageLevelHi.TabStop = false
         Me.gbVoltageLevelHi.Text = "Voltage Level High"
         '
@@ -719,7 +713,7 @@ Partial Class ElectricMotorForm
         Me.tbVoltageHi.Location = New System.Drawing.Point(136, 19)
         Me.tbVoltageHi.Name = "tbVoltageHi"
         Me.tbVoltageHi.Size = New System.Drawing.Size(49, 20)
-        Me.tbVoltageHi.TabIndex = 49
+        Me.tbVoltageHi.TabIndex = 0
         '
         'gbVoltageLevelLow
         '
@@ -741,7 +735,7 @@ Partial Class ElectricMotorForm
         Me.gbVoltageLevelLow.Location = New System.Drawing.Point(12, 242)
         Me.gbVoltageLevelLow.Name = "gbVoltageLevelLow"
         Me.gbVoltageLevelLow.Size = New System.Drawing.Size(482, 170)
-        Me.gbVoltageLevelLow.TabIndex = 51
+        Me.gbVoltageLevelLow.TabIndex = 8
         Me.gbVoltageLevelLow.TabStop = false
         Me.gbVoltageLevelLow.Text = "Voltage Level Low"
         '
@@ -768,7 +762,7 @@ Partial Class ElectricMotorForm
         Me.tbVoltageLow.Location = New System.Drawing.Point(136, 19)
         Me.tbVoltageLow.Name = "tbVoltageLow"
         Me.tbVoltageLow.Size = New System.Drawing.Size(49, 20)
-        Me.tbVoltageLow.TabIndex = 49
+        Me.tbVoltageLow.TabIndex = 0
         '
         'lblMaxTorqueLow
         '
@@ -784,7 +778,7 @@ Partial Class ElectricMotorForm
         Me.tbDragTorqueLow.Location = New System.Drawing.Point(6, 103)
         Me.tbDragTorqueLow.Name = "tbDragTorqueLow"
         Me.tbDragTorqueLow.Size = New System.Drawing.Size(406, 20)
-        Me.tbDragTorqueLow.TabIndex = 5
+        Me.tbDragTorqueLow.TabIndex = 4
         '
         'lblDragTorqueLow
         '
@@ -801,8 +795,7 @@ Partial Class ElectricMotorForm
         Me.btnBrowseDragCurveLow.Location = New System.Drawing.Point(420, 100)
         Me.btnBrowseDragCurveLow.Name = "btnBrowseDragCurveLow"
         Me.btnBrowseDragCurveLow.Size = New System.Drawing.Size(24, 24)
-        Me.btnBrowseDragCurveLow.TabIndex = 6
-        Me.btnBrowseDragCurveLow.TabStop = false
+        Me.btnBrowseDragCurveLow.TabIndex = 5
         Me.btnBrowseDragCurveLow.UseVisualStyleBackColor = true
         '
         'btnDragCurveOpenLow
@@ -811,8 +804,7 @@ Partial Class ElectricMotorForm
         Me.btnDragCurveOpenLow.Location = New System.Drawing.Point(443, 100)
         Me.btnDragCurveOpenLow.Name = "btnDragCurveOpenLow"
         Me.btnDragCurveOpenLow.Size = New System.Drawing.Size(24, 24)
-        Me.btnDragCurveOpenLow.TabIndex = 7
-        Me.btnDragCurveOpenLow.TabStop = false
+        Me.btnDragCurveOpenLow.TabIndex = 6
         Me.btnDragCurveOpenLow.UseVisualStyleBackColor = true
         '
         'tbMapLow
@@ -820,7 +812,7 @@ Partial Class ElectricMotorForm
         Me.tbMapLow.Location = New System.Drawing.Point(6, 144)
         Me.tbMapLow.Name = "tbMapLow"
         Me.tbMapLow.Size = New System.Drawing.Size(406, 20)
-        Me.tbMapLow.TabIndex = 40
+        Me.tbMapLow.TabIndex = 7
         '
         'lblPowerMapLow
         '
@@ -837,8 +829,7 @@ Partial Class ElectricMotorForm
         Me.btnBrowseEmMapLow.Location = New System.Drawing.Point(420, 141)
         Me.btnBrowseEmMapLow.Name = "btnBrowseEmMapLow"
         Me.btnBrowseEmMapLow.Size = New System.Drawing.Size(24, 24)
-        Me.btnBrowseEmMapLow.TabIndex = 41
-        Me.btnBrowseEmMapLow.TabStop = false
+        Me.btnBrowseEmMapLow.TabIndex = 8
         Me.btnBrowseEmMapLow.UseVisualStyleBackColor = true
         '
         'btnEmMapOpenLow
@@ -847,8 +838,7 @@ Partial Class ElectricMotorForm
         Me.btnEmMapOpenLow.Location = New System.Drawing.Point(443, 141)
         Me.btnEmMapOpenLow.Name = "btnEmMapOpenLow"
         Me.btnEmMapOpenLow.Size = New System.Drawing.Size(24, 24)
-        Me.btnEmMapOpenLow.TabIndex = 42
-        Me.btnEmMapOpenLow.TabStop = false
+        Me.btnEmMapOpenLow.TabIndex = 9
         Me.btnEmMapOpenLow.UseVisualStyleBackColor = true
         '
         'tbMaxTorqueLow
@@ -856,7 +846,7 @@ Partial Class ElectricMotorForm
         Me.tbMaxTorqueLow.Location = New System.Drawing.Point(6, 62)
         Me.tbMaxTorqueLow.Name = "tbMaxTorqueLow"
         Me.tbMaxTorqueLow.Size = New System.Drawing.Size(406, 20)
-        Me.tbMaxTorqueLow.TabIndex = 44
+        Me.tbMaxTorqueLow.TabIndex = 1
         '
         'btnMaxTorqueCurveOpenLow
         '
@@ -864,8 +854,7 @@ Partial Class ElectricMotorForm
         Me.btnMaxTorqueCurveOpenLow.Location = New System.Drawing.Point(443, 60)
         Me.btnMaxTorqueCurveOpenLow.Name = "btnMaxTorqueCurveOpenLow"
         Me.btnMaxTorqueCurveOpenLow.Size = New System.Drawing.Size(24, 24)
-        Me.btnMaxTorqueCurveOpenLow.TabIndex = 46
-        Me.btnMaxTorqueCurveOpenLow.TabStop = false
+        Me.btnMaxTorqueCurveOpenLow.TabIndex = 3
         Me.btnMaxTorqueCurveOpenLow.UseVisualStyleBackColor = true
         '
         'btnBrowseMaxTorqueLow
@@ -874,8 +863,7 @@ Partial Class ElectricMotorForm
         Me.btnBrowseMaxTorqueLow.Location = New System.Drawing.Point(420, 60)
         Me.btnBrowseMaxTorqueLow.Name = "btnBrowseMaxTorqueLow"
         Me.btnBrowseMaxTorqueLow.Size = New System.Drawing.Size(24, 24)
-        Me.btnBrowseMaxTorqueLow.TabIndex = 45
-        Me.btnBrowseMaxTorqueLow.TabStop = false
+        Me.btnBrowseMaxTorqueLow.TabIndex = 2
         Me.btnBrowseMaxTorqueLow.UseVisualStyleBackColor = true
         '
         'ElectricMotorForm
diff --git a/VECTO/GUI/EngineForm.Designer.vb b/VECTO/GUI/EngineForm.Designer.vb
index a030550927d7fffc10ca79946d0cafcb237d1796..742146d7d413aeb0016eae1ff340decd70638739 100644
--- a/VECTO/GUI/EngineForm.Designer.vb
+++ b/VECTO/GUI/EngineForm.Designer.vb
@@ -130,8 +130,11 @@ Partial Class EngineForm
         Me.Label35 = New System.Windows.Forms.Label()
         Me.cbDualFuel = New System.Windows.Forms.CheckBox()
         Me.tbWHR = New System.Windows.Forms.TabControl()
+        Me.TabPage1 = New System.Windows.Forms.TabPage()
+        Me.cbElWHR = New System.Windows.Forms.CheckBox()
+        Me.cbMechWHRNotConnectedCrankshaft = New System.Windows.Forms.CheckBox()
+        Me.cbMechWHRInMap = New System.Windows.Forms.CheckBox()
         Me.tbElectricalWHR = New System.Windows.Forms.TabPage()
-        Me.tbMechanicalWHR = New System.Windows.Forms.TabPage()
         Me.Label36 = New System.Windows.Forms.Label()
         Me.pnElWHRDeclaration = New System.Windows.Forms.Panel()
         Me.lblWHRRegPer = New System.Windows.Forms.Label()
@@ -148,6 +151,7 @@ Partial Class EngineForm
         Me.pnElWhrEngineering = New System.Windows.Forms.Panel()
         Me.tbElWHREngineering = New System.Windows.Forms.TextBox()
         Me.Label26 = New System.Windows.Forms.Label()
+        Me.tbMechanicalWHR = New System.Windows.Forms.TabPage()
         Me.Label37 = New System.Windows.Forms.Label()
         Me.pnMechWhrDeclaration = New System.Windows.Forms.Panel()
         Me.Label38 = New System.Windows.Forms.Label()
@@ -164,10 +168,6 @@ Partial Class EngineForm
         Me.pnMechWhrEngineering = New System.Windows.Forms.Panel()
         Me.tbMechWHREngineering = New System.Windows.Forms.TextBox()
         Me.Label46 = New System.Windows.Forms.Label()
-        Me.TabPage1 = New System.Windows.Forms.TabPage()
-        Me.cbMechWHRInMap = New System.Windows.Forms.CheckBox()
-        Me.cbMechWHRNotConnectedCrankshaft = New System.Windows.Forms.CheckBox()
-        Me.cbElWHR = New System.Windows.Forms.CheckBox()
         Me.ToolStrip1.SuspendLayout
         Me.StatusStrip1.SuspendLayout
         CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
@@ -184,13 +184,13 @@ Partial Class EngineForm
         Me.pnWhtcFuel2.SuspendLayout
         Me.pnEngCFFuel2.SuspendLayout
         Me.tbWHR.SuspendLayout
+        Me.TabPage1.SuspendLayout
         Me.tbElectricalWHR.SuspendLayout
-        Me.tbMechanicalWHR.SuspendLayout
         Me.pnElWHRDeclaration.SuspendLayout
         Me.pnElWhrEngineering.SuspendLayout
+        Me.tbMechanicalWHR.SuspendLayout
         Me.pnMechWhrDeclaration.SuspendLayout
         Me.pnMechWhrEngineering.SuspendLayout
-        Me.TabPage1.SuspendLayout
         Me.SuspendLayout
         '
         'TbIdleSpeed
@@ -214,7 +214,7 @@ Partial Class EngineForm
         Me.TbInertia.Location = New System.Drawing.Point(111, 4)
         Me.TbInertia.Name = "TbInertia"
         Me.TbInertia.Size = New System.Drawing.Size(57, 20)
-        Me.TbInertia.TabIndex = 3
+        Me.TbInertia.TabIndex = 0
         '
         'Label41
         '
@@ -250,7 +250,7 @@ Partial Class EngineForm
         Me.ButCancel.Location = New System.Drawing.Point(916, 552)
         Me.ButCancel.Name = "ButCancel"
         Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-        Me.ButCancel.TabIndex = 13
+        Me.ButCancel.TabIndex = 14
         Me.ButCancel.Text = "Cancel"
         Me.ButCancel.UseVisualStyleBackColor = true
         '
@@ -260,17 +260,18 @@ Partial Class EngineForm
         Me.ButOK.Location = New System.Drawing.Point(835, 552)
         Me.ButOK.Name = "ButOK"
         Me.ButOK.Size = New System.Drawing.Size(75, 23)
-        Me.ButOK.TabIndex = 12
+        Me.ButOK.TabIndex = 13
         Me.ButOK.Text = "Save"
         Me.ButOK.UseVisualStyleBackColor = true
         '
         'ToolStrip1
         '
         Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
         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.Size = New System.Drawing.Size(1003, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(1003, 31)
         Me.ToolStrip1.TabIndex = 30
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -280,7 +281,7 @@ Partial Class EngineForm
         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(23, 22)
+        Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtNew.Text = "ToolStripButton1"
         Me.ToolStripBtNew.ToolTipText = "New"
         '
@@ -290,7 +291,7 @@ Partial Class EngineForm
         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(23, 22)
+        Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtOpen.Text = "ToolStripButton1"
         Me.ToolStripBtOpen.ToolTipText = "Open..."
         '
@@ -300,7 +301,7 @@ Partial Class EngineForm
         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(23, 22)
+        Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtSave.Text = "ToolStripButton1"
         Me.ToolStripBtSave.ToolTipText = "Save"
         '
@@ -310,14 +311,14 @@ Partial Class EngineForm
         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(23, 22)
+        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, 25)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripBtSendTo
         '
@@ -325,14 +326,14 @@ Partial Class EngineForm
         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(23, 22)
+        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, 25)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripButton1
         '
@@ -340,11 +341,12 @@ Partial Class EngineForm
         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(23, 22)
+        Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton1.Text = "Help"
         '
         '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, 578)
         Me.StatusStrip1.Name = "StatusStrip1"
@@ -405,7 +407,7 @@ Partial Class EngineForm
         Me.TbMAP.Location = New System.Drawing.Point(6, 57)
         Me.TbMAP.Name = "TbMAP"
         Me.TbMAP.Size = New System.Drawing.Size(406, 20)
-        Me.TbMAP.TabIndex = 5
+        Me.TbMAP.TabIndex = 1
         '
         'Label6
         '
@@ -422,8 +424,7 @@ Partial Class EngineForm
         Me.BtMAP.Location = New System.Drawing.Point(418, 55)
         Me.BtMAP.Name = "BtMAP"
         Me.BtMAP.Size = New System.Drawing.Size(24, 24)
-        Me.BtMAP.TabIndex = 6
-        Me.BtMAP.TabStop = false
+        Me.BtMAP.TabIndex = 2
         Me.BtMAP.UseVisualStyleBackColor = true
         '
         'PictureBox1
@@ -438,6 +439,7 @@ Partial Class EngineForm
         '
         'CmOpenFile
         '
+        Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
         Me.CmOpenFile.Name = "CmOpenFile"
         Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
@@ -460,8 +462,7 @@ Partial Class EngineForm
         Me.BtMAPopen.Location = New System.Drawing.Point(441, 55)
         Me.BtMAPopen.Name = "BtMAPopen"
         Me.BtMAPopen.Size = New System.Drawing.Size(24, 24)
-        Me.BtMAPopen.TabIndex = 7
-        Me.BtMAPopen.TabStop = false
+        Me.BtMAPopen.TabIndex = 3
         Me.BtMAPopen.UseVisualStyleBackColor = true
         '
         'PnInertia
@@ -472,7 +473,7 @@ Partial Class EngineForm
         Me.PnInertia.Location = New System.Drawing.Point(272, 188)
         Me.PnInertia.Name = "PnInertia"
         Me.PnInertia.Size = New System.Drawing.Size(212, 30)
-        Me.PnInertia.TabIndex = 3
+        Me.PnInertia.TabIndex = 7
         '
         'GrWHTC
         '
@@ -481,7 +482,7 @@ Partial Class EngineForm
         Me.GrWHTC.Location = New System.Drawing.Point(3, 94)
         Me.GrWHTC.Name = "GrWHTC"
         Me.GrWHTC.Size = New System.Drawing.Size(462, 135)
-        Me.GrWHTC.TabIndex = 9
+        Me.GrWHTC.TabIndex = 4
         Me.GrWHTC.TabStop = false
         Me.GrWHTC.Text = "Fuel Consumption Correction Factors"
         '
@@ -501,7 +502,7 @@ Partial Class EngineForm
         Me.PnWhtcDeclaration.Location = New System.Drawing.Point(3, 19)
         Me.PnWhtcDeclaration.Name = "PnWhtcDeclaration"
         Me.PnWhtcDeclaration.Size = New System.Drawing.Size(455, 74)
-        Me.PnWhtcDeclaration.TabIndex = 8
+        Me.PnWhtcDeclaration.TabIndex = 1
         '
         'Label20
         '
@@ -517,7 +518,7 @@ Partial Class EngineForm
         Me.tbRegPerCorrFactor.Location = New System.Drawing.Point(391, 46)
         Me.tbRegPerCorrFactor.Name = "tbRegPerCorrFactor"
         Me.tbRegPerCorrFactor.Size = New System.Drawing.Size(57, 20)
-        Me.tbRegPerCorrFactor.TabIndex = 10
+        Me.tbRegPerCorrFactor.TabIndex = 4
         '
         'lblColdHotFactor
         '
@@ -533,7 +534,7 @@ Partial Class EngineForm
         Me.TbColdHotFactor.Location = New System.Drawing.Point(225, 46)
         Me.TbColdHotFactor.Name = "TbColdHotFactor"
         Me.TbColdHotFactor.Size = New System.Drawing.Size(57, 20)
-        Me.TbColdHotFactor.TabIndex = 6
+        Me.TbColdHotFactor.TabIndex = 3
         '
         'Label4
         '
@@ -600,14 +601,14 @@ Partial Class EngineForm
         Me.PnWhtcEngineering.Location = New System.Drawing.Point(3, 99)
         Me.PnWhtcEngineering.Name = "PnWhtcEngineering"
         Me.PnWhtcEngineering.Size = New System.Drawing.Size(455, 30)
-        Me.PnWhtcEngineering.TabIndex = 7
+        Me.PnWhtcEngineering.TabIndex = 2
         '
         'TbWHTCEngineering
         '
         Me.TbWHTCEngineering.Location = New System.Drawing.Point(225, 3)
         Me.TbWHTCEngineering.Name = "TbWHTCEngineering"
         Me.TbWHTCEngineering.Size = New System.Drawing.Size(57, 20)
-        Me.TbWHTCEngineering.TabIndex = 5
+        Me.TbWHTCEngineering.TabIndex = 0
         '
         'lblWhtcEngineering
         '
@@ -633,7 +634,7 @@ Partial Class EngineForm
         Me.TbFLD.Location = New System.Drawing.Point(12, 241)
         Me.TbFLD.Name = "TbFLD"
         Me.TbFLD.Size = New System.Drawing.Size(434, 20)
-        Me.TbFLD.TabIndex = 5
+        Me.TbFLD.TabIndex = 8
         '
         'Label14
         '
@@ -650,8 +651,7 @@ Partial Class EngineForm
         Me.BtFLD.Location = New System.Drawing.Point(446, 239)
         Me.BtFLD.Name = "BtFLD"
         Me.BtFLD.Size = New System.Drawing.Size(24, 24)
-        Me.BtFLD.TabIndex = 6
-        Me.BtFLD.TabStop = false
+        Me.BtFLD.TabIndex = 9
         Me.BtFLD.UseVisualStyleBackColor = true
         '
         'BtFLDopen
@@ -660,8 +660,7 @@ Partial Class EngineForm
         Me.BtFLDopen.Location = New System.Drawing.Point(469, 239)
         Me.BtFLDopen.Name = "BtFLDopen"
         Me.BtFLDopen.Size = New System.Drawing.Size(24, 24)
-        Me.BtFLDopen.TabIndex = 7
-        Me.BtFLDopen.TabStop = false
+        Me.BtFLDopen.TabIndex = 10
         Me.BtFLDopen.UseVisualStyleBackColor = true
         '
         'tbRatedSpeed
@@ -669,7 +668,7 @@ Partial Class EngineForm
         Me.tbRatedSpeed.Location = New System.Drawing.Point(381, 108)
         Me.tbRatedSpeed.Name = "tbRatedSpeed"
         Me.tbRatedSpeed.Size = New System.Drawing.Size(57, 20)
-        Me.tbRatedSpeed.TabIndex = 41
+        Me.tbRatedSpeed.TabIndex = 4
         '
         'Label9
         '
@@ -694,7 +693,7 @@ Partial Class EngineForm
         Me.tbRatedPower.Location = New System.Drawing.Point(381, 134)
         Me.tbRatedPower.Name = "tbRatedPower"
         Me.tbRatedPower.Size = New System.Drawing.Size(57, 20)
-        Me.tbRatedPower.TabIndex = 44
+        Me.tbRatedPower.TabIndex = 5
         '
         'Label12
         '
@@ -719,7 +718,7 @@ Partial Class EngineForm
         Me.tbMaxTorque.Location = New System.Drawing.Point(381, 158)
         Me.tbMaxTorque.Name = "tbMaxTorque"
         Me.tbMaxTorque.Size = New System.Drawing.Size(57, 20)
-        Me.tbMaxTorque.TabIndex = 47
+        Me.tbMaxTorque.TabIndex = 6
         '
         'Label16
         '
@@ -754,7 +753,7 @@ Partial Class EngineForm
         Me.cbFuelType.Location = New System.Drawing.Point(71, 10)
         Me.cbFuelType.Name = "cbFuelType"
         Me.cbFuelType.Size = New System.Drawing.Size(143, 21)
-        Me.cbFuelType.TabIndex = 51
+        Me.cbFuelType.TabIndex = 0
         '
         'lblEngineCharacteristics
         '
@@ -772,7 +771,7 @@ Partial Class EngineForm
         Me.tbDualFuel.Name = "tbDualFuel"
         Me.tbDualFuel.SelectedIndex = 0
         Me.tbDualFuel.Size = New System.Drawing.Size(481, 279)
-        Me.tbDualFuel.TabIndex = 56
+        Me.tbDualFuel.TabIndex = 11
         '
         'tpPrimaryfuel
         '
@@ -815,7 +814,7 @@ Partial Class EngineForm
         Me.GroupBox1.Location = New System.Drawing.Point(3, 85)
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.Size = New System.Drawing.Size(462, 135)
-        Me.GroupBox1.TabIndex = 55
+        Me.GroupBox1.TabIndex = 4
         Me.GroupBox1.TabStop = false
         Me.GroupBox1.Text = "Fuel Consumption Correction Factors"
         '
@@ -835,7 +834,7 @@ Partial Class EngineForm
         Me.pnWhtcFuel2.Location = New System.Drawing.Point(3, 19)
         Me.pnWhtcFuel2.Name = "pnWhtcFuel2"
         Me.pnWhtcFuel2.Size = New System.Drawing.Size(455, 74)
-        Me.pnWhtcFuel2.TabIndex = 8
+        Me.pnWhtcFuel2.TabIndex = 1
         '
         'Label27
         '
@@ -851,7 +850,7 @@ Partial Class EngineForm
         Me.tbRegPerFuel2.Location = New System.Drawing.Point(391, 46)
         Me.tbRegPerFuel2.Name = "tbRegPerFuel2"
         Me.tbRegPerFuel2.Size = New System.Drawing.Size(57, 20)
-        Me.tbRegPerFuel2.TabIndex = 10
+        Me.tbRegPerFuel2.TabIndex = 4
         '
         'Label28
         '
@@ -867,7 +866,7 @@ Partial Class EngineForm
         Me.tbColdHotFuel2.Location = New System.Drawing.Point(225, 46)
         Me.tbColdHotFuel2.Name = "tbColdHotFuel2"
         Me.tbColdHotFuel2.Size = New System.Drawing.Size(57, 20)
-        Me.tbColdHotFuel2.TabIndex = 6
+        Me.tbColdHotFuel2.TabIndex = 3
         '
         'Label29
         '
@@ -934,14 +933,14 @@ Partial Class EngineForm
         Me.pnEngCFFuel2.Location = New System.Drawing.Point(3, 99)
         Me.pnEngCFFuel2.Name = "pnEngCFFuel2"
         Me.pnEngCFFuel2.Size = New System.Drawing.Size(455, 30)
-        Me.pnEngCFFuel2.TabIndex = 7
+        Me.pnEngCFFuel2.TabIndex = 2
         '
         'tbEngineeringCFFuel2
         '
         Me.tbEngineeringCFFuel2.Location = New System.Drawing.Point(225, 3)
         Me.tbEngineeringCFFuel2.Name = "tbEngineeringCFFuel2"
         Me.tbEngineeringCFFuel2.Size = New System.Drawing.Size(57, 20)
-        Me.tbEngineeringCFFuel2.TabIndex = 5
+        Me.tbEngineeringCFFuel2.TabIndex = 0
         '
         'Label33
         '
@@ -957,7 +956,7 @@ Partial Class EngineForm
         Me.tbMapFuel2.Location = New System.Drawing.Point(6, 54)
         Me.tbMapFuel2.Name = "tbMapFuel2"
         Me.tbMapFuel2.Size = New System.Drawing.Size(406, 20)
-        Me.tbMapFuel2.TabIndex = 52
+        Me.tbMapFuel2.TabIndex = 1
         '
         'Label34
         '
@@ -974,8 +973,7 @@ Partial Class EngineForm
         Me.btMapFuel2.Location = New System.Drawing.Point(418, 52)
         Me.btMapFuel2.Name = "btMapFuel2"
         Me.btMapFuel2.Size = New System.Drawing.Size(24, 24)
-        Me.btMapFuel2.TabIndex = 53
-        Me.btMapFuel2.TabStop = false
+        Me.btMapFuel2.TabIndex = 2
         Me.btMapFuel2.UseVisualStyleBackColor = true
         '
         'btMapOpenFuel2
@@ -984,8 +982,7 @@ Partial Class EngineForm
         Me.btMapOpenFuel2.Location = New System.Drawing.Point(441, 52)
         Me.btMapOpenFuel2.Name = "btMapOpenFuel2"
         Me.btMapOpenFuel2.Size = New System.Drawing.Size(24, 24)
-        Me.btMapOpenFuel2.TabIndex = 54
-        Me.btMapOpenFuel2.TabStop = false
+        Me.btMapOpenFuel2.TabIndex = 3
         Me.btMapOpenFuel2.UseVisualStyleBackColor = true
         '
         'cbFuelType2
@@ -994,7 +991,7 @@ Partial Class EngineForm
         Me.cbFuelType2.Location = New System.Drawing.Point(71, 6)
         Me.cbFuelType2.Name = "cbFuelType2"
         Me.cbFuelType2.Size = New System.Drawing.Size(143, 21)
-        Me.cbFuelType2.TabIndex = 58
+        Me.cbFuelType2.TabIndex = 0
         '
         'Label35
         '
@@ -1012,7 +1009,7 @@ Partial Class EngineForm
         Me.cbDualFuel.Location = New System.Drawing.Point(30, 160)
         Me.cbDualFuel.Name = "cbDualFuel"
         Me.cbDualFuel.Size = New System.Drawing.Size(107, 17)
-        Me.cbDualFuel.TabIndex = 58
+        Me.cbDualFuel.TabIndex = 3
         Me.cbDualFuel.Text = "Dual Fuel Engine"
         Me.cbDualFuel.UseVisualStyleBackColor = true
         '
@@ -1025,7 +1022,49 @@ Partial Class EngineForm
         Me.tbWHR.Name = "tbWHR"
         Me.tbWHR.SelectedIndex = 0
         Me.tbWHR.Size = New System.Drawing.Size(482, 171)
-        Me.tbWHR.TabIndex = 59
+        Me.tbWHR.TabIndex = 12
+        '
+        'TabPage1
+        '
+        Me.TabPage1.Controls.Add(Me.cbElWHR)
+        Me.TabPage1.Controls.Add(Me.cbMechWHRNotConnectedCrankshaft)
+        Me.TabPage1.Controls.Add(Me.cbMechWHRInMap)
+        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage1.Name = "TabPage1"
+        Me.TabPage1.Size = New System.Drawing.Size(474, 145)
+        Me.TabPage1.TabIndex = 2
+        Me.TabPage1.Text = "WHR Type"
+        Me.TabPage1.UseVisualStyleBackColor = true
+        '
+        'cbElWHR
+        '
+        Me.cbElWHR.AutoSize = true
+        Me.cbElWHR.Location = New System.Drawing.Point(17, 58)
+        Me.cbElWHR.Name = "cbElWHR"
+        Me.cbElWHR.Size = New System.Drawing.Size(136, 17)
+        Me.cbElWHR.TabIndex = 2
+        Me.cbElWHR.Text = "Electrical WHR System"
+        Me.cbElWHR.UseVisualStyleBackColor = true
+        '
+        'cbMechWHRNotConnectedCrankshaft
+        '
+        Me.cbMechWHRNotConnectedCrankshaft.AutoSize = true
+        Me.cbMechWHRNotConnectedCrankshaft.Location = New System.Drawing.Point(17, 35)
+        Me.cbMechWHRNotConnectedCrankshaft.Name = "cbMechWHRNotConnectedCrankshaft"
+        Me.cbMechWHRNotConnectedCrankshaft.Size = New System.Drawing.Size(303, 17)
+        Me.cbMechWHRNotConnectedCrankshaft.TabIndex = 1
+        Me.cbMechWHRNotConnectedCrankshaft.Text = "Mechanical WHR System not connected to the crankshaft"
+        Me.cbMechWHRNotConnectedCrankshaft.UseVisualStyleBackColor = true
+        '
+        'cbMechWHRInMap
+        '
+        Me.cbMechWHRInMap.AutoSize = true
+        Me.cbMechWHRInMap.Location = New System.Drawing.Point(17, 12)
+        Me.cbMechWHRInMap.Name = "cbMechWHRInMap"
+        Me.cbMechWHRInMap.Size = New System.Drawing.Size(287, 17)
+        Me.cbMechWHRInMap.TabIndex = 0
+        Me.cbMechWHRInMap.Text = "Mechanical WHR System incuded in FC measurements"
+        Me.cbMechWHRInMap.UseVisualStyleBackColor = true
         '
         'tbElectricalWHR
         '
@@ -1040,19 +1079,6 @@ Partial Class EngineForm
         Me.tbElectricalWHR.Text = "Correction Factors Electrical WHR"
         Me.tbElectricalWHR.UseVisualStyleBackColor = true
         '
-        'tbMechanicalWHR
-        '
-        Me.tbMechanicalWHR.Controls.Add(Me.Label37)
-        Me.tbMechanicalWHR.Controls.Add(Me.pnMechWhrDeclaration)
-        Me.tbMechanicalWHR.Controls.Add(Me.pnMechWhrEngineering)
-        Me.tbMechanicalWHR.Location = New System.Drawing.Point(4, 22)
-        Me.tbMechanicalWHR.Name = "tbMechanicalWHR"
-        Me.tbMechanicalWHR.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbMechanicalWHR.Size = New System.Drawing.Size(474, 145)
-        Me.tbMechanicalWHR.TabIndex = 1
-        Me.tbMechanicalWHR.Text = "Correction Factors Mechanical WHR"
-        Me.tbMechanicalWHR.UseVisualStyleBackColor = true
-        '
         'Label36
         '
         Me.Label36.AutoSize = true
@@ -1079,7 +1105,7 @@ Partial Class EngineForm
         Me.pnElWHRDeclaration.Location = New System.Drawing.Point(6, 6)
         Me.pnElWHRDeclaration.Name = "pnElWHRDeclaration"
         Me.pnElWHRDeclaration.Size = New System.Drawing.Size(458, 74)
-        Me.pnElWHRDeclaration.TabIndex = 13
+        Me.pnElWHRDeclaration.TabIndex = 0
         '
         'lblWHRRegPer
         '
@@ -1095,7 +1121,7 @@ Partial Class EngineForm
         Me.tbElWHRRegPer.Location = New System.Drawing.Point(376, 46)
         Me.tbElWHRRegPer.Name = "tbElWHRRegPer"
         Me.tbElWHRRegPer.Size = New System.Drawing.Size(57, 20)
-        Me.tbElWHRRegPer.TabIndex = 10
+        Me.tbElWHRRegPer.TabIndex = 4
         '
         'Label21
         '
@@ -1111,7 +1137,7 @@ Partial Class EngineForm
         Me.tbElWHRColdHot.Location = New System.Drawing.Point(194, 46)
         Me.tbElWHRColdHot.Name = "tbElWHRColdHot"
         Me.tbElWHRColdHot.Size = New System.Drawing.Size(57, 20)
-        Me.tbElWHRColdHot.TabIndex = 6
+        Me.tbElWHRColdHot.TabIndex = 3
         '
         'Label22
         '
@@ -1178,14 +1204,14 @@ Partial Class EngineForm
         Me.pnElWhrEngineering.Location = New System.Drawing.Point(6, 86)
         Me.pnElWhrEngineering.Name = "pnElWhrEngineering"
         Me.pnElWhrEngineering.Size = New System.Drawing.Size(458, 30)
-        Me.pnElWhrEngineering.TabIndex = 12
+        Me.pnElWhrEngineering.TabIndex = 1
         '
         'tbElWHREngineering
         '
         Me.tbElWHREngineering.Location = New System.Drawing.Point(194, 3)
         Me.tbElWHREngineering.Name = "tbElWHREngineering"
         Me.tbElWHREngineering.Size = New System.Drawing.Size(57, 20)
-        Me.tbElWHREngineering.TabIndex = 5
+        Me.tbElWHREngineering.TabIndex = 0
         '
         'Label26
         '
@@ -1196,6 +1222,19 @@ Partial Class EngineForm
         Me.Label26.TabIndex = 6
         Me.Label26.Text = "Engineering"
         '
+        'tbMechanicalWHR
+        '
+        Me.tbMechanicalWHR.Controls.Add(Me.Label37)
+        Me.tbMechanicalWHR.Controls.Add(Me.pnMechWhrDeclaration)
+        Me.tbMechanicalWHR.Controls.Add(Me.pnMechWhrEngineering)
+        Me.tbMechanicalWHR.Location = New System.Drawing.Point(4, 22)
+        Me.tbMechanicalWHR.Name = "tbMechanicalWHR"
+        Me.tbMechanicalWHR.Padding = New System.Windows.Forms.Padding(3)
+        Me.tbMechanicalWHR.Size = New System.Drawing.Size(474, 145)
+        Me.tbMechanicalWHR.TabIndex = 1
+        Me.tbMechanicalWHR.Text = "Correction Factors Mechanical WHR"
+        Me.tbMechanicalWHR.UseVisualStyleBackColor = true
+        '
         'Label37
         '
         Me.Label37.AutoSize = true
@@ -1222,7 +1261,7 @@ Partial Class EngineForm
         Me.pnMechWhrDeclaration.Location = New System.Drawing.Point(6, 6)
         Me.pnMechWhrDeclaration.Name = "pnMechWhrDeclaration"
         Me.pnMechWhrDeclaration.Size = New System.Drawing.Size(458, 74)
-        Me.pnMechWhrDeclaration.TabIndex = 13
+        Me.pnMechWhrDeclaration.TabIndex = 0
         '
         'Label38
         '
@@ -1238,7 +1277,7 @@ Partial Class EngineForm
         Me.tbMechWHRRegPerCF.Location = New System.Drawing.Point(376, 46)
         Me.tbMechWHRRegPerCF.Name = "tbMechWHRRegPerCF"
         Me.tbMechWHRRegPerCF.Size = New System.Drawing.Size(57, 20)
-        Me.tbMechWHRRegPerCF.TabIndex = 10
+        Me.tbMechWHRRegPerCF.TabIndex = 4
         '
         'Label39
         '
@@ -1254,7 +1293,7 @@ Partial Class EngineForm
         Me.tbMechWHRBFColdHot.Location = New System.Drawing.Point(194, 46)
         Me.tbMechWHRBFColdHot.Name = "tbMechWHRBFColdHot"
         Me.tbMechWHRBFColdHot.Size = New System.Drawing.Size(57, 20)
-        Me.tbMechWHRBFColdHot.TabIndex = 6
+        Me.tbMechWHRBFColdHot.TabIndex = 3
         '
         'Label42
         '
@@ -1321,14 +1360,14 @@ Partial Class EngineForm
         Me.pnMechWhrEngineering.Location = New System.Drawing.Point(6, 86)
         Me.pnMechWhrEngineering.Name = "pnMechWhrEngineering"
         Me.pnMechWhrEngineering.Size = New System.Drawing.Size(458, 30)
-        Me.pnMechWhrEngineering.TabIndex = 12
+        Me.pnMechWhrEngineering.TabIndex = 1
         '
         'tbMechWHREngineering
         '
         Me.tbMechWHREngineering.Location = New System.Drawing.Point(194, 3)
         Me.tbMechWHREngineering.Name = "tbMechWHREngineering"
         Me.tbMechWHREngineering.Size = New System.Drawing.Size(57, 20)
-        Me.tbMechWHREngineering.TabIndex = 5
+        Me.tbMechWHREngineering.TabIndex = 0
         '
         'Label46
         '
@@ -1339,48 +1378,6 @@ Partial Class EngineForm
         Me.Label46.TabIndex = 6
         Me.Label46.Text = "Engineering"
         '
-        'TabPage1
-        '
-        Me.TabPage1.Controls.Add(Me.cbElWHR)
-        Me.TabPage1.Controls.Add(Me.cbMechWHRNotConnectedCrankshaft)
-        Me.TabPage1.Controls.Add(Me.cbMechWHRInMap)
-        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
-        Me.TabPage1.Name = "TabPage1"
-        Me.TabPage1.Size = New System.Drawing.Size(474, 145)
-        Me.TabPage1.TabIndex = 2
-        Me.TabPage1.Text = "WHR Type"
-        Me.TabPage1.UseVisualStyleBackColor = true
-        '
-        'cbMechWHRInMap
-        '
-        Me.cbMechWHRInMap.AutoSize = true
-        Me.cbMechWHRInMap.Location = New System.Drawing.Point(17, 12)
-        Me.cbMechWHRInMap.Name = "cbMechWHRInMap"
-        Me.cbMechWHRInMap.Size = New System.Drawing.Size(287, 17)
-        Me.cbMechWHRInMap.TabIndex = 0
-        Me.cbMechWHRInMap.Text = "Mechanical WHR System incuded in FC measurements"
-        Me.cbMechWHRInMap.UseVisualStyleBackColor = true
-        '
-        'cbMechWHRNotConnectedCrankshaft
-        '
-        Me.cbMechWHRNotConnectedCrankshaft.AutoSize = true
-        Me.cbMechWHRNotConnectedCrankshaft.Location = New System.Drawing.Point(17, 35)
-        Me.cbMechWHRNotConnectedCrankshaft.Name = "cbMechWHRNotConnectedCrankshaft"
-        Me.cbMechWHRNotConnectedCrankshaft.Size = New System.Drawing.Size(303, 17)
-        Me.cbMechWHRNotConnectedCrankshaft.TabIndex = 1
-        Me.cbMechWHRNotConnectedCrankshaft.Text = "Mechanical WHR System not connected to the crankshaft"
-        Me.cbMechWHRNotConnectedCrankshaft.UseVisualStyleBackColor = true
-        '
-        'cbElWHR
-        '
-        Me.cbElWHR.AutoSize = true
-        Me.cbElWHR.Location = New System.Drawing.Point(17, 58)
-        Me.cbElWHR.Name = "cbElWHR"
-        Me.cbElWHR.Size = New System.Drawing.Size(136, 17)
-        Me.cbElWHR.TabIndex = 2
-        Me.cbElWHR.Text = "Electrical WHR System"
-        Me.cbElWHR.UseVisualStyleBackColor = true
-        '
         'EngineForm
         '
         Me.AcceptButton = Me.ButOK
@@ -1452,20 +1449,20 @@ Partial Class EngineForm
         Me.pnEngCFFuel2.ResumeLayout(false)
         Me.pnEngCFFuel2.PerformLayout
         Me.tbWHR.ResumeLayout(false)
+        Me.TabPage1.ResumeLayout(false)
+        Me.TabPage1.PerformLayout
         Me.tbElectricalWHR.ResumeLayout(false)
         Me.tbElectricalWHR.PerformLayout
-        Me.tbMechanicalWHR.ResumeLayout(false)
-        Me.tbMechanicalWHR.PerformLayout
         Me.pnElWHRDeclaration.ResumeLayout(false)
         Me.pnElWHRDeclaration.PerformLayout
         Me.pnElWhrEngineering.ResumeLayout(false)
         Me.pnElWhrEngineering.PerformLayout
+        Me.tbMechanicalWHR.ResumeLayout(false)
+        Me.tbMechanicalWHR.PerformLayout
         Me.pnMechWhrDeclaration.ResumeLayout(false)
         Me.pnMechWhrDeclaration.PerformLayout
         Me.pnMechWhrEngineering.ResumeLayout(false)
         Me.pnMechWhrEngineering.PerformLayout
-        Me.TabPage1.ResumeLayout(false)
-        Me.TabPage1.PerformLayout
         Me.ResumeLayout(false)
         Me.PerformLayout
 
diff --git a/VECTO/GUI/GearboxForm.Designer.vb b/VECTO/GUI/GearboxForm.Designer.vb
index 0d8df6abcc01fefb6747905338efaef9148123dc..5dff87bd762f4f2009152dc1999c33932e80c56e 100644
--- a/VECTO/GUI/GearboxForm.Designer.vb
+++ b/VECTO/GUI/GearboxForm.Designer.vb
@@ -35,1123 +35,1123 @@ Partial Class GearboxForm
 	'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
 	<DebuggerStepThrough()> _
 	Private Sub InitializeComponent()
-		Me.components = New System.ComponentModel.Container()
-		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GearboxForm))
-		Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-		Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
-		Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
-		Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
-		Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
-		Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
-		Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
-		Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
-		Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-		Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
-		Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
-		Me.ButCancel = New System.Windows.Forms.Button()
-		Me.ButOK = New System.Windows.Forms.Button()
-		Me.TbTracInt = New System.Windows.Forms.TextBox()
-		Me.LvGears = New System.Windows.Forms.ListView()
-		Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-		Me.TBI_getr = New System.Windows.Forms.TextBox()
-		Me.Label49 = New System.Windows.Forms.Label()
-		Me.Label33 = New System.Windows.Forms.Label()
-		Me.Label48 = New System.Windows.Forms.Label()
-		Me.Label6 = New System.Windows.Forms.Label()
-		Me.Label3 = New System.Windows.Forms.Label()
-		Me.TbName = New System.Windows.Forms.TextBox()
-		Me.PictureBox1 = New System.Windows.Forms.PictureBox()
-		Me.BtRemGear = New System.Windows.Forms.Button()
-		Me.GrGearShift = New System.Windows.Forms.GroupBox()
-		Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-		Me.tbUpshiftMinAcceleration = New System.Windows.Forms.TextBox()
-		Me.tbUpshiftAfterDownshift = New System.Windows.Forms.TextBox()
-		Me.tbDownshiftAfterUpshift = New System.Windows.Forms.TextBox()
-		Me.Label24 = New System.Windows.Forms.Label()
-		Me.Label23 = New System.Windows.Forms.Label()
-		Me.Label22 = New System.Windows.Forms.Label()
-		Me.Label21 = New System.Windows.Forms.Label()
-		Me.Label20 = New System.Windows.Forms.Label()
-		Me.Label19 = New System.Windows.Forms.Label()
-		Me.PnTorqRes = New System.Windows.Forms.Panel()
-		Me.Label25 = New System.Windows.Forms.Label()
-		Me.Label2 = New System.Windows.Forms.Label()
-		Me.Label4 = New System.Windows.Forms.Label()
-		Me.TbTqResv = New System.Windows.Forms.TextBox()
-		Me.TbMinTimeBetweenShifts = New System.Windows.Forms.TextBox()
-		Me.Label12 = New System.Windows.Forms.Label()
-		Me.Label13 = New System.Windows.Forms.Label()
-		Me.GroupBox2 = New System.Windows.Forms.GroupBox()
-		Me.TbStartAcc = New System.Windows.Forms.TextBox()
-		Me.Label11 = New System.Windows.Forms.Label()
-		Me.TbStartSpeed = New System.Windows.Forms.TextBox()
-		Me.Label9 = New System.Windows.Forms.Label()
-		Me.Label10 = New System.Windows.Forms.Label()
-		Me.TbTqResvStart = New System.Windows.Forms.TextBox()
-		Me.Label8 = New System.Windows.Forms.Label()
-		Me.Label5 = New System.Windows.Forms.Label()
-		Me.Label7 = New System.Windows.Forms.Label()
-		Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
-		Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-		Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-		Me.gbTC = New System.Windows.Forms.GroupBox()
-		Me.pnTcEngineering = New System.Windows.Forms.Panel()
-		Me.Label26 = New System.Windows.Forms.Label()
-		Me.TBTCShiftPolygon = New System.Windows.Forms.TextBox()
-		Me.tbTCmaxSpeed = New System.Windows.Forms.TextBox()
-		Me.TbTCrefrpm = New System.Windows.Forms.TextBox()
-		Me.Label27 = New System.Windows.Forms.Label()
-		Me.Label14 = New System.Windows.Forms.Label()
-		Me.BtTCShiftFileBrowse = New System.Windows.Forms.Button()
-		Me.Label1 = New System.Windows.Forms.Label()
-		Me.TbTCinertia = New System.Windows.Forms.TextBox()
-		Me.Label15 = New System.Windows.Forms.Label()
-		Me.Label18 = New System.Windows.Forms.Label()
-		Me.LblTCShiftFile = New System.Windows.Forms.Label()
-		Me.BtTCfileOpen = New System.Windows.Forms.Button()
-		Me.TbTCfile = New System.Windows.Forms.TextBox()
-		Me.BtTCfileBrowse = New System.Windows.Forms.Button()
-		Me.Label17 = New System.Windows.Forms.Label()
-		Me.tbTCLUpshiftMinAcceleration = New System.Windows.Forms.TextBox()
-		Me.Label30 = New System.Windows.Forms.Label()
-		Me.Label31 = New System.Windows.Forms.Label()
-		Me.Label16 = New System.Windows.Forms.Label()
-		Me.CbGStype = New System.Windows.Forms.ComboBox()
-		Me.BtAddGear = New System.Windows.Forms.Button()
-		Me.GroupBox4 = New System.Windows.Forms.GroupBox()
-		Me.Label32 = New System.Windows.Forms.Label()
-		Me.PnInertiaTI = New System.Windows.Forms.Panel()
-		Me.PicBox = New System.Windows.Forms.PictureBox()
-		Me.gbPowershiftLosses = New System.Windows.Forms.GroupBox()
-		Me.lbAtShiftTime = New System.Windows.Forms.Label()
-		Me.tbATShiftTime = New System.Windows.Forms.TextBox()
-		Me.Label28 = New System.Windows.Forms.Label()
-		Me.tbTCCUpshiftMinAcceleration = New System.Windows.Forms.TextBox()
-		Me.Label34 = New System.Windows.Forms.Label()
-		Me.Label35 = New System.Windows.Forms.Label()
-		Me.gbTCAccMin = New System.Windows.Forms.GroupBox()
-		Me.lblGbxInfo = New System.Windows.Forms.Label()
-		Me.btnExportXML = New System.Windows.Forms.Button()
-		Me.btnExportAxlGearXML = New System.Windows.Forms.Button()
-		Me.btExportVGBS = New System.Windows.Forms.Button()
-		Me.ToolStrip1.SuspendLayout()
-		Me.StatusStrip1.SuspendLayout()
-		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
-		Me.GrGearShift.SuspendLayout()
-		Me.GroupBox1.SuspendLayout()
-		Me.PnTorqRes.SuspendLayout()
-		Me.GroupBox2.SuspendLayout()
-		Me.CmOpenFile.SuspendLayout()
-		Me.gbTC.SuspendLayout()
-		Me.pnTcEngineering.SuspendLayout()
-		Me.GroupBox4.SuspendLayout()
-		Me.PnInertiaTI.SuspendLayout()
-		CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
-		Me.gbPowershiftLosses.SuspendLayout()
-		Me.gbTCAccMin.SuspendLayout()
-		Me.SuspendLayout()
-		'
-		'ToolStrip1
-		'
-		Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
-		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.Size = New System.Drawing.Size(877, 25)
-		Me.ToolStrip1.TabIndex = 30
-		Me.ToolStrip1.Text = "ToolStrip1"
-		'
-		'ToolStripBtNew
-		'
-		Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-		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(23, 22)
-		Me.ToolStripBtNew.Text = "ToolStripButton1"
-		Me.ToolStripBtNew.ToolTipText = "New"
-		'
-		'ToolStripBtOpen
-		'
-		Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-		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(23, 22)
-		Me.ToolStripBtOpen.Text = "ToolStripButton1"
-		Me.ToolStripBtOpen.ToolTipText = "Open..."
-		'
-		'ToolStripBtSave
-		'
-		Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-		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(23, 22)
-		Me.ToolStripBtSave.Text = "ToolStripButton1"
-		Me.ToolStripBtSave.ToolTipText = "Save"
-		'
-		'ToolStripBtSaveAs
-		'
-		Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-		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(23, 22)
-		Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
-		Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
-		'
-		'ToolStripSeparator3
-		'
-		Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-		Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 25)
-		'
-		'ToolStripBtSendTo
-		'
-		Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-		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(23, 22)
-		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, 25)
-		'
-		'ToolStripButton1
-		'
-		Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-		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(23, 22)
-		Me.ToolStripButton1.Text = "Help"
-		'
-		'StatusStrip1
-		'
-		Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
-		Me.StatusStrip1.Location = New System.Drawing.Point(0, 674)
-		Me.StatusStrip1.Name = "StatusStrip1"
-		Me.StatusStrip1.Size = New System.Drawing.Size(877, 22)
-		Me.StatusStrip1.SizingGrip = False
-		Me.StatusStrip1.TabIndex = 37
-		Me.StatusStrip1.Text = "StatusStrip1"
-		'
-		'LbStatus
-		'
-		Me.LbStatus.Name = "LbStatus"
-		Me.LbStatus.Size = New System.Drawing.Size(39, 17)
-		Me.LbStatus.Text = "Status"
-		'
-		'ButCancel
-		'
-		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(798, 648)
-		Me.ButCancel.Name = "ButCancel"
-		Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-		Me.ButCancel.TabIndex = 7
-		Me.ButCancel.Text = "Cancel"
-		Me.ButCancel.UseVisualStyleBackColor = True
-		'
-		'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(717, 648)
-		Me.ButOK.Name = "ButOK"
-		Me.ButOK.Size = New System.Drawing.Size(75, 23)
-		Me.ButOK.TabIndex = 6
-		Me.ButOK.Text = "Save"
-		Me.ButOK.UseVisualStyleBackColor = True
-		'
-		'TbTracInt
-		'
-		Me.TbTracInt.Location = New System.Drawing.Point(299, 3)
-		Me.TbTracInt.Name = "TbTracInt"
-		Me.TbTracInt.Size = New System.Drawing.Size(57, 20)
-		Me.TbTracInt.TabIndex = 1
-		'
-		'LvGears
-		'
-		Me.LvGears.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3, Me.ColumnHeader5, Me.ColumnHeader6, Me.ColumnHeader7})
-		Me.LvGears.FullRowSelect = True
-		Me.LvGears.GridLines = True
-		Me.LvGears.HideSelection = False
-		Me.LvGears.Location = New System.Drawing.Point(6, 18)
-		Me.LvGears.MultiSelect = False
-		Me.LvGears.Name = "LvGears"
-		Me.LvGears.Size = New System.Drawing.Size(429, 183)
-		Me.LvGears.TabIndex = 0
-		Me.LvGears.TabStop = False
-		Me.LvGears.UseCompatibleStateImageBehavior = False
-		Me.LvGears.View = System.Windows.Forms.View.Details
-		'
-		'ColumnHeader1
-		'
-		Me.ColumnHeader1.Text = "Gear"
-		Me.ColumnHeader1.Width = 38
-		'
-		'ColumnHeader2
-		'
-		Me.ColumnHeader2.Text = "Ratio"
-		Me.ColumnHeader2.Width = 42
-		'
-		'ColumnHeader3
-		'
-		Me.ColumnHeader3.Text = "Loss Map or Efficiency"
-		Me.ColumnHeader3.Width = 111
-		'
-		'ColumnHeader5
-		'
-		Me.ColumnHeader5.Text = "Shift Polygons"
-		Me.ColumnHeader5.Width = 79
-		'
-		'ColumnHeader6
-		'
-		Me.ColumnHeader6.Text = "Max Torque"
-		Me.ColumnHeader6.Width = 78
-		'
-		'ColumnHeader7
-		'
-		Me.ColumnHeader7.Text = "Max Speed"
-		Me.ColumnHeader7.Width = 76
-		'
-		'TBI_getr
-		'
-		Me.TBI_getr.Location = New System.Drawing.Point(78, 3)
-		Me.TBI_getr.Name = "TBI_getr"
-		Me.TBI_getr.Size = New System.Drawing.Size(57, 20)
-		Me.TBI_getr.TabIndex = 0
-		'
-		'Label49
-		'
-		Me.Label49.AutoSize = True
-		Me.Label49.Location = New System.Drawing.Point(362, 6)
-		Me.Label49.Name = "Label49"
-		Me.Label49.Size = New System.Drawing.Size(18, 13)
-		Me.Label49.TabIndex = 2
-		Me.Label49.Text = "[s]"
-		'
-		'Label33
-		'
-		Me.Label33.AutoSize = True
-		Me.Label33.Location = New System.Drawing.Point(141, 6)
-		Me.Label33.Name = "Label33"
-		Me.Label33.Size = New System.Drawing.Size(36, 13)
-		Me.Label33.TabIndex = 2
-		Me.Label33.Text = "[kgm²]"
-		'
-		'Label48
-		'
-		Me.Label48.AutoSize = True
-		Me.Label48.Location = New System.Drawing.Point(191, 6)
-		Me.Label48.Name = "Label48"
-		Me.Label48.Size = New System.Drawing.Size(102, 13)
-		Me.Label48.TabIndex = 2
-		Me.Label48.Text = "Traction Interruption"
-		'
-		'Label6
-		'
-		Me.Label6.AutoSize = True
-		Me.Label6.Location = New System.Drawing.Point(6, 6)
-		Me.Label6.Name = "Label6"
-		Me.Label6.Size = New System.Drawing.Size(36, 13)
-		Me.Label6.TabIndex = 2
-		Me.Label6.Text = "Inertia"
-		'
-		'Label3
-		'
-		Me.Label3.AutoSize = True
-		Me.Label3.Location = New System.Drawing.Point(26, 79)
-		Me.Label3.Name = "Label3"
-		Me.Label3.Size = New System.Drawing.Size(87, 13)
-		Me.Label3.TabIndex = 42
-		Me.Label3.Text = "Make and Model"
-		'
-		'TbName
-		'
-		Me.TbName.Location = New System.Drawing.Point(119, 76)
-		Me.TbName.Name = "TbName"
-		Me.TbName.Size = New System.Drawing.Size(334, 20)
-		Me.TbName.TabIndex = 0
-		'
-		'PictureBox1
-		'
-		Me.PictureBox1.BackColor = System.Drawing.Color.White
-		Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_GBX
-		Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
-		Me.PictureBox1.Name = "PictureBox1"
-		Me.PictureBox1.Size = New System.Drawing.Size(453, 40)
-		Me.PictureBox1.TabIndex = 43
-		Me.PictureBox1.TabStop = False
-		'
-		'BtRemGear
-		'
-		Me.BtRemGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
-		Me.BtRemGear.Location = New System.Drawing.Point(30, 202)
-		Me.BtRemGear.Name = "BtRemGear"
-		Me.BtRemGear.Size = New System.Drawing.Size(24, 24)
-		Me.BtRemGear.TabIndex = 2
-		Me.BtRemGear.UseVisualStyleBackColor = True
-		'
-		'GrGearShift
-		'
-		Me.GrGearShift.Controls.Add(Me.GroupBox1)
-		Me.GrGearShift.Controls.Add(Me.PnTorqRes)
-		Me.GrGearShift.Controls.Add(Me.TbMinTimeBetweenShifts)
-		Me.GrGearShift.Controls.Add(Me.Label12)
-		Me.GrGearShift.Controls.Add(Me.Label13)
-		Me.GrGearShift.Controls.Add(Me.GroupBox2)
-		Me.GrGearShift.Location = New System.Drawing.Point(12, 377)
-		Me.GrGearShift.Name = "GrGearShift"
-		Me.GrGearShift.Size = New System.Drawing.Size(441, 291)
-		Me.GrGearShift.TabIndex = 3
-		Me.GrGearShift.TabStop = False
-		Me.GrGearShift.Text = "Gear shift parameters"
-		'
-		'GroupBox1
-		'
-		Me.GroupBox1.Controls.Add(Me.tbUpshiftMinAcceleration)
-		Me.GroupBox1.Controls.Add(Me.tbUpshiftAfterDownshift)
-		Me.GroupBox1.Controls.Add(Me.tbDownshiftAfterUpshift)
-		Me.GroupBox1.Controls.Add(Me.Label24)
-		Me.GroupBox1.Controls.Add(Me.Label23)
-		Me.GroupBox1.Controls.Add(Me.Label22)
-		Me.GroupBox1.Controls.Add(Me.Label21)
-		Me.GroupBox1.Controls.Add(Me.Label20)
-		Me.GroupBox1.Controls.Add(Me.Label19)
-		Me.GroupBox1.Location = New System.Drawing.Point(6, 82)
-		Me.GroupBox1.Name = "GroupBox1"
-		Me.GroupBox1.Size = New System.Drawing.Size(429, 100)
-		Me.GroupBox1.TabIndex = 10
-		Me.GroupBox1.TabStop = False
-		Me.GroupBox1.Text = "Shift Strategy Parameters"
-		'
-		'tbUpshiftMinAcceleration
-		'
-		Me.tbUpshiftMinAcceleration.Location = New System.Drawing.Point(209, 71)
-		Me.tbUpshiftMinAcceleration.Name = "tbUpshiftMinAcceleration"
-		Me.tbUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20)
-		Me.tbUpshiftMinAcceleration.TabIndex = 8
-		'
-		'tbUpshiftAfterDownshift
-		'
-		Me.tbUpshiftAfterDownshift.Location = New System.Drawing.Point(209, 45)
-		Me.tbUpshiftAfterDownshift.Name = "tbUpshiftAfterDownshift"
-		Me.tbUpshiftAfterDownshift.Size = New System.Drawing.Size(57, 20)
-		Me.tbUpshiftAfterDownshift.TabIndex = 7
-		'
-		'tbDownshiftAfterUpshift
-		'
-		Me.tbDownshiftAfterUpshift.Location = New System.Drawing.Point(209, 20)
-		Me.tbDownshiftAfterUpshift.Name = "tbDownshiftAfterUpshift"
-		Me.tbDownshiftAfterUpshift.Size = New System.Drawing.Size(57, 20)
-		Me.tbDownshiftAfterUpshift.TabIndex = 6
-		'
-		'Label24
-		'
-		Me.Label24.AutoSize = True
-		Me.Label24.Location = New System.Drawing.Point(275, 74)
-		Me.Label24.Name = "Label24"
-		Me.Label24.Size = New System.Drawing.Size(34, 13)
-		Me.Label24.TabIndex = 5
-		Me.Label24.Text = "[m/s²]"
-		'
-		'Label23
-		'
-		Me.Label23.AutoSize = True
-		Me.Label23.Location = New System.Drawing.Point(275, 48)
-		Me.Label23.Name = "Label23"
-		Me.Label23.Size = New System.Drawing.Size(18, 13)
-		Me.Label23.TabIndex = 4
-		Me.Label23.Text = "[s]"
-		'
-		'Label22
-		'
-		Me.Label22.AutoSize = True
-		Me.Label22.Location = New System.Drawing.Point(275, 25)
-		Me.Label22.Name = "Label22"
-		Me.Label22.Size = New System.Drawing.Size(18, 13)
-		Me.Label22.TabIndex = 3
-		Me.Label22.Text = "[s]"
-		'
-		'Label21
-		'
-		Me.Label21.AutoSize = True
-		Me.Label21.Location = New System.Drawing.Point(20, 74)
-		Me.Label21.Name = "Label21"
-		Me.Label21.Size = New System.Drawing.Size(146, 13)
-		Me.Label21.TabIndex = 2
-		Me.Label21.Text = "Min. acceleration after upshift"
-		'
-		'Label20
-		'
-		Me.Label20.AutoSize = True
-		Me.Label20.Location = New System.Drawing.Point(20, 48)
-		Me.Label20.Name = "Label20"
-		Me.Label20.Size = New System.Drawing.Size(140, 13)
-		Me.Label20.TabIndex = 1
-		Me.Label20.Text = "Upshift after downshift delay"
-		'
-		'Label19
-		'
-		Me.Label19.AutoSize = True
-		Me.Label19.Location = New System.Drawing.Point(20, 25)
-		Me.Label19.Name = "Label19"
-		Me.Label19.Size = New System.Drawing.Size(140, 13)
-		Me.Label19.TabIndex = 0
-		Me.Label19.Text = "Downshift after upshift delay"
-		'
-		'PnTorqRes
-		'
-		Me.PnTorqRes.Controls.Add(Me.Label25)
-		Me.PnTorqRes.Controls.Add(Me.Label2)
-		Me.PnTorqRes.Controls.Add(Me.Label4)
-		Me.PnTorqRes.Controls.Add(Me.TbTqResv)
-		Me.PnTorqRes.Location = New System.Drawing.Point(9, 20)
-		Me.PnTorqRes.Name = "PnTorqRes"
-		Me.PnTorqRes.Size = New System.Drawing.Size(426, 32)
-		Me.PnTorqRes.TabIndex = 2
-		'
-		'Label25
-		'
-		Me.Label25.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.Label25.AutoSize = True
-		Me.Label25.Location = New System.Drawing.Point(294, 9)
-		Me.Label25.Name = "Label25"
-		Me.Label25.Size = New System.Drawing.Size(129, 13)
-		Me.Label25.TabIndex = 1
-		Me.Label25.Text = "(Early shift-up, Skip gears)"
-		'
-		'Label2
-		'
-		Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.Label2.AutoSize = True
-		Me.Label2.Location = New System.Drawing.Point(18, 9)
-		Me.Label2.Name = "Label2"
-		Me.Label2.Size = New System.Drawing.Size(79, 13)
-		Me.Label2.TabIndex = 0
-		Me.Label2.Text = "Torque reserve"
-		'
-		'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(272, 9)
-		Me.Label4.Name = "Label4"
-		Me.Label4.Size = New System.Drawing.Size(21, 13)
-		Me.Label4.TabIndex = 0
-		Me.Label4.Text = "[%]"
-		'
-		'TbTqResv
-		'
-		Me.TbTqResv.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TbTqResv.Location = New System.Drawing.Point(206, 6)
-		Me.TbTqResv.Name = "TbTqResv"
-		Me.TbTqResv.Size = New System.Drawing.Size(57, 20)
-		Me.TbTqResv.TabIndex = 0
-		'
-		'TbMinTimeBetweenShifts
-		'
-		Me.TbMinTimeBetweenShifts.Location = New System.Drawing.Point(215, 52)
-		Me.TbMinTimeBetweenShifts.Name = "TbMinTimeBetweenShifts"
-		Me.TbMinTimeBetweenShifts.Size = New System.Drawing.Size(57, 20)
-		Me.TbMinTimeBetweenShifts.TabIndex = 3
-		'
-		'Label12
-		'
-		Me.Label12.AutoSize = True
-		Me.Label12.Location = New System.Drawing.Point(281, 55)
-		Me.Label12.Name = "Label12"
-		Me.Label12.Size = New System.Drawing.Size(18, 13)
-		Me.Label12.TabIndex = 9
-		Me.Label12.Text = "[s]"
-		'
-		'Label13
-		'
-		Me.Label13.AutoSize = True
-		Me.Label13.Location = New System.Drawing.Point(27, 55)
-		Me.Label13.Name = "Label13"
-		Me.Label13.Size = New System.Drawing.Size(162, 13)
-		Me.Label13.TabIndex = 8
-		Me.Label13.Text = "Minimum time between gearshifts"
-		'
-		'GroupBox2
-		'
-		Me.GroupBox2.Controls.Add(Me.TbStartAcc)
-		Me.GroupBox2.Controls.Add(Me.Label11)
-		Me.GroupBox2.Controls.Add(Me.TbStartSpeed)
-		Me.GroupBox2.Controls.Add(Me.Label9)
-		Me.GroupBox2.Controls.Add(Me.Label10)
-		Me.GroupBox2.Controls.Add(Me.TbTqResvStart)
-		Me.GroupBox2.Controls.Add(Me.Label8)
-		Me.GroupBox2.Controls.Add(Me.Label5)
-		Me.GroupBox2.Controls.Add(Me.Label7)
-		Me.GroupBox2.Location = New System.Drawing.Point(6, 186)
-		Me.GroupBox2.Name = "GroupBox2"
-		Me.GroupBox2.Size = New System.Drawing.Size(429, 99)
-		Me.GroupBox2.TabIndex = 4
-		Me.GroupBox2.TabStop = False
-		Me.GroupBox2.Text = "Start Gear"
-		'
-		'TbStartAcc
-		'
-		Me.TbStartAcc.Location = New System.Drawing.Point(209, 71)
-		Me.TbStartAcc.Name = "TbStartAcc"
-		Me.TbStartAcc.Size = New System.Drawing.Size(57, 20)
-		Me.TbStartAcc.TabIndex = 2
-		Me.TbStartAcc.Visible = False
-		'
-		'Label11
-		'
-		Me.Label11.AutoSize = True
-		Me.Label11.Location = New System.Drawing.Point(20, 74)
-		Me.Label11.Name = "Label11"
-		Me.Label11.Size = New System.Drawing.Size(173, 13)
-		Me.Label11.TabIndex = 0
-		Me.Label11.Text = "Reference acceleration at clutch-in"
-		Me.Label11.Visible = False
-		'
-		'TbStartSpeed
-		'
-		Me.TbStartSpeed.Location = New System.Drawing.Point(209, 45)
-		Me.TbStartSpeed.Name = "TbStartSpeed"
-		Me.TbStartSpeed.Size = New System.Drawing.Size(57, 20)
-		Me.TbStartSpeed.TabIndex = 1
-		'
-		'Label9
-		'
-		Me.Label9.AutoSize = True
-		Me.Label9.Location = New System.Drawing.Point(20, 48)
-		Me.Label9.Name = "Label9"
-		Me.Label9.Size = New System.Drawing.Size(181, 13)
-		Me.Label9.TabIndex = 0
-		Me.Label9.Text = "Reference vehicle speed at clutch-in"
-		'
-		'Label10
-		'
-		Me.Label10.AutoSize = True
-		Me.Label10.Location = New System.Drawing.Point(272, 74)
-		Me.Label10.Name = "Label10"
-		Me.Label10.Size = New System.Drawing.Size(34, 13)
-		Me.Label10.TabIndex = 0
-		Me.Label10.Text = "[m/s²]"
-		Me.Label10.Visible = False
-		'
-		'TbTqResvStart
-		'
-		Me.TbTqResvStart.Location = New System.Drawing.Point(209, 19)
-		Me.TbTqResvStart.Name = "TbTqResvStart"
-		Me.TbTqResvStart.Size = New System.Drawing.Size(57, 20)
-		Me.TbTqResvStart.TabIndex = 0
-		'
-		'Label8
-		'
-		Me.Label8.AutoSize = True
-		Me.Label8.Location = New System.Drawing.Point(272, 48)
-		Me.Label8.Name = "Label8"
-		Me.Label8.Size = New System.Drawing.Size(31, 13)
-		Me.Label8.TabIndex = 0
-		Me.Label8.Text = "[m/s]"
-		'
-		'Label5
-		'
-		Me.Label5.AutoSize = True
-		Me.Label5.Location = New System.Drawing.Point(20, 22)
-		Me.Label5.Name = "Label5"
-		Me.Label5.Size = New System.Drawing.Size(79, 13)
-		Me.Label5.TabIndex = 0
-		Me.Label5.Text = "Torque reserve"
-		'
-		'Label7
-		'
-		Me.Label7.AutoSize = True
-		Me.Label7.Location = New System.Drawing.Point(272, 22)
-		Me.Label7.Name = "Label7"
-		Me.Label7.Size = New System.Drawing.Size(21, 13)
-		Me.Label7.TabIndex = 0
-		Me.Label7.Text = "[%]"
-		'
-		'CmOpenFile
-		'
-		Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
-		Me.CmOpenFile.Name = "CmOpenFile"
-		Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
-		'
-		'OpenWithToolStripMenuItem
-		'
-		Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
-		Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
-		Me.OpenWithToolStripMenuItem.Text = "Open with ..."
-		'
-		'ShowInFolderToolStripMenuItem
-		'
-		Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
-		Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
-		Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
-		'
-		'gbTC
-		'
-		Me.gbTC.Controls.Add(Me.pnTcEngineering)
-		Me.gbTC.Controls.Add(Me.BtTCfileOpen)
-		Me.gbTC.Controls.Add(Me.TbTCfile)
-		Me.gbTC.Controls.Add(Me.BtTCfileBrowse)
-		Me.gbTC.Controls.Add(Me.Label17)
-		Me.gbTC.Location = New System.Drawing.Point(459, 377)
-		Me.gbTC.Name = "gbTC"
-		Me.gbTC.Size = New System.Drawing.Size(414, 162)
-		Me.gbTC.TabIndex = 5
-		Me.gbTC.TabStop = False
-		Me.gbTC.Text = "Torque Converter"
-		'
-		'pnTcEngineering
-		'
-		Me.pnTcEngineering.Controls.Add(Me.Label26)
-		Me.pnTcEngineering.Controls.Add(Me.TBTCShiftPolygon)
-		Me.pnTcEngineering.Controls.Add(Me.tbTCmaxSpeed)
-		Me.pnTcEngineering.Controls.Add(Me.TbTCrefrpm)
-		Me.pnTcEngineering.Controls.Add(Me.Label27)
-		Me.pnTcEngineering.Controls.Add(Me.Label14)
-		Me.pnTcEngineering.Controls.Add(Me.BtTCShiftFileBrowse)
-		Me.pnTcEngineering.Controls.Add(Me.Label1)
-		Me.pnTcEngineering.Controls.Add(Me.TbTCinertia)
-		Me.pnTcEngineering.Controls.Add(Me.Label15)
-		Me.pnTcEngineering.Controls.Add(Me.Label18)
-		Me.pnTcEngineering.Controls.Add(Me.LblTCShiftFile)
-		Me.pnTcEngineering.Location = New System.Drawing.Point(7, 63)
-		Me.pnTcEngineering.Name = "pnTcEngineering"
-		Me.pnTcEngineering.Size = New System.Drawing.Size(399, 93)
-		Me.pnTcEngineering.TabIndex = 3
-		'
-		'Label26
-		'
-		Me.Label26.AutoSize = True
-		Me.Label26.Location = New System.Drawing.Point(1, 29)
-		Me.Label26.Name = "Label26"
-		Me.Label26.Size = New System.Drawing.Size(64, 13)
-		Me.Label26.TabIndex = 50
-		Me.Label26.Text = "Max. Speed"
-		'
-		'TBTCShiftPolygon
-		'
-		Me.TBTCShiftPolygon.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TBTCShiftPolygon.Location = New System.Drawing.Point(4, 70)
-		Me.TBTCShiftPolygon.Name = "TBTCShiftPolygon"
-		Me.TBTCShiftPolygon.Size = New System.Drawing.Size(349, 20)
-		Me.TBTCShiftPolygon.TabIndex = 49
-		'
-		'tbTCmaxSpeed
-		'
-		Me.tbTCmaxSpeed.Location = New System.Drawing.Point(75, 26)
-		Me.tbTCmaxSpeed.Name = "tbTCmaxSpeed"
-		Me.tbTCmaxSpeed.Size = New System.Drawing.Size(57, 20)
-		Me.tbTCmaxSpeed.TabIndex = 52
-		'
-		'TbTCrefrpm
-		'
-		Me.TbTCrefrpm.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TbTCrefrpm.Location = New System.Drawing.Point(296, 0)
-		Me.TbTCrefrpm.Name = "TbTCrefrpm"
-		Me.TbTCrefrpm.Size = New System.Drawing.Size(57, 20)
-		Me.TbTCrefrpm.TabIndex = 46
-		'
-		'Label27
-		'
-		Me.Label27.AutoSize = True
-		Me.Label27.Location = New System.Drawing.Point(138, 29)
-		Me.Label27.Name = "Label27"
-		Me.Label27.Size = New System.Drawing.Size(30, 13)
-		Me.Label27.TabIndex = 51
-		Me.Label27.Text = "[rpm]"
-		'
-		'Label14
-		'
-		Me.Label14.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.Label14.AutoSize = True
-		Me.Label14.Location = New System.Drawing.Point(357, 3)
-		Me.Label14.Name = "Label14"
-		Me.Label14.Size = New System.Drawing.Size(40, 13)
-		Me.Label14.TabIndex = 41
-		Me.Label14.Text = "[1/min]"
-		'
-		'BtTCShiftFileBrowse
-		'
-		Me.BtTCShiftFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.BtTCShiftFileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-		Me.BtTCShiftFileBrowse.Location = New System.Drawing.Point(354, 68)
-		Me.BtTCShiftFileBrowse.Name = "BtTCShiftFileBrowse"
-		Me.BtTCShiftFileBrowse.Size = New System.Drawing.Size(24, 24)
-		Me.BtTCShiftFileBrowse.TabIndex = 47
-		Me.BtTCShiftFileBrowse.TabStop = False
-		Me.BtTCShiftFileBrowse.UseVisualStyleBackColor = True
-		'
-		'Label1
-		'
-		Me.Label1.AutoSize = True
-		Me.Label1.Location = New System.Drawing.Point(138, 3)
-		Me.Label1.Name = "Label1"
-		Me.Label1.Size = New System.Drawing.Size(36, 13)
-		Me.Label1.TabIndex = 43
-		Me.Label1.Text = "[kgm²]"
-		'
-		'TbTCinertia
-		'
-		Me.TbTCinertia.Location = New System.Drawing.Point(75, 0)
-		Me.TbTCinertia.Name = "TbTCinertia"
-		Me.TbTCinertia.Size = New System.Drawing.Size(57, 20)
-		Me.TbTCinertia.TabIndex = 45
-		'
-		'Label15
-		'
-		Me.Label15.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.Label15.AutoSize = True
-		Me.Label15.Location = New System.Drawing.Point(213, 3)
-		Me.Label15.Name = "Label15"
-		Me.Label15.Size = New System.Drawing.Size(77, 13)
-		Me.Label15.TabIndex = 42
-		Me.Label15.Text = "Reference rpm"
-		'
-		'Label18
-		'
-		Me.Label18.AutoSize = True
-		Me.Label18.Location = New System.Drawing.Point(1, 3)
-		Me.Label18.Name = "Label18"
-		Me.Label18.Size = New System.Drawing.Size(36, 13)
-		Me.Label18.TabIndex = 44
-		Me.Label18.Text = "Inertia"
-		'
-		'LblTCShiftFile
-		'
-		Me.LblTCShiftFile.AutoSize = True
-		Me.LblTCShiftFile.Location = New System.Drawing.Point(1, 55)
-		Me.LblTCShiftFile.Name = "LblTCShiftFile"
-		Me.LblTCShiftFile.Size = New System.Drawing.Size(207, 13)
-		Me.LblTCShiftFile.TabIndex = 48
-		Me.LblTCShiftFile.Text = "Torque converter shift polygons file (.vgbs)"
-		'
-		'BtTCfileOpen
-		'
-		Me.BtTCfileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.BtTCfileOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
-		Me.BtTCfileOpen.Location = New System.Drawing.Point(383, 35)
-		Me.BtTCfileOpen.Name = "BtTCfileOpen"
-		Me.BtTCfileOpen.Size = New System.Drawing.Size(24, 24)
-		Me.BtTCfileOpen.TabIndex = 2
-		Me.BtTCfileOpen.TabStop = False
-		Me.BtTCfileOpen.UseVisualStyleBackColor = True
-		'
-		'TbTCfile
-		'
-		Me.TbTCfile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TbTCfile.Location = New System.Drawing.Point(9, 37)
-		Me.TbTCfile.Name = "TbTCfile"
-		Me.TbTCfile.Size = New System.Drawing.Size(349, 20)
-		Me.TbTCfile.TabIndex = 0
-		'
-		'BtTCfileBrowse
-		'
-		Me.BtTCfileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.BtTCfileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-		Me.BtTCfileBrowse.Location = New System.Drawing.Point(359, 35)
-		Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
-		Me.BtTCfileBrowse.Size = New System.Drawing.Size(24, 24)
-		Me.BtTCfileBrowse.TabIndex = 1
-		Me.BtTCfileBrowse.TabStop = False
-		Me.BtTCfileBrowse.UseVisualStyleBackColor = True
-		'
-		'Label17
-		'
-		Me.Label17.AutoSize = True
-		Me.Label17.Location = New System.Drawing.Point(6, 21)
-		Me.Label17.Name = "Label17"
-		Me.Label17.Size = New System.Drawing.Size(209, 13)
-		Me.Label17.TabIndex = 0
-		Me.Label17.Text = "Torque converter characteristics file (.vtcc)"
-		'
-		'tbTCLUpshiftMinAcceleration
-		'
-		Me.tbTCLUpshiftMinAcceleration.Location = New System.Drawing.Point(78, 19)
-		Me.tbTCLUpshiftMinAcceleration.Name = "tbTCLUpshiftMinAcceleration"
-		Me.tbTCLUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20)
-		Me.tbTCLUpshiftMinAcceleration.TabIndex = 43
-		'
-		'Label30
-		'
-		Me.Label30.AutoSize = True
-		Me.Label30.Location = New System.Drawing.Point(141, 22)
-		Me.Label30.Name = "Label30"
-		Me.Label30.Size = New System.Drawing.Size(34, 13)
-		Me.Label30.TabIndex = 42
-		Me.Label30.Text = "[m/s²]"
-		'
-		'Label31
-		'
-		Me.Label31.AutoSize = True
-		Me.Label31.Location = New System.Drawing.Point(6, 22)
-		Me.Label31.Name = "Label31"
-		Me.Label31.Size = New System.Drawing.Size(69, 13)
-		Me.Label31.TabIndex = 41
-		Me.Label31.Text = "Acc. for C->L"
-		'
-		'Label16
-		'
-		Me.Label16.AutoSize = True
-		Me.Label16.Location = New System.Drawing.Point(18, 105)
-		Me.Label16.Name = "Label16"
-		Me.Label16.Size = New System.Drawing.Size(95, 13)
-		Me.Label16.TabIndex = 45
-		Me.Label16.Text = "Transmission Type"
-		'
-		'CbGStype
-		'
-		Me.CbGStype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.CbGStype.FormattingEnabled = True
-		Me.CbGStype.Location = New System.Drawing.Point(119, 102)
-		Me.CbGStype.Name = "CbGStype"
-		Me.CbGStype.Size = New System.Drawing.Size(227, 21)
-		Me.CbGStype.TabIndex = 1
-		'
-		'BtAddGear
-		'
-		Me.BtAddGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
-		Me.BtAddGear.Location = New System.Drawing.Point(6, 202)
-		Me.BtAddGear.Name = "BtAddGear"
-		Me.BtAddGear.Size = New System.Drawing.Size(24, 24)
-		Me.BtAddGear.TabIndex = 1
-		Me.BtAddGear.UseVisualStyleBackColor = True
-		'
-		'GroupBox4
-		'
-		Me.GroupBox4.Controls.Add(Me.btExportVGBS)
-		Me.GroupBox4.Controls.Add(Me.Label32)
-		Me.GroupBox4.Controls.Add(Me.LvGears)
-		Me.GroupBox4.Controls.Add(Me.BtRemGear)
-		Me.GroupBox4.Controls.Add(Me.BtAddGear)
-		Me.GroupBox4.Location = New System.Drawing.Point(12, 135)
-		Me.GroupBox4.Name = "GroupBox4"
-		Me.GroupBox4.Size = New System.Drawing.Size(441, 232)
-		Me.GroupBox4.TabIndex = 2
-		Me.GroupBox4.TabStop = False
-		Me.GroupBox4.Text = "Gears"
-		'
-		'Label32
-		'
-		Me.Label32.AutoSize = True
-		Me.Label32.Location = New System.Drawing.Point(331, 202)
-		Me.Label32.Name = "Label32"
-		Me.Label32.Size = New System.Drawing.Size(106, 13)
-		Me.Label32.TabIndex = 3
-		Me.Label32.Text = "(Double-Click to Edit)"
-		'
-		'PnInertiaTI
-		'
-		Me.PnInertiaTI.Controls.Add(Me.Label6)
-		Me.PnInertiaTI.Controls.Add(Me.TBI_getr)
-		Me.PnInertiaTI.Controls.Add(Me.Label33)
-		Me.PnInertiaTI.Controls.Add(Me.Label48)
-		Me.PnInertiaTI.Controls.Add(Me.Label49)
-		Me.PnInertiaTI.Controls.Add(Me.TbTracInt)
-		Me.PnInertiaTI.Location = New System.Drawing.Point(459, 344)
-		Me.PnInertiaTI.Name = "PnInertiaTI"
-		Me.PnInertiaTI.Size = New System.Drawing.Size(411, 30)
-		Me.PnInertiaTI.TabIndex = 4
-		'
-		'PicBox
-		'
-		Me.PicBox.BackColor = System.Drawing.Color.LightGray
-		Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-		Me.PicBox.Location = New System.Drawing.Point(459, 28)
-		Me.PicBox.Name = "PicBox"
-		Me.PicBox.Size = New System.Drawing.Size(414, 308)
-		Me.PicBox.TabIndex = 48
-		Me.PicBox.TabStop = False
-		'
-		'gbPowershiftLosses
-		'
-		Me.gbPowershiftLosses.Controls.Add(Me.lbAtShiftTime)
-		Me.gbPowershiftLosses.Controls.Add(Me.tbATShiftTime)
-		Me.gbPowershiftLosses.Controls.Add(Me.Label28)
-		Me.gbPowershiftLosses.Location = New System.Drawing.Point(459, 598)
-		Me.gbPowershiftLosses.Name = "gbPowershiftLosses"
-		Me.gbPowershiftLosses.Size = New System.Drawing.Size(414, 47)
-		Me.gbPowershiftLosses.TabIndex = 49
-		Me.gbPowershiftLosses.TabStop = False
-		Me.gbPowershiftLosses.Text = "Power shift losses"
-		'
-		'lbAtShiftTime
-		'
-		Me.lbAtShiftTime.AutoSize = True
-		Me.lbAtShiftTime.Location = New System.Drawing.Point(6, 22)
-		Me.lbAtShiftTime.Name = "lbAtShiftTime"
-		Me.lbAtShiftTime.Size = New System.Drawing.Size(50, 13)
-		Me.lbAtShiftTime.TabIndex = 0
-		Me.lbAtShiftTime.Text = "Shift time"
-		'
-		'tbATShiftTime
-		'
-		Me.tbATShiftTime.Location = New System.Drawing.Point(78, 19)
-		Me.tbATShiftTime.Name = "tbATShiftTime"
-		Me.tbATShiftTime.Size = New System.Drawing.Size(57, 20)
-		Me.tbATShiftTime.TabIndex = 4
-		'
-		'Label28
-		'
-		Me.Label28.AutoSize = True
-		Me.Label28.Location = New System.Drawing.Point(141, 22)
-		Me.Label28.Name = "Label28"
-		Me.Label28.Size = New System.Drawing.Size(18, 13)
-		Me.Label28.TabIndex = 41
-		Me.Label28.Text = "[s]"
-		'
-		'tbTCCUpshiftMinAcceleration
-		'
-		Me.tbTCCUpshiftMinAcceleration.Location = New System.Drawing.Point(299, 19)
-		Me.tbTCCUpshiftMinAcceleration.Name = "tbTCCUpshiftMinAcceleration"
-		Me.tbTCCUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20)
-		Me.tbTCCUpshiftMinAcceleration.TabIndex = 46
-		'
-		'Label34
-		'
-		Me.Label34.AutoSize = True
-		Me.Label34.Location = New System.Drawing.Point(362, 22)
-		Me.Label34.Name = "Label34"
-		Me.Label34.Size = New System.Drawing.Size(34, 13)
-		Me.Label34.TabIndex = 45
-		Me.Label34.Text = "[m/s²]"
-		'
-		'Label35
-		'
-		Me.Label35.AutoSize = True
-		Me.Label35.Location = New System.Drawing.Point(211, 22)
-		Me.Label35.Name = "Label35"
-		Me.Label35.Size = New System.Drawing.Size(70, 13)
-		Me.Label35.TabIndex = 44
-		Me.Label35.Text = "Acc. for C->C"
-		'
-		'gbTCAccMin
-		'
-		Me.gbTCAccMin.Controls.Add(Me.tbTCLUpshiftMinAcceleration)
-		Me.gbTCAccMin.Controls.Add(Me.tbTCCUpshiftMinAcceleration)
-		Me.gbTCAccMin.Controls.Add(Me.Label34)
-		Me.gbTCAccMin.Controls.Add(Me.Label31)
-		Me.gbTCAccMin.Controls.Add(Me.Label35)
-		Me.gbTCAccMin.Controls.Add(Me.Label30)
-		Me.gbTCAccMin.Location = New System.Drawing.Point(459, 545)
-		Me.gbTCAccMin.Name = "gbTCAccMin"
-		Me.gbTCAccMin.Size = New System.Drawing.Size(414, 47)
-		Me.gbTCAccMin.TabIndex = 50
-		Me.gbTCAccMin.TabStop = False
-		Me.gbTCAccMin.Text = "Torque Converter: Min. acceleration after upshift"
-		'
-		'lblGbxInfo
-		'
-		Me.lblGbxInfo.AutoSize = True
-		Me.lblGbxInfo.Location = New System.Drawing.Point(121, 126)
-		Me.lblGbxInfo.Name = "lblGbxInfo"
-		Me.lblGbxInfo.Size = New System.Drawing.Size(0, 13)
-		Me.lblGbxInfo.TabIndex = 51
-		'
-		'btnExportXML
-		'
-		Me.btnExportXML.Location = New System.Drawing.Point(459, 648)
-		Me.btnExportXML.Name = "btnExportXML"
-		Me.btnExportXML.Size = New System.Drawing.Size(119, 23)
-		Me.btnExportXML.TabIndex = 52
-		Me.btnExportXML.Text = "Exp. Gearbox as XML"
-		Me.btnExportXML.UseVisualStyleBackColor = True
-		'
-		'btnExportAxlGearXML
-		'
-		Me.btnExportAxlGearXML.Location = New System.Drawing.Point(584, 648)
-		Me.btnExportAxlGearXML.Name = "btnExportAxlGearXML"
-		Me.btnExportAxlGearXML.Size = New System.Drawing.Size(118, 23)
-		Me.btnExportAxlGearXML.TabIndex = 53
-		Me.btnExportAxlGearXML.Text = "Exp. AxlGear as XML"
-		Me.btnExportAxlGearXML.UseVisualStyleBackColor = True
-		'
-		'btExportVGBS
-		'
-		Me.btExportVGBS.Enabled = False
-		Me.btExportVGBS.Location = New System.Drawing.Point(55, 202)
-		Me.btExportVGBS.Name = "btExportVGBS"
-		Me.btExportVGBS.Size = New System.Drawing.Size(153, 24)
-		Me.btExportVGBS.TabIndex = 4
-		Me.btExportVGBS.Text = "Export Shiftcurve as VGBS"
-		Me.btExportVGBS.UseVisualStyleBackColor = True
-		'
-		'GearboxForm
-		'
-		Me.AcceptButton = Me.ButOK
-		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-		Me.CancelButton = Me.ButCancel
-		Me.ClientSize = New System.Drawing.Size(877, 696)
-		Me.Controls.Add(Me.btnExportAxlGearXML)
-		Me.Controls.Add(Me.btnExportXML)
-		Me.Controls.Add(Me.lblGbxInfo)
-		Me.Controls.Add(Me.gbTCAccMin)
-		Me.Controls.Add(Me.gbPowershiftLosses)
-		Me.Controls.Add(Me.PicBox)
-		Me.Controls.Add(Me.PnInertiaTI)
-		Me.Controls.Add(Me.GroupBox4)
-		Me.Controls.Add(Me.CbGStype)
-		Me.Controls.Add(Me.Label16)
-		Me.Controls.Add(Me.PictureBox1)
-		Me.Controls.Add(Me.GrGearShift)
-		Me.Controls.Add(Me.gbTC)
-		Me.Controls.Add(Me.Label3)
-		Me.Controls.Add(Me.TbName)
-		Me.Controls.Add(Me.ButCancel)
-		Me.Controls.Add(Me.ButOK)
-		Me.Controls.Add(Me.StatusStrip1)
-		Me.Controls.Add(Me.ToolStrip1)
-		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
-		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-		Me.MaximizeBox = False
-		Me.Name = "GearboxForm"
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-		Me.Text = "F_GBX"
-		Me.ToolStrip1.ResumeLayout(False)
-		Me.ToolStrip1.PerformLayout()
-		Me.StatusStrip1.ResumeLayout(False)
-		Me.StatusStrip1.PerformLayout()
-		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
-		Me.GrGearShift.ResumeLayout(False)
-		Me.GrGearShift.PerformLayout()
-		Me.GroupBox1.ResumeLayout(False)
-		Me.GroupBox1.PerformLayout()
-		Me.PnTorqRes.ResumeLayout(False)
-		Me.PnTorqRes.PerformLayout()
-		Me.GroupBox2.ResumeLayout(False)
-		Me.GroupBox2.PerformLayout()
-		Me.CmOpenFile.ResumeLayout(False)
-		Me.gbTC.ResumeLayout(False)
-		Me.gbTC.PerformLayout()
-		Me.pnTcEngineering.ResumeLayout(False)
-		Me.pnTcEngineering.PerformLayout()
-		Me.GroupBox4.ResumeLayout(False)
-		Me.GroupBox4.PerformLayout()
-		Me.PnInertiaTI.ResumeLayout(False)
-		Me.PnInertiaTI.PerformLayout()
-		CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
-		Me.gbPowershiftLosses.ResumeLayout(False)
-		Me.gbPowershiftLosses.PerformLayout()
-		Me.gbTCAccMin.ResumeLayout(False)
-		Me.gbTCAccMin.PerformLayout()
-		Me.ResumeLayout(False)
-		Me.PerformLayout()
+        Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GearboxForm))
+        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+        Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+        Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.ButCancel = New System.Windows.Forms.Button()
+        Me.ButOK = New System.Windows.Forms.Button()
+        Me.TbTracInt = New System.Windows.Forms.TextBox()
+        Me.LvGears = New System.Windows.Forms.ListView()
+        Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader7 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.TBI_getr = New System.Windows.Forms.TextBox()
+        Me.Label49 = New System.Windows.Forms.Label()
+        Me.Label33 = New System.Windows.Forms.Label()
+        Me.Label48 = New System.Windows.Forms.Label()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.TbName = New System.Windows.Forms.TextBox()
+        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+        Me.BtRemGear = New System.Windows.Forms.Button()
+        Me.GrGearShift = New System.Windows.Forms.GroupBox()
+        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.tbUpshiftMinAcceleration = New System.Windows.Forms.TextBox()
+        Me.tbUpshiftAfterDownshift = New System.Windows.Forms.TextBox()
+        Me.tbDownshiftAfterUpshift = New System.Windows.Forms.TextBox()
+        Me.Label24 = New System.Windows.Forms.Label()
+        Me.Label23 = New System.Windows.Forms.Label()
+        Me.Label22 = New System.Windows.Forms.Label()
+        Me.Label21 = New System.Windows.Forms.Label()
+        Me.Label20 = New System.Windows.Forms.Label()
+        Me.Label19 = New System.Windows.Forms.Label()
+        Me.PnTorqRes = New System.Windows.Forms.Panel()
+        Me.Label25 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.TbTqResv = New System.Windows.Forms.TextBox()
+        Me.TbMinTimeBetweenShifts = New System.Windows.Forms.TextBox()
+        Me.Label12 = New System.Windows.Forms.Label()
+        Me.Label13 = New System.Windows.Forms.Label()
+        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.TbStartAcc = New System.Windows.Forms.TextBox()
+        Me.Label11 = New System.Windows.Forms.Label()
+        Me.TbStartSpeed = New System.Windows.Forms.TextBox()
+        Me.Label9 = New System.Windows.Forms.Label()
+        Me.Label10 = New System.Windows.Forms.Label()
+        Me.TbTqResvStart = New System.Windows.Forms.TextBox()
+        Me.Label8 = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gbTC = New System.Windows.Forms.GroupBox()
+        Me.pnTcEngineering = New System.Windows.Forms.Panel()
+        Me.Label26 = New System.Windows.Forms.Label()
+        Me.TBTCShiftPolygon = New System.Windows.Forms.TextBox()
+        Me.tbTCmaxSpeed = New System.Windows.Forms.TextBox()
+        Me.TbTCrefrpm = New System.Windows.Forms.TextBox()
+        Me.Label27 = New System.Windows.Forms.Label()
+        Me.Label14 = New System.Windows.Forms.Label()
+        Me.BtTCShiftFileBrowse = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.TbTCinertia = New System.Windows.Forms.TextBox()
+        Me.Label15 = New System.Windows.Forms.Label()
+        Me.Label18 = New System.Windows.Forms.Label()
+        Me.LblTCShiftFile = New System.Windows.Forms.Label()
+        Me.BtTCfileOpen = New System.Windows.Forms.Button()
+        Me.TbTCfile = New System.Windows.Forms.TextBox()
+        Me.BtTCfileBrowse = New System.Windows.Forms.Button()
+        Me.Label17 = New System.Windows.Forms.Label()
+        Me.tbTCLUpshiftMinAcceleration = New System.Windows.Forms.TextBox()
+        Me.Label30 = New System.Windows.Forms.Label()
+        Me.Label31 = New System.Windows.Forms.Label()
+        Me.Label16 = New System.Windows.Forms.Label()
+        Me.CbGStype = New System.Windows.Forms.ComboBox()
+        Me.BtAddGear = New System.Windows.Forms.Button()
+        Me.GroupBox4 = New System.Windows.Forms.GroupBox()
+        Me.btExportVGBS = New System.Windows.Forms.Button()
+        Me.Label32 = New System.Windows.Forms.Label()
+        Me.PnInertiaTI = New System.Windows.Forms.Panel()
+        Me.PicBox = New System.Windows.Forms.PictureBox()
+        Me.gbPowershiftLosses = New System.Windows.Forms.GroupBox()
+        Me.lbAtShiftTime = New System.Windows.Forms.Label()
+        Me.tbATShiftTime = New System.Windows.Forms.TextBox()
+        Me.Label28 = New System.Windows.Forms.Label()
+        Me.tbTCCUpshiftMinAcceleration = New System.Windows.Forms.TextBox()
+        Me.Label34 = New System.Windows.Forms.Label()
+        Me.Label35 = New System.Windows.Forms.Label()
+        Me.gbTCAccMin = New System.Windows.Forms.GroupBox()
+        Me.lblGbxInfo = New System.Windows.Forms.Label()
+        Me.btnExportXML = New System.Windows.Forms.Button()
+        Me.btnExportAxlGearXML = New System.Windows.Forms.Button()
+        Me.ToolStrip1.SuspendLayout
+        Me.StatusStrip1.SuspendLayout
+        CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
+        Me.GrGearShift.SuspendLayout
+        Me.GroupBox1.SuspendLayout
+        Me.PnTorqRes.SuspendLayout
+        Me.GroupBox2.SuspendLayout
+        Me.CmOpenFile.SuspendLayout
+        Me.gbTC.SuspendLayout
+        Me.pnTcEngineering.SuspendLayout
+        Me.GroupBox4.SuspendLayout
+        Me.PnInertiaTI.SuspendLayout
+        CType(Me.PicBox,System.ComponentModel.ISupportInitialize).BeginInit
+        Me.gbPowershiftLosses.SuspendLayout
+        Me.gbTCAccMin.SuspendLayout
+        Me.SuspendLayout
+        '
+        'ToolStrip1
+        '
+        Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
+        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.Size = New System.Drawing.Size(877, 31)
+        Me.ToolStrip1.TabIndex = 30
+        Me.ToolStrip1.Text = "ToolStrip1"
+        '
+        'ToolStripBtNew
+        '
+        Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        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(28, 28)
+        Me.ToolStripBtNew.Text = "ToolStripButton1"
+        Me.ToolStripBtNew.ToolTipText = "New"
+        '
+        'ToolStripBtOpen
+        '
+        Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        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(28, 28)
+        Me.ToolStripBtOpen.Text = "ToolStripButton1"
+        Me.ToolStripBtOpen.ToolTipText = "Open..."
+        '
+        'ToolStripBtSave
+        '
+        Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        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(28, 28)
+        Me.ToolStripBtSave.Text = "ToolStripButton1"
+        Me.ToolStripBtSave.ToolTipText = "Save"
+        '
+        'ToolStripBtSaveAs
+        '
+        Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        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(28, 28)
+        Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
+        Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
+        '
+        'ToolStripSeparator3
+        '
+        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
+        '
+        'ToolStripBtSendTo
+        '
+        Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        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(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, 31)
+        '
+        'ToolStripButton1
+        '
+        Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        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(28, 28)
+        Me.ToolStripButton1.Text = "Help"
+        '
+        '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, 674)
+        Me.StatusStrip1.Name = "StatusStrip1"
+        Me.StatusStrip1.Size = New System.Drawing.Size(877, 22)
+        Me.StatusStrip1.SizingGrip = false
+        Me.StatusStrip1.TabIndex = 37
+        Me.StatusStrip1.Text = "StatusStrip1"
+        '
+        'LbStatus
+        '
+        Me.LbStatus.Name = "LbStatus"
+        Me.LbStatus.Size = New System.Drawing.Size(39, 17)
+        Me.LbStatus.Text = "Status"
+        '
+        'ButCancel
+        '
+        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(798, 648)
+        Me.ButCancel.Name = "ButCancel"
+        Me.ButCancel.Size = New System.Drawing.Size(75, 23)
+        Me.ButCancel.TabIndex = 8
+        Me.ButCancel.Text = "Cancel"
+        Me.ButCancel.UseVisualStyleBackColor = true
+        '
+        '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(717, 648)
+        Me.ButOK.Name = "ButOK"
+        Me.ButOK.Size = New System.Drawing.Size(75, 23)
+        Me.ButOK.TabIndex = 7
+        Me.ButOK.Text = "Save"
+        Me.ButOK.UseVisualStyleBackColor = true
+        '
+        'TbTracInt
+        '
+        Me.TbTracInt.Location = New System.Drawing.Point(299, 3)
+        Me.TbTracInt.Name = "TbTracInt"
+        Me.TbTracInt.Size = New System.Drawing.Size(57, 20)
+        Me.TbTracInt.TabIndex = 1
+        '
+        'LvGears
+        '
+        Me.LvGears.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2, Me.ColumnHeader3, Me.ColumnHeader5, Me.ColumnHeader6, Me.ColumnHeader7})
+        Me.LvGears.FullRowSelect = true
+        Me.LvGears.GridLines = true
+        Me.LvGears.HideSelection = false
+        Me.LvGears.Location = New System.Drawing.Point(6, 18)
+        Me.LvGears.MultiSelect = false
+        Me.LvGears.Name = "LvGears"
+        Me.LvGears.Size = New System.Drawing.Size(429, 183)
+        Me.LvGears.TabIndex = 0
+        Me.LvGears.TabStop = false
+        Me.LvGears.UseCompatibleStateImageBehavior = false
+        Me.LvGears.View = System.Windows.Forms.View.Details
+        '
+        'ColumnHeader1
+        '
+        Me.ColumnHeader1.Text = "Gear"
+        Me.ColumnHeader1.Width = 38
+        '
+        'ColumnHeader2
+        '
+        Me.ColumnHeader2.Text = "Ratio"
+        Me.ColumnHeader2.Width = 42
+        '
+        'ColumnHeader3
+        '
+        Me.ColumnHeader3.Text = "Loss Map or Efficiency"
+        Me.ColumnHeader3.Width = 111
+        '
+        'ColumnHeader5
+        '
+        Me.ColumnHeader5.Text = "Shift Polygons"
+        Me.ColumnHeader5.Width = 79
+        '
+        'ColumnHeader6
+        '
+        Me.ColumnHeader6.Text = "Max Torque"
+        Me.ColumnHeader6.Width = 78
+        '
+        'ColumnHeader7
+        '
+        Me.ColumnHeader7.Text = "Max Speed"
+        Me.ColumnHeader7.Width = 76
+        '
+        'TBI_getr
+        '
+        Me.TBI_getr.Location = New System.Drawing.Point(78, 3)
+        Me.TBI_getr.Name = "TBI_getr"
+        Me.TBI_getr.Size = New System.Drawing.Size(57, 20)
+        Me.TBI_getr.TabIndex = 0
+        '
+        'Label49
+        '
+        Me.Label49.AutoSize = true
+        Me.Label49.Location = New System.Drawing.Point(362, 6)
+        Me.Label49.Name = "Label49"
+        Me.Label49.Size = New System.Drawing.Size(18, 13)
+        Me.Label49.TabIndex = 2
+        Me.Label49.Text = "[s]"
+        '
+        'Label33
+        '
+        Me.Label33.AutoSize = true
+        Me.Label33.Location = New System.Drawing.Point(141, 6)
+        Me.Label33.Name = "Label33"
+        Me.Label33.Size = New System.Drawing.Size(36, 13)
+        Me.Label33.TabIndex = 2
+        Me.Label33.Text = "[kgm²]"
+        '
+        'Label48
+        '
+        Me.Label48.AutoSize = true
+        Me.Label48.Location = New System.Drawing.Point(191, 6)
+        Me.Label48.Name = "Label48"
+        Me.Label48.Size = New System.Drawing.Size(102, 13)
+        Me.Label48.TabIndex = 2
+        Me.Label48.Text = "Traction Interruption"
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = true
+        Me.Label6.Location = New System.Drawing.Point(6, 6)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(36, 13)
+        Me.Label6.TabIndex = 2
+        Me.Label6.Text = "Inertia"
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = true
+        Me.Label3.Location = New System.Drawing.Point(26, 79)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(87, 13)
+        Me.Label3.TabIndex = 42
+        Me.Label3.Text = "Make and Model"
+        '
+        'TbName
+        '
+        Me.TbName.Location = New System.Drawing.Point(119, 76)
+        Me.TbName.Name = "TbName"
+        Me.TbName.Size = New System.Drawing.Size(334, 20)
+        Me.TbName.TabIndex = 0
+        '
+        'PictureBox1
+        '
+        Me.PictureBox1.BackColor = System.Drawing.Color.White
+        Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_GBX
+        Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
+        Me.PictureBox1.Name = "PictureBox1"
+        Me.PictureBox1.Size = New System.Drawing.Size(453, 40)
+        Me.PictureBox1.TabIndex = 43
+        Me.PictureBox1.TabStop = false
+        '
+        'BtRemGear
+        '
+        Me.BtRemGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+        Me.BtRemGear.Location = New System.Drawing.Point(30, 202)
+        Me.BtRemGear.Name = "BtRemGear"
+        Me.BtRemGear.Size = New System.Drawing.Size(24, 24)
+        Me.BtRemGear.TabIndex = 2
+        Me.BtRemGear.UseVisualStyleBackColor = true
+        '
+        'GrGearShift
+        '
+        Me.GrGearShift.Controls.Add(Me.GroupBox1)
+        Me.GrGearShift.Controls.Add(Me.PnTorqRes)
+        Me.GrGearShift.Controls.Add(Me.TbMinTimeBetweenShifts)
+        Me.GrGearShift.Controls.Add(Me.Label12)
+        Me.GrGearShift.Controls.Add(Me.Label13)
+        Me.GrGearShift.Controls.Add(Me.GroupBox2)
+        Me.GrGearShift.Location = New System.Drawing.Point(12, 377)
+        Me.GrGearShift.Name = "GrGearShift"
+        Me.GrGearShift.Size = New System.Drawing.Size(441, 291)
+        Me.GrGearShift.TabIndex = 3
+        Me.GrGearShift.TabStop = false
+        Me.GrGearShift.Text = "Gear shift parameters"
+        '
+        'GroupBox1
+        '
+        Me.GroupBox1.Controls.Add(Me.tbUpshiftMinAcceleration)
+        Me.GroupBox1.Controls.Add(Me.tbUpshiftAfterDownshift)
+        Me.GroupBox1.Controls.Add(Me.tbDownshiftAfterUpshift)
+        Me.GroupBox1.Controls.Add(Me.Label24)
+        Me.GroupBox1.Controls.Add(Me.Label23)
+        Me.GroupBox1.Controls.Add(Me.Label22)
+        Me.GroupBox1.Controls.Add(Me.Label21)
+        Me.GroupBox1.Controls.Add(Me.Label20)
+        Me.GroupBox1.Controls.Add(Me.Label19)
+        Me.GroupBox1.Location = New System.Drawing.Point(6, 82)
+        Me.GroupBox1.Name = "GroupBox1"
+        Me.GroupBox1.Size = New System.Drawing.Size(429, 100)
+        Me.GroupBox1.TabIndex = 2
+        Me.GroupBox1.TabStop = false
+        Me.GroupBox1.Text = "Shift Strategy Parameters"
+        '
+        'tbUpshiftMinAcceleration
+        '
+        Me.tbUpshiftMinAcceleration.Location = New System.Drawing.Point(209, 71)
+        Me.tbUpshiftMinAcceleration.Name = "tbUpshiftMinAcceleration"
+        Me.tbUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20)
+        Me.tbUpshiftMinAcceleration.TabIndex = 2
+        '
+        'tbUpshiftAfterDownshift
+        '
+        Me.tbUpshiftAfterDownshift.Location = New System.Drawing.Point(209, 45)
+        Me.tbUpshiftAfterDownshift.Name = "tbUpshiftAfterDownshift"
+        Me.tbUpshiftAfterDownshift.Size = New System.Drawing.Size(57, 20)
+        Me.tbUpshiftAfterDownshift.TabIndex = 1
+        '
+        'tbDownshiftAfterUpshift
+        '
+        Me.tbDownshiftAfterUpshift.Location = New System.Drawing.Point(209, 20)
+        Me.tbDownshiftAfterUpshift.Name = "tbDownshiftAfterUpshift"
+        Me.tbDownshiftAfterUpshift.Size = New System.Drawing.Size(57, 20)
+        Me.tbDownshiftAfterUpshift.TabIndex = 0
+        '
+        'Label24
+        '
+        Me.Label24.AutoSize = true
+        Me.Label24.Location = New System.Drawing.Point(275, 74)
+        Me.Label24.Name = "Label24"
+        Me.Label24.Size = New System.Drawing.Size(34, 13)
+        Me.Label24.TabIndex = 5
+        Me.Label24.Text = "[m/s²]"
+        '
+        'Label23
+        '
+        Me.Label23.AutoSize = true
+        Me.Label23.Location = New System.Drawing.Point(275, 48)
+        Me.Label23.Name = "Label23"
+        Me.Label23.Size = New System.Drawing.Size(18, 13)
+        Me.Label23.TabIndex = 4
+        Me.Label23.Text = "[s]"
+        '
+        'Label22
+        '
+        Me.Label22.AutoSize = true
+        Me.Label22.Location = New System.Drawing.Point(275, 25)
+        Me.Label22.Name = "Label22"
+        Me.Label22.Size = New System.Drawing.Size(18, 13)
+        Me.Label22.TabIndex = 3
+        Me.Label22.Text = "[s]"
+        '
+        'Label21
+        '
+        Me.Label21.AutoSize = true
+        Me.Label21.Location = New System.Drawing.Point(20, 74)
+        Me.Label21.Name = "Label21"
+        Me.Label21.Size = New System.Drawing.Size(146, 13)
+        Me.Label21.TabIndex = 2
+        Me.Label21.Text = "Min. acceleration after upshift"
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = true
+        Me.Label20.Location = New System.Drawing.Point(20, 48)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(140, 13)
+        Me.Label20.TabIndex = 1
+        Me.Label20.Text = "Upshift after downshift delay"
+        '
+        'Label19
+        '
+        Me.Label19.AutoSize = true
+        Me.Label19.Location = New System.Drawing.Point(20, 25)
+        Me.Label19.Name = "Label19"
+        Me.Label19.Size = New System.Drawing.Size(140, 13)
+        Me.Label19.TabIndex = 0
+        Me.Label19.Text = "Downshift after upshift delay"
+        '
+        'PnTorqRes
+        '
+        Me.PnTorqRes.Controls.Add(Me.Label25)
+        Me.PnTorqRes.Controls.Add(Me.Label2)
+        Me.PnTorqRes.Controls.Add(Me.Label4)
+        Me.PnTorqRes.Controls.Add(Me.TbTqResv)
+        Me.PnTorqRes.Location = New System.Drawing.Point(9, 20)
+        Me.PnTorqRes.Name = "PnTorqRes"
+        Me.PnTorqRes.Size = New System.Drawing.Size(426, 32)
+        Me.PnTorqRes.TabIndex = 0
+        '
+        'Label25
+        '
+        Me.Label25.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.Label25.AutoSize = true
+        Me.Label25.Location = New System.Drawing.Point(294, 9)
+        Me.Label25.Name = "Label25"
+        Me.Label25.Size = New System.Drawing.Size(129, 13)
+        Me.Label25.TabIndex = 1
+        Me.Label25.Text = "(Early shift-up, Skip gears)"
+        '
+        'Label2
+        '
+        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.Label2.AutoSize = true
+        Me.Label2.Location = New System.Drawing.Point(18, 9)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(79, 13)
+        Me.Label2.TabIndex = 0
+        Me.Label2.Text = "Torque reserve"
+        '
+        '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(272, 9)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(21, 13)
+        Me.Label4.TabIndex = 0
+        Me.Label4.Text = "[%]"
+        '
+        'TbTqResv
+        '
+        Me.TbTqResv.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TbTqResv.Location = New System.Drawing.Point(206, 6)
+        Me.TbTqResv.Name = "TbTqResv"
+        Me.TbTqResv.Size = New System.Drawing.Size(57, 20)
+        Me.TbTqResv.TabIndex = 0
+        '
+        'TbMinTimeBetweenShifts
+        '
+        Me.TbMinTimeBetweenShifts.Location = New System.Drawing.Point(215, 52)
+        Me.TbMinTimeBetweenShifts.Name = "TbMinTimeBetweenShifts"
+        Me.TbMinTimeBetweenShifts.Size = New System.Drawing.Size(57, 20)
+        Me.TbMinTimeBetweenShifts.TabIndex = 1
+        '
+        'Label12
+        '
+        Me.Label12.AutoSize = true
+        Me.Label12.Location = New System.Drawing.Point(281, 55)
+        Me.Label12.Name = "Label12"
+        Me.Label12.Size = New System.Drawing.Size(18, 13)
+        Me.Label12.TabIndex = 9
+        Me.Label12.Text = "[s]"
+        '
+        'Label13
+        '
+        Me.Label13.AutoSize = true
+        Me.Label13.Location = New System.Drawing.Point(27, 55)
+        Me.Label13.Name = "Label13"
+        Me.Label13.Size = New System.Drawing.Size(162, 13)
+        Me.Label13.TabIndex = 8
+        Me.Label13.Text = "Minimum time between gearshifts"
+        '
+        'GroupBox2
+        '
+        Me.GroupBox2.Controls.Add(Me.TbStartAcc)
+        Me.GroupBox2.Controls.Add(Me.Label11)
+        Me.GroupBox2.Controls.Add(Me.TbStartSpeed)
+        Me.GroupBox2.Controls.Add(Me.Label9)
+        Me.GroupBox2.Controls.Add(Me.Label10)
+        Me.GroupBox2.Controls.Add(Me.TbTqResvStart)
+        Me.GroupBox2.Controls.Add(Me.Label8)
+        Me.GroupBox2.Controls.Add(Me.Label5)
+        Me.GroupBox2.Controls.Add(Me.Label7)
+        Me.GroupBox2.Location = New System.Drawing.Point(6, 186)
+        Me.GroupBox2.Name = "GroupBox2"
+        Me.GroupBox2.Size = New System.Drawing.Size(429, 99)
+        Me.GroupBox2.TabIndex = 3
+        Me.GroupBox2.TabStop = false
+        Me.GroupBox2.Text = "Start Gear"
+        '
+        'TbStartAcc
+        '
+        Me.TbStartAcc.Location = New System.Drawing.Point(209, 71)
+        Me.TbStartAcc.Name = "TbStartAcc"
+        Me.TbStartAcc.Size = New System.Drawing.Size(57, 20)
+        Me.TbStartAcc.TabIndex = 2
+        Me.TbStartAcc.Visible = false
+        '
+        'Label11
+        '
+        Me.Label11.AutoSize = true
+        Me.Label11.Location = New System.Drawing.Point(20, 74)
+        Me.Label11.Name = "Label11"
+        Me.Label11.Size = New System.Drawing.Size(173, 13)
+        Me.Label11.TabIndex = 0
+        Me.Label11.Text = "Reference acceleration at clutch-in"
+        Me.Label11.Visible = false
+        '
+        'TbStartSpeed
+        '
+        Me.TbStartSpeed.Location = New System.Drawing.Point(209, 45)
+        Me.TbStartSpeed.Name = "TbStartSpeed"
+        Me.TbStartSpeed.Size = New System.Drawing.Size(57, 20)
+        Me.TbStartSpeed.TabIndex = 1
+        '
+        'Label9
+        '
+        Me.Label9.AutoSize = true
+        Me.Label9.Location = New System.Drawing.Point(20, 48)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(181, 13)
+        Me.Label9.TabIndex = 0
+        Me.Label9.Text = "Reference vehicle speed at clutch-in"
+        '
+        'Label10
+        '
+        Me.Label10.AutoSize = true
+        Me.Label10.Location = New System.Drawing.Point(272, 74)
+        Me.Label10.Name = "Label10"
+        Me.Label10.Size = New System.Drawing.Size(34, 13)
+        Me.Label10.TabIndex = 0
+        Me.Label10.Text = "[m/s²]"
+        Me.Label10.Visible = false
+        '
+        'TbTqResvStart
+        '
+        Me.TbTqResvStart.Location = New System.Drawing.Point(209, 19)
+        Me.TbTqResvStart.Name = "TbTqResvStart"
+        Me.TbTqResvStart.Size = New System.Drawing.Size(57, 20)
+        Me.TbTqResvStart.TabIndex = 0
+        '
+        'Label8
+        '
+        Me.Label8.AutoSize = true
+        Me.Label8.Location = New System.Drawing.Point(272, 48)
+        Me.Label8.Name = "Label8"
+        Me.Label8.Size = New System.Drawing.Size(31, 13)
+        Me.Label8.TabIndex = 0
+        Me.Label8.Text = "[m/s]"
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = true
+        Me.Label5.Location = New System.Drawing.Point(20, 22)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(79, 13)
+        Me.Label5.TabIndex = 0
+        Me.Label5.Text = "Torque reserve"
+        '
+        'Label7
+        '
+        Me.Label7.AutoSize = true
+        Me.Label7.Location = New System.Drawing.Point(272, 22)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(21, 13)
+        Me.Label7.TabIndex = 0
+        Me.Label7.Text = "[%]"
+        '
+        'CmOpenFile
+        '
+        Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
+        Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+        Me.CmOpenFile.Name = "CmOpenFile"
+        Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
+        '
+        'OpenWithToolStripMenuItem
+        '
+        Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+        Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+        Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+        '
+        'ShowInFolderToolStripMenuItem
+        '
+        Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+        Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+        Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+        '
+        'gbTC
+        '
+        Me.gbTC.Controls.Add(Me.pnTcEngineering)
+        Me.gbTC.Controls.Add(Me.BtTCfileOpen)
+        Me.gbTC.Controls.Add(Me.TbTCfile)
+        Me.gbTC.Controls.Add(Me.BtTCfileBrowse)
+        Me.gbTC.Controls.Add(Me.Label17)
+        Me.gbTC.Location = New System.Drawing.Point(459, 377)
+        Me.gbTC.Name = "gbTC"
+        Me.gbTC.Size = New System.Drawing.Size(414, 162)
+        Me.gbTC.TabIndex = 5
+        Me.gbTC.TabStop = false
+        Me.gbTC.Text = "Torque Converter"
+        '
+        'pnTcEngineering
+        '
+        Me.pnTcEngineering.Controls.Add(Me.Label26)
+        Me.pnTcEngineering.Controls.Add(Me.TBTCShiftPolygon)
+        Me.pnTcEngineering.Controls.Add(Me.tbTCmaxSpeed)
+        Me.pnTcEngineering.Controls.Add(Me.TbTCrefrpm)
+        Me.pnTcEngineering.Controls.Add(Me.Label27)
+        Me.pnTcEngineering.Controls.Add(Me.Label14)
+        Me.pnTcEngineering.Controls.Add(Me.BtTCShiftFileBrowse)
+        Me.pnTcEngineering.Controls.Add(Me.Label1)
+        Me.pnTcEngineering.Controls.Add(Me.TbTCinertia)
+        Me.pnTcEngineering.Controls.Add(Me.Label15)
+        Me.pnTcEngineering.Controls.Add(Me.Label18)
+        Me.pnTcEngineering.Controls.Add(Me.LblTCShiftFile)
+        Me.pnTcEngineering.Location = New System.Drawing.Point(7, 63)
+        Me.pnTcEngineering.Name = "pnTcEngineering"
+        Me.pnTcEngineering.Size = New System.Drawing.Size(399, 93)
+        Me.pnTcEngineering.TabIndex = 3
+        '
+        'Label26
+        '
+        Me.Label26.AutoSize = true
+        Me.Label26.Location = New System.Drawing.Point(1, 29)
+        Me.Label26.Name = "Label26"
+        Me.Label26.Size = New System.Drawing.Size(64, 13)
+        Me.Label26.TabIndex = 50
+        Me.Label26.Text = "Max. Speed"
+        '
+        'TBTCShiftPolygon
+        '
+        Me.TBTCShiftPolygon.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
+            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TBTCShiftPolygon.Location = New System.Drawing.Point(4, 70)
+        Me.TBTCShiftPolygon.Name = "TBTCShiftPolygon"
+        Me.TBTCShiftPolygon.Size = New System.Drawing.Size(349, 20)
+        Me.TBTCShiftPolygon.TabIndex = 3
+        '
+        'tbTCmaxSpeed
+        '
+        Me.tbTCmaxSpeed.Location = New System.Drawing.Point(75, 26)
+        Me.tbTCmaxSpeed.Name = "tbTCmaxSpeed"
+        Me.tbTCmaxSpeed.Size = New System.Drawing.Size(57, 20)
+        Me.tbTCmaxSpeed.TabIndex = 2
+        '
+        'TbTCrefrpm
+        '
+        Me.TbTCrefrpm.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TbTCrefrpm.Location = New System.Drawing.Point(296, 0)
+        Me.TbTCrefrpm.Name = "TbTCrefrpm"
+        Me.TbTCrefrpm.Size = New System.Drawing.Size(57, 20)
+        Me.TbTCrefrpm.TabIndex = 1
+        '
+        'Label27
+        '
+        Me.Label27.AutoSize = true
+        Me.Label27.Location = New System.Drawing.Point(138, 29)
+        Me.Label27.Name = "Label27"
+        Me.Label27.Size = New System.Drawing.Size(30, 13)
+        Me.Label27.TabIndex = 51
+        Me.Label27.Text = "[rpm]"
+        '
+        'Label14
+        '
+        Me.Label14.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.Label14.AutoSize = true
+        Me.Label14.Location = New System.Drawing.Point(357, 3)
+        Me.Label14.Name = "Label14"
+        Me.Label14.Size = New System.Drawing.Size(40, 13)
+        Me.Label14.TabIndex = 41
+        Me.Label14.Text = "[1/min]"
+        '
+        'BtTCShiftFileBrowse
+        '
+        Me.BtTCShiftFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.BtTCShiftFileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+        Me.BtTCShiftFileBrowse.Location = New System.Drawing.Point(354, 68)
+        Me.BtTCShiftFileBrowse.Name = "BtTCShiftFileBrowse"
+        Me.BtTCShiftFileBrowse.Size = New System.Drawing.Size(24, 24)
+        Me.BtTCShiftFileBrowse.TabIndex = 4
+        Me.BtTCShiftFileBrowse.UseVisualStyleBackColor = true
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = true
+        Me.Label1.Location = New System.Drawing.Point(138, 3)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(36, 13)
+        Me.Label1.TabIndex = 43
+        Me.Label1.Text = "[kgm²]"
+        '
+        'TbTCinertia
+        '
+        Me.TbTCinertia.Location = New System.Drawing.Point(75, 0)
+        Me.TbTCinertia.Name = "TbTCinertia"
+        Me.TbTCinertia.Size = New System.Drawing.Size(57, 20)
+        Me.TbTCinertia.TabIndex = 0
+        '
+        'Label15
+        '
+        Me.Label15.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.Label15.AutoSize = true
+        Me.Label15.Location = New System.Drawing.Point(213, 3)
+        Me.Label15.Name = "Label15"
+        Me.Label15.Size = New System.Drawing.Size(77, 13)
+        Me.Label15.TabIndex = 42
+        Me.Label15.Text = "Reference rpm"
+        '
+        'Label18
+        '
+        Me.Label18.AutoSize = true
+        Me.Label18.Location = New System.Drawing.Point(1, 3)
+        Me.Label18.Name = "Label18"
+        Me.Label18.Size = New System.Drawing.Size(36, 13)
+        Me.Label18.TabIndex = 44
+        Me.Label18.Text = "Inertia"
+        '
+        'LblTCShiftFile
+        '
+        Me.LblTCShiftFile.AutoSize = true
+        Me.LblTCShiftFile.Location = New System.Drawing.Point(1, 55)
+        Me.LblTCShiftFile.Name = "LblTCShiftFile"
+        Me.LblTCShiftFile.Size = New System.Drawing.Size(207, 13)
+        Me.LblTCShiftFile.TabIndex = 48
+        Me.LblTCShiftFile.Text = "Torque converter shift polygons file (.vgbs)"
+        '
+        'BtTCfileOpen
+        '
+        Me.BtTCfileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.BtTCfileOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+        Me.BtTCfileOpen.Location = New System.Drawing.Point(383, 35)
+        Me.BtTCfileOpen.Name = "BtTCfileOpen"
+        Me.BtTCfileOpen.Size = New System.Drawing.Size(24, 24)
+        Me.BtTCfileOpen.TabIndex = 2
+        Me.BtTCfileOpen.UseVisualStyleBackColor = true
+        '
+        'TbTCfile
+        '
+        Me.TbTCfile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
+            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TbTCfile.Location = New System.Drawing.Point(9, 37)
+        Me.TbTCfile.Name = "TbTCfile"
+        Me.TbTCfile.Size = New System.Drawing.Size(349, 20)
+        Me.TbTCfile.TabIndex = 0
+        '
+        'BtTCfileBrowse
+        '
+        Me.BtTCfileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.BtTCfileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+        Me.BtTCfileBrowse.Location = New System.Drawing.Point(359, 35)
+        Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
+        Me.BtTCfileBrowse.Size = New System.Drawing.Size(24, 24)
+        Me.BtTCfileBrowse.TabIndex = 1
+        Me.BtTCfileBrowse.UseVisualStyleBackColor = true
+        '
+        'Label17
+        '
+        Me.Label17.AutoSize = true
+        Me.Label17.Location = New System.Drawing.Point(6, 21)
+        Me.Label17.Name = "Label17"
+        Me.Label17.Size = New System.Drawing.Size(209, 13)
+        Me.Label17.TabIndex = 0
+        Me.Label17.Text = "Torque converter characteristics file (.vtcc)"
+        '
+        'tbTCLUpshiftMinAcceleration
+        '
+        Me.tbTCLUpshiftMinAcceleration.Location = New System.Drawing.Point(78, 19)
+        Me.tbTCLUpshiftMinAcceleration.Name = "tbTCLUpshiftMinAcceleration"
+        Me.tbTCLUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20)
+        Me.tbTCLUpshiftMinAcceleration.TabIndex = 0
+        '
+        'Label30
+        '
+        Me.Label30.AutoSize = true
+        Me.Label30.Location = New System.Drawing.Point(141, 22)
+        Me.Label30.Name = "Label30"
+        Me.Label30.Size = New System.Drawing.Size(34, 13)
+        Me.Label30.TabIndex = 42
+        Me.Label30.Text = "[m/s²]"
+        '
+        'Label31
+        '
+        Me.Label31.AutoSize = true
+        Me.Label31.Location = New System.Drawing.Point(6, 22)
+        Me.Label31.Name = "Label31"
+        Me.Label31.Size = New System.Drawing.Size(69, 13)
+        Me.Label31.TabIndex = 41
+        Me.Label31.Text = "Acc. for C->L"
+        '
+        'Label16
+        '
+        Me.Label16.AutoSize = true
+        Me.Label16.Location = New System.Drawing.Point(18, 105)
+        Me.Label16.Name = "Label16"
+        Me.Label16.Size = New System.Drawing.Size(95, 13)
+        Me.Label16.TabIndex = 45
+        Me.Label16.Text = "Transmission Type"
+        '
+        'CbGStype
+        '
+        Me.CbGStype.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.CbGStype.FormattingEnabled = true
+        Me.CbGStype.Location = New System.Drawing.Point(119, 102)
+        Me.CbGStype.Name = "CbGStype"
+        Me.CbGStype.Size = New System.Drawing.Size(227, 21)
+        Me.CbGStype.TabIndex = 1
+        '
+        'BtAddGear
+        '
+        Me.BtAddGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+        Me.BtAddGear.Location = New System.Drawing.Point(6, 202)
+        Me.BtAddGear.Name = "BtAddGear"
+        Me.BtAddGear.Size = New System.Drawing.Size(24, 24)
+        Me.BtAddGear.TabIndex = 1
+        Me.BtAddGear.UseVisualStyleBackColor = true
+        '
+        'GroupBox4
+        '
+        Me.GroupBox4.Controls.Add(Me.btExportVGBS)
+        Me.GroupBox4.Controls.Add(Me.Label32)
+        Me.GroupBox4.Controls.Add(Me.LvGears)
+        Me.GroupBox4.Controls.Add(Me.BtRemGear)
+        Me.GroupBox4.Controls.Add(Me.BtAddGear)
+        Me.GroupBox4.Location = New System.Drawing.Point(12, 135)
+        Me.GroupBox4.Name = "GroupBox4"
+        Me.GroupBox4.Size = New System.Drawing.Size(441, 232)
+        Me.GroupBox4.TabIndex = 2
+        Me.GroupBox4.TabStop = false
+        Me.GroupBox4.Text = "Gears"
+        '
+        'btExportVGBS
+        '
+        Me.btExportVGBS.Enabled = false
+        Me.btExportVGBS.Location = New System.Drawing.Point(55, 202)
+        Me.btExportVGBS.Name = "btExportVGBS"
+        Me.btExportVGBS.Size = New System.Drawing.Size(153, 24)
+        Me.btExportVGBS.TabIndex = 4
+        Me.btExportVGBS.Text = "Export Shiftcurve as VGBS"
+        Me.btExportVGBS.UseVisualStyleBackColor = true
+        '
+        'Label32
+        '
+        Me.Label32.AutoSize = true
+        Me.Label32.Location = New System.Drawing.Point(331, 202)
+        Me.Label32.Name = "Label32"
+        Me.Label32.Size = New System.Drawing.Size(106, 13)
+        Me.Label32.TabIndex = 3
+        Me.Label32.Text = "(Double-Click to Edit)"
+        '
+        'PnInertiaTI
+        '
+        Me.PnInertiaTI.Controls.Add(Me.Label6)
+        Me.PnInertiaTI.Controls.Add(Me.TBI_getr)
+        Me.PnInertiaTI.Controls.Add(Me.Label33)
+        Me.PnInertiaTI.Controls.Add(Me.Label48)
+        Me.PnInertiaTI.Controls.Add(Me.Label49)
+        Me.PnInertiaTI.Controls.Add(Me.TbTracInt)
+        Me.PnInertiaTI.Location = New System.Drawing.Point(459, 344)
+        Me.PnInertiaTI.Name = "PnInertiaTI"
+        Me.PnInertiaTI.Size = New System.Drawing.Size(411, 30)
+        Me.PnInertiaTI.TabIndex = 4
+        '
+        'PicBox
+        '
+        Me.PicBox.BackColor = System.Drawing.Color.LightGray
+        Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.PicBox.Location = New System.Drawing.Point(459, 28)
+        Me.PicBox.Name = "PicBox"
+        Me.PicBox.Size = New System.Drawing.Size(414, 308)
+        Me.PicBox.TabIndex = 48
+        Me.PicBox.TabStop = false
+        '
+        'gbPowershiftLosses
+        '
+        Me.gbPowershiftLosses.Controls.Add(Me.lbAtShiftTime)
+        Me.gbPowershiftLosses.Controls.Add(Me.tbATShiftTime)
+        Me.gbPowershiftLosses.Controls.Add(Me.Label28)
+        Me.gbPowershiftLosses.Location = New System.Drawing.Point(459, 598)
+        Me.gbPowershiftLosses.Name = "gbPowershiftLosses"
+        Me.gbPowershiftLosses.Size = New System.Drawing.Size(414, 47)
+        Me.gbPowershiftLosses.TabIndex = 6
+        Me.gbPowershiftLosses.TabStop = false
+        Me.gbPowershiftLosses.Text = "Power shift losses"
+        '
+        'lbAtShiftTime
+        '
+        Me.lbAtShiftTime.AutoSize = true
+        Me.lbAtShiftTime.Location = New System.Drawing.Point(6, 22)
+        Me.lbAtShiftTime.Name = "lbAtShiftTime"
+        Me.lbAtShiftTime.Size = New System.Drawing.Size(50, 13)
+        Me.lbAtShiftTime.TabIndex = 0
+        Me.lbAtShiftTime.Text = "Shift time"
+        '
+        'tbATShiftTime
+        '
+        Me.tbATShiftTime.Location = New System.Drawing.Point(78, 19)
+        Me.tbATShiftTime.Name = "tbATShiftTime"
+        Me.tbATShiftTime.Size = New System.Drawing.Size(57, 20)
+        Me.tbATShiftTime.TabIndex = 0
+        '
+        'Label28
+        '
+        Me.Label28.AutoSize = true
+        Me.Label28.Location = New System.Drawing.Point(141, 22)
+        Me.Label28.Name = "Label28"
+        Me.Label28.Size = New System.Drawing.Size(18, 13)
+        Me.Label28.TabIndex = 41
+        Me.Label28.Text = "[s]"
+        '
+        'tbTCCUpshiftMinAcceleration
+        '
+        Me.tbTCCUpshiftMinAcceleration.Location = New System.Drawing.Point(299, 19)
+        Me.tbTCCUpshiftMinAcceleration.Name = "tbTCCUpshiftMinAcceleration"
+        Me.tbTCCUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20)
+        Me.tbTCCUpshiftMinAcceleration.TabIndex = 1
+        '
+        'Label34
+        '
+        Me.Label34.AutoSize = true
+        Me.Label34.Location = New System.Drawing.Point(362, 22)
+        Me.Label34.Name = "Label34"
+        Me.Label34.Size = New System.Drawing.Size(34, 13)
+        Me.Label34.TabIndex = 45
+        Me.Label34.Text = "[m/s²]"
+        '
+        'Label35
+        '
+        Me.Label35.AutoSize = true
+        Me.Label35.Location = New System.Drawing.Point(211, 22)
+        Me.Label35.Name = "Label35"
+        Me.Label35.Size = New System.Drawing.Size(70, 13)
+        Me.Label35.TabIndex = 44
+        Me.Label35.Text = "Acc. for C->C"
+        '
+        'gbTCAccMin
+        '
+        Me.gbTCAccMin.Controls.Add(Me.tbTCLUpshiftMinAcceleration)
+        Me.gbTCAccMin.Controls.Add(Me.tbTCCUpshiftMinAcceleration)
+        Me.gbTCAccMin.Controls.Add(Me.Label34)
+        Me.gbTCAccMin.Controls.Add(Me.Label31)
+        Me.gbTCAccMin.Controls.Add(Me.Label35)
+        Me.gbTCAccMin.Controls.Add(Me.Label30)
+        Me.gbTCAccMin.Location = New System.Drawing.Point(459, 545)
+        Me.gbTCAccMin.Name = "gbTCAccMin"
+        Me.gbTCAccMin.Size = New System.Drawing.Size(414, 47)
+        Me.gbTCAccMin.TabIndex = 6
+        Me.gbTCAccMin.TabStop = false
+        Me.gbTCAccMin.Text = "Torque Converter: Min. acceleration after upshift"
+        '
+        'lblGbxInfo
+        '
+        Me.lblGbxInfo.AutoSize = true
+        Me.lblGbxInfo.Location = New System.Drawing.Point(121, 126)
+        Me.lblGbxInfo.Name = "lblGbxInfo"
+        Me.lblGbxInfo.Size = New System.Drawing.Size(0, 13)
+        Me.lblGbxInfo.TabIndex = 51
+        '
+        'btnExportXML
+        '
+        Me.btnExportXML.Location = New System.Drawing.Point(459, 648)
+        Me.btnExportXML.Name = "btnExportXML"
+        Me.btnExportXML.Size = New System.Drawing.Size(119, 23)
+        Me.btnExportXML.TabIndex = 9
+        Me.btnExportXML.Text = "Exp. Gearbox as XML"
+        Me.btnExportXML.UseVisualStyleBackColor = true
+        '
+        'btnExportAxlGearXML
+        '
+        Me.btnExportAxlGearXML.Location = New System.Drawing.Point(584, 648)
+        Me.btnExportAxlGearXML.Name = "btnExportAxlGearXML"
+        Me.btnExportAxlGearXML.Size = New System.Drawing.Size(118, 23)
+        Me.btnExportAxlGearXML.TabIndex = 10
+        Me.btnExportAxlGearXML.Text = "Exp. AxlGear as XML"
+        Me.btnExportAxlGearXML.UseVisualStyleBackColor = true
+        '
+        'GearboxForm
+        '
+        Me.AcceptButton = Me.ButOK
+        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(877, 696)
+        Me.Controls.Add(Me.btnExportAxlGearXML)
+        Me.Controls.Add(Me.btnExportXML)
+        Me.Controls.Add(Me.lblGbxInfo)
+        Me.Controls.Add(Me.gbTCAccMin)
+        Me.Controls.Add(Me.gbPowershiftLosses)
+        Me.Controls.Add(Me.PicBox)
+        Me.Controls.Add(Me.PnInertiaTI)
+        Me.Controls.Add(Me.GroupBox4)
+        Me.Controls.Add(Me.CbGStype)
+        Me.Controls.Add(Me.Label16)
+        Me.Controls.Add(Me.PictureBox1)
+        Me.Controls.Add(Me.GrGearShift)
+        Me.Controls.Add(Me.gbTC)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.TbName)
+        Me.Controls.Add(Me.ButCancel)
+        Me.Controls.Add(Me.ButOK)
+        Me.Controls.Add(Me.StatusStrip1)
+        Me.Controls.Add(Me.ToolStrip1)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+        Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+        Me.MaximizeBox = false
+        Me.Name = "GearboxForm"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "F_GBX"
+        Me.ToolStrip1.ResumeLayout(false)
+        Me.ToolStrip1.PerformLayout
+        Me.StatusStrip1.ResumeLayout(false)
+        Me.StatusStrip1.PerformLayout
+        CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
+        Me.GrGearShift.ResumeLayout(false)
+        Me.GrGearShift.PerformLayout
+        Me.GroupBox1.ResumeLayout(false)
+        Me.GroupBox1.PerformLayout
+        Me.PnTorqRes.ResumeLayout(false)
+        Me.PnTorqRes.PerformLayout
+        Me.GroupBox2.ResumeLayout(false)
+        Me.GroupBox2.PerformLayout
+        Me.CmOpenFile.ResumeLayout(false)
+        Me.gbTC.ResumeLayout(false)
+        Me.gbTC.PerformLayout
+        Me.pnTcEngineering.ResumeLayout(false)
+        Me.pnTcEngineering.PerformLayout
+        Me.GroupBox4.ResumeLayout(false)
+        Me.GroupBox4.PerformLayout
+        Me.PnInertiaTI.ResumeLayout(false)
+        Me.PnInertiaTI.PerformLayout
+        CType(Me.PicBox,System.ComponentModel.ISupportInitialize).EndInit
+        Me.gbPowershiftLosses.ResumeLayout(false)
+        Me.gbPowershiftLosses.PerformLayout
+        Me.gbTCAccMin.ResumeLayout(false)
+        Me.gbTCAccMin.PerformLayout
+        Me.ResumeLayout(false)
+        Me.PerformLayout
 
-	End Sub
+End Sub
 	Friend WithEvents ToolStrip1 As ToolStrip
 	Friend WithEvents ToolStripBtNew As ToolStripButton
 	Friend WithEvents ToolStripBtOpen As ToolStripButton
diff --git a/VECTO/GUI/GearboxGearDialog.Designer.vb b/VECTO/GUI/GearboxGearDialog.Designer.vb
index da689eb1855830f64f440725e71bb65b45c3032d..eaf0f774aa49d222b1dd5ab90c60ad9e7294d896 100644
--- a/VECTO/GUI/GearboxGearDialog.Designer.vb
+++ b/VECTO/GUI/GearboxGearDialog.Designer.vb
@@ -27,284 +27,283 @@ Partial Class GearboxGearDialog
 	'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
 	<DebuggerStepThrough()> _
 	Private Sub InitializeComponent()
-		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GearboxGearDialog))
-		Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
-		Me.OK_Button = New System.Windows.Forms.Button()
-		Me.Cancel_Button = New System.Windows.Forms.Button()
-		Me.TbGear = New System.Windows.Forms.TextBox()
-		Me.Label1 = New System.Windows.Forms.Label()
-		Me.TbRatio = New System.Windows.Forms.TextBox()
-		Me.Label2 = New System.Windows.Forms.Label()
-		Me.TbMapPath = New System.Windows.Forms.TextBox()
-		Me.Label3 = New System.Windows.Forms.Label()
-		Me.BtBrowse = New System.Windows.Forms.Button()
-		Me.BtNext = New System.Windows.Forms.Button()
-		Me.TbShiftPolyFile = New System.Windows.Forms.TextBox()
-		Me.BtShiftPolyBrowse = New System.Windows.Forms.Button()
-		Me.Label4 = New System.Windows.Forms.Label()
-		Me.PnShiftPoly = New System.Windows.Forms.Panel()
-		Me.Label5 = New System.Windows.Forms.Label()
-		Me.TbMaxTorque = New System.Windows.Forms.TextBox()
-		Me.PnFld = New System.Windows.Forms.Panel()
-		Me.Label6 = New System.Windows.Forms.Label()
-		Me.BtPrevious = New System.Windows.Forms.Button()
-		Me.Label7 = New System.Windows.Forms.Label()
-		Me.tbMaxSpeed = New System.Windows.Forms.TextBox()
-		Me.Label8 = New System.Windows.Forms.Label()
-		Me.TableLayoutPanel1.SuspendLayout()
-		Me.PnShiftPoly.SuspendLayout()
-		Me.PnFld.SuspendLayout()
-		Me.SuspendLayout()
-		'
-		'TableLayoutPanel1
-		'
-		Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TableLayoutPanel1.ColumnCount = 2
-		Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-		Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-		Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
-		Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
-		Me.TableLayoutPanel1.Location = New System.Drawing.Point(370, 177)
-		Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
-		Me.TableLayoutPanel1.RowCount = 1
-		Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-		Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
-		Me.TableLayoutPanel1.TabIndex = 12
-		'
-		'OK_Button
-		'
-		Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
-		Me.OK_Button.Location = New System.Drawing.Point(3, 3)
-		Me.OK_Button.Name = "OK_Button"
-		Me.OK_Button.Size = New System.Drawing.Size(67, 23)
-		Me.OK_Button.TabIndex = 0
-		Me.OK_Button.Text = "OK"
-		'
-		'Cancel_Button
-		'
-		Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
-		Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
-		Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
-		Me.Cancel_Button.Name = "Cancel_Button"
-		Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
-		Me.Cancel_Button.TabIndex = 1
-		Me.Cancel_Button.Text = "Cancel"
-		'
-		'TbGear
-		'
-		Me.TbGear.Location = New System.Drawing.Point(48, 6)
-		Me.TbGear.Name = "TbGear"
-		Me.TbGear.ReadOnly = True
-		Me.TbGear.Size = New System.Drawing.Size(37, 20)
-		Me.TbGear.TabIndex = 1
-		Me.TbGear.TabStop = False
-		'
-		'Label1
-		'
-		Me.Label1.AutoSize = True
-		Me.Label1.Location = New System.Drawing.Point(12, 9)
-		Me.Label1.Name = "Label1"
-		Me.Label1.Size = New System.Drawing.Size(30, 13)
-		Me.Label1.TabIndex = 0
-		Me.Label1.Text = "Gear"
-		'
-		'TbRatio
-		'
-		Me.TbRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TbRatio.Location = New System.Drawing.Point(139, 6)
-		Me.TbRatio.Name = "TbRatio"
-		Me.TbRatio.Size = New System.Drawing.Size(66, 20)
-		Me.TbRatio.TabIndex = 3
-		'
-		'Label2
-		'
-		Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.Label2.AutoSize = True
-		Me.Label2.Location = New System.Drawing.Point(101, 9)
-		Me.Label2.Name = "Label2"
-		Me.Label2.Size = New System.Drawing.Size(32, 13)
-		Me.Label2.TabIndex = 2
-		Me.Label2.Text = "Ratio"
-		'
-		'TbMapPath
-		'
-		Me.TbMapPath.Location = New System.Drawing.Point(12, 51)
-		Me.TbMapPath.Name = "TbMapPath"
-		Me.TbMapPath.Size = New System.Drawing.Size(476, 20)
-		Me.TbMapPath.TabIndex = 6
-		'
-		'Label3
-		'
-		Me.Label3.AutoSize = True
-		Me.Label3.Location = New System.Drawing.Point(11, 37)
-		Me.Label3.Name = "Label3"
-		Me.Label3.Size = New System.Drawing.Size(187, 13)
-		Me.Label3.TabIndex = 5
-		Me.Label3.Text = "Loss Map file or Efficiency Value [0..1]"
-		'
-		'BtBrowse
-		'
-		Me.BtBrowse.Image = CType(resources.GetObject("BtBrowse.Image"), System.Drawing.Image)
-		Me.BtBrowse.Location = New System.Drawing.Point(489, 49)
-		Me.BtBrowse.Name = "BtBrowse"
-		Me.BtBrowse.Size = New System.Drawing.Size(24, 24)
-		Me.BtBrowse.TabIndex = 7
-		Me.BtBrowse.UseVisualStyleBackColor = True
-		'
-		'BtNext
-		'
-		Me.BtNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.BtNext.Location = New System.Drawing.Point(196, 180)
-		Me.BtNext.Name = "BtNext"
-		Me.BtNext.Size = New System.Drawing.Size(67, 23)
-		Me.BtNext.TabIndex = 11
-		Me.BtNext.Text = "&Next >"
-		Me.BtNext.UseVisualStyleBackColor = True
-		'
-		'TbShiftPolyFile
-		'
-		Me.TbShiftPolyFile.Location = New System.Drawing.Point(2, 17)
-		Me.TbShiftPolyFile.Name = "TbShiftPolyFile"
-		Me.TbShiftPolyFile.Size = New System.Drawing.Size(476, 20)
-		Me.TbShiftPolyFile.TabIndex = 1
-		'
-		'BtShiftPolyBrowse
-		'
-		Me.BtShiftPolyBrowse.Image = CType(resources.GetObject("BtShiftPolyBrowse.Image"), System.Drawing.Image)
-		Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(479, 16)
-		Me.BtShiftPolyBrowse.Name = "BtShiftPolyBrowse"
-		Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(24, 24)
-		Me.BtShiftPolyBrowse.TabIndex = 2
-		Me.BtShiftPolyBrowse.TabStop = False
-		Me.BtShiftPolyBrowse.UseVisualStyleBackColor = True
-		'
-		'Label4
-		'
-		Me.Label4.AutoSize = True
-		Me.Label4.Location = New System.Drawing.Point(1, 3)
-		Me.Label4.Name = "Label4"
-		Me.Label4.Size = New System.Drawing.Size(89, 13)
-		Me.Label4.TabIndex = 0
-		Me.Label4.Text = "Shift polygons file"
-		'
-		'PnShiftPoly
-		'
-		Me.PnShiftPoly.Controls.Add(Me.TbShiftPolyFile)
-		Me.PnShiftPoly.Controls.Add(Me.BtShiftPolyBrowse)
-		Me.PnShiftPoly.Controls.Add(Me.Label4)
-		Me.PnShiftPoly.Location = New System.Drawing.Point(10, 79)
-		Me.PnShiftPoly.Name = "PnShiftPoly"
-		Me.PnShiftPoly.Size = New System.Drawing.Size(513, 41)
-		Me.PnShiftPoly.TabIndex = 8
-		'
-		'Label5
-		'
-		Me.Label5.AutoSize = True
-		Me.Label5.Location = New System.Drawing.Point(1, 5)
-		Me.Label5.Name = "Label5"
-		Me.Label5.Size = New System.Drawing.Size(123, 13)
-		Me.Label5.TabIndex = 0
-		Me.Label5.Text = "Maximum allowed torque"
-		'
-		'TbMaxTorque
-		'
-		Me.TbMaxTorque.Location = New System.Drawing.Point(2, 19)
-		Me.TbMaxTorque.Name = "TbMaxTorque"
-		Me.TbMaxTorque.Size = New System.Drawing.Size(88, 20)
-		Me.TbMaxTorque.TabIndex = 1
-		'
-		'PnFld
-		'
-		Me.PnFld.Controls.Add(Me.Label7)
-		Me.PnFld.Controls.Add(Me.tbMaxSpeed)
-		Me.PnFld.Controls.Add(Me.Label8)
-		Me.PnFld.Controls.Add(Me.Label6)
-		Me.PnFld.Controls.Add(Me.TbMaxTorque)
-		Me.PnFld.Controls.Add(Me.Label5)
-		Me.PnFld.Location = New System.Drawing.Point(10, 126)
-		Me.PnFld.Name = "PnFld"
-		Me.PnFld.Size = New System.Drawing.Size(513, 46)
-		Me.PnFld.TabIndex = 9
-		'
-		'Label6
-		'
-		Me.Label6.AutoSize = True
-		Me.Label6.Location = New System.Drawing.Point(96, 22)
-		Me.Label6.Name = "Label6"
-		Me.Label6.Size = New System.Drawing.Size(29, 13)
-		Me.Label6.TabIndex = 2
-		Me.Label6.Text = "[Nm]"
-		'
-		'BtPrevious
-		'
-		Me.BtPrevious.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.BtPrevious.Location = New System.Drawing.Point(129, 180)
-		Me.BtPrevious.Name = "BtPrevious"
-		Me.BtPrevious.Size = New System.Drawing.Size(67, 23)
-		Me.BtPrevious.TabIndex = 10
-		Me.BtPrevious.Text = "< &Previous"
-		Me.BtPrevious.UseVisualStyleBackColor = True
-		'
-		'Label7
-		'
-		Me.Label7.AutoSize = True
-		Me.Label7.Location = New System.Drawing.Point(360, 22)
-		Me.Label7.Name = "Label7"
-		Me.Label7.Size = New System.Drawing.Size(30, 13)
-		Me.Label7.TabIndex = 5
-		Me.Label7.Text = "[rpm]"
-		'
-		'tbMaxSpeed
-		'
-		Me.tbMaxSpeed.Location = New System.Drawing.Point(266, 19)
-		Me.tbMaxSpeed.Name = "tbMaxSpeed"
-		Me.tbMaxSpeed.Size = New System.Drawing.Size(88, 20)
-		Me.tbMaxSpeed.TabIndex = 4
-		'
-		'Label8
-		'
-		Me.Label8.AutoSize = True
-		Me.Label8.Location = New System.Drawing.Point(265, 5)
-		Me.Label8.Name = "Label8"
-		Me.Label8.Size = New System.Drawing.Size(122, 13)
-		Me.Label8.TabIndex = 3
-		Me.Label8.Text = "Maximum allowed speed"
-		'
-		'GearboxGearDialog
-		'
-		Me.AcceptButton = Me.OK_Button
-		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-		Me.CancelButton = Me.Cancel_Button
-		Me.ClientSize = New System.Drawing.Size(528, 218)
-		Me.Controls.Add(Me.BtPrevious)
-		Me.Controls.Add(Me.PnFld)
-		Me.Controls.Add(Me.PnShiftPoly)
-		Me.Controls.Add(Me.BtNext)
-		Me.Controls.Add(Me.BtBrowse)
-		Me.Controls.Add(Me.Label3)
-		Me.Controls.Add(Me.TbMapPath)
-		Me.Controls.Add(Me.Label2)
-		Me.Controls.Add(Me.TbRatio)
-		Me.Controls.Add(Me.Label1)
-		Me.Controls.Add(Me.TbGear)
-		Me.Controls.Add(Me.TableLayoutPanel1)
-		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
-		Me.MaximizeBox = False
-		Me.MinimizeBox = False
-		Me.Name = "GearboxGearDialog"
-		Me.ShowInTaskbar = False
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-		Me.Text = "Edit Gears"
-		Me.TableLayoutPanel1.ResumeLayout(False)
-		Me.PnShiftPoly.ResumeLayout(False)
-		Me.PnShiftPoly.PerformLayout()
-		Me.PnFld.ResumeLayout(False)
-		Me.PnFld.PerformLayout()
-		Me.ResumeLayout(False)
-		Me.PerformLayout()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GearboxGearDialog))
+        Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+        Me.OK_Button = New System.Windows.Forms.Button()
+        Me.Cancel_Button = New System.Windows.Forms.Button()
+        Me.TbGear = New System.Windows.Forms.TextBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.TbRatio = New System.Windows.Forms.TextBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.TbMapPath = New System.Windows.Forms.TextBox()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.BtBrowse = New System.Windows.Forms.Button()
+        Me.BtNext = New System.Windows.Forms.Button()
+        Me.TbShiftPolyFile = New System.Windows.Forms.TextBox()
+        Me.BtShiftPolyBrowse = New System.Windows.Forms.Button()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.PnShiftPoly = New System.Windows.Forms.Panel()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.TbMaxTorque = New System.Windows.Forms.TextBox()
+        Me.PnFld = New System.Windows.Forms.Panel()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.tbMaxSpeed = New System.Windows.Forms.TextBox()
+        Me.Label8 = New System.Windows.Forms.Label()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.BtPrevious = New System.Windows.Forms.Button()
+        Me.TableLayoutPanel1.SuspendLayout
+        Me.PnShiftPoly.SuspendLayout
+        Me.PnFld.SuspendLayout
+        Me.SuspendLayout
+        '
+        'TableLayoutPanel1
+        '
+        Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TableLayoutPanel1.ColumnCount = 2
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+        Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
+        Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(370, 177)
+        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+        Me.TableLayoutPanel1.RowCount = 1
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+        Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
+        Me.TableLayoutPanel1.TabIndex = 12
+        '
+        'OK_Button
+        '
+        Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.OK_Button.Location = New System.Drawing.Point(3, 3)
+        Me.OK_Button.Name = "OK_Button"
+        Me.OK_Button.Size = New System.Drawing.Size(67, 23)
+        Me.OK_Button.TabIndex = 6
+        Me.OK_Button.Text = "OK"
+        '
+        'Cancel_Button
+        '
+        Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
+        Me.Cancel_Button.Name = "Cancel_Button"
+        Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
+        Me.Cancel_Button.TabIndex = 7
+        Me.Cancel_Button.Text = "Cancel"
+        '
+        'TbGear
+        '
+        Me.TbGear.Location = New System.Drawing.Point(48, 6)
+        Me.TbGear.Name = "TbGear"
+        Me.TbGear.ReadOnly = true
+        Me.TbGear.Size = New System.Drawing.Size(37, 20)
+        Me.TbGear.TabIndex = 0
+        Me.TbGear.TabStop = false
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = true
+        Me.Label1.Location = New System.Drawing.Point(12, 9)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(30, 13)
+        Me.Label1.TabIndex = 0
+        Me.Label1.Text = "Gear"
+        '
+        'TbRatio
+        '
+        Me.TbRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TbRatio.Location = New System.Drawing.Point(139, 6)
+        Me.TbRatio.Name = "TbRatio"
+        Me.TbRatio.Size = New System.Drawing.Size(66, 20)
+        Me.TbRatio.TabIndex = 1
+        '
+        'Label2
+        '
+        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.Label2.AutoSize = true
+        Me.Label2.Location = New System.Drawing.Point(101, 9)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(32, 13)
+        Me.Label2.TabIndex = 2
+        Me.Label2.Text = "Ratio"
+        '
+        'TbMapPath
+        '
+        Me.TbMapPath.Location = New System.Drawing.Point(12, 51)
+        Me.TbMapPath.Name = "TbMapPath"
+        Me.TbMapPath.Size = New System.Drawing.Size(476, 20)
+        Me.TbMapPath.TabIndex = 2
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = true
+        Me.Label3.Location = New System.Drawing.Point(11, 37)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(187, 13)
+        Me.Label3.TabIndex = 5
+        Me.Label3.Text = "Loss Map file or Efficiency Value [0..1]"
+        '
+        'BtBrowse
+        '
+        Me.BtBrowse.Image = CType(resources.GetObject("BtBrowse.Image"),System.Drawing.Image)
+        Me.BtBrowse.Location = New System.Drawing.Point(489, 49)
+        Me.BtBrowse.Name = "BtBrowse"
+        Me.BtBrowse.Size = New System.Drawing.Size(24, 24)
+        Me.BtBrowse.TabIndex = 3
+        Me.BtBrowse.UseVisualStyleBackColor = false
+        '
+        'BtNext
+        '
+        Me.BtNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+        Me.BtNext.Location = New System.Drawing.Point(196, 180)
+        Me.BtNext.Name = "BtNext"
+        Me.BtNext.Size = New System.Drawing.Size(67, 23)
+        Me.BtNext.TabIndex = 9
+        Me.BtNext.Text = "&Next >"
+        Me.BtNext.UseVisualStyleBackColor = true
+        '
+        'TbShiftPolyFile
+        '
+        Me.TbShiftPolyFile.Location = New System.Drawing.Point(2, 17)
+        Me.TbShiftPolyFile.Name = "TbShiftPolyFile"
+        Me.TbShiftPolyFile.Size = New System.Drawing.Size(476, 20)
+        Me.TbShiftPolyFile.TabIndex = 0
+        '
+        'BtShiftPolyBrowse
+        '
+        Me.BtShiftPolyBrowse.Image = CType(resources.GetObject("BtShiftPolyBrowse.Image"),System.Drawing.Image)
+        Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(479, 16)
+        Me.BtShiftPolyBrowse.Name = "BtShiftPolyBrowse"
+        Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(24, 24)
+        Me.BtShiftPolyBrowse.TabIndex = 1
+        Me.BtShiftPolyBrowse.UseVisualStyleBackColor = false
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = true
+        Me.Label4.Location = New System.Drawing.Point(1, 3)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(89, 13)
+        Me.Label4.TabIndex = 0
+        Me.Label4.Text = "Shift polygons file"
+        '
+        'PnShiftPoly
+        '
+        Me.PnShiftPoly.Controls.Add(Me.TbShiftPolyFile)
+        Me.PnShiftPoly.Controls.Add(Me.BtShiftPolyBrowse)
+        Me.PnShiftPoly.Controls.Add(Me.Label4)
+        Me.PnShiftPoly.Location = New System.Drawing.Point(10, 79)
+        Me.PnShiftPoly.Name = "PnShiftPoly"
+        Me.PnShiftPoly.Size = New System.Drawing.Size(513, 41)
+        Me.PnShiftPoly.TabIndex = 4
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = true
+        Me.Label5.Location = New System.Drawing.Point(1, 5)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(123, 13)
+        Me.Label5.TabIndex = 0
+        Me.Label5.Text = "Maximum allowed torque"
+        '
+        'TbMaxTorque
+        '
+        Me.TbMaxTorque.Location = New System.Drawing.Point(2, 19)
+        Me.TbMaxTorque.Name = "TbMaxTorque"
+        Me.TbMaxTorque.Size = New System.Drawing.Size(88, 20)
+        Me.TbMaxTorque.TabIndex = 0
+        '
+        'PnFld
+        '
+        Me.PnFld.Controls.Add(Me.Label7)
+        Me.PnFld.Controls.Add(Me.tbMaxSpeed)
+        Me.PnFld.Controls.Add(Me.Label8)
+        Me.PnFld.Controls.Add(Me.Label6)
+        Me.PnFld.Controls.Add(Me.TbMaxTorque)
+        Me.PnFld.Controls.Add(Me.Label5)
+        Me.PnFld.Location = New System.Drawing.Point(10, 126)
+        Me.PnFld.Name = "PnFld"
+        Me.PnFld.Size = New System.Drawing.Size(513, 46)
+        Me.PnFld.TabIndex = 5
+        '
+        'Label7
+        '
+        Me.Label7.AutoSize = true
+        Me.Label7.Location = New System.Drawing.Point(360, 22)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(30, 13)
+        Me.Label7.TabIndex = 5
+        Me.Label7.Text = "[rpm]"
+        '
+        'tbMaxSpeed
+        '
+        Me.tbMaxSpeed.Location = New System.Drawing.Point(266, 19)
+        Me.tbMaxSpeed.Name = "tbMaxSpeed"
+        Me.tbMaxSpeed.Size = New System.Drawing.Size(88, 20)
+        Me.tbMaxSpeed.TabIndex = 1
+        '
+        'Label8
+        '
+        Me.Label8.AutoSize = true
+        Me.Label8.Location = New System.Drawing.Point(265, 5)
+        Me.Label8.Name = "Label8"
+        Me.Label8.Size = New System.Drawing.Size(122, 13)
+        Me.Label8.TabIndex = 3
+        Me.Label8.Text = "Maximum allowed speed"
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = true
+        Me.Label6.Location = New System.Drawing.Point(96, 22)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(29, 13)
+        Me.Label6.TabIndex = 2
+        Me.Label6.Text = "[Nm]"
+        '
+        'BtPrevious
+        '
+        Me.BtPrevious.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+        Me.BtPrevious.Location = New System.Drawing.Point(129, 180)
+        Me.BtPrevious.Name = "BtPrevious"
+        Me.BtPrevious.Size = New System.Drawing.Size(67, 23)
+        Me.BtPrevious.TabIndex = 8
+        Me.BtPrevious.Text = "< &Previous"
+        Me.BtPrevious.UseVisualStyleBackColor = true
+        '
+        'GearboxGearDialog
+        '
+        Me.AcceptButton = Me.OK_Button
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.CancelButton = Me.Cancel_Button
+        Me.ClientSize = New System.Drawing.Size(528, 218)
+        Me.Controls.Add(Me.BtPrevious)
+        Me.Controls.Add(Me.PnFld)
+        Me.Controls.Add(Me.PnShiftPoly)
+        Me.Controls.Add(Me.BtNext)
+        Me.Controls.Add(Me.BtBrowse)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.TbMapPath)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.TbRatio)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.TbGear)
+        Me.Controls.Add(Me.TableLayoutPanel1)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+        Me.MaximizeBox = false
+        Me.MinimizeBox = false
+        Me.Name = "GearboxGearDialog"
+        Me.ShowInTaskbar = false
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Edit Gears"
+        Me.TableLayoutPanel1.ResumeLayout(false)
+        Me.PnShiftPoly.ResumeLayout(false)
+        Me.PnShiftPoly.PerformLayout
+        Me.PnFld.ResumeLayout(false)
+        Me.PnFld.PerformLayout
+        Me.ResumeLayout(false)
+        Me.PerformLayout
 
-	End Sub
+End Sub
 	Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
 	Friend WithEvents OK_Button As Button
 	Friend WithEvents Cancel_Button As Button
diff --git a/VECTO/GUI/GearboxGearDialog.resx b/VECTO/GUI/GearboxGearDialog.resx
index 1191d47a08a36f72e882ef236badbd8f7cf38e7f..4f77f2d6bffe3c96b9ca9eac09daac80ad8cda0e 100644
--- a/VECTO/GUI/GearboxGearDialog.resx
+++ b/VECTO/GUI/GearboxGearDialog.resx
@@ -120,38 +120,38 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="BtBrowse.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
-        0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
-        776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
-        AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
-        FJKv98Rjo/ca0J9AqakKxr5ye7iU7sCufBuFSfBjIYduXldvQnKdMg5r3fEmQVe1AO7FtkecH1rDvtAK
-        TtnsDCpYmxNjddbIjBgreki+2BELXWccVEoRAqu8EPTEC2Sp03223KqUCbsMSw0VrEzfhG4qG7rJbCwb
-        Ifnsmyt4/1oAX5kHqtUSnKj2pQIHsZWCCKzTLUAFSxNZWBrPwnfCWCa0ekiuaL6As408yNVSxPYI4FbI
-        gWM2u4ybxwIRsJKZBoH2ayYWRzOg+ULQX+HndMikpxDSxINC9wJRyiAcatiJPQUcuBTawOGxQWCZYG4Q
-        kIJ6OA3qoTTMD6bhW08iAmp98GqlBdHKABxrcacCb7kj3CQcKmAVM8G8vE1BBfODqZhTpWJ2IIUevV3C
-        x1HZfkS1+yOk1XOLgFvGgmWcuYYZzvChAlKc7ruBqY/JVNBYEobiB4HgFbnCv9HdJPCs4MIxl43tMWYj
-        zEv6MhlSIMXJnuuY6DL8gTVFoajMP4+68ovg5bvisHw3FXDTWBDn8ehNmKatIlSjehmDcWUSxt4lUkF5
-        znEUpPhBmncStY+CcSDLGT4VzrBPtkJz2TnD5j/TLQ/ndEjD5F01Qgy3XkWnXIj4yIOx+ld7DV8wGLax
-        DI5ltLncQmRWZoy2Tnsl/zQ5DTnBvRQ/b2P8n2EwfgPZDDiygt3V8AAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+        zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+        0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+        c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+        qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+        GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+        1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+        gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+        TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+        W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+        MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+        IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+        eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="BtShiftPolyBrowse.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADr8AAA6/ATgFUyQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
-        0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
-        776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
-        AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
-        FJKv98Rjo/ca0J9AqakKxr5ye7iU7sCufBuFSfBjIYduXldvQnKdMg5r3fEmQVe1AO7FtkecH1rDvtAK
-        TtnsDCpYmxNjddbIjBgreki+2BELXWccVEoRAqu8EPTEC2Sp03223KqUCbsMSw0VrEzfhG4qG7rJbCwb
-        Ifnsmyt4/1oAX5kHqtUSnKj2pQIHsZWCCKzTLUAFSxNZWBrPwnfCWCa0ekiuaL6As408yNVSxPYI4FbI
-        gWM2u4ybxwIRsJKZBoH2ayYWRzOg+ULQX+HndMikpxDSxINC9wJRyiAcatiJPQUcuBTawOGxQWCZYG4Q
-        kIJ6OA3qoTTMD6bhW08iAmp98GqlBdHKABxrcacCb7kj3CQcKmAVM8G8vE1BBfODqZhTpWJ2IIUevV3C
-        x1HZfkS1+yOk1XOLgFvGgmWcuYYZzvChAlKc7ruBqY/JVNBYEobiB4HgFbnCv9HdJPCs4MIxl43tMWYj
-        zEv6MhlSIMXJnuuY6DL8gTVFoajMP4+68ovg5bvisHw3FXDTWBDn8ehNmKatIlSjehmDcWUSxt4lUkF5
-        znEUpPhBmncStY+CcSDLGT4VzrBPtkJz2TnD5j/TLQ/ndEjD5F01Qgy3XkWnXIj4yIOx+ld7DV8wGLax
-        DI5ltLncQmRWZoy2Tnsl/zQ5DTnBvRQ/b2P8n2EwfgPZDDiygt3V8AAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAAtVJREFUOE+FkmtIk2EYhhc6zU1zyjyAlZn5Q0QS6k/EMDDSQiuzkmxM5wpEA00S
+        zTzbsozQEDUyVKjQbejUPGQSyyjUmofysFRKU/M859J5qORu77s1KX/0wPXju7/vvp4X3o/RVsHv7pDy
+        0VklwIfaCPTXCzHQEPkXn5pEUDWJNH31kRGMf4eUocvF7GAShlqjQZ6H3qZjYUICQGliVfscvc+EGmNt
+        c0hhY/kONpYMrC/cwowqiYowchcYNaKRoa7mDDyfcuFRYpdnrBsEv7S3KT8XCTkUkq/3xGOj9xrQn0Cp
+        qQrGvnJ7uJTuwK58G4VJ8GMhh25eV29Ccp0yDmvd8SZBV7UA7sW2R5wfWsO+0ApO2ewMKlibE2N11siM
+        GCt6SL7YEQtdZxxUShECq7wQ9MQLZKnTfbbcqpQJuwxLDRWsTN+EbiobuslsLBsh+eybK3j/WgBfmQeq
+        1RKcqPalAgexlYIIrNMtQAVLE1lYGs/Cd8JYJrR6SK5ovoCzjTzI1VLE9gjgVsiBYza7jJvHAhGwkpkG
+        gfZrJhZHM6D5QtBf4ed0yKSnENLEg0L3AlHKIBxq2Ik9BRy4FNrA4bFBYJlgbhCQgno4DeqhNMwPpuFb
+        TyICan3waqUF0coAHGtxpwJvuSPcJBwqYBUzwby8TUEF84OpmFOlYnYghR69XcLHUdl+RLX7I6TVc4uA
+        W8aCZZy5hhnO8KECUpzuu4Gpj8lU0FgShuIHgeAVucK/0d0k8KzgwjGXje0xZiPMS/oyGVIgxcme65jo
+        MvyBNUWhqMw/j7ryi+Dlu+KwfDcVcNNYEOfx6E2Ypq0iVKN6GYNxZRLG3iVSQXnOcRSk+EGadxK1j4Jx
+        IMsZPhXOsE+2QnPZOcPmP9MtD+d0SMPkXTVCDLdeRadciPjIg7H6V3sNXzAYtrEMjmW0udxCZFZmjLZO
+        eyX/NDkNOcG9FD9vY/yfYTB+A9kMOLKC3dXwAAAAAElFTkSuQmCC
 </value>
   </data>
 </root>
\ No newline at end of file
diff --git a/VECTO/GUI/HybridStrategyParamsForm.Designer.vb b/VECTO/GUI/HybridStrategyParamsForm.Designer.vb
index 995fc66fe3c561090bb213771f6725d9f8f6bedb..90c1d30d22d3b75da81bdb6725d5d79dcc5d6d09 100644
--- a/VECTO/GUI/HybridStrategyParamsForm.Designer.vb
+++ b/VECTO/GUI/HybridStrategyParamsForm.Designer.vb
@@ -143,7 +143,7 @@ Partial Class HybridStrategyParamsForm
         Me.ButCancel.Location = New System.Drawing.Point(362, 381)
         Me.ButCancel.Name = "ButCancel"
         Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-        Me.ButCancel.TabIndex = 13
+        Me.ButCancel.TabIndex = 11
         Me.ButCancel.Text = "Cancel"
         Me.ButCancel.UseVisualStyleBackColor = true
         '
@@ -153,17 +153,18 @@ Partial Class HybridStrategyParamsForm
         Me.ButOK.Location = New System.Drawing.Point(281, 381)
         Me.ButOK.Name = "ButOK"
         Me.ButOK.Size = New System.Drawing.Size(75, 23)
-        Me.ButOK.TabIndex = 12
+        Me.ButOK.TabIndex = 10
         Me.ButOK.Text = "Save"
         Me.ButOK.UseVisualStyleBackColor = true
         '
         'ToolStrip1
         '
         Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
         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.Size = New System.Drawing.Size(449, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(449, 31)
         Me.ToolStrip1.TabIndex = 30
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -173,7 +174,7 @@ Partial Class HybridStrategyParamsForm
         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(23, 22)
+        Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtNew.Text = "ToolStripButton1"
         Me.ToolStripBtNew.ToolTipText = "New"
         '
@@ -183,7 +184,7 @@ Partial Class HybridStrategyParamsForm
         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(23, 22)
+        Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtOpen.Text = "ToolStripButton1"
         Me.ToolStripBtOpen.ToolTipText = "Open..."
         '
@@ -193,7 +194,7 @@ Partial Class HybridStrategyParamsForm
         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(23, 22)
+        Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtSave.Text = "ToolStripButton1"
         Me.ToolStripBtSave.ToolTipText = "Save"
         '
@@ -203,14 +204,14 @@ Partial Class HybridStrategyParamsForm
         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(23, 22)
+        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, 25)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripBtSendTo
         '
@@ -218,14 +219,14 @@ Partial Class HybridStrategyParamsForm
         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(23, 22)
+        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, 25)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripButton1
         '
@@ -233,11 +234,12 @@ Partial Class HybridStrategyParamsForm
         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(23, 22)
+        Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton1.Text = "Help"
         '
         '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, 407)
         Me.StatusStrip1.Name = "StatusStrip1"
@@ -264,6 +266,7 @@ Partial Class HybridStrategyParamsForm
         '
         'CmOpenFile
         '
+        Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
         Me.CmOpenFile.Name = "CmOpenFile"
         Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
@@ -288,7 +291,7 @@ Partial Class HybridStrategyParamsForm
         Me.pnEquivFactor.Location = New System.Drawing.Point(12, 74)
         Me.pnEquivFactor.Name = "pnEquivFactor"
         Me.pnEquivFactor.Size = New System.Drawing.Size(288, 28)
-        Me.pnEquivFactor.TabIndex = 3
+        Me.pnEquivFactor.TabIndex = 0
         '
         'lblTitle
         '
@@ -309,7 +312,7 @@ Partial Class HybridStrategyParamsForm
         Me.pnMinSoC.Location = New System.Drawing.Point(12, 134)
         Me.pnMinSoC.Name = "pnMinSoC"
         Me.pnMinSoC.Size = New System.Drawing.Size(288, 28)
-        Me.pnMinSoC.TabIndex = 25
+        Me.pnMinSoC.TabIndex = 2
         '
         'lblMinSoC
         '
@@ -344,7 +347,7 @@ Partial Class HybridStrategyParamsForm
         Me.pnMaxSoC.Location = New System.Drawing.Point(12, 164)
         Me.pnMaxSoC.Name = "pnMaxSoC"
         Me.pnMaxSoC.Size = New System.Drawing.Size(288, 28)
-        Me.pnMaxSoC.TabIndex = 26
+        Me.pnMaxSoC.TabIndex = 3
         '
         'lblMaxSoC
         '
@@ -379,7 +382,7 @@ Partial Class HybridStrategyParamsForm
         Me.pnTargetSoC.Location = New System.Drawing.Point(12, 194)
         Me.pnTargetSoC.Name = "pnTargetSoC"
         Me.pnTargetSoC.Size = New System.Drawing.Size(288, 28)
-        Me.pnTargetSoC.TabIndex = 27
+        Me.pnTargetSoC.TabIndex = 4
         '
         'lblTargetSoC
         '
@@ -414,7 +417,7 @@ Partial Class HybridStrategyParamsForm
         Me.pnAuxBufferTime.Location = New System.Drawing.Point(12, 254)
         Me.pnAuxBufferTime.Name = "pnAuxBufferTime"
         Me.pnAuxBufferTime.Size = New System.Drawing.Size(288, 28)
-        Me.pnAuxBufferTime.TabIndex = 28
+        Me.pnAuxBufferTime.TabIndex = 6
         '
         'lblAuxBufferTime
         '
@@ -449,7 +452,7 @@ Partial Class HybridStrategyParamsForm
         Me.pnAuxBufferChgTime.Location = New System.Drawing.Point(12, 284)
         Me.pnAuxBufferChgTime.Name = "pnAuxBufferChgTime"
         Me.pnAuxBufferChgTime.Size = New System.Drawing.Size(288, 28)
-        Me.pnAuxBufferChgTime.TabIndex = 29
+        Me.pnAuxBufferChgTime.TabIndex = 7
         '
         'Label1
         '
@@ -484,7 +487,7 @@ Partial Class HybridStrategyParamsForm
         Me.Panel1.Location = New System.Drawing.Point(12, 224)
         Me.Panel1.Name = "Panel1"
         Me.Panel1.Size = New System.Drawing.Size(288, 28)
-        Me.Panel1.TabIndex = 29
+        Me.Panel1.TabIndex = 5
         '
         'lblMinIceOnTime
         '
@@ -519,7 +522,7 @@ Partial Class HybridStrategyParamsForm
         Me.Panel2.Location = New System.Drawing.Point(12, 104)
         Me.Panel2.Name = "Panel2"
         Me.Panel2.Size = New System.Drawing.Size(288, 28)
-        Me.Panel2.TabIndex = 25
+        Me.Panel2.TabIndex = 1
         '
         'EquivalenceFactorChg
         '
@@ -554,7 +557,7 @@ Partial Class HybridStrategyParamsForm
         Me.pnICEStartPenaltyFactor.Location = New System.Drawing.Point(12, 314)
         Me.pnICEStartPenaltyFactor.Name = "pnICEStartPenaltyFactor"
         Me.pnICEStartPenaltyFactor.Size = New System.Drawing.Size(288, 28)
-        Me.pnICEStartPenaltyFactor.TabIndex = 30
+        Me.pnICEStartPenaltyFactor.TabIndex = 8
         '
         'lblICEStartPenaltyFactor
         '
@@ -589,7 +592,7 @@ Partial Class HybridStrategyParamsForm
         Me.pnCostFactorSoCExponent.Location = New System.Drawing.Point(12, 344)
         Me.pnCostFactorSoCExponent.Name = "pnCostFactorSoCExponent"
         Me.pnCostFactorSoCExponent.Size = New System.Drawing.Size(288, 28)
-        Me.pnCostFactorSoCExponent.TabIndex = 31
+        Me.pnCostFactorSoCExponent.TabIndex = 9
         '
         'lblCostFactorSoCExponent
         '
diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb
index f2a9671807edae1073c42823ed05436210a75d98..12282beb5883bffc81a8fb7b04d211f9e5c6aa1f 100644
--- a/VECTO/GUI/MainForm.Designer.vb
+++ b/VECTO/GUI/MainForm.Designer.vb
@@ -142,6 +142,7 @@ Partial Class MainForm
         '
         'StatusBAR
         '
+        Me.StatusBAR.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.StatusBAR.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLbStatus, Me.ToolStripProgBarJob, Me.ToolStripProgBarOverall})
         Me.StatusBAR.Location = New System.Drawing.Point(0, 648)
         Me.StatusBAR.Name = "StatusBAR"
@@ -586,6 +587,7 @@ Partial Class MainForm
         '
         'ConMenFilelist
         '
+        Me.ConMenFilelist.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.ConMenFilelist.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ShowInFolderMenuItem, Me.SaveListToolStripMenuItem, Me.LoadListToolStripMenuItem, Me.LoadDefaultListToolStripMenuItem, Me.ClearListToolStripMenuItem})
         Me.ConMenFilelist.Name = "ConMenFilelist"
         Me.ConMenFilelist.ShowImageMargin = false
@@ -682,10 +684,11 @@ Partial Class MainForm
         '
         Me.ToolStrip1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
         Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripSeparator2, Me.ToolStripDrDnBtTools, Me.ToolStripDrDnBtInfo})
         Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
         Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(1045, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(1045, 31)
         Me.ToolStrip1.TabIndex = 11
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -695,7 +698,7 @@ Partial Class MainForm
         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(23, 22)
+        Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtNew.Text = "ToolStripBtNew"
         Me.ToolStripBtNew.ToolTipText = "New Job File"
         '
@@ -705,14 +708,14 @@ Partial Class MainForm
         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(23, 22)
+        Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtOpen.Text = "ToolStripButton1"
         Me.ToolStripBtOpen.ToolTipText = "Open File..."
         '
         'ToolStripSeparator2
         '
         Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 25)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripDrDnBtTools
         '
@@ -720,87 +723,87 @@ Partial Class MainForm
         Me.ToolStripDrDnBtTools.Image = Global.TUGraz.VECTO.My.Resources.Resources.Misc_Tools_icon
         Me.ToolStripDrDnBtTools.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripDrDnBtTools.Name = "ToolStripDrDnBtTools"
-        Me.ToolStripDrDnBtTools.Size = New System.Drawing.Size(63, 22)
+        Me.ToolStripDrDnBtTools.Size = New System.Drawing.Size(71, 28)
         Me.ToolStripDrDnBtTools.Text = "Tools"
         '
         'GENEditorToolStripMenuItem1
         '
         Me.GENEditorToolStripMenuItem1.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
         Me.GENEditorToolStripMenuItem1.Name = "GENEditorToolStripMenuItem1"
-        Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(254, 22)
+        Me.GENEditorToolStripMenuItem1.Size = New System.Drawing.Size(262, 30)
         Me.GENEditorToolStripMenuItem1.Text = "Job Editor - Conventional Vehicle"
         '
         'JobEditorParallelHybridVehicleToolStripMenuItem
         '
         Me.JobEditorParallelHybridVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
         Me.JobEditorParallelHybridVehicleToolStripMenuItem.Name = "JobEditorParallelHybridVehicleToolStripMenuItem"
-        Me.JobEditorParallelHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+        Me.JobEditorParallelHybridVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
         Me.JobEditorParallelHybridVehicleToolStripMenuItem.Text = "Job Editor - Parallel Hybrid Vehicle"
         '
         'JobEditorBatteryElectricVehicleToolStripMenuItem
         '
         Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
         Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Name = "JobEditorBatteryElectricVehicleToolStripMenuItem"
-        Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+        Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
         Me.JobEditorBatteryElectricVehicleToolStripMenuItem.Text = "JobEditor - Battery Electric Vehicle"
         '
         'JobEditorEngineOnlyModeToolStripMenuItem
         '
         Me.JobEditorEngineOnlyModeToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
         Me.JobEditorEngineOnlyModeToolStripMenuItem.Name = "JobEditorEngineOnlyModeToolStripMenuItem"
-        Me.JobEditorEngineOnlyModeToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+        Me.JobEditorEngineOnlyModeToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
         Me.JobEditorEngineOnlyModeToolStripMenuItem.Text = "Job Editor - Engine Only Mode"
         '
         'EPTPJobEditorToolStripMenuItem
         '
         Me.EPTPJobEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VECTO
         Me.EPTPJobEditorToolStripMenuItem.Name = "EPTPJobEditorToolStripMenuItem"
-        Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+        Me.EPTPJobEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
         Me.EPTPJobEditorToolStripMenuItem.Text = "VTP Job Editor"
         '
         'VEHEditorToolStripMenuItem
         '
         Me.VEHEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_VEH
         Me.VEHEditorToolStripMenuItem.Name = "VEHEditorToolStripMenuItem"
-        Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+        Me.VEHEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
         Me.VEHEditorToolStripMenuItem.Text = "Vehicle Editor"
         '
         'EngineEditorToolStripMenuItem
         '
         Me.EngineEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_ENG
         Me.EngineEditorToolStripMenuItem.Name = "EngineEditorToolStripMenuItem"
-        Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+        Me.EngineEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
         Me.EngineEditorToolStripMenuItem.Text = "Engine Editor"
         '
         'GearboxEditorToolStripMenuItem
         '
         Me.GearboxEditorToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_GBX
         Me.GearboxEditorToolStripMenuItem.Name = "GearboxEditorToolStripMenuItem"
-        Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+        Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
         Me.GearboxEditorToolStripMenuItem.Text = "Gearbox Editor"
         '
         'GraphToolStripMenuItem
         '
         Me.GraphToolStripMenuItem.Image = Global.TUGraz.VECTO.My.Resources.Resources.F_Graph
         Me.GraphToolStripMenuItem.Name = "GraphToolStripMenuItem"
-        Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+        Me.GraphToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
         Me.GraphToolStripMenuItem.Text = "Graph"
         '
         'ToolStripSeparator6
         '
         Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
-        Me.ToolStripSeparator6.Size = New System.Drawing.Size(251, 6)
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(259, 6)
         '
         'OpenLogToolStripMenuItem
         '
         Me.OpenLogToolStripMenuItem.Name = "OpenLogToolStripMenuItem"
-        Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+        Me.OpenLogToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
         Me.OpenLogToolStripMenuItem.Text = "Open Log"
         '
         'SettingsToolStripMenuItem
         '
         Me.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"
-        Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(254, 22)
+        Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(262, 30)
         Me.SettingsToolStripMenuItem.Text = "Settings"
         '
         'ToolStripDrDnBtInfo
@@ -809,7 +812,7 @@ Partial Class MainForm
         Me.ToolStripDrDnBtInfo.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
         Me.ToolStripDrDnBtInfo.ImageTransparentColor = System.Drawing.Color.Magenta
         Me.ToolStripDrDnBtInfo.Name = "ToolStripDrDnBtInfo"
-        Me.ToolStripDrDnBtInfo.Size = New System.Drawing.Size(61, 22)
+        Me.ToolStripDrDnBtInfo.Size = New System.Drawing.Size(69, 28)
         Me.ToolStripDrDnBtInfo.Text = "Help"
         '
         'UserManualToolStripMenuItem
@@ -843,6 +846,7 @@ Partial Class MainForm
         '
         'CmDEV
         '
+        Me.CmDEV.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.CmDEV.Name = "CmDEV"
         Me.CmDEV.ShowImageMargin = false
         Me.CmDEV.Size = New System.Drawing.Size(36, 4)
@@ -853,6 +857,7 @@ Partial Class MainForm
         '
         'CmOpenFile
         '
+        Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.OpenInGraphWindowToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
         Me.CmOpenFile.Name = "CmOpenFile"
         Me.CmOpenFile.ShowImageMargin = false
diff --git a/VECTO/GUI/REESSPackDialog.Designer.vb b/VECTO/GUI/REESSPackDialog.Designer.vb
index 17cfbbf3359d0fd6d857e8227e456bbaf934aee8..3e601ae842ec2c208f0d9cda9b3a62c50bef41f8 100644
--- a/VECTO/GUI/REESSPackDialog.Designer.vb
+++ b/VECTO/GUI/REESSPackDialog.Designer.vb
@@ -72,7 +72,7 @@ Partial Class REESSPackDialog
         Me.OK_Button.Location = New System.Drawing.Point(3, 3)
         Me.OK_Button.Name = "OK_Button"
         Me.OK_Button.Size = New System.Drawing.Size(67, 23)
-        Me.OK_Button.TabIndex = 0
+        Me.OK_Button.TabIndex = 3
         Me.OK_Button.Text = "OK"
         '
         'Cancel_Button
@@ -82,7 +82,7 @@ Partial Class REESSPackDialog
         Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
         Me.Cancel_Button.Name = "Cancel_Button"
         Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
-        Me.Cancel_Button.TabIndex = 1
+        Me.Cancel_Button.TabIndex = 4
         Me.Cancel_Button.Text = "Cancel"
         '
         'pnREESSPack
@@ -93,7 +93,7 @@ Partial Class REESSPackDialog
         Me.pnREESSPack.Location = New System.Drawing.Point(12, 12)
         Me.pnREESSPack.Name = "pnREESSPack"
         Me.pnREESSPack.Size = New System.Drawing.Size(553, 27)
-        Me.pnREESSPack.TabIndex = 20
+        Me.pnREESSPack.TabIndex = 0
         '
         'btnOpenBattery
         '
@@ -112,8 +112,7 @@ Partial Class REESSPackDialog
         Me.btnBrowseBattery.Location = New System.Drawing.Point(527, 2)
         Me.btnBrowseBattery.Name = "btnBrowseBattery"
         Me.btnBrowseBattery.Size = New System.Drawing.Size(24, 24)
-        Me.btnBrowseBattery.TabIndex = 2
-        Me.btnBrowseBattery.TabStop = false
+        Me.btnBrowseBattery.TabIndex = 1
         Me.btnBrowseBattery.UseVisualStyleBackColor = true
         '
         'tbBattery
@@ -123,14 +122,14 @@ Partial Class REESSPackDialog
         Me.tbBattery.Location = New System.Drawing.Point(104, 4)
         Me.tbBattery.Name = "tbBattery"
         Me.tbBattery.Size = New System.Drawing.Size(417, 20)
-        Me.tbBattery.TabIndex = 1
+        Me.tbBattery.TabIndex = 0
         '
         'tbBatteryPackCnt
         '
         Me.tbBatteryPackCnt.Location = New System.Drawing.Point(214, 45)
         Me.tbBatteryPackCnt.Name = "tbBatteryPackCnt"
         Me.tbBatteryPackCnt.Size = New System.Drawing.Size(59, 20)
-        Me.tbBatteryPackCnt.TabIndex = 26
+        Me.tbBatteryPackCnt.TabIndex = 1
         '
         'lblBatteryPackCnt
         '
@@ -146,7 +145,7 @@ Partial Class REESSPackDialog
         Me.tbStreamId.Location = New System.Drawing.Point(214, 71)
         Me.tbStreamId.Name = "tbStreamId"
         Me.tbStreamId.Size = New System.Drawing.Size(59, 20)
-        Me.tbStreamId.TabIndex = 28
+        Me.tbStreamId.TabIndex = 2
         '
         'lblStreamId
         '
diff --git a/VECTO/GUI/VectoJobForm.Designer.vb b/VECTO/GUI/VectoJobForm.Designer.vb
index ecbdc5007ce9a2a87862ea469d3ef27aa3085500..34893b3f40027a86e89b2671901c8ebee273bd4b 100644
--- a/VECTO/GUI/VectoJobForm.Designer.vb
+++ b/VECTO/GUI/VectoJobForm.Designer.vb
@@ -273,15 +273,14 @@ Partial Class VectoJobForm
         Me.pnHybridStrategy.Location = New System.Drawing.Point(4, 125)
         Me.pnHybridStrategy.Name = "pnHybridStrategy"
         Me.pnHybridStrategy.Size = New System.Drawing.Size(516, 26)
-        Me.pnHybridStrategy.TabIndex = 15
+        Me.pnHybridStrategy.TabIndex = 4
         '
         'btnOpenHybridStrategyParameters
         '
         Me.btnOpenHybridStrategyParameters.Location = New System.Drawing.Point(3, 3)
         Me.btnOpenHybridStrategyParameters.Name = "btnOpenHybridStrategyParameters"
         Me.btnOpenHybridStrategyParameters.Size = New System.Drawing.Size(72, 21)
-        Me.btnOpenHybridStrategyParameters.TabIndex = 11
-        Me.btnOpenHybridStrategyParameters.TabStop = false
+        Me.btnOpenHybridStrategyParameters.TabIndex = 0
         Me.btnOpenHybridStrategyParameters.Text = "Hyb. Str. P."
         Me.btnOpenHybridStrategyParameters.UseVisualStyleBackColor = true
         '
@@ -292,7 +291,7 @@ Partial Class VectoJobForm
         Me.tbHybridStrategyParams.Location = New System.Drawing.Point(81, 3)
         Me.tbHybridStrategyParams.Name = "tbHybridStrategyParams"
         Me.tbHybridStrategyParams.Size = New System.Drawing.Size(406, 20)
-        Me.tbHybridStrategyParams.TabIndex = 12
+        Me.tbHybridStrategyParams.TabIndex = 1
         '
         'btnBrowseHybridStrategyParams
         '
@@ -301,8 +300,7 @@ Partial Class VectoJobForm
         Me.btnBrowseHybridStrategyParams.Location = New System.Drawing.Point(489, 1)
         Me.btnBrowseHybridStrategyParams.Name = "btnBrowseHybridStrategyParams"
         Me.btnBrowseHybridStrategyParams.Size = New System.Drawing.Size(24, 24)
-        Me.btnBrowseHybridStrategyParams.TabIndex = 13
-        Me.btnBrowseHybridStrategyParams.TabStop = false
+        Me.btnBrowseHybridStrategyParams.TabIndex = 2
         Me.btnBrowseHybridStrategyParams.UseVisualStyleBackColor = true
         '
         'pnVehicle
@@ -313,7 +311,7 @@ Partial Class VectoJobForm
         Me.pnVehicle.Location = New System.Drawing.Point(4, 7)
         Me.pnVehicle.Name = "pnVehicle"
         Me.pnVehicle.Size = New System.Drawing.Size(518, 27)
-        Me.pnVehicle.TabIndex = 17
+        Me.pnVehicle.TabIndex = 0
         '
         'ButOpenVEH
         '
@@ -321,7 +319,6 @@ Partial Class VectoJobForm
         Me.ButOpenVEH.Name = "ButOpenVEH"
         Me.ButOpenVEH.Size = New System.Drawing.Size(72, 21)
         Me.ButOpenVEH.TabIndex = 0
-        Me.ButOpenVEH.TabStop = false
         Me.ButOpenVEH.Text = "Vehicle"
         Me.ButOpenVEH.UseVisualStyleBackColor = true
         '
@@ -333,7 +330,6 @@ Partial Class VectoJobForm
         Me.ButtonVEH.Name = "ButtonVEH"
         Me.ButtonVEH.Size = New System.Drawing.Size(24, 24)
         Me.ButtonVEH.TabIndex = 2
-        Me.ButtonVEH.TabStop = false
         Me.ButtonVEH.UseVisualStyleBackColor = true
         '
         'TbVEH
@@ -353,15 +349,14 @@ Partial Class VectoJobForm
         Me.pnEngine.Location = New System.Drawing.Point(4, 37)
         Me.pnEngine.Name = "pnEngine"
         Me.pnEngine.Size = New System.Drawing.Size(519, 27)
-        Me.pnEngine.TabIndex = 16
+        Me.pnEngine.TabIndex = 1
         '
         'ButOpenENG
         '
         Me.ButOpenENG.Location = New System.Drawing.Point(4, 3)
         Me.ButOpenENG.Name = "ButOpenENG"
         Me.ButOpenENG.Size = New System.Drawing.Size(72, 21)
-        Me.ButOpenENG.TabIndex = 3
-        Me.ButOpenENG.TabStop = false
+        Me.ButOpenENG.TabIndex = 0
         Me.ButOpenENG.Text = "Engine"
         Me.ButOpenENG.UseVisualStyleBackColor = true
         '
@@ -372,8 +367,7 @@ Partial Class VectoJobForm
         Me.ButtonMAP.Location = New System.Drawing.Point(492, 1)
         Me.ButtonMAP.Name = "ButtonMAP"
         Me.ButtonMAP.Size = New System.Drawing.Size(24, 24)
-        Me.ButtonMAP.TabIndex = 5
-        Me.ButtonMAP.TabStop = false
+        Me.ButtonMAP.TabIndex = 2
         Me.ButtonMAP.UseVisualStyleBackColor = true
         '
         'TbENG
@@ -383,7 +377,7 @@ Partial Class VectoJobForm
         Me.TbENG.Location = New System.Drawing.Point(82, 3)
         Me.TbENG.Name = "TbENG"
         Me.TbENG.Size = New System.Drawing.Size(404, 20)
-        Me.TbENG.TabIndex = 4
+        Me.TbENG.TabIndex = 1
         '
         'pnGearbox
         '
@@ -393,15 +387,14 @@ Partial Class VectoJobForm
         Me.pnGearbox.Location = New System.Drawing.Point(3, 66)
         Me.pnGearbox.Name = "pnGearbox"
         Me.pnGearbox.Size = New System.Drawing.Size(517, 28)
-        Me.pnGearbox.TabIndex = 15
+        Me.pnGearbox.TabIndex = 2
         '
         'ButOpenGBX
         '
         Me.ButOpenGBX.Location = New System.Drawing.Point(4, 3)
         Me.ButOpenGBX.Name = "ButOpenGBX"
         Me.ButOpenGBX.Size = New System.Drawing.Size(72, 21)
-        Me.ButOpenGBX.TabIndex = 6
-        Me.ButOpenGBX.TabStop = false
+        Me.ButOpenGBX.TabIndex = 0
         Me.ButOpenGBX.Text = "Gearbox"
         Me.ButOpenGBX.UseVisualStyleBackColor = true
         '
@@ -412,8 +405,7 @@ Partial Class VectoJobForm
         Me.ButtonGBX.Location = New System.Drawing.Point(492, 1)
         Me.ButtonGBX.Name = "ButtonGBX"
         Me.ButtonGBX.Size = New System.Drawing.Size(24, 24)
-        Me.ButtonGBX.TabIndex = 8
-        Me.ButtonGBX.TabStop = false
+        Me.ButtonGBX.TabIndex = 2
         Me.ButtonGBX.UseVisualStyleBackColor = true
         '
         'TbGBX
@@ -423,7 +415,7 @@ Partial Class VectoJobForm
         Me.TbGBX.Location = New System.Drawing.Point(82, 3)
         Me.TbGBX.Name = "TbGBX"
         Me.TbGBX.Size = New System.Drawing.Size(404, 20)
-        Me.TbGBX.TabIndex = 7
+        Me.TbGBX.TabIndex = 1
         '
         'pnShiftParams
         '
@@ -433,15 +425,14 @@ Partial Class VectoJobForm
         Me.pnShiftParams.Location = New System.Drawing.Point(4, 96)
         Me.pnShiftParams.Name = "pnShiftParams"
         Me.pnShiftParams.Size = New System.Drawing.Size(516, 26)
-        Me.pnShiftParams.TabIndex = 14
+        Me.pnShiftParams.TabIndex = 3
         '
         'BtnShiftParamsForm
         '
         Me.BtnShiftParamsForm.Location = New System.Drawing.Point(3, 3)
         Me.BtnShiftParamsForm.Name = "BtnShiftParamsForm"
         Me.BtnShiftParamsForm.Size = New System.Drawing.Size(72, 21)
-        Me.BtnShiftParamsForm.TabIndex = 11
-        Me.BtnShiftParamsForm.TabStop = false
+        Me.BtnShiftParamsForm.TabIndex = 0
         Me.BtnShiftParamsForm.Text = "Shift Parameters"
         Me.BtnShiftParamsForm.UseVisualStyleBackColor = true
         '
@@ -452,7 +443,7 @@ Partial Class VectoJobForm
         Me.TbShiftStrategyParams.Location = New System.Drawing.Point(81, 3)
         Me.TbShiftStrategyParams.Name = "TbShiftStrategyParams"
         Me.TbShiftStrategyParams.Size = New System.Drawing.Size(406, 20)
-        Me.TbShiftStrategyParams.TabIndex = 12
+        Me.TbShiftStrategyParams.TabIndex = 1
         '
         'BtnShiftStrategyParams
         '
@@ -461,8 +452,7 @@ Partial Class VectoJobForm
         Me.BtnShiftStrategyParams.Location = New System.Drawing.Point(489, 1)
         Me.BtnShiftStrategyParams.Name = "BtnShiftStrategyParams"
         Me.BtnShiftStrategyParams.Size = New System.Drawing.Size(24, 24)
-        Me.BtnShiftStrategyParams.TabIndex = 13
-        Me.BtnShiftStrategyParams.TabStop = false
+        Me.BtnShiftStrategyParams.TabIndex = 2
         Me.BtnShiftStrategyParams.UseVisualStyleBackColor = true
         '
         'GrCycles
@@ -476,7 +466,7 @@ Partial Class VectoJobForm
         Me.GrCycles.Location = New System.Drawing.Point(6, 6)
         Me.GrCycles.Name = "GrCycles"
         Me.GrCycles.Size = New System.Drawing.Size(515, 138)
-        Me.GrCycles.TabIndex = 10
+        Me.GrCycles.TabIndex = 0
         Me.GrCycles.TabStop = false
         Me.GrCycles.Text = "Cycles"
         '
@@ -547,7 +537,7 @@ Partial Class VectoJobForm
         Me.GrAuxMech.Location = New System.Drawing.Point(6, 16)
         Me.GrAuxMech.Name = "GrAuxMech"
         Me.GrAuxMech.Size = New System.Drawing.Size(515, 280)
-        Me.GrAuxMech.TabIndex = 9
+        Me.GrAuxMech.TabIndex = 0
         Me.GrAuxMech.TabStop = false
         Me.GrAuxMech.Text = "Mechanical Auxiliaries"
         '
@@ -618,14 +608,14 @@ Partial Class VectoJobForm
         Me.pnAuxEngineering.Location = New System.Drawing.Point(6, 19)
         Me.pnAuxEngineering.Name = "pnAuxEngineering"
         Me.pnAuxEngineering.Size = New System.Drawing.Size(500, 80)
-        Me.pnAuxEngineering.TabIndex = 45
+        Me.pnAuxEngineering.TabIndex = 0
         '
         'tbPAuxStandstillICEOff
         '
         Me.tbPAuxStandstillICEOff.Location = New System.Drawing.Point(170, 55)
         Me.tbPAuxStandstillICEOff.Name = "tbPAuxStandstillICEOff"
         Me.tbPAuxStandstillICEOff.Size = New System.Drawing.Size(76, 20)
-        Me.tbPAuxStandstillICEOff.TabIndex = 49
+        Me.tbPAuxStandstillICEOff.TabIndex = 2
         '
         'lblAuxStandstillICEOffUnit
         '
@@ -650,7 +640,7 @@ Partial Class VectoJobForm
         Me.tbPAuxDrivingICEOff.Location = New System.Drawing.Point(170, 29)
         Me.tbPAuxDrivingICEOff.Name = "tbPAuxDrivingICEOff"
         Me.tbPAuxDrivingICEOff.Size = New System.Drawing.Size(76, 20)
-        Me.tbPAuxDrivingICEOff.TabIndex = 46
+        Me.tbPAuxDrivingICEOff.TabIndex = 1
         '
         'lblAuxDrivingICEOffUnit
         '
@@ -675,7 +665,7 @@ Partial Class VectoJobForm
         Me.TbAuxPAuxICEOn.Location = New System.Drawing.Point(170, 3)
         Me.TbAuxPAuxICEOn.Name = "TbAuxPAuxICEOn"
         Me.TbAuxPAuxICEOn.Size = New System.Drawing.Size(76, 20)
-        Me.TbAuxPAuxICEOn.TabIndex = 43
+        Me.TbAuxPAuxICEOn.TabIndex = 0
         '
         'lblAuxICEOnUnit
         '
@@ -810,7 +800,7 @@ Partial Class VectoJobForm
         Me.gbBusAux.Location = New System.Drawing.Point(6, 302)
         Me.gbBusAux.Name = "gbBusAux"
         Me.gbBusAux.Size = New System.Drawing.Size(515, 78)
-        Me.gbBusAux.TabIndex = 11
+        Me.gbBusAux.TabIndex = 1
         Me.gbBusAux.TabStop = false
         Me.gbBusAux.Text = "Bus Auxiliaries"
         '
@@ -820,7 +810,7 @@ Partial Class VectoJobForm
         Me.cbEnableBusAux.Location = New System.Drawing.Point(10, 17)
         Me.cbEnableBusAux.Name = "cbEnableBusAux"
         Me.cbEnableBusAux.Size = New System.Drawing.Size(115, 17)
-        Me.cbEnableBusAux.TabIndex = 17
+        Me.cbEnableBusAux.TabIndex = 0
         Me.cbEnableBusAux.Text = "Use Bus Auxiliaries"
         Me.cbEnableBusAux.UseVisualStyleBackColor = true
         '
@@ -829,18 +819,18 @@ Partial Class VectoJobForm
         Me.pnBusAux.Controls.Add(Me.btnBusAuxP)
         Me.pnBusAux.Controls.Add(Me.tbBusAuxParams)
         Me.pnBusAux.Controls.Add(Me.btnBrowsBusAuxParams)
-        Me.pnBusAux.Location = New System.Drawing.Point(6, 40)
         Me.pnBusAux.Enabled = false
+        Me.pnBusAux.Location = New System.Drawing.Point(6, 40)
         Me.pnBusAux.Name = "pnBusAux"
         Me.pnBusAux.Size = New System.Drawing.Size(503, 26)
-        Me.pnBusAux.TabIndex = 16
+        Me.pnBusAux.TabIndex = 1
         '
         'btnBusAuxP
         '
         Me.btnBusAuxP.Location = New System.Drawing.Point(3, 3)
         Me.btnBusAuxP.Name = "btnBusAuxP"
         Me.btnBusAuxP.Size = New System.Drawing.Size(72, 21)
-        Me.btnBusAuxP.TabIndex = 11
+        Me.btnBusAuxP.TabIndex = 0
         Me.btnBusAuxP.TabStop = false
         Me.btnBusAuxP.Text = "BusAux P."
         Me.btnBusAuxP.UseVisualStyleBackColor = true
@@ -852,7 +842,7 @@ Partial Class VectoJobForm
         Me.tbBusAuxParams.Location = New System.Drawing.Point(81, 3)
         Me.tbBusAuxParams.Name = "tbBusAuxParams"
         Me.tbBusAuxParams.Size = New System.Drawing.Size(393, 20)
-        Me.tbBusAuxParams.TabIndex = 12
+        Me.tbBusAuxParams.TabIndex = 1
         '
         'btnBrowsBusAuxParams
         '
@@ -861,8 +851,7 @@ Partial Class VectoJobForm
         Me.btnBrowsBusAuxParams.Location = New System.Drawing.Point(476, 1)
         Me.btnBrowsBusAuxParams.Name = "btnBrowsBusAuxParams"
         Me.btnBrowsBusAuxParams.Size = New System.Drawing.Size(24, 24)
-        Me.btnBrowsBusAuxParams.TabIndex = 13
-        Me.btnBrowsBusAuxParams.TabStop = false
+        Me.btnBrowsBusAuxParams.TabIndex = 2
         Me.btnBrowsBusAuxParams.UseVisualStyleBackColor = true
         '
         'gbElectricAux
@@ -874,7 +863,7 @@ Partial Class VectoJobForm
         Me.gbElectricAux.Location = New System.Drawing.Point(6, 386)
         Me.gbElectricAux.Name = "gbElectricAux"
         Me.gbElectricAux.Size = New System.Drawing.Size(515, 55)
-        Me.gbElectricAux.TabIndex = 10
+        Me.gbElectricAux.TabIndex = 2
         Me.gbElectricAux.TabStop = false
         Me.gbElectricAux.Text = "Electric Auxiliaries"
         Me.gbElectricAux.Visible = false
@@ -903,7 +892,7 @@ Partial Class VectoJobForm
         Me.tbElectricAuxConstant.Location = New System.Drawing.Point(109, 19)
         Me.tbElectricAuxConstant.Name = "tbElectricAuxConstant"
         Me.tbElectricAuxConstant.Size = New System.Drawing.Size(76, 20)
-        Me.tbElectricAuxConstant.TabIndex = 46
+        Me.tbElectricAuxConstant.TabIndex = 0
         '
         'lblElAuxConst
         '
@@ -945,7 +934,7 @@ Partial Class VectoJobForm
         Me.gbShiftStrategy.Location = New System.Drawing.Point(9, 347)
         Me.gbShiftStrategy.Name = "gbShiftStrategy"
         Me.gbShiftStrategy.Size = New System.Drawing.Size(514, 50)
-        Me.gbShiftStrategy.TabIndex = 4
+        Me.gbShiftStrategy.TabIndex = 3
         Me.gbShiftStrategy.TabStop = false
         Me.gbShiftStrategy.Text = "Gearshift Strategy"
         '
@@ -966,7 +955,7 @@ Partial Class VectoJobForm
         Me.GrVACC.Location = New System.Drawing.Point(9, 271)
         Me.GrVACC.Name = "GrVACC"
         Me.GrVACC.Size = New System.Drawing.Size(515, 69)
-        Me.GrVACC.TabIndex = 3
+        Me.GrVACC.TabIndex = 2
         Me.GrVACC.TabStop = false
         Me.GrVACC.Text = "Max. acceleration and brake curves"
         '
@@ -1006,7 +995,6 @@ Partial Class VectoJobForm
         Me.BtAccOpen.Name = "BtAccOpen"
         Me.BtAccOpen.Size = New System.Drawing.Size(24, 24)
         Me.BtAccOpen.TabIndex = 2
-        Me.BtAccOpen.TabStop = false
         Me.BtAccOpen.UseVisualStyleBackColor = true
         '
         'GrLAC
@@ -1016,7 +1004,7 @@ Partial Class VectoJobForm
         Me.GrLAC.Location = New System.Drawing.Point(9, 92)
         Me.GrLAC.Name = "GrLAC"
         Me.GrLAC.Size = New System.Drawing.Size(514, 173)
-        Me.GrLAC.TabIndex = 2
+        Me.GrLAC.TabIndex = 1
         Me.GrLAC.TabStop = false
         Me.GrLAC.Text = "Look-Ahead Coasting"
         '
@@ -1041,7 +1029,7 @@ Partial Class VectoJobForm
         Me.pnLookAheadCoasting.Location = New System.Drawing.Point(15, 19)
         Me.pnLookAheadCoasting.Name = "pnLookAheadCoasting"
         Me.pnLookAheadCoasting.Size = New System.Drawing.Size(493, 129)
-        Me.pnLookAheadCoasting.TabIndex = 20
+        Me.pnLookAheadCoasting.TabIndex = 0
         '
         'Label7
         '
@@ -1067,7 +1055,7 @@ Partial Class VectoJobForm
         Me.tbLacMinSpeed.Location = New System.Drawing.Point(179, 3)
         Me.tbLacMinSpeed.Name = "tbLacMinSpeed"
         Me.tbLacMinSpeed.Size = New System.Drawing.Size(64, 20)
-        Me.tbLacMinSpeed.TabIndex = 34
+        Me.tbLacMinSpeed.TabIndex = 0
         '
         'btnDfVelocityDrop
         '
@@ -1076,8 +1064,7 @@ Partial Class VectoJobForm
         Me.btnDfVelocityDrop.Location = New System.Drawing.Point(466, 78)
         Me.btnDfVelocityDrop.Name = "btnDfVelocityDrop"
         Me.btnDfVelocityDrop.Size = New System.Drawing.Size(24, 24)
-        Me.btnDfVelocityDrop.TabIndex = 32
-        Me.btnDfVelocityDrop.TabStop = false
+        Me.btnDfVelocityDrop.TabIndex = 5
         Me.btnDfVelocityDrop.UseVisualStyleBackColor = true
         '
         'Label12
@@ -1094,7 +1081,7 @@ Partial Class VectoJobForm
         Me.tbDfCoastingScale.Location = New System.Drawing.Point(241, 107)
         Me.tbDfCoastingScale.Name = "tbDfCoastingScale"
         Me.tbDfCoastingScale.Size = New System.Drawing.Size(37, 20)
-        Me.tbDfCoastingScale.TabIndex = 30
+        Me.tbDfCoastingScale.TabIndex = 7
         '
         'Label11
         '
@@ -1120,7 +1107,7 @@ Partial Class VectoJobForm
         Me.tbDfCoastingOffset.Location = New System.Drawing.Point(180, 107)
         Me.tbDfCoastingOffset.Name = "tbDfCoastingOffset"
         Me.tbDfCoastingOffset.Size = New System.Drawing.Size(37, 20)
-        Me.tbDfCoastingOffset.TabIndex = 28
+        Me.tbDfCoastingOffset.TabIndex = 6
         '
         'tbLacDfTargetSpeedFile
         '
@@ -1129,7 +1116,7 @@ Partial Class VectoJobForm
         Me.tbLacDfTargetSpeedFile.Location = New System.Drawing.Point(179, 54)
         Me.tbLacDfTargetSpeedFile.Name = "tbLacDfTargetSpeedFile"
         Me.tbLacDfTargetSpeedFile.Size = New System.Drawing.Size(286, 20)
-        Me.tbLacDfTargetSpeedFile.TabIndex = 22
+        Me.tbLacDfTargetSpeedFile.TabIndex = 2
         '
         'Label10
         '
@@ -1167,8 +1154,7 @@ Partial Class VectoJobForm
         Me.btnDfTargetSpeed.Location = New System.Drawing.Point(466, 52)
         Me.btnDfTargetSpeed.Name = "btnDfTargetSpeed"
         Me.btnDfTargetSpeed.Size = New System.Drawing.Size(24, 24)
-        Me.btnDfTargetSpeed.TabIndex = 23
-        Me.btnDfTargetSpeed.TabStop = false
+        Me.btnDfTargetSpeed.TabIndex = 3
         Me.btnDfTargetSpeed.UseVisualStyleBackColor = true
         '
         'tbLacPreviewFactor
@@ -1176,7 +1162,7 @@ Partial Class VectoJobForm
         Me.tbLacPreviewFactor.Location = New System.Drawing.Point(179, 28)
         Me.tbLacPreviewFactor.Name = "tbLacPreviewFactor"
         Me.tbLacPreviewFactor.Size = New System.Drawing.Size(64, 20)
-        Me.tbLacPreviewFactor.TabIndex = 21
+        Me.tbLacPreviewFactor.TabIndex = 1
         '
         'tbLacDfVelocityDropFile
         '
@@ -1185,7 +1171,7 @@ Partial Class VectoJobForm
         Me.tbLacDfVelocityDropFile.Location = New System.Drawing.Point(179, 81)
         Me.tbLacDfVelocityDropFile.Name = "tbLacDfVelocityDropFile"
         Me.tbLacDfVelocityDropFile.Size = New System.Drawing.Size(286, 20)
-        Me.tbLacDfVelocityDropFile.TabIndex = 25
+        Me.tbLacDfVelocityDropFile.TabIndex = 4
         '
         'CbLookAhead
         '
@@ -1207,7 +1193,7 @@ Partial Class VectoJobForm
         Me.gbOverspeed.Location = New System.Drawing.Point(9, 9)
         Me.gbOverspeed.Name = "gbOverspeed"
         Me.gbOverspeed.Size = New System.Drawing.Size(515, 77)
-        Me.gbOverspeed.TabIndex = 1
+        Me.gbOverspeed.TabIndex = 0
         Me.gbOverspeed.TabStop = false
         Me.gbOverspeed.Text = "Overspeed"
         '
@@ -1222,7 +1208,7 @@ Partial Class VectoJobForm
         Me.PnEcoRoll.Location = New System.Drawing.Point(91, 17)
         Me.PnEcoRoll.Name = "PnEcoRoll"
         Me.PnEcoRoll.Size = New System.Drawing.Size(232, 54)
-        Me.PnEcoRoll.TabIndex = 3
+        Me.PnEcoRoll.TabIndex = 2
         '
         'Label21
         '
@@ -1247,7 +1233,7 @@ Partial Class VectoJobForm
         Me.TbVmin.Location = New System.Drawing.Point(104, 28)
         Me.TbVmin.Name = "TbVmin"
         Me.TbVmin.Size = New System.Drawing.Size(64, 20)
-        Me.TbVmin.TabIndex = 2
+        Me.TbVmin.TabIndex = 1
         '
         'TbOverspeed
         '
@@ -1333,7 +1319,7 @@ Partial Class VectoJobForm
         Me.gbPCC.Location = New System.Drawing.Point(7, 269)
         Me.gbPCC.Name = "gbPCC"
         Me.gbPCC.Size = New System.Drawing.Size(515, 217)
-        Me.gbPCC.TabIndex = 7
+        Me.gbPCC.TabIndex = 2
         Me.gbPCC.TabStop = false
         Me.gbPCC.Text = "Predictive Cruise Control"
         '
@@ -1381,7 +1367,7 @@ Partial Class VectoJobForm
         Me.tbPCCPreviewUseCase2.Location = New System.Drawing.Point(247, 149)
         Me.tbPCCPreviewUseCase2.Name = "tbPCCPreviewUseCase2"
         Me.tbPCCPreviewUseCase2.Size = New System.Drawing.Size(52, 20)
-        Me.tbPCCPreviewUseCase2.TabIndex = 27
+        Me.tbPCCPreviewUseCase2.TabIndex = 5
         '
         'Label38
         '
@@ -1406,7 +1392,7 @@ Partial Class VectoJobForm
         Me.tbPCCPreviewUseCase1.Location = New System.Drawing.Point(247, 123)
         Me.tbPCCPreviewUseCase1.Name = "tbPCCPreviewUseCase1"
         Me.tbPCCPreviewUseCase1.Size = New System.Drawing.Size(52, 20)
-        Me.tbPCCPreviewUseCase1.TabIndex = 24
+        Me.tbPCCPreviewUseCase1.TabIndex = 4
         '
         'Label36
         '
@@ -1431,7 +1417,7 @@ Partial Class VectoJobForm
         Me.tbPCCMinSpeed.Location = New System.Drawing.Point(247, 97)
         Me.tbPCCMinSpeed.Name = "tbPCCMinSpeed"
         Me.tbPCCMinSpeed.Size = New System.Drawing.Size(52, 20)
-        Me.tbPCCMinSpeed.TabIndex = 21
+        Me.tbPCCMinSpeed.TabIndex = 3
         '
         'Label34
         '
@@ -1456,7 +1442,7 @@ Partial Class VectoJobForm
         Me.tbPCCEnableSpeed.Location = New System.Drawing.Point(247, 71)
         Me.tbPCCEnableSpeed.Name = "tbPCCEnableSpeed"
         Me.tbPCCEnableSpeed.Size = New System.Drawing.Size(52, 20)
-        Me.tbPCCEnableSpeed.TabIndex = 18
+        Me.tbPCCEnableSpeed.TabIndex = 2
         '
         'Label31
         '
@@ -1481,7 +1467,7 @@ Partial Class VectoJobForm
         Me.tbPCCOverspeed.Location = New System.Drawing.Point(247, 45)
         Me.tbPCCOverspeed.Name = "tbPCCOverspeed"
         Me.tbPCCOverspeed.Size = New System.Drawing.Size(52, 20)
-        Me.tbPCCOverspeed.TabIndex = 15
+        Me.tbPCCOverspeed.TabIndex = 1
         '
         'Label20
         '
@@ -1506,7 +1492,7 @@ Partial Class VectoJobForm
         Me.tbPCCUnderspeed.Location = New System.Drawing.Point(247, 19)
         Me.tbPCCUnderspeed.Name = "tbPCCUnderspeed"
         Me.tbPCCUnderspeed.Size = New System.Drawing.Size(52, 20)
-        Me.tbPCCUnderspeed.TabIndex = 12
+        Me.tbPCCUnderspeed.TabIndex = 0
         '
         'gbEcoRoll
         '
@@ -1525,7 +1511,7 @@ Partial Class VectoJobForm
         Me.gbEcoRoll.Location = New System.Drawing.Point(7, 136)
         Me.gbEcoRoll.Name = "gbEcoRoll"
         Me.gbEcoRoll.Size = New System.Drawing.Size(515, 127)
-        Me.gbEcoRoll.TabIndex = 6
+        Me.gbEcoRoll.TabIndex = 1
         Me.gbEcoRoll.TabStop = false
         Me.gbEcoRoll.Text = "Eco-Roll"
         '
@@ -1552,7 +1538,7 @@ Partial Class VectoJobForm
         Me.tbEcoRollMaxAcc.Location = New System.Drawing.Point(247, 72)
         Me.tbEcoRollMaxAcc.Name = "tbEcoRollMaxAcc"
         Me.tbEcoRollMaxAcc.Size = New System.Drawing.Size(52, 20)
-        Me.tbEcoRollMaxAcc.TabIndex = 18
+        Me.tbEcoRollMaxAcc.TabIndex = 2
         '
         'Label29
         '
@@ -1579,7 +1565,7 @@ Partial Class VectoJobForm
         Me.tbEcoRollUnderspeed.Location = New System.Drawing.Point(247, 97)
         Me.tbEcoRollUnderspeed.Name = "tbEcoRollUnderspeed"
         Me.tbEcoRollUnderspeed.Size = New System.Drawing.Size(52, 20)
-        Me.tbEcoRollUnderspeed.TabIndex = 15
+        Me.tbEcoRollUnderspeed.TabIndex = 3
         Me.tbEcoRollUnderspeed.Visible = false
         '
         'Label27
@@ -1605,7 +1591,7 @@ Partial Class VectoJobForm
         Me.tbEcoRollActivationDelay.Location = New System.Drawing.Point(247, 45)
         Me.tbEcoRollActivationDelay.Name = "tbEcoRollActivationDelay"
         Me.tbEcoRollActivationDelay.Size = New System.Drawing.Size(52, 20)
-        Me.tbEcoRollActivationDelay.TabIndex = 12
+        Me.tbEcoRollActivationDelay.TabIndex = 1
         '
         'Label25
         '
@@ -1630,7 +1616,7 @@ Partial Class VectoJobForm
         Me.tbEcoRollMinSpeed.Location = New System.Drawing.Point(247, 19)
         Me.tbEcoRollMinSpeed.Name = "tbEcoRollMinSpeed"
         Me.tbEcoRollMinSpeed.Size = New System.Drawing.Size(52, 20)
-        Me.tbEcoRollMinSpeed.TabIndex = 9
+        Me.tbEcoRollMinSpeed.TabIndex = 0
         '
         'gbEngineStopStart
         '
@@ -1647,7 +1633,7 @@ Partial Class VectoJobForm
         Me.gbEngineStopStart.Location = New System.Drawing.Point(7, 9)
         Me.gbEngineStopStart.Name = "gbEngineStopStart"
         Me.gbEngineStopStart.Size = New System.Drawing.Size(515, 121)
-        Me.gbEngineStopStart.TabIndex = 5
+        Me.gbEngineStopStart.TabIndex = 0
         Me.gbEngineStopStart.TabStop = false
         Me.gbEngineStopStart.Text = "Engine Stop/Start"
         '
@@ -1656,7 +1642,7 @@ Partial Class VectoJobForm
         Me.tbESSUtilityFactorDriving.Location = New System.Drawing.Point(247, 95)
         Me.tbESSUtilityFactorDriving.Name = "tbESSUtilityFactorDriving"
         Me.tbESSUtilityFactorDriving.Size = New System.Drawing.Size(52, 20)
-        Me.tbESSUtilityFactorDriving.TabIndex = 9
+        Me.tbESSUtilityFactorDriving.TabIndex = 3
         '
         'lblESSUtilityFactorDriving
         '
@@ -1672,7 +1658,7 @@ Partial Class VectoJobForm
         Me.tbEssUtility.Location = New System.Drawing.Point(247, 69)
         Me.tbEssUtility.Name = "tbEssUtility"
         Me.tbEssUtility.Size = New System.Drawing.Size(52, 20)
-        Me.tbEssUtility.TabIndex = 7
+        Me.tbEssUtility.TabIndex = 2
         '
         'Label24
         '
@@ -1697,7 +1683,7 @@ Partial Class VectoJobForm
         Me.tbMaxEngineOffTimespan.Location = New System.Drawing.Point(247, 43)
         Me.tbMaxEngineOffTimespan.Name = "tbMaxEngineOffTimespan"
         Me.tbMaxEngineOffTimespan.Size = New System.Drawing.Size(52, 20)
-        Me.tbMaxEngineOffTimespan.TabIndex = 4
+        Me.tbMaxEngineOffTimespan.TabIndex = 1
         '
         'Label19
         '
@@ -1722,7 +1708,7 @@ Partial Class VectoJobForm
         Me.tbEngineStopStartActivationDelay.Location = New System.Drawing.Point(247, 17)
         Me.tbEngineStopStartActivationDelay.Name = "tbEngineStopStartActivationDelay"
         Me.tbEngineStopStartActivationDelay.Size = New System.Drawing.Size(52, 20)
-        Me.tbEngineStopStartActivationDelay.TabIndex = 1
+        Me.tbEngineStopStartActivationDelay.TabIndex = 0
         '
         'Label16
         '
@@ -1772,6 +1758,7 @@ Partial Class VectoJobForm
         '
         '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, 609)
         Me.StatusStrip1.Name = "StatusStrip1"
@@ -1792,7 +1779,7 @@ Partial Class VectoJobForm
         Me.ButOK.Location = New System.Drawing.Point(776, 563)
         Me.ButOK.Name = "ButOK"
         Me.ButOK.Size = New System.Drawing.Size(75, 23)
-        Me.ButOK.TabIndex = 0
+        Me.ButOK.TabIndex = 1
         Me.ButOK.Text = "Save"
         Me.ButOK.UseVisualStyleBackColor = true
         '
@@ -1803,17 +1790,18 @@ Partial Class VectoJobForm
         Me.ButCancel.Location = New System.Drawing.Point(857, 563)
         Me.ButCancel.Name = "ButCancel"
         Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-        Me.ButCancel.TabIndex = 1
+        Me.ButCancel.TabIndex = 2
         Me.ButCancel.Text = "Cancel"
         Me.ButCancel.UseVisualStyleBackColor = true
         '
         'ToolStrip1
         '
         Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
         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.Size = New System.Drawing.Size(944, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(944, 31)
         Me.ToolStrip1.TabIndex = 20
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -1823,7 +1811,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(23, 22)
+        Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtNew.Text = "New"
         Me.ToolStripBtNew.ToolTipText = "New"
         '
@@ -1833,7 +1821,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(23, 22)
+        Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtOpen.Text = "Open"
         Me.ToolStripBtOpen.ToolTipText = "Open..."
         '
@@ -1843,7 +1831,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(23, 22)
+        Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtSave.Text = "Save"
         Me.ToolStripBtSave.ToolTipText = "Save"
         '
@@ -1853,14 +1841,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(23, 22)
+        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, 25)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripBtSendTo
         '
@@ -1868,14 +1856,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(23, 22)
+        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, 25)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripButton1
         '
@@ -1883,7 +1871,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(23, 22)
+        Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton1.Text = "Help"
         '
         'PictureBox1
@@ -1900,6 +1888,7 @@ Partial Class VectoJobForm
         '
         'CmOpenFile
         '
+        Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
         Me.CmOpenFile.Name = "CmOpenFile"
         Me.CmOpenFile.ShowImageMargin = false
diff --git a/VECTO/GUI/VectoVTPJobForm.Designer.vb b/VECTO/GUI/VectoVTPJobForm.Designer.vb
index 1d86c0331b9d1827846458b8d584700443883c61..f2ba7144b43084f2d1493903c02a379a50ef669c 100644
--- a/VECTO/GUI/VectoVTPJobForm.Designer.vb
+++ b/VECTO/GUI/VectoVTPJobForm.Designer.vb
@@ -70,7 +70,10 @@ Partial Class VectoVTPJobForm
         Me.lblEngineCharacteristics = New System.Windows.Forms.Label()
         Me.PictureBox2 = New System.Windows.Forms.PictureBox()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.Label13 = New System.Windows.Forms.Label()
         Me.tbFanDiameter = New System.Windows.Forms.TextBox()
+        Me.tbC4 = New System.Windows.Forms.TextBox()
+        Me.Label14 = New System.Windows.Forms.Label()
         Me.Label7 = New System.Windows.Forms.Label()
         Me.pnFanParameters = New System.Windows.Forms.Panel()
         Me.Label11 = New System.Windows.Forms.Label()
@@ -91,9 +94,6 @@ Partial Class VectoVTPJobForm
         Me.Label8 = New System.Windows.Forms.Label()
         Me.tbManufacturerRecord = New System.Windows.Forms.TextBox()
         Me.ButtonManR = New System.Windows.Forms.Button()
-        Me.Label13 = New System.Windows.Forms.Label()
-        Me.tbC4 = New System.Windows.Forms.TextBox()
-        Me.Label14 = New System.Windows.Forms.Label()
         Me.GrCycles.SuspendLayout
         Me.GrAux.SuspendLayout
         Me.StatusStrip1.SuspendLayout
@@ -120,7 +120,7 @@ Partial Class VectoVTPJobForm
         Me.GrCycles.Location = New System.Drawing.Point(11, 324)
         Me.GrCycles.Name = "GrCycles"
         Me.GrCycles.Size = New System.Drawing.Size(515, 166)
-        Me.GrCycles.TabIndex = 10
+        Me.GrCycles.TabIndex = 3
         Me.GrCycles.TabStop = false
         Me.GrCycles.Text = "Cycles"
         '
@@ -202,7 +202,7 @@ Partial Class VectoVTPJobForm
         Me.GrAux.Location = New System.Drawing.Point(11, 178)
         Me.GrAux.Name = "GrAux"
         Me.GrAux.Size = New System.Drawing.Size(515, 140)
-        Me.GrAux.TabIndex = 9
+        Me.GrAux.TabIndex = 2
         Me.GrAux.TabStop = false
         Me.GrAux.Text = "Auxiliaries"
         '
@@ -246,7 +246,7 @@ Partial Class VectoVTPJobForm
         Me.TbVEH.Location = New System.Drawing.Point(128, 86)
         Me.TbVEH.Name = "TbVEH"
         Me.TbVEH.Size = New System.Drawing.Size(373, 20)
-        Me.TbVEH.TabIndex = 1
+        Me.TbVEH.TabIndex = 0
         '
         'ButtonVEH
         '
@@ -256,11 +256,11 @@ Partial Class VectoVTPJobForm
         Me.ButtonVEH.Name = "ButtonVEH"
         Me.ButtonVEH.Size = New System.Drawing.Size(24, 24)
         Me.ButtonVEH.TabIndex = 2
-        Me.ButtonVEH.TabStop = false
         Me.ButtonVEH.UseVisualStyleBackColor = true
         '
         '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, 660)
         Me.StatusStrip1.Name = "StatusStrip1"
@@ -281,7 +281,7 @@ Partial Class VectoVTPJobForm
         Me.ButOK.Location = New System.Drawing.Point(778, 633)
         Me.ButOK.Name = "ButOK"
         Me.ButOK.Size = New System.Drawing.Size(75, 23)
-        Me.ButOK.TabIndex = 0
+        Me.ButOK.TabIndex = 5
         Me.ButOK.Text = "Save"
         Me.ButOK.UseVisualStyleBackColor = true
         '
@@ -292,17 +292,18 @@ Partial Class VectoVTPJobForm
         Me.ButCancel.Location = New System.Drawing.Point(859, 633)
         Me.ButCancel.Name = "ButCancel"
         Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-        Me.ButCancel.TabIndex = 1
+        Me.ButCancel.TabIndex = 6
         Me.ButCancel.Text = "Cancel"
         Me.ButCancel.UseVisualStyleBackColor = true
         '
         'ToolStrip1
         '
         Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
         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.Size = New System.Drawing.Size(944, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(944, 31)
         Me.ToolStrip1.TabIndex = 20
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -312,7 +313,7 @@ Partial Class VectoVTPJobForm
         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(23, 22)
+        Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtNew.Text = "New"
         Me.ToolStripBtNew.ToolTipText = "New"
         '
@@ -322,7 +323,7 @@ Partial Class VectoVTPJobForm
         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(23, 22)
+        Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtOpen.Text = "Open"
         Me.ToolStripBtOpen.ToolTipText = "Open..."
         '
@@ -332,7 +333,7 @@ Partial Class VectoVTPJobForm
         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(23, 22)
+        Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripBtSave.Text = "Save"
         Me.ToolStripBtSave.ToolTipText = "Save"
         '
@@ -342,14 +343,14 @@ Partial Class VectoVTPJobForm
         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(23, 22)
+        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, 25)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripBtSendTo
         '
@@ -357,14 +358,14 @@ Partial Class VectoVTPJobForm
         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(23, 22)
+        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, 25)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
         '
         'ToolStripButton1
         '
@@ -372,7 +373,7 @@ Partial Class VectoVTPJobForm
         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(23, 22)
+        Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
         Me.ToolStripButton1.Text = "Help"
         '
         'PictureBox1
@@ -389,6 +390,7 @@ Partial Class VectoVTPJobForm
         '
         'CmOpenFile
         '
+        Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
         Me.CmOpenFile.Name = "CmOpenFile"
         Me.CmOpenFile.ShowImageMargin = false
@@ -507,16 +509,41 @@ Partial Class VectoVTPJobForm
         Me.GroupBox1.Location = New System.Drawing.Point(10, 496)
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.Size = New System.Drawing.Size(517, 144)
-        Me.GroupBox1.TabIndex = 39
+        Me.GroupBox1.TabIndex = 4
         Me.GroupBox1.TabStop = false
         Me.GroupBox1.Text = "Fan Power"
         '
+        'Label13
+        '
+        Me.Label13.AutoSize = true
+        Me.Label13.Location = New System.Drawing.Point(463, 120)
+        Me.Label13.Name = "Label13"
+        Me.Label13.Size = New System.Drawing.Size(16, 13)
+        Me.Label13.TabIndex = 53
+        Me.Label13.Text = "[-]"
+        '
         'tbFanDiameter
         '
         Me.tbFanDiameter.Location = New System.Drawing.Point(371, 13)
         Me.tbFanDiameter.Name = "tbFanDiameter"
         Me.tbFanDiameter.Size = New System.Drawing.Size(86, 20)
-        Me.tbFanDiameter.TabIndex = 46
+        Me.tbFanDiameter.TabIndex = 0
+        '
+        'tbC4
+        '
+        Me.tbC4.Location = New System.Drawing.Point(371, 117)
+        Me.tbC4.Name = "tbC4"
+        Me.tbC4.Size = New System.Drawing.Size(86, 20)
+        Me.tbC4.TabIndex = 2
+        '
+        'Label14
+        '
+        Me.Label14.AutoSize = true
+        Me.Label14.Location = New System.Drawing.Point(342, 120)
+        Me.Label14.Name = "Label14"
+        Me.Label14.Size = New System.Drawing.Size(23, 13)
+        Me.Label14.TabIndex = 51
+        Me.Label14.Text = "C4:"
         '
         'Label7
         '
@@ -541,7 +568,7 @@ Partial Class VectoVTPJobForm
         Me.pnFanParameters.Location = New System.Drawing.Point(290, 36)
         Me.pnFanParameters.Name = "pnFanParameters"
         Me.pnFanParameters.Size = New System.Drawing.Size(218, 78)
-        Me.pnFanParameters.TabIndex = 48
+        Me.pnFanParameters.TabIndex = 1
         '
         'Label11
         '
@@ -584,7 +611,7 @@ Partial Class VectoVTPJobForm
         Me.tbC1.Location = New System.Drawing.Point(81, 3)
         Me.tbC1.Name = "tbC1"
         Me.tbC1.Size = New System.Drawing.Size(86, 20)
-        Me.tbC1.TabIndex = 40
+        Me.tbC1.TabIndex = 0
         '
         'Label3
         '
@@ -600,14 +627,14 @@ Partial Class VectoVTPJobForm
         Me.tbC3.Location = New System.Drawing.Point(81, 55)
         Me.tbC3.Name = "tbC3"
         Me.tbC3.Size = New System.Drawing.Size(86, 20)
-        Me.tbC3.TabIndex = 44
+        Me.tbC3.TabIndex = 2
         '
         'tbC2
         '
         Me.tbC2.Location = New System.Drawing.Point(81, 29)
         Me.tbC2.Name = "tbC2"
         Me.tbC2.Size = New System.Drawing.Size(86, 20)
-        Me.tbC2.TabIndex = 42
+        Me.tbC2.TabIndex = 1
         '
         'Label4
         '
@@ -647,7 +674,7 @@ Partial Class VectoVTPJobForm
         Me.pnManufacturerRecord.Location = New System.Drawing.Point(11, 112)
         Me.pnManufacturerRecord.Name = "pnManufacturerRecord"
         Me.pnManufacturerRecord.Size = New System.Drawing.Size(525, 66)
-        Me.pnManufacturerRecord.TabIndex = 41
+        Me.pnManufacturerRecord.TabIndex = 1
         '
         'lblMileageUnit
         '
@@ -665,7 +692,7 @@ Partial Class VectoVTPJobForm
         Me.tbMileage.Location = New System.Drawing.Point(117, 40)
         Me.tbMileage.Name = "tbMileage"
         Me.tbMileage.Size = New System.Drawing.Size(76, 20)
-        Me.tbMileage.TabIndex = 48
+        Me.tbMileage.TabIndex = 2
         '
         'lblMileage
         '
@@ -692,7 +719,7 @@ Partial Class VectoVTPJobForm
         Me.tbManufacturerRecord.Location = New System.Drawing.Point(117, 8)
         Me.tbManufacturerRecord.Name = "tbManufacturerRecord"
         Me.tbManufacturerRecord.Size = New System.Drawing.Size(374, 20)
-        Me.tbManufacturerRecord.TabIndex = 41
+        Me.tbManufacturerRecord.TabIndex = 0
         '
         'ButtonManR
         '
@@ -701,35 +728,9 @@ Partial Class VectoVTPJobForm
         Me.ButtonManR.Location = New System.Drawing.Point(492, 6)
         Me.ButtonManR.Name = "ButtonManR"
         Me.ButtonManR.Size = New System.Drawing.Size(24, 24)
-        Me.ButtonManR.TabIndex = 42
-        Me.ButtonManR.TabStop = false
+        Me.ButtonManR.TabIndex = 1
         Me.ButtonManR.UseVisualStyleBackColor = true
         '
-        'Label13
-        '
-        Me.Label13.AutoSize = true
-        Me.Label13.Location = New System.Drawing.Point(463, 120)
-        Me.Label13.Name = "Label13"
-        Me.Label13.Size = New System.Drawing.Size(16, 13)
-        Me.Label13.TabIndex = 53
-        Me.Label13.Text = "[-]"
-        '
-        'tbC4
-        '
-        Me.tbC4.Location = New System.Drawing.Point(371, 117)
-        Me.tbC4.Name = "tbC4"
-        Me.tbC4.Size = New System.Drawing.Size(86, 20)
-        Me.tbC4.TabIndex = 52
-        '
-        'Label14
-        '
-        Me.Label14.AutoSize = true
-        Me.Label14.Location = New System.Drawing.Point(342, 120)
-        Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(23, 13)
-        Me.Label14.TabIndex = 51
-        Me.Label14.Text = "C4:"
-        '
         'VectoVTPJobForm
         '
         Me.AcceptButton = Me.ButOK
diff --git a/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb b/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb
index 5db90ec58a56da973e5f2d5decf6daa7203889ca..6568277f0c77319c9549e3d6a910d7a18d2c7c27 100644
--- a/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb
+++ b/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb
@@ -77,7 +77,7 @@ Partial Class VehicleAuxiliariesDialog
         Me.OK_Button.Location = New System.Drawing.Point(3, 3)
         Me.OK_Button.Name = "OK_Button"
         Me.OK_Button.Size = New System.Drawing.Size(67, 23)
-        Me.OK_Button.TabIndex = 0
+        Me.OK_Button.TabIndex = 5
         Me.OK_Button.Text = "OK"
         '
         'Cancel_Button
@@ -87,7 +87,7 @@ Partial Class VehicleAuxiliariesDialog
         Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
         Me.Cancel_Button.Name = "Cancel_Button"
         Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
-        Me.Cancel_Button.TabIndex = 1
+        Me.Cancel_Button.TabIndex = 6
         Me.Cancel_Button.Text = "Cancel"
         '
         'Label1
@@ -140,7 +140,7 @@ Partial Class VehicleAuxiliariesDialog
         Me.CbTech.Location = New System.Drawing.Point(75, 6)
         Me.CbTech.Name = "CbTech"
         Me.CbTech.Size = New System.Drawing.Size(352, 21)
-        Me.CbTech.TabIndex = 27
+        Me.CbTech.TabIndex = 1
         '
         'PnTech
         '
@@ -191,7 +191,7 @@ Partial Class VehicleAuxiliariesDialog
         Me.CbTech4.Location = New System.Drawing.Point(75, 87)
         Me.CbTech4.Name = "CbTech4"
         Me.CbTech4.Size = New System.Drawing.Size(352, 21)
-        Me.CbTech4.TabIndex = 30
+        Me.CbTech4.TabIndex = 4
         '
         'CbTech3
         '
@@ -200,7 +200,7 @@ Partial Class VehicleAuxiliariesDialog
         Me.CbTech3.Location = New System.Drawing.Point(75, 60)
         Me.CbTech3.Name = "CbTech3"
         Me.CbTech3.Size = New System.Drawing.Size(352, 21)
-        Me.CbTech3.TabIndex = 29
+        Me.CbTech3.TabIndex = 3
         '
         'CbTech2
         '
@@ -209,7 +209,7 @@ Partial Class VehicleAuxiliariesDialog
         Me.CbTech2.Location = New System.Drawing.Point(75, 33)
         Me.CbTech2.Name = "CbTech2"
         Me.CbTech2.Size = New System.Drawing.Size(352, 21)
-        Me.CbTech2.TabIndex = 28
+        Me.CbTech2.TabIndex = 2
         '
         'VehicleAuxiliariesDialog
         '
diff --git a/VECTO/GUI/VehicleAxleDialog.Designer.vb b/VECTO/GUI/VehicleAxleDialog.Designer.vb
index fccfd299c47df79b5bd4a178c574ad533e06a968..42d49d159769b2a24db553470f069a3205d699b7 100644
--- a/VECTO/GUI/VehicleAxleDialog.Designer.vb
+++ b/VECTO/GUI/VehicleAxleDialog.Designer.vb
@@ -35,291 +35,291 @@ Partial Class VehicleAxleDialog
 	'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
 	<DebuggerStepThrough()> _
 	Private Sub InitializeComponent()
-		Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
-		Me.OK_Button = New System.Windows.Forms.Button()
-		Me.Cancel_Button = New System.Windows.Forms.Button()
-		Me.Label1 = New System.Windows.Forms.Label()
-		Me.TbAxleShare = New System.Windows.Forms.TextBox()
-		Me.Label2 = New System.Windows.Forms.Label()
-		Me.Label3 = New System.Windows.Forms.Label()
-		Me.Label4 = New System.Windows.Forms.Label()
-		Me.TbRRC = New System.Windows.Forms.TextBox()
-		Me.Label5 = New System.Windows.Forms.Label()
-		Me.Label6 = New System.Windows.Forms.Label()
-		Me.TbFzISO = New System.Windows.Forms.TextBox()
-		Me.Label9 = New System.Windows.Forms.Label()
-		Me.Label10 = New System.Windows.Forms.Label()
-		Me.CbTwinT = New System.Windows.Forms.CheckBox()
-		Me.PnAxle = New System.Windows.Forms.Panel()
-		Me.TbI_wheels = New System.Windows.Forms.TextBox()
-		Me.Label7 = New System.Windows.Forms.Label()
-		Me.Label32 = New System.Windows.Forms.Label()
-		Me.Label8 = New System.Windows.Forms.Label()
-		Me.CbWheels = New System.Windows.Forms.ComboBox()
-		Me.cbAxleType = New System.Windows.Forms.ComboBox()
-		Me.Label11 = New System.Windows.Forms.Label()
-		Me.Label12 = New System.Windows.Forms.Label()
-		Me.TableLayoutPanel1.SuspendLayout()
-		Me.PnAxle.SuspendLayout()
-		Me.SuspendLayout()
-		'
-		'TableLayoutPanel1
-		'
-		Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TableLayoutPanel1.ColumnCount = 2
-		Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-		Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-		Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
-		Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
-		Me.TableLayoutPanel1.Location = New System.Drawing.Point(309, 161)
-		Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
-		Me.TableLayoutPanel1.RowCount = 1
-		Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-		Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
-		Me.TableLayoutPanel1.TabIndex = 4
-		'
-		'OK_Button
-		'
-		Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
-		Me.OK_Button.Location = New System.Drawing.Point(3, 3)
-		Me.OK_Button.Name = "OK_Button"
-		Me.OK_Button.Size = New System.Drawing.Size(67, 23)
-		Me.OK_Button.TabIndex = 0
-		Me.OK_Button.Text = "OK"
-		'
-		'Cancel_Button
-		'
-		Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
-		Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
-		Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
-		Me.Cancel_Button.Name = "Cancel_Button"
-		Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
-		Me.Cancel_Button.TabIndex = 1
-		Me.Cancel_Button.Text = "Cancel"
-		'
-		'Label1
-		'
-		Me.Label1.AutoSize = True
-		Me.Label1.Location = New System.Drawing.Point(3, 3)
-		Me.Label1.Name = "Label1"
-		Me.Label1.Size = New System.Drawing.Size(96, 13)
-		Me.Label1.TabIndex = 1
-		Me.Label1.Text = "Relative Axle Load"
-		'
-		'TbAxleShare
-		'
-		Me.TbAxleShare.Location = New System.Drawing.Point(105, 0)
-		Me.TbAxleShare.Name = "TbAxleShare"
-		Me.TbAxleShare.Size = New System.Drawing.Size(84, 20)
-		Me.TbAxleShare.TabIndex = 0
-		'
-		'Label2
-		'
-		Me.Label2.AutoSize = True
-		Me.Label2.Location = New System.Drawing.Point(195, 3)
-		Me.Label2.Name = "Label2"
-		Me.Label2.Size = New System.Drawing.Size(40, 13)
-		Me.Label2.TabIndex = 1
-		Me.Label2.Text = "[-][0..1]"
-		'
-		'Label3
-		'
-		Me.Label3.AutoSize = True
-		Me.Label3.Location = New System.Drawing.Point(55, 94)
-		Me.Label3.Name = "Label3"
-		Me.Label3.Size = New System.Drawing.Size(51, 13)
-		Me.Label3.TabIndex = 1
-		Me.Label3.Text = "RRC ISO"
-		'
-		'Label4
-		'
-		Me.Label4.AutoSize = True
-		Me.Label4.Location = New System.Drawing.Point(202, 66)
-		Me.Label4.Name = "Label4"
-		Me.Label4.Size = New System.Drawing.Size(16, 13)
-		Me.Label4.TabIndex = 1
-		Me.Label4.Text = "[-]"
-		'
-		'TbRRC
-		'
-		Me.TbRRC.Location = New System.Drawing.Point(112, 91)
-		Me.TbRRC.Name = "TbRRC"
-		Me.TbRRC.Size = New System.Drawing.Size(84, 20)
-		Me.TbRRC.TabIndex = 2
-		'
-		'Label5
-		'
-		Me.Label5.AutoSize = True
-		Me.Label5.Location = New System.Drawing.Point(67, 120)
-		Me.Label5.Name = "Label5"
-		Me.Label5.Size = New System.Drawing.Size(39, 13)
-		Me.Label5.TabIndex = 1
-		Me.Label5.Text = "Fz ISO"
-		'
-		'Label6
-		'
-		Me.Label6.AutoSize = True
-		Me.Label6.Location = New System.Drawing.Point(202, 120)
-		Me.Label6.Name = "Label6"
-		Me.Label6.Size = New System.Drawing.Size(21, 13)
-		Me.Label6.TabIndex = 1
-		Me.Label6.Text = "[N]"
-		'
-		'TbFzISO
-		'
-		Me.TbFzISO.Location = New System.Drawing.Point(112, 117)
-		Me.TbFzISO.Name = "TbFzISO"
-		Me.TbFzISO.Size = New System.Drawing.Size(84, 20)
-		Me.TbFzISO.TabIndex = 3
-		'
-		'Label9
-		'
-		Me.Label9.AutoSize = True
-		Me.Label9.Location = New System.Drawing.Point(248, 94)
-		Me.Label9.Name = "Label9"
-		Me.Label9.Size = New System.Drawing.Size(146, 13)
-		Me.Label9.TabIndex = 1
-		Me.Label9.Text = "RRC according to ISO 28580"
-		'
-		'Label10
-		'
-		Me.Label10.AutoSize = True
-		Me.Label10.Location = New System.Drawing.Point(248, 117)
-		Me.Label10.Name = "Label10"
-		Me.Label10.Size = New System.Drawing.Size(167, 26)
-		Me.Label10.TabIndex = 1
-		Me.Label10.Text = "Test load according to ISO 28580" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(85% of max. tyre load capacity)"
-		'
-		'CbTwinT
-		'
-		Me.CbTwinT.AutoSize = True
-		Me.CbTwinT.Location = New System.Drawing.Point(285, 39)
-		Me.CbTwinT.Name = "CbTwinT"
-		Me.CbTwinT.Size = New System.Drawing.Size(78, 17)
-		Me.CbTwinT.TabIndex = 1
-		Me.CbTwinT.Text = "Twin Tyres"
-		Me.CbTwinT.UseVisualStyleBackColor = True
-		'
-		'PnAxle
-		'
-		Me.PnAxle.Controls.Add(Me.TbI_wheels)
-		Me.PnAxle.Controls.Add(Me.Label1)
-		Me.PnAxle.Controls.Add(Me.Label7)
-		Me.PnAxle.Controls.Add(Me.Label2)
-		Me.PnAxle.Controls.Add(Me.Label32)
-		Me.PnAxle.Controls.Add(Me.TbAxleShare)
-		Me.PnAxle.Location = New System.Drawing.Point(7, 65)
-		Me.PnAxle.Name = "PnAxle"
-		Me.PnAxle.Size = New System.Drawing.Size(450, 23)
-		Me.PnAxle.TabIndex = 5
-		'
-		'TbI_wheels
-		'
-		Me.TbI_wheels.Location = New System.Drawing.Point(322, 0)
-		Me.TbI_wheels.Name = "TbI_wheels"
-		Me.TbI_wheels.Size = New System.Drawing.Size(84, 20)
-		Me.TbI_wheels.TabIndex = 26
-		'
-		'Label7
-		'
-		Me.Label7.AutoSize = True
-		Me.Label7.Location = New System.Drawing.Point(241, 3)
-		Me.Label7.Name = "Label7"
-		Me.Label7.Size = New System.Drawing.Size(75, 13)
-		Me.Label7.TabIndex = 25
-		Me.Label7.Text = "Wheels Inertia"
-		'
-		'Label32
-		'
-		Me.Label32.AutoSize = True
-		Me.Label32.Location = New System.Drawing.Point(412, 3)
-		Me.Label32.Name = "Label32"
-		Me.Label32.Size = New System.Drawing.Size(36, 13)
-		Me.Label32.TabIndex = 27
-		Me.Label32.Text = "[kgm²]"
-		'
-		'Label8
-		'
-		Me.Label8.AutoSize = True
-		Me.Label8.Location = New System.Drawing.Point(4, 13)
-		Me.Label8.Name = "Label8"
-		Me.Label8.Size = New System.Drawing.Size(80, 13)
-		Me.Label8.TabIndex = 6
-		Me.Label8.Text = "Tyre Dimension"
-		'
-		'CbWheels
-		'
-		Me.CbWheels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.CbWheels.FormattingEnabled = True
-		Me.CbWheels.Location = New System.Drawing.Point(90, 10)
-		Me.CbWheels.Name = "CbWheels"
-		Me.CbWheels.Size = New System.Drawing.Size(176, 21)
-		Me.CbWheels.TabIndex = 7
-		'
-		'cbAxleType
-		'
-		Me.cbAxleType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.cbAxleType.FormattingEnabled = True
-		Me.cbAxleType.Location = New System.Drawing.Point(90, 37)
-		Me.cbAxleType.Name = "cbAxleType"
-		Me.cbAxleType.Size = New System.Drawing.Size(176, 21)
-		Me.cbAxleType.TabIndex = 8
-		'
-		'Label11
-		'
-		Me.Label11.AutoSize = True
-		Me.Label11.Location = New System.Drawing.Point(4, 40)
-		Me.Label11.Name = "Label11"
-		Me.Label11.Size = New System.Drawing.Size(69, 13)
-		Me.Label11.TabIndex = 9
-		Me.Label11.Text = "Configuration"
-		'
-		'Label12
-		'
-		Me.Label12.AutoSize = True
-		Me.Label12.Location = New System.Drawing.Point(202, 94)
-		Me.Label12.Name = "Label12"
-		Me.Label12.Size = New System.Drawing.Size(16, 13)
-		Me.Label12.TabIndex = 10
-		Me.Label12.Text = "[-]"
-		'
-		'VehicleAxleDialog
-		'
-		Me.AcceptButton = Me.OK_Button
-		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-		Me.CancelButton = Me.Cancel_Button
-		Me.ClientSize = New System.Drawing.Size(467, 202)
-		Me.Controls.Add(Me.Label12)
-		Me.Controls.Add(Me.Label11)
-		Me.Controls.Add(Me.cbAxleType)
-		Me.Controls.Add(Me.CbWheels)
-		Me.Controls.Add(Me.Label8)
-		Me.Controls.Add(Me.PnAxle)
-		Me.Controls.Add(Me.CbTwinT)
-		Me.Controls.Add(Me.TbFzISO)
-		Me.Controls.Add(Me.Label6)
-		Me.Controls.Add(Me.TbRRC)
-		Me.Controls.Add(Me.Label4)
-		Me.Controls.Add(Me.Label10)
-		Me.Controls.Add(Me.Label5)
-		Me.Controls.Add(Me.Label9)
-		Me.Controls.Add(Me.Label3)
-		Me.Controls.Add(Me.TableLayoutPanel1)
-		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
-		Me.MaximizeBox = False
-		Me.MinimizeBox = False
-		Me.Name = "VehicleAxleDialog"
-		Me.ShowInTaskbar = False
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-		Me.Text = "Axle configuration"
-		Me.TableLayoutPanel1.ResumeLayout(False)
-		Me.PnAxle.ResumeLayout(False)
-		Me.PnAxle.PerformLayout()
-		Me.ResumeLayout(False)
-		Me.PerformLayout()
+        Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+        Me.OK_Button = New System.Windows.Forms.Button()
+        Me.Cancel_Button = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.TbAxleShare = New System.Windows.Forms.TextBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.TbRRC = New System.Windows.Forms.TextBox()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.TbFzISO = New System.Windows.Forms.TextBox()
+        Me.Label9 = New System.Windows.Forms.Label()
+        Me.Label10 = New System.Windows.Forms.Label()
+        Me.CbTwinT = New System.Windows.Forms.CheckBox()
+        Me.PnAxle = New System.Windows.Forms.Panel()
+        Me.TbI_wheels = New System.Windows.Forms.TextBox()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.Label32 = New System.Windows.Forms.Label()
+        Me.Label8 = New System.Windows.Forms.Label()
+        Me.CbWheels = New System.Windows.Forms.ComboBox()
+        Me.cbAxleType = New System.Windows.Forms.ComboBox()
+        Me.Label11 = New System.Windows.Forms.Label()
+        Me.Label12 = New System.Windows.Forms.Label()
+        Me.TableLayoutPanel1.SuspendLayout
+        Me.PnAxle.SuspendLayout
+        Me.SuspendLayout
+        '
+        'TableLayoutPanel1
+        '
+        Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TableLayoutPanel1.ColumnCount = 2
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+        Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
+        Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(309, 161)
+        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+        Me.TableLayoutPanel1.RowCount = 1
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+        Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
+        Me.TableLayoutPanel1.TabIndex = 6
+        '
+        'OK_Button
+        '
+        Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.OK_Button.Location = New System.Drawing.Point(3, 3)
+        Me.OK_Button.Name = "OK_Button"
+        Me.OK_Button.Size = New System.Drawing.Size(67, 23)
+        Me.OK_Button.TabIndex = 6
+        Me.OK_Button.Text = "OK"
+        '
+        'Cancel_Button
+        '
+        Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
+        Me.Cancel_Button.Name = "Cancel_Button"
+        Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
+        Me.Cancel_Button.TabIndex = 7
+        Me.Cancel_Button.Text = "Cancel"
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = true
+        Me.Label1.Location = New System.Drawing.Point(3, 3)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(96, 13)
+        Me.Label1.TabIndex = 1
+        Me.Label1.Text = "Relative Axle Load"
+        '
+        'TbAxleShare
+        '
+        Me.TbAxleShare.Location = New System.Drawing.Point(105, 0)
+        Me.TbAxleShare.Name = "TbAxleShare"
+        Me.TbAxleShare.Size = New System.Drawing.Size(84, 20)
+        Me.TbAxleShare.TabIndex = 0
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = true
+        Me.Label2.Location = New System.Drawing.Point(195, 3)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(40, 13)
+        Me.Label2.TabIndex = 1
+        Me.Label2.Text = "[-][0..1]"
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = true
+        Me.Label3.Location = New System.Drawing.Point(55, 94)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(51, 13)
+        Me.Label3.TabIndex = 1
+        Me.Label3.Text = "RRC ISO"
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = true
+        Me.Label4.Location = New System.Drawing.Point(202, 66)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(16, 13)
+        Me.Label4.TabIndex = 1
+        Me.Label4.Text = "[-]"
+        '
+        'TbRRC
+        '
+        Me.TbRRC.Location = New System.Drawing.Point(112, 91)
+        Me.TbRRC.Name = "TbRRC"
+        Me.TbRRC.Size = New System.Drawing.Size(84, 20)
+        Me.TbRRC.TabIndex = 4
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = true
+        Me.Label5.Location = New System.Drawing.Point(67, 120)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(39, 13)
+        Me.Label5.TabIndex = 1
+        Me.Label5.Text = "Fz ISO"
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = true
+        Me.Label6.Location = New System.Drawing.Point(202, 120)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(21, 13)
+        Me.Label6.TabIndex = 1
+        Me.Label6.Text = "[N]"
+        '
+        'TbFzISO
+        '
+        Me.TbFzISO.Location = New System.Drawing.Point(112, 117)
+        Me.TbFzISO.Name = "TbFzISO"
+        Me.TbFzISO.Size = New System.Drawing.Size(84, 20)
+        Me.TbFzISO.TabIndex = 5
+        '
+        'Label9
+        '
+        Me.Label9.AutoSize = true
+        Me.Label9.Location = New System.Drawing.Point(248, 94)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(146, 13)
+        Me.Label9.TabIndex = 1
+        Me.Label9.Text = "RRC according to ISO 28580"
+        '
+        'Label10
+        '
+        Me.Label10.AutoSize = true
+        Me.Label10.Location = New System.Drawing.Point(248, 117)
+        Me.Label10.Name = "Label10"
+        Me.Label10.Size = New System.Drawing.Size(167, 26)
+        Me.Label10.TabIndex = 1
+        Me.Label10.Text = "Test load according to ISO 28580"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"(85% of max. tyre load capacity)"
+        '
+        'CbTwinT
+        '
+        Me.CbTwinT.AutoSize = true
+        Me.CbTwinT.Location = New System.Drawing.Point(285, 39)
+        Me.CbTwinT.Name = "CbTwinT"
+        Me.CbTwinT.Size = New System.Drawing.Size(78, 17)
+        Me.CbTwinT.TabIndex = 2
+        Me.CbTwinT.Text = "Twin Tyres"
+        Me.CbTwinT.UseVisualStyleBackColor = true
+        '
+        'PnAxle
+        '
+        Me.PnAxle.Controls.Add(Me.TbI_wheels)
+        Me.PnAxle.Controls.Add(Me.Label1)
+        Me.PnAxle.Controls.Add(Me.Label7)
+        Me.PnAxle.Controls.Add(Me.Label2)
+        Me.PnAxle.Controls.Add(Me.Label32)
+        Me.PnAxle.Controls.Add(Me.TbAxleShare)
+        Me.PnAxle.Location = New System.Drawing.Point(7, 65)
+        Me.PnAxle.Name = "PnAxle"
+        Me.PnAxle.Size = New System.Drawing.Size(450, 23)
+        Me.PnAxle.TabIndex = 3
+        '
+        'TbI_wheels
+        '
+        Me.TbI_wheels.Location = New System.Drawing.Point(322, 0)
+        Me.TbI_wheels.Name = "TbI_wheels"
+        Me.TbI_wheels.Size = New System.Drawing.Size(84, 20)
+        Me.TbI_wheels.TabIndex = 1
+        '
+        'Label7
+        '
+        Me.Label7.AutoSize = true
+        Me.Label7.Location = New System.Drawing.Point(241, 3)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(75, 13)
+        Me.Label7.TabIndex = 25
+        Me.Label7.Text = "Wheels Inertia"
+        '
+        'Label32
+        '
+        Me.Label32.AutoSize = true
+        Me.Label32.Location = New System.Drawing.Point(412, 3)
+        Me.Label32.Name = "Label32"
+        Me.Label32.Size = New System.Drawing.Size(36, 13)
+        Me.Label32.TabIndex = 27
+        Me.Label32.Text = "[kgm²]"
+        '
+        'Label8
+        '
+        Me.Label8.AutoSize = true
+        Me.Label8.Location = New System.Drawing.Point(4, 13)
+        Me.Label8.Name = "Label8"
+        Me.Label8.Size = New System.Drawing.Size(80, 13)
+        Me.Label8.TabIndex = 6
+        Me.Label8.Text = "Tyre Dimension"
+        '
+        'CbWheels
+        '
+        Me.CbWheels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.CbWheels.FormattingEnabled = true
+        Me.CbWheels.Location = New System.Drawing.Point(90, 10)
+        Me.CbWheels.Name = "CbWheels"
+        Me.CbWheels.Size = New System.Drawing.Size(176, 21)
+        Me.CbWheels.TabIndex = 0
+        '
+        'cbAxleType
+        '
+        Me.cbAxleType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cbAxleType.FormattingEnabled = true
+        Me.cbAxleType.Location = New System.Drawing.Point(90, 37)
+        Me.cbAxleType.Name = "cbAxleType"
+        Me.cbAxleType.Size = New System.Drawing.Size(176, 21)
+        Me.cbAxleType.TabIndex = 1
+        '
+        'Label11
+        '
+        Me.Label11.AutoSize = true
+        Me.Label11.Location = New System.Drawing.Point(4, 40)
+        Me.Label11.Name = "Label11"
+        Me.Label11.Size = New System.Drawing.Size(69, 13)
+        Me.Label11.TabIndex = 9
+        Me.Label11.Text = "Configuration"
+        '
+        'Label12
+        '
+        Me.Label12.AutoSize = true
+        Me.Label12.Location = New System.Drawing.Point(202, 94)
+        Me.Label12.Name = "Label12"
+        Me.Label12.Size = New System.Drawing.Size(16, 13)
+        Me.Label12.TabIndex = 10
+        Me.Label12.Text = "[-]"
+        '
+        'VehicleAxleDialog
+        '
+        Me.AcceptButton = Me.OK_Button
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.CancelButton = Me.Cancel_Button
+        Me.ClientSize = New System.Drawing.Size(467, 202)
+        Me.Controls.Add(Me.Label12)
+        Me.Controls.Add(Me.Label11)
+        Me.Controls.Add(Me.cbAxleType)
+        Me.Controls.Add(Me.CbWheels)
+        Me.Controls.Add(Me.Label8)
+        Me.Controls.Add(Me.PnAxle)
+        Me.Controls.Add(Me.CbTwinT)
+        Me.Controls.Add(Me.TbFzISO)
+        Me.Controls.Add(Me.Label6)
+        Me.Controls.Add(Me.TbRRC)
+        Me.Controls.Add(Me.Label4)
+        Me.Controls.Add(Me.Label10)
+        Me.Controls.Add(Me.Label5)
+        Me.Controls.Add(Me.Label9)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.TableLayoutPanel1)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+        Me.MaximizeBox = false
+        Me.MinimizeBox = false
+        Me.Name = "VehicleAxleDialog"
+        Me.ShowInTaskbar = false
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Axle configuration"
+        Me.TableLayoutPanel1.ResumeLayout(false)
+        Me.PnAxle.ResumeLayout(false)
+        Me.PnAxle.PerformLayout
+        Me.ResumeLayout(false)
+        Me.PerformLayout
 
-	End Sub
+End Sub
 	Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
 	Friend WithEvents OK_Button As Button
 	Friend WithEvents Cancel_Button As Button
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index 958e40bb6ee1a86ec3a742613c16eadf37a73f0d..5d94cf6ae1a7ad210b86d50df57e2d2283c84a09 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -320,7 +320,7 @@ Partial Class VehicleForm
         Me.ButOK.Location = New System.Drawing.Point(498, 577)
         Me.ButOK.Name = "ButOK"
         Me.ButOK.Size = New System.Drawing.Size(75, 23)
-        Me.ButOK.TabIndex = 5
+        Me.ButOK.TabIndex = 6
         Me.ButOK.Text = "Save"
         Me.ButOK.UseVisualStyleBackColor = true
         '
@@ -331,7 +331,7 @@ Partial Class VehicleForm
         Me.ButCancel.Location = New System.Drawing.Point(579, 577)
         Me.ButCancel.Name = "ButCancel"
         Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-        Me.ButCancel.TabIndex = 6
+        Me.ButCancel.TabIndex = 7
         Me.ButCancel.Text = "Cancel"
         Me.ButCancel.UseVisualStyleBackColor = true
         '
@@ -402,7 +402,7 @@ Partial Class VehicleForm
         Me.GroupBox6.Location = New System.Drawing.Point(290, 84)
         Me.GroupBox6.Name = "GroupBox6"
         Me.GroupBox6.Size = New System.Drawing.Size(281, 96)
-        Me.GroupBox6.TabIndex = 5
+        Me.GroupBox6.TabIndex = 3
         Me.GroupBox6.TabStop = false
         Me.GroupBox6.Text = "Cross Wind Correction"
         '
@@ -415,7 +415,6 @@ Partial Class VehicleForm
         Me.BtCdFileOpen.Name = "BtCdFileOpen"
         Me.BtCdFileOpen.Size = New System.Drawing.Size(24, 24)
         Me.BtCdFileOpen.TabIndex = 3
-        Me.BtCdFileOpen.TabStop = false
         Me.BtCdFileOpen.UseVisualStyleBackColor = true
         '
         'LbCdMode
@@ -516,7 +515,7 @@ Partial Class VehicleForm
         Me.GroupBox7.Location = New System.Drawing.Point(6, 76)
         Me.GroupBox7.Name = "GroupBox7"
         Me.GroupBox7.Size = New System.Drawing.Size(279, 111)
-        Me.GroupBox7.TabIndex = 3
+        Me.GroupBox7.TabIndex = 1
         Me.GroupBox7.TabStop = false
         Me.GroupBox7.Text = "Retarder Losses"
         '
@@ -549,7 +548,7 @@ Partial Class VehicleForm
         Me.BtRtBrowse.Location = New System.Drawing.Point(236, 39)
         Me.BtRtBrowse.Name = "BtRtBrowse"
         Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24)
-        Me.BtRtBrowse.TabIndex = 14
+        Me.BtRtBrowse.TabIndex = 2
         Me.BtRtBrowse.UseVisualStyleBackColor = true
         '
         'TbRtPath
@@ -558,7 +557,7 @@ Partial Class VehicleForm
         Me.TbRtPath.Location = New System.Drawing.Point(6, 41)
         Me.TbRtPath.Name = "TbRtPath"
         Me.TbRtPath.Size = New System.Drawing.Size(224, 20)
-        Me.TbRtPath.TabIndex = 13
+        Me.TbRtPath.TabIndex = 1
         '
         'Label45
         '
@@ -575,7 +574,7 @@ Partial Class VehicleForm
         Me.LbRtRatio.Location = New System.Drawing.Point(4, 5)
         Me.LbRtRatio.Name = "LbRtRatio"
         Me.LbRtRatio.Size = New System.Drawing.Size(167, 17)
-        Me.LbRtRatio.TabIndex = 5
+        Me.LbRtRatio.TabIndex = 1
         Me.LbRtRatio.Text = "Ratio"
         Me.LbRtRatio.TextAlign = System.Drawing.ContentAlignment.TopRight
         '
@@ -631,7 +630,7 @@ Partial Class VehicleForm
         Me.GroupBox8.Location = New System.Drawing.Point(6, 186)
         Me.GroupBox8.Name = "GroupBox8"
         Me.GroupBox8.Size = New System.Drawing.Size(564, 151)
-        Me.GroupBox8.TabIndex = 2
+        Me.GroupBox8.TabIndex = 4
         Me.GroupBox8.TabStop = false
         Me.GroupBox8.Text = "Axles / Wheels"
         '
@@ -727,7 +726,7 @@ Partial Class VehicleForm
         Me.PnWheelDiam.Location = New System.Drawing.Point(3, 16)
         Me.PnWheelDiam.Name = "PnWheelDiam"
         Me.PnWheelDiam.Size = New System.Drawing.Size(272, 31)
-        Me.PnWheelDiam.TabIndex = 5
+        Me.PnWheelDiam.TabIndex = 0
         '
         'CbAxleConfig
         '
@@ -834,7 +833,7 @@ Partial Class VehicleForm
         Me.GrAirRes.Location = New System.Drawing.Point(290, 6)
         Me.GrAirRes.Name = "GrAirRes"
         Me.GrAirRes.Size = New System.Drawing.Size(280, 72)
-        Me.GrAirRes.TabIndex = 1
+        Me.GrAirRes.TabIndex = 2
         Me.GrAirRes.TabStop = false
         Me.GrAirRes.Text = "Air Resistance"
         '
@@ -857,7 +856,7 @@ Partial Class VehicleForm
         Me.tbVehicleHeight.Location = New System.Drawing.Point(119, 29)
         Me.tbVehicleHeight.Name = "tbVehicleHeight"
         Me.tbVehicleHeight.Size = New System.Drawing.Size(57, 20)
-        Me.tbVehicleHeight.TabIndex = 25
+        Me.tbVehicleHeight.TabIndex = 1
         '
         'Label11
         '
@@ -922,7 +921,7 @@ Partial Class VehicleForm
         Me.GroupBox3.Location = New System.Drawing.Point(6, 130)
         Me.GroupBox3.Name = "GroupBox3"
         Me.GroupBox3.Size = New System.Drawing.Size(278, 50)
-        Me.GroupBox3.TabIndex = 6
+        Me.GroupBox3.TabIndex = 1
         Me.GroupBox3.TabStop = false
         Me.GroupBox3.Text = "Dynamic Tyre Radius"
         '
@@ -933,7 +932,7 @@ Partial Class VehicleForm
         Me.GroupBox2.Location = New System.Drawing.Point(291, 76)
         Me.GroupBox2.Name = "GroupBox2"
         Me.GroupBox2.Size = New System.Drawing.Size(282, 111)
-        Me.GroupBox2.TabIndex = 4
+        Me.GroupBox2.TabIndex = 3
         Me.GroupBox2.TabStop = false
         Me.GroupBox2.Text = "Angledrive"
         '
@@ -948,7 +947,7 @@ Partial Class VehicleForm
         Me.pnAngledriveFields.Location = New System.Drawing.Point(3, 42)
         Me.pnAngledriveFields.Name = "pnAngledriveFields"
         Me.pnAngledriveFields.Size = New System.Drawing.Size(272, 63)
-        Me.pnAngledriveFields.TabIndex = 6
+        Me.pnAngledriveFields.TabIndex = 1
         '
         'Label4
         '
@@ -984,7 +983,7 @@ Partial Class VehicleForm
         Me.tbAngledriveRatio.Location = New System.Drawing.Point(188, 4)
         Me.tbAngledriveRatio.Name = "tbAngledriveRatio"
         Me.tbAngledriveRatio.Size = New System.Drawing.Size(56, 20)
-        Me.tbAngledriveRatio.TabIndex = 12
+        Me.tbAngledriveRatio.TabIndex = 0
         '
         'btAngledriveLossMapBrowse
         '
@@ -993,7 +992,7 @@ Partial Class VehicleForm
         Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(245, 39)
         Me.btAngledriveLossMapBrowse.Name = "btAngledriveLossMapBrowse"
         Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(24, 24)
-        Me.btAngledriveLossMapBrowse.TabIndex = 14
+        Me.btAngledriveLossMapBrowse.TabIndex = 2
         Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = true
         '
         'tbAngledriveLossMapPath
@@ -1002,7 +1001,7 @@ Partial Class VehicleForm
         Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(6, 41)
         Me.tbAngledriveLossMapPath.Name = "tbAngledriveLossMapPath"
         Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(239, 20)
-        Me.tbAngledriveLossMapPath.TabIndex = 13
+        Me.tbAngledriveLossMapPath.TabIndex = 1
         '
         'cbAngledriveType
         '
@@ -1047,7 +1046,7 @@ Partial Class VehicleForm
         Me.tbPTOCycle.Location = New System.Drawing.Point(6, 71)
         Me.tbPTOCycle.Name = "tbPTOCycle"
         Me.tbPTOCycle.Size = New System.Drawing.Size(239, 20)
-        Me.tbPTOCycle.TabIndex = 16
+        Me.tbPTOCycle.TabIndex = 2
         Me.ToolTip1.SetToolTip(Me.tbPTOCycle, "PTO Consumer Loss Map")
         '
         'tbPTOLossMap
@@ -1055,7 +1054,7 @@ Partial Class VehicleForm
         Me.tbPTOLossMap.Location = New System.Drawing.Point(6, 24)
         Me.tbPTOLossMap.Name = "tbPTOLossMap"
         Me.tbPTOLossMap.Size = New System.Drawing.Size(239, 20)
-        Me.tbPTOLossMap.TabIndex = 13
+        Me.tbPTOLossMap.TabIndex = 0
         Me.ToolTip1.SetToolTip(Me.tbPTOLossMap, "PTO Consumer Loss Map")
         '
         'tbPTODrive
@@ -1063,7 +1062,7 @@ Partial Class VehicleForm
         Me.tbPTODrive.Location = New System.Drawing.Point(6, 183)
         Me.tbPTODrive.Name = "tbPTODrive"
         Me.tbPTODrive.Size = New System.Drawing.Size(239, 20)
-        Me.tbPTODrive.TabIndex = 19
+        Me.tbPTODrive.TabIndex = 5
         Me.ToolTip1.SetToolTip(Me.tbPTODrive, "PTO Consumer Loss Map")
         '
         'tcVehicleComponents
@@ -1078,7 +1077,7 @@ Partial Class VehicleForm
         Me.tcVehicleComponents.Name = "tcVehicleComponents"
         Me.tcVehicleComponents.SelectedIndex = 0
         Me.tcVehicleComponents.Size = New System.Drawing.Size(656, 400)
-        Me.tcVehicleComponents.TabIndex = 40
+        Me.tcVehicleComponents.TabIndex = 5
         '
         'tpGeneral
         '
@@ -1115,7 +1114,7 @@ Partial Class VehicleForm
         Me.GroupBox4.Location = New System.Drawing.Point(6, 7)
         Me.GroupBox4.Name = "GroupBox4"
         Me.GroupBox4.Size = New System.Drawing.Size(279, 63)
-        Me.GroupBox4.TabIndex = 6
+        Me.GroupBox4.TabIndex = 0
         Me.GroupBox4.TabStop = false
         Me.GroupBox4.Text = "Vehicle Idling Speed"
         '
@@ -1162,7 +1161,7 @@ Partial Class VehicleForm
         Me.GroupBox9.Location = New System.Drawing.Point(306, 7)
         Me.GroupBox9.Name = "GroupBox9"
         Me.GroupBox9.Size = New System.Drawing.Size(264, 63)
-        Me.GroupBox9.TabIndex = 5
+        Me.GroupBox9.TabIndex = 2
         Me.GroupBox9.TabStop = false
         Me.GroupBox9.Text = "Tank System"
         '
@@ -1208,7 +1207,7 @@ Partial Class VehicleForm
         Me.gbBattery.Location = New System.Drawing.Point(6, 175)
         Me.gbBattery.Name = "gbBattery"
         Me.gbBattery.Size = New System.Drawing.Size(633, 187)
-        Me.gbBattery.TabIndex = 27
+        Me.gbBattery.TabIndex = 2
         Me.gbBattery.TabStop = false
         Me.gbBattery.Text = "Electric Energy Storage system"
         '
@@ -1250,7 +1249,7 @@ Partial Class VehicleForm
         Me.btnAddReessPack.Location = New System.Drawing.Point(6, 153)
         Me.btnAddReessPack.Name = "btnAddReessPack"
         Me.btnAddReessPack.Size = New System.Drawing.Size(24, 24)
-        Me.btnAddReessPack.TabIndex = 28
+        Me.btnAddReessPack.TabIndex = 1
         Me.btnAddReessPack.UseVisualStyleBackColor = true
         '
         'lblEditReessPack
@@ -1268,7 +1267,7 @@ Partial Class VehicleForm
         Me.btnRemoveReessPack.Location = New System.Drawing.Point(33, 153)
         Me.btnRemoveReessPack.Name = "btnRemoveReessPack"
         Me.btnRemoveReessPack.Size = New System.Drawing.Size(24, 24)
-        Me.btnRemoveReessPack.TabIndex = 29
+        Me.btnRemoveReessPack.TabIndex = 2
         Me.btnRemoveReessPack.UseVisualStyleBackColor = true
         '
         'lblInitialSoCUnit
@@ -1285,7 +1284,7 @@ Partial Class VehicleForm
         Me.tbInitialSoC.Location = New System.Drawing.Point(204, 19)
         Me.tbInitialSoC.Name = "tbInitialSoC"
         Me.tbInitialSoC.Size = New System.Drawing.Size(59, 20)
-        Me.tbInitialSoC.TabIndex = 26
+        Me.tbInitialSoC.TabIndex = 0
         '
         'lblInitialSoC
         '
@@ -1326,7 +1325,7 @@ Partial Class VehicleForm
         Me.gbRatiosPerGear.Location = New System.Drawing.Point(444, 12)
         Me.gbRatiosPerGear.Name = "gbRatiosPerGear"
         Me.gbRatiosPerGear.Size = New System.Drawing.Size(181, 145)
-        Me.gbRatiosPerGear.TabIndex = 29
+        Me.gbRatiosPerGear.TabIndex = 1
         Me.gbRatiosPerGear.TabStop = false
         Me.gbRatiosPerGear.Text = "Transmission Ratio per Gear"
         '
@@ -1391,7 +1390,7 @@ Partial Class VehicleForm
         Me.btnEmADCLossMap.Location = New System.Drawing.Point(414, 127)
         Me.btnEmADCLossMap.Name = "btnEmADCLossMap"
         Me.btnEmADCLossMap.Size = New System.Drawing.Size(24, 24)
-        Me.btnEmADCLossMap.TabIndex = 28
+        Me.btnEmADCLossMap.TabIndex = 5
         Me.btnEmADCLossMap.UseVisualStyleBackColor = true
         '
         'tbEmADCLossMap
@@ -1399,7 +1398,7 @@ Partial Class VehicleForm
         Me.tbEmADCLossMap.Location = New System.Drawing.Point(204, 131)
         Me.tbEmADCLossMap.Name = "tbEmADCLossMap"
         Me.tbEmADCLossMap.Size = New System.Drawing.Size(202, 20)
-        Me.tbEmADCLossMap.TabIndex = 26
+        Me.tbEmADCLossMap.TabIndex = 4
         '
         'lblEmADCLossmap
         '
@@ -1415,7 +1414,7 @@ Partial Class VehicleForm
         Me.tbRatioEm.Location = New System.Drawing.Point(204, 105)
         Me.tbRatioEm.Name = "tbRatioEm"
         Me.tbRatioEm.Size = New System.Drawing.Size(59, 20)
-        Me.tbRatioEm.TabIndex = 24
+        Me.tbRatioEm.TabIndex = 3
         '
         'lblRatioEm
         '
@@ -1431,7 +1430,7 @@ Partial Class VehicleForm
         Me.tbEmCount.Location = New System.Drawing.Point(204, 79)
         Me.tbEmCount.Name = "tbEmCount"
         Me.tbEmCount.Size = New System.Drawing.Size(59, 20)
-        Me.tbEmCount.TabIndex = 22
+        Me.tbEmCount.TabIndex = 2
         '
         'cbEmPos
         '
@@ -1439,7 +1438,7 @@ Partial Class VehicleForm
         Me.cbEmPos.Location = New System.Drawing.Point(142, 52)
         Me.cbEmPos.Name = "cbEmPos"
         Me.cbEmPos.Size = New System.Drawing.Size(121, 21)
-        Me.cbEmPos.TabIndex = 21
+        Me.cbEmPos.TabIndex = 1
         '
         'lblEmCount
         '
@@ -1467,7 +1466,7 @@ Partial Class VehicleForm
         Me.pnElectricMotor.Location = New System.Drawing.Point(6, 19)
         Me.pnElectricMotor.Name = "pnElectricMotor"
         Me.pnElectricMotor.Size = New System.Drawing.Size(432, 27)
-        Me.pnElectricMotor.TabIndex = 18
+        Me.pnElectricMotor.TabIndex = 0
         '
         'btnOpenElectricMotor
         '
@@ -1475,7 +1474,6 @@ Partial Class VehicleForm
         Me.btnOpenElectricMotor.Name = "btnOpenElectricMotor"
         Me.btnOpenElectricMotor.Size = New System.Drawing.Size(94, 21)
         Me.btnOpenElectricMotor.TabIndex = 0
-        Me.btnOpenElectricMotor.TabStop = false
         Me.btnOpenElectricMotor.Text = "Electric Motor"
         Me.btnOpenElectricMotor.UseVisualStyleBackColor = true
         '
@@ -1487,7 +1485,6 @@ Partial Class VehicleForm
         Me.btnBrowseElectricMotor.Name = "btnBrowseElectricMotor"
         Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(24, 24)
         Me.btnBrowseElectricMotor.TabIndex = 2
-        Me.btnBrowseElectricMotor.TabStop = false
         Me.btnBrowseElectricMotor.UseVisualStyleBackColor = true
         '
         'tbElectricMotor
@@ -1506,7 +1503,7 @@ Partial Class VehicleForm
         Me.tpTorqueLimits.Controls.Add(Me.bgVehicleTorqueLimits)
         Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 22)
         Me.tpTorqueLimits.Name = "tpTorqueLimits"
-        Me.tpTorqueLimits.Size = New System.Drawing.Size(648, 655)
+        Me.tpTorqueLimits.Size = New System.Drawing.Size(648, 374)
         Me.tpTorqueLimits.TabIndex = 2
         Me.tpTorqueLimits.Text = "Torque Limits"
         Me.tpTorqueLimits.UseVisualStyleBackColor = true
@@ -1518,7 +1515,7 @@ Partial Class VehicleForm
         Me.gbPropulsionTorque.Location = New System.Drawing.Point(3, 236)
         Me.gbPropulsionTorque.Name = "gbPropulsionTorque"
         Me.gbPropulsionTorque.Size = New System.Drawing.Size(407, 52)
-        Me.gbPropulsionTorque.TabIndex = 17
+        Me.gbPropulsionTorque.TabIndex = 2
         Me.gbPropulsionTorque.TabStop = false
         Me.gbPropulsionTorque.Text = "Propulsion Torque Limit"
         '
@@ -1528,7 +1525,7 @@ Partial Class VehicleForm
         Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(331, 17)
         Me.btnPropulsionTorqueLimit.Name = "btnPropulsionTorqueLimit"
         Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(24, 24)
-        Me.btnPropulsionTorqueLimit.TabIndex = 16
+        Me.btnPropulsionTorqueLimit.TabIndex = 1
         Me.btnPropulsionTorqueLimit.UseVisualStyleBackColor = true
         '
         'tbPropulsionTorqueLimit
@@ -1536,7 +1533,7 @@ Partial Class VehicleForm
         Me.tbPropulsionTorqueLimit.Location = New System.Drawing.Point(6, 20)
         Me.tbPropulsionTorqueLimit.Name = "tbPropulsionTorqueLimit"
         Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(319, 20)
-        Me.tbPropulsionTorqueLimit.TabIndex = 15
+        Me.tbPropulsionTorqueLimit.TabIndex = 0
         '
         'gbEMTorqueLimits
         '
@@ -1545,7 +1542,7 @@ Partial Class VehicleForm
         Me.gbEMTorqueLimits.Location = New System.Drawing.Point(3, 178)
         Me.gbEMTorqueLimits.Name = "gbEMTorqueLimits"
         Me.gbEMTorqueLimits.Size = New System.Drawing.Size(407, 52)
-        Me.gbEMTorqueLimits.TabIndex = 9
+        Me.gbEMTorqueLimits.TabIndex = 1
         Me.gbEMTorqueLimits.TabStop = false
         Me.gbEMTorqueLimits.Text = "Electric Machine Torque Limits"
         '
@@ -1555,7 +1552,7 @@ Partial Class VehicleForm
         Me.btnEmTorqueLimits.Location = New System.Drawing.Point(331, 17)
         Me.btnEmTorqueLimits.Name = "btnEmTorqueLimits"
         Me.btnEmTorqueLimits.Size = New System.Drawing.Size(24, 24)
-        Me.btnEmTorqueLimits.TabIndex = 16
+        Me.btnEmTorqueLimits.TabIndex = 1
         Me.btnEmTorqueLimits.UseVisualStyleBackColor = true
         '
         'tbEmTorqueLimits
@@ -1563,7 +1560,7 @@ Partial Class VehicleForm
         Me.tbEmTorqueLimits.Location = New System.Drawing.Point(6, 20)
         Me.tbEmTorqueLimits.Name = "tbEmTorqueLimits"
         Me.tbEmTorqueLimits.Size = New System.Drawing.Size(319, 20)
-        Me.tbEmTorqueLimits.TabIndex = 15
+        Me.tbEmTorqueLimits.TabIndex = 0
         '
         'bgVehicleTorqueLimits
         '
@@ -1574,7 +1571,7 @@ Partial Class VehicleForm
         Me.bgVehicleTorqueLimits.Location = New System.Drawing.Point(3, 9)
         Me.bgVehicleTorqueLimits.Name = "bgVehicleTorqueLimits"
         Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(407, 163)
-        Me.bgVehicleTorqueLimits.TabIndex = 8
+        Me.bgVehicleTorqueLimits.TabIndex = 0
         Me.bgVehicleTorqueLimits.TabStop = false
         Me.bgVehicleTorqueLimits.Text = "ICE Torque Limits"
         '
@@ -1638,7 +1635,7 @@ Partial Class VehicleForm
         Me.tpADAS.Location = New System.Drawing.Point(4, 22)
         Me.tpADAS.Name = "tpADAS"
         Me.tpADAS.Padding = New System.Windows.Forms.Padding(3)
-        Me.tpADAS.Size = New System.Drawing.Size(648, 655)
+        Me.tpADAS.Size = New System.Drawing.Size(648, 374)
         Me.tpADAS.TabIndex = 3
         Me.tpADAS.Text = "ADAS"
         Me.tpADAS.UseVisualStyleBackColor = true
@@ -1664,7 +1661,7 @@ Partial Class VehicleForm
         Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(265, 19)
         Me.cbAtEcoRollReleaseLockupClutch.Name = "cbAtEcoRollReleaseLockupClutch"
         Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(243, 17)
-        Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 9
+        Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 3
         Me.cbAtEcoRollReleaseLockupClutch.Text = "AT Gearbox: Eco-Roll Release Lockup Clutch"
         Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = true
         '
@@ -1674,7 +1671,7 @@ Partial Class VehicleForm
         Me.cbPcc.Location = New System.Drawing.Point(18, 104)
         Me.cbPcc.Name = "cbPcc"
         Me.cbPcc.Size = New System.Drawing.Size(179, 21)
-        Me.cbPcc.TabIndex = 8
+        Me.cbPcc.TabIndex = 2
         '
         'cbEcoRoll
         '
@@ -1682,7 +1679,7 @@ Partial Class VehicleForm
         Me.cbEcoRoll.Location = New System.Drawing.Point(18, 58)
         Me.cbEcoRoll.Name = "cbEcoRoll"
         Me.cbEcoRoll.Size = New System.Drawing.Size(179, 21)
-        Me.cbEcoRoll.TabIndex = 7
+        Me.cbEcoRoll.TabIndex = 1
         '
         'Label22
         '
@@ -1699,7 +1696,7 @@ Partial Class VehicleForm
         Me.cbEngineStopStart.Location = New System.Drawing.Point(6, 19)
         Me.cbEngineStopStart.Name = "cbEngineStopStart"
         Me.cbEngineStopStart.Size = New System.Drawing.Size(203, 17)
-        Me.cbEngineStopStart.TabIndex = 4
+        Me.cbEngineStopStart.TabIndex = 0
         Me.cbEngineStopStart.Text = "Engine Stop/Start during vehicle stop"
         Me.cbEngineStopStart.UseVisualStyleBackColor = true
         '
@@ -1714,12 +1711,11 @@ Partial Class VehicleForm
         '
         'tpRoadSweeper
         '
-        Me.tpRoadSweeper.Controls.Add(Me.gbPTODrive)
         Me.tpRoadSweeper.Controls.Add(Me.pnPTO)
         Me.tpRoadSweeper.Controls.Add(Me.gbPTO)
         Me.tpRoadSweeper.Location = New System.Drawing.Point(4, 22)
         Me.tpRoadSweeper.Name = "tpRoadSweeper"
-        Me.tpRoadSweeper.Size = New System.Drawing.Size(648, 655)
+        Me.tpRoadSweeper.Size = New System.Drawing.Size(648, 374)
         Me.tpRoadSweeper.TabIndex = 4
         Me.tpRoadSweeper.Text = "PTO"
         Me.tpRoadSweeper.UseVisualStyleBackColor = true
@@ -1732,10 +1728,10 @@ 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(5, 172)
+        Me.gbPTODrive.Location = New System.Drawing.Point(3, 99)
         Me.gbPTODrive.Name = "gbPTODrive"
-        Me.gbPTODrive.Size = New System.Drawing.Size(566, 55)
-        Me.gbPTODrive.TabIndex = 0
+        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)"
         '
@@ -1754,7 +1750,7 @@ Partial Class VehicleForm
         Me.tbPtoGear.Location = New System.Drawing.Point(371, 21)
         Me.tbPtoGear.Name = "tbPtoGear"
         Me.tbPtoGear.Size = New System.Drawing.Size(70, 20)
-        Me.tbPtoGear.TabIndex = 5
+        Me.tbPtoGear.TabIndex = 1
         '
         'Label26
         '
@@ -1771,7 +1767,7 @@ Partial Class VehicleForm
         Me.tbPtoEngineSpeed.Location = New System.Drawing.Point(120, 21)
         Me.tbPtoEngineSpeed.Name = "tbPtoEngineSpeed"
         Me.tbPtoEngineSpeed.Size = New System.Drawing.Size(70, 20)
-        Me.tbPtoEngineSpeed.TabIndex = 2
+        Me.tbPtoEngineSpeed.TabIndex = 0
         '
         'Label25
         '
@@ -1793,6 +1789,7 @@ Partial Class VehicleForm
         '
         'pnPTO
         '
+        Me.pnPTO.Controls.Add(Me.gbPTODrive)
         Me.pnPTO.Controls.Add(Me.btPTOCycleDrive)
         Me.pnPTO.Controls.Add(Me.Label28)
         Me.pnPTO.Controls.Add(Me.tbPTODrive)
@@ -1805,7 +1802,7 @@ Partial Class VehicleForm
         Me.pnPTO.Location = New System.Drawing.Point(5, 73)
         Me.pnPTO.Name = "pnPTO"
         Me.pnPTO.Size = New System.Drawing.Size(566, 211)
-        Me.pnPTO.TabIndex = 6
+        Me.pnPTO.TabIndex = 1
         '
         'btPTOCycleDrive
         '
@@ -1813,7 +1810,7 @@ Partial Class VehicleForm
         Me.btPTOCycleDrive.Location = New System.Drawing.Point(245, 181)
         Me.btPTOCycleDrive.Name = "btPTOCycleDrive"
         Me.btPTOCycleDrive.Size = New System.Drawing.Size(24, 24)
-        Me.btPTOCycleDrive.TabIndex = 20
+        Me.btPTOCycleDrive.TabIndex = 6
         Me.btPTOCycleDrive.UseVisualStyleBackColor = true
         '
         'Label28
@@ -1831,7 +1828,7 @@ Partial Class VehicleForm
         Me.btPTOCycle.Location = New System.Drawing.Point(245, 69)
         Me.btPTOCycle.Name = "btPTOCycle"
         Me.btPTOCycle.Size = New System.Drawing.Size(24, 24)
-        Me.btPTOCycle.TabIndex = 17
+        Me.btPTOCycle.TabIndex = 3
         Me.btPTOCycle.UseVisualStyleBackColor = true
         '
         'Label16
@@ -1849,7 +1846,7 @@ Partial Class VehicleForm
         Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(245, 22)
         Me.btPTOLossMapBrowse.Name = "btPTOLossMapBrowse"
         Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(24, 24)
-        Me.btPTOLossMapBrowse.TabIndex = 14
+        Me.btPTOLossMapBrowse.TabIndex = 1
         Me.btPTOLossMapBrowse.UseVisualStyleBackColor = true
         '
         'Label7
@@ -1867,7 +1864,7 @@ Partial Class VehicleForm
         Me.gbPTO.Location = New System.Drawing.Point(5, 10)
         Me.gbPTO.Name = "gbPTO"
         Me.gbPTO.Size = New System.Drawing.Size(564, 57)
-        Me.gbPTO.TabIndex = 5
+        Me.gbPTO.TabIndex = 0
         Me.gbPTO.TabStop = false
         Me.gbPTO.Text = "PTO Design Variant"
         '
@@ -1878,7 +1875,7 @@ Partial Class VehicleForm
         Me.cbLegislativeClass.Location = New System.Drawing.Point(220, 140)
         Me.cbLegislativeClass.Name = "cbLegislativeClass"
         Me.cbLegislativeClass.Size = New System.Drawing.Size(52, 21)
-        Me.cbLegislativeClass.TabIndex = 41
+        Me.cbLegislativeClass.TabIndex = 4
         '
         'Label21
         '
diff --git a/VECTO/GUI/VehicleTorqueLimitsDialog.Designer.vb b/VECTO/GUI/VehicleTorqueLimitsDialog.Designer.vb
index 0e5ba01347f6b845ce8e2ef681ce150fc6582078..4a788326d5f339080294b502ed6410fd694f55d7 100644
--- a/VECTO/GUI/VehicleTorqueLimitsDialog.Designer.vb
+++ b/VECTO/GUI/VehicleTorqueLimitsDialog.Designer.vb
@@ -35,117 +35,117 @@ Partial Class VehicleTorqueLimitDialog
 	'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
 	<DebuggerStepThrough()> _
 	Private Sub InitializeComponent()
-		Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
-		Me.OK_Button = New System.Windows.Forms.Button()
-		Me.Cancel_Button = New System.Windows.Forms.Button()
-		Me.Label3 = New System.Windows.Forms.Label()
-		Me.tbGear = New System.Windows.Forms.TextBox()
-		Me.Label5 = New System.Windows.Forms.Label()
-		Me.Label6 = New System.Windows.Forms.Label()
-		Me.tbMaxTorque = New System.Windows.Forms.TextBox()
-		Me.TableLayoutPanel1.SuspendLayout
-		Me.SuspendLayout
-		'
-		'TableLayoutPanel1
-		'
-		Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.TableLayoutPanel1.ColumnCount = 2
-		Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
-		Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
-		Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
-		Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
-		Me.TableLayoutPanel1.Location = New System.Drawing.Point(303, 44)
-		Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
-		Me.TableLayoutPanel1.RowCount = 1
-		Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
-		Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
-		Me.TableLayoutPanel1.TabIndex = 4
-		'
-		'OK_Button
-		'
-		Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
-		Me.OK_Button.Location = New System.Drawing.Point(3, 3)
-		Me.OK_Button.Name = "OK_Button"
-		Me.OK_Button.Size = New System.Drawing.Size(67, 23)
-		Me.OK_Button.TabIndex = 0
-		Me.OK_Button.Text = "OK"
-		'
-		'Cancel_Button
-		'
-		Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
-		Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
-		Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
-		Me.Cancel_Button.Name = "Cancel_Button"
-		Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
-		Me.Cancel_Button.TabIndex = 1
-		Me.Cancel_Button.Text = "Cancel"
-		'
-		'Label3
-		'
-		Me.Label3.AutoSize = true
-		Me.Label3.Location = New System.Drawing.Point(13, 15)
-		Me.Label3.Name = "Label3"
-		Me.Label3.Size = New System.Drawing.Size(30, 13)
-		Me.Label3.TabIndex = 1
-		Me.Label3.Text = "Gear"
-		'
-		'tbGear
-		'
-		Me.tbGear.Location = New System.Drawing.Point(70, 12)
-		Me.tbGear.Name = "tbGear"
-		Me.tbGear.Size = New System.Drawing.Size(41, 20)
-		Me.tbGear.TabIndex = 2
-		Me.tbGear.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
-		'
-		'Label5
-		'
-		Me.Label5.AutoSize = True
-		Me.Label5.Location = New System.Drawing.Point(171, 15)
-		Me.Label5.Name = "Label5"
-		Me.Label5.Size = New System.Drawing.Size(66, 13)
-		Me.Label5.TabIndex = 1
-		Me.Label5.Text = "max. Torque"
-		'
-		'Label6
-		'
-		Me.Label6.AutoSize = True
-		Me.Label6.Location = New System.Drawing.Point(331, 15)
-		Me.Label6.Name = "Label6"
-		Me.Label6.Size = New System.Drawing.Size(29, 13)
-		Me.Label6.TabIndex = 1
-		Me.Label6.Text = "[Nm]"
-		'
-		'tbMaxTorque
-		'
-		Me.tbMaxTorque.Location = New System.Drawing.Point(241, 13)
-		Me.tbMaxTorque.Name = "tbMaxTorque"
-		Me.tbMaxTorque.Size = New System.Drawing.Size(84, 20)
-		Me.tbMaxTorque.TabIndex = 3
-		Me.tbMaxTorque.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
-		'
-		'VehicleTorqueLimitDialog
-		'
-		Me.AcceptButton = Me.OK_Button
-		Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
-		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-		Me.CancelButton = Me.Cancel_Button
-		Me.ClientSize = New System.Drawing.Size(461, 85)
-		Me.Controls.Add(Me.tbMaxTorque)
-		Me.Controls.Add(Me.Label6)
-		Me.Controls.Add(Me.tbGear)
-		Me.Controls.Add(Me.Label5)
-		Me.Controls.Add(Me.Label3)
-		Me.Controls.Add(Me.TableLayoutPanel1)
-		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
-		Me.MaximizeBox = false
-		Me.MinimizeBox = false
-		Me.Name = "VehicleTorqueLimitDialog"
-		Me.ShowInTaskbar = false
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-		Me.Text = "Torque Limits"
-		Me.TableLayoutPanel1.ResumeLayout(false)
-		Me.ResumeLayout(false)
-		Me.PerformLayout
+        Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+        Me.OK_Button = New System.Windows.Forms.Button()
+        Me.Cancel_Button = New System.Windows.Forms.Button()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.tbGear = New System.Windows.Forms.TextBox()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.tbMaxTorque = New System.Windows.Forms.TextBox()
+        Me.TableLayoutPanel1.SuspendLayout
+        Me.SuspendLayout
+        '
+        'TableLayoutPanel1
+        '
+        Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+        Me.TableLayoutPanel1.ColumnCount = 2
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
+        Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
+        Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(303, 44)
+        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+        Me.TableLayoutPanel1.RowCount = 1
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
+        Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
+        Me.TableLayoutPanel1.TabIndex = 2
+        '
+        'OK_Button
+        '
+        Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.OK_Button.Location = New System.Drawing.Point(3, 3)
+        Me.OK_Button.Name = "OK_Button"
+        Me.OK_Button.Size = New System.Drawing.Size(67, 23)
+        Me.OK_Button.TabIndex = 0
+        Me.OK_Button.Text = "OK"
+        '
+        'Cancel_Button
+        '
+        Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+        Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
+        Me.Cancel_Button.Name = "Cancel_Button"
+        Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
+        Me.Cancel_Button.TabIndex = 1
+        Me.Cancel_Button.Text = "Cancel"
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = true
+        Me.Label3.Location = New System.Drawing.Point(13, 15)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(30, 13)
+        Me.Label3.TabIndex = 1
+        Me.Label3.Text = "Gear"
+        '
+        'tbGear
+        '
+        Me.tbGear.Location = New System.Drawing.Point(70, 12)
+        Me.tbGear.Name = "tbGear"
+        Me.tbGear.Size = New System.Drawing.Size(41, 20)
+        Me.tbGear.TabIndex = 0
+        Me.tbGear.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = true
+        Me.Label5.Location = New System.Drawing.Point(171, 15)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(66, 13)
+        Me.Label5.TabIndex = 1
+        Me.Label5.Text = "max. Torque"
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = true
+        Me.Label6.Location = New System.Drawing.Point(331, 15)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(29, 13)
+        Me.Label6.TabIndex = 1
+        Me.Label6.Text = "[Nm]"
+        '
+        'tbMaxTorque
+        '
+        Me.tbMaxTorque.Location = New System.Drawing.Point(241, 13)
+        Me.tbMaxTorque.Name = "tbMaxTorque"
+        Me.tbMaxTorque.Size = New System.Drawing.Size(84, 20)
+        Me.tbMaxTorque.TabIndex = 1
+        Me.tbMaxTorque.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        'VehicleTorqueLimitDialog
+        '
+        Me.AcceptButton = Me.OK_Button
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.CancelButton = Me.Cancel_Button
+        Me.ClientSize = New System.Drawing.Size(461, 85)
+        Me.Controls.Add(Me.tbMaxTorque)
+        Me.Controls.Add(Me.Label6)
+        Me.Controls.Add(Me.tbGear)
+        Me.Controls.Add(Me.Label5)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.TableLayoutPanel1)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+        Me.MaximizeBox = false
+        Me.MinimizeBox = false
+        Me.Name = "VehicleTorqueLimitDialog"
+        Me.ShowInTaskbar = false
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Torque Limits"
+        Me.TableLayoutPanel1.ResumeLayout(false)
+        Me.ResumeLayout(false)
+        Me.PerformLayout
 
 End Sub
 	Friend WithEvents TableLayoutPanel1 As TableLayoutPanel
diff --git a/VECTO/GUI/XMLExportJobDialog.Designer.vb b/VECTO/GUI/XMLExportJobDialog.Designer.vb
index 49e75db030f68deb02b84cd10affaa91fcd84085..fc21f135f3baf1060677caa68163cf13a239fdab 100644
--- a/VECTO/GUI/XMLExportJobDialog.Designer.vb
+++ b/VECTO/GUI/XMLExportJobDialog.Designer.vb
@@ -22,159 +22,158 @@ Partial Class XMLExportJobDialog
     'Do not modify it using the code editor.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(XMLExportJobDialog))
-		Me.lbVendor = New System.Windows.Forms.Label()
-		Me.tbVendor = New System.Windows.Forms.TextBox()
-		Me.btnExport = New System.Windows.Forms.Button()
-		Me.cbSingleFile = New System.Windows.Forms.CheckBox()
-		Me.label1 = New System.Windows.Forms.Label()
-		Me.tbJobfile = New System.Windows.Forms.TextBox()
-		Me.tbMode = New System.Windows.Forms.TextBox()
-		Me.lblJobfile = New System.Windows.Forms.Label()
-		Me.lblDstDir = New System.Windows.Forms.Label()
-		Me.tbDestination = New System.Windows.Forms.TextBox()
-		Me.lblMode = New System.Windows.Forms.Label()
-		Me.btnCancel = New System.Windows.Forms.Button()
-		Me.BtTCfileBrowse = New System.Windows.Forms.Button()
-		Me.SuspendLayout()
-		'
-		'lbVendor
-		'
-		Me.lbVendor.AutoSize = True
-		Me.lbVendor.Location = New System.Drawing.Point(10, 97)
-		Me.lbVendor.Name = "lbVendor"
-		Me.lbVendor.Size = New System.Drawing.Size(44, 13)
-		Me.lbVendor.TabIndex = 25
-		Me.lbVendor.Text = "Vendor:"
-		'
-		'tbVendor
-		'
-		Me.tbVendor.Location = New System.Drawing.Point(131, 94)
-		Me.tbVendor.Name = "tbVendor"
-		Me.tbVendor.Size = New System.Drawing.Size(231, 20)
-		Me.tbVendor.TabIndex = 24
-		'
-		'btnExport
-		'
-		Me.btnExport.Location = New System.Drawing.Point(224, 150)
-		Me.btnExport.Name = "btnExport"
-		Me.btnExport.Size = New System.Drawing.Size(75, 23)
-		Me.btnExport.TabIndex = 23
-		Me.btnExport.Text = "Export"
-		Me.btnExport.UseVisualStyleBackColor = True
-		'
-		'cbSingleFile
-		'
-		Me.cbSingleFile.AutoSize = True
-		Me.cbSingleFile.Location = New System.Drawing.Point(132, 121)
-		Me.cbSingleFile.Name = "cbSingleFile"
-		Me.cbSingleFile.Size = New System.Drawing.Size(15, 14)
-		Me.cbSingleFile.TabIndex = 22
-		Me.cbSingleFile.UseVisualStyleBackColor = True
-		'
-		'label1
-		'
-		Me.label1.AutoSize = True
-		Me.label1.Location = New System.Drawing.Point(10, 121)
-		Me.label1.Name = "label1"
-		Me.label1.Size = New System.Drawing.Size(116, 13)
-		Me.label1.TabIndex = 21
-		Me.label1.Text = "Output single XML File:"
-		'
-		'tbJobfile
-		'
-		Me.tbJobfile.Location = New System.Drawing.Point(131, 20)
-		Me.tbJobfile.Name = "tbJobfile"
-		Me.tbJobfile.ReadOnly = True
-		Me.tbJobfile.Size = New System.Drawing.Size(231, 20)
-		Me.tbJobfile.TabIndex = 19
-		'
-		'tbMode
-		'
-		Me.tbMode.Location = New System.Drawing.Point(131, 43)
-		Me.tbMode.Name = "tbMode"
-		Me.tbMode.ReadOnly = True
-		Me.tbMode.Size = New System.Drawing.Size(231, 20)
-		Me.tbMode.TabIndex = 18
-		'
-		'lblJobfile
-		'
-		Me.lblJobfile.AutoSize = True
-		Me.lblJobfile.Location = New System.Drawing.Point(10, 23)
-		Me.lblJobfile.Name = "lblJobfile"
-		Me.lblJobfile.Size = New System.Drawing.Size(58, 13)
-		Me.lblJobfile.TabIndex = 17
-		Me.lblJobfile.Text = "Vecto Job:"
-		'
-		'lblDstDir
-		'
-		Me.lblDstDir.AutoSize = True
-		Me.lblDstDir.Location = New System.Drawing.Point(10, 71)
-		Me.lblDstDir.Name = "lblDstDir"
-		Me.lblDstDir.Size = New System.Drawing.Size(87, 13)
-		Me.lblDstDir.TabIndex = 16
-		Me.lblDstDir.Text = "Output Directory:"
-		'
-		'tbDestination
-		'
-		Me.tbDestination.Location = New System.Drawing.Point(131, 68)
-		Me.tbDestination.Name = "tbDestination"
-		Me.tbDestination.Size = New System.Drawing.Size(231, 20)
-		Me.tbDestination.TabIndex = 15
-		'
-		'lblMode
-		'
-		Me.lblMode.AutoSize = True
-		Me.lblMode.Location = New System.Drawing.Point(10, 46)
-		Me.lblMode.Name = "lblMode"
-		Me.lblMode.Size = New System.Drawing.Size(68, 13)
-		Me.lblMode.TabIndex = 14
-		Me.lblMode.Text = "Vecto Mode:"
-		'
-		'btnCancel
-		'
-		Me.btnCancel.Location = New System.Drawing.Point(305, 150)
-		Me.btnCancel.Name = "btnCancel"
-		Me.btnCancel.Size = New System.Drawing.Size(75, 23)
-		Me.btnCancel.TabIndex = 13
-		Me.btnCancel.Text = "Cancel"
-		Me.btnCancel.UseVisualStyleBackColor = True
-		'
-		'BtTCfileBrowse
-		'
-		Me.BtTCfileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-		Me.BtTCfileBrowse.Location = New System.Drawing.Point(362, 66)
-		Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
-		Me.BtTCfileBrowse.Size = New System.Drawing.Size(24, 24)
-		Me.BtTCfileBrowse.TabIndex = 26
-		Me.BtTCfileBrowse.TabStop = False
-		Me.BtTCfileBrowse.UseVisualStyleBackColor = True
-		'
-		'XMLExportJobDialog
-		'
-		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-		Me.ClientSize = New System.Drawing.Size(392, 185)
-		Me.Controls.Add(Me.BtTCfileBrowse)
-		Me.Controls.Add(Me.lbVendor)
-		Me.Controls.Add(Me.tbVendor)
-		Me.Controls.Add(Me.btnExport)
-		Me.Controls.Add(Me.cbSingleFile)
-		Me.Controls.Add(Me.label1)
-		Me.Controls.Add(Me.tbJobfile)
-		Me.Controls.Add(Me.tbMode)
-		Me.Controls.Add(Me.lblJobfile)
-		Me.Controls.Add(Me.lblDstDir)
-		Me.Controls.Add(Me.tbDestination)
-		Me.Controls.Add(Me.lblMode)
-		Me.Controls.Add(Me.btnCancel)
-		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-		Me.Name = "XMLExportJobDialog"
-		Me.Text = "VECTO XML Export"
-		Me.ResumeLayout(False)
-		Me.PerformLayout()
-
-	End Sub
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(XMLExportJobDialog))
+        Me.lbVendor = New System.Windows.Forms.Label()
+        Me.tbVendor = New System.Windows.Forms.TextBox()
+        Me.btnExport = New System.Windows.Forms.Button()
+        Me.cbSingleFile = New System.Windows.Forms.CheckBox()
+        Me.label1 = New System.Windows.Forms.Label()
+        Me.tbJobfile = New System.Windows.Forms.TextBox()
+        Me.tbMode = New System.Windows.Forms.TextBox()
+        Me.lblJobfile = New System.Windows.Forms.Label()
+        Me.lblDstDir = New System.Windows.Forms.Label()
+        Me.tbDestination = New System.Windows.Forms.TextBox()
+        Me.lblMode = New System.Windows.Forms.Label()
+        Me.btnCancel = New System.Windows.Forms.Button()
+        Me.BtTCfileBrowse = New System.Windows.Forms.Button()
+        Me.SuspendLayout
+        '
+        'lbVendor
+        '
+        Me.lbVendor.AutoSize = true
+        Me.lbVendor.Location = New System.Drawing.Point(10, 97)
+        Me.lbVendor.Name = "lbVendor"
+        Me.lbVendor.Size = New System.Drawing.Size(44, 13)
+        Me.lbVendor.TabIndex = 25
+        Me.lbVendor.Text = "Vendor:"
+        '
+        'tbVendor
+        '
+        Me.tbVendor.Location = New System.Drawing.Point(131, 94)
+        Me.tbVendor.Name = "tbVendor"
+        Me.tbVendor.Size = New System.Drawing.Size(231, 20)
+        Me.tbVendor.TabIndex = 4
+        '
+        'btnExport
+        '
+        Me.btnExport.Location = New System.Drawing.Point(224, 150)
+        Me.btnExport.Name = "btnExport"
+        Me.btnExport.Size = New System.Drawing.Size(75, 23)
+        Me.btnExport.TabIndex = 6
+        Me.btnExport.Text = "Export"
+        Me.btnExport.UseVisualStyleBackColor = true
+        '
+        'cbSingleFile
+        '
+        Me.cbSingleFile.AutoSize = true
+        Me.cbSingleFile.Location = New System.Drawing.Point(132, 121)
+        Me.cbSingleFile.Name = "cbSingleFile"
+        Me.cbSingleFile.Size = New System.Drawing.Size(15, 14)
+        Me.cbSingleFile.TabIndex = 22
+        Me.cbSingleFile.UseVisualStyleBackColor = true
+        '
+        'label1
+        '
+        Me.label1.AutoSize = true
+        Me.label1.Location = New System.Drawing.Point(10, 121)
+        Me.label1.Name = "label1"
+        Me.label1.Size = New System.Drawing.Size(116, 13)
+        Me.label1.TabIndex = 5
+        Me.label1.Text = "Output single XML File:"
+        '
+        'tbJobfile
+        '
+        Me.tbJobfile.Location = New System.Drawing.Point(131, 20)
+        Me.tbJobfile.Name = "tbJobfile"
+        Me.tbJobfile.ReadOnly = true
+        Me.tbJobfile.Size = New System.Drawing.Size(231, 20)
+        Me.tbJobfile.TabIndex = 0
+        '
+        'tbMode
+        '
+        Me.tbMode.Location = New System.Drawing.Point(131, 43)
+        Me.tbMode.Name = "tbMode"
+        Me.tbMode.ReadOnly = true
+        Me.tbMode.Size = New System.Drawing.Size(231, 20)
+        Me.tbMode.TabIndex = 1
+        '
+        'lblJobfile
+        '
+        Me.lblJobfile.AutoSize = true
+        Me.lblJobfile.Location = New System.Drawing.Point(10, 23)
+        Me.lblJobfile.Name = "lblJobfile"
+        Me.lblJobfile.Size = New System.Drawing.Size(58, 13)
+        Me.lblJobfile.TabIndex = 17
+        Me.lblJobfile.Text = "Vecto Job:"
+        '
+        'lblDstDir
+        '
+        Me.lblDstDir.AutoSize = true
+        Me.lblDstDir.Location = New System.Drawing.Point(10, 71)
+        Me.lblDstDir.Name = "lblDstDir"
+        Me.lblDstDir.Size = New System.Drawing.Size(87, 13)
+        Me.lblDstDir.TabIndex = 16
+        Me.lblDstDir.Text = "Output Directory:"
+        '
+        'tbDestination
+        '
+        Me.tbDestination.Location = New System.Drawing.Point(131, 68)
+        Me.tbDestination.Name = "tbDestination"
+        Me.tbDestination.Size = New System.Drawing.Size(231, 20)
+        Me.tbDestination.TabIndex = 2
+        '
+        'lblMode
+        '
+        Me.lblMode.AutoSize = true
+        Me.lblMode.Location = New System.Drawing.Point(10, 46)
+        Me.lblMode.Name = "lblMode"
+        Me.lblMode.Size = New System.Drawing.Size(68, 13)
+        Me.lblMode.TabIndex = 14
+        Me.lblMode.Text = "Vecto Mode:"
+        '
+        'btnCancel
+        '
+        Me.btnCancel.Location = New System.Drawing.Point(305, 150)
+        Me.btnCancel.Name = "btnCancel"
+        Me.btnCancel.Size = New System.Drawing.Size(75, 23)
+        Me.btnCancel.TabIndex = 7
+        Me.btnCancel.Text = "Cancel"
+        Me.btnCancel.UseVisualStyleBackColor = true
+        '
+        'BtTCfileBrowse
+        '
+        Me.BtTCfileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+        Me.BtTCfileBrowse.Location = New System.Drawing.Point(362, 66)
+        Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
+        Me.BtTCfileBrowse.Size = New System.Drawing.Size(24, 24)
+        Me.BtTCfileBrowse.TabIndex = 3
+        Me.BtTCfileBrowse.UseVisualStyleBackColor = true
+        '
+        'XMLExportJobDialog
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(392, 185)
+        Me.Controls.Add(Me.BtTCfileBrowse)
+        Me.Controls.Add(Me.lbVendor)
+        Me.Controls.Add(Me.tbVendor)
+        Me.Controls.Add(Me.btnExport)
+        Me.Controls.Add(Me.cbSingleFile)
+        Me.Controls.Add(Me.label1)
+        Me.Controls.Add(Me.tbJobfile)
+        Me.Controls.Add(Me.tbMode)
+        Me.Controls.Add(Me.lblJobfile)
+        Me.Controls.Add(Me.lblDstDir)
+        Me.Controls.Add(Me.tbDestination)
+        Me.Controls.Add(Me.lblMode)
+        Me.Controls.Add(Me.btnCancel)
+        Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+        Me.Name = "XMLExportJobDialog"
+        Me.Text = "VECTO XML Export"
+        Me.ResumeLayout(false)
+        Me.PerformLayout
+
+End Sub
 	Private WithEvents lbVendor As System.Windows.Forms.Label
 	Private WithEvents tbVendor As System.Windows.Forms.TextBox
 	Private WithEvents btnExport As System.Windows.Forms.Button
diff --git a/VECTO/GUI/XMLImportJobDialog.Designer.vb b/VECTO/GUI/XMLImportJobDialog.Designer.vb
index ecc7eb7dff1212f672c955cd1a123d8297d2515d..1312df14e2cabd0a10354f39d5b95e13946a04bb 100644
--- a/VECTO/GUI/XMLImportJobDialog.Designer.vb
+++ b/VECTO/GUI/XMLImportJobDialog.Designer.vb
@@ -22,105 +22,105 @@ Partial Class XMLImportJobDialog
     'Do not modify it using the code editor.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(XMLImportJobDialog))
-		Me.btnClose = New System.Windows.Forms.Button()
-		Me.btnImport = New System.Windows.Forms.Button()
-		Me.btnBrowseOutput = New System.Windows.Forms.Button()
-		Me.btnBrowseJob = New System.Windows.Forms.Button()
-		Me.tbDestination = New System.Windows.Forms.TextBox()
-		Me.tbJobFile = New System.Windows.Forms.TextBox()
-		Me.label2 = New System.Windows.Forms.Label()
-		Me.label1 = New System.Windows.Forms.Label()
-		Me.SuspendLayout()
-		'
-		'btnClose
-		'
-		Me.btnClose.Location = New System.Drawing.Point(391, 92)
-		Me.btnClose.Name = "btnClose"
-		Me.btnClose.Size = New System.Drawing.Size(75, 23)
-		Me.btnClose.TabIndex = 15
-		Me.btnClose.Text = "Cancel"
-		Me.btnClose.UseVisualStyleBackColor = True
-		'
-		'btnImport
-		'
-		Me.btnImport.Location = New System.Drawing.Point(310, 92)
-		Me.btnImport.Name = "btnImport"
-		Me.btnImport.Size = New System.Drawing.Size(75, 23)
-		Me.btnImport.TabIndex = 14
-		Me.btnImport.Text = "Import"
-		Me.btnImport.UseVisualStyleBackColor = True
-		'
-		'btnBrowseOutput
-		'
-		Me.btnBrowseOutput.Location = New System.Drawing.Point(345, 41)
-		Me.btnBrowseOutput.Name = "btnBrowseOutput"
-		Me.btnBrowseOutput.Size = New System.Drawing.Size(75, 23)
-		Me.btnBrowseOutput.TabIndex = 13
-		Me.btnBrowseOutput.Text = "Browse"
-		Me.btnBrowseOutput.UseVisualStyleBackColor = True
-		'
-		'btnBrowseJob
-		'
-		Me.btnBrowseJob.Location = New System.Drawing.Point(345, 12)
-		Me.btnBrowseJob.Name = "btnBrowseJob"
-		Me.btnBrowseJob.Size = New System.Drawing.Size(75, 23)
-		Me.btnBrowseJob.TabIndex = 12
-		Me.btnBrowseJob.Text = "Browse"
-		Me.btnBrowseJob.UseVisualStyleBackColor = True
-		'
-		'tbDestination
-		'
-		Me.tbDestination.Location = New System.Drawing.Point(105, 43)
-		Me.tbDestination.Name = "tbDestination"
-		Me.tbDestination.Size = New System.Drawing.Size(224, 20)
-		Me.tbDestination.TabIndex = 11
-		'
-		'tbJobFile
-		'
-		Me.tbJobFile.Location = New System.Drawing.Point(105, 14)
-		Me.tbJobFile.Name = "tbJobFile"
-		Me.tbJobFile.Size = New System.Drawing.Size(224, 20)
-		Me.tbJobFile.TabIndex = 10
-		'
-		'label2
-		'
-		Me.label2.AutoSize = True
-		Me.label2.Location = New System.Drawing.Point(11, 46)
-		Me.label2.Name = "label2"
-		Me.label2.Size = New System.Drawing.Size(87, 13)
-		Me.label2.TabIndex = 9
-		Me.label2.Text = "Output Directory:"
-		'
-		'label1
-		'
-		Me.label1.AutoSize = True
-		Me.label1.Location = New System.Drawing.Point(11, 17)
-		Me.label1.Name = "label1"
-		Me.label1.Size = New System.Drawing.Size(46, 13)
-		Me.label1.TabIndex = 8
-		Me.label1.Text = "Job File:"
-		'
-		'XMLImportJobDialog
-		'
-		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-		Me.ClientSize = New System.Drawing.Size(480, 130)
-		Me.Controls.Add(Me.btnClose)
-		Me.Controls.Add(Me.btnImport)
-		Me.Controls.Add(Me.btnBrowseOutput)
-		Me.Controls.Add(Me.btnBrowseJob)
-		Me.Controls.Add(Me.tbDestination)
-		Me.Controls.Add(Me.tbJobFile)
-		Me.Controls.Add(Me.label2)
-		Me.Controls.Add(Me.label1)
-		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-		Me.Name = "XMLImportJobDialog"
-		Me.Text = "VECTO Import Job"
-		Me.ResumeLayout(False)
-		Me.PerformLayout()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(XMLImportJobDialog))
+        Me.btnClose = New System.Windows.Forms.Button()
+        Me.btnImport = New System.Windows.Forms.Button()
+        Me.btnBrowseOutput = New System.Windows.Forms.Button()
+        Me.btnBrowseJob = New System.Windows.Forms.Button()
+        Me.tbDestination = New System.Windows.Forms.TextBox()
+        Me.tbJobFile = New System.Windows.Forms.TextBox()
+        Me.label2 = New System.Windows.Forms.Label()
+        Me.label1 = New System.Windows.Forms.Label()
+        Me.SuspendLayout
+        '
+        'btnClose
+        '
+        Me.btnClose.Location = New System.Drawing.Point(391, 92)
+        Me.btnClose.Name = "btnClose"
+        Me.btnClose.Size = New System.Drawing.Size(75, 23)
+        Me.btnClose.TabIndex = 5
+        Me.btnClose.Text = "Cancel"
+        Me.btnClose.UseVisualStyleBackColor = true
+        '
+        'btnImport
+        '
+        Me.btnImport.Location = New System.Drawing.Point(310, 92)
+        Me.btnImport.Name = "btnImport"
+        Me.btnImport.Size = New System.Drawing.Size(75, 23)
+        Me.btnImport.TabIndex = 4
+        Me.btnImport.Text = "Import"
+        Me.btnImport.UseVisualStyleBackColor = true
+        '
+        'btnBrowseOutput
+        '
+        Me.btnBrowseOutput.Location = New System.Drawing.Point(345, 41)
+        Me.btnBrowseOutput.Name = "btnBrowseOutput"
+        Me.btnBrowseOutput.Size = New System.Drawing.Size(75, 23)
+        Me.btnBrowseOutput.TabIndex = 3
+        Me.btnBrowseOutput.Text = "Browse"
+        Me.btnBrowseOutput.UseVisualStyleBackColor = true
+        '
+        'btnBrowseJob
+        '
+        Me.btnBrowseJob.Location = New System.Drawing.Point(345, 12)
+        Me.btnBrowseJob.Name = "btnBrowseJob"
+        Me.btnBrowseJob.Size = New System.Drawing.Size(75, 23)
+        Me.btnBrowseJob.TabIndex = 1
+        Me.btnBrowseJob.Text = "Browse"
+        Me.btnBrowseJob.UseVisualStyleBackColor = true
+        '
+        'tbDestination
+        '
+        Me.tbDestination.Location = New System.Drawing.Point(105, 43)
+        Me.tbDestination.Name = "tbDestination"
+        Me.tbDestination.Size = New System.Drawing.Size(224, 20)
+        Me.tbDestination.TabIndex = 2
+        '
+        'tbJobFile
+        '
+        Me.tbJobFile.Location = New System.Drawing.Point(105, 14)
+        Me.tbJobFile.Name = "tbJobFile"
+        Me.tbJobFile.Size = New System.Drawing.Size(224, 20)
+        Me.tbJobFile.TabIndex = 0
+        '
+        'label2
+        '
+        Me.label2.AutoSize = true
+        Me.label2.Location = New System.Drawing.Point(11, 46)
+        Me.label2.Name = "label2"
+        Me.label2.Size = New System.Drawing.Size(87, 13)
+        Me.label2.TabIndex = 9
+        Me.label2.Text = "Output Directory:"
+        '
+        'label1
+        '
+        Me.label1.AutoSize = true
+        Me.label1.Location = New System.Drawing.Point(11, 17)
+        Me.label1.Name = "label1"
+        Me.label1.Size = New System.Drawing.Size(46, 13)
+        Me.label1.TabIndex = 8
+        Me.label1.Text = "Job File:"
+        '
+        'XMLImportJobDialog
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(480, 130)
+        Me.Controls.Add(Me.btnClose)
+        Me.Controls.Add(Me.btnImport)
+        Me.Controls.Add(Me.btnBrowseOutput)
+        Me.Controls.Add(Me.btnBrowseJob)
+        Me.Controls.Add(Me.tbDestination)
+        Me.Controls.Add(Me.tbJobFile)
+        Me.Controls.Add(Me.label2)
+        Me.Controls.Add(Me.label1)
+        Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
+        Me.Name = "XMLImportJobDialog"
+        Me.Text = "VECTO Import Job"
+        Me.ResumeLayout(false)
+        Me.PerformLayout
 
-	End Sub
+End Sub
 	Private WithEvents btnClose As System.Windows.Forms.Button
 	Private WithEvents btnImport As System.Windows.Forms.Button
 	Private WithEvents btnBrowseOutput As System.Windows.Forms.Button