diff --git a/VECTO/GUI/F_GBX.Designer.vb b/VECTO/GUI/F_GBX.Designer.vb
index 7951eac0e575a07d09ff44849ec9b960f94965ea..04ffc73c4ac4440a5f89dde09b2cef6f67520515 100644
--- a/VECTO/GUI/F_GBX.Designer.vb
+++ b/VECTO/GUI/F_GBX.Designer.vb
@@ -276,13 +276,13 @@ Partial Class F_GBX
 		'
 		'ColumnHeader3
 		'
-		Me.ColumnHeader3.Text = "Loss Map or Efficiency [-]"
-		Me.ColumnHeader3.Width = 137
+		Me.ColumnHeader3.Text = "Loss Map or Efficiency"
+		Me.ColumnHeader3.Width = 122
 		'
 		'ColumnHeader5
 		'
 		Me.ColumnHeader5.Text = "Shift Polygons"
-		Me.ColumnHeader5.Width = 97
+		Me.ColumnHeader5.Width = 88
 		'
 		'ColumnHeader6
 		'
diff --git a/VECTO/GUI/F_GBX.vb b/VECTO/GUI/F_GBX.vb
index c2c088eba502f68d4b49e15bba7ec1dddd8776f9..a0db5e120615d9fc1eca9014ff9b1374bed4a1df 100644
--- a/VECTO/GUI/F_GBX.vb
+++ b/VECTO/GUI/F_GBX.vb
@@ -18,7 +18,7 @@ Public Class F_GBX
 	Private GbxFile As String = ""
 	Public AutoSendTo As Boolean = False
 	Public JobDir As String = ""
-	Private GearDia As F_GBX_GearDlog
+	Private GearDia As GearboxGearDialog
 
 	Private Init As Boolean = False
 
@@ -35,7 +35,7 @@ Public Class F_GBX
 	Private Sub F_GBX_Load(sender As Object, e As System.EventArgs) Handles Me.Load
 
 		Init = False
-		GearDia = New F_GBX_GearDlog
+		GearDia = New GearboxGearDialog
 
 		Me.PnInertiaTI.Enabled = Not Cfg.DeclMode
 		Me.GrGearShift.Enabled = Not Cfg.DeclMode
@@ -537,6 +537,12 @@ Public Class F_GBX
 				GearDia.TbFld.Text = ""
 			End If
 
+			If LvGears.SelectedItems(0).Index = 0 Then
+				GearDia.BtPrevious.Enabled = False
+			Else
+				GearDia.BtPrevious.Enabled = True
+			End If
+
 			If GearDia.ShowDialog = Windows.Forms.DialogResult.OK Then
 
 				If GearDia.ChIsTCgear.Checked Then
@@ -559,17 +565,21 @@ Public Class F_GBX
 
 			Else
 
-				If Me.LvGears.SelectedItems(0).SubItems(2).Text = "" Then RemoveGear(True)
+				If LvGears.SelectedItems(0).SubItems(2).Text = "" Then RemoveGear(True)
 
 			End If
 
 			If GearDia.NextGear Then
-				If Me.LvGears.Items.Count - 1 = Me.LvGears.SelectedIndices(0) Then AddGear()
+				If LvGears.Items.Count - 1 = LvGears.SelectedIndices(0) Then AddGear()
+
+				LvGears.Items(LvGears.SelectedIndices(0) + 1).Selected = True
+			End If
 
-				Me.LvGears.Items(Me.LvGears.SelectedIndices(0) + 1).Selected = True
+			If GearDia.PreviousGear AndAlso LvGears.SelectedIndices(0) > 0 Then
+				LvGears.Items(LvGears.SelectedIndices(0) - 1).Selected = True
 			End If
 
-		Loop Until Not GearDia.NextGear
+		Loop Until Not (GearDia.NextGear OrElse GearDia.PreviousGear)
 	End Sub
 
 	'Add Gear
diff --git a/VECTO/GUI/F_GBX_GearDlog.vb b/VECTO/GUI/F_GBX_GearDlog.vb
deleted file mode 100644
index b76b14dd617f8bbdc1236976b91cdc86464026ab..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_GBX_GearDlog.vb
+++ /dev/null
@@ -1,80 +0,0 @@
-' Copyright 2014 European Union.
-' Licensed under the EUPL (the 'Licence');
-'
-' * You may not use this work except in compliance with the Licence.
-' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
-' * Unless required by applicable law or agreed to in writing,
-'   software distributed under the Licence is distributed on an "AS IS" basis,
-'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-'
-' See the LICENSE.txt for the specific language governing permissions and limitations.
-
-Imports System.Windows.Forms
-
-''' <summary>
-''' Gear Editor (Vehicle Editor sub-dialog)
-''' </summary>
-''' <remarks></remarks>
-Public Class F_GBX_GearDlog
-
-    Public NextGear As Boolean
-	Public GbxPath As String
-
-    'Save and Close
-    Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
-
-        If Not IsNumeric(Me.TbRatio.Text) Then
-            MsgBox("Gear ratio is invalid!")
-            Me.TbRatio.Focus()
-            Me.TbRatio.SelectAll()
-            Exit Sub
-        End If
-
-        NextGear = False
-        Me.DialogResult = System.Windows.Forms.DialogResult.OK
-        Me.Close()
-    End Sub
-
-    'Cancel
-    Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click
-        NextGear = False
-        Me.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.Close()
-    End Sub
-
-    'Next Gear button - Close dialog and open for next gear
-    Private Sub BtNext_Click(sender As System.Object, e As System.EventArgs) Handles BtNext.Click
-
-        If Not IsNumeric(Me.TbRatio.Text) Then
-            MsgBox("Gear ratio is invalid!")
-            Me.TbRatio.Focus()
-            Me.TbRatio.SelectAll()
-            Exit Sub
-        End If
-
-        NextGear = True
-        Me.DialogResult = System.Windows.Forms.DialogResult.OK
-        Me.Close()
-    End Sub
-
-    'Browse for transmission loss map
-    Private Sub BtBrowse_Click(sender As System.Object, e As System.EventArgs) Handles BtBrowse.Click
-        If fbTLM.OpenDialog(fFileRepl(Me.TbMapPath.Text, GbxPath)) Then
-            Me.TbMapPath.Text = fFileWoDir(fbTLM.Files(0), GbxPath)
-        End If
-    End Sub
-
-    'Browse for shift polygons file
-	Private Sub BtShiftPolyBrowse_Click(sender As System.Object, e As System.EventArgs) Handles BtShiftPolyBrowse.Click
-		If fbGBS.OpenDialog(fFileRepl(Me.TbShiftPolyFile.Text, GbxPath)) Then
-			Me.TbShiftPolyFile.Text = fFileWoDir(fbGBS.Files(0), GbxPath)
-		End If
-	End Sub
-
-	Private Sub BtBrowseFld_Click(sender As Object, e As EventArgs) Handles BtBrowseFld.Click
-		If fbFLD.OpenDialog(fFileRepl(Me.TbFld.Text, GbxPath)) Then
-			Me.TbFld.Text = fFileWoDir(fbFLD.Files(0), GbxPath)
-		End If
-	End Sub
-
-End Class
diff --git a/VECTO/GUI/F_VEH.vb b/VECTO/GUI/F_VEH.vb
index 9933b7520155c650260edb9c2995b8bfab1fc197..6c609ce4344e2e6964c856fd6bbddf0e38a5b1db 100644
--- a/VECTO/GUI/F_VEH.vb
+++ b/VECTO/GUI/F_VEH.vb
@@ -434,11 +434,13 @@ Public Class F_VEH
 
 		VEH0.VehCat = CType(Me.CbCat.SelectedIndex, tVehCat)
 
+		Dim axleShareCheck As Double
 		For Each LV0 In LvRRC.Items
 
 			a0 = New cVEH.cAxle
 
 			a0.Share = fTextboxToNumString(LV0.SubItems(1).Text)
+			axleShareCheck += a0.Share
 			a0.TwinTire = (LV0.SubItems(2).Text = "yes")
 			a0.RRC = fTextboxToNumString(LV0.SubItems(3).Text)
 			a0.FzISO = fTextboxToNumString(LV0.SubItems(4).Text)
@@ -449,6 +451,11 @@ Public Class F_VEH
 
 		Next
 
+		If Math.Abs(axleShareCheck - 1) > 0.000001 Then
+			MsgBox("Relative axle loads must sum up to 1.0. Current value: " & axleShareCheck, MsgBoxStyle.Critical)
+			Return False
+		End If
+
 		VEH0.MassMax = CSng(fTextboxToNumString(Me.TbMassMass.Text))
 		VEH0.MassExtra = CSng(fTextboxToNumString(Me.TbMassExtra.Text))
 		VEH0.AxleConf = CType(Me.CbAxleConfig.SelectedIndex, tAxleConf)
diff --git a/VECTO/GUI/F_VEH_Axle.Designer.vb b/VECTO/GUI/F_VEH_Axle.Designer.vb
index d42bec507fb1b662f5ed093e44dd10a9c3b68f5a..0dae260a74b97db74cffdd695dc6efc499a8465c 100644
--- a/VECTO/GUI/F_VEH_Axle.Designer.vb
+++ b/VECTO/GUI/F_VEH_Axle.Designer.vb
@@ -32,258 +32,258 @@ Partial Class F_VEH_Axle
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.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.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(250, 217)
-        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(7, 10)
-        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(109, 8)
-        Me.TbAxleShare.Name = "TbAxleShare"
-        Me.TbAxleShare.Size = New System.Drawing.Size(53, 20)
-        Me.TbAxleShare.TabIndex = 0
-        '
-        'Label2
-        '
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(168, 11)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(16, 13)
-        Me.Label2.TabIndex = 1
-        Me.Label2.Text = "[-]"
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(41, 108)
-        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(188, 108)
-        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(98, 105)
-        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(53, 154)
-        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(188, 154)
-        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(98, 151)
-        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(223, 108)
-        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(223, 154)
-        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(255, 19)
-        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(9, 49)
-        Me.PnAxle.Name = "PnAxle"
-        Me.PnAxle.Size = New System.Drawing.Size(394, 39)
-        Me.PnAxle.TabIndex = 5
-        '
-        'TbI_wheels
-        '
-        Me.TbI_wheels.Location = New System.Drawing.Point(287, 8)
-        Me.TbI_wheels.Name = "TbI_wheels"
-        Me.TbI_wheels.Size = New System.Drawing.Size(57, 20)
-        Me.TbI_wheels.TabIndex = 26
-        '
-        'Label7
-        '
-        Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(206, 11)
-        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(350, 11)
-        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(6, 20)
-        Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(43, 13)
-        Me.Label8.TabIndex = 6
-        Me.Label8.Text = "Wheels"
-        '
-        'CbWheels
-        '
-        Me.CbWheels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.CbWheels.FormattingEnabled = True
-        Me.CbWheels.Location = New System.Drawing.Point(55, 17)
-        Me.CbWheels.Name = "CbWheels"
-        Me.CbWheels.Size = New System.Drawing.Size(176, 21)
-        Me.CbWheels.TabIndex = 7
-        '
-        'F_VEH_Axle
-        '
-        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(408, 258)
-        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.FixedDialog
-        Me.MaximizeBox = False
-        Me.MinimizeBox = False
-        Me.Name = "F_VEH_Axle"
-        Me.ShowInTaskbar = False
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        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.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(250, 217)
+		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(7, 10)
+		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(109, 8)
+		Me.TbAxleShare.Name = "TbAxleShare"
+		Me.TbAxleShare.Size = New System.Drawing.Size(53, 20)
+		Me.TbAxleShare.TabIndex = 0
+		'
+		'Label2
+		'
+		Me.Label2.AutoSize = True
+		Me.Label2.Location = New System.Drawing.Point(168, 11)
+		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(41, 108)
+		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(188, 108)
+		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(98, 105)
+		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(53, 154)
+		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(188, 154)
+		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(98, 151)
+		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(223, 108)
+		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(223, 154)
+		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(255, 19)
+		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(9, 49)
+		Me.PnAxle.Name = "PnAxle"
+		Me.PnAxle.Size = New System.Drawing.Size(394, 39)
+		Me.PnAxle.TabIndex = 5
+		'
+		'TbI_wheels
+		'
+		Me.TbI_wheels.Location = New System.Drawing.Point(292, 8)
+		Me.TbI_wheels.Name = "TbI_wheels"
+		Me.TbI_wheels.Size = New System.Drawing.Size(57, 20)
+		Me.TbI_wheels.TabIndex = 26
+		'
+		'Label7
+		'
+		Me.Label7.AutoSize = True
+		Me.Label7.Location = New System.Drawing.Point(211, 11)
+		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(355, 11)
+		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(6, 20)
+		Me.Label8.Name = "Label8"
+		Me.Label8.Size = New System.Drawing.Size(43, 13)
+		Me.Label8.TabIndex = 6
+		Me.Label8.Text = "Wheels"
+		'
+		'CbWheels
+		'
+		Me.CbWheels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+		Me.CbWheels.FormattingEnabled = True
+		Me.CbWheels.Location = New System.Drawing.Point(55, 17)
+		Me.CbWheels.Name = "CbWheels"
+		Me.CbWheels.Size = New System.Drawing.Size(176, 21)
+		Me.CbWheels.TabIndex = 7
+		'
+		'F_VEH_Axle
+		'
+		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(408, 258)
+		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.FixedDialog
+		Me.MaximizeBox = False
+		Me.MinimizeBox = False
+		Me.Name = "F_VEH_Axle"
+		Me.ShowInTaskbar = False
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		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 System.Windows.Forms.TableLayoutPanel
     Friend WithEvents OK_Button As System.Windows.Forms.Button
     Friend WithEvents Cancel_Button As System.Windows.Forms.Button
diff --git a/VECTO/GUI/F_GBX_GearDlog.Designer.vb b/VECTO/GUI/GearboxGearDialog.Designer.vb
similarity index 82%
rename from VECTO/GUI/F_GBX_GearDlog.Designer.vb
rename to VECTO/GUI/GearboxGearDialog.Designer.vb
index d8509838d84843bf18ce80dcdb72b58427f8d857..ca670c4f7ab0c600e97adeda1f513ceb73585927 100644
--- a/VECTO/GUI/F_GBX_GearDlog.Designer.vb
+++ b/VECTO/GUI/GearboxGearDialog.Designer.vb
@@ -1,305 +1,318 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class F_GBX_GearDlog
-    Inherits System.Windows.Forms.Form
-
-    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        Try
-            If disposing AndAlso components IsNot Nothing Then
-                components.Dispose()
-            End If
-        Finally
-            MyBase.Dispose(disposing)
-        End Try
-    End Sub
-
-    'Wird vom Windows Form-Designer benötigt.
-    Private components As System.ComponentModel.IContainer
-
-    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
-    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
-    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.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.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.ChIsTCgear = New System.Windows.Forms.CheckBox()
-		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.BtBrowseFld = New System.Windows.Forms.Button()
-		Me.TbFld = New System.Windows.Forms.TextBox()
-		Me.PnFld = New System.Windows.Forms.Panel()
-		Me.Label6 = 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(380, 217)
-		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 = 0
-		'
-		'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 = 2
-		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(149, 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(111, 9)
-		Me.Label2.Name = "Label2"
-		Me.Label2.Size = New System.Drawing.Size(32, 13)
-		Me.Label2.TabIndex = 4
-		Me.Label2.Text = "Ratio"
-		'
-		'TbMapPath
-		'
-		Me.TbMapPath.Location = New System.Drawing.Point(12, 61)
-		Me.TbMapPath.Name = "TbMapPath"
-		Me.TbMapPath.Size = New System.Drawing.Size(476, 20)
-		Me.TbMapPath.TabIndex = 5
-		'
-		'Label3
-		'
-		Me.Label3.AutoSize = True
-		Me.Label3.Location = New System.Drawing.Point(12, 45)
-		Me.Label3.Name = "Label3"
-		Me.Label3.Size = New System.Drawing.Size(126, 13)
-		Me.Label3.TabIndex = 7
-		Me.Label3.Text = "Loss Map or Efficiency [-]"
-		'
-		'BtBrowse
-		'
-		Me.BtBrowse.Location = New System.Drawing.Point(494, 59)
-		Me.BtBrowse.Name = "BtBrowse"
-		Me.BtBrowse.Size = New System.Drawing.Size(32, 23)
-		Me.BtBrowse.TabIndex = 8
-		Me.BtBrowse.Text = "..."
-		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(307, 220)
-		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
-		'
-		'ChIsTCgear
-		'
-		Me.ChIsTCgear.AutoSize = True
-		Me.ChIsTCgear.Location = New System.Drawing.Point(236, 8)
-		Me.ChIsTCgear.Name = "ChIsTCgear"
-		Me.ChIsTCgear.Size = New System.Drawing.Size(241, 17)
-		Me.ChIsTCgear.TabIndex = 10
-		Me.ChIsTCgear.Text = "Torque Conveter active (lock-up clutch open)"
-		Me.ChIsTCgear.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 = 12
-		'
-		'BtShiftPolyBrowse
-		'
-		Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(484, 15)
-		Me.BtShiftPolyBrowse.Name = "BtShiftPolyBrowse"
-		Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(32, 23)
-		Me.BtShiftPolyBrowse.TabIndex = 13
-		Me.BtShiftPolyBrowse.TabStop = False
-		Me.BtShiftPolyBrowse.Text = "..."
-		Me.BtShiftPolyBrowse.UseVisualStyleBackColor = True
-		'
-		'Label4
-		'
-		Me.Label4.AutoSize = True
-		Me.Label4.Location = New System.Drawing.Point(2, 1)
-		Me.Label4.Name = "Label4"
-		Me.Label4.Size = New System.Drawing.Size(89, 13)
-		Me.Label4.TabIndex = 11
-		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, 90)
-		Me.PnShiftPoly.Name = "PnShiftPoly"
-		Me.PnShiftPoly.Size = New System.Drawing.Size(525, 46)
-		Me.PnShiftPoly.TabIndex = 14
-		'
-		'Label5
-		'
-		Me.Label5.AutoSize = True
-		Me.Label5.Location = New System.Drawing.Point(2, 3)
-		Me.Label5.Name = "Label5"
-		Me.Label5.Size = New System.Drawing.Size(81, 13)
-		Me.Label5.TabIndex = 11
-		Me.Label5.Text = "Full Load Curve"
-		'
-		'BtBrowseFld
-		'
-		Me.BtBrowseFld.Location = New System.Drawing.Point(484, 17)
-		Me.BtBrowseFld.Name = "BtBrowseFld"
-		Me.BtBrowseFld.Size = New System.Drawing.Size(32, 23)
-		Me.BtBrowseFld.TabIndex = 13
-		Me.BtBrowseFld.TabStop = False
-		Me.BtBrowseFld.Text = "..."
-		Me.BtBrowseFld.UseVisualStyleBackColor = True
-		'
-		'TbFld
-		'
-		Me.TbFld.Location = New System.Drawing.Point(2, 19)
-		Me.TbFld.Name = "TbFld"
-		Me.TbFld.Size = New System.Drawing.Size(476, 20)
-		Me.TbFld.TabIndex = 12
-		'
-		'PnFld
-		'
-		Me.PnFld.Controls.Add(Me.Label6)
-		Me.PnFld.Controls.Add(Me.TbFld)
-		Me.PnFld.Controls.Add(Me.BtBrowseFld)
-		Me.PnFld.Controls.Add(Me.Label5)
-		Me.PnFld.Location = New System.Drawing.Point(10, 144)
-		Me.PnFld.Name = "PnFld"
-		Me.PnFld.Size = New System.Drawing.Size(523, 65)
-		Me.PnFld.TabIndex = 15
-		'
-		'Label6
-		'
-		Me.Label6.AutoSize = True
-		Me.Label6.Location = New System.Drawing.Point(3, 42)
-		Me.Label6.Name = "Label6"
-		Me.Label6.Size = New System.Drawing.Size(344, 13)
-		Me.Label6.TabIndex = 14
-		Me.Label6.Text = "If no file is defined the Full Load Curve from the Engine File will be used."
-		'
-		'F_GBX_GearDlog
-		'
-		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(538, 258)
-		Me.Controls.Add(Me.PnFld)
-		Me.Controls.Add(Me.PnShiftPoly)
-		Me.Controls.Add(Me.ChIsTCgear)
-		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.FixedDialog
-		Me.MaximizeBox = False
-		Me.MinimizeBox = False
-		Me.Name = "F_GBX_GearDlog"
-		Me.ShowInTaskbar = False
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-		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
-	Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
-	Friend WithEvents OK_Button As System.Windows.Forms.Button
-	Friend WithEvents Cancel_Button As System.Windows.Forms.Button
-	Friend WithEvents TbGear As System.Windows.Forms.TextBox
-	Friend WithEvents Label1 As System.Windows.Forms.Label
-	Friend WithEvents TbRatio As System.Windows.Forms.TextBox
-	Friend WithEvents Label2 As System.Windows.Forms.Label
-	Friend WithEvents TbMapPath As System.Windows.Forms.TextBox
-	Friend WithEvents Label3 As System.Windows.Forms.Label
-	Friend WithEvents BtBrowse As System.Windows.Forms.Button
-	Friend WithEvents BtNext As System.Windows.Forms.Button
-	Friend WithEvents ChIsTCgear As System.Windows.Forms.CheckBox
-	Friend WithEvents TbShiftPolyFile As System.Windows.Forms.TextBox
-	Friend WithEvents BtShiftPolyBrowse As System.Windows.Forms.Button
-	Friend WithEvents Label4 As System.Windows.Forms.Label
-	Friend WithEvents PnShiftPoly As System.Windows.Forms.Panel
-	Friend WithEvents Label5 As System.Windows.Forms.Label
-	Friend WithEvents BtBrowseFld As System.Windows.Forms.Button
-	Friend WithEvents TbFld As System.Windows.Forms.TextBox
-	Friend WithEvents PnFld As System.Windows.Forms.Panel
-	Friend WithEvents Label6 As System.Windows.Forms.Label
-
-End Class
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class GearboxGearDialog
+	Inherits System.Windows.Forms.Form
+
+	'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+	<System.Diagnostics.DebuggerNonUserCode()> _
+	Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+		Try
+			If disposing AndAlso components IsNot Nothing Then
+				components.Dispose()
+			End If
+		Finally
+			MyBase.Dispose(disposing)
+		End Try
+	End Sub
+
+	'Wird vom Windows Form-Designer benötigt.
+	Private components As System.ComponentModel.IContainer
+
+	'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+	'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+	'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+	<System.Diagnostics.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.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.ChIsTCgear = New System.Windows.Forms.CheckBox()
+		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.BtBrowseFld = New System.Windows.Forms.Button()
+		Me.TbFld = 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.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(380, 217)
+		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(149, 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(111, 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, 61)
+		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(12, 45)
+		Me.Label3.Name = "Label3"
+		Me.Label3.Size = New System.Drawing.Size(157, 13)
+		Me.Label3.TabIndex = 5
+		Me.Label3.Text = "Loss Map file or Efficiency [0..1]"
+		'
+		'BtBrowse
+		'
+		Me.BtBrowse.Location = New System.Drawing.Point(494, 59)
+		Me.BtBrowse.Name = "BtBrowse"
+		Me.BtBrowse.Size = New System.Drawing.Size(32, 23)
+		Me.BtBrowse.TabIndex = 7
+		Me.BtBrowse.Text = "..."
+		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(307, 220)
+		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
+		'
+		'ChIsTCgear
+		'
+		Me.ChIsTCgear.AutoSize = True
+		Me.ChIsTCgear.Location = New System.Drawing.Point(236, 8)
+		Me.ChIsTCgear.Name = "ChIsTCgear"
+		Me.ChIsTCgear.Size = New System.Drawing.Size(241, 17)
+		Me.ChIsTCgear.TabIndex = 4
+		Me.ChIsTCgear.Text = "Torque Conveter active (lock-up clutch open)"
+		Me.ChIsTCgear.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.Location = New System.Drawing.Point(484, 15)
+		Me.BtShiftPolyBrowse.Name = "BtShiftPolyBrowse"
+		Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(32, 23)
+		Me.BtShiftPolyBrowse.TabIndex = 2
+		Me.BtShiftPolyBrowse.TabStop = False
+		Me.BtShiftPolyBrowse.Text = "..."
+		Me.BtShiftPolyBrowse.UseVisualStyleBackColor = True
+		'
+		'Label4
+		'
+		Me.Label4.AutoSize = True
+		Me.Label4.Location = New System.Drawing.Point(2, 1)
+		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, 90)
+		Me.PnShiftPoly.Name = "PnShiftPoly"
+		Me.PnShiftPoly.Size = New System.Drawing.Size(525, 46)
+		Me.PnShiftPoly.TabIndex = 8
+		'
+		'Label5
+		'
+		Me.Label5.AutoSize = True
+		Me.Label5.Location = New System.Drawing.Point(2, 3)
+		Me.Label5.Name = "Label5"
+		Me.Label5.Size = New System.Drawing.Size(97, 13)
+		Me.Label5.TabIndex = 0
+		Me.Label5.Text = "Full Load Curve file"
+		'
+		'BtBrowseFld
+		'
+		Me.BtBrowseFld.Location = New System.Drawing.Point(484, 17)
+		Me.BtBrowseFld.Name = "BtBrowseFld"
+		Me.BtBrowseFld.Size = New System.Drawing.Size(32, 23)
+		Me.BtBrowseFld.TabIndex = 2
+		Me.BtBrowseFld.TabStop = False
+		Me.BtBrowseFld.Text = "..."
+		Me.BtBrowseFld.UseVisualStyleBackColor = True
+		'
+		'TbFld
+		'
+		Me.TbFld.Location = New System.Drawing.Point(2, 19)
+		Me.TbFld.Name = "TbFld"
+		Me.TbFld.Size = New System.Drawing.Size(476, 20)
+		Me.TbFld.TabIndex = 1
+		'
+		'PnFld
+		'
+		Me.PnFld.Controls.Add(Me.Label6)
+		Me.PnFld.Controls.Add(Me.TbFld)
+		Me.PnFld.Controls.Add(Me.BtBrowseFld)
+		Me.PnFld.Controls.Add(Me.Label5)
+		Me.PnFld.Location = New System.Drawing.Point(10, 144)
+		Me.PnFld.Name = "PnFld"
+		Me.PnFld.Size = New System.Drawing.Size(523, 65)
+		Me.PnFld.TabIndex = 9
+		'
+		'Label6
+		'
+		Me.Label6.AutoSize = True
+		Me.Label6.Location = New System.Drawing.Point(3, 42)
+		Me.Label6.Name = "Label6"
+		Me.Label6.Size = New System.Drawing.Size(344, 13)
+		Me.Label6.TabIndex = 3
+		Me.Label6.Text = "If no file is defined the Full Load Curve from the Engine File will be used."
+		'
+		'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(234, 220)
+		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
+		'
+		'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(538, 258)
+		Me.Controls.Add(Me.BtPrevious)
+		Me.Controls.Add(Me.PnFld)
+		Me.Controls.Add(Me.PnShiftPoly)
+		Me.Controls.Add(Me.ChIsTCgear)
+		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.FixedDialog
+		Me.MaximizeBox = False
+		Me.MinimizeBox = False
+		Me.Name = "GearboxGearDialog"
+		Me.ShowInTaskbar = False
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		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
+	Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
+	Friend WithEvents OK_Button As System.Windows.Forms.Button
+	Friend WithEvents Cancel_Button As System.Windows.Forms.Button
+	Friend WithEvents TbGear As System.Windows.Forms.TextBox
+	Friend WithEvents Label1 As System.Windows.Forms.Label
+	Friend WithEvents TbRatio As System.Windows.Forms.TextBox
+	Friend WithEvents Label2 As System.Windows.Forms.Label
+	Friend WithEvents TbMapPath As System.Windows.Forms.TextBox
+	Friend WithEvents Label3 As System.Windows.Forms.Label
+	Friend WithEvents BtBrowse As System.Windows.Forms.Button
+	Friend WithEvents BtNext As System.Windows.Forms.Button
+	Friend WithEvents ChIsTCgear As System.Windows.Forms.CheckBox
+	Friend WithEvents TbShiftPolyFile As System.Windows.Forms.TextBox
+	Friend WithEvents BtShiftPolyBrowse As System.Windows.Forms.Button
+	Friend WithEvents Label4 As System.Windows.Forms.Label
+	Friend WithEvents PnShiftPoly As System.Windows.Forms.Panel
+	Friend WithEvents Label5 As System.Windows.Forms.Label
+	Friend WithEvents BtBrowseFld As System.Windows.Forms.Button
+	Friend WithEvents TbFld As System.Windows.Forms.TextBox
+	Friend WithEvents PnFld As System.Windows.Forms.Panel
+	Friend WithEvents Label6 As System.Windows.Forms.Label
+	Friend WithEvents BtPrevious As System.Windows.Forms.Button
+
+End Class
diff --git a/VECTO/GUI/F_GBX_GearDlog.resx b/VECTO/GUI/GearboxGearDialog.resx
similarity index 100%
rename from VECTO/GUI/F_GBX_GearDlog.resx
rename to VECTO/GUI/GearboxGearDialog.resx
diff --git a/VECTO/GUI/GearboxGearDialog.vb b/VECTO/GUI/GearboxGearDialog.vb
new file mode 100644
index 0000000000000000000000000000000000000000..b237053189851e7dcf9a1de2a406383c569bffe6
--- /dev/null
+++ b/VECTO/GUI/GearboxGearDialog.vb
@@ -0,0 +1,117 @@
+' Copyright 2014 European Union.
+' Licensed under the EUPL (the 'Licence');
+'
+' * You may not use this work except in compliance with the Licence.
+' * You may obtain a copy of the Licence at: http://ec.europa.eu/idabc/eupl
+' * Unless required by applicable law or agreed to in writing,
+'   software distributed under the Licence is distributed on an "AS IS" basis,
+'   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+'
+' See the LICENSE.txt for the specific language governing permissions and limitations.
+
+Imports System.Windows.Forms
+
+''' <summary>
+''' Gear Editor (Vehicle Editor sub-dialog)
+''' </summary>
+''' <remarks></remarks>
+Public Class GearboxGearDialog
+	Public NextGear As Boolean
+	Public PreviousGear As Boolean
+	Public GbxPath As String
+
+	'Save and Close
+	Private Sub OK_Button_Click(sender As Object, e As EventArgs) Handles OK_Button.Click
+
+		If Not IsNumeric(TbRatio.Text) Then
+			MsgBox("Gear ratio is invalid!")
+			TbRatio.Focus()
+			TbRatio.SelectAll()
+			Exit Sub
+		End If
+
+		If IsNumeric(TbMapPath.Text) AndAlso (TbMapPath.Text < 0 OrElse TbMapPath.Text > 1) Then
+			MsgBox("Efficiency is invalid! Must be between 0 and 1.")
+			TbMapPath.Focus()
+			TbMapPath.SelectAll()
+			Exit Sub
+		End If
+
+		NextGear = False
+		PreviousGear = False
+		DialogResult = DialogResult.OK
+		Close()
+	End Sub
+
+	'Cancel
+	Private Sub Cancel_Button_Click(sender As Object, e As EventArgs) Handles Cancel_Button.Click
+		NextGear = False
+		PreviousGear = False
+		DialogResult = DialogResult.Cancel
+		Close()
+	End Sub
+
+	'Next Gear button - Close dialog and open for next gear
+	Private Sub BtNext_Click(sender As Object, e As EventArgs) Handles BtNext.Click
+
+		If Not IsNumeric(TbRatio.Text) Then
+			MsgBox("Gear ratio is invalid!")
+			TbRatio.Focus()
+			TbRatio.SelectAll()
+			Exit Sub
+		End If
+
+		If IsNumeric(TbMapPath.Text) AndAlso (TbMapPath.Text < 0 OrElse TbMapPath.Text > 1) Then
+			MsgBox("Efficiency is invalid! Must be between 0 and 1.")
+			TbMapPath.Focus()
+			TbMapPath.SelectAll()
+			Exit Sub
+		End If
+
+		NextGear = True
+		PreviousGear = False
+		DialogResult = DialogResult.OK
+		Close()
+	End Sub
+
+	'Browse for transmission loss map
+	Private Sub BtBrowse_Click(sender As Object, e As EventArgs) Handles BtBrowse.Click
+		If fbTLM.OpenDialog(fFileRepl(TbMapPath.Text, GbxPath)) Then
+			TbMapPath.Text = fFileWoDir(fbTLM.Files(0), GbxPath)
+		End If
+	End Sub
+
+	'Browse for shift polygons file
+	Private Sub BtShiftPolyBrowse_Click(sender As Object, e As EventArgs) Handles BtShiftPolyBrowse.Click
+		If fbGBS.OpenDialog(fFileRepl(TbShiftPolyFile.Text, GbxPath)) Then
+			TbShiftPolyFile.Text = fFileWoDir(fbGBS.Files(0), GbxPath)
+		End If
+	End Sub
+
+	Private Sub BtBrowseFld_Click(sender As Object, e As EventArgs) Handles BtBrowseFld.Click
+		If fbFLD.OpenDialog(fFileRepl(TbFld.Text, GbxPath)) Then
+			TbFld.Text = fFileWoDir(fbFLD.Files(0), GbxPath)
+		End If
+	End Sub
+
+	Private Sub Button1_Click(sender As Object, e As EventArgs) Handles BtPrevious.Click
+		If Not IsNumeric(TbRatio.Text) Then
+			MsgBox("Gear ratio is invalid!")
+			TbRatio.Focus()
+			TbRatio.SelectAll()
+			Exit Sub
+		End If
+
+		If IsNumeric(TbMapPath.Text) AndAlso (TbMapPath.Text < 0 OrElse TbMapPath.Text > 1) Then
+			MsgBox("Efficiency is invalid! Must be between 0 and 1.")
+			TbMapPath.Focus()
+			TbMapPath.SelectAll()
+			Exit Sub
+		End If
+
+		PreviousGear = True
+		NextGear = False
+		DialogResult = DialogResult.OK
+		Close()
+	End Sub
+End Class
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 24edccaada55778d0cb4ff15181f2092ecae4afc..3e6c8a0b7cc30c7400d405454c9e2246b21d98d9 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -247,10 +247,10 @@
     <Compile Include="Input Files\cDRI.vb" />
     <Compile Include="Input Files\cVECTO.vb" />
     <Compile Include="Input Files\cVEH.vb" />
-    <Compile Include="GUI\F_GBX_GearDlog.Designer.vb">
-      <DependentUpon>F_GBX_GearDlog.vb</DependentUpon>
+    <Compile Include="GUI\GearboxGearDialog.Designer.vb">
+      <DependentUpon>GearboxGearDialog.vb</DependentUpon>
     </Compile>
-    <Compile Include="GUI\F_GBX_GearDlog.vb">
+    <Compile Include="GUI\GearboxGearDialog.vb">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Input Files\cSubPath.vb" />
@@ -378,8 +378,8 @@
     <EmbeddedResource Include="GUI\F_VEH_Axle.resx">
       <DependentUpon>F_VEH_Axle.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="GUI\F_GBX_GearDlog.resx">
-      <DependentUpon>F_GBX_GearDlog.vb</DependentUpon>
+    <EmbeddedResource Include="GUI\GearboxGearDialog.resx">
+      <DependentUpon>GearboxGearDialog.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="My Project\Resources.resx">
       <Generator>VbMyResourcesResXFileCodeGenerator</Generator>