diff --git a/VECTO/GUI/IEPCForm.Designer.vb b/VECTO/GUI/IEPCForm.Designer.vb
index 2a4b898005449429d07b8b69d573d08cdc990363..4d9b7ab64fa88f32d6e574d455d41c83052b4c37 100644
--- a/VECTO/GUI/IEPCForm.Designer.vb
+++ b/VECTO/GUI/IEPCForm.Designer.vb
@@ -28,7 +28,6 @@ Partial Class IEPCForm
         Me.tbThermalOverload = New System.Windows.Forms.TextBox()
         Me.Label52 = New System.Windows.Forms.Label()
         Me.Label48 = New System.Windows.Forms.Label()
-        Me.tbNumberOfDesignTypeWheelMotor = New System.Windows.Forms.TextBox()
         Me.Label51 = New System.Windows.Forms.Label()
         Me.tbInertia = New System.Windows.Forms.TextBox()
         Me.Label49 = New System.Windows.Forms.Label()
@@ -62,15 +61,15 @@ Partial Class IEPCForm
         Me.TableLayoutPanel6 = New System.Windows.Forms.TableLayoutPanel()
         Me.Label47 = New System.Windows.Forms.Label()
         Me.lvPowerMap1 = New System.Windows.Forms.ListView()
-        Me.ColumnHeader13 = New System.Windows.Forms.ColumnHeader()
-        Me.ColumnHeader14 = New System.Windows.Forms.ColumnHeader()
+        Me.ColumnHeader13 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader14 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
         Me.tpVoltageLevel = New System.Windows.Forms.TabPage()
         Me.GroupBox4 = New System.Windows.Forms.GroupBox()
         Me.TableLayoutPanel2 = New System.Windows.Forms.TableLayoutPanel()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.lvPowerMap2 = New System.Windows.Forms.ListView()
-        Me.ColumnHeader6 = New System.Windows.Forms.ColumnHeader()
-        Me.ColumnHeader7 = New 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.FlowLayoutPanel10 = New System.Windows.Forms.FlowLayoutPanel()
         Me.Label28 = New System.Windows.Forms.Label()
         Me.tbFLCurve2 = New System.Windows.Forms.TextBox()
@@ -105,14 +104,14 @@ Partial Class IEPCForm
         Me.btRemoveGear = New System.Windows.Forms.Button()
         Me.Label6 = New System.Windows.Forms.Label()
         Me.lvGear = New System.Windows.Forms.ListView()
-        Me.ColumnHeader1 = New System.Windows.Forms.ColumnHeader()
-        Me.ColumnHeader2 = New System.Windows.Forms.ColumnHeader()
-        Me.ColumnHeader3 = New System.Windows.Forms.ColumnHeader()
+        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.GroupBox3 = New System.Windows.Forms.GroupBox()
         Me.TableLayoutPanel3 = New System.Windows.Forms.TableLayoutPanel()
         Me.lvDragCurve = New System.Windows.Forms.ListView()
-        Me.ColumnHeader4 = New System.Windows.Forms.ColumnHeader()
-        Me.ColumnHeader5 = New System.Windows.Forms.ColumnHeader()
+        Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
+        Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
         Me.FlowLayoutPanel11 = New System.Windows.Forms.FlowLayoutPanel()
         Me.btAddDragCurve = New System.Windows.Forms.Button()
         Me.btRemoveDragCurve = New System.Windows.Forms.Button()
@@ -152,6 +151,7 @@ Partial Class IEPCForm
         Me.pnElectricMachineType = New System.Windows.Forms.Panel()
         Me.cbEmType = New System.Windows.Forms.ComboBox()
         Me.lblEmType = New System.Windows.Forms.Label()
+        Me.cbNumWheelMotors = New System.Windows.Forms.ComboBox()
         Me.tcVoltageLevels.SuspendLayout
         Me.tpFirstVoltageLevel.SuspendLayout
         Me.FlowLayoutPanel9.SuspendLayout
@@ -187,86 +187,72 @@ Partial Class IEPCForm
         '
         Me.btFLCurveFile1.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.btFLCurveFile1.Image = CType(resources.GetObject("btFLCurveFile1.Image"),System.Drawing.Image)
-        Me.btFLCurveFile1.Location = New System.Drawing.Point(487, 0)
+        Me.btFLCurveFile1.Location = New System.Drawing.Point(425, 1)
         Me.btFLCurveFile1.Margin = New System.Windows.Forms.Padding(0)
         Me.btFLCurveFile1.Name = "btFLCurveFile1"
-        Me.btFLCurveFile1.Size = New System.Drawing.Size(28, 28)
+        Me.btFLCurveFile1.Size = New System.Drawing.Size(24, 24)
         Me.btFLCurveFile1.TabIndex = 15
         Me.btFLCurveFile1.UseVisualStyleBackColor = true
         '
         'tbThermalOverload
         '
-        Me.tbThermalOverload.Location = New System.Drawing.Point(222, 1)
-        Me.tbThermalOverload.Margin = New System.Windows.Forms.Padding(35, 3, 4, 3)
+        Me.tbThermalOverload.Location = New System.Drawing.Point(190, 1)
+        Me.tbThermalOverload.Margin = New System.Windows.Forms.Padding(30, 3, 3, 3)
         Me.tbThermalOverload.Name = "tbThermalOverload"
-        Me.tbThermalOverload.Size = New System.Drawing.Size(65, 23)
+        Me.tbThermalOverload.Size = New System.Drawing.Size(56, 20)
         Me.tbThermalOverload.TabIndex = 3
         '
         'Label52
         '
         Me.Label52.AutoSize = true
-        Me.Label52.Location = New System.Drawing.Point(6, 4)
-        Me.Label52.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label52.Location = New System.Drawing.Point(5, 3)
         Me.Label52.Name = "Label52"
-        Me.Label52.Size = New System.Drawing.Size(188, 15)
+        Me.Label52.Size = New System.Drawing.Size(173, 13)
         Me.Label52.TabIndex = 50
         Me.Label52.Text = "Thermal Overload Recovery Factor"
         '
         'Label48
         '
         Me.Label48.AutoSize = true
-        Me.Label48.Location = New System.Drawing.Point(4, 5)
-        Me.Label48.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label48.Location = New System.Drawing.Point(3, 4)
         Me.Label48.Name = "Label48"
-        Me.Label48.Size = New System.Drawing.Size(227, 15)
+        Me.Label48.Size = New System.Drawing.Size(207, 13)
         Me.Label48.TabIndex = 48
         Me.Label48.Text = "Nr of Design Type Wheel Motor Measured"
         '
-        'tbNumberOfDesignTypeWheelMotor
-        '
-        Me.tbNumberOfDesignTypeWheelMotor.Enabled = false
-        Me.tbNumberOfDesignTypeWheelMotor.Location = New System.Drawing.Point(254, 2)
-        Me.tbNumberOfDesignTypeWheelMotor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
-        Me.tbNumberOfDesignTypeWheelMotor.Name = "tbNumberOfDesignTypeWheelMotor"
-        Me.tbNumberOfDesignTypeWheelMotor.Size = New System.Drawing.Size(34, 23)
-        Me.tbNumberOfDesignTypeWheelMotor.TabIndex = 5
-        '
         'Label51
         '
         Me.Label51.AutoSize = true
-        Me.Label51.Location = New System.Drawing.Point(5, 7)
-        Me.Label51.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label51.Location = New System.Drawing.Point(4, 6)
         Me.Label51.Name = "Label51"
-        Me.Label51.Size = New System.Drawing.Size(40, 15)
+        Me.Label51.Size = New System.Drawing.Size(36, 13)
         Me.Label51.TabIndex = 45
         Me.Label51.Text = "Inertia"
         '
         'tbInertia
         '
-        Me.tbInertia.Location = New System.Drawing.Point(222, 4)
-        Me.tbInertia.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.tbInertia.Location = New System.Drawing.Point(190, 3)
         Me.tbInertia.Name = "tbInertia"
-        Me.tbInertia.Size = New System.Drawing.Size(66, 23)
+        Me.tbInertia.Size = New System.Drawing.Size(57, 20)
         Me.tbInertia.TabIndex = 2
         '
         'Label49
         '
         Me.Label49.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label49.AutoSize = true
-        Me.Label49.Location = New System.Drawing.Point(4, 7)
-        Me.Label49.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label49.Location = New System.Drawing.Point(3, 6)
         Me.Label49.Name = "Label49"
-        Me.Label49.Size = New System.Drawing.Size(96, 15)
+        Me.Label49.Size = New System.Drawing.Size(87, 13)
         Me.Label49.TabIndex = 43
         Me.Label49.Text = "Make and Model"
         '
         'tbModel
         '
         Me.tbModel.Anchor = System.Windows.Forms.AnchorStyles.Left
-        Me.tbModel.Location = New System.Drawing.Point(108, 3)
-        Me.tbModel.Margin = New System.Windows.Forms.Padding(4, 3, 0, 3)
+        Me.tbModel.Location = New System.Drawing.Point(96, 3)
+        Me.tbModel.Margin = New System.Windows.Forms.Padding(3, 3, 0, 3)
         Me.tbModel.Name = "tbModel"
-        Me.tbModel.Size = New System.Drawing.Size(482, 23)
+        Me.tbModel.Size = New System.Drawing.Size(414, 20)
         Me.tbModel.TabIndex = 1
         '
         'tcVoltageLevels
@@ -274,11 +260,10 @@ Partial Class IEPCForm
         Me.tcVoltageLevels.Anchor = System.Windows.Forms.AnchorStyles.Top
         Me.tcVoltageLevels.Controls.Add(Me.tpFirstVoltageLevel)
         Me.tcVoltageLevels.Controls.Add(Me.tpVoltageLevel)
-        Me.tcVoltageLevels.Location = New System.Drawing.Point(19, 246)
-        Me.tcVoltageLevels.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.tcVoltageLevels.Location = New System.Drawing.Point(16, 213)
         Me.tcVoltageLevels.Name = "tcVoltageLevels"
         Me.tcVoltageLevels.SelectedIndex = 0
-        Me.tcVoltageLevels.Size = New System.Drawing.Size(603, 372)
+        Me.tcVoltageLevels.Size = New System.Drawing.Size(517, 322)
         Me.tcVoltageLevels.TabIndex = 107
         '
         'tpFirstVoltageLevel
@@ -286,11 +271,10 @@ Partial Class IEPCForm
         Me.tpFirstVoltageLevel.Controls.Add(Me.FlowLayoutPanel9)
         Me.tpFirstVoltageLevel.Controls.Add(Me.TableLayoutPanel1)
         Me.tpFirstVoltageLevel.Controls.Add(Me.GroupBox2)
-        Me.tpFirstVoltageLevel.Location = New System.Drawing.Point(4, 24)
-        Me.tpFirstVoltageLevel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.tpFirstVoltageLevel.Location = New System.Drawing.Point(4, 22)
         Me.tpFirstVoltageLevel.Name = "tpFirstVoltageLevel"
-        Me.tpFirstVoltageLevel.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
-        Me.tpFirstVoltageLevel.Size = New System.Drawing.Size(595, 344)
+        Me.tpFirstVoltageLevel.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.tpFirstVoltageLevel.Size = New System.Drawing.Size(509, 296)
         Me.tpFirstVoltageLevel.TabIndex = 0
         Me.tpFirstVoltageLevel.Text = "Voltage Level Low"
         Me.tpFirstVoltageLevel.UseVisualStyleBackColor = true
@@ -302,39 +286,38 @@ Partial Class IEPCForm
         Me.FlowLayoutPanel9.Controls.Add(Me.tbFLCurve1)
         Me.FlowLayoutPanel9.Controls.Add(Me.btFLCurveFile1)
         Me.FlowLayoutPanel9.Controls.Add(Me.btShowFLCurve1)
-        Me.FlowLayoutPanel9.Location = New System.Drawing.Point(7, 108)
-        Me.FlowLayoutPanel9.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.FlowLayoutPanel9.Location = New System.Drawing.Point(6, 94)
         Me.FlowLayoutPanel9.Name = "FlowLayoutPanel9"
-        Me.FlowLayoutPanel9.Size = New System.Drawing.Size(579, 30)
+        Me.FlowLayoutPanel9.Size = New System.Drawing.Size(496, 26)
         Me.FlowLayoutPanel9.TabIndex = 108
         '
         'Label44
         '
         Me.Label44.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.Label44.AutoSize = true
-        Me.Label44.Location = New System.Drawing.Point(16, 7)
-        Me.Label44.Margin = New System.Windows.Forms.Padding(16, 0, 0, 0)
+        Me.Label44.Location = New System.Drawing.Point(14, 6)
+        Me.Label44.Margin = New System.Windows.Forms.Padding(14, 0, 0, 0)
         Me.Label44.Name = "Label44"
-        Me.Label44.Size = New System.Drawing.Size(138, 15)
+        Me.Label44.Size = New System.Drawing.Size(125, 13)
         Me.Label44.TabIndex = 59
         Me.Label44.Text = "Full Load Curve (.viepcp)"
         '
         'tbFLCurve1
         '
         Me.tbFLCurve1.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.tbFLCurve1.Location = New System.Drawing.Point(158, 3)
-        Me.tbFLCurve1.Margin = New System.Windows.Forms.Padding(4, 3, 7, 3)
+        Me.tbFLCurve1.Location = New System.Drawing.Point(142, 3)
+        Me.tbFLCurve1.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
         Me.tbFLCurve1.Name = "tbFLCurve1"
-        Me.tbFLCurve1.Size = New System.Drawing.Size(322, 23)
+        Me.tbFLCurve1.Size = New System.Drawing.Size(277, 20)
         Me.tbFLCurve1.TabIndex = 14
         '
         'btShowFLCurve1
         '
         Me.btShowFLCurve1.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
-        Me.btShowFLCurve1.Location = New System.Drawing.Point(515, 1)
+        Me.btShowFLCurve1.Location = New System.Drawing.Point(449, 1)
         Me.btShowFLCurve1.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
         Me.btShowFLCurve1.Name = "btShowFLCurve1"
-        Me.btShowFLCurve1.Size = New System.Drawing.Size(28, 28)
+        Me.btShowFLCurve1.Size = New System.Drawing.Size(24, 24)
         Me.btShowFLCurve1.TabIndex = 85
         Me.btShowFLCurve1.TabStop = false
         Me.btShowFLCurve1.UseVisualStyleBackColor = true
@@ -342,13 +325,13 @@ Partial Class IEPCForm
         'TableLayoutPanel1
         '
         Me.TableLayoutPanel1.ColumnCount = 7
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160!))
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 75!))
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 41!))
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 143!))
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 72!))
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37!))
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 67!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 137!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 64!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 35!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 123!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 32!))
+        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 57!))
         Me.TableLayoutPanel1.Controls.Add(Me.Label11, 2, 1)
         Me.TableLayoutPanel1.Controls.Add(Me.Label4, 2, 0)
         Me.TableLayoutPanel1.Controls.Add(Me.Label13, 5, 0)
@@ -367,24 +350,23 @@ Partial Class IEPCForm
         Me.TableLayoutPanel1.Controls.Add(Me.Label41, 3, 1)
         Me.TableLayoutPanel1.Controls.Add(Me.tbOverloadTorque1, 4, 1)
         Me.TableLayoutPanel1.Controls.Add(Me.Label12, 5, 1)
-        Me.TableLayoutPanel1.Location = New System.Drawing.Point(7, 8)
-        Me.TableLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(6, 7)
         Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
         Me.TableLayoutPanel1.RowCount = 3
-        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
-        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
-        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
-        Me.TableLayoutPanel1.Size = New System.Drawing.Size(579, 95)
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+        Me.TableLayoutPanel1.Size = New System.Drawing.Size(496, 82)
         Me.TableLayoutPanel1.TabIndex = 107
         '
         'Label11
         '
         Me.Label11.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.Label11.AutoSize = true
-        Me.Label11.Location = New System.Drawing.Point(238, 39)
+        Me.Label11.Location = New System.Drawing.Point(204, 34)
         Me.Label11.Margin = New System.Windows.Forms.Padding(0)
         Me.Label11.Name = "Label11"
-        Me.Label11.Size = New System.Drawing.Size(35, 15)
+        Me.Label11.Size = New System.Drawing.Size(29, 13)
         Me.Label11.TabIndex = 63
         Me.Label11.Text = "[Nm]"
         '
@@ -392,10 +374,10 @@ Partial Class IEPCForm
         '
         Me.Label4.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.Label4.AutoSize = true
-        Me.Label4.Location = New System.Drawing.Point(244, 8)
+        Me.Label4.Location = New System.Drawing.Point(208, 7)
         Me.Label4.Margin = New System.Windows.Forms.Padding(0)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(22, 15)
+        Me.Label4.Size = New System.Drawing.Size(20, 13)
         Me.Label4.TabIndex = 62
         Me.Label4.Text = "[V]"
         '
@@ -403,10 +385,10 @@ Partial Class IEPCForm
         '
         Me.Label13.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.Label13.AutoSize = true
-        Me.Label13.Location = New System.Drawing.Point(499, 8)
+        Me.Label13.Location = New System.Drawing.Point(428, 7)
         Me.Label13.Margin = New System.Windows.Forms.Padding(0)
         Me.Label13.Name = "Label13"
-        Me.Label13.Size = New System.Drawing.Size(20, 15)
+        Me.Label13.Size = New System.Drawing.Size(18, 13)
         Me.Label13.TabIndex = 65
         Me.Label13.Text = "[s]"
         '
@@ -414,10 +396,9 @@ Partial Class IEPCForm
         '
         Me.Label43.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label43.AutoSize = true
-        Me.Label43.Location = New System.Drawing.Point(331, 8)
-        Me.Label43.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label43.Location = New System.Drawing.Point(280, 7)
         Me.Label43.Name = "Label43"
-        Me.Label43.Size = New System.Drawing.Size(84, 15)
+        Me.Label43.Size = New System.Drawing.Size(76, 13)
         Me.Label43.TabIndex = 11
         Me.Label43.Text = "Overload Time"
         '
@@ -425,39 +406,37 @@ Partial Class IEPCForm
         '
         Me.Label37.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label37.AutoSize = true
-        Me.Label37.Location = New System.Drawing.Point(110, 8)
-        Me.Label37.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label37.Location = New System.Drawing.Point(91, 7)
         Me.Label37.Name = "Label37"
-        Me.Label37.Size = New System.Drawing.Size(46, 15)
+        Me.Label37.Size = New System.Drawing.Size(43, 13)
         Me.Label37.TabIndex = 1
         Me.Label37.Text = "Voltage"
         '
         'tbOverloadTime1
         '
         Me.tbOverloadTime1.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.tbOverloadTime1.Location = New System.Drawing.Point(422, 4)
+        Me.tbOverloadTime1.Location = New System.Drawing.Point(362, 3)
         Me.tbOverloadTime1.Margin = New System.Windows.Forms.Padding(0)
         Me.tbOverloadTime1.Name = "tbOverloadTime1"
-        Me.tbOverloadTime1.Size = New System.Drawing.Size(65, 23)
+        Me.tbOverloadTime1.Size = New System.Drawing.Size(56, 20)
         Me.tbOverloadTime1.TabIndex = 11
         '
         'tbVoltage1
         '
         Me.tbVoltage1.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.tbVoltage1.Location = New System.Drawing.Point(165, 4)
+        Me.tbVoltage1.Location = New System.Drawing.Point(141, 3)
         Me.tbVoltage1.Margin = New System.Windows.Forms.Padding(0)
         Me.tbVoltage1.Name = "tbVoltage1"
-        Me.tbVoltage1.Size = New System.Drawing.Size(65, 23)
+        Me.tbVoltage1.Size = New System.Drawing.Size(56, 20)
         Me.tbVoltage1.TabIndex = 8
         '
         'Label39
         '
         Me.Label39.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label39.AutoSize = true
-        Me.Label39.Location = New System.Drawing.Point(48, 39)
-        Me.Label39.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label39.Location = New System.Drawing.Point(37, 34)
         Me.Label39.Name = "Label39"
-        Me.Label39.Size = New System.Drawing.Size(108, 15)
+        Me.Label39.Size = New System.Drawing.Size(97, 13)
         Me.Label39.TabIndex = 3
         Me.Label39.Text = "Continuous Torque"
         '
@@ -465,39 +444,38 @@ Partial Class IEPCForm
         '
         Me.Label1.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label1.AutoSize = true
-        Me.Label1.Location = New System.Drawing.Point(13, 71)
-        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label1.Location = New System.Drawing.Point(3, 61)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(143, 15)
+        Me.Label1.Size = New System.Drawing.Size(131, 13)
         Me.Label1.TabIndex = 6
         Me.Label1.Text = "Continuous Torque Speed"
         '
         'tbContinousTorque1
         '
         Me.tbContinousTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.tbContinousTorque1.Location = New System.Drawing.Point(165, 35)
+        Me.tbContinousTorque1.Location = New System.Drawing.Point(141, 30)
         Me.tbContinousTorque1.Margin = New System.Windows.Forms.Padding(0)
         Me.tbContinousTorque1.Name = "tbContinousTorque1"
-        Me.tbContinousTorque1.Size = New System.Drawing.Size(65, 23)
+        Me.tbContinousTorque1.Size = New System.Drawing.Size(56, 20)
         Me.tbContinousTorque1.TabIndex = 9
         '
         'tbContinousTorqueSpeed1
         '
         Me.tbContinousTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.tbContinousTorqueSpeed1.Location = New System.Drawing.Point(165, 67)
+        Me.tbContinousTorqueSpeed1.Location = New System.Drawing.Point(141, 58)
         Me.tbContinousTorqueSpeed1.Margin = New System.Windows.Forms.Padding(0)
         Me.tbContinousTorqueSpeed1.Name = "tbContinousTorqueSpeed1"
-        Me.tbContinousTorqueSpeed1.Size = New System.Drawing.Size(65, 23)
+        Me.tbContinousTorqueSpeed1.Size = New System.Drawing.Size(56, 20)
         Me.tbContinousTorqueSpeed1.TabIndex = 10
         '
         'Label15
         '
         Me.Label15.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.Label15.AutoSize = true
-        Me.Label15.Location = New System.Drawing.Point(237, 71)
+        Me.Label15.Location = New System.Drawing.Point(203, 61)
         Me.Label15.Margin = New System.Windows.Forms.Padding(0)
         Me.Label15.Name = "Label15"
-        Me.Label15.Size = New System.Drawing.Size(37, 15)
+        Me.Label15.Size = New System.Drawing.Size(30, 13)
         Me.Label15.TabIndex = 67
         Me.Label15.Text = "[rpm]"
         '
@@ -505,10 +483,9 @@ Partial Class IEPCForm
         '
         Me.Label42.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label42.AutoSize = true
-        Me.Label42.Location = New System.Drawing.Point(286, 71)
-        Me.Label42.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label42.Location = New System.Drawing.Point(266, 55)
         Me.Label42.Name = "Label42"
-        Me.Label42.Size = New System.Drawing.Size(129, 15)
+        Me.Label42.Size = New System.Drawing.Size(90, 26)
         Me.Label42.TabIndex = 9
         Me.Label42.Text = "Overload Torque Speed"
         '
@@ -516,50 +493,47 @@ Partial Class IEPCForm
         '
         Me.Label14.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.Label14.AutoSize = true
-        Me.Label14.Location = New System.Drawing.Point(491, 71)
+        Me.Label14.Location = New System.Drawing.Point(422, 61)
         Me.Label14.Margin = New System.Windows.Forms.Padding(0)
         Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(37, 15)
+        Me.Label14.Size = New System.Drawing.Size(30, 13)
         Me.Label14.TabIndex = 66
         Me.Label14.Text = "[rpm]"
         '
         'tboverloadTorqueSpeed1
         '
         Me.tboverloadTorqueSpeed1.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.tboverloadTorqueSpeed1.Location = New System.Drawing.Point(423, 67)
-        Me.tboverloadTorqueSpeed1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.tboverloadTorqueSpeed1.Location = New System.Drawing.Point(362, 58)
         Me.tboverloadTorqueSpeed1.Name = "tboverloadTorqueSpeed1"
-        Me.tboverloadTorqueSpeed1.Size = New System.Drawing.Size(64, 23)
+        Me.tboverloadTorqueSpeed1.Size = New System.Drawing.Size(55, 20)
         Me.tboverloadTorqueSpeed1.TabIndex = 13
         '
         'Label41
         '
         Me.Label41.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label41.AutoSize = true
-        Me.Label41.Location = New System.Drawing.Point(321, 39)
-        Me.Label41.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label41.Location = New System.Drawing.Point(269, 34)
         Me.Label41.Name = "Label41"
-        Me.Label41.Size = New System.Drawing.Size(94, 15)
+        Me.Label41.Size = New System.Drawing.Size(87, 13)
         Me.Label41.TabIndex = 7
         Me.Label41.Text = "Overload Torque"
         '
         'tbOverloadTorque1
         '
         Me.tbOverloadTorque1.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.tbOverloadTorque1.Location = New System.Drawing.Point(423, 35)
-        Me.tbOverloadTorque1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.tbOverloadTorque1.Location = New System.Drawing.Point(362, 30)
         Me.tbOverloadTorque1.Name = "tbOverloadTorque1"
-        Me.tbOverloadTorque1.Size = New System.Drawing.Size(64, 23)
+        Me.tbOverloadTorque1.Size = New System.Drawing.Size(55, 20)
         Me.tbOverloadTorque1.TabIndex = 12
         '
         'Label12
         '
         Me.Label12.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.Label12.AutoSize = true
-        Me.Label12.Location = New System.Drawing.Point(492, 39)
+        Me.Label12.Location = New System.Drawing.Point(422, 34)
         Me.Label12.Margin = New System.Windows.Forms.Padding(0)
         Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(35, 15)
+        Me.Label12.Size = New System.Drawing.Size(29, 13)
         Me.Label12.TabIndex = 64
         Me.Label12.Text = "[Nm]"
         '
@@ -567,11 +541,9 @@ Partial Class IEPCForm
         '
         Me.GroupBox2.Anchor = System.Windows.Forms.AnchorStyles.Top
         Me.GroupBox2.Controls.Add(Me.TableLayoutPanel6)
-        Me.GroupBox2.Location = New System.Drawing.Point(7, 145)
-        Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.GroupBox2.Location = New System.Drawing.Point(6, 126)
         Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
-        Me.GroupBox2.Size = New System.Drawing.Size(368, 187)
+        Me.GroupBox2.Size = New System.Drawing.Size(315, 162)
         Me.GroupBox2.TabIndex = 60
         Me.GroupBox2.TabStop = false
         Me.GroupBox2.Text = "Power Map Per Gear"
@@ -580,28 +552,26 @@ Partial Class IEPCForm
         '
         Me.TableLayoutPanel6.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.TableLayoutPanel6.ColumnCount = 2
-        Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150!))
-        Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 197!))
+        Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129!))
+        Me.TableLayoutPanel6.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 170!))
         Me.TableLayoutPanel6.Controls.Add(Me.Label47, 1, 1)
         Me.TableLayoutPanel6.Controls.Add(Me.lvPowerMap1, 0, 0)
-        Me.TableLayoutPanel6.Location = New System.Drawing.Point(7, 15)
-        Me.TableLayoutPanel6.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.TableLayoutPanel6.Location = New System.Drawing.Point(6, 13)
         Me.TableLayoutPanel6.Name = "TableLayoutPanel6"
         Me.TableLayoutPanel6.RowCount = 2
         Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 88.81119!))
         Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.18881!))
-        Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23!))
-        Me.TableLayoutPanel6.Size = New System.Drawing.Size(348, 165)
+        Me.TableLayoutPanel6.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20!))
+        Me.TableLayoutPanel6.Size = New System.Drawing.Size(298, 143)
         Me.TableLayoutPanel6.TabIndex = 53
         '
         'Label47
         '
         Me.Label47.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
         Me.Label47.AutoSize = true
-        Me.Label47.Location = New System.Drawing.Point(223, 146)
-        Me.Label47.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label47.Location = New System.Drawing.Point(190, 127)
         Me.Label47.Name = "Label47"
-        Me.Label47.Size = New System.Drawing.Size(121, 15)
+        Me.Label47.Size = New System.Drawing.Size(106, 13)
         Me.Label47.TabIndex = 6
         Me.Label47.Text = "(Double-Click to Edit)"
         '
@@ -614,11 +584,11 @@ Partial Class IEPCForm
         Me.TableLayoutPanel6.SetColumnSpan(Me.lvPowerMap1, 2)
         Me.lvPowerMap1.FullRowSelect = true
         Me.lvPowerMap1.GridLines = true
-        Me.lvPowerMap1.Location = New System.Drawing.Point(4, 3)
-        Me.lvPowerMap1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.lvPowerMap1.HideSelection = false
+        Me.lvPowerMap1.Location = New System.Drawing.Point(3, 3)
         Me.lvPowerMap1.MultiSelect = false
         Me.lvPowerMap1.Name = "lvPowerMap1"
-        Me.lvPowerMap1.Size = New System.Drawing.Size(340, 140)
+        Me.lvPowerMap1.Size = New System.Drawing.Size(293, 121)
         Me.lvPowerMap1.TabIndex = 108
         Me.lvPowerMap1.TabStop = false
         Me.lvPowerMap1.UseCompatibleStateImageBehavior = false
@@ -639,11 +609,10 @@ Partial Class IEPCForm
         Me.tpVoltageLevel.Controls.Add(Me.GroupBox4)
         Me.tpVoltageLevel.Controls.Add(Me.FlowLayoutPanel10)
         Me.tpVoltageLevel.Controls.Add(Me.TableLayoutPanel4)
-        Me.tpVoltageLevel.Location = New System.Drawing.Point(4, 24)
-        Me.tpVoltageLevel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.tpVoltageLevel.Location = New System.Drawing.Point(4, 22)
         Me.tpVoltageLevel.Name = "tpVoltageLevel"
-        Me.tpVoltageLevel.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
-        Me.tpVoltageLevel.Size = New System.Drawing.Size(595, 344)
+        Me.tpVoltageLevel.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.tpVoltageLevel.Size = New System.Drawing.Size(509, 296)
         Me.tpVoltageLevel.TabIndex = 1
         Me.tpVoltageLevel.Text = "Voltage Level High"
         Me.tpVoltageLevel.UseVisualStyleBackColor = true
@@ -652,11 +621,9 @@ Partial Class IEPCForm
         '
         Me.GroupBox4.Anchor = System.Windows.Forms.AnchorStyles.Top
         Me.GroupBox4.Controls.Add(Me.TableLayoutPanel2)
-        Me.GroupBox4.Location = New System.Drawing.Point(7, 145)
-        Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.GroupBox4.Location = New System.Drawing.Point(6, 126)
         Me.GroupBox4.Name = "GroupBox4"
-        Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
-        Me.GroupBox4.Size = New System.Drawing.Size(368, 187)
+        Me.GroupBox4.Size = New System.Drawing.Size(315, 162)
         Me.GroupBox4.TabIndex = 75
         Me.GroupBox4.TabStop = false
         Me.GroupBox4.Text = "Power Map Per Gear"
@@ -665,28 +632,26 @@ Partial Class IEPCForm
         '
         Me.TableLayoutPanel2.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.TableLayoutPanel2.ColumnCount = 2
-        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150!))
-        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 197!))
+        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129!))
+        Me.TableLayoutPanel2.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 170!))
         Me.TableLayoutPanel2.Controls.Add(Me.Label5, 1, 1)
         Me.TableLayoutPanel2.Controls.Add(Me.lvPowerMap2, 0, 0)
-        Me.TableLayoutPanel2.Location = New System.Drawing.Point(7, 15)
-        Me.TableLayoutPanel2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.TableLayoutPanel2.Location = New System.Drawing.Point(6, 13)
         Me.TableLayoutPanel2.Name = "TableLayoutPanel2"
         Me.TableLayoutPanel2.RowCount = 2
         Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 88.81119!))
         Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.18881!))
-        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 23!))
-        Me.TableLayoutPanel2.Size = New System.Drawing.Size(348, 165)
+        Me.TableLayoutPanel2.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20!))
+        Me.TableLayoutPanel2.Size = New System.Drawing.Size(298, 143)
         Me.TableLayoutPanel2.TabIndex = 53
         '
         'Label5
         '
         Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
         Me.Label5.AutoSize = true
-        Me.Label5.Location = New System.Drawing.Point(223, 146)
-        Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label5.Location = New System.Drawing.Point(190, 127)
         Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(121, 15)
+        Me.Label5.Size = New System.Drawing.Size(106, 13)
         Me.Label5.TabIndex = 6
         Me.Label5.Text = "(Double-Click to Edit)"
         '
@@ -699,11 +664,11 @@ Partial Class IEPCForm
         Me.TableLayoutPanel2.SetColumnSpan(Me.lvPowerMap2, 2)
         Me.lvPowerMap2.FullRowSelect = true
         Me.lvPowerMap2.GridLines = true
-        Me.lvPowerMap2.Location = New System.Drawing.Point(4, 3)
-        Me.lvPowerMap2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.lvPowerMap2.HideSelection = false
+        Me.lvPowerMap2.Location = New System.Drawing.Point(3, 3)
         Me.lvPowerMap2.MultiSelect = false
         Me.lvPowerMap2.Name = "lvPowerMap2"
-        Me.lvPowerMap2.Size = New System.Drawing.Size(340, 140)
+        Me.lvPowerMap2.Size = New System.Drawing.Size(293, 121)
         Me.lvPowerMap2.TabIndex = 109
         Me.lvPowerMap2.TabStop = false
         Me.lvPowerMap2.UseCompatibleStateImageBehavior = false
@@ -725,50 +690,49 @@ Partial Class IEPCForm
         Me.FlowLayoutPanel10.Controls.Add(Me.tbFLCurve2)
         Me.FlowLayoutPanel10.Controls.Add(Me.btFLCurveFile2)
         Me.FlowLayoutPanel10.Controls.Add(Me.btShowFLCurve2)
-        Me.FlowLayoutPanel10.Location = New System.Drawing.Point(7, 108)
-        Me.FlowLayoutPanel10.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.FlowLayoutPanel10.Location = New System.Drawing.Point(6, 94)
         Me.FlowLayoutPanel10.Name = "FlowLayoutPanel10"
-        Me.FlowLayoutPanel10.Size = New System.Drawing.Size(579, 30)
+        Me.FlowLayoutPanel10.Size = New System.Drawing.Size(496, 26)
         Me.FlowLayoutPanel10.TabIndex = 110
         '
         'Label28
         '
         Me.Label28.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.Label28.AutoSize = true
-        Me.Label28.Location = New System.Drawing.Point(16, 7)
-        Me.Label28.Margin = New System.Windows.Forms.Padding(16, 0, 0, 0)
+        Me.Label28.Location = New System.Drawing.Point(14, 6)
+        Me.Label28.Margin = New System.Windows.Forms.Padding(14, 0, 0, 0)
         Me.Label28.Name = "Label28"
-        Me.Label28.Size = New System.Drawing.Size(138, 15)
+        Me.Label28.Size = New System.Drawing.Size(125, 13)
         Me.Label28.TabIndex = 59
         Me.Label28.Text = "Full Load Curve (.viepcp)"
         '
         'tbFLCurve2
         '
         Me.tbFLCurve2.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.tbFLCurve2.Location = New System.Drawing.Point(158, 3)
-        Me.tbFLCurve2.Margin = New System.Windows.Forms.Padding(4, 3, 7, 3)
+        Me.tbFLCurve2.Location = New System.Drawing.Point(142, 3)
+        Me.tbFLCurve2.Margin = New System.Windows.Forms.Padding(3, 3, 6, 3)
         Me.tbFLCurve2.Name = "tbFLCurve2"
-        Me.tbFLCurve2.Size = New System.Drawing.Size(322, 23)
+        Me.tbFLCurve2.Size = New System.Drawing.Size(277, 20)
         Me.tbFLCurve2.TabIndex = 23
         '
         'btFLCurveFile2
         '
         Me.btFLCurveFile2.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.btFLCurveFile2.Image = CType(resources.GetObject("btFLCurveFile2.Image"),System.Drawing.Image)
-        Me.btFLCurveFile2.Location = New System.Drawing.Point(487, 0)
+        Me.btFLCurveFile2.Location = New System.Drawing.Point(425, 1)
         Me.btFLCurveFile2.Margin = New System.Windows.Forms.Padding(0)
         Me.btFLCurveFile2.Name = "btFLCurveFile2"
-        Me.btFLCurveFile2.Size = New System.Drawing.Size(28, 28)
+        Me.btFLCurveFile2.Size = New System.Drawing.Size(24, 24)
         Me.btFLCurveFile2.TabIndex = 24
         Me.btFLCurveFile2.UseVisualStyleBackColor = true
         '
         'btShowFLCurve2
         '
         Me.btShowFLCurve2.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
-        Me.btShowFLCurve2.Location = New System.Drawing.Point(515, 1)
+        Me.btShowFLCurve2.Location = New System.Drawing.Point(449, 1)
         Me.btShowFLCurve2.Margin = New System.Windows.Forms.Padding(0, 1, 0, 0)
         Me.btShowFLCurve2.Name = "btShowFLCurve2"
-        Me.btShowFLCurve2.Size = New System.Drawing.Size(28, 28)
+        Me.btShowFLCurve2.Size = New System.Drawing.Size(24, 24)
         Me.btShowFLCurve2.TabIndex = 85
         Me.btShowFLCurve2.TabStop = false
         Me.btShowFLCurve2.UseVisualStyleBackColor = true
@@ -777,13 +741,13 @@ Partial Class IEPCForm
         '
         Me.TableLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.TableLayoutPanel4.ColumnCount = 7
-        Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160!))
-        Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 75!))
-        Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 41!))
-        Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 143!))
-        Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 72!))
-        Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37!))
-        Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 67!))
+        Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 137!))
+        Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 64!))
+        Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 35!))
+        Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 123!))
+        Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 62!))
+        Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 32!))
+        Me.TableLayoutPanel4.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 57!))
         Me.TableLayoutPanel4.Controls.Add(Me.Label17, 2, 1)
         Me.TableLayoutPanel4.Controls.Add(Me.Label18, 2, 0)
         Me.TableLayoutPanel4.Controls.Add(Me.Label26, 5, 0)
@@ -802,24 +766,23 @@ Partial Class IEPCForm
         Me.TableLayoutPanel4.Controls.Add(Me.Label22, 3, 1)
         Me.TableLayoutPanel4.Controls.Add(Me.tbOverloadTorque2, 4, 1)
         Me.TableLayoutPanel4.Controls.Add(Me.Label16, 5, 1)
-        Me.TableLayoutPanel4.Location = New System.Drawing.Point(7, 8)
-        Me.TableLayoutPanel4.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.TableLayoutPanel4.Location = New System.Drawing.Point(6, 7)
         Me.TableLayoutPanel4.Name = "TableLayoutPanel4"
         Me.TableLayoutPanel4.RowCount = 3
-        Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
-        Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
-        Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 31!))
-        Me.TableLayoutPanel4.Size = New System.Drawing.Size(579, 95)
+        Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+        Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+        Me.TableLayoutPanel4.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27!))
+        Me.TableLayoutPanel4.Size = New System.Drawing.Size(496, 82)
         Me.TableLayoutPanel4.TabIndex = 109
         '
         'Label17
         '
         Me.Label17.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.Label17.AutoSize = true
-        Me.Label17.Location = New System.Drawing.Point(238, 39)
+        Me.Label17.Location = New System.Drawing.Point(204, 34)
         Me.Label17.Margin = New System.Windows.Forms.Padding(0)
         Me.Label17.Name = "Label17"
-        Me.Label17.Size = New System.Drawing.Size(35, 15)
+        Me.Label17.Size = New System.Drawing.Size(29, 13)
         Me.Label17.TabIndex = 63
         Me.Label17.Text = "[Nm]"
         '
@@ -827,10 +790,10 @@ Partial Class IEPCForm
         '
         Me.Label18.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.Label18.AutoSize = true
-        Me.Label18.Location = New System.Drawing.Point(244, 8)
+        Me.Label18.Location = New System.Drawing.Point(208, 7)
         Me.Label18.Margin = New System.Windows.Forms.Padding(0)
         Me.Label18.Name = "Label18"
-        Me.Label18.Size = New System.Drawing.Size(22, 15)
+        Me.Label18.Size = New System.Drawing.Size(20, 13)
         Me.Label18.TabIndex = 62
         Me.Label18.Text = "[V]"
         '
@@ -838,10 +801,10 @@ Partial Class IEPCForm
         '
         Me.Label26.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.Label26.AutoSize = true
-        Me.Label26.Location = New System.Drawing.Point(499, 8)
+        Me.Label26.Location = New System.Drawing.Point(428, 7)
         Me.Label26.Margin = New System.Windows.Forms.Padding(0)
         Me.Label26.Name = "Label26"
-        Me.Label26.Size = New System.Drawing.Size(20, 15)
+        Me.Label26.Size = New System.Drawing.Size(18, 13)
         Me.Label26.TabIndex = 65
         Me.Label26.Text = "[s]"
         '
@@ -849,50 +812,45 @@ Partial Class IEPCForm
         '
         Me.Label19.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label19.AutoSize = true
-        Me.Label19.Location = New System.Drawing.Point(110, 8)
-        Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label19.Location = New System.Drawing.Point(91, 7)
         Me.Label19.Name = "Label19"
-        Me.Label19.Size = New System.Drawing.Size(46, 15)
+        Me.Label19.Size = New System.Drawing.Size(43, 13)
         Me.Label19.TabIndex = 1
         Me.Label19.Text = "Voltage"
         '
         'tbOverloadTime2
         '
         Me.tbOverloadTime2.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.tbOverloadTime2.Location = New System.Drawing.Point(423, 4)
-        Me.tbOverloadTime2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.tbOverloadTime2.Location = New System.Drawing.Point(362, 3)
         Me.tbOverloadTime2.Name = "tbOverloadTime2"
-        Me.tbOverloadTime2.Size = New System.Drawing.Size(64, 23)
+        Me.tbOverloadTime2.Size = New System.Drawing.Size(55, 20)
         Me.tbOverloadTime2.TabIndex = 20
         '
         'Label24
         '
         Me.Label24.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label24.AutoSize = true
-        Me.Label24.Location = New System.Drawing.Point(331, 8)
-        Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label24.Location = New System.Drawing.Point(280, 7)
         Me.Label24.Name = "Label24"
-        Me.Label24.Size = New System.Drawing.Size(84, 15)
+        Me.Label24.Size = New System.Drawing.Size(76, 13)
         Me.Label24.TabIndex = 11
         Me.Label24.Text = "Overload Time"
         '
         'tbVoltage2
         '
         Me.tbVoltage2.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.tbVoltage2.Location = New System.Drawing.Point(165, 4)
-        Me.tbVoltage2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.tbVoltage2.Location = New System.Drawing.Point(141, 3)
         Me.tbVoltage2.Name = "tbVoltage2"
-        Me.tbVoltage2.Size = New System.Drawing.Size(64, 23)
+        Me.tbVoltage2.Size = New System.Drawing.Size(55, 20)
         Me.tbVoltage2.TabIndex = 17
         '
         'Label20
         '
         Me.Label20.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label20.AutoSize = true
-        Me.Label20.Location = New System.Drawing.Point(48, 39)
-        Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label20.Location = New System.Drawing.Point(37, 34)
         Me.Label20.Name = "Label20"
-        Me.Label20.Size = New System.Drawing.Size(108, 15)
+        Me.Label20.Size = New System.Drawing.Size(97, 13)
         Me.Label20.TabIndex = 3
         Me.Label20.Text = "Continuous Torque"
         '
@@ -900,39 +858,36 @@ Partial Class IEPCForm
         '
         Me.Label21.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label21.AutoSize = true
-        Me.Label21.Location = New System.Drawing.Point(13, 71)
-        Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label21.Location = New System.Drawing.Point(3, 61)
         Me.Label21.Name = "Label21"
-        Me.Label21.Size = New System.Drawing.Size(143, 15)
+        Me.Label21.Size = New System.Drawing.Size(131, 13)
         Me.Label21.TabIndex = 6
         Me.Label21.Text = "Continuous Torque Speed"
         '
         'tbContinousTorque2
         '
         Me.tbContinousTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.tbContinousTorque2.Location = New System.Drawing.Point(165, 35)
-        Me.tbContinousTorque2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.tbContinousTorque2.Location = New System.Drawing.Point(141, 30)
         Me.tbContinousTorque2.Name = "tbContinousTorque2"
-        Me.tbContinousTorque2.Size = New System.Drawing.Size(64, 23)
+        Me.tbContinousTorque2.Size = New System.Drawing.Size(55, 20)
         Me.tbContinousTorque2.TabIndex = 18
         '
         'tbContinousTorqueSpeed2
         '
         Me.tbContinousTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.tbContinousTorqueSpeed2.Location = New System.Drawing.Point(165, 67)
-        Me.tbContinousTorqueSpeed2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.tbContinousTorqueSpeed2.Location = New System.Drawing.Point(141, 58)
         Me.tbContinousTorqueSpeed2.Name = "tbContinousTorqueSpeed2"
-        Me.tbContinousTorqueSpeed2.Size = New System.Drawing.Size(64, 23)
+        Me.tbContinousTorqueSpeed2.Size = New System.Drawing.Size(55, 20)
         Me.tbContinousTorqueSpeed2.TabIndex = 19
         '
         'Label27
         '
         Me.Label27.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.Label27.AutoSize = true
-        Me.Label27.Location = New System.Drawing.Point(237, 71)
+        Me.Label27.Location = New System.Drawing.Point(203, 61)
         Me.Label27.Margin = New System.Windows.Forms.Padding(0)
         Me.Label27.Name = "Label27"
-        Me.Label27.Size = New System.Drawing.Size(37, 15)
+        Me.Label27.Size = New System.Drawing.Size(30, 13)
         Me.Label27.TabIndex = 67
         Me.Label27.Text = "[rpm]"
         '
@@ -940,30 +895,28 @@ Partial Class IEPCForm
         '
         Me.Label23.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label23.AutoSize = true
-        Me.Label23.Location = New System.Drawing.Point(286, 71)
-        Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label23.Location = New System.Drawing.Point(266, 55)
         Me.Label23.Name = "Label23"
-        Me.Label23.Size = New System.Drawing.Size(129, 15)
+        Me.Label23.Size = New System.Drawing.Size(90, 26)
         Me.Label23.TabIndex = 9
         Me.Label23.Text = "Overload Torque Speed"
         '
         'tbOverloadTorqueSpeed2
         '
         Me.tbOverloadTorqueSpeed2.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.tbOverloadTorqueSpeed2.Location = New System.Drawing.Point(423, 67)
-        Me.tbOverloadTorqueSpeed2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.tbOverloadTorqueSpeed2.Location = New System.Drawing.Point(362, 58)
         Me.tbOverloadTorqueSpeed2.Name = "tbOverloadTorqueSpeed2"
-        Me.tbOverloadTorqueSpeed2.Size = New System.Drawing.Size(64, 23)
+        Me.tbOverloadTorqueSpeed2.Size = New System.Drawing.Size(55, 20)
         Me.tbOverloadTorqueSpeed2.TabIndex = 22
         '
         'Label25
         '
         Me.Label25.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.Label25.AutoSize = true
-        Me.Label25.Location = New System.Drawing.Point(491, 71)
+        Me.Label25.Location = New System.Drawing.Point(422, 61)
         Me.Label25.Margin = New System.Windows.Forms.Padding(0)
         Me.Label25.Name = "Label25"
-        Me.Label25.Size = New System.Drawing.Size(37, 15)
+        Me.Label25.Size = New System.Drawing.Size(30, 13)
         Me.Label25.TabIndex = 66
         Me.Label25.Text = "[rpm]"
         '
@@ -971,38 +924,36 @@ Partial Class IEPCForm
         '
         Me.Label22.Anchor = System.Windows.Forms.AnchorStyles.Right
         Me.Label22.AutoSize = true
-        Me.Label22.Location = New System.Drawing.Point(321, 39)
-        Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label22.Location = New System.Drawing.Point(269, 34)
         Me.Label22.Name = "Label22"
-        Me.Label22.Size = New System.Drawing.Size(94, 15)
+        Me.Label22.Size = New System.Drawing.Size(87, 13)
         Me.Label22.TabIndex = 7
         Me.Label22.Text = "Overload Torque"
         '
         'tbOverloadTorque2
         '
         Me.tbOverloadTorque2.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.tbOverloadTorque2.Location = New System.Drawing.Point(423, 35)
-        Me.tbOverloadTorque2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.tbOverloadTorque2.Location = New System.Drawing.Point(362, 30)
         Me.tbOverloadTorque2.Name = "tbOverloadTorque2"
-        Me.tbOverloadTorque2.Size = New System.Drawing.Size(64, 23)
+        Me.tbOverloadTorque2.Size = New System.Drawing.Size(55, 20)
         Me.tbOverloadTorque2.TabIndex = 21
         '
         'Label16
         '
         Me.Label16.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.Label16.AutoSize = true
-        Me.Label16.Location = New System.Drawing.Point(492, 39)
+        Me.Label16.Location = New System.Drawing.Point(422, 34)
         Me.Label16.Margin = New System.Windows.Forms.Padding(0)
         Me.Label16.Name = "Label16"
-        Me.Label16.Size = New System.Drawing.Size(35, 15)
+        Me.Label16.Size = New System.Drawing.Size(29, 13)
         Me.Label16.TabIndex = 64
         Me.Label16.Text = "[Nm]"
         '
         'cbDesignTypeWheelMotor
         '
         Me.cbDesignTypeWheelMotor.AutoSize = true
-        Me.cbDesignTypeWheelMotor.Location = New System.Drawing.Point(170, 6)
-        Me.cbDesignTypeWheelMotor.Margin = New System.Windows.Forms.Padding(58, 7, 4, 7)
+        Me.cbDesignTypeWheelMotor.Location = New System.Drawing.Point(146, 5)
+        Me.cbDesignTypeWheelMotor.Margin = New System.Windows.Forms.Padding(50, 6, 3, 6)
         Me.cbDesignTypeWheelMotor.Name = "cbDesignTypeWheelMotor"
         Me.cbDesignTypeWheelMotor.Size = New System.Drawing.Size(15, 14)
         Me.cbDesignTypeWheelMotor.TabIndex = 4
@@ -1011,18 +962,18 @@ Partial Class IEPCForm
         'Label2
         '
         Me.Label2.AutoSize = true
-        Me.Label2.Location = New System.Drawing.Point(4, 5)
-        Me.Label2.Margin = New System.Windows.Forms.Padding(4, 7, 7, 7)
+        Me.Label2.Location = New System.Drawing.Point(3, 4)
+        Me.Label2.Margin = New System.Windows.Forms.Padding(3, 6, 6, 6)
         Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(114, 15)
+        Me.Label2.Size = New System.Drawing.Size(101, 13)
         Me.Label2.TabIndex = 53
         Me.Label2.Text = "Differential Included"
         '
         'cbDifferentialIncluded
         '
         Me.cbDifferentialIncluded.AutoSize = true
-        Me.cbDifferentialIncluded.Location = New System.Drawing.Point(169, 6)
-        Me.cbDifferentialIncluded.Margin = New System.Windows.Forms.Padding(93, 7, 4, 7)
+        Me.cbDifferentialIncluded.Location = New System.Drawing.Point(145, 5)
+        Me.cbDifferentialIncluded.Margin = New System.Windows.Forms.Padding(80, 6, 3, 6)
         Me.cbDifferentialIncluded.Name = "cbDifferentialIncluded"
         Me.cbDifferentialIncluded.Size = New System.Drawing.Size(15, 14)
         Me.cbDifferentialIncluded.TabIndex = 6
@@ -1032,11 +983,9 @@ Partial Class IEPCForm
         '
         Me.GroupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top
         Me.GroupBox1.Controls.Add(Me.TableLayoutPanel5)
-        Me.GroupBox1.Location = New System.Drawing.Point(630, 90)
-        Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.GroupBox1.Location = New System.Drawing.Point(540, 78)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
-        Me.GroupBox1.Size = New System.Drawing.Size(366, 276)
+        Me.GroupBox1.Size = New System.Drawing.Size(314, 239)
         Me.GroupBox1.TabIndex = 61
         Me.GroupBox1.TabStop = false
         Me.GroupBox1.Text = "Gears"
@@ -1045,47 +994,43 @@ Partial Class IEPCForm
         '
         Me.TableLayoutPanel5.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.TableLayoutPanel5.ColumnCount = 2
-        Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150!))
-        Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 200!))
+        Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129!))
+        Me.TableLayoutPanel5.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 171!))
         Me.TableLayoutPanel5.Controls.Add(Me.FlowLayoutPanel2, 0, 1)
         Me.TableLayoutPanel5.Controls.Add(Me.Label6, 1, 1)
         Me.TableLayoutPanel5.Controls.Add(Me.lvGear, 0, 0)
-        Me.TableLayoutPanel5.Location = New System.Drawing.Point(8, 22)
-        Me.TableLayoutPanel5.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.TableLayoutPanel5.Location = New System.Drawing.Point(7, 19)
         Me.TableLayoutPanel5.Name = "TableLayoutPanel5"
         Me.TableLayoutPanel5.RowCount = 2
         Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
         Me.TableLayoutPanel5.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
-        Me.TableLayoutPanel5.Size = New System.Drawing.Size(350, 245)
+        Me.TableLayoutPanel5.Size = New System.Drawing.Size(300, 212)
         Me.TableLayoutPanel5.TabIndex = 111
         '
         'FlowLayoutPanel2
         '
         Me.FlowLayoutPanel2.Controls.Add(Me.btAddGear)
         Me.FlowLayoutPanel2.Controls.Add(Me.btRemoveGear)
-        Me.FlowLayoutPanel2.Location = New System.Drawing.Point(4, 195)
-        Me.FlowLayoutPanel2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.FlowLayoutPanel2.Location = New System.Drawing.Point(3, 169)
         Me.FlowLayoutPanel2.Name = "FlowLayoutPanel2"
-        Me.FlowLayoutPanel2.Size = New System.Drawing.Size(71, 32)
+        Me.FlowLayoutPanel2.Size = New System.Drawing.Size(61, 28)
         Me.FlowLayoutPanel2.TabIndex = 112
         '
         'btAddGear
         '
         Me.btAddGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.btAddGear.Location = New System.Drawing.Point(4, 3)
-        Me.btAddGear.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.btAddGear.Location = New System.Drawing.Point(3, 3)
         Me.btAddGear.Name = "btAddGear"
-        Me.btAddGear.Size = New System.Drawing.Size(28, 28)
+        Me.btAddGear.Size = New System.Drawing.Size(24, 24)
         Me.btAddGear.TabIndex = 25
         Me.btAddGear.UseVisualStyleBackColor = true
         '
         'btRemoveGear
         '
         Me.btRemoveGear.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.btRemoveGear.Location = New System.Drawing.Point(4, 37)
-        Me.btRemoveGear.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.btRemoveGear.Location = New System.Drawing.Point(33, 3)
         Me.btRemoveGear.Name = "btRemoveGear"
-        Me.btRemoveGear.Size = New System.Drawing.Size(28, 28)
+        Me.btRemoveGear.Size = New System.Drawing.Size(24, 24)
         Me.btRemoveGear.TabIndex = 26
         Me.btRemoveGear.UseVisualStyleBackColor = true
         '
@@ -1093,10 +1038,9 @@ Partial Class IEPCForm
         '
         Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
         Me.Label6.AutoSize = true
-        Me.Label6.Location = New System.Drawing.Point(225, 192)
-        Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label6.Location = New System.Drawing.Point(191, 166)
         Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(121, 15)
+        Me.Label6.Size = New System.Drawing.Size(106, 13)
         Me.Label6.TabIndex = 6
         Me.Label6.Text = "(Double-Click to Edit)"
         '
@@ -1109,11 +1053,11 @@ Partial Class IEPCForm
         Me.TableLayoutPanel5.SetColumnSpan(Me.lvGear, 2)
         Me.lvGear.FullRowSelect = true
         Me.lvGear.GridLines = true
-        Me.lvGear.Location = New System.Drawing.Point(4, 3)
-        Me.lvGear.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.lvGear.HideSelection = false
+        Me.lvGear.Location = New System.Drawing.Point(3, 3)
         Me.lvGear.MultiSelect = false
         Me.lvGear.Name = "lvGear"
-        Me.lvGear.Size = New System.Drawing.Size(342, 186)
+        Me.lvGear.Size = New System.Drawing.Size(294, 160)
         Me.lvGear.TabIndex = 78
         Me.lvGear.TabStop = false
         Me.lvGear.UseCompatibleStateImageBehavior = false
@@ -1138,11 +1082,9 @@ Partial Class IEPCForm
         '
         Me.GroupBox3.Anchor = System.Windows.Forms.AnchorStyles.Top
         Me.GroupBox3.Controls.Add(Me.TableLayoutPanel3)
-        Me.GroupBox3.Location = New System.Drawing.Point(630, 375)
-        Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.GroupBox3.Location = New System.Drawing.Point(540, 325)
         Me.GroupBox3.Name = "GroupBox3"
-        Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
-        Me.GroupBox3.Size = New System.Drawing.Size(366, 239)
+        Me.GroupBox3.Size = New System.Drawing.Size(314, 207)
         Me.GroupBox3.TabIndex = 62
         Me.GroupBox3.TabStop = false
         Me.GroupBox3.Text = "Drag Curves"
@@ -1151,18 +1093,17 @@ Partial Class IEPCForm
         '
         Me.TableLayoutPanel3.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.TableLayoutPanel3.ColumnCount = 2
-        Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150!))
-        Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 200!))
+        Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 129!))
+        Me.TableLayoutPanel3.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 171!))
         Me.TableLayoutPanel3.Controls.Add(Me.lvDragCurve, 0, 0)
         Me.TableLayoutPanel3.Controls.Add(Me.FlowLayoutPanel11, 0, 1)
         Me.TableLayoutPanel3.Controls.Add(Me.Label7, 1, 1)
-        Me.TableLayoutPanel3.Location = New System.Drawing.Point(8, 22)
-        Me.TableLayoutPanel3.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.TableLayoutPanel3.Location = New System.Drawing.Point(7, 19)
         Me.TableLayoutPanel3.Name = "TableLayoutPanel3"
         Me.TableLayoutPanel3.RowCount = 2
         Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.61636!))
         Me.TableLayoutPanel3.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.38365!))
-        Me.TableLayoutPanel3.Size = New System.Drawing.Size(350, 211)
+        Me.TableLayoutPanel3.Size = New System.Drawing.Size(300, 183)
         Me.TableLayoutPanel3.TabIndex = 113
         '
         'lvDragCurve
@@ -1174,11 +1115,11 @@ Partial Class IEPCForm
         Me.TableLayoutPanel3.SetColumnSpan(Me.lvDragCurve, 2)
         Me.lvDragCurve.FullRowSelect = true
         Me.lvDragCurve.GridLines = true
-        Me.lvDragCurve.Location = New System.Drawing.Point(4, 3)
-        Me.lvDragCurve.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.lvDragCurve.HideSelection = false
+        Me.lvDragCurve.Location = New System.Drawing.Point(3, 3)
         Me.lvDragCurve.MultiSelect = false
         Me.lvDragCurve.Name = "lvDragCurve"
-        Me.lvDragCurve.Size = New System.Drawing.Size(342, 159)
+        Me.lvDragCurve.Size = New System.Drawing.Size(294, 137)
         Me.lvDragCurve.TabIndex = 78
         Me.lvDragCurve.TabStop = false
         Me.lvDragCurve.UseCompatibleStateImageBehavior = false
@@ -1198,29 +1139,26 @@ Partial Class IEPCForm
         '
         Me.FlowLayoutPanel11.Controls.Add(Me.btAddDragCurve)
         Me.FlowLayoutPanel11.Controls.Add(Me.btRemoveDragCurve)
-        Me.FlowLayoutPanel11.Location = New System.Drawing.Point(4, 168)
-        Me.FlowLayoutPanel11.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.FlowLayoutPanel11.Location = New System.Drawing.Point(3, 146)
         Me.FlowLayoutPanel11.Name = "FlowLayoutPanel11"
-        Me.FlowLayoutPanel11.Size = New System.Drawing.Size(71, 32)
+        Me.FlowLayoutPanel11.Size = New System.Drawing.Size(61, 28)
         Me.FlowLayoutPanel11.TabIndex = 114
         '
         'btAddDragCurve
         '
         Me.btAddDragCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.btAddDragCurve.Location = New System.Drawing.Point(4, 3)
-        Me.btAddDragCurve.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.btAddDragCurve.Location = New System.Drawing.Point(3, 3)
         Me.btAddDragCurve.Name = "btAddDragCurve"
-        Me.btAddDragCurve.Size = New System.Drawing.Size(28, 28)
+        Me.btAddDragCurve.Size = New System.Drawing.Size(24, 24)
         Me.btAddDragCurve.TabIndex = 27
         Me.btAddDragCurve.UseVisualStyleBackColor = true
         '
         'btRemoveDragCurve
         '
         Me.btRemoveDragCurve.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.btRemoveDragCurve.Location = New System.Drawing.Point(4, 37)
-        Me.btRemoveDragCurve.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.btRemoveDragCurve.Location = New System.Drawing.Point(33, 3)
         Me.btRemoveDragCurve.Name = "btRemoveDragCurve"
-        Me.btRemoveDragCurve.Size = New System.Drawing.Size(28, 28)
+        Me.btRemoveDragCurve.Size = New System.Drawing.Size(24, 24)
         Me.btRemoveDragCurve.TabIndex = 28
         Me.btRemoveDragCurve.UseVisualStyleBackColor = true
         '
@@ -1228,10 +1166,9 @@ Partial Class IEPCForm
         '
         Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
         Me.Label7.AutoSize = true
-        Me.Label7.Location = New System.Drawing.Point(225, 165)
-        Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label7.Location = New System.Drawing.Point(191, 143)
         Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(121, 15)
+        Me.Label7.Size = New System.Drawing.Size(106, 13)
         Me.Label7.TabIndex = 6
         Me.Label7.Text = "(Double-Click to Edit)"
         '
@@ -1242,7 +1179,7 @@ Partial Class IEPCForm
         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(1008, 31)
+        Me.ToolStrip1.Size = New System.Drawing.Size(864, 31)
         Me.ToolStrip1.TabIndex = 63
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -1321,9 +1258,8 @@ Partial Class IEPCForm
         Me.PictureBox1.Dock = System.Windows.Forms.DockStyle.Top
         Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
         Me.PictureBox1.Location = New System.Drawing.Point(0, 31)
-        Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
         Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(1008, 46)
+        Me.PictureBox1.Size = New System.Drawing.Size(864, 40)
         Me.PictureBox1.TabIndex = 64
         Me.PictureBox1.TabStop = false
         '
@@ -1332,9 +1268,8 @@ Partial Class IEPCForm
         Me.lblTitle.Anchor = System.Windows.Forms.AnchorStyles.Top
         Me.lblTitle.AutoSize = true
         Me.lblTitle.BackColor = System.Drawing.Color.White
-        Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point)
-        Me.lblTitle.Location = New System.Drawing.Point(133, 42)
-        Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!)
+        Me.lblTitle.Location = New System.Drawing.Point(114, 36)
         Me.lblTitle.Name = "lblTitle"
         Me.lblTitle.Size = New System.Drawing.Size(68, 29)
         Me.lblTitle.TabIndex = 65
@@ -1344,10 +1279,9 @@ Partial Class IEPCForm
         '
         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(908, 621)
-        Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.ButCancel.Location = New System.Drawing.Point(778, 538)
         Me.ButCancel.Name = "ButCancel"
-        Me.ButCancel.Size = New System.Drawing.Size(88, 27)
+        Me.ButCancel.Size = New System.Drawing.Size(75, 23)
         Me.ButCancel.TabIndex = 67
         Me.ButCancel.Text = "Cancel"
         Me.ButCancel.UseVisualStyleBackColor = true
@@ -1355,10 +1289,9 @@ Partial Class IEPCForm
         '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(813, 621)
-        Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.ButOK.Location = New System.Drawing.Point(697, 538)
         Me.ButOK.Name = "ButOK"
-        Me.ButOK.Size = New System.Drawing.Size(88, 27)
+        Me.ButOK.Size = New System.Drawing.Size(75, 23)
         Me.ButOK.TabIndex = 66
         Me.ButOK.Text = "Save"
         Me.ButOK.UseVisualStyleBackColor = true
@@ -1367,10 +1300,9 @@ Partial Class IEPCForm
         '
         Me.FlowLayoutPanel1.Controls.Add(Me.Label49)
         Me.FlowLayoutPanel1.Controls.Add(Me.tbModel)
-        Me.FlowLayoutPanel1.Location = New System.Drawing.Point(14, 89)
-        Me.FlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.FlowLayoutPanel1.Location = New System.Drawing.Point(12, 77)
         Me.FlowLayoutPanel1.Name = "FlowLayoutPanel1"
-        Me.FlowLayoutPanel1.Size = New System.Drawing.Size(598, 30)
+        Me.FlowLayoutPanel1.Size = New System.Drawing.Size(513, 26)
         Me.FlowLayoutPanel1.TabIndex = 101
         '
         'FlowLayoutPanel4
@@ -1378,40 +1310,37 @@ Partial Class IEPCForm
         Me.FlowLayoutPanel4.Anchor = System.Windows.Forms.AnchorStyles.Top
         Me.FlowLayoutPanel4.Controls.Add(Me.Label3)
         Me.FlowLayoutPanel4.Controls.Add(Me.cbDesignTypeWheelMotor)
-        Me.FlowLayoutPanel4.Location = New System.Drawing.Point(14, 186)
-        Me.FlowLayoutPanel4.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.FlowLayoutPanel4.Location = New System.Drawing.Point(12, 161)
         Me.FlowLayoutPanel4.Name = "FlowLayoutPanel4"
-        Me.FlowLayoutPanel4.Size = New System.Drawing.Size(245, 28)
+        Me.FlowLayoutPanel4.Size = New System.Drawing.Size(210, 24)
         Me.FlowLayoutPanel4.TabIndex = 104
         '
         'Label3
         '
         Me.Label3.AutoSize = true
-        Me.Label3.Location = New System.Drawing.Point(5, 5)
-        Me.Label3.Margin = New System.Windows.Forms.Padding(4, 7, 7, 7)
+        Me.Label3.Location = New System.Drawing.Point(4, 4)
+        Me.Label3.Margin = New System.Windows.Forms.Padding(3, 6, 6, 6)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(142, 15)
+        Me.Label3.Size = New System.Drawing.Size(131, 13)
         Me.Label3.TabIndex = 55
         Me.Label3.Text = "Design Type Wheel Motor"
         '
         'FlowLayoutPanel5
         '
+        Me.FlowLayoutPanel5.Controls.Add(Me.cbNumWheelMotors)
         Me.FlowLayoutPanel5.Controls.Add(Me.Label48)
-        Me.FlowLayoutPanel5.Controls.Add(Me.tbNumberOfDesignTypeWheelMotor)
         Me.FlowLayoutPanel5.Controls.Add(Me.Label9)
-        Me.FlowLayoutPanel5.Location = New System.Drawing.Point(265, 186)
-        Me.FlowLayoutPanel5.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.FlowLayoutPanel5.Location = New System.Drawing.Point(227, 161)
         Me.FlowLayoutPanel5.Name = "FlowLayoutPanel5"
-        Me.FlowLayoutPanel5.Size = New System.Drawing.Size(348, 28)
+        Me.FlowLayoutPanel5.Size = New System.Drawing.Size(298, 24)
         Me.FlowLayoutPanel5.TabIndex = 105
         '
         'Label9
         '
         Me.Label9.AutoSize = true
-        Me.Label9.Location = New System.Drawing.Point(296, 5)
-        Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label9.Location = New System.Drawing.Point(254, 4)
         Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(20, 15)
+        Me.Label9.Size = New System.Drawing.Size(16, 13)
         Me.Label9.TabIndex = 66
         Me.Label9.Text = "[-]"
         '
@@ -1420,19 +1349,17 @@ Partial Class IEPCForm
         Me.pnInertia.Controls.Add(Me.Label51)
         Me.pnInertia.Controls.Add(Me.lblinertiaUnit)
         Me.pnInertia.Controls.Add(Me.tbInertia)
-        Me.pnInertia.Location = New System.Drawing.Point(265, 125)
-        Me.pnInertia.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.pnInertia.Location = New System.Drawing.Point(227, 108)
         Me.pnInertia.Name = "pnInertia"
-        Me.pnInertia.Size = New System.Drawing.Size(348, 30)
+        Me.pnInertia.Size = New System.Drawing.Size(298, 26)
         Me.pnInertia.TabIndex = 102
         '
         'lblinertiaUnit
         '
         Me.lblinertiaUnit.AutoSize = true
-        Me.lblinertiaUnit.Location = New System.Drawing.Point(296, 7)
-        Me.lblinertiaUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblinertiaUnit.Location = New System.Drawing.Point(254, 6)
         Me.lblinertiaUnit.Name = "lblinertiaUnit"
-        Me.lblinertiaUnit.Size = New System.Drawing.Size(43, 15)
+        Me.lblinertiaUnit.Size = New System.Drawing.Size(36, 13)
         Me.lblinertiaUnit.TabIndex = 64
         Me.lblinertiaUnit.Text = "[kgm²]"
         '
@@ -1440,10 +1367,9 @@ Partial Class IEPCForm
         '
         Me.FlowLayoutPanel7.Controls.Add(Me.Label2)
         Me.FlowLayoutPanel7.Controls.Add(Me.cbDifferentialIncluded)
-        Me.FlowLayoutPanel7.Location = New System.Drawing.Point(14, 215)
-        Me.FlowLayoutPanel7.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.FlowLayoutPanel7.Location = New System.Drawing.Point(12, 186)
         Me.FlowLayoutPanel7.Name = "FlowLayoutPanel7"
-        Me.FlowLayoutPanel7.Size = New System.Drawing.Size(245, 28)
+        Me.FlowLayoutPanel7.Size = New System.Drawing.Size(210, 24)
         Me.FlowLayoutPanel7.TabIndex = 106
         '
         'pnThermalOverloadRecovery
@@ -1451,19 +1377,17 @@ Partial Class IEPCForm
         Me.pnThermalOverloadRecovery.Controls.Add(Me.Label52)
         Me.pnThermalOverloadRecovery.Controls.Add(Me.tbThermalOverload)
         Me.pnThermalOverloadRecovery.Controls.Add(Me.Label10)
-        Me.pnThermalOverloadRecovery.Location = New System.Drawing.Point(265, 157)
-        Me.pnThermalOverloadRecovery.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.pnThermalOverloadRecovery.Location = New System.Drawing.Point(227, 136)
         Me.pnThermalOverloadRecovery.Name = "pnThermalOverloadRecovery"
-        Me.pnThermalOverloadRecovery.Size = New System.Drawing.Size(348, 26)
+        Me.pnThermalOverloadRecovery.Size = New System.Drawing.Size(298, 23)
         Me.pnThermalOverloadRecovery.TabIndex = 103
         '
         'Label10
         '
         Me.Label10.AutoSize = true
-        Me.Label10.Location = New System.Drawing.Point(296, 4)
-        Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label10.Location = New System.Drawing.Point(254, 3)
         Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(20, 15)
+        Me.Label10.Size = New System.Drawing.Size(16, 13)
         Me.Label10.TabIndex = 67
         Me.Label10.Text = "[-]"
         '
@@ -1471,10 +1395,9 @@ Partial Class IEPCForm
         '
         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, 655)
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 565)
         Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(1, 0, 16, 0)
-        Me.StatusStrip1.Size = New System.Drawing.Size(1008, 22)
+        Me.StatusStrip1.Size = New System.Drawing.Size(864, 22)
         Me.StatusStrip1.SizingGrip = false
         Me.StatusStrip1.TabIndex = 74
         Me.StatusStrip1.Text = "StatusStrip1"
@@ -1509,72 +1432,75 @@ Partial Class IEPCForm
         Me.pnRatedPower.Controls.Add(Me.lblRatedPower)
         Me.pnRatedPower.Controls.Add(Me.lblRatedPowerUnit)
         Me.pnRatedPower.Controls.Add(Me.tbRatedPower)
-        Me.pnRatedPower.Location = New System.Drawing.Point(14, 157)
-        Me.pnRatedPower.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.pnRatedPower.Location = New System.Drawing.Point(12, 136)
         Me.pnRatedPower.Name = "pnRatedPower"
-        Me.pnRatedPower.Size = New System.Drawing.Size(245, 26)
+        Me.pnRatedPower.Size = New System.Drawing.Size(210, 23)
         Me.pnRatedPower.TabIndex = 103
         '
         'lblRatedPower
         '
         Me.lblRatedPower.AutoSize = true
-        Me.lblRatedPower.Location = New System.Drawing.Point(5, 5)
-        Me.lblRatedPower.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblRatedPower.Location = New System.Drawing.Point(4, 4)
         Me.lblRatedPower.Name = "lblRatedPower"
-        Me.lblRatedPower.Size = New System.Drawing.Size(73, 15)
+        Me.lblRatedPower.Size = New System.Drawing.Size(69, 13)
         Me.lblRatedPower.TabIndex = 45
         Me.lblRatedPower.Text = "Rated Power"
         '
         'lblRatedPowerUnit
         '
         Me.lblRatedPowerUnit.AutoSize = true
-        Me.lblRatedPowerUnit.Location = New System.Drawing.Point(193, 5)
-        Me.lblRatedPowerUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblRatedPowerUnit.Location = New System.Drawing.Point(165, 4)
         Me.lblRatedPowerUnit.Name = "lblRatedPowerUnit"
-        Me.lblRatedPowerUnit.Size = New System.Drawing.Size(32, 15)
+        Me.lblRatedPowerUnit.Size = New System.Drawing.Size(30, 13)
         Me.lblRatedPowerUnit.TabIndex = 64
         Me.lblRatedPowerUnit.Text = "[kW]"
         '
         'tbRatedPower
         '
-        Me.tbRatedPower.Location = New System.Drawing.Point(119, 1)
-        Me.tbRatedPower.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+        Me.tbRatedPower.Location = New System.Drawing.Point(102, 1)
         Me.tbRatedPower.Name = "tbRatedPower"
-        Me.tbRatedPower.Size = New System.Drawing.Size(66, 23)
+        Me.tbRatedPower.Size = New System.Drawing.Size(57, 20)
         Me.tbRatedPower.TabIndex = 2
         '
         'pnElectricMachineType
         '
         Me.pnElectricMachineType.Controls.Add(Me.cbEmType)
         Me.pnElectricMachineType.Controls.Add(Me.lblEmType)
-        Me.pnElectricMachineType.Location = New System.Drawing.Point(14, 125)
+        Me.pnElectricMachineType.Location = New System.Drawing.Point(12, 108)
         Me.pnElectricMachineType.Name = "pnElectricMachineType"
-        Me.pnElectricMachineType.Size = New System.Drawing.Size(245, 30)
+        Me.pnElectricMachineType.Size = New System.Drawing.Size(210, 26)
         Me.pnElectricMachineType.TabIndex = 108
         '
         'cbEmType
         '
         Me.cbEmType.FormattingEnabled = true
-        Me.cbEmType.Location = New System.Drawing.Point(75, 4)
+        Me.cbEmType.Location = New System.Drawing.Point(64, 3)
         Me.cbEmType.Name = "cbEmType"
-        Me.cbEmType.Size = New System.Drawing.Size(151, 23)
+        Me.cbEmType.Size = New System.Drawing.Size(130, 21)
         Me.cbEmType.TabIndex = 26
         '
         'lblEmType
         '
         Me.lblEmType.AutoSize = true
-        Me.lblEmType.Location = New System.Drawing.Point(5, 6)
-        Me.lblEmType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblEmType.Location = New System.Drawing.Point(4, 5)
         Me.lblEmType.Name = "lblEmType"
-        Me.lblEmType.Size = New System.Drawing.Size(51, 15)
+        Me.lblEmType.Size = New System.Drawing.Size(50, 13)
         Me.lblEmType.TabIndex = 25
         Me.lblEmType.Text = "EM Type"
         '
+        'cbNumWheelMotors
+        '
+        Me.cbNumWheelMotors.FormattingEnabled = true
+        Me.cbNumWheelMotors.Location = New System.Drawing.Point(214, 2)
+        Me.cbNumWheelMotors.Name = "cbNumWheelMotors"
+        Me.cbNumWheelMotors.Size = New System.Drawing.Size(33, 21)
+        Me.cbNumWheelMotors.TabIndex = 67
+        '
         'IEPCForm
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(7!, 15!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1008, 677)
+        Me.ClientSize = New System.Drawing.Size(864, 587)
         Me.Controls.Add(Me.pnElectricMachineType)
         Me.Controls.Add(Me.pnRatedPower)
         Me.Controls.Add(Me.StatusStrip1)
@@ -1594,7 +1520,6 @@ Partial Class IEPCForm
         Me.Controls.Add(Me.tcVoltageLevels)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
         Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
-        Me.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
         Me.MaximizeBox = false
         Me.Name = "IEPCForm"
         Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
@@ -1655,7 +1580,6 @@ End Sub
 	Friend WithEvents tbThermalOverload As TextBox
 	Friend WithEvents Label52 As Label
 	Friend WithEvents Label48 As Label
-	Friend WithEvents tbNumberOfDesignTypeWheelMotor As TextBox
 	Friend WithEvents Label51 As Label
 	Friend WithEvents tbInertia As TextBox
 	Friend WithEvents Label49 As Label
@@ -1779,4 +1703,5 @@ End Sub
     Friend WithEvents FlowLayoutPanel5 As Panel
     Friend WithEvents pnThermalOverloadRecovery As Panel
     Friend WithEvents Label3 As Label
+    Friend WithEvents cbNumWheelMotors As ComboBox
 End Class
diff --git a/VECTO/GUI/IEPCForm.resx b/VECTO/GUI/IEPCForm.resx
index 9ce0c514cbb626a74197b4081d87c69d49282988..50021e8dee392b488a1cf238c54469d8f1de2343 100644
--- a/VECTO/GUI/IEPCForm.resx
+++ b/VECTO/GUI/IEPCForm.resx
@@ -1,4 +1,64 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/VECTO/GUI/IEPCForm.vb b/VECTO/GUI/IEPCForm.vb
index 2d923213a8e4276c9dd3485b0a4fdacebb686ff7..f6980b2f11f470740aceba20ba70b24aa68c161c 100644
--- a/VECTO/GUI/IEPCForm.vb
+++ b/VECTO/GUI/IEPCForm.vb
@@ -30,6 +30,13 @@ Public Class IEPCForm
 	    cbEmType.DisplayMember = "Label"
 	    cbEmType.DataSource = [enum].GetValues(GetType(ElectricMachineType)).Cast(Of ElectricMachineType).Select(Function(type) New With {Key .Value = type, .Label = type.GetLabel()}).ToList()
 
+	    cbNumWheelMotors.ValueMember = "Key"
+	    cbNumWheelMotors.DisplayMember = "Value"
+	    cbNumWheelMotors.DataSource = {
+		    			New KeyValuePair(of Integer, string)(1, "1"),
+                        New KeyValuePair(of Integer, string)(2, "2") }
+	    
+
 	End Sub
 
 #Region "Set IEPC Data"
@@ -41,8 +48,12 @@ Public Class IEPCForm
 		tbInertia.Text = inputData.Inertia.ToGUIFormat()
 		cbDifferentialIncluded.Checked = inputData.DifferentialIncluded
 		cbDesignTypeWheelMotor.Checked = inputData.DesignTypeWheelMotor
-		tbNumberOfDesignTypeWheelMotor.Text = inputData.NrOfDesignTypeWheelMotorMeasured.Value.ToGUIFormat()
-		
+		if  inputData.DesignTypeWheelMotor andalso inputData.NrOfDesignTypeWheelMotorMeasured.HasValue then
+	        cbNumWheelMotors.SelectedValue = inputData.NrOfDesignTypeWheelMotorMeasured.Value
+		Else 
+		    cbNumWheelMotors.SelectedIndex = -1
+		end if
+
 		tbRatedPower.Text = inputData.R85RatedPower.ConvertToKiloWatt().Value.ToGUIFormat()
 		cbEmType.SelectedValue = inputData.ElectricMachineType
 		if Not Cfg.DeclMode Then
@@ -301,7 +312,7 @@ Public Class IEPCForm
 		cbDifferentialIncluded.Checked = False
 		cbDesignTypeWheelMotor.Checked = False
 	    FlowLayoutPanel5.Enabled = False
-        tbNumberOfDesignTypeWheelMotor.Text = "0"
+	    cbNumWheelMotors.SelectedIndex = -1
         tbThermalOverload.Text = ""
 
 		tbVoltage1.Text = ""
@@ -419,7 +430,7 @@ Public Class IEPCForm
 		Dim iepc = New IEPCInputData(file)
 
 		iepc.SetCommonEntries(tbModel.Text, tbInertia.Text, cbDesignTypeWheelMotor.Checked, 
-							  tbNumberOfDesignTypeWheelMotor.Text, cbDifferentialIncluded.Checked,
+                              CType(cbNumWheelMotors.SelectedValue, Integer), cbDifferentialIncluded.Checked,
 							  tbThermalOverload.Text)
 		iepc.R85RatedPower = tbRatedPower.Text.ToDouble(0).SI(Unit.SI.Kilo.Watt).Cast(of Watt)
 		iepc.ElectricMachineType =  CType(cbEmType.SelectedValue, ElectricMachineType)
@@ -516,9 +527,9 @@ Public Class IEPCForm
 		Return True
 	End Function
 
-	Private Function ValidateNrDesignTypeWheelMotorMeasured() As Boolean 
-		If Not cbDesignTypeWheelMotor.Checked AND Not ValidDoubleValue(tbNumberOfDesignTypeWheelMotor.Text) Then
-			ShowErrorMessageBox("Nr of Design Type Wheel Motor Measured", tbNumberOfDesignTypeWheelMotor)
+	Private Function ValidateNrDesignTypeWheelMotorMeasured() As Boolean
+		If cbDesignTypeWheelMotor.Checked andalso cbNumWheelMotors.SelectedIndex = -1 Then
+			ShowErrorMessageBox("Nr of Design Type Wheel Motor Measured missing")
 			Return False
 		End If
 		Return True
@@ -725,18 +736,18 @@ Public Class IEPCForm
 	End Sub
 
 	Private Sub cbDesignTypeWheelMotor_CheckedChanged(sender As Object, e As EventArgs) Handles cbDesignTypeWheelMotor.CheckedChanged
-		tbNumberOfDesignTypeWheelMotor.Enabled = cbDesignTypeWheelMotor.Checked
+	    cbNumWheelMotors.Enabled = cbDesignTypeWheelMotor.Checked
 		FlowLayoutPanel5.Enabled =  cbDesignTypeWheelMotor.Checked
 		cbDifferentialIncluded.Enabled = Not cbDesignTypeWheelMotor.Checked
 		if (cbDesignTypeWheelMotor.Checked) then
 		    cbDifferentialIncluded.Checked = False
 		end if
-		If tbNumberOfDesignTypeWheelMotor.Enabled = False Then _
-			tbNumberOfDesignTypeWheelMotor.Text = "0"
-		Change()
+		If cbNumWheelMotors.Enabled = False Then _
+		    cbNumWheelMotors.SelectedIndex = -1
+	    Change()
 	End Sub
 
-	Private Sub tbNumberOfDesignTypeWheelMotor_TextChanged(sender As Object, e As EventArgs) Handles tbNumberOfDesignTypeWheelMotor.TextChanged
+	Private Sub tbNumberOfDesignTypeWheelMotor_TextChanged(sender As Object, e As EventArgs) 
 		Change()
 	End Sub
 
diff --git a/VECTO/Input Files/IEPCInputData.vb b/VECTO/Input Files/IEPCInputData.vb
index 2d78c5e3b859f25dd29026f3e08f6490bfdabf0c..b3e0f34d8e905c3f27f8d65933d400d63bdda595 100644
--- a/VECTO/Input Files/IEPCInputData.vb	
+++ b/VECTO/Input Files/IEPCInputData.vb	
@@ -41,13 +41,13 @@ Public Class IEPCInputData
     End Function
 
     Public Sub SetCommonEntries(model As String, inertia As String, designTypeWheelMotorMeasured As Boolean, 
-                                nrOfDesignTypeWheelMotorMeasured As string, differentialIncluded as Boolean,
+                                nrOfDesignTypeWheelMotorMeasured As Integer, differentialIncluded as Boolean,
                                 thermalOverloadRecoverFactor As String)
 
         _model = model
         _inertia = inertia.ToDouble().SI(Of KilogramSquareMeter)
         _wheelMotorMeasured = designTypeWheelMotorMeasured
-        _nrDesignTypeWheelMotor = nrOfDesignTypeWheelMotorMeasured.ToInt(Nothing)
+        _nrDesignTypeWheelMotor = nrOfDesignTypeWheelMotorMeasured
         _differentialIncluded = differentialIncluded
         _overloadRecoverFactor = thermalOverloadRecoverFactor.ToDouble(0)