diff --git a/VECTO/GUI/F_ENG.Designer.vb b/VECTO/GUI/F_ENG.Designer.vb
index aeb0d3bf630556cb6ace3c94b8a23cd869ab1cbc..d2d15446259de2a862bdd50108ee504e2547d062 100644
--- a/VECTO/GUI/F_ENG.Designer.vb
+++ b/VECTO/GUI/F_ENG.Designer.vb
@@ -301,7 +301,7 @@ Partial Class F_ENG
 		'
 		Me.TbMAP.Location = New System.Drawing.Point(12, 259)
 		Me.TbMAP.Name = "TbMAP"
-		Me.TbMAP.Size = New System.Drawing.Size(418, 20)
+		Me.TbMAP.Size = New System.Drawing.Size(434, 20)
 		Me.TbMAP.TabIndex = 5
 		'
 		'Label6
@@ -315,12 +315,12 @@ Partial Class F_ENG
 		'
 		'BtMAP
 		'
-		Me.BtMAP.Location = New System.Drawing.Point(436, 257)
+		Me.BtMAP.Image = Global.VECTO.My.Resources.Resources.Open_icon
+		Me.BtMAP.Location = New System.Drawing.Point(446, 257)
 		Me.BtMAP.Name = "BtMAP"
-		Me.BtMAP.Size = New System.Drawing.Size(28, 23)
+		Me.BtMAP.Size = New System.Drawing.Size(24, 24)
 		Me.BtMAP.TabIndex = 6
 		Me.BtMAP.TabStop = False
-		Me.BtMAP.Text = "..."
 		Me.BtMAP.UseVisualStyleBackColor = True
 		'
 		'PictureBox1
@@ -354,9 +354,9 @@ Partial Class F_ENG
 		'BtMAPopen
 		'
 		Me.BtMAPopen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
-		Me.BtMAPopen.Location = New System.Drawing.Point(470, 257)
+		Me.BtMAPopen.Location = New System.Drawing.Point(469, 257)
 		Me.BtMAPopen.Name = "BtMAPopen"
-		Me.BtMAPopen.Size = New System.Drawing.Size(23, 23)
+		Me.BtMAPopen.Size = New System.Drawing.Size(24, 24)
 		Me.BtMAPopen.TabIndex = 7
 		Me.BtMAPopen.TabStop = False
 		Me.BtMAPopen.UseVisualStyleBackColor = True
@@ -468,7 +468,7 @@ Partial Class F_ENG
 		'
 		Me.TbFLD.Location = New System.Drawing.Point(12, 202)
 		Me.TbFLD.Name = "TbFLD"
-		Me.TbFLD.Size = New System.Drawing.Size(418, 20)
+		Me.TbFLD.Size = New System.Drawing.Size(434, 20)
 		Me.TbFLD.TabIndex = 5
 		'
 		'Label14
@@ -482,20 +482,20 @@ Partial Class F_ENG
 		'
 		'BtFLD
 		'
-		Me.BtFLD.Location = New System.Drawing.Point(436, 200)
+		Me.BtFLD.Image = Global.VECTO.My.Resources.Resources.Open_icon
+		Me.BtFLD.Location = New System.Drawing.Point(446, 200)
 		Me.BtFLD.Name = "BtFLD"
-		Me.BtFLD.Size = New System.Drawing.Size(28, 23)
+		Me.BtFLD.Size = New System.Drawing.Size(24, 24)
 		Me.BtFLD.TabIndex = 6
 		Me.BtFLD.TabStop = False
-		Me.BtFLD.Text = "..."
 		Me.BtFLD.UseVisualStyleBackColor = True
 		'
 		'BtFLDopen
 		'
 		Me.BtFLDopen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
-		Me.BtFLDopen.Location = New System.Drawing.Point(470, 200)
+		Me.BtFLDopen.Location = New System.Drawing.Point(469, 200)
 		Me.BtFLDopen.Name = "BtFLDopen"
-		Me.BtFLDopen.Size = New System.Drawing.Size(23, 23)
+		Me.BtFLDopen.Size = New System.Drawing.Size(24, 24)
 		Me.BtFLDopen.TabIndex = 7
 		Me.BtFLDopen.TabStop = False
 		Me.BtFLDopen.UseVisualStyleBackColor = True
diff --git a/VECTO/GUI/F_FileSign.Designer.vb b/VECTO/GUI/F_FileSign.Designer.vb
index 43edf26e5f8f6aab8aeb091edee31d654b9d9cfa..86f7c9e621bf0afbb7b65ba7890edac1f3e991e2 100644
--- a/VECTO/GUI/F_FileSign.Designer.vb
+++ b/VECTO/GUI/F_FileSign.Designer.vb
@@ -32,306 +32,306 @@ Partial Class F_FileSign
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_FileSign))
-        Me.TbSigFile = New System.Windows.Forms.TextBox()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.BtBrowse = New System.Windows.Forms.Button()
-        Me.lvFiles = New System.Windows.Forms.ListView()
-        Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.BtSign = New System.Windows.Forms.Button()
-        Me.BtClose = New System.Windows.Forms.Button()
-        Me.BtRemFLD = New System.Windows.Forms.Button()
-        Me.BtAddFLD = New System.Windows.Forms.Button()
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-        Me.BtClearList = New System.Windows.Forms.Button()
-        Me.BtReload = New System.Windows.Forms.Button()
-        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
-        Me.LbStatus = New System.Windows.Forms.Label()
-        Me.LbMode = New System.Windows.Forms.Label()
-        Me.LbDateStr = New System.Windows.Forms.Label()
-        Me.TbPubKey = New System.Windows.Forms.TextBox()
-        Me.TbLicStr = New System.Windows.Forms.TextBox()
-        Me.Label5 = New System.Windows.Forms.Label()
-        Me.Label6 = New System.Windows.Forms.Label()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.GroupBox1.SuspendLayout()
-        Me.GroupBox2.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'TbSigFile
-        '
-        Me.TbSigFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TbSigFile.Location = New System.Drawing.Point(12, 29)
-        Me.TbSigFile.Name = "TbSigFile"
-        Me.TbSigFile.Size = New System.Drawing.Size(509, 20)
-        Me.TbSigFile.TabIndex = 0
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(12, 13)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(99, 13)
-        Me.Label1.TabIndex = 4
-        Me.Label1.Text = "Signature file (.vsig)"
-        '
-        'BtBrowse
-        '
-        Me.BtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.BtBrowse.Location = New System.Drawing.Point(527, 27)
-        Me.BtBrowse.Name = "BtBrowse"
-        Me.BtBrowse.Size = New System.Drawing.Size(28, 23)
-        Me.BtBrowse.TabIndex = 1
-        Me.BtBrowse.Text = "..."
-        Me.BtBrowse.UseVisualStyleBackColor = True
-        '
-        'lvFiles
-        '
-        Me.lvFiles.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.lvFiles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2})
-        Me.lvFiles.FullRowSelect = True
-        Me.lvFiles.GridLines = True
-        Me.lvFiles.LabelEdit = True
-        Me.lvFiles.Location = New System.Drawing.Point(6, 19)
-        Me.lvFiles.MultiSelect = False
-        Me.lvFiles.Name = "lvFiles"
-        Me.lvFiles.Size = New System.Drawing.Size(565, 368)
-        Me.lvFiles.TabIndex = 0
-        Me.lvFiles.UseCompatibleStateImageBehavior = False
-        Me.lvFiles.View = System.Windows.Forms.View.Details
-        '
-        'ColumnHeader1
-        '
-        Me.ColumnHeader1.Text = "File"
-        Me.ColumnHeader1.Width = 408
-        '
-        'ColumnHeader2
-        '
-        Me.ColumnHeader2.Text = "Status"
-        Me.ColumnHeader2.Width = 141
-        '
-        'BtSign
-        '
-        Me.BtSign.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.BtSign.Location = New System.Drawing.Point(12, 638)
-        Me.BtSign.Name = "BtSign"
-        Me.BtSign.Size = New System.Drawing.Size(126, 23)
-        Me.BtSign.TabIndex = 5
-        Me.BtSign.Text = "Create Signature File"
-        Me.BtSign.UseVisualStyleBackColor = True
-        '
-        'BtClose
-        '
-        Me.BtClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.BtClose.Location = New System.Drawing.Point(522, 638)
-        Me.BtClose.Name = "BtClose"
-        Me.BtClose.Size = New System.Drawing.Size(67, 23)
-        Me.BtClose.TabIndex = 6
-        Me.BtClose.Text = "Close"
-        Me.BtClose.UseVisualStyleBackColor = True
-        '
-        'BtRemFLD
-        '
-        Me.BtRemFLD.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.BtRemFLD.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.BtRemFLD.Location = New System.Drawing.Point(43, 393)
-        Me.BtRemFLD.Name = "BtRemFLD"
-        Me.BtRemFLD.Size = New System.Drawing.Size(29, 23)
-        Me.BtRemFLD.TabIndex = 2
-        Me.BtRemFLD.UseVisualStyleBackColor = True
-        '
-        'BtAddFLD
-        '
-        Me.BtAddFLD.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.BtAddFLD.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.BtAddFLD.Location = New System.Drawing.Point(6, 393)
-        Me.BtAddFLD.Name = "BtAddFLD"
-        Me.BtAddFLD.Size = New System.Drawing.Size(29, 23)
-        Me.BtAddFLD.TabIndex = 1
-        Me.BtAddFLD.UseVisualStyleBackColor = True
-        '
-        'GroupBox1
-        '
-        Me.GroupBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.GroupBox1.Controls.Add(Me.lvFiles)
-        Me.GroupBox1.Controls.Add(Me.BtClearList)
-        Me.GroupBox1.Controls.Add(Me.BtRemFLD)
-        Me.GroupBox1.Controls.Add(Me.BtAddFLD)
-        Me.GroupBox1.Location = New System.Drawing.Point(12, 210)
-        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(577, 422)
-        Me.GroupBox1.TabIndex = 4
-        Me.GroupBox1.TabStop = False
-        Me.GroupBox1.Text = "Files"
-        '
-        'BtClearList
-        '
-        Me.BtClearList.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.BtClearList.Location = New System.Drawing.Point(78, 393)
-        Me.BtClearList.Name = "BtClearList"
-        Me.BtClearList.Size = New System.Drawing.Size(63, 23)
-        Me.BtClearList.TabIndex = 3
-        Me.BtClearList.Text = "Clear List"
-        Me.BtClearList.UseVisualStyleBackColor = True
-        '
-        'BtReload
-        '
-        Me.BtReload.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.BtReload.Image = Global.VECTO.My.Resources.Resources.Refresh_icon
-        Me.BtReload.Location = New System.Drawing.Point(561, 27)
-        Me.BtReload.Name = "BtReload"
-        Me.BtReload.Size = New System.Drawing.Size(28, 23)
-        Me.BtReload.TabIndex = 2
-        Me.BtReload.UseVisualStyleBackColor = True
-        '
-        'GroupBox2
-        '
-        Me.GroupBox2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.GroupBox2.Controls.Add(Me.LbStatus)
-        Me.GroupBox2.Controls.Add(Me.LbMode)
-        Me.GroupBox2.Controls.Add(Me.LbDateStr)
-        Me.GroupBox2.Controls.Add(Me.TbPubKey)
-        Me.GroupBox2.Controls.Add(Me.TbLicStr)
-        Me.GroupBox2.Controls.Add(Me.Label5)
-        Me.GroupBox2.Controls.Add(Me.Label6)
-        Me.GroupBox2.Controls.Add(Me.Label3)
-        Me.GroupBox2.Controls.Add(Me.Label4)
-        Me.GroupBox2.Controls.Add(Me.Label2)
-        Me.GroupBox2.Location = New System.Drawing.Point(18, 55)
-        Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(571, 149)
-        Me.GroupBox2.TabIndex = 3
-        Me.GroupBox2.TabStop = False
-        Me.GroupBox2.Text = "File Information"
-        '
-        'LbStatus
-        '
-        Me.LbStatus.AutoSize = True
-        Me.LbStatus.Location = New System.Drawing.Point(99, 116)
-        Me.LbStatus.Name = "LbStatus"
-        Me.LbStatus.Size = New System.Drawing.Size(0, 13)
-        Me.LbStatus.TabIndex = 4
-        '
-        'LbMode
-        '
-        Me.LbMode.AutoSize = True
-        Me.LbMode.Location = New System.Drawing.Point(99, 87)
-        Me.LbMode.Name = "LbMode"
-        Me.LbMode.Size = New System.Drawing.Size(0, 13)
-        Me.LbMode.TabIndex = 3
-        '
-        'LbDateStr
-        '
-        Me.LbDateStr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.LbDateStr.AutoSize = True
-        Me.LbDateStr.Location = New System.Drawing.Point(415, 87)
-        Me.LbDateStr.Name = "LbDateStr"
-        Me.LbDateStr.Size = New System.Drawing.Size(0, 13)
-        Me.LbDateStr.TabIndex = 2
-        '
-        'TbPubKey
-        '
-        Me.TbPubKey.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TbPubKey.Location = New System.Drawing.Point(99, 48)
-        Me.TbPubKey.Name = "TbPubKey"
-        Me.TbPubKey.ReadOnly = True
-        Me.TbPubKey.Size = New System.Drawing.Size(466, 20)
-        Me.TbPubKey.TabIndex = 1
-        '
-        'TbLicStr
-        '
-        Me.TbLicStr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TbLicStr.Location = New System.Drawing.Point(99, 22)
-        Me.TbLicStr.Name = "TbLicStr"
-        Me.TbLicStr.ReadOnly = True
-        Me.TbLicStr.Size = New System.Drawing.Size(466, 20)
-        Me.TbLicStr.TabIndex = 0
-        '
-        'Label5
-        '
-        Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(33, 51)
-        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(60, 13)
-        Me.Label5.TabIndex = 0
-        Me.Label5.Text = "Public Key:"
-        '
-        'Label6
-        '
-        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(53, 116)
-        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(40, 13)
-        Me.Label6.TabIndex = 0
-        Me.Label6.Text = "Status:"
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(56, 87)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(37, 13)
-        Me.Label3.TabIndex = 0
-        Me.Label3.Text = "Mode:"
-        '
-        'Label4
-        '
-        Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(334, 87)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(75, 13)
-        Me.Label4.TabIndex = 0
-        Me.Label4.Text = "Creation Time:"
-        '
-        'Label2
-        '
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(12, 25)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(81, 13)
-        Me.Label2.TabIndex = 0
-        Me.Label2.Text = "License Owner:"
-        '
-        'F_FileSign
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(601, 673)
-        Me.Controls.Add(Me.GroupBox2)
-        Me.Controls.Add(Me.BtReload)
-        Me.Controls.Add(Me.GroupBox1)
-        Me.Controls.Add(Me.BtClose)
-        Me.Controls.Add(Me.BtSign)
-        Me.Controls.Add(Me.BtBrowse)
-        Me.Controls.Add(Me.Label1)
-        Me.Controls.Add(Me.TbSigFile)
-        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.MaximizeBox = False
-        Me.MinimizeBox = False
-        Me.MinimumSize = New System.Drawing.Size(480, 400)
-        Me.Name = "F_FileSign"
-        Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        Me.Text = "Sign & Verify Files"
-        Me.GroupBox1.ResumeLayout(False)
-        Me.GroupBox2.ResumeLayout(False)
-        Me.GroupBox2.PerformLayout()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
+		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_FileSign))
+		Me.TbSigFile = New System.Windows.Forms.TextBox()
+		Me.Label1 = New System.Windows.Forms.Label()
+		Me.BtBrowse = New System.Windows.Forms.Button()
+		Me.lvFiles = New System.Windows.Forms.ListView()
+		Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.ColumnHeader2 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.BtSign = New System.Windows.Forms.Button()
+		Me.BtClose = New System.Windows.Forms.Button()
+		Me.BtRemFLD = New System.Windows.Forms.Button()
+		Me.BtAddFLD = New System.Windows.Forms.Button()
+		Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+		Me.BtClearList = New System.Windows.Forms.Button()
+		Me.BtReload = New System.Windows.Forms.Button()
+		Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+		Me.LbStatus = New System.Windows.Forms.Label()
+		Me.LbMode = New System.Windows.Forms.Label()
+		Me.LbDateStr = New System.Windows.Forms.Label()
+		Me.TbPubKey = New System.Windows.Forms.TextBox()
+		Me.TbLicStr = New System.Windows.Forms.TextBox()
+		Me.Label5 = New System.Windows.Forms.Label()
+		Me.Label6 = New System.Windows.Forms.Label()
+		Me.Label3 = New System.Windows.Forms.Label()
+		Me.Label4 = New System.Windows.Forms.Label()
+		Me.Label2 = New System.Windows.Forms.Label()
+		Me.GroupBox1.SuspendLayout()
+		Me.GroupBox2.SuspendLayout()
+		Me.SuspendLayout()
+		'
+		'TbSigFile
+		'
+		Me.TbSigFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbSigFile.Location = New System.Drawing.Point(12, 29)
+		Me.TbSigFile.Name = "TbSigFile"
+		Me.TbSigFile.Size = New System.Drawing.Size(528, 20)
+		Me.TbSigFile.TabIndex = 0
+		'
+		'Label1
+		'
+		Me.Label1.AutoSize = True
+		Me.Label1.Location = New System.Drawing.Point(12, 13)
+		Me.Label1.Name = "Label1"
+		Me.Label1.Size = New System.Drawing.Size(99, 13)
+		Me.Label1.TabIndex = 4
+		Me.Label1.Text = "Signature file (.vsig)"
+		'
+		'BtBrowse
+		'
+		Me.BtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon
+		Me.BtBrowse.Location = New System.Drawing.Point(541, 27)
+		Me.BtBrowse.Name = "BtBrowse"
+		Me.BtBrowse.Size = New System.Drawing.Size(24, 24)
+		Me.BtBrowse.TabIndex = 1
+		Me.BtBrowse.UseVisualStyleBackColor = True
+		'
+		'lvFiles
+		'
+		Me.lvFiles.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+			Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.lvFiles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2})
+		Me.lvFiles.FullRowSelect = True
+		Me.lvFiles.GridLines = True
+		Me.lvFiles.LabelEdit = True
+		Me.lvFiles.Location = New System.Drawing.Point(6, 19)
+		Me.lvFiles.MultiSelect = False
+		Me.lvFiles.Name = "lvFiles"
+		Me.lvFiles.Size = New System.Drawing.Size(565, 368)
+		Me.lvFiles.TabIndex = 0
+		Me.lvFiles.UseCompatibleStateImageBehavior = False
+		Me.lvFiles.View = System.Windows.Forms.View.Details
+		'
+		'ColumnHeader1
+		'
+		Me.ColumnHeader1.Text = "File"
+		Me.ColumnHeader1.Width = 408
+		'
+		'ColumnHeader2
+		'
+		Me.ColumnHeader2.Text = "Status"
+		Me.ColumnHeader2.Width = 141
+		'
+		'BtSign
+		'
+		Me.BtSign.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtSign.Location = New System.Drawing.Point(12, 638)
+		Me.BtSign.Name = "BtSign"
+		Me.BtSign.Size = New System.Drawing.Size(126, 23)
+		Me.BtSign.TabIndex = 5
+		Me.BtSign.Text = "Create Signature File"
+		Me.BtSign.UseVisualStyleBackColor = True
+		'
+		'BtClose
+		'
+		Me.BtClose.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtClose.Location = New System.Drawing.Point(522, 638)
+		Me.BtClose.Name = "BtClose"
+		Me.BtClose.Size = New System.Drawing.Size(67, 23)
+		Me.BtClose.TabIndex = 6
+		Me.BtClose.Text = "Close"
+		Me.BtClose.UseVisualStyleBackColor = True
+		'
+		'BtRemFLD
+		'
+		Me.BtRemFLD.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtRemFLD.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
+		Me.BtRemFLD.Location = New System.Drawing.Point(29, 387)
+		Me.BtRemFLD.Name = "BtRemFLD"
+		Me.BtRemFLD.Size = New System.Drawing.Size(24, 24)
+		Me.BtRemFLD.TabIndex = 2
+		Me.BtRemFLD.UseVisualStyleBackColor = True
+		'
+		'BtAddFLD
+		'
+		Me.BtAddFLD.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtAddFLD.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
+		Me.BtAddFLD.Location = New System.Drawing.Point(5, 387)
+		Me.BtAddFLD.Name = "BtAddFLD"
+		Me.BtAddFLD.Size = New System.Drawing.Size(24, 24)
+		Me.BtAddFLD.TabIndex = 1
+		Me.BtAddFLD.UseVisualStyleBackColor = True
+		'
+		'GroupBox1
+		'
+		Me.GroupBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+			Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.GroupBox1.Controls.Add(Me.lvFiles)
+		Me.GroupBox1.Controls.Add(Me.BtClearList)
+		Me.GroupBox1.Controls.Add(Me.BtRemFLD)
+		Me.GroupBox1.Controls.Add(Me.BtAddFLD)
+		Me.GroupBox1.Location = New System.Drawing.Point(12, 210)
+		Me.GroupBox1.Name = "GroupBox1"
+		Me.GroupBox1.Size = New System.Drawing.Size(577, 422)
+		Me.GroupBox1.TabIndex = 4
+		Me.GroupBox1.TabStop = False
+		Me.GroupBox1.Text = "Files"
+		'
+		'BtClearList
+		'
+		Me.BtClearList.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtClearList.Location = New System.Drawing.Point(508, 387)
+		Me.BtClearList.Name = "BtClearList"
+		Me.BtClearList.Size = New System.Drawing.Size(63, 24)
+		Me.BtClearList.TabIndex = 3
+		Me.BtClearList.Text = "Clear List"
+		Me.BtClearList.UseVisualStyleBackColor = True
+		'
+		'BtReload
+		'
+		Me.BtReload.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtReload.Image = Global.VECTO.My.Resources.Resources.Refresh_icon
+		Me.BtReload.Location = New System.Drawing.Point(565, 27)
+		Me.BtReload.Name = "BtReload"
+		Me.BtReload.Size = New System.Drawing.Size(24, 24)
+		Me.BtReload.TabIndex = 2
+		Me.BtReload.UseVisualStyleBackColor = True
+		'
+		'GroupBox2
+		'
+		Me.GroupBox2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.GroupBox2.Controls.Add(Me.LbStatus)
+		Me.GroupBox2.Controls.Add(Me.LbMode)
+		Me.GroupBox2.Controls.Add(Me.LbDateStr)
+		Me.GroupBox2.Controls.Add(Me.TbPubKey)
+		Me.GroupBox2.Controls.Add(Me.TbLicStr)
+		Me.GroupBox2.Controls.Add(Me.Label5)
+		Me.GroupBox2.Controls.Add(Me.Label6)
+		Me.GroupBox2.Controls.Add(Me.Label3)
+		Me.GroupBox2.Controls.Add(Me.Label4)
+		Me.GroupBox2.Controls.Add(Me.Label2)
+		Me.GroupBox2.Location = New System.Drawing.Point(18, 55)
+		Me.GroupBox2.Name = "GroupBox2"
+		Me.GroupBox2.Size = New System.Drawing.Size(571, 149)
+		Me.GroupBox2.TabIndex = 3
+		Me.GroupBox2.TabStop = False
+		Me.GroupBox2.Text = "File Information"
+		'
+		'LbStatus
+		'
+		Me.LbStatus.AutoSize = True
+		Me.LbStatus.Location = New System.Drawing.Point(99, 116)
+		Me.LbStatus.Name = "LbStatus"
+		Me.LbStatus.Size = New System.Drawing.Size(0, 13)
+		Me.LbStatus.TabIndex = 4
+		'
+		'LbMode
+		'
+		Me.LbMode.AutoSize = True
+		Me.LbMode.Location = New System.Drawing.Point(99, 87)
+		Me.LbMode.Name = "LbMode"
+		Me.LbMode.Size = New System.Drawing.Size(0, 13)
+		Me.LbMode.TabIndex = 3
+		'
+		'LbDateStr
+		'
+		Me.LbDateStr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.LbDateStr.AutoSize = True
+		Me.LbDateStr.Location = New System.Drawing.Point(415, 87)
+		Me.LbDateStr.Name = "LbDateStr"
+		Me.LbDateStr.Size = New System.Drawing.Size(0, 13)
+		Me.LbDateStr.TabIndex = 2
+		'
+		'TbPubKey
+		'
+		Me.TbPubKey.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbPubKey.Location = New System.Drawing.Point(99, 48)
+		Me.TbPubKey.Name = "TbPubKey"
+		Me.TbPubKey.ReadOnly = True
+		Me.TbPubKey.Size = New System.Drawing.Size(466, 20)
+		Me.TbPubKey.TabIndex = 1
+		'
+		'TbLicStr
+		'
+		Me.TbLicStr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbLicStr.Location = New System.Drawing.Point(99, 22)
+		Me.TbLicStr.Name = "TbLicStr"
+		Me.TbLicStr.ReadOnly = True
+		Me.TbLicStr.Size = New System.Drawing.Size(466, 20)
+		Me.TbLicStr.TabIndex = 0
+		'
+		'Label5
+		'
+		Me.Label5.AutoSize = True
+		Me.Label5.Location = New System.Drawing.Point(33, 51)
+		Me.Label5.Name = "Label5"
+		Me.Label5.Size = New System.Drawing.Size(60, 13)
+		Me.Label5.TabIndex = 0
+		Me.Label5.Text = "Public Key:"
+		'
+		'Label6
+		'
+		Me.Label6.AutoSize = True
+		Me.Label6.Location = New System.Drawing.Point(53, 116)
+		Me.Label6.Name = "Label6"
+		Me.Label6.Size = New System.Drawing.Size(40, 13)
+		Me.Label6.TabIndex = 0
+		Me.Label6.Text = "Status:"
+		'
+		'Label3
+		'
+		Me.Label3.AutoSize = True
+		Me.Label3.Location = New System.Drawing.Point(56, 87)
+		Me.Label3.Name = "Label3"
+		Me.Label3.Size = New System.Drawing.Size(37, 13)
+		Me.Label3.TabIndex = 0
+		Me.Label3.Text = "Mode:"
+		'
+		'Label4
+		'
+		Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label4.AutoSize = True
+		Me.Label4.Location = New System.Drawing.Point(334, 87)
+		Me.Label4.Name = "Label4"
+		Me.Label4.Size = New System.Drawing.Size(75, 13)
+		Me.Label4.TabIndex = 0
+		Me.Label4.Text = "Creation Time:"
+		'
+		'Label2
+		'
+		Me.Label2.AutoSize = True
+		Me.Label2.Location = New System.Drawing.Point(12, 25)
+		Me.Label2.Name = "Label2"
+		Me.Label2.Size = New System.Drawing.Size(81, 13)
+		Me.Label2.TabIndex = 0
+		Me.Label2.Text = "License Owner:"
+		'
+		'F_FileSign
+		'
+		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+		Me.ClientSize = New System.Drawing.Size(601, 673)
+		Me.Controls.Add(Me.GroupBox2)
+		Me.Controls.Add(Me.BtReload)
+		Me.Controls.Add(Me.GroupBox1)
+		Me.Controls.Add(Me.BtClose)
+		Me.Controls.Add(Me.BtSign)
+		Me.Controls.Add(Me.BtBrowse)
+		Me.Controls.Add(Me.Label1)
+		Me.Controls.Add(Me.TbSigFile)
+		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+		Me.MaximizeBox = False
+		Me.MinimizeBox = False
+		Me.MinimumSize = New System.Drawing.Size(480, 400)
+		Me.Name = "F_FileSign"
+		Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.Text = "Sign & Verify Files"
+		Me.GroupBox1.ResumeLayout(False)
+		Me.GroupBox2.ResumeLayout(False)
+		Me.GroupBox2.PerformLayout()
+		Me.ResumeLayout(False)
+		Me.PerformLayout()
 
-    End Sub
+	End Sub
     Friend WithEvents TbSigFile As System.Windows.Forms.TextBox
     Friend WithEvents Label1 As System.Windows.Forms.Label
     Friend WithEvents BtBrowse As System.Windows.Forms.Button
diff --git a/VECTO/GUI/F_GBX.Designer.vb b/VECTO/GUI/F_GBX.Designer.vb
index 3a53f946f4b9918603db1b3ca36f648dab3b3306..56636a755c07fb3ada90973de84c3f7cbc69cdf1 100644
--- a/VECTO/GUI/F_GBX.Designer.vb
+++ b/VECTO/GUI/F_GBX.Designer.vb
@@ -65,6 +65,16 @@ Partial Class F_GBX
 		Me.PictureBox1 = New System.Windows.Forms.PictureBox()
 		Me.BtRemGear = New System.Windows.Forms.Button()
 		Me.GrGearShift = New System.Windows.Forms.GroupBox()
+		Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+		Me.tbUpshiftMinAcceleration = New System.Windows.Forms.TextBox()
+		Me.tbUpshiftAfterDownshift = New System.Windows.Forms.TextBox()
+		Me.tbDownshiftAfterUpshift = New System.Windows.Forms.TextBox()
+		Me.Label24 = New System.Windows.Forms.Label()
+		Me.Label23 = New System.Windows.Forms.Label()
+		Me.Label22 = New System.Windows.Forms.Label()
+		Me.Label21 = New System.Windows.Forms.Label()
+		Me.Label20 = New System.Windows.Forms.Label()
+		Me.Label19 = New System.Windows.Forms.Label()
 		Me.PnTorqRes = New System.Windows.Forms.Panel()
 		Me.Label2 = New System.Windows.Forms.Label()
 		Me.Label4 = New System.Windows.Forms.Label()
@@ -107,20 +117,11 @@ Partial Class F_GBX
 		Me.Label32 = New System.Windows.Forms.Label()
 		Me.PnInertiaTI = New System.Windows.Forms.Panel()
 		Me.PicBox = New System.Windows.Forms.PictureBox()
-		Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-		Me.Label19 = New System.Windows.Forms.Label()
-		Me.Label20 = New System.Windows.Forms.Label()
-		Me.Label21 = New System.Windows.Forms.Label()
-		Me.Label22 = New System.Windows.Forms.Label()
-		Me.Label23 = New System.Windows.Forms.Label()
-		Me.Label24 = New System.Windows.Forms.Label()
-		Me.tbDownshiftAfterUpshift = New System.Windows.Forms.TextBox()
-		Me.tbUpshiftAfterDownshift = New System.Windows.Forms.TextBox()
-		Me.tbUpshiftMinAcceleration = New System.Windows.Forms.TextBox()
 		Me.ToolStrip1.SuspendLayout()
 		Me.StatusStrip1.SuspendLayout()
 		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
 		Me.GrGearShift.SuspendLayout()
+		Me.GroupBox1.SuspendLayout()
 		Me.PnTorqRes.SuspendLayout()
 		Me.GroupBox2.SuspendLayout()
 		Me.CmOpenFile.SuspendLayout()
@@ -129,7 +130,6 @@ Partial Class F_GBX
 		Me.GroupBox4.SuspendLayout()
 		Me.PnInertiaTI.SuspendLayout()
 		CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
-		Me.GroupBox1.SuspendLayout()
 		Me.SuspendLayout()
 		'
 		'ToolStrip1
@@ -395,6 +395,100 @@ Partial Class F_GBX
 		Me.GrGearShift.TabStop = False
 		Me.GrGearShift.Text = "Gear shift parameters"
 		'
+		'GroupBox1
+		'
+		Me.GroupBox1.BackColor = System.Drawing.Color.AliceBlue
+		Me.GroupBox1.Controls.Add(Me.tbUpshiftMinAcceleration)
+		Me.GroupBox1.Controls.Add(Me.tbUpshiftAfterDownshift)
+		Me.GroupBox1.Controls.Add(Me.tbDownshiftAfterUpshift)
+		Me.GroupBox1.Controls.Add(Me.Label24)
+		Me.GroupBox1.Controls.Add(Me.Label23)
+		Me.GroupBox1.Controls.Add(Me.Label22)
+		Me.GroupBox1.Controls.Add(Me.Label21)
+		Me.GroupBox1.Controls.Add(Me.Label20)
+		Me.GroupBox1.Controls.Add(Me.Label19)
+		Me.GroupBox1.Location = New System.Drawing.Point(6, 82)
+		Me.GroupBox1.Name = "GroupBox1"
+		Me.GroupBox1.Size = New System.Drawing.Size(429, 100)
+		Me.GroupBox1.TabIndex = 10
+		Me.GroupBox1.TabStop = False
+		Me.GroupBox1.Text = "Shift Strategy Parameters"
+		'
+		'tbUpshiftMinAcceleration
+		'
+		Me.tbUpshiftMinAcceleration.Location = New System.Drawing.Point(209, 71)
+		Me.tbUpshiftMinAcceleration.Name = "tbUpshiftMinAcceleration"
+		Me.tbUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20)
+		Me.tbUpshiftMinAcceleration.TabIndex = 8
+		'
+		'tbUpshiftAfterDownshift
+		'
+		Me.tbUpshiftAfterDownshift.Location = New System.Drawing.Point(209, 45)
+		Me.tbUpshiftAfterDownshift.Name = "tbUpshiftAfterDownshift"
+		Me.tbUpshiftAfterDownshift.Size = New System.Drawing.Size(57, 20)
+		Me.tbUpshiftAfterDownshift.TabIndex = 7
+		'
+		'tbDownshiftAfterUpshift
+		'
+		Me.tbDownshiftAfterUpshift.Location = New System.Drawing.Point(209, 20)
+		Me.tbDownshiftAfterUpshift.Name = "tbDownshiftAfterUpshift"
+		Me.tbDownshiftAfterUpshift.Size = New System.Drawing.Size(57, 20)
+		Me.tbDownshiftAfterUpshift.TabIndex = 6
+		'
+		'Label24
+		'
+		Me.Label24.AutoSize = True
+		Me.Label24.Location = New System.Drawing.Point(275, 74)
+		Me.Label24.Name = "Label24"
+		Me.Label24.Size = New System.Drawing.Size(34, 13)
+		Me.Label24.TabIndex = 5
+		Me.Label24.Text = "[m/s²]"
+		'
+		'Label23
+		'
+		Me.Label23.AutoSize = True
+		Me.Label23.Location = New System.Drawing.Point(275, 48)
+		Me.Label23.Name = "Label23"
+		Me.Label23.Size = New System.Drawing.Size(18, 13)
+		Me.Label23.TabIndex = 4
+		Me.Label23.Text = "[s]"
+		'
+		'Label22
+		'
+		Me.Label22.AutoSize = True
+		Me.Label22.Location = New System.Drawing.Point(275, 25)
+		Me.Label22.Name = "Label22"
+		Me.Label22.Size = New System.Drawing.Size(18, 13)
+		Me.Label22.TabIndex = 3
+		Me.Label22.Text = "[s]"
+		'
+		'Label21
+		'
+		Me.Label21.AutoSize = True
+		Me.Label21.Location = New System.Drawing.Point(20, 74)
+		Me.Label21.Name = "Label21"
+		Me.Label21.Size = New System.Drawing.Size(146, 13)
+		Me.Label21.TabIndex = 2
+		Me.Label21.Text = "Min. acceleration after upshift"
+		'
+		'Label20
+		'
+		Me.Label20.AutoSize = True
+		Me.Label20.Location = New System.Drawing.Point(20, 48)
+		Me.Label20.Name = "Label20"
+		Me.Label20.Size = New System.Drawing.Size(137, 13)
+		Me.Label20.TabIndex = 1
+		Me.Label20.Text = "Upshift afer downshift delay"
+		'
+		'Label19
+		'
+		Me.Label19.AutoSize = True
+		Me.Label19.Location = New System.Drawing.Point(20, 25)
+		Me.Label19.Name = "Label19"
+		Me.Label19.Size = New System.Drawing.Size(137, 13)
+		Me.Label19.TabIndex = 0
+		Me.Label19.Text = "Downshift afer upshift delay"
+		'
 		'PnTorqRes
 		'
 		Me.PnTorqRes.Controls.Add(Me.Label2)
@@ -676,30 +770,30 @@ Partial Class F_GBX
 		'BtTCfileBrowse
 		'
 		Me.BtTCfileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.BtTCfileBrowse.Location = New System.Drawing.Point(341, 19)
+		Me.BtTCfileBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon
+		Me.BtTCfileBrowse.Location = New System.Drawing.Point(348, 19)
 		Me.BtTCfileBrowse.Name = "BtTCfileBrowse"
-		Me.BtTCfileBrowse.Size = New System.Drawing.Size(32, 23)
+		Me.BtTCfileBrowse.Size = New System.Drawing.Size(24, 24)
 		Me.BtTCfileBrowse.TabIndex = 1
 		Me.BtTCfileBrowse.TabStop = False
-		Me.BtTCfileBrowse.Text = "..."
 		Me.BtTCfileBrowse.UseVisualStyleBackColor = True
 		'
 		'TbTCfile
 		'
 		Me.TbTCfile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
 			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TbTCfile.Location = New System.Drawing.Point(0, 21)
+		Me.TbTCfile.Location = New System.Drawing.Point(4, 21)
 		Me.TbTCfile.Name = "TbTCfile"
-		Me.TbTCfile.Size = New System.Drawing.Size(335, 20)
+		Me.TbTCfile.Size = New System.Drawing.Size(343, 20)
 		Me.TbTCfile.TabIndex = 0
 		'
 		'BtTCfileOpen
 		'
 		Me.BtTCfileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.BtTCfileOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
-		Me.BtTCfileOpen.Location = New System.Drawing.Point(379, 19)
+		Me.BtTCfileOpen.Location = New System.Drawing.Point(372, 19)
 		Me.BtTCfileOpen.Name = "BtTCfileOpen"
-		Me.BtTCfileOpen.Size = New System.Drawing.Size(23, 23)
+		Me.BtTCfileOpen.Size = New System.Drawing.Size(24, 24)
 		Me.BtTCfileOpen.TabIndex = 2
 		Me.BtTCfileOpen.TabStop = False
 		Me.BtTCfileOpen.UseVisualStyleBackColor = True
@@ -795,100 +889,6 @@ Partial Class F_GBX
 		Me.PicBox.TabIndex = 48
 		Me.PicBox.TabStop = False
 		'
-		'GroupBox1
-		'
-		Me.GroupBox1.BackColor = System.Drawing.Color.AliceBlue
-		Me.GroupBox1.Controls.Add(Me.tbUpshiftMinAcceleration)
-		Me.GroupBox1.Controls.Add(Me.tbUpshiftAfterDownshift)
-		Me.GroupBox1.Controls.Add(Me.tbDownshiftAfterUpshift)
-		Me.GroupBox1.Controls.Add(Me.Label24)
-		Me.GroupBox1.Controls.Add(Me.Label23)
-		Me.GroupBox1.Controls.Add(Me.Label22)
-		Me.GroupBox1.Controls.Add(Me.Label21)
-		Me.GroupBox1.Controls.Add(Me.Label20)
-		Me.GroupBox1.Controls.Add(Me.Label19)
-		Me.GroupBox1.Location = New System.Drawing.Point(6, 82)
-		Me.GroupBox1.Name = "GroupBox1"
-		Me.GroupBox1.Size = New System.Drawing.Size(429, 100)
-		Me.GroupBox1.TabIndex = 10
-		Me.GroupBox1.TabStop = False
-		Me.GroupBox1.Text = "Shift Strategy Parameters"
-		'
-		'Label19
-		'
-		Me.Label19.AutoSize = True
-		Me.Label19.Location = New System.Drawing.Point(20, 25)
-		Me.Label19.Name = "Label19"
-		Me.Label19.Size = New System.Drawing.Size(137, 13)
-		Me.Label19.TabIndex = 0
-		Me.Label19.Text = "Downshift afer upshift delay"
-		'
-		'Label20
-		'
-		Me.Label20.AutoSize = True
-		Me.Label20.Location = New System.Drawing.Point(20, 48)
-		Me.Label20.Name = "Label20"
-		Me.Label20.Size = New System.Drawing.Size(137, 13)
-		Me.Label20.TabIndex = 1
-		Me.Label20.Text = "Upshift afer downshift delay"
-		'
-		'Label21
-		'
-		Me.Label21.AutoSize = True
-		Me.Label21.Location = New System.Drawing.Point(20, 74)
-		Me.Label21.Name = "Label21"
-		Me.Label21.Size = New System.Drawing.Size(146, 13)
-		Me.Label21.TabIndex = 2
-		Me.Label21.Text = "Min. acceleration after upshift"
-		'
-		'Label22
-		'
-		Me.Label22.AutoSize = True
-		Me.Label22.Location = New System.Drawing.Point(275, 25)
-		Me.Label22.Name = "Label22"
-		Me.Label22.Size = New System.Drawing.Size(18, 13)
-		Me.Label22.TabIndex = 3
-		Me.Label22.Text = "[s]"
-		'
-		'Label23
-		'
-		Me.Label23.AutoSize = True
-		Me.Label23.Location = New System.Drawing.Point(275, 48)
-		Me.Label23.Name = "Label23"
-		Me.Label23.Size = New System.Drawing.Size(18, 13)
-		Me.Label23.TabIndex = 4
-		Me.Label23.Text = "[s]"
-		'
-		'Label24
-		'
-		Me.Label24.AutoSize = True
-		Me.Label24.Location = New System.Drawing.Point(275, 74)
-		Me.Label24.Name = "Label24"
-		Me.Label24.Size = New System.Drawing.Size(34, 13)
-		Me.Label24.TabIndex = 5
-		Me.Label24.Text = "[m/s²]"
-		'
-		'tbDownshiftAfterUpshift
-		'
-		Me.tbDownshiftAfterUpshift.Location = New System.Drawing.Point(209, 20)
-		Me.tbDownshiftAfterUpshift.Name = "tbDownshiftAfterUpshift"
-		Me.tbDownshiftAfterUpshift.Size = New System.Drawing.Size(57, 20)
-		Me.tbDownshiftAfterUpshift.TabIndex = 6
-		'
-		'tbUpshiftAfterDownshift
-		'
-		Me.tbUpshiftAfterDownshift.Location = New System.Drawing.Point(209, 45)
-		Me.tbUpshiftAfterDownshift.Name = "tbUpshiftAfterDownshift"
-		Me.tbUpshiftAfterDownshift.Size = New System.Drawing.Size(57, 20)
-		Me.tbUpshiftAfterDownshift.TabIndex = 7
-		'
-		'tbUpshiftMinAcceleration
-		'
-		Me.tbUpshiftMinAcceleration.Location = New System.Drawing.Point(209, 71)
-		Me.tbUpshiftMinAcceleration.Name = "tbUpshiftMinAcceleration"
-		Me.tbUpshiftMinAcceleration.Size = New System.Drawing.Size(57, 20)
-		Me.tbUpshiftMinAcceleration.TabIndex = 8
-		'
 		'F_GBX
 		'
 		Me.AcceptButton = Me.ButOK
@@ -923,6 +923,8 @@ Partial Class F_GBX
 		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
 		Me.GrGearShift.ResumeLayout(False)
 		Me.GrGearShift.PerformLayout()
+		Me.GroupBox1.ResumeLayout(False)
+		Me.GroupBox1.PerformLayout()
 		Me.PnTorqRes.ResumeLayout(False)
 		Me.PnTorqRes.PerformLayout()
 		Me.GroupBox2.ResumeLayout(False)
@@ -937,8 +939,6 @@ Partial Class F_GBX
 		Me.PnInertiaTI.ResumeLayout(False)
 		Me.PnInertiaTI.PerformLayout()
 		CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
-		Me.GroupBox1.ResumeLayout(False)
-		Me.GroupBox1.PerformLayout()
 		Me.ResumeLayout(False)
 		Me.PerformLayout()
 
diff --git a/VECTO/GUI/F_Graph.Designer.vb b/VECTO/GUI/F_Graph.Designer.vb
index 363249425b64d850f29720fcd3014620f54c6fb8..db7594de7d0832e6afd08c03d2193cf80cda1eb4 100644
--- a/VECTO/GUI/F_Graph.Designer.vb
+++ b/VECTO/GUI/F_Graph.Designer.vb
@@ -22,302 +22,302 @@ Partial Class F_Graph
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_Graph))
-        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-        Me.BtRemCh = New System.Windows.Forms.Button()
-        Me.BtAddCh = New System.Windows.Forms.Button()
-        Me.ListView1 = New System.Windows.Forms.ListView()
-        Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.CbXaxis = New System.Windows.Forms.ComboBox()
-        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-        Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.TbXmin = New System.Windows.Forms.TextBox()
-        Me.TbXmax = New System.Windows.Forms.TextBox()
-        Me.BtReset = New System.Windows.Forms.Button()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.BtZoomIn = New System.Windows.Forms.Button()
-        Me.BtZoomOut = New System.Windows.Forms.Button()
-        Me.BtMoveL = New System.Windows.Forms.Button()
-        Me.BtMoveR = New System.Windows.Forms.Button()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.GroupBox1.SuspendLayout()
-        Me.ToolStrip1.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'PictureBox1
-        '
-        Me.PictureBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.PictureBox1.BackColor = System.Drawing.Color.LightGray
-        Me.PictureBox1.Location = New System.Drawing.Point(262, 28)
-        Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(984, 332)
-        Me.PictureBox1.TabIndex = 0
-        Me.PictureBox1.TabStop = False
-        '
-        'GroupBox1
-        '
-        Me.GroupBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.GroupBox1.Controls.Add(Me.BtRemCh)
-        Me.GroupBox1.Controls.Add(Me.BtAddCh)
-        Me.GroupBox1.Controls.Add(Me.ListView1)
-        Me.GroupBox1.Location = New System.Drawing.Point(12, 28)
-        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(244, 362)
-        Me.GroupBox1.TabIndex = 0
-        Me.GroupBox1.TabStop = False
-        Me.GroupBox1.Text = "Channels"
-        '
-        'BtRemCh
-        '
-        Me.BtRemCh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.BtRemCh.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.BtRemCh.Location = New System.Drawing.Point(41, 333)
-        Me.BtRemCh.Name = "BtRemCh"
-        Me.BtRemCh.Size = New System.Drawing.Size(29, 23)
-        Me.BtRemCh.TabIndex = 2
-        Me.BtRemCh.UseVisualStyleBackColor = True
-        '
-        'BtAddCh
-        '
-        Me.BtAddCh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.BtAddCh.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.BtAddCh.Location = New System.Drawing.Point(6, 333)
-        Me.BtAddCh.Name = "BtAddCh"
-        Me.BtAddCh.Size = New System.Drawing.Size(29, 23)
-        Me.BtAddCh.TabIndex = 1
-        Me.BtAddCh.UseVisualStyleBackColor = True
-        '
-        'ListView1
-        '
-        Me.ListView1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.ListView1.BackColor = System.Drawing.Color.GhostWhite
-        Me.ListView1.CheckBoxes = True
-        Me.ListView1.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader3})
-        Me.ListView1.FullRowSelect = True
-        Me.ListView1.GridLines = True
-        Me.ListView1.Location = New System.Drawing.Point(6, 19)
-        Me.ListView1.Name = "ListView1"
-        Me.ListView1.Size = New System.Drawing.Size(232, 308)
-        Me.ListView1.TabIndex = 0
-        Me.ListView1.UseCompatibleStateImageBehavior = False
-        Me.ListView1.View = System.Windows.Forms.View.Details
-        '
-        'ColumnHeader1
-        '
-        Me.ColumnHeader1.Text = "Channel"
-        Me.ColumnHeader1.Width = 184
-        '
-        'ColumnHeader3
-        '
-        Me.ColumnHeader3.Text = "Y Axis"
-        Me.ColumnHeader3.Width = 42
-        '
-        'CbXaxis
-        '
-        Me.CbXaxis.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.CbXaxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.CbXaxis.FormattingEnabled = True
-        Me.CbXaxis.Items.AddRange(New Object() {"Distance", "Time"})
-        Me.CbXaxis.Location = New System.Drawing.Point(325, 369)
-        Me.CbXaxis.Name = "CbXaxis"
-        Me.CbXaxis.Size = New System.Drawing.Size(90, 21)
-        Me.CbXaxis.TabIndex = 1
-        '
-        'ToolStrip1
-        '
-        Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtOpen, Me.ToolStripButton3, Me.ToolStripButton2, Me.ToolStripSeparator1, Me.ToolStripButton1})
-        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
-        Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(1258, 25)
-        Me.ToolStrip1.TabIndex = 31
-        Me.ToolStrip1.Text = "ToolStrip1"
-        '
-        'ToolStripBtOpen
-        '
-        Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon
-        Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
-        Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripBtOpen.Text = "ToolStripButton1"
-        Me.ToolStripBtOpen.ToolTipText = "Open .vmod file"
-        '
-        'ToolStripButton3
-        '
-        Me.ToolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton3.Image = Global.VECTO.My.Resources.Resources.application_add_icon
-        Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton3.Name = "ToolStripButton3"
-        Me.ToolStripButton3.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripButton3.Text = "ToolStripButton3"
-        Me.ToolStripButton3.ToolTipText = "New window"
-        '
-        'ToolStripButton2
-        '
-        Me.ToolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton2.Image = Global.VECTO.My.Resources.Resources.Refresh_icon
-        Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton2.Name = "ToolStripButton2"
-        Me.ToolStripButton2.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripButton2.Text = "ToolStripButton2"
-        Me.ToolStripButton2.ToolTipText = "Reload file"
-        '
-        'ToolStripSeparator1
-        '
-        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
-        '
-        'ToolStripButton1
-        '
-        Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon
-        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
-        Me.ToolStripButton1.Text = "Help"
-        '
-        'Label1
-        '
-        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(283, 372)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(36, 13)
-        Me.Label1.TabIndex = 32
-        Me.Label1.Text = "X Axis"
-        '
-        'TbXmin
-        '
-        Me.TbXmin.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.TbXmin.Location = New System.Drawing.Point(497, 369)
-        Me.TbXmin.Name = "TbXmin"
-        Me.TbXmin.Size = New System.Drawing.Size(71, 20)
-        Me.TbXmin.TabIndex = 2
-        '
-        'TbXmax
-        '
-        Me.TbXmax.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.TbXmax.Location = New System.Drawing.Point(609, 369)
-        Me.TbXmax.Name = "TbXmax"
-        Me.TbXmax.Size = New System.Drawing.Size(71, 20)
-        Me.TbXmax.TabIndex = 3
-        '
-        'BtReset
-        '
-        Me.BtReset.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.BtReset.Location = New System.Drawing.Point(691, 367)
-        Me.BtReset.Name = "BtReset"
-        Me.BtReset.Size = New System.Drawing.Size(75, 23)
-        Me.BtReset.TabIndex = 4
-        Me.BtReset.Text = "Reset"
-        Me.BtReset.UseVisualStyleBackColor = True
-        '
-        'Label2
-        '
-        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(467, 372)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(24, 13)
-        Me.Label2.TabIndex = 35
-        Me.Label2.Text = "Min"
-        '
-        'Label3
-        '
-        Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(576, 372)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(27, 13)
-        Me.Label3.TabIndex = 35
-        Me.Label3.Text = "Max"
-        '
-        'BtZoomIn
-        '
-        Me.BtZoomIn.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.BtZoomIn.Location = New System.Drawing.Point(1103, 366)
-        Me.BtZoomIn.Name = "BtZoomIn"
-        Me.BtZoomIn.Size = New System.Drawing.Size(28, 23)
-        Me.BtZoomIn.TabIndex = 36
-        Me.BtZoomIn.Text = "+"
-        Me.BtZoomIn.UseVisualStyleBackColor = True
-        '
-        'BtZoomOut
-        '
-        Me.BtZoomOut.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.BtZoomOut.Location = New System.Drawing.Point(1137, 366)
-        Me.BtZoomOut.Name = "BtZoomOut"
-        Me.BtZoomOut.Size = New System.Drawing.Size(28, 23)
-        Me.BtZoomOut.TabIndex = 36
-        Me.BtZoomOut.Text = "-"
-        Me.BtZoomOut.UseVisualStyleBackColor = True
-        '
-        'BtMoveL
-        '
-        Me.BtMoveL.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.BtMoveL.Location = New System.Drawing.Point(1184, 366)
-        Me.BtMoveL.Name = "BtMoveL"
-        Me.BtMoveL.Size = New System.Drawing.Size(28, 23)
-        Me.BtMoveL.TabIndex = 36
-        Me.BtMoveL.Text = "<"
-        Me.BtMoveL.UseVisualStyleBackColor = True
-        '
-        'BtMoveR
-        '
-        Me.BtMoveR.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.BtMoveR.Location = New System.Drawing.Point(1218, 366)
-        Me.BtMoveR.Name = "BtMoveR"
-        Me.BtMoveR.Size = New System.Drawing.Size(28, 23)
-        Me.BtMoveR.TabIndex = 36
-        Me.BtMoveR.Text = ">"
-        Me.BtMoveR.UseVisualStyleBackColor = True
-        '
-        'F_Graph
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(1258, 400)
-        Me.Controls.Add(Me.BtZoomOut)
-        Me.Controls.Add(Me.BtMoveR)
-        Me.Controls.Add(Me.BtMoveL)
-        Me.Controls.Add(Me.BtZoomIn)
-        Me.Controls.Add(Me.Label3)
-        Me.Controls.Add(Me.Label2)
-        Me.Controls.Add(Me.BtReset)
-        Me.Controls.Add(Me.TbXmax)
-        Me.Controls.Add(Me.TbXmin)
-        Me.Controls.Add(Me.Label1)
-        Me.Controls.Add(Me.CbXaxis)
-        Me.Controls.Add(Me.ToolStrip1)
-        Me.Controls.Add(Me.GroupBox1)
-        Me.Controls.Add(Me.PictureBox1)
-        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
-        Me.MinimumSize = New System.Drawing.Size(1000, 300)
-        Me.Name = "F_Graph"
-        Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show
-        Me.Text = "Graph"
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.GroupBox1.ResumeLayout(False)
-        Me.ToolStrip1.ResumeLayout(False)
-        Me.ToolStrip1.PerformLayout()
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
+		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_Graph))
+		Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+		Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+		Me.BtRemCh = New System.Windows.Forms.Button()
+		Me.BtAddCh = New System.Windows.Forms.Button()
+		Me.ListView1 = New System.Windows.Forms.ListView()
+		Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.ColumnHeader3 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.CbXaxis = New System.Windows.Forms.ComboBox()
+		Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+		Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+		Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+		Me.Label1 = New System.Windows.Forms.Label()
+		Me.TbXmin = New System.Windows.Forms.TextBox()
+		Me.TbXmax = New System.Windows.Forms.TextBox()
+		Me.BtReset = New System.Windows.Forms.Button()
+		Me.Label2 = New System.Windows.Forms.Label()
+		Me.Label3 = New System.Windows.Forms.Label()
+		Me.BtZoomIn = New System.Windows.Forms.Button()
+		Me.BtZoomOut = New System.Windows.Forms.Button()
+		Me.BtMoveL = New System.Windows.Forms.Button()
+		Me.BtMoveR = New System.Windows.Forms.Button()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.GroupBox1.SuspendLayout()
+		Me.ToolStrip1.SuspendLayout()
+		Me.SuspendLayout()
+		'
+		'PictureBox1
+		'
+		Me.PictureBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+			Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.PictureBox1.BackColor = System.Drawing.Color.LightGray
+		Me.PictureBox1.Location = New System.Drawing.Point(262, 28)
+		Me.PictureBox1.Name = "PictureBox1"
+		Me.PictureBox1.Size = New System.Drawing.Size(984, 332)
+		Me.PictureBox1.TabIndex = 0
+		Me.PictureBox1.TabStop = False
+		'
+		'GroupBox1
+		'
+		Me.GroupBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+			Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.GroupBox1.Controls.Add(Me.BtRemCh)
+		Me.GroupBox1.Controls.Add(Me.BtAddCh)
+		Me.GroupBox1.Controls.Add(Me.ListView1)
+		Me.GroupBox1.Location = New System.Drawing.Point(12, 28)
+		Me.GroupBox1.Name = "GroupBox1"
+		Me.GroupBox1.Size = New System.Drawing.Size(244, 362)
+		Me.GroupBox1.TabIndex = 0
+		Me.GroupBox1.TabStop = False
+		Me.GroupBox1.Text = "Channels"
+		'
+		'BtRemCh
+		'
+		Me.BtRemCh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtRemCh.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
+		Me.BtRemCh.Location = New System.Drawing.Point(29, 327)
+		Me.BtRemCh.Name = "BtRemCh"
+		Me.BtRemCh.Size = New System.Drawing.Size(24, 24)
+		Me.BtRemCh.TabIndex = 2
+		Me.BtRemCh.UseVisualStyleBackColor = True
+		'
+		'BtAddCh
+		'
+		Me.BtAddCh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtAddCh.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
+		Me.BtAddCh.Location = New System.Drawing.Point(5, 327)
+		Me.BtAddCh.Name = "BtAddCh"
+		Me.BtAddCh.Size = New System.Drawing.Size(24, 24)
+		Me.BtAddCh.TabIndex = 1
+		Me.BtAddCh.UseVisualStyleBackColor = True
+		'
+		'ListView1
+		'
+		Me.ListView1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+			Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ListView1.BackColor = System.Drawing.Color.GhostWhite
+		Me.ListView1.CheckBoxes = True
+		Me.ListView1.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader3})
+		Me.ListView1.FullRowSelect = True
+		Me.ListView1.GridLines = True
+		Me.ListView1.Location = New System.Drawing.Point(6, 19)
+		Me.ListView1.Name = "ListView1"
+		Me.ListView1.Size = New System.Drawing.Size(232, 308)
+		Me.ListView1.TabIndex = 0
+		Me.ListView1.UseCompatibleStateImageBehavior = False
+		Me.ListView1.View = System.Windows.Forms.View.Details
+		'
+		'ColumnHeader1
+		'
+		Me.ColumnHeader1.Text = "Channel"
+		Me.ColumnHeader1.Width = 184
+		'
+		'ColumnHeader3
+		'
+		Me.ColumnHeader3.Text = "Y Axis"
+		Me.ColumnHeader3.Width = 42
+		'
+		'CbXaxis
+		'
+		Me.CbXaxis.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.CbXaxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+		Me.CbXaxis.FormattingEnabled = True
+		Me.CbXaxis.Items.AddRange(New Object() {"Distance", "Time"})
+		Me.CbXaxis.Location = New System.Drawing.Point(325, 369)
+		Me.CbXaxis.Name = "CbXaxis"
+		Me.CbXaxis.Size = New System.Drawing.Size(90, 21)
+		Me.CbXaxis.TabIndex = 1
+		'
+		'ToolStrip1
+		'
+		Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+		Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtOpen, Me.ToolStripButton3, Me.ToolStripButton2, Me.ToolStripSeparator1, Me.ToolStripButton1})
+		Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+		Me.ToolStrip1.Name = "ToolStrip1"
+		Me.ToolStrip1.Size = New System.Drawing.Size(1258, 25)
+		Me.ToolStrip1.TabIndex = 31
+		Me.ToolStrip1.Text = "ToolStrip1"
+		'
+		'ToolStripBtOpen
+		'
+		Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon
+		Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
+		Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripBtOpen.Text = "ToolStripButton1"
+		Me.ToolStripBtOpen.ToolTipText = "Open .vmod file"
+		'
+		'ToolStripButton3
+		'
+		Me.ToolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripButton3.Image = Global.VECTO.My.Resources.Resources.application_add_icon
+		Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripButton3.Name = "ToolStripButton3"
+		Me.ToolStripButton3.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripButton3.Text = "ToolStripButton3"
+		Me.ToolStripButton3.ToolTipText = "New window"
+		'
+		'ToolStripButton2
+		'
+		Me.ToolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripButton2.Image = Global.VECTO.My.Resources.Resources.Refresh_icon
+		Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripButton2.Name = "ToolStripButton2"
+		Me.ToolStripButton2.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripButton2.Text = "ToolStripButton2"
+		Me.ToolStripButton2.ToolTipText = "Reload file"
+		'
+		'ToolStripSeparator1
+		'
+		Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+		Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
+		'
+		'ToolStripButton1
+		'
+		Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripButton1.Image = Global.VECTO.My.Resources.Resources.Help_icon
+		Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripButton1.Name = "ToolStripButton1"
+		Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
+		Me.ToolStripButton1.Text = "Help"
+		'
+		'Label1
+		'
+		Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.Label1.AutoSize = True
+		Me.Label1.Location = New System.Drawing.Point(283, 372)
+		Me.Label1.Name = "Label1"
+		Me.Label1.Size = New System.Drawing.Size(36, 13)
+		Me.Label1.TabIndex = 32
+		Me.Label1.Text = "X Axis"
+		'
+		'TbXmin
+		'
+		Me.TbXmin.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.TbXmin.Location = New System.Drawing.Point(497, 369)
+		Me.TbXmin.Name = "TbXmin"
+		Me.TbXmin.Size = New System.Drawing.Size(71, 20)
+		Me.TbXmin.TabIndex = 2
+		'
+		'TbXmax
+		'
+		Me.TbXmax.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.TbXmax.Location = New System.Drawing.Point(609, 369)
+		Me.TbXmax.Name = "TbXmax"
+		Me.TbXmax.Size = New System.Drawing.Size(71, 20)
+		Me.TbXmax.TabIndex = 3
+		'
+		'BtReset
+		'
+		Me.BtReset.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtReset.Location = New System.Drawing.Point(691, 367)
+		Me.BtReset.Name = "BtReset"
+		Me.BtReset.Size = New System.Drawing.Size(75, 23)
+		Me.BtReset.TabIndex = 4
+		Me.BtReset.Text = "Reset"
+		Me.BtReset.UseVisualStyleBackColor = True
+		'
+		'Label2
+		'
+		Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.Label2.AutoSize = True
+		Me.Label2.Location = New System.Drawing.Point(467, 372)
+		Me.Label2.Name = "Label2"
+		Me.Label2.Size = New System.Drawing.Size(24, 13)
+		Me.Label2.TabIndex = 35
+		Me.Label2.Text = "Min"
+		'
+		'Label3
+		'
+		Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.Label3.AutoSize = True
+		Me.Label3.Location = New System.Drawing.Point(576, 372)
+		Me.Label3.Name = "Label3"
+		Me.Label3.Size = New System.Drawing.Size(27, 13)
+		Me.Label3.TabIndex = 35
+		Me.Label3.Text = "Max"
+		'
+		'BtZoomIn
+		'
+		Me.BtZoomIn.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtZoomIn.Location = New System.Drawing.Point(1103, 366)
+		Me.BtZoomIn.Name = "BtZoomIn"
+		Me.BtZoomIn.Size = New System.Drawing.Size(24, 24)
+		Me.BtZoomIn.TabIndex = 36
+		Me.BtZoomIn.Text = "+"
+		Me.BtZoomIn.UseVisualStyleBackColor = True
+		'
+		'BtZoomOut
+		'
+		Me.BtZoomOut.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtZoomOut.Location = New System.Drawing.Point(1126, 366)
+		Me.BtZoomOut.Name = "BtZoomOut"
+		Me.BtZoomOut.Size = New System.Drawing.Size(24, 24)
+		Me.BtZoomOut.TabIndex = 36
+		Me.BtZoomOut.Text = "-"
+		Me.BtZoomOut.UseVisualStyleBackColor = True
+		'
+		'BtMoveL
+		'
+		Me.BtMoveL.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtMoveL.Location = New System.Drawing.Point(1199, 366)
+		Me.BtMoveL.Name = "BtMoveL"
+		Me.BtMoveL.Size = New System.Drawing.Size(24, 24)
+		Me.BtMoveL.TabIndex = 36
+		Me.BtMoveL.Text = "<"
+		Me.BtMoveL.UseVisualStyleBackColor = True
+		'
+		'BtMoveR
+		'
+		Me.BtMoveR.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtMoveR.Location = New System.Drawing.Point(1222, 366)
+		Me.BtMoveR.Name = "BtMoveR"
+		Me.BtMoveR.Size = New System.Drawing.Size(24, 24)
+		Me.BtMoveR.TabIndex = 36
+		Me.BtMoveR.Text = ">"
+		Me.BtMoveR.UseVisualStyleBackColor = True
+		'
+		'F_Graph
+		'
+		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+		Me.ClientSize = New System.Drawing.Size(1258, 400)
+		Me.Controls.Add(Me.BtZoomOut)
+		Me.Controls.Add(Me.BtMoveR)
+		Me.Controls.Add(Me.BtMoveL)
+		Me.Controls.Add(Me.BtZoomIn)
+		Me.Controls.Add(Me.Label3)
+		Me.Controls.Add(Me.Label2)
+		Me.Controls.Add(Me.BtReset)
+		Me.Controls.Add(Me.TbXmax)
+		Me.Controls.Add(Me.TbXmin)
+		Me.Controls.Add(Me.Label1)
+		Me.Controls.Add(Me.CbXaxis)
+		Me.Controls.Add(Me.ToolStrip1)
+		Me.Controls.Add(Me.GroupBox1)
+		Me.Controls.Add(Me.PictureBox1)
+		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+		Me.MinimumSize = New System.Drawing.Size(1000, 300)
+		Me.Name = "F_Graph"
+		Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show
+		Me.Text = "Graph"
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.GroupBox1.ResumeLayout(False)
+		Me.ToolStrip1.ResumeLayout(False)
+		Me.ToolStrip1.PerformLayout()
+		Me.ResumeLayout(False)
+		Me.PerformLayout()
 
-    End Sub
+	End Sub
     Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
     Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
     Friend WithEvents ListView1 As System.Windows.Forms.ListView
diff --git a/VECTO/GUI/F_MAINForm.Designer.vb b/VECTO/GUI/F_MAINForm.Designer.vb
index 45a7f915fd12007e1a5fef95b2c22d0163356b66..b3b053cf6b69c6edb249190ecb1ca70b8b024d80 100644
--- a/VECTO/GUI/F_MAINForm.Designer.vb
+++ b/VECTO/GUI/F_MAINForm.Designer.vb
@@ -229,7 +229,7 @@ Partial Class F_MAINForm
 		'
 		Me.btStartV3.Image = Global.VECTO.My.Resources.Resources.Play_icon
 		Me.btStartV3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-		Me.btStartV3.Location = New System.Drawing.Point(6, 100)
+		Me.btStartV3.Location = New System.Drawing.Point(6, 83)
 		Me.btStartV3.Name = "btStartV3"
 		Me.btStartV3.Size = New System.Drawing.Size(105, 41)
 		Me.btStartV3.TabIndex = 20
@@ -241,7 +241,7 @@ Partial Class F_MAINForm
 		'
 		Me.LbDecl.AutoSize = True
 		Me.LbDecl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-		Me.LbDecl.Location = New System.Drawing.Point(3, 141)
+		Me.LbDecl.Location = New System.Drawing.Point(3, 127)
 		Me.LbDecl.Name = "LbDecl"
 		Me.LbDecl.Size = New System.Drawing.Size(107, 13)
 		Me.LbDecl.TabIndex = 19
@@ -261,9 +261,9 @@ Partial Class F_MAINForm
 		'
 		Me.BtGENdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.BtGENdown.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_down_icon
-		Me.BtGENdown.Location = New System.Drawing.Point(1002, 321)
+		Me.BtGENdown.Location = New System.Drawing.Point(1008, 316)
 		Me.BtGENdown.Name = "BtGENdown"
-		Me.BtGENdown.Size = New System.Drawing.Size(30, 23)
+		Me.BtGENdown.Size = New System.Drawing.Size(30, 24)
 		Me.BtGENdown.TabIndex = 6
 		Me.BtGENdown.UseVisualStyleBackColor = True
 		'
@@ -271,9 +271,9 @@ Partial Class F_MAINForm
 		'
 		Me.BtGENup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.BtGENup.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_up_icon
-		Me.BtGENup.Location = New System.Drawing.Point(966, 321)
+		Me.BtGENup.Location = New System.Drawing.Point(977, 316)
 		Me.BtGENup.Name = "BtGENup"
-		Me.BtGENup.Size = New System.Drawing.Size(30, 23)
+		Me.BtGENup.Size = New System.Drawing.Size(30, 24)
 		Me.BtGENup.TabIndex = 4
 		Me.BtGENup.UseVisualStyleBackColor = True
 		'
@@ -283,7 +283,7 @@ Partial Class F_MAINForm
 		Me.LbAutoShDown.AutoSize = True
 		Me.LbAutoShDown.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
 		Me.LbAutoShDown.ForeColor = System.Drawing.Color.Red
-		Me.LbAutoShDown.Location = New System.Drawing.Point(250, 326)
+		Me.LbAutoShDown.Location = New System.Drawing.Point(449, 323)
 		Me.LbAutoShDown.Name = "LbAutoShDown"
 		Me.LbAutoShDown.Size = New System.Drawing.Size(225, 13)
 		Me.LbAutoShDown.TabIndex = 17
@@ -294,11 +294,11 @@ Partial Class F_MAINForm
 		'
 		Me.ChBoxAllGEN.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.ChBoxAllGEN.AutoSize = True
-		Me.ChBoxAllGEN.Location = New System.Drawing.Point(126, 325)
+		Me.ChBoxAllGEN.Location = New System.Drawing.Point(188, 320)
 		Me.ChBoxAllGEN.Name = "ChBoxAllGEN"
-		Me.ChBoxAllGEN.Size = New System.Drawing.Size(37, 17)
+		Me.ChBoxAllGEN.Size = New System.Drawing.Size(70, 17)
 		Me.ChBoxAllGEN.TabIndex = 16
-		Me.ChBoxAllGEN.Text = "All"
+		Me.ChBoxAllGEN.Text = "Select All"
 		Me.ChBoxAllGEN.UseVisualStyleBackColor = True
 		'
 		'LvGEN
@@ -334,9 +334,9 @@ Partial Class F_MAINForm
 		'ButtonGENopt
 		'
 		Me.ButtonGENopt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.ButtonGENopt.Location = New System.Drawing.Point(1038, 321)
+		Me.ButtonGENopt.Location = New System.Drawing.Point(1039, 316)
 		Me.ButtonGENopt.Name = "ButtonGENopt"
-		Me.ButtonGENopt.Size = New System.Drawing.Size(80, 23)
+		Me.ButtonGENopt.Size = New System.Drawing.Size(80, 24)
 		Me.ButtonGENopt.TabIndex = 8
 		Me.ButtonGENopt.Text = "List Options"
 		Me.ButtonGENopt.UseVisualStyleBackColor = True
@@ -346,9 +346,9 @@ Partial Class F_MAINForm
 		Me.ButtonGENremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.ButtonGENremove.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
 		Me.ButtonGENremove.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
-		Me.ButtonGENremove.Location = New System.Drawing.Point(930, 321)
+		Me.ButtonGENremove.Location = New System.Drawing.Point(144, 316)
 		Me.ButtonGENremove.Name = "ButtonGENremove"
-		Me.ButtonGENremove.Size = New System.Drawing.Size(30, 23)
+		Me.ButtonGENremove.Size = New System.Drawing.Size(30, 24)
 		Me.ButtonGENremove.TabIndex = 2
 		Me.ButtonGENremove.UseVisualStyleBackColor = True
 		'
@@ -358,7 +358,7 @@ Partial Class F_MAINForm
 		Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
 		Me.Button1.Location = New System.Drawing.Point(6, 53)
 		Me.Button1.Name = "Button1"
-		Me.Button1.Size = New System.Drawing.Size(105, 41)
+		Me.Button1.Size = New System.Drawing.Size(105, 28)
 		Me.Button1.TabIndex = 12
 		Me.Button1.Text = "START V2.2"
 		Me.Button1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText
@@ -369,9 +369,9 @@ Partial Class F_MAINForm
 		Me.ButtonGENadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.ButtonGENadd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
 		Me.ButtonGENadd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
-		Me.ButtonGENadd.Location = New System.Drawing.Point(894, 321)
+		Me.ButtonGENadd.Location = New System.Drawing.Point(113, 316)
 		Me.ButtonGENadd.Name = "ButtonGENadd"
-		Me.ButtonGENadd.Size = New System.Drawing.Size(30, 23)
+		Me.ButtonGENadd.Size = New System.Drawing.Size(30, 24)
 		Me.ButtonGENadd.TabIndex = 1
 		Me.ButtonGENadd.UseVisualStyleBackColor = True
 		'
@@ -396,9 +396,9 @@ Partial Class F_MAINForm
 		'
 		Me.BtDRIdown.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.BtDRIdown.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_down_icon
-		Me.BtDRIdown.Location = New System.Drawing.Point(999, 318)
+		Me.BtDRIdown.Location = New System.Drawing.Point(1003, 313)
 		Me.BtDRIdown.Name = "BtDRIdown"
-		Me.BtDRIdown.Size = New System.Drawing.Size(30, 23)
+		Me.BtDRIdown.Size = New System.Drawing.Size(30, 24)
 		Me.BtDRIdown.TabIndex = 3
 		Me.BtDRIdown.UseVisualStyleBackColor = True
 		'
@@ -406,9 +406,9 @@ Partial Class F_MAINForm
 		'
 		Me.BtDRIup.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.BtDRIup.Image = Global.VECTO.My.Resources.Resources.Actions_arrow_up_icon
-		Me.BtDRIup.Location = New System.Drawing.Point(963, 318)
+		Me.BtDRIup.Location = New System.Drawing.Point(973, 313)
 		Me.BtDRIup.Name = "BtDRIup"
-		Me.BtDRIup.Size = New System.Drawing.Size(30, 23)
+		Me.BtDRIup.Size = New System.Drawing.Size(30, 24)
 		Me.BtDRIup.TabIndex = 2
 		Me.BtDRIup.UseVisualStyleBackColor = True
 		'
@@ -416,11 +416,11 @@ Partial Class F_MAINForm
 		'
 		Me.ChBoxAllDRI.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.ChBoxAllDRI.AutoSize = True
-		Me.ChBoxAllDRI.Location = New System.Drawing.Point(15, 322)
+		Me.ChBoxAllDRI.Location = New System.Drawing.Point(74, 317)
 		Me.ChBoxAllDRI.Name = "ChBoxAllDRI"
-		Me.ChBoxAllDRI.Size = New System.Drawing.Size(37, 17)
+		Me.ChBoxAllDRI.Size = New System.Drawing.Size(70, 17)
 		Me.ChBoxAllDRI.TabIndex = 7
-		Me.ChBoxAllDRI.Text = "All"
+		Me.ChBoxAllDRI.Text = "Select All"
 		Me.ChBoxAllDRI.UseVisualStyleBackColor = True
 		'
 		'LvDRI
@@ -456,7 +456,7 @@ Partial Class F_MAINForm
 		'ButtonDRIedit
 		'
 		Me.ButtonDRIedit.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.ButtonDRIedit.Location = New System.Drawing.Point(1035, 318)
+		Me.ButtonDRIedit.Location = New System.Drawing.Point(1035, 313)
 		Me.ButtonDRIedit.Name = "ButtonDRIedit"
 		Me.ButtonDRIedit.Size = New System.Drawing.Size(80, 23)
 		Me.ButtonDRIedit.TabIndex = 4
@@ -468,9 +468,9 @@ Partial Class F_MAINForm
 		Me.ButtonDRIremove.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.ButtonDRIremove.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
 		Me.ButtonDRIremove.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
-		Me.ButtonDRIremove.Location = New System.Drawing.Point(927, 318)
+		Me.ButtonDRIremove.Location = New System.Drawing.Point(37, 313)
 		Me.ButtonDRIremove.Name = "ButtonDRIremove"
-		Me.ButtonDRIremove.Size = New System.Drawing.Size(30, 23)
+		Me.ButtonDRIremove.Size = New System.Drawing.Size(30, 24)
 		Me.ButtonDRIremove.TabIndex = 1
 		Me.ButtonDRIremove.UseVisualStyleBackColor = True
 		'
@@ -479,9 +479,9 @@ Partial Class F_MAINForm
 		Me.ButtonDRIadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.ButtonDRIadd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
 		Me.ButtonDRIadd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
-		Me.ButtonDRIadd.Location = New System.Drawing.Point(891, 318)
+		Me.ButtonDRIadd.Location = New System.Drawing.Point(6, 313)
 		Me.ButtonDRIadd.Name = "ButtonDRIadd"
-		Me.ButtonDRIadd.Size = New System.Drawing.Size(30, 23)
+		Me.ButtonDRIadd.Size = New System.Drawing.Size(30, 24)
 		Me.ButtonDRIadd.TabIndex = 0
 		Me.ButtonDRIadd.UseVisualStyleBackColor = True
 		'
@@ -538,11 +538,11 @@ Partial Class F_MAINForm
 		'ButBObrowse
 		'
 		Me.ButBObrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.ButBObrowse.Location = New System.Drawing.Point(1054, 18)
+		Me.ButBObrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon
+		Me.ButBObrowse.Location = New System.Drawing.Point(1048, 16)
 		Me.ButBObrowse.Name = "ButBObrowse"
-		Me.ButBObrowse.Size = New System.Drawing.Size(28, 20)
+		Me.ButBObrowse.Size = New System.Drawing.Size(24, 24)
 		Me.ButBObrowse.TabIndex = 3
-		Me.ButBObrowse.Text = "..."
 		Me.ButBObrowse.UseVisualStyleBackColor = True
 		'
 		'CbBOmode
@@ -710,11 +710,11 @@ Partial Class F_MAINForm
 		'
 		Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.Label1.AutoSize = True
-		Me.Label1.Location = New System.Drawing.Point(6, 331)
+		Me.Label1.Location = New System.Drawing.Point(1012, 328)
 		Me.Label1.Name = "Label1"
-		Me.Label1.Size = New System.Drawing.Size(125, 13)
+		Me.Label1.Size = New System.Drawing.Size(106, 13)
 		Me.Label1.TabIndex = 1
-		Me.Label1.Text = "Double-Click entry to edit"
+		Me.Label1.Text = "(Double-Click to Edit)"
 		'
 		'LvDEVoptions
 		'
diff --git a/VECTO/GUI/F_Settings.Designer.vb b/VECTO/GUI/F_Settings.Designer.vb
index 716218d0b4597e8c157e6eaff22aa4ee29617fa3..94a69ec499451c439fdbc76352da590f6ee53423 100644
--- a/VECTO/GUI/F_Settings.Designer.vb
+++ b/VECTO/GUI/F_Settings.Designer.vb
@@ -56,9 +56,9 @@ Partial Class F_Settings
 		'ButtonOK
 		'
 		Me.ButtonOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.ButtonOK.Location = New System.Drawing.Point(347, 287)
+		Me.ButtonOK.Location = New System.Drawing.Point(347, 278)
 		Me.ButtonOK.Name = "ButtonOK"
-		Me.ButtonOK.Size = New System.Drawing.Size(75, 26)
+		Me.ButtonOK.Size = New System.Drawing.Size(75, 24)
 		Me.ButtonOK.TabIndex = 2
 		Me.ButtonOK.Text = "OK"
 		Me.ButtonOK.UseVisualStyleBackColor = True
@@ -67,9 +67,9 @@ Partial Class F_Settings
 		'
 		Me.ButtonCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.ButtonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-		Me.ButtonCancel.Location = New System.Drawing.Point(428, 287)
+		Me.ButtonCancel.Location = New System.Drawing.Point(428, 278)
 		Me.ButtonCancel.Name = "ButtonCancel"
-		Me.ButtonCancel.Size = New System.Drawing.Size(75, 26)
+		Me.ButtonCancel.Size = New System.Drawing.Size(75, 24)
 		Me.ButtonCancel.TabIndex = 3
 		Me.ButtonCancel.Text = "Cancel"
 		Me.ButtonCancel.UseVisualStyleBackColor = True
@@ -156,7 +156,7 @@ Partial Class F_Settings
 		Me.TabControl1.Location = New System.Drawing.Point(3, 3)
 		Me.TabControl1.Name = "TabControl1"
 		Me.TabControl1.SelectedIndex = 0
-		Me.TabControl1.Size = New System.Drawing.Size(508, 278)
+		Me.TabControl1.Size = New System.Drawing.Size(508, 269)
 		Me.TabControl1.TabIndex = 12
 		'
 		'TabPage2
@@ -166,7 +166,7 @@ Partial Class F_Settings
 		Me.TabPage2.Location = New System.Drawing.Point(4, 22)
 		Me.TabPage2.Name = "TabPage2"
 		Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-		Me.TabPage2.Size = New System.Drawing.Size(500, 252)
+		Me.TabPage2.Size = New System.Drawing.Size(500, 243)
 		Me.TabPage2.TabIndex = 0
 		Me.TabPage2.Text = "VECTO"
 		Me.TabPage2.UseVisualStyleBackColor = True
@@ -267,9 +267,9 @@ Partial Class F_Settings
 		'ButReset
 		'
 		Me.ButReset.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.ButReset.Location = New System.Drawing.Point(35, 287)
+		Me.ButReset.Location = New System.Drawing.Point(31, 278)
 		Me.ButReset.Name = "ButReset"
-		Me.ButReset.Size = New System.Drawing.Size(108, 26)
+		Me.ButReset.Size = New System.Drawing.Size(108, 24)
 		Me.ButReset.TabIndex = 1
 		Me.ButReset.Text = "Reset All Settings"
 		Me.ButReset.UseVisualStyleBackColor = True
@@ -278,9 +278,9 @@ Partial Class F_Settings
 		'
 		Me.BtHelp.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.BtHelp.Image = Global.VECTO.My.Resources.Resources.Help_icon
-		Me.BtHelp.Location = New System.Drawing.Point(3, 287)
+		Me.BtHelp.Location = New System.Drawing.Point(4, 278)
 		Me.BtHelp.Name = "BtHelp"
-		Me.BtHelp.Size = New System.Drawing.Size(26, 26)
+		Me.BtHelp.Size = New System.Drawing.Size(24, 24)
 		Me.BtHelp.TabIndex = 0
 		Me.BtHelp.UseVisualStyleBackColor = True
 		'
@@ -290,7 +290,7 @@ Partial Class F_Settings
 		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
 		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
 		Me.CancelButton = Me.ButtonCancel
-		Me.ClientSize = New System.Drawing.Size(515, 325)
+		Me.ClientSize = New System.Drawing.Size(515, 310)
 		Me.Controls.Add(Me.BtHelp)
 		Me.Controls.Add(Me.ButReset)
 		Me.Controls.Add(Me.TabControl1)
diff --git a/VECTO/GUI/F_VECTO.Designer.vb b/VECTO/GUI/F_VECTO.Designer.vb
index 29479abb09c5729b713820e2d56015ccf7dbd335..c24ffe7428bdcfbd9fc369dea630d5dbbacffa2f 100644
--- a/VECTO/GUI/F_VECTO.Designer.vb
+++ b/VECTO/GUI/F_VECTO.Designer.vb
@@ -200,11 +200,11 @@ Partial Class F_VECTO
 		'
 		Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.Label2.AutoSize = True
-		Me.Label2.Location = New System.Drawing.Point(386, 159)
+		Me.Label2.Location = New System.Drawing.Point(379, 148)
 		Me.Label2.Name = "Label2"
-		Me.Label2.Size = New System.Drawing.Size(122, 13)
+		Me.Label2.Size = New System.Drawing.Size(133, 13)
 		Me.Label2.TabIndex = 3
-		Me.Label2.Text = "Double-Click to open file"
+		Me.Label2.Text = "(Double-Click to Open File)"
 		'
 		'LvCycles
 		'
@@ -234,9 +234,9 @@ Partial Class F_VECTO
 		'
 		Me.BtDRIrem.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.BtDRIrem.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
-		Me.BtDRIrem.Location = New System.Drawing.Point(41, 154)
+		Me.BtDRIrem.Location = New System.Drawing.Point(29, 149)
 		Me.BtDRIrem.Name = "BtDRIrem"
-		Me.BtDRIrem.Size = New System.Drawing.Size(29, 23)
+		Me.BtDRIrem.Size = New System.Drawing.Size(24, 24)
 		Me.BtDRIrem.TabIndex = 2
 		Me.BtDRIrem.UseVisualStyleBackColor = True
 		'
@@ -244,9 +244,9 @@ Partial Class F_VECTO
 		'
 		Me.BtDRIadd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.BtDRIadd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
-		Me.BtDRIadd.Location = New System.Drawing.Point(6, 154)
+		Me.BtDRIadd.Location = New System.Drawing.Point(5, 149)
 		Me.BtDRIadd.Name = "BtDRIadd"
-		Me.BtDRIadd.Size = New System.Drawing.Size(29, 23)
+		Me.BtDRIadd.Size = New System.Drawing.Size(24, 24)
 		Me.BtDRIadd.TabIndex = 1
 		Me.BtDRIadd.UseVisualStyleBackColor = True
 		'
@@ -268,7 +268,7 @@ Partial Class F_VECTO
 		Me.GrAux.Controls.Add(Me.ButAuxAdd)
 		Me.GrAux.Location = New System.Drawing.Point(6, 87)
 		Me.GrAux.Name = "GrAux"
-		Me.GrAux.Size = New System.Drawing.Size(515, 223)
+		Me.GrAux.Size = New System.Drawing.Size(515, 221)
 		Me.GrAux.TabIndex = 9
 		Me.GrAux.TabStop = False
 		Me.GrAux.Text = "Auxiliaries"
@@ -276,9 +276,9 @@ Partial Class F_VECTO
 		'btnAAUXOpen
 		'
 		Me.btnAAUXOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
-		Me.btnAAUXOpen.Location = New System.Drawing.Point(486, 45)
+		Me.btnAAUXOpen.Location = New System.Drawing.Point(465, 45)
 		Me.btnAAUXOpen.Name = "btnAAUXOpen"
-		Me.btnAAUXOpen.Size = New System.Drawing.Size(26, 23)
+		Me.btnAAUXOpen.Size = New System.Drawing.Size(24, 24)
 		Me.btnAAUXOpen.TabIndex = 41
 		Me.btnAAUXOpen.UseVisualStyleBackColor = True
 		'
@@ -293,11 +293,11 @@ Partial Class F_VECTO
 		'
 		'btnBrowseAAUXFile
 		'
-		Me.btnBrowseAAUXFile.Location = New System.Drawing.Point(447, 45)
+		Me.btnBrowseAAUXFile.Image = Global.VECTO.My.Resources.Resources.Open_icon
+		Me.btnBrowseAAUXFile.Location = New System.Drawing.Point(441, 45)
 		Me.btnBrowseAAUXFile.Name = "btnBrowseAAUXFile"
-		Me.btnBrowseAAUXFile.Size = New System.Drawing.Size(36, 23)
+		Me.btnBrowseAAUXFile.Size = New System.Drawing.Size(24, 24)
 		Me.btnBrowseAAUXFile.TabIndex = 39
-		Me.btnBrowseAAUXFile.Text = ". . ."
 		Me.ToolTip1.SetToolTip(Me.btnBrowseAAUXFile, "Configure/Browser  Advanced Auxiliary Files")
 		Me.btnBrowseAAUXFile.UseVisualStyleBackColor = True
 		'
@@ -340,11 +340,11 @@ Partial Class F_VECTO
 		'
 		Me.Label32.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.Label32.AutoSize = True
-		Me.Label32.Location = New System.Drawing.Point(370, 200)
+		Me.Label32.Location = New System.Drawing.Point(406, 189)
 		Me.Label32.Name = "Label32"
-		Me.Label32.Size = New System.Drawing.Size(139, 13)
+		Me.Label32.Size = New System.Drawing.Size(106, 13)
 		Me.Label32.TabIndex = 3
-		Me.Label32.Text = "Double-Click to edit auxiliary"
+		Me.Label32.Text = "(Double-Click to Edit)"
 		'
 		'LvAux
 		'
@@ -381,18 +381,18 @@ Partial Class F_VECTO
 		'ButAuxRem
 		'
 		Me.ButAuxRem.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
-		Me.ButAuxRem.Location = New System.Drawing.Point(42, 195)
+		Me.ButAuxRem.Location = New System.Drawing.Point(29, 190)
 		Me.ButAuxRem.Name = "ButAuxRem"
-		Me.ButAuxRem.Size = New System.Drawing.Size(29, 23)
+		Me.ButAuxRem.Size = New System.Drawing.Size(24, 24)
 		Me.ButAuxRem.TabIndex = 2
 		Me.ButAuxRem.UseVisualStyleBackColor = True
 		'
 		'ButAuxAdd
 		'
 		Me.ButAuxAdd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
-		Me.ButAuxAdd.Location = New System.Drawing.Point(7, 195)
+		Me.ButAuxAdd.Location = New System.Drawing.Point(5, 190)
 		Me.ButAuxAdd.Name = "ButAuxAdd"
-		Me.ButAuxAdd.Size = New System.Drawing.Size(29, 23)
+		Me.ButAuxAdd.Size = New System.Drawing.Size(24, 24)
 		Me.ButAuxAdd.TabIndex = 1
 		Me.ButAuxAdd.UseVisualStyleBackColor = True
 		'
@@ -402,7 +402,7 @@ Partial Class F_VECTO
 			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.TbGBX.Location = New System.Drawing.Point(84, 60)
 		Me.TbGBX.Name = "TbGBX"
-		Me.TbGBX.Size = New System.Drawing.Size(406, 20)
+		Me.TbGBX.Size = New System.Drawing.Size(411, 20)
 		Me.TbGBX.TabIndex = 7
 		'
 		'TbENG
@@ -411,7 +411,7 @@ Partial Class F_VECTO
 			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.TbENG.Location = New System.Drawing.Point(84, 33)
 		Me.TbENG.Name = "TbENG"
-		Me.TbENG.Size = New System.Drawing.Size(406, 20)
+		Me.TbENG.Size = New System.Drawing.Size(411, 20)
 		Me.TbENG.TabIndex = 4
 		'
 		'TbVEH
@@ -420,7 +420,7 @@ Partial Class F_VECTO
 			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.TbVEH.Location = New System.Drawing.Point(84, 7)
 		Me.TbVEH.Name = "TbVEH"
-		Me.TbVEH.Size = New System.Drawing.Size(406, 20)
+		Me.TbVEH.Size = New System.Drawing.Size(411, 20)
 		Me.TbVEH.TabIndex = 1
 		'
 		'ButOpenGBX
@@ -456,34 +456,34 @@ Partial Class F_VECTO
 		'ButtonVEH
 		'
 		Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.ButtonVEH.Location = New System.Drawing.Point(496, 6)
+		Me.ButtonVEH.Image = CType(resources.GetObject("ButtonVEH.Image"), System.Drawing.Image)
+		Me.ButtonVEH.Location = New System.Drawing.Point(496, 5)
 		Me.ButtonVEH.Name = "ButtonVEH"
-		Me.ButtonVEH.Size = New System.Drawing.Size(28, 21)
+		Me.ButtonVEH.Size = New System.Drawing.Size(24, 24)
 		Me.ButtonVEH.TabIndex = 2
 		Me.ButtonVEH.TabStop = False
-		Me.ButtonVEH.Text = "..."
 		Me.ButtonVEH.UseVisualStyleBackColor = True
 		'
 		'ButtonGBX
 		'
 		Me.ButtonGBX.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.ButtonGBX.Location = New System.Drawing.Point(496, 60)
+		Me.ButtonGBX.Image = CType(resources.GetObject("ButtonGBX.Image"), System.Drawing.Image)
+		Me.ButtonGBX.Location = New System.Drawing.Point(496, 58)
 		Me.ButtonGBX.Name = "ButtonGBX"
-		Me.ButtonGBX.Size = New System.Drawing.Size(28, 21)
+		Me.ButtonGBX.Size = New System.Drawing.Size(24, 24)
 		Me.ButtonGBX.TabIndex = 8
 		Me.ButtonGBX.TabStop = False
-		Me.ButtonGBX.Text = "..."
 		Me.ButtonGBX.UseVisualStyleBackColor = True
 		'
 		'ButtonMAP
 		'
 		Me.ButtonMAP.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.ButtonMAP.Location = New System.Drawing.Point(496, 33)
+		Me.ButtonMAP.Image = CType(resources.GetObject("ButtonMAP.Image"), System.Drawing.Image)
+		Me.ButtonMAP.Location = New System.Drawing.Point(496, 31)
 		Me.ButtonMAP.Name = "ButtonMAP"
-		Me.ButtonMAP.Size = New System.Drawing.Size(28, 21)
+		Me.ButtonMAP.Size = New System.Drawing.Size(24, 24)
 		Me.ButtonMAP.TabIndex = 5
 		Me.ButtonMAP.TabStop = False
-		Me.ButtonMAP.Text = "..."
 		Me.ButtonMAP.UseVisualStyleBackColor = True
 		'
 		'TabControl1
@@ -537,20 +537,20 @@ Partial Class F_VECTO
 		'BtDesMaxBr
 		'
 		Me.BtDesMaxBr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.BtDesMaxBr.Location = New System.Drawing.Point(452, 28)
+		Me.BtDesMaxBr.Image = Global.VECTO.My.Resources.Resources.Open_icon
+		Me.BtDesMaxBr.Location = New System.Drawing.Point(446, 27)
 		Me.BtDesMaxBr.Name = "BtDesMaxBr"
-		Me.BtDesMaxBr.Size = New System.Drawing.Size(28, 21)
+		Me.BtDesMaxBr.Size = New System.Drawing.Size(24, 24)
 		Me.BtDesMaxBr.TabIndex = 1
-		Me.BtDesMaxBr.Text = "..."
 		Me.BtDesMaxBr.UseVisualStyleBackColor = True
 		'
 		'BtAccOpen
 		'
 		Me.BtAccOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.BtAccOpen.Image = Global.VECTO.My.Resources.Resources.application_export_icon_small
-		Me.BtAccOpen.Location = New System.Drawing.Point(486, 27)
+		Me.BtAccOpen.Location = New System.Drawing.Point(469, 27)
 		Me.BtAccOpen.Name = "BtAccOpen"
-		Me.BtAccOpen.Size = New System.Drawing.Size(23, 23)
+		Me.BtAccOpen.Size = New System.Drawing.Size(24, 24)
 		Me.BtAccOpen.TabIndex = 2
 		Me.BtAccOpen.TabStop = False
 		Me.BtAccOpen.UseVisualStyleBackColor = True
@@ -670,23 +670,23 @@ Partial Class F_VECTO
 		'btnDfVelocityDrop
 		'
 		Me.btnDfVelocityDrop.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.btnDfVelocityDrop.Location = New System.Drawing.Point(437, 72)
+		Me.btnDfVelocityDrop.Image = CType(resources.GetObject("btnDfVelocityDrop.Image"), System.Drawing.Image)
+		Me.btnDfVelocityDrop.Location = New System.Drawing.Point(431, 72)
 		Me.btnDfVelocityDrop.Name = "btnDfVelocityDrop"
-		Me.btnDfVelocityDrop.Size = New System.Drawing.Size(28, 21)
+		Me.btnDfVelocityDrop.Size = New System.Drawing.Size(24, 24)
 		Me.btnDfVelocityDrop.TabIndex = 10
 		Me.btnDfVelocityDrop.TabStop = False
-		Me.btnDfVelocityDrop.Text = "..."
 		Me.btnDfVelocityDrop.UseVisualStyleBackColor = True
 		'
 		'btnDfTargetSpeed
 		'
 		Me.btnDfTargetSpeed.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.btnDfTargetSpeed.Location = New System.Drawing.Point(437, 45)
+		Me.btnDfTargetSpeed.Image = CType(resources.GetObject("btnDfTargetSpeed.Image"), System.Drawing.Image)
+		Me.btnDfTargetSpeed.Location = New System.Drawing.Point(431, 45)
 		Me.btnDfTargetSpeed.Name = "btnDfTargetSpeed"
-		Me.btnDfTargetSpeed.Size = New System.Drawing.Size(28, 21)
+		Me.btnDfTargetSpeed.Size = New System.Drawing.Size(24, 24)
 		Me.btnDfTargetSpeed.TabIndex = 7
 		Me.btnDfTargetSpeed.TabStop = False
-		Me.btnDfTargetSpeed.Text = "..."
 		Me.btnDfTargetSpeed.UseVisualStyleBackColor = True
 		'
 		'Label4
diff --git a/VECTO/GUI/F_VECTO.resx b/VECTO/GUI/F_VECTO.resx
index e86e2319862af9904048f1c4664865391ed468f6..0d1b298bfc67c8db49d692480be4c7d31484d5a6 100644
--- a/VECTO/GUI/F_VECTO.resx
+++ b/VECTO/GUI/F_VECTO.resx
@@ -120,6 +120,97 @@
   <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>468, 15</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="ButtonVEH.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+        0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
+        776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
+        AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
+        FJKv98Rjo/ca0J9AqakKxr5ye7iU7sCufBuFSfBjIYduXldvQnKdMg5r3fEmQVe1AO7FtkecH1rDvtAK
+        TtnsDCpYmxNjddbIjBgreki+2BELXWccVEoRAqu8EPTEC2Sp03223KqUCbsMSw0VrEzfhG4qG7rJbCwb
+        Ifnsmyt4/1oAX5kHqtUSnKj2pQIHsZWCCKzTLUAFSxNZWBrPwnfCWCa0ekiuaL6As408yNVSxPYI4FbI
+        gWM2u4ybxwIRsJKZBoH2ayYWRzOg+ULQX+HndMikpxDSxINC9wJRyiAcatiJPQUcuBTawOGxQWCZYG4Q
+        kIJ6OA3qoTTMD6bhW08iAmp98GqlBdHKABxrcacCb7kj3CQcKmAVM8G8vE1BBfODqZhTpWJ2IIUevV3C
+        x1HZfkS1+yOk1XOLgFvGgmWcuYYZzvChAlKc7ruBqY/JVNBYEobiB4HgFbnCv9HdJPCs4MIxl43tMWYj
+        zEv6MhlSIMXJnuuY6DL8gTVFoajMP4+68ovg5bvisHw3FXDTWBDn8ehNmKatIlSjehmDcWUSxt4lUkF5
+        znEUpPhBmncStY+CcSDLGT4VzrBPtkJz2TnD5j/TLQ/ndEjD5F01Qgy3XkWnXIj4yIOx+ld7DV8wGLax
+        DI5ltLncQmRWZoy2Tnsl/zQ5DTnBvRQ/b2P8n2EwfgPZDDiygt3V8AAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="ButtonGBX.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+        0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
+        776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
+        AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
+        FJKv98Rjo/ca0J9AqakKxr5ye7iU7sCufBuFSfBjIYduXldvQnKdMg5r3fEmQVe1AO7FtkecH1rDvtAK
+        TtnsDCpYmxNjddbIjBgreki+2BELXWccVEoRAqu8EPTEC2Sp03223KqUCbsMSw0VrEzfhG4qG7rJbCwb
+        Ifnsmyt4/1oAX5kHqtUSnKj2pQIHsZWCCKzTLUAFSxNZWBrPwnfCWCa0ekiuaL6As408yNVSxPYI4FbI
+        gWM2u4ybxwIRsJKZBoH2ayYWRzOg+ULQX+HndMikpxDSxINC9wJRyiAcatiJPQUcuBTawOGxQWCZYG4Q
+        kIJ6OA3qoTTMD6bhW08iAmp98GqlBdHKABxrcacCb7kj3CQcKmAVM8G8vE1BBfODqZhTpWJ2IIUevV3C
+        x1HZfkS1+yOk1XOLgFvGgmWcuYYZzvChAlKc7ruBqY/JVNBYEobiB4HgFbnCv9HdJPCs4MIxl43tMWYj
+        zEv6MhlSIMXJnuuY6DL8gTVFoajMP4+68ovg5bvisHw3FXDTWBDn8ehNmKatIlSjehmDcWUSxt4lUkF5
+        znEUpPhBmncStY+CcSDLGT4VzrBPtkJz2TnD5j/TLQ/ndEjD5F01Qgy3XkWnXIj4yIOx+ld7DV8wGLax
+        DI5ltLncQmRWZoy2Tnsl/zQ5DTnBvRQ/b2P8n2EwfgPZDDiygt3V8AAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="ButtonMAP.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+        0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
+        776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
+        AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
+        FJKv98Rjo/ca0J9AqakKxr5ye7iU7sCufBuFSfBjIYduXldvQnKdMg5r3fEmQVe1AO7FtkecH1rDvtAK
+        TtnsDCpYmxNjddbIjBgreki+2BELXWccVEoRAqu8EPTEC2Sp03223KqUCbsMSw0VrEzfhG4qG7rJbCwb
+        Ifnsmyt4/1oAX5kHqtUSnKj2pQIHsZWCCKzTLUAFSxNZWBrPwnfCWCa0ekiuaL6As408yNVSxPYI4FbI
+        gWM2u4ybxwIRsJKZBoH2ayYWRzOg+ULQX+HndMikpxDSxINC9wJRyiAcatiJPQUcuBTawOGxQWCZYG4Q
+        kIJ6OA3qoTTMD6bhW08iAmp98GqlBdHKABxrcacCb7kj3CQcKmAVM8G8vE1BBfODqZhTpWJ2IIUevV3C
+        x1HZfkS1+yOk1XOLgFvGgmWcuYYZzvChAlKc7ruBqY/JVNBYEobiB4HgFbnCv9HdJPCs4MIxl43tMWYj
+        zEv6MhlSIMXJnuuY6DL8gTVFoajMP4+68ovg5bvisHw3FXDTWBDn8ehNmKatIlSjehmDcWUSxt4lUkF5
+        znEUpPhBmncStY+CcSDLGT4VzrBPtkJz2TnD5j/TLQ/ndEjD5F01Qgy3XkWnXIj4yIOx+ld7DV8wGLax
+        DI5ltLncQmRWZoy2Tnsl/zQ5DTnBvRQ/b2P8n2EwfgPZDDiygt3V8AAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btnDfVelocityDrop.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+        0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
+        776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
+        AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
+        FJKv98Rjo/ca0J9AqakKxr5ye7iU7sCufBuFSfBjIYduXldvQnKdMg5r3fEmQVe1AO7FtkecH1rDvtAK
+        TtnsDCpYmxNjddbIjBgreki+2BELXWccVEoRAqu8EPTEC2Sp03223KqUCbsMSw0VrEzfhG4qG7rJbCwb
+        Ifnsmyt4/1oAX5kHqtUSnKj2pQIHsZWCCKzTLUAFSxNZWBrPwnfCWCa0ekiuaL6As408yNVSxPYI4FbI
+        gWM2u4ybxwIRsJKZBoH2ayYWRzOg+ULQX+HndMikpxDSxINC9wJRyiAcatiJPQUcuBTawOGxQWCZYG4Q
+        kIJ6OA3qoTTMD6bhW08iAmp98GqlBdHKABxrcacCb7kj3CQcKmAVM8G8vE1BBfODqZhTpWJ2IIUevV3C
+        x1HZfkS1+yOk1XOLgFvGgmWcuYYZzvChAlKc7ruBqY/JVNBYEobiB4HgFbnCv9HdJPCs4MIxl43tMWYj
+        zEv6MhlSIMXJnuuY6DL8gTVFoajMP4+68ovg5bvisHw3FXDTWBDn8ehNmKatIlSjehmDcWUSxt4lUkF5
+        znEUpPhBmncStY+CcSDLGT4VzrBPtkJz2TnD5j/TLQ/ndEjD5F01Qgy3XkWnXIj4yIOx+ld7DV8wGLax
+        DI5ltLncQmRWZoy2Tnsl/zQ5DTnBvRQ/b2P8n2EwfgPZDDiygt3V8AAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btnDfTargetSpeed.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+        0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
+        776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
+        AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
+        FJKv98Rjo/ca0J9AqakKxr5ye7iU7sCufBuFSfBjIYduXldvQnKdMg5r3fEmQVe1AO7FtkecH1rDvtAK
+        TtnsDCpYmxNjddbIjBgreki+2BELXWccVEoRAqu8EPTEC2Sp03223KqUCbsMSw0VrEzfhG4qG7rJbCwb
+        Ifnsmyt4/1oAX5kHqtUSnKj2pQIHsZWCCKzTLUAFSxNZWBrPwnfCWCa0ekiuaL6As408yNVSxPYI4FbI
+        gWM2u4ybxwIRsJKZBoH2ayYWRzOg+ULQX+HndMikpxDSxINC9wJRyiAcatiJPQUcuBTawOGxQWCZYG4Q
+        kIJ6OA3qoTTMD6bhW08iAmp98GqlBdHKABxrcacCb7kj3CQcKmAVM8G8vE1BBfODqZhTpWJ2IIUevV3C
+        x1HZfkS1+yOk1XOLgFvGgmWcuYYZzvChAlKc7ruBqY/JVNBYEobiB4HgFbnCv9HdJPCs4MIxl43tMWYj
+        zEv6MhlSIMXJnuuY6DL8gTVFoajMP4+68ovg5bvisHw3FXDTWBDn8ehNmKatIlSjehmDcWUSxt4lUkF5
+        znEUpPhBmncStY+CcSDLGT4VzrBPtkJz2TnD5j/TLQ/ndEjD5F01Qgy3XkWnXIj4yIOx+ld7DV8wGLax
+        DI5ltLncQmRWZoy2Tnsl/zQ5DTnBvRQ/b2P8n2EwfgPZDDiygt3V8AAAAABJRU5ErkJggg==
+</value>
+  </data>
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>125, 17</value>
   </metadata>
@@ -132,7 +223,6 @@
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>49</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAJCAAAAEAIAAoEwAAFgAAACgAAAAkAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
diff --git a/VECTO/GUI/F_VEH.Designer.vb b/VECTO/GUI/F_VEH.Designer.vb
index 8fabfb95acd402c9a76786194536e4acf6e7a6c8..edf5713b0bfc42bef06da90aa32263898c7d86e1 100644
--- a/VECTO/GUI/F_VEH.Designer.vb
+++ b/VECTO/GUI/F_VEH.Designer.vb
@@ -63,6 +63,7 @@ Partial Class F_VEH
 		Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
 		Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
 		Me.GroupBox7 = New System.Windows.Forms.GroupBox()
+		Me.Label15 = New System.Windows.Forms.Label()
 		Me.PnRt = New System.Windows.Forms.Panel()
 		Me.Label45 = New System.Windows.Forms.Label()
 		Me.LbRtRatio = New System.Windows.Forms.Label()
@@ -111,6 +112,7 @@ Partial Class F_VEH
 		Me.PnAll = New System.Windows.Forms.Panel()
 		Me.GroupBox2 = New System.Windows.Forms.GroupBox()
 		Me.Label4 = New System.Windows.Forms.Label()
+		Me.Label12 = New System.Windows.Forms.Label()
 		Me.Label10 = New System.Windows.Forms.Label()
 		Me.tbAngularGearRatio = New System.Windows.Forms.TextBox()
 		Me.btAngularGearLossMapBrowse = New System.Windows.Forms.Button()
@@ -118,8 +120,6 @@ Partial Class F_VEH
 		Me.cbAngularGearType = New System.Windows.Forms.ComboBox()
 		Me.PicVehicle = New System.Windows.Forms.PictureBox()
 		Me.Label8 = New System.Windows.Forms.Label()
-		Me.Label12 = New System.Windows.Forms.Label()
-		Me.Label15 = New System.Windows.Forms.Label()
 		Me.GroupBox6.SuspendLayout()
 		Me.ToolStrip1.SuspendLayout()
 		Me.GroupBox7.SuspendLayout()
@@ -410,6 +410,15 @@ Partial Class F_VEH
 		Me.GroupBox7.TabStop = False
 		Me.GroupBox7.Text = "Retarder Losses"
 		'
+		'Label15
+		'
+		Me.Label15.Location = New System.Drawing.Point(4, 66)
+		Me.Label15.Name = "Label15"
+		Me.Label15.Size = New System.Drawing.Size(269, 17)
+		Me.Label15.TabIndex = 12
+		Me.Label15.Text = "Retarder Loss Map"
+		Me.Label15.TextAlign = System.Drawing.ContentAlignment.BottomLeft
+		'
 		'PnRt
 		'
 		Me.PnRt.Controls.Add(Me.Label45)
@@ -558,7 +567,7 @@ Partial Class F_VEH
 		'ButAxlRem
 		'
 		Me.ButAxlRem.Image = Global.VECTO.My.Resources.Resources.minus_circle_icon
-		Me.ButAxlRem.Location = New System.Drawing.Point(28, 121)
+		Me.ButAxlRem.Location = New System.Drawing.Point(29, 122)
 		Me.ButAxlRem.Name = "ButAxlRem"
 		Me.ButAxlRem.Size = New System.Drawing.Size(24, 24)
 		Me.ButAxlRem.TabIndex = 2
@@ -618,7 +627,7 @@ Partial Class F_VEH
 		'ButAxlAdd
 		'
 		Me.ButAxlAdd.Image = Global.VECTO.My.Resources.Resources.plus_circle_icon
-		Me.ButAxlAdd.Location = New System.Drawing.Point(5, 121)
+		Me.ButAxlAdd.Location = New System.Drawing.Point(5, 122)
 		Me.ButAxlAdd.Name = "ButAxlAdd"
 		Me.ButAxlAdd.Size = New System.Drawing.Size(24, 24)
 		Me.ButAxlAdd.TabIndex = 1
@@ -849,6 +858,15 @@ Partial Class F_VEH
 		Me.Label4.TabIndex = 10
 		Me.Label4.Text = "[-]"
 		'
+		'Label12
+		'
+		Me.Label12.Location = New System.Drawing.Point(3, 67)
+		Me.Label12.Name = "Label12"
+		Me.Label12.Size = New System.Drawing.Size(269, 16)
+		Me.Label12.TabIndex = 11
+		Me.Label12.Text = "Transmission Loss Map or Efficiency Value [0..1]"
+		Me.Label12.TextAlign = System.Drawing.ContentAlignment.BottomLeft
+		'
 		'Label10
 		'
 		Me.Label10.Location = New System.Drawing.Point(149, 49)
@@ -913,24 +931,6 @@ Partial Class F_VEH
 		Me.Label8.TabIndex = 10
 		Me.Label8.Text = "HDV Class"
 		'
-		'Label12
-		'
-		Me.Label12.Location = New System.Drawing.Point(6, 67)
-		Me.Label12.Name = "Label12"
-		Me.Label12.Size = New System.Drawing.Size(266, 16)
-		Me.Label12.TabIndex = 11
-		Me.Label12.Text = "Transmission Loss Map or Efficiency Value [0..1]"
-		Me.Label12.TextAlign = System.Drawing.ContentAlignment.BottomLeft
-		'
-		'Label15
-		'
-		Me.Label15.Location = New System.Drawing.Point(6, 66)
-		Me.Label15.Name = "Label15"
-		Me.Label15.Size = New System.Drawing.Size(267, 17)
-		Me.Label15.TabIndex = 12
-		Me.Label15.Text = "Retarder Loss Map"
-		Me.Label15.TextAlign = System.Drawing.ContentAlignment.BottomLeft
-		'
 		'F_VEH
 		'
 		Me.AcceptButton = Me.ButOK
diff --git a/VECTO/GUI/F_VEH_AuxDlog.Designer.vb b/VECTO/GUI/F_VEH_AuxDlog.Designer.vb
index 55414e1091ff81ef48909d4fdd47289cdf2eed1d..50d8813fa9ea20fc9d86e21e28efea662595b082 100644
--- a/VECTO/GUI/F_VEH_AuxDlog.Designer.vb
+++ b/VECTO/GUI/F_VEH_AuxDlog.Designer.vb
@@ -32,215 +32,215 @@ Partial Class F_VEH_AuxDlog
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
-        Me.OK_Button = New System.Windows.Forms.Button()
-        Me.Cancel_Button = New System.Windows.Forms.Button()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.TbID = New System.Windows.Forms.TextBox()
-        Me.TbPath = New System.Windows.Forms.TextBox()
-        Me.BtBrowse = New System.Windows.Forms.Button()
-        Me.CbType = New System.Windows.Forms.ComboBox()
-        Me.LbIDhelp = New System.Windows.Forms.Label()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.CbTech = New System.Windows.Forms.ComboBox()
-        Me.PnTech = New System.Windows.Forms.Panel()
-        Me.PnFile = New System.Windows.Forms.Panel()
-        Me.LVTech = New System.Windows.Forms.ListView()
-        Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
-        Me.TableLayoutPanel1.SuspendLayout()
-        Me.PnTech.SuspendLayout()
-        Me.PnFile.SuspendLayout()
-        Me.SuspendLayout()
-        '
-        'TableLayoutPanel1
-        '
-        Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TableLayoutPanel1.ColumnCount = 2
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-        Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
-        Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
-        Me.TableLayoutPanel1.Location = New System.Drawing.Point(301, 388)
-        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
-        Me.TableLayoutPanel1.RowCount = 1
-        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
-        Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
-        Me.TableLayoutPanel1.TabIndex = 25
-        '
-        'OK_Button
-        '
-        Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.OK_Button.Location = New System.Drawing.Point(3, 3)
-        Me.OK_Button.Name = "OK_Button"
-        Me.OK_Button.Size = New System.Drawing.Size(67, 23)
-        Me.OK_Button.TabIndex = 0
-        Me.OK_Button.Text = "OK"
-        '
-        'Cancel_Button
-        '
-        Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
-        Me.Cancel_Button.Name = "Cancel_Button"
-        Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
-        Me.Cancel_Button.TabIndex = 1
-        Me.Cancel_Button.Text = "Cancel"
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(171, 10)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(18, 13)
-        Me.Label1.TabIndex = 1
-        Me.Label1.Text = "ID"
-        '
-        'Label2
-        '
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(9, 10)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(31, 13)
-        Me.Label2.TabIndex = 1
-        Me.Label2.Text = "Type"
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(7, 39)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(50, 13)
-        Me.Label3.TabIndex = 1
-        Me.Label3.Text = "Input File"
-        '
-        'TbID
-        '
-        Me.TbID.Location = New System.Drawing.Point(195, 7)
-        Me.TbID.Name = "TbID"
-        Me.TbID.Size = New System.Drawing.Size(39, 20)
-        Me.TbID.TabIndex = 5
-        '
-        'TbPath
-        '
-        Me.TbPath.Location = New System.Drawing.Point(7, 55)
-        Me.TbPath.Name = "TbPath"
-        Me.TbPath.Size = New System.Drawing.Size(383, 20)
-        Me.TbPath.TabIndex = 10
-        '
-        'BtBrowse
-        '
-        Me.BtBrowse.Location = New System.Drawing.Point(396, 53)
-        Me.BtBrowse.Name = "BtBrowse"
-        Me.BtBrowse.Size = New System.Drawing.Size(32, 23)
-        Me.BtBrowse.TabIndex = 15
-        Me.BtBrowse.Text = "..."
-        Me.BtBrowse.UseVisualStyleBackColor = True
-        '
-        'CbType
-        '
-        Me.CbType.FormattingEnabled = True
-        Me.CbType.Location = New System.Drawing.Point(46, 7)
-        Me.CbType.Name = "CbType"
-        Me.CbType.Size = New System.Drawing.Size(109, 21)
-        Me.CbType.TabIndex = 0
-        '
-        'LbIDhelp
-        '
-        Me.LbIDhelp.AutoSize = True
-        Me.LbIDhelp.Location = New System.Drawing.Point(240, 10)
-        Me.LbIDhelp.Name = "LbIDhelp"
-        Me.LbIDhelp.Size = New System.Drawing.Size(0, 13)
-        Me.LbIDhelp.TabIndex = 26
-        '
-        'Label4
-        '
-        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(6, 9)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(63, 13)
-        Me.Label4.TabIndex = 1
-        Me.Label4.Text = "Technology"
-        '
-        'CbTech
-        '
-        Me.CbTech.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.CbTech.FormattingEnabled = True
-        Me.CbTech.Location = New System.Drawing.Point(75, 6)
-        Me.CbTech.Name = "CbTech"
-        Me.CbTech.Size = New System.Drawing.Size(352, 21)
-        Me.CbTech.TabIndex = 27
-        '
-        'PnTech
-        '
-        Me.PnTech.Controls.Add(Me.CbTech)
-        Me.PnTech.Controls.Add(Me.Label4)
-        Me.PnTech.Location = New System.Drawing.Point(12, 12)
-        Me.PnTech.Name = "PnTech"
-        Me.PnTech.Size = New System.Drawing.Size(435, 34)
-        Me.PnTech.TabIndex = 28
-        '
-        'PnFile
-        '
-        Me.PnFile.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.PnFile.Controls.Add(Me.LbIDhelp)
-        Me.PnFile.Controls.Add(Me.BtBrowse)
-        Me.PnFile.Controls.Add(Me.CbType)
-        Me.PnFile.Controls.Add(Me.TbID)
-        Me.PnFile.Controls.Add(Me.TbPath)
-        Me.PnFile.Controls.Add(Me.Label2)
-        Me.PnFile.Controls.Add(Me.Label3)
-        Me.PnFile.Controls.Add(Me.Label1)
-        Me.PnFile.Location = New System.Drawing.Point(12, 293)
-        Me.PnFile.Name = "PnFile"
-        Me.PnFile.Size = New System.Drawing.Size(435, 89)
-        Me.PnFile.TabIndex = 29
-        '
-        'LVTech
-        '
-        Me.LVTech.CheckBoxes = True
-        Me.LVTech.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1})
-        Me.LVTech.FullRowSelect = True
-        Me.LVTech.GridLines = True
-        Me.LVTech.Location = New System.Drawing.Point(12, 52)
-        Me.LVTech.Name = "LVTech"
-        Me.LVTech.Size = New System.Drawing.Size(435, 235)
-        Me.LVTech.TabIndex = 30
-        Me.LVTech.UseCompatibleStateImageBehavior = False
-        Me.LVTech.View = System.Windows.Forms.View.Details
-        '
-        'ColumnHeader1
-        '
-        Me.ColumnHeader1.Text = "Technologies"
-        Me.ColumnHeader1.Width = 420
-        '
-        'F_VEH_AuxDlog
-        '
-        Me.AcceptButton = Me.OK_Button
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.CancelButton = Me.Cancel_Button
-        Me.ClientSize = New System.Drawing.Size(459, 429)
-        Me.Controls.Add(Me.LVTech)
-        Me.Controls.Add(Me.PnFile)
-        Me.Controls.Add(Me.PnTech)
-        Me.Controls.Add(Me.TableLayoutPanel1)
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
-        Me.MaximizeBox = False
-        Me.MinimizeBox = False
-        Me.Name = "F_VEH_AuxDlog"
-        Me.ShowInTaskbar = False
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        Me.Text = "Auxiliary"
-        Me.TableLayoutPanel1.ResumeLayout(False)
-        Me.PnTech.ResumeLayout(False)
-        Me.PnTech.PerformLayout()
-        Me.PnFile.ResumeLayout(False)
-        Me.PnFile.PerformLayout()
-        Me.ResumeLayout(False)
+		Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+		Me.OK_Button = New System.Windows.Forms.Button()
+		Me.Cancel_Button = New System.Windows.Forms.Button()
+		Me.Label1 = New System.Windows.Forms.Label()
+		Me.Label2 = New System.Windows.Forms.Label()
+		Me.Label3 = New System.Windows.Forms.Label()
+		Me.TbID = New System.Windows.Forms.TextBox()
+		Me.TbPath = New System.Windows.Forms.TextBox()
+		Me.BtBrowse = New System.Windows.Forms.Button()
+		Me.CbType = New System.Windows.Forms.ComboBox()
+		Me.LbIDhelp = New System.Windows.Forms.Label()
+		Me.Label4 = New System.Windows.Forms.Label()
+		Me.CbTech = New System.Windows.Forms.ComboBox()
+		Me.PnTech = New System.Windows.Forms.Panel()
+		Me.PnFile = New System.Windows.Forms.Panel()
+		Me.LVTech = New System.Windows.Forms.ListView()
+		Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader)
+		Me.TableLayoutPanel1.SuspendLayout()
+		Me.PnTech.SuspendLayout()
+		Me.PnFile.SuspendLayout()
+		Me.SuspendLayout()
+		'
+		'TableLayoutPanel1
+		'
+		Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TableLayoutPanel1.ColumnCount = 2
+		Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
+		Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
+		Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
+		Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
+		Me.TableLayoutPanel1.Location = New System.Drawing.Point(301, 388)
+		Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
+		Me.TableLayoutPanel1.RowCount = 1
+		Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
+		Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
+		Me.TableLayoutPanel1.TabIndex = 25
+		'
+		'OK_Button
+		'
+		Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+		Me.OK_Button.Location = New System.Drawing.Point(3, 3)
+		Me.OK_Button.Name = "OK_Button"
+		Me.OK_Button.Size = New System.Drawing.Size(67, 23)
+		Me.OK_Button.TabIndex = 0
+		Me.OK_Button.Text = "OK"
+		'
+		'Cancel_Button
+		'
+		Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
+		Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
+		Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
+		Me.Cancel_Button.Name = "Cancel_Button"
+		Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
+		Me.Cancel_Button.TabIndex = 1
+		Me.Cancel_Button.Text = "Cancel"
+		'
+		'Label1
+		'
+		Me.Label1.AutoSize = True
+		Me.Label1.Location = New System.Drawing.Point(171, 10)
+		Me.Label1.Name = "Label1"
+		Me.Label1.Size = New System.Drawing.Size(18, 13)
+		Me.Label1.TabIndex = 1
+		Me.Label1.Text = "ID"
+		'
+		'Label2
+		'
+		Me.Label2.AutoSize = True
+		Me.Label2.Location = New System.Drawing.Point(9, 10)
+		Me.Label2.Name = "Label2"
+		Me.Label2.Size = New System.Drawing.Size(31, 13)
+		Me.Label2.TabIndex = 1
+		Me.Label2.Text = "Type"
+		'
+		'Label3
+		'
+		Me.Label3.AutoSize = True
+		Me.Label3.Location = New System.Drawing.Point(7, 39)
+		Me.Label3.Name = "Label3"
+		Me.Label3.Size = New System.Drawing.Size(50, 13)
+		Me.Label3.TabIndex = 1
+		Me.Label3.Text = "Input File"
+		'
+		'TbID
+		'
+		Me.TbID.Location = New System.Drawing.Point(195, 7)
+		Me.TbID.Name = "TbID"
+		Me.TbID.Size = New System.Drawing.Size(39, 20)
+		Me.TbID.TabIndex = 5
+		'
+		'TbPath
+		'
+		Me.TbPath.Location = New System.Drawing.Point(7, 55)
+		Me.TbPath.Name = "TbPath"
+		Me.TbPath.Size = New System.Drawing.Size(401, 20)
+		Me.TbPath.TabIndex = 10
+		'
+		'BtBrowse
+		'
+		Me.BtBrowse.Image = Global.VECTO.My.Resources.Resources.Open_icon
+		Me.BtBrowse.Location = New System.Drawing.Point(408, 53)
+		Me.BtBrowse.Name = "BtBrowse"
+		Me.BtBrowse.Size = New System.Drawing.Size(24, 24)
+		Me.BtBrowse.TabIndex = 15
+		Me.BtBrowse.UseVisualStyleBackColor = True
+		'
+		'CbType
+		'
+		Me.CbType.FormattingEnabled = True
+		Me.CbType.Location = New System.Drawing.Point(46, 7)
+		Me.CbType.Name = "CbType"
+		Me.CbType.Size = New System.Drawing.Size(109, 21)
+		Me.CbType.TabIndex = 0
+		'
+		'LbIDhelp
+		'
+		Me.LbIDhelp.AutoSize = True
+		Me.LbIDhelp.Location = New System.Drawing.Point(240, 10)
+		Me.LbIDhelp.Name = "LbIDhelp"
+		Me.LbIDhelp.Size = New System.Drawing.Size(0, 13)
+		Me.LbIDhelp.TabIndex = 26
+		'
+		'Label4
+		'
+		Me.Label4.AutoSize = True
+		Me.Label4.Location = New System.Drawing.Point(6, 9)
+		Me.Label4.Name = "Label4"
+		Me.Label4.Size = New System.Drawing.Size(63, 13)
+		Me.Label4.TabIndex = 1
+		Me.Label4.Text = "Technology"
+		'
+		'CbTech
+		'
+		Me.CbTech.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+		Me.CbTech.FormattingEnabled = True
+		Me.CbTech.Location = New System.Drawing.Point(75, 6)
+		Me.CbTech.Name = "CbTech"
+		Me.CbTech.Size = New System.Drawing.Size(352, 21)
+		Me.CbTech.TabIndex = 27
+		'
+		'PnTech
+		'
+		Me.PnTech.Controls.Add(Me.CbTech)
+		Me.PnTech.Controls.Add(Me.Label4)
+		Me.PnTech.Location = New System.Drawing.Point(12, 12)
+		Me.PnTech.Name = "PnTech"
+		Me.PnTech.Size = New System.Drawing.Size(435, 34)
+		Me.PnTech.TabIndex = 28
+		'
+		'PnFile
+		'
+		Me.PnFile.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.PnFile.Controls.Add(Me.LbIDhelp)
+		Me.PnFile.Controls.Add(Me.BtBrowse)
+		Me.PnFile.Controls.Add(Me.CbType)
+		Me.PnFile.Controls.Add(Me.TbID)
+		Me.PnFile.Controls.Add(Me.TbPath)
+		Me.PnFile.Controls.Add(Me.Label2)
+		Me.PnFile.Controls.Add(Me.Label3)
+		Me.PnFile.Controls.Add(Me.Label1)
+		Me.PnFile.Location = New System.Drawing.Point(12, 293)
+		Me.PnFile.Name = "PnFile"
+		Me.PnFile.Size = New System.Drawing.Size(435, 89)
+		Me.PnFile.TabIndex = 29
+		'
+		'LVTech
+		'
+		Me.LVTech.CheckBoxes = True
+		Me.LVTech.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1})
+		Me.LVTech.FullRowSelect = True
+		Me.LVTech.GridLines = True
+		Me.LVTech.Location = New System.Drawing.Point(12, 52)
+		Me.LVTech.Name = "LVTech"
+		Me.LVTech.Size = New System.Drawing.Size(435, 235)
+		Me.LVTech.TabIndex = 30
+		Me.LVTech.UseCompatibleStateImageBehavior = False
+		Me.LVTech.View = System.Windows.Forms.View.Details
+		'
+		'ColumnHeader1
+		'
+		Me.ColumnHeader1.Text = "Technologies"
+		Me.ColumnHeader1.Width = 420
+		'
+		'F_VEH_AuxDlog
+		'
+		Me.AcceptButton = Me.OK_Button
+		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+		Me.CancelButton = Me.Cancel_Button
+		Me.ClientSize = New System.Drawing.Size(459, 429)
+		Me.Controls.Add(Me.LVTech)
+		Me.Controls.Add(Me.PnFile)
+		Me.Controls.Add(Me.PnTech)
+		Me.Controls.Add(Me.TableLayoutPanel1)
+		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
+		Me.MaximizeBox = False
+		Me.MinimizeBox = False
+		Me.Name = "F_VEH_AuxDlog"
+		Me.ShowInTaskbar = False
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.Text = "Auxiliary"
+		Me.TableLayoutPanel1.ResumeLayout(False)
+		Me.PnTech.ResumeLayout(False)
+		Me.PnTech.PerformLayout()
+		Me.PnFile.ResumeLayout(False)
+		Me.PnFile.PerformLayout()
+		Me.ResumeLayout(False)
 
-    End Sub
+	End Sub
     Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
     Friend WithEvents OK_Button As System.Windows.Forms.Button
     Friend WithEvents Cancel_Button As System.Windows.Forms.Button
diff --git a/VECTO/GUI/GearboxGearDialog.Designer.vb b/VECTO/GUI/GearboxGearDialog.Designer.vb
index ca670c4f7ab0c600e97adeda1f513ceb73585927..ae070b253468a2bbe5dd7b4e814ea467701f8c24 100644
--- a/VECTO/GUI/GearboxGearDialog.Designer.vb
+++ b/VECTO/GUI/GearboxGearDialog.Designer.vb
@@ -22,6 +22,7 @@ Partial Class GearboxGearDialog
 	'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
 	<System.Diagnostics.DebuggerStepThrough()> _
 	Private Sub InitializeComponent()
+		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GearboxGearDialog))
 		Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
 		Me.OK_Button = New System.Windows.Forms.Button()
 		Me.Cancel_Button = New System.Windows.Forms.Button()
@@ -57,7 +58,7 @@ Partial Class GearboxGearDialog
 		Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
 		Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
 		Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
-		Me.TableLayoutPanel1.Location = New System.Drawing.Point(380, 217)
+		Me.TableLayoutPanel1.Location = New System.Drawing.Point(377, 210)
 		Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
 		Me.TableLayoutPanel1.RowCount = 1
 		Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
@@ -104,7 +105,7 @@ Partial Class GearboxGearDialog
 		'TbRatio
 		'
 		Me.TbRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.TbRatio.Location = New System.Drawing.Point(149, 6)
+		Me.TbRatio.Location = New System.Drawing.Point(139, 6)
 		Me.TbRatio.Name = "TbRatio"
 		Me.TbRatio.Size = New System.Drawing.Size(66, 20)
 		Me.TbRatio.TabIndex = 3
@@ -113,7 +114,7 @@ Partial Class GearboxGearDialog
 		'
 		Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.Label2.AutoSize = True
-		Me.Label2.Location = New System.Drawing.Point(111, 9)
+		Me.Label2.Location = New System.Drawing.Point(101, 9)
 		Me.Label2.Name = "Label2"
 		Me.Label2.Size = New System.Drawing.Size(32, 13)
 		Me.Label2.TabIndex = 2
@@ -121,7 +122,7 @@ Partial Class GearboxGearDialog
 		'
 		'TbMapPath
 		'
-		Me.TbMapPath.Location = New System.Drawing.Point(12, 61)
+		Me.TbMapPath.Location = New System.Drawing.Point(12, 51)
 		Me.TbMapPath.Name = "TbMapPath"
 		Me.TbMapPath.Size = New System.Drawing.Size(476, 20)
 		Me.TbMapPath.TabIndex = 6
@@ -129,25 +130,25 @@ Partial Class GearboxGearDialog
 		'Label3
 		'
 		Me.Label3.AutoSize = True
-		Me.Label3.Location = New System.Drawing.Point(12, 45)
+		Me.Label3.Location = New System.Drawing.Point(11, 37)
 		Me.Label3.Name = "Label3"
-		Me.Label3.Size = New System.Drawing.Size(157, 13)
+		Me.Label3.Size = New System.Drawing.Size(187, 13)
 		Me.Label3.TabIndex = 5
-		Me.Label3.Text = "Loss Map file or Efficiency [0..1]"
+		Me.Label3.Text = "Loss Map file or Efficiency Value [0..1]"
 		'
 		'BtBrowse
 		'
-		Me.BtBrowse.Location = New System.Drawing.Point(494, 59)
+		Me.BtBrowse.Image = CType(resources.GetObject("BtBrowse.Image"), System.Drawing.Image)
+		Me.BtBrowse.Location = New System.Drawing.Point(488, 49)
 		Me.BtBrowse.Name = "BtBrowse"
-		Me.BtBrowse.Size = New System.Drawing.Size(32, 23)
+		Me.BtBrowse.Size = New System.Drawing.Size(24, 24)
 		Me.BtBrowse.TabIndex = 7
-		Me.BtBrowse.Text = "..."
 		Me.BtBrowse.UseVisualStyleBackColor = True
 		'
 		'BtNext
 		'
 		Me.BtNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.BtNext.Location = New System.Drawing.Point(307, 220)
+		Me.BtNext.Location = New System.Drawing.Point(203, 213)
 		Me.BtNext.Name = "BtNext"
 		Me.BtNext.Size = New System.Drawing.Size(67, 23)
 		Me.BtNext.TabIndex = 11
@@ -173,18 +174,18 @@ Partial Class GearboxGearDialog
 		'
 		'BtShiftPolyBrowse
 		'
-		Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(484, 15)
+		Me.BtShiftPolyBrowse.Image = CType(resources.GetObject("BtShiftPolyBrowse.Image"), System.Drawing.Image)
+		Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(478, 15)
 		Me.BtShiftPolyBrowse.Name = "BtShiftPolyBrowse"
-		Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(32, 23)
+		Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(24, 24)
 		Me.BtShiftPolyBrowse.TabIndex = 2
 		Me.BtShiftPolyBrowse.TabStop = False
-		Me.BtShiftPolyBrowse.Text = "..."
 		Me.BtShiftPolyBrowse.UseVisualStyleBackColor = True
 		'
 		'Label4
 		'
 		Me.Label4.AutoSize = True
-		Me.Label4.Location = New System.Drawing.Point(2, 1)
+		Me.Label4.Location = New System.Drawing.Point(1, 3)
 		Me.Label4.Name = "Label4"
 		Me.Label4.Size = New System.Drawing.Size(89, 13)
 		Me.Label4.TabIndex = 0
@@ -195,15 +196,15 @@ Partial Class GearboxGearDialog
 		Me.PnShiftPoly.Controls.Add(Me.TbShiftPolyFile)
 		Me.PnShiftPoly.Controls.Add(Me.BtShiftPolyBrowse)
 		Me.PnShiftPoly.Controls.Add(Me.Label4)
-		Me.PnShiftPoly.Location = New System.Drawing.Point(10, 90)
+		Me.PnShiftPoly.Location = New System.Drawing.Point(10, 79)
 		Me.PnShiftPoly.Name = "PnShiftPoly"
-		Me.PnShiftPoly.Size = New System.Drawing.Size(525, 46)
+		Me.PnShiftPoly.Size = New System.Drawing.Size(513, 41)
 		Me.PnShiftPoly.TabIndex = 8
 		'
 		'Label5
 		'
 		Me.Label5.AutoSize = True
-		Me.Label5.Location = New System.Drawing.Point(2, 3)
+		Me.Label5.Location = New System.Drawing.Point(1, 5)
 		Me.Label5.Name = "Label5"
 		Me.Label5.Size = New System.Drawing.Size(97, 13)
 		Me.Label5.TabIndex = 0
@@ -211,12 +212,12 @@ Partial Class GearboxGearDialog
 		'
 		'BtBrowseFld
 		'
-		Me.BtBrowseFld.Location = New System.Drawing.Point(484, 17)
+		Me.BtBrowseFld.Image = CType(resources.GetObject("BtBrowseFld.Image"), System.Drawing.Image)
+		Me.BtBrowseFld.Location = New System.Drawing.Point(478, 17)
 		Me.BtBrowseFld.Name = "BtBrowseFld"
-		Me.BtBrowseFld.Size = New System.Drawing.Size(32, 23)
+		Me.BtBrowseFld.Size = New System.Drawing.Size(24, 24)
 		Me.BtBrowseFld.TabIndex = 2
 		Me.BtBrowseFld.TabStop = False
-		Me.BtBrowseFld.Text = "..."
 		Me.BtBrowseFld.UseVisualStyleBackColor = True
 		'
 		'TbFld
@@ -232,24 +233,24 @@ Partial Class GearboxGearDialog
 		Me.PnFld.Controls.Add(Me.TbFld)
 		Me.PnFld.Controls.Add(Me.BtBrowseFld)
 		Me.PnFld.Controls.Add(Me.Label5)
-		Me.PnFld.Location = New System.Drawing.Point(10, 144)
+		Me.PnFld.Location = New System.Drawing.Point(10, 126)
 		Me.PnFld.Name = "PnFld"
-		Me.PnFld.Size = New System.Drawing.Size(523, 65)
+		Me.PnFld.Size = New System.Drawing.Size(513, 61)
 		Me.PnFld.TabIndex = 9
 		'
 		'Label6
 		'
 		Me.Label6.AutoSize = True
-		Me.Label6.Location = New System.Drawing.Point(3, 42)
+		Me.Label6.Location = New System.Drawing.Point(1, 41)
 		Me.Label6.Name = "Label6"
-		Me.Label6.Size = New System.Drawing.Size(344, 13)
+		Me.Label6.Size = New System.Drawing.Size(347, 13)
 		Me.Label6.TabIndex = 3
-		Me.Label6.Text = "If no file is defined the Full Load Curve from the Engine File will be used."
+		Me.Label6.Text = "(If no file is defined the Full Load Curve from the Engine File will be used)"
 		'
 		'BtPrevious
 		'
 		Me.BtPrevious.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.BtPrevious.Location = New System.Drawing.Point(234, 220)
+		Me.BtPrevious.Location = New System.Drawing.Point(136, 213)
 		Me.BtPrevious.Name = "BtPrevious"
 		Me.BtPrevious.Size = New System.Drawing.Size(67, 23)
 		Me.BtPrevious.TabIndex = 10
@@ -262,7 +263,7 @@ Partial Class GearboxGearDialog
 		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
 		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
 		Me.CancelButton = Me.Cancel_Button
-		Me.ClientSize = New System.Drawing.Size(538, 258)
+		Me.ClientSize = New System.Drawing.Size(528, 254)
 		Me.Controls.Add(Me.BtPrevious)
 		Me.Controls.Add(Me.PnFld)
 		Me.Controls.Add(Me.PnShiftPoly)
diff --git a/VECTO/GUI/GearboxGearDialog.resx b/VECTO/GUI/GearboxGearDialog.resx
index 1af7de150c99c12dd67a509fe57c10d63e4eeb04..598ef8b7aa8909d4d36c9bde49528edd90c8ae6c 100644
--- a/VECTO/GUI/GearboxGearDialog.resx
+++ b/VECTO/GUI/GearboxGearDialog.resx
@@ -117,4 +117,59 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="BtBrowse.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+        0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
+        776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
+        AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
+        FJKv98Rjo/ca0J9AqakKxr5ye7iU7sCufBuFSfBjIYduXldvQnKdMg5r3fEmQVe1AO7FtkecH1rDvtAK
+        TtnsDCpYmxNjddbIjBgreki+2BELXWccVEoRAqu8EPTEC2Sp03223KqUCbsMSw0VrEzfhG4qG7rJbCwb
+        Ifnsmyt4/1oAX5kHqtUSnKj2pQIHsZWCCKzTLUAFSxNZWBrPwnfCWCa0ekiuaL6As408yNVSxPYI4FbI
+        gWM2u4ybxwIRsJKZBoH2ayYWRzOg+ULQX+HndMikpxDSxINC9wJRyiAcatiJPQUcuBTawOGxQWCZYG4Q
+        kIJ6OA3qoTTMD6bhW08iAmp98GqlBdHKABxrcacCb7kj3CQcKmAVM8G8vE1BBfODqZhTpWJ2IIUevV3C
+        x1HZfkS1+yOk1XOLgFvGgmWcuYYZzvChAlKc7ruBqY/JVNBYEobiB4HgFbnCv9HdJPCs4MIxl43tMWYj
+        zEv6MhlSIMXJnuuY6DL8gTVFoajMP4+68ovg5bvisHw3FXDTWBDn8ehNmKatIlSjehmDcWUSxt4lUkF5
+        znEUpPhBmncStY+CcSDLGT4VzrBPtkJz2TnD5j/TLQ/ndEjD5F01Qgy3XkWnXIj4yIOx+ld7DV8wGLax
+        DI5ltLncQmRWZoy2Tnsl/zQ5DTnBvRQ/b2P8n2EwfgPZDDiygt3V8AAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="BtShiftPolyBrowse.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+        0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
+        776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
+        AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
+        FJKv98Rjo/ca0J9AqakKxr5ye7iU7sCufBuFSfBjIYduXldvQnKdMg5r3fEmQVe1AO7FtkecH1rDvtAK
+        TtnsDCpYmxNjddbIjBgreki+2BELXWccVEoRAqu8EPTEC2Sp03223KqUCbsMSw0VrEzfhG4qG7rJbCwb
+        Ifnsmyt4/1oAX5kHqtUSnKj2pQIHsZWCCKzTLUAFSxNZWBrPwnfCWCa0ekiuaL6As408yNVSxPYI4FbI
+        gWM2u4ybxwIRsJKZBoH2ayYWRzOg+ULQX+HndMikpxDSxINC9wJRyiAcatiJPQUcuBTawOGxQWCZYG4Q
+        kIJ6OA3qoTTMD6bhW08iAmp98GqlBdHKABxrcacCb7kj3CQcKmAVM8G8vE1BBfODqZhTpWJ2IIUevV3C
+        x1HZfkS1+yOk1XOLgFvGgmWcuYYZzvChAlKc7ruBqY/JVNBYEobiB4HgFbnCv9HdJPCs4MIxl43tMWYj
+        zEv6MhlSIMXJnuuY6DL8gTVFoajMP4+68ovg5bvisHw3FXDTWBDn8ehNmKatIlSjehmDcWUSxt4lUkF5
+        znEUpPhBmncStY+CcSDLGT4VzrBPtkJz2TnD5j/TLQ/ndEjD5F01Qgy3XkWnXIj4yIOx+ld7DV8wGLax
+        DI5ltLncQmRWZoy2Tnsl/zQ5DTnBvRQ/b2P8n2EwfgPZDDiygt3V8AAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="BtBrowseFld.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALVSURBVDhPhZJrSJNhGIYXOs1Nc8o8gJWZ+UNEEupPxDAw
+        0kIrs5JsTOcKRANNEs0827KM0BA1MlSo0G3o1DxkEsso1JqH8rBUSlPzPOfSeajkbu+7NSl/9MD147u/
+        776eF96P0VbB7+6Q8tFZJcCH2gj01wsx0BD5F5+aRFA1iTR99ZERjH+HlKHLxexgEoZao0Geh96mY2FC
+        AkBpYlX7HL3PhBpjbXNIYWP5DjaWDKwv3MKMKomKMHIXGDWikaGu5gw8n3LhUWKXZ6wbBL+0tyk/Fwk5
+        FJKv98Rjo/ca0J9AqakKxr5ye7iU7sCufBuFSfBjIYduXldvQnKdMg5r3fEmQVe1AO7FtkecH1rDvtAK
+        TtnsDCpYmxNjddbIjBgreki+2BELXWccVEoRAqu8EPTEC2Sp03223KqUCbsMSw0VrEzfhG4qG7rJbCwb
+        Ifnsmyt4/1oAX5kHqtUSnKj2pQIHsZWCCKzTLUAFSxNZWBrPwnfCWCa0ekiuaL6As408yNVSxPYI4FbI
+        gWM2u4ybxwIRsJKZBoH2ayYWRzOg+ULQX+HndMikpxDSxINC9wJRyiAcatiJPQUcuBTawOGxQWCZYG4Q
+        kIJ6OA3qoTTMD6bhW08iAmp98GqlBdHKABxrcacCb7kj3CQcKmAVM8G8vE1BBfODqZhTpWJ2IIUevV3C
+        x1HZfkS1+yOk1XOLgFvGgmWcuYYZzvChAlKc7ruBqY/JVNBYEobiB4HgFbnCv9HdJPCs4MIxl43tMWYj
+        zEv6MhlSIMXJnuuY6DL8gTVFoajMP4+68ovg5bvisHw3FXDTWBDn8ehNmKatIlSjehmDcWUSxt4lUkF5
+        znEUpPhBmncStY+CcSDLGT4VzrBPtkJz2TnD5j/TLQ/ndEjD5F01Qgy3XkWnXIj4yIOx+ld7DV8wGLax
+        DI5ltLncQmRWZoy2Tnsl/zQ5DTnBvRQ/b2P8n2EwfgPZDDiygt3V8AAAAABJRU5ErkJggg==
+</value>
+  </data>
 </root>
\ No newline at end of file