diff --git a/VECTO/GUI/AboutBox.Designer.vb b/VECTO/GUI/AboutBox.Designer.vb
index 57d8e61498875612e68321444101f71aeba6efe1..bde22d1a8880d8e60b1b860f69a76931513a47d6 100644
--- a/VECTO/GUI/AboutBox.Designer.vb
+++ b/VECTO/GUI/AboutBox.Designer.vb
@@ -190,7 +190,7 @@ Partial Class AboutBox
 		Me.Controls.Add(Me.Label8)
 		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
 		Me.Name = "AboutBox"
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "About VECTO"
 		Me.Panel1.ResumeLayout(False)
 		Me.Panel1.PerformLayout()
diff --git a/VECTO/GUI/EngineForm.Designer.vb b/VECTO/GUI/EngineForm.Designer.vb
index 91a0a19ca83081a4248af307a160fe050e797830..4027908c135b47423e464389ce7e52fffc62c66d 100644
--- a/VECTO/GUI/EngineForm.Designer.vb
+++ b/VECTO/GUI/EngineForm.Designer.vb
@@ -72,6 +72,8 @@ Partial Class EngineForm
 		Me.PnInertia = New System.Windows.Forms.Panel()
 		Me.GrWHTC = New System.Windows.Forms.GroupBox()
 		Me.PnWhtcDeclaration = New System.Windows.Forms.Panel()
+		Me.lblColdHotFactor = New System.Windows.Forms.Label()
+		Me.TbColdHotFactor = New System.Windows.Forms.TextBox()
 		Me.BtWHTCimport = New System.Windows.Forms.Button()
 		Me.Label4 = New System.Windows.Forms.Label()
 		Me.Label7 = New System.Windows.Forms.Label()
@@ -88,8 +90,6 @@ Partial Class EngineForm
 		Me.Label14 = New System.Windows.Forms.Label()
 		Me.BtFLD = New System.Windows.Forms.Button()
 		Me.BtFLDopen = New System.Windows.Forms.Button()
-		Me.lblColdHotFactor = New System.Windows.Forms.Label()
-		Me.TbColdHotFactor = New System.Windows.Forms.TextBox()
 		Me.ToolStrip1.SuspendLayout()
 		Me.StatusStrip1.SuspendLayout()
 		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -155,7 +155,7 @@ Partial Class EngineForm
 		'
 		Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-		Me.ButCancel.Location = New System.Drawing.Point(898, 469)
+		Me.ButCancel.Location = New System.Drawing.Point(898, 460)
 		Me.ButCancel.Name = "ButCancel"
 		Me.ButCancel.Size = New System.Drawing.Size(75, 23)
 		Me.ButCancel.TabIndex = 13
@@ -165,7 +165,7 @@ Partial Class EngineForm
 		'ButOK
 		'
 		Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.ButOK.Location = New System.Drawing.Point(817, 469)
+		Me.ButOK.Location = New System.Drawing.Point(817, 460)
 		Me.ButOK.Name = "ButOK"
 		Me.ButOK.Size = New System.Drawing.Size(75, 23)
 		Me.ButOK.TabIndex = 12
@@ -254,7 +254,7 @@ Partial Class EngineForm
 		'StatusStrip1
 		'
 		Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
-		Me.StatusStrip1.Location = New System.Drawing.Point(0, 495)
+		Me.StatusStrip1.Location = New System.Drawing.Point(0, 486)
 		Me.StatusStrip1.Name = "StatusStrip1"
 		Me.StatusStrip1.Size = New System.Drawing.Size(985, 22)
 		Me.StatusStrip1.SizingGrip = False
@@ -338,9 +338,9 @@ Partial Class EngineForm
 		'
 		Me.PictureBox1.BackColor = System.Drawing.Color.White
 		Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_ENG
-		Me.PictureBox1.Location = New System.Drawing.Point(12, 28)
+		Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
 		Me.PictureBox1.Name = "PictureBox1"
-		Me.PictureBox1.Size = New System.Drawing.Size(481, 40)
+		Me.PictureBox1.Size = New System.Drawing.Size(502, 40)
 		Me.PictureBox1.TabIndex = 39
 		Me.PictureBox1.TabStop = False
 		'
@@ -410,6 +410,22 @@ Partial Class EngineForm
 		Me.PnWhtcDeclaration.Size = New System.Drawing.Size(472, 87)
 		Me.PnWhtcDeclaration.TabIndex = 8
 		'
+		'lblColdHotFactor
+		'
+		Me.lblColdHotFactor.AutoSize = True
+		Me.lblColdHotFactor.Location = New System.Drawing.Point(3, 63)
+		Me.lblColdHotFactor.Name = "lblColdHotFactor"
+		Me.lblColdHotFactor.Size = New System.Drawing.Size(185, 13)
+		Me.lblColdHotFactor.TabIndex = 5
+		Me.lblColdHotFactor.Text = "Cold/Hot Emmission Balancing Factor"
+		'
+		'TbColdHotFactor
+		'
+		Me.TbColdHotFactor.Location = New System.Drawing.Point(194, 60)
+		Me.TbColdHotFactor.Name = "TbColdHotFactor"
+		Me.TbColdHotFactor.Size = New System.Drawing.Size(57, 20)
+		Me.TbColdHotFactor.TabIndex = 6
+		'
 		'BtWHTCimport
 		'
 		Me.BtWHTCimport.Location = New System.Drawing.Point(299, 3)
@@ -504,6 +520,7 @@ Partial Class EngineForm
 		'PicBox
 		'
 		Me.PicBox.BackColor = System.Drawing.Color.LightGray
+		Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
 		Me.PicBox.Location = New System.Drawing.Point(499, 28)
 		Me.PicBox.Name = "PicBox"
 		Me.PicBox.Size = New System.Drawing.Size(474, 425)
@@ -546,27 +563,11 @@ Partial Class EngineForm
 		Me.BtFLDopen.TabStop = False
 		Me.BtFLDopen.UseVisualStyleBackColor = True
 		'
-		'lblColdHotFactor
-		'
-		Me.lblColdHotFactor.AutoSize = True
-		Me.lblColdHotFactor.Location = New System.Drawing.Point(3, 63)
-		Me.lblColdHotFactor.Name = "lblColdHotFactor"
-		Me.lblColdHotFactor.Size = New System.Drawing.Size(185, 13)
-		Me.lblColdHotFactor.TabIndex = 5
-		Me.lblColdHotFactor.Text = "Cold/Hot Emmission Balancing Factor"
-		'
-		'TbColdHotFactor
-		'
-		Me.TbColdHotFactor.Location = New System.Drawing.Point(194, 60)
-		Me.TbColdHotFactor.Name = "TbColdHotFactor"
-		Me.TbColdHotFactor.Size = New System.Drawing.Size(57, 20)
-		Me.TbColdHotFactor.TabIndex = 6
-		'
 		'EngineForm
 		'
 		Me.AcceptButton = Me.ButOK
 		Me.CancelButton = Me.ButCancel
-		Me.ClientSize = New System.Drawing.Size(985, 517)
+		Me.ClientSize = New System.Drawing.Size(985, 508)
 		Me.Controls.Add(Me.PicBox)
 		Me.Controls.Add(Me.GrWHTC)
 		Me.Controls.Add(Me.PnInertia)
@@ -591,10 +592,12 @@ Partial Class EngineForm
 		Me.Controls.Add(Me.Label40)
 		Me.Controls.Add(Me.Label1)
 		Me.Controls.Add(Me.TbName)
+		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
 		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
 		Me.MaximizeBox = False
 		Me.Name = "EngineForm"
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "F_ENG"
 		Me.ToolStrip1.ResumeLayout(False)
 		Me.ToolStrip1.PerformLayout()
diff --git a/VECTO/GUI/FileSignDialog.Designer.vb b/VECTO/GUI/FileSignDialog.Designer.vb
index 5ceac73395ef1e52facedfcf2fb05ba054132294..2200de7a98365159ce9d84d7334b88c922807a50 100644
--- a/VECTO/GUI/FileSignDialog.Designer.vb
+++ b/VECTO/GUI/FileSignDialog.Designer.vb
@@ -35,79 +35,79 @@ Partial Class FileSignDialog
 	'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
 	<DebuggerStepThrough()> _
 	Private Sub InitializeComponent()
-		Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(FileSignDialog))
-		Me.TbSigFile = New TextBox()
-		Me.Label1 = New Label()
-		Me.BtBrowse = New Button()
-		Me.lvFiles = New ListView()
-		Me.ColumnHeader1 = CType(New ColumnHeader(), ColumnHeader)
-		Me.ColumnHeader2 = CType(New ColumnHeader(), ColumnHeader)
-		Me.BtSign = New Button()
-		Me.BtClose = New Button()
-		Me.BtRemFLD = New Button()
-		Me.BtAddFLD = New Button()
-		Me.GroupBox1 = New GroupBox()
-		Me.BtClearList = New Button()
-		Me.BtReload = New Button()
-		Me.GroupBox2 = New GroupBox()
-		Me.LbStatus = New Label()
-		Me.LbMode = New Label()
-		Me.LbDateStr = New Label()
-		Me.TbPubKey = New TextBox()
-		Me.TbLicStr = New TextBox()
-		Me.Label5 = New Label()
-		Me.Label6 = New Label()
-		Me.Label3 = New Label()
-		Me.Label4 = New Label()
-		Me.Label2 = New Label()
+		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FileSignDialog))
+		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(((AnchorStyles.Top Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
-		Me.TbSigFile.Location = New Point(12, 29)
+		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 Size(528, 20)
+		Me.TbSigFile.Size = New System.Drawing.Size(528, 20)
 		Me.TbSigFile.TabIndex = 0
 		'
 		'Label1
 		'
 		Me.Label1.AutoSize = True
-		Me.Label1.Location = New Point(12, 13)
+		Me.Label1.Location = New System.Drawing.Point(12, 13)
 		Me.Label1.Name = "Label1"
-		Me.Label1.Size = New Size(99, 13)
+		Me.Label1.Size = New System.Drawing.Size(99, 13)
 		Me.Label1.TabIndex = 4
 		Me.Label1.Text = "Signature file (.vsig)"
 		'
 		'BtBrowse
 		'
-		Me.BtBrowse.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
-		Me.BtBrowse.Image = My.Resources.Resources.Open_icon
-		Me.BtBrowse.Location = New Point(541, 27)
+		Me.BtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+		Me.BtBrowse.Location = New System.Drawing.Point(541, 27)
 		Me.BtBrowse.Name = "BtBrowse"
-		Me.BtBrowse.Size = New Size(24, 24)
+		Me.BtBrowse.Size = New System.Drawing.Size(24, 24)
 		Me.BtBrowse.TabIndex = 1
 		Me.BtBrowse.UseVisualStyleBackColor = True
 		'
 		'lvFiles
 		'
-		Me.lvFiles.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
-			Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
-		Me.lvFiles.Columns.AddRange(New ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2})
+		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 Point(6, 19)
+		Me.lvFiles.Location = New System.Drawing.Point(6, 19)
 		Me.lvFiles.MultiSelect = False
 		Me.lvFiles.Name = "lvFiles"
-		Me.lvFiles.Size = New Size(565, 368)
+		Me.lvFiles.Size = New System.Drawing.Size(565, 217)
 		Me.lvFiles.TabIndex = 0
 		Me.lvFiles.UseCompatibleStateImageBehavior = False
-		Me.lvFiles.View = View.Details
+		Me.lvFiles.View = System.Windows.Forms.View.Details
 		'
 		'ColumnHeader1
 		'
@@ -121,84 +121,84 @@ Partial Class FileSignDialog
 		'
 		'BtSign
 		'
-		Me.BtSign.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.BtSign.Location = New Point(12, 638)
+		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, 487)
 		Me.BtSign.Name = "BtSign"
-		Me.BtSign.Size = New Size(126, 23)
+		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((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
-		Me.BtClose.Location = New Point(522, 638)
+		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, 487)
 		Me.BtClose.Name = "BtClose"
-		Me.BtClose.Size = New Size(67, 23)
+		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((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.BtRemFLD.Image = My.Resources.Resources.minus_circle_icon
-		Me.BtRemFLD.Location = New Point(29, 387)
+		Me.BtRemFLD.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtRemFLD.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+		Me.BtRemFLD.Location = New System.Drawing.Point(29, 236)
 		Me.BtRemFLD.Name = "BtRemFLD"
-		Me.BtRemFLD.Size = New Size(24, 24)
+		Me.BtRemFLD.Size = New System.Drawing.Size(24, 24)
 		Me.BtRemFLD.TabIndex = 2
 		Me.BtRemFLD.UseVisualStyleBackColor = True
 		'
 		'BtAddFLD
 		'
-		Me.BtAddFLD.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.BtAddFLD.Image = My.Resources.Resources.plus_circle_icon
-		Me.BtAddFLD.Location = New Point(5, 387)
+		Me.BtAddFLD.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtAddFLD.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+		Me.BtAddFLD.Location = New System.Drawing.Point(5, 236)
 		Me.BtAddFLD.Name = "BtAddFLD"
-		Me.BtAddFLD.Size = New Size(24, 24)
+		Me.BtAddFLD.Size = New System.Drawing.Size(24, 24)
 		Me.BtAddFLD.TabIndex = 1
 		Me.BtAddFLD.UseVisualStyleBackColor = True
 		'
 		'GroupBox1
 		'
-		Me.GroupBox1.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
-			Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
+		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 Point(12, 210)
+		Me.GroupBox1.Location = New System.Drawing.Point(12, 210)
 		Me.GroupBox1.Name = "GroupBox1"
-		Me.GroupBox1.Size = New Size(577, 422)
+		Me.GroupBox1.Size = New System.Drawing.Size(577, 271)
 		Me.GroupBox1.TabIndex = 4
 		Me.GroupBox1.TabStop = False
 		Me.GroupBox1.Text = "Files"
 		'
 		'BtClearList
 		'
-		Me.BtClearList.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.BtClearList.Location = New Point(508, 387)
+		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, 236)
 		Me.BtClearList.Name = "BtClearList"
-		Me.BtClearList.Size = New Size(63, 24)
+		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((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
-		Me.BtReload.Image = My.Resources.Resources.Refresh_icon
-		Me.BtReload.Location = New Point(565, 27)
+		Me.BtReload.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtReload.Image = Global.TUGraz.VECTO.My.Resources.Resources.Refresh_icon
+		Me.BtReload.Location = New System.Drawing.Point(565, 27)
 		Me.BtReload.Name = "BtReload"
-		Me.BtReload.Size = New Size(24, 24)
+		Me.BtReload.Size = New System.Drawing.Size(24, 24)
 		Me.BtReload.TabIndex = 2
 		Me.BtReload.UseVisualStyleBackColor = True
 		'
 		'GroupBox2
 		'
-		Me.GroupBox2.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
+		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)
@@ -209,9 +209,9 @@ Partial Class FileSignDialog
 		Me.GroupBox2.Controls.Add(Me.Label3)
 		Me.GroupBox2.Controls.Add(Me.Label4)
 		Me.GroupBox2.Controls.Add(Me.Label2)
-		Me.GroupBox2.Location = New Point(18, 55)
+		Me.GroupBox2.Location = New System.Drawing.Point(12, 55)
 		Me.GroupBox2.Name = "GroupBox2"
-		Me.GroupBox2.Size = New Size(571, 149)
+		Me.GroupBox2.Size = New System.Drawing.Size(577, 149)
 		Me.GroupBox2.TabIndex = 3
 		Me.GroupBox2.TabStop = False
 		Me.GroupBox2.Text = "File Information"
@@ -219,99 +219,97 @@ Partial Class FileSignDialog
 		'LbStatus
 		'
 		Me.LbStatus.AutoSize = True
-		Me.LbStatus.Location = New Point(99, 116)
+		Me.LbStatus.Location = New System.Drawing.Point(99, 116)
 		Me.LbStatus.Name = "LbStatus"
-		Me.LbStatus.Size = New Size(0, 13)
+		Me.LbStatus.Size = New System.Drawing.Size(0, 13)
 		Me.LbStatus.TabIndex = 4
 		'
 		'LbMode
 		'
 		Me.LbMode.AutoSize = True
-		Me.LbMode.Location = New Point(99, 87)
+		Me.LbMode.Location = New System.Drawing.Point(99, 87)
 		Me.LbMode.Name = "LbMode"
-		Me.LbMode.Size = New Size(0, 13)
+		Me.LbMode.Size = New System.Drawing.Size(0, 13)
 		Me.LbMode.TabIndex = 3
 		'
 		'LbDateStr
 		'
-		Me.LbDateStr.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
+		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 Point(415, 87)
+		Me.LbDateStr.Location = New System.Drawing.Point(421, 87)
 		Me.LbDateStr.Name = "LbDateStr"
-		Me.LbDateStr.Size = New Size(0, 13)
+		Me.LbDateStr.Size = New System.Drawing.Size(0, 13)
 		Me.LbDateStr.TabIndex = 2
 		'
 		'TbPubKey
 		'
-		Me.TbPubKey.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
-		Me.TbPubKey.Location = New Point(99, 48)
+		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 Size(466, 20)
+		Me.TbPubKey.Size = New System.Drawing.Size(472, 20)
 		Me.TbPubKey.TabIndex = 1
 		'
 		'TbLicStr
 		'
-		Me.TbLicStr.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
-		Me.TbLicStr.Location = New Point(99, 22)
+		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 Size(466, 20)
+		Me.TbLicStr.Size = New System.Drawing.Size(472, 20)
 		Me.TbLicStr.TabIndex = 0
 		'
 		'Label5
 		'
 		Me.Label5.AutoSize = True
-		Me.Label5.Location = New Point(33, 51)
+		Me.Label5.Location = New System.Drawing.Point(33, 51)
 		Me.Label5.Name = "Label5"
-		Me.Label5.Size = New Size(60, 13)
+		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 Point(53, 116)
+		Me.Label6.Location = New System.Drawing.Point(53, 116)
 		Me.Label6.Name = "Label6"
-		Me.Label6.Size = New Size(40, 13)
+		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 Point(56, 87)
+		Me.Label3.Location = New System.Drawing.Point(56, 87)
 		Me.Label3.Name = "Label3"
-		Me.Label3.Size = New Size(37, 13)
+		Me.Label3.Size = New System.Drawing.Size(37, 13)
 		Me.Label3.TabIndex = 0
 		Me.Label3.Text = "Mode:"
 		'
 		'Label4
 		'
-		Me.Label4.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
+		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 Point(334, 87)
+		Me.Label4.Location = New System.Drawing.Point(340, 87)
 		Me.Label4.Name = "Label4"
-		Me.Label4.Size = New Size(75, 13)
+		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 Point(12, 25)
+		Me.Label2.Location = New System.Drawing.Point(12, 25)
 		Me.Label2.Name = "Label2"
-		Me.Label2.Size = New Size(81, 13)
+		Me.Label2.Size = New System.Drawing.Size(81, 13)
 		Me.Label2.TabIndex = 0
 		Me.Label2.Text = "License Owner:"
 		'
-		'F_FileSign
+		'FileSignDialog
 		'
-		Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!)
-		Me.AutoScaleMode = AutoScaleMode.Font
-		Me.ClientSize = New Size(601, 673)
+		Me.ClientSize = New System.Drawing.Size(601, 522)
 		Me.Controls.Add(Me.GroupBox2)
 		Me.Controls.Add(Me.BtReload)
 		Me.Controls.Add(Me.GroupBox1)
@@ -320,13 +318,13 @@ Partial Class FileSignDialog
 		Me.Controls.Add(Me.BtBrowse)
 		Me.Controls.Add(Me.Label1)
 		Me.Controls.Add(Me.TbSigFile)
-		Me.Icon = CType(resources.GetObject("$this.Icon"), Icon)
+		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
+		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
 		Me.MaximizeBox = False
 		Me.MinimizeBox = False
-		Me.MinimumSize = New Size(480, 400)
+		Me.MinimumSize = New System.Drawing.Size(480, 400)
 		Me.Name = "FileSignDialog"
-		Me.SizeGripStyle = SizeGripStyle.Show
-		Me.StartPosition = FormStartPosition.CenterParent
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "Sign & Verify Files"
 		Me.GroupBox1.ResumeLayout(False)
 		Me.GroupBox2.ResumeLayout(False)
diff --git a/VECTO/GUI/GearboxForm.Designer.vb b/VECTO/GUI/GearboxForm.Designer.vb
index b9b9047b67e72dc697f56187c4c3313f4e5f36fd..d2449a253597b89e00bbabdc39ba47104beaebf4 100644
--- a/VECTO/GUI/GearboxForm.Designer.vb
+++ b/VECTO/GUI/GearboxForm.Designer.vb
@@ -217,7 +217,7 @@ Partial Class GearboxForm
 		'StatusStrip1
 		'
 		Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
-		Me.StatusStrip1.Location = New System.Drawing.Point(0, 684)
+		Me.StatusStrip1.Location = New System.Drawing.Point(0, 680)
 		Me.StatusStrip1.Name = "StatusStrip1"
 		Me.StatusStrip1.Size = New System.Drawing.Size(877, 22)
 		Me.StatusStrip1.SizingGrip = False
@@ -234,7 +234,7 @@ Partial Class GearboxForm
 		'
 		Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-		Me.ButCancel.Location = New System.Drawing.Point(790, 658)
+		Me.ButCancel.Location = New System.Drawing.Point(790, 654)
 		Me.ButCancel.Name = "ButCancel"
 		Me.ButCancel.Size = New System.Drawing.Size(75, 23)
 		Me.ButCancel.TabIndex = 7
@@ -244,7 +244,7 @@ Partial Class GearboxForm
 		'ButOK
 		'
 		Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-		Me.ButOK.Location = New System.Drawing.Point(709, 658)
+		Me.ButOK.Location = New System.Drawing.Point(709, 654)
 		Me.ButOK.Name = "ButOK"
 		Me.ButOK.Size = New System.Drawing.Size(75, 23)
 		Me.ButOK.TabIndex = 6
@@ -361,9 +361,9 @@ Partial Class GearboxForm
 		'
 		Me.PictureBox1.BackColor = System.Drawing.Color.White
 		Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_GBX
-		Me.PictureBox1.Location = New System.Drawing.Point(12, 28)
+		Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
 		Me.PictureBox1.Name = "PictureBox1"
-		Me.PictureBox1.Size = New System.Drawing.Size(441, 40)
+		Me.PictureBox1.Size = New System.Drawing.Size(461, 40)
 		Me.PictureBox1.TabIndex = 43
 		Me.PictureBox1.TabStop = False
 		'
@@ -886,6 +886,7 @@ Partial Class GearboxForm
 		'PicBox
 		'
 		Me.PicBox.BackColor = System.Drawing.Color.LightGray
+		Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
 		Me.PicBox.Location = New System.Drawing.Point(459, 28)
 		Me.PicBox.Name = "PicBox"
 		Me.PicBox.Size = New System.Drawing.Size(406, 372)
@@ -896,7 +897,7 @@ Partial Class GearboxForm
 		'
 		Me.AcceptButton = Me.ButOK
 		Me.CancelButton = Me.ButCancel
-		Me.ClientSize = New System.Drawing.Size(877, 706)
+		Me.ClientSize = New System.Drawing.Size(877, 702)
 		Me.Controls.Add(Me.PicBox)
 		Me.Controls.Add(Me.PnInertiaTI)
 		Me.Controls.Add(Me.GroupBox4)
@@ -911,10 +912,11 @@ Partial Class GearboxForm
 		Me.Controls.Add(Me.ButOK)
 		Me.Controls.Add(Me.StatusStrip1)
 		Me.Controls.Add(Me.ToolStrip1)
+		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
 		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
 		Me.MaximizeBox = False
 		Me.Name = "GearboxForm"
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "F_GBX"
 		Me.ToolStrip1.ResumeLayout(False)
 		Me.ToolStrip1.PerformLayout()
diff --git a/VECTO/GUI/GearboxGearDialog.Designer.vb b/VECTO/GUI/GearboxGearDialog.Designer.vb
index 9c9fca529ffc4023be05d28cd0d05e5ca3165d74..fbe25e6bb292faa13dff23473089d9d249d555eb 100644
--- a/VECTO/GUI/GearboxGearDialog.Designer.vb
+++ b/VECTO/GUI/GearboxGearDialog.Designer.vb
@@ -27,27 +27,27 @@ Partial Class GearboxGearDialog
 	'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
 	<DebuggerStepThrough()> _
 	Private Sub InitializeComponent()
-		Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(GearboxGearDialog))
-		Me.TableLayoutPanel1 = New TableLayoutPanel()
-		Me.OK_Button = New Button()
-		Me.Cancel_Button = New Button()
-		Me.TbGear = New TextBox()
-		Me.Label1 = New Label()
-		Me.TbRatio = New TextBox()
-		Me.Label2 = New Label()
-		Me.TbMapPath = New TextBox()
-		Me.Label3 = New Label()
-		Me.BtBrowse = New Button()
-		Me.BtNext = New Button()
-		Me.TbShiftPolyFile = New TextBox()
-		Me.BtShiftPolyBrowse = New Button()
-		Me.Label4 = New Label()
-		Me.PnShiftPoly = New Panel()
-		Me.Label5 = New Label()
-		Me.TbMaxTorque = New TextBox()
-		Me.PnFld = New Panel()
-		Me.BtPrevious = New Button()
-		Me.Label6 = New Label()
+		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GearboxGearDialog))
+		Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+		Me.OK_Button = New System.Windows.Forms.Button()
+		Me.Cancel_Button = New System.Windows.Forms.Button()
+		Me.TbGear = New System.Windows.Forms.TextBox()
+		Me.Label1 = New System.Windows.Forms.Label()
+		Me.TbRatio = New System.Windows.Forms.TextBox()
+		Me.Label2 = New System.Windows.Forms.Label()
+		Me.TbMapPath = New System.Windows.Forms.TextBox()
+		Me.Label3 = New System.Windows.Forms.Label()
+		Me.BtBrowse = New System.Windows.Forms.Button()
+		Me.BtNext = New System.Windows.Forms.Button()
+		Me.TbShiftPolyFile = New System.Windows.Forms.TextBox()
+		Me.BtShiftPolyBrowse = New System.Windows.Forms.Button()
+		Me.Label4 = New System.Windows.Forms.Label()
+		Me.PnShiftPoly = New System.Windows.Forms.Panel()
+		Me.Label5 = New System.Windows.Forms.Label()
+		Me.TbMaxTorque = New System.Windows.Forms.TextBox()
+		Me.PnFld = New System.Windows.Forms.Panel()
+		Me.Label6 = New System.Windows.Forms.Label()
+		Me.BtPrevious = New System.Windows.Forms.Button()
 		Me.TableLayoutPanel1.SuspendLayout()
 		Me.PnShiftPoly.SuspendLayout()
 		Me.PnFld.SuspendLayout()
@@ -55,122 +55,122 @@ Partial Class GearboxGearDialog
 		'
 		'TableLayoutPanel1
 		'
-		Me.TableLayoutPanel1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
+		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 ColumnStyle(SizeType.Percent, 50.0!))
-		Me.TableLayoutPanel1.ColumnStyles.Add(New ColumnStyle(SizeType.Percent, 50.0!))
+		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 Point(370, 184)
+		Me.TableLayoutPanel1.Location = New System.Drawing.Point(370, 177)
 		Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
 		Me.TableLayoutPanel1.RowCount = 1
-		Me.TableLayoutPanel1.RowStyles.Add(New RowStyle(SizeType.Percent, 50.0!))
-		Me.TableLayoutPanel1.Size = New Size(146, 29)
+		Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
+		Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
 		Me.TableLayoutPanel1.TabIndex = 12
 		'
 		'OK_Button
 		'
-		Me.OK_Button.Anchor = AnchorStyles.None
-		Me.OK_Button.Location = New Point(3, 3)
+		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 Size(67, 23)
+		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 = AnchorStyles.None
-		Me.Cancel_Button.DialogResult = DialogResult.Cancel
-		Me.Cancel_Button.Location = New Point(76, 3)
+		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 Size(67, 23)
+		Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
 		Me.Cancel_Button.TabIndex = 1
 		Me.Cancel_Button.Text = "Cancel"
 		'
 		'TbGear
 		'
-		Me.TbGear.Location = New Point(48, 6)
+		Me.TbGear.Location = New System.Drawing.Point(48, 6)
 		Me.TbGear.Name = "TbGear"
 		Me.TbGear.ReadOnly = True
-		Me.TbGear.Size = New Size(37, 20)
+		Me.TbGear.Size = New System.Drawing.Size(37, 20)
 		Me.TbGear.TabIndex = 1
 		Me.TbGear.TabStop = False
 		'
 		'Label1
 		'
 		Me.Label1.AutoSize = True
-		Me.Label1.Location = New Point(12, 9)
+		Me.Label1.Location = New System.Drawing.Point(12, 9)
 		Me.Label1.Name = "Label1"
-		Me.Label1.Size = New Size(30, 13)
+		Me.Label1.Size = New System.Drawing.Size(30, 13)
 		Me.Label1.TabIndex = 0
 		Me.Label1.Text = "Gear"
 		'
 		'TbRatio
 		'
-		Me.TbRatio.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
-		Me.TbRatio.Location = New Point(139, 6)
+		Me.TbRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbRatio.Location = New System.Drawing.Point(139, 6)
 		Me.TbRatio.Name = "TbRatio"
-		Me.TbRatio.Size = New Size(66, 20)
+		Me.TbRatio.Size = New System.Drawing.Size(66, 20)
 		Me.TbRatio.TabIndex = 3
 		'
 		'Label2
 		'
-		Me.Label2.Anchor = CType((AnchorStyles.Top Or AnchorStyles.Right), AnchorStyles)
+		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 Point(101, 9)
+		Me.Label2.Location = New System.Drawing.Point(101, 9)
 		Me.Label2.Name = "Label2"
-		Me.Label2.Size = New Size(32, 13)
+		Me.Label2.Size = New System.Drawing.Size(32, 13)
 		Me.Label2.TabIndex = 2
 		Me.Label2.Text = "Ratio"
 		'
 		'TbMapPath
 		'
-		Me.TbMapPath.Location = New Point(12, 51)
+		Me.TbMapPath.Location = New System.Drawing.Point(12, 51)
 		Me.TbMapPath.Name = "TbMapPath"
-		Me.TbMapPath.Size = New Size(476, 20)
+		Me.TbMapPath.Size = New System.Drawing.Size(476, 20)
 		Me.TbMapPath.TabIndex = 6
 		'
 		'Label3
 		'
 		Me.Label3.AutoSize = True
-		Me.Label3.Location = New Point(11, 37)
+		Me.Label3.Location = New System.Drawing.Point(11, 37)
 		Me.Label3.Name = "Label3"
-		Me.Label3.Size = New Size(187, 13)
+		Me.Label3.Size = New System.Drawing.Size(187, 13)
 		Me.Label3.TabIndex = 5
 		Me.Label3.Text = "Loss Map file or Efficiency Value [0..1]"
 		'
 		'BtBrowse
 		'
-		Me.BtBrowse.Image = CType(resources.GetObject("BtBrowse.Image"), Image)
-		Me.BtBrowse.Location = New Point(488, 49)
+		Me.BtBrowse.Image = CType(resources.GetObject("BtBrowse.Image"), System.Drawing.Image)
+		Me.BtBrowse.Location = New System.Drawing.Point(489, 49)
 		Me.BtBrowse.Name = "BtBrowse"
-		Me.BtBrowse.Size = New Size(24, 24)
+		Me.BtBrowse.Size = New System.Drawing.Size(24, 24)
 		Me.BtBrowse.TabIndex = 7
 		Me.BtBrowse.UseVisualStyleBackColor = True
 		'
 		'BtNext
 		'
-		Me.BtNext.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.BtNext.Location = New Point(196, 187)
+		Me.BtNext.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtNext.Location = New System.Drawing.Point(196, 180)
 		Me.BtNext.Name = "BtNext"
-		Me.BtNext.Size = New Size(67, 23)
+		Me.BtNext.Size = New System.Drawing.Size(67, 23)
 		Me.BtNext.TabIndex = 11
 		Me.BtNext.Text = "&Next >"
 		Me.BtNext.UseVisualStyleBackColor = True
 		'
 		'TbShiftPolyFile
 		'
-		Me.TbShiftPolyFile.Location = New Point(2, 17)
+		Me.TbShiftPolyFile.Location = New System.Drawing.Point(2, 17)
 		Me.TbShiftPolyFile.Name = "TbShiftPolyFile"
-		Me.TbShiftPolyFile.Size = New Size(476, 20)
+		Me.TbShiftPolyFile.Size = New System.Drawing.Size(476, 20)
 		Me.TbShiftPolyFile.TabIndex = 1
 		'
 		'BtShiftPolyBrowse
 		'
-		Me.BtShiftPolyBrowse.Image = CType(resources.GetObject("BtShiftPolyBrowse.Image"), Image)
-		Me.BtShiftPolyBrowse.Location = New Point(478, 15)
+		Me.BtShiftPolyBrowse.Image = CType(resources.GetObject("BtShiftPolyBrowse.Image"), System.Drawing.Image)
+		Me.BtShiftPolyBrowse.Location = New System.Drawing.Point(479, 16)
 		Me.BtShiftPolyBrowse.Name = "BtShiftPolyBrowse"
-		Me.BtShiftPolyBrowse.Size = New Size(24, 24)
+		Me.BtShiftPolyBrowse.Size = New System.Drawing.Size(24, 24)
 		Me.BtShiftPolyBrowse.TabIndex = 2
 		Me.BtShiftPolyBrowse.TabStop = False
 		Me.BtShiftPolyBrowse.UseVisualStyleBackColor = True
@@ -178,9 +178,9 @@ Partial Class GearboxGearDialog
 		'Label4
 		'
 		Me.Label4.AutoSize = True
-		Me.Label4.Location = New Point(1, 3)
+		Me.Label4.Location = New System.Drawing.Point(1, 3)
 		Me.Label4.Name = "Label4"
-		Me.Label4.Size = New Size(89, 13)
+		Me.Label4.Size = New System.Drawing.Size(89, 13)
 		Me.Label4.TabIndex = 0
 		Me.Label4.Text = "Shift polygons file"
 		'
@@ -189,25 +189,25 @@ 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 Point(10, 79)
+		Me.PnShiftPoly.Location = New System.Drawing.Point(10, 79)
 		Me.PnShiftPoly.Name = "PnShiftPoly"
-		Me.PnShiftPoly.Size = New Size(513, 41)
+		Me.PnShiftPoly.Size = New System.Drawing.Size(513, 41)
 		Me.PnShiftPoly.TabIndex = 8
 		'
 		'Label5
 		'
 		Me.Label5.AutoSize = True
-		Me.Label5.Location = New Point(1, 5)
+		Me.Label5.Location = New System.Drawing.Point(1, 5)
 		Me.Label5.Name = "Label5"
-		Me.Label5.Size = New Size(123, 13)
+		Me.Label5.Size = New System.Drawing.Size(123, 13)
 		Me.Label5.TabIndex = 0
 		Me.Label5.Text = "Maximum allowed torque"
 		'
 		'TbMaxTorque
 		'
-		Me.TbMaxTorque.Location = New Point(2, 19)
+		Me.TbMaxTorque.Location = New System.Drawing.Point(2, 19)
 		Me.TbMaxTorque.Name = "TbMaxTorque"
-		Me.TbMaxTorque.Size = New Size(88, 20)
+		Me.TbMaxTorque.Size = New System.Drawing.Size(88, 20)
 		Me.TbMaxTorque.TabIndex = 1
 		'
 		'PnFld
@@ -215,37 +215,35 @@ Partial Class GearboxGearDialog
 		Me.PnFld.Controls.Add(Me.Label6)
 		Me.PnFld.Controls.Add(Me.TbMaxTorque)
 		Me.PnFld.Controls.Add(Me.Label5)
-		Me.PnFld.Location = New Point(10, 126)
+		Me.PnFld.Location = New System.Drawing.Point(10, 126)
 		Me.PnFld.Name = "PnFld"
-		Me.PnFld.Size = New Size(513, 46)
+		Me.PnFld.Size = New System.Drawing.Size(513, 46)
 		Me.PnFld.TabIndex = 9
 		'
-		'BtPrevious
-		'
-		Me.BtPrevious.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.BtPrevious.Location = New Point(129, 187)
-		Me.BtPrevious.Name = "BtPrevious"
-		Me.BtPrevious.Size = New Size(67, 23)
-		Me.BtPrevious.TabIndex = 10
-		Me.BtPrevious.Text = "< &Previous"
-		Me.BtPrevious.UseVisualStyleBackColor = True
-		'
 		'Label6
 		'
 		Me.Label6.AutoSize = True
-		Me.Label6.Location = New Point(96, 22)
+		Me.Label6.Location = New System.Drawing.Point(96, 22)
 		Me.Label6.Name = "Label6"
-		Me.Label6.Size = New Size(29, 13)
+		Me.Label6.Size = New System.Drawing.Size(29, 13)
 		Me.Label6.TabIndex = 2
 		Me.Label6.Text = "[Nm]"
 		'
+		'BtPrevious
+		'
+		Me.BtPrevious.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtPrevious.Location = New System.Drawing.Point(129, 180)
+		Me.BtPrevious.Name = "BtPrevious"
+		Me.BtPrevious.Size = New System.Drawing.Size(67, 23)
+		Me.BtPrevious.TabIndex = 10
+		Me.BtPrevious.Text = "< &Previous"
+		Me.BtPrevious.UseVisualStyleBackColor = True
+		'
 		'GearboxGearDialog
 		'
 		Me.AcceptButton = Me.OK_Button
-		Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!)
-		Me.AutoScaleMode = AutoScaleMode.Font
 		Me.CancelButton = Me.Cancel_Button
-		Me.ClientSize = New Size(528, 225)
+		Me.ClientSize = New System.Drawing.Size(528, 218)
 		Me.Controls.Add(Me.BtPrevious)
 		Me.Controls.Add(Me.PnFld)
 		Me.Controls.Add(Me.PnShiftPoly)
@@ -258,12 +256,12 @@ Partial Class GearboxGearDialog
 		Me.Controls.Add(Me.Label1)
 		Me.Controls.Add(Me.TbGear)
 		Me.Controls.Add(Me.TableLayoutPanel1)
-		Me.FormBorderStyle = FormBorderStyle.FixedDialog
+		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
 		Me.MaximizeBox = False
 		Me.MinimizeBox = False
 		Me.Name = "GearboxGearDialog"
 		Me.ShowInTaskbar = False
-		Me.StartPosition = FormStartPosition.CenterParent
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "Edit Gears"
 		Me.TableLayoutPanel1.ResumeLayout(False)
 		Me.PnShiftPoly.ResumeLayout(False)
diff --git a/VECTO/GUI/GraphEditChannelDialog.Designer.vb b/VECTO/GUI/GraphEditChannelDialog.Designer.vb
index 7294e5ce49a7749703b7b6c463ea37ccb78c7b40..346ed748bd545c5fb5e4f996913377af7d1fced6 100644
--- a/VECTO/GUI/GraphEditChannelDialog.Designer.vb
+++ b/VECTO/GUI/GraphEditChannelDialog.Designer.vb
@@ -126,7 +126,7 @@ Partial Class GraphEditChannelDialog
 		Me.MinimizeBox = False
 		Me.Name = "GraphEditChannelDialog"
 		Me.ShowInTaskbar = False
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "Edit Channel"
 		Me.TableLayoutPanel1.ResumeLayout(False)
 		Me.GroupBox1.ResumeLayout(False)
diff --git a/VECTO/GUI/GraphForm.Designer.vb b/VECTO/GUI/GraphForm.Designer.vb
index 4df01c959896dc1b21f013f93178d8ff2e459dbb..47732362f378df073de0feb3df8fba8ec7a3be8f 100644
--- a/VECTO/GUI/GraphForm.Designer.vb
+++ b/VECTO/GUI/GraphForm.Designer.vb
@@ -25,98 +25,99 @@ Partial Class GraphForm
 	'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
 	<DebuggerStepThrough()> _
 	Private Sub InitializeComponent()
-		Dim resources As ComponentResourceManager = New ComponentResourceManager(GetType(GraphForm))
-		Me.PictureBox1 = New PictureBox()
-		Me.GroupBox1 = New GroupBox()
-		Me.BtRemCh = New Button()
-		Me.BtAddCh = New Button()
-		Me.ListView1 = New ListView()
-		Me.ColumnHeader1 = CType(New ColumnHeader(), ColumnHeader)
-		Me.ColumnHeader3 = CType(New ColumnHeader(), ColumnHeader)
-		Me.CbXaxis = New ComboBox()
-		Me.ToolStrip1 = New ToolStrip()
-		Me.ToolStripBtOpen = New ToolStripButton()
-		Me.ToolStripButton3 = New ToolStripButton()
-		Me.ToolStripButton2 = New ToolStripButton()
-		Me.ToolStripSeparator1 = New ToolStripSeparator()
-		Me.ToolStripButton1 = New ToolStripButton()
-		Me.Label1 = New Label()
-		Me.TbXmin = New TextBox()
-		Me.TbXmax = New TextBox()
-		Me.BtReset = New Button()
-		Me.Label2 = New Label()
-		Me.Label3 = New Label()
-		Me.BtZoomIn = New Button()
-		Me.BtZoomOut = New Button()
-		Me.BtMoveL = New Button()
-		Me.BtMoveR = New Button()
-		CType(Me.PictureBox1, ISupportInitialize).BeginInit()
+		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(GraphForm))
+		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((((AnchorStyles.Top Or AnchorStyles.Bottom) _
-			Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
-		Me.PictureBox1.BackColor = Color.LightGray
-		Me.PictureBox1.Location = New Point(262, 28)
+		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.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+		Me.PictureBox1.Location = New System.Drawing.Point(262, 28)
 		Me.PictureBox1.Name = "PictureBox1"
-		Me.PictureBox1.Size = New Size(984, 332)
+		Me.PictureBox1.Size = New System.Drawing.Size(984, 332)
 		Me.PictureBox1.TabIndex = 0
 		Me.PictureBox1.TabStop = False
 		'
 		'GroupBox1
 		'
-		Me.GroupBox1.Anchor = CType(((AnchorStyles.Top Or AnchorStyles.Bottom) _
-			Or AnchorStyles.Left), AnchorStyles)
+		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 Point(12, 28)
+		Me.GroupBox1.Location = New System.Drawing.Point(12, 28)
 		Me.GroupBox1.Name = "GroupBox1"
-		Me.GroupBox1.Size = New Size(244, 362)
+		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((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.BtRemCh.Image = My.Resources.Resources.minus_circle_icon
-		Me.BtRemCh.Location = New Point(29, 327)
+		Me.BtRemCh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtRemCh.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+		Me.BtRemCh.Location = New System.Drawing.Point(29, 327)
 		Me.BtRemCh.Name = "BtRemCh"
-		Me.BtRemCh.Size = New Size(24, 24)
+		Me.BtRemCh.Size = New System.Drawing.Size(24, 24)
 		Me.BtRemCh.TabIndex = 2
 		Me.BtRemCh.UseVisualStyleBackColor = True
 		'
 		'BtAddCh
 		'
-		Me.BtAddCh.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.BtAddCh.Image = My.Resources.Resources.plus_circle_icon
-		Me.BtAddCh.Location = New Point(5, 327)
+		Me.BtAddCh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+		Me.BtAddCh.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+		Me.BtAddCh.Location = New System.Drawing.Point(5, 327)
 		Me.BtAddCh.Name = "BtAddCh"
-		Me.BtAddCh.Size = New Size(24, 24)
+		Me.BtAddCh.Size = New System.Drawing.Size(24, 24)
 		Me.BtAddCh.TabIndex = 1
 		Me.BtAddCh.UseVisualStyleBackColor = True
 		'
 		'ListView1
 		'
-		Me.ListView1.Anchor = CType((((AnchorStyles.Top Or AnchorStyles.Bottom) _
-			Or AnchorStyles.Left) _
-			Or AnchorStyles.Right), AnchorStyles)
-		Me.ListView1.BackColor = Color.GhostWhite
+		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 ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader3})
+		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 Point(6, 19)
+		Me.ListView1.Location = New System.Drawing.Point(6, 19)
 		Me.ListView1.Name = "ListView1"
-		Me.ListView1.Size = New Size(232, 308)
+		Me.ListView1.Size = New System.Drawing.Size(232, 308)
 		Me.ListView1.TabIndex = 0
 		Me.ListView1.UseCompatibleStateImageBehavior = False
-		Me.ListView1.View = View.Details
+		Me.ListView1.View = System.Windows.Forms.View.Details
 		'
 		'ColumnHeader1
 		'
@@ -130,170 +131,168 @@ Partial Class GraphForm
 		'
 		'CbXaxis
 		'
-		Me.CbXaxis.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.CbXaxis.DropDownStyle = ComboBoxStyle.DropDownList
+		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 Point(325, 369)
+		Me.CbXaxis.Location = New System.Drawing.Point(325, 369)
 		Me.CbXaxis.Name = "CbXaxis"
-		Me.CbXaxis.Size = New Size(90, 21)
+		Me.CbXaxis.Size = New System.Drawing.Size(90, 21)
 		Me.CbXaxis.TabIndex = 1
 		'
 		'ToolStrip1
 		'
-		Me.ToolStrip1.GripStyle = ToolStripGripStyle.Hidden
-		Me.ToolStrip1.Items.AddRange(New ToolStripItem() {Me.ToolStripBtOpen, Me.ToolStripButton3, Me.ToolStripButton2, Me.ToolStripSeparator1, Me.ToolStripButton1})
-		Me.ToolStrip1.Location = New Point(0, 0)
+		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 Size(1258, 25)
+		Me.ToolStrip1.Size = New System.Drawing.Size(1258, 25)
 		Me.ToolStrip1.TabIndex = 31
 		Me.ToolStrip1.Text = "ToolStrip1"
 		'
 		'ToolStripBtOpen
 		'
-		Me.ToolStripBtOpen.DisplayStyle = ToolStripItemDisplayStyle.Image
-		Me.ToolStripBtOpen.Image = My.Resources.Resources.Open_icon
-		Me.ToolStripBtOpen.ImageTransparentColor = Color.Magenta
+		Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+		Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
 		Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
-		Me.ToolStripBtOpen.Size = New Size(23, 22)
+		Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
 		Me.ToolStripBtOpen.Text = "ToolStripButton1"
 		Me.ToolStripBtOpen.ToolTipText = "Open .vmod file"
 		'
 		'ToolStripButton3
 		'
-		Me.ToolStripButton3.DisplayStyle = ToolStripItemDisplayStyle.Image
-		Me.ToolStripButton3.Image = My.Resources.Resources.application_add_icon
-		Me.ToolStripButton3.ImageTransparentColor = Color.Magenta
+		Me.ToolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripButton3.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_add_icon
+		Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta
 		Me.ToolStripButton3.Name = "ToolStripButton3"
-		Me.ToolStripButton3.Size = New Size(23, 22)
+		Me.ToolStripButton3.Size = New System.Drawing.Size(23, 22)
 		Me.ToolStripButton3.Text = "ToolStripButton3"
 		Me.ToolStripButton3.ToolTipText = "New window"
 		'
 		'ToolStripButton2
 		'
-		Me.ToolStripButton2.DisplayStyle = ToolStripItemDisplayStyle.Image
-		Me.ToolStripButton2.Image = My.Resources.Resources.Refresh_icon
-		Me.ToolStripButton2.ImageTransparentColor = Color.Magenta
+		Me.ToolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripButton2.Image = Global.TUGraz.VECTO.My.Resources.Resources.Refresh_icon
+		Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
 		Me.ToolStripButton2.Name = "ToolStripButton2"
-		Me.ToolStripButton2.Size = New Size(23, 22)
+		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 Size(6, 25)
+		Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
 		'
 		'ToolStripButton1
 		'
-		Me.ToolStripButton1.DisplayStyle = ToolStripItemDisplayStyle.Image
-		Me.ToolStripButton1.Image = My.Resources.Resources.Help_icon
-		Me.ToolStripButton1.ImageTransparentColor = Color.Magenta
+		Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
+		Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
 		Me.ToolStripButton1.Name = "ToolStripButton1"
-		Me.ToolStripButton1.Size = New Size(23, 22)
+		Me.ToolStripButton1.Size = New System.Drawing.Size(23, 22)
 		Me.ToolStripButton1.Text = "Help"
 		'
 		'Label1
 		'
-		Me.Label1.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
+		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 Point(283, 372)
+		Me.Label1.Location = New System.Drawing.Point(283, 372)
 		Me.Label1.Name = "Label1"
-		Me.Label1.Size = New Size(36, 13)
+		Me.Label1.Size = New System.Drawing.Size(36, 13)
 		Me.Label1.TabIndex = 32
 		Me.Label1.Text = "X Axis"
 		'
 		'TbXmin
 		'
-		Me.TbXmin.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.TbXmin.Location = New Point(497, 369)
+		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 Size(71, 20)
+		Me.TbXmin.Size = New System.Drawing.Size(71, 20)
 		Me.TbXmin.TabIndex = 2
 		'
 		'TbXmax
 		'
-		Me.TbXmax.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.TbXmax.Location = New Point(609, 369)
+		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 Size(71, 20)
+		Me.TbXmax.Size = New System.Drawing.Size(71, 20)
 		Me.TbXmax.TabIndex = 3
 		'
 		'BtReset
 		'
-		Me.BtReset.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
-		Me.BtReset.Location = New Point(691, 367)
+		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 Size(75, 23)
+		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((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
+		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 Point(467, 372)
+		Me.Label2.Location = New System.Drawing.Point(467, 372)
 		Me.Label2.Name = "Label2"
-		Me.Label2.Size = New Size(24, 13)
+		Me.Label2.Size = New System.Drawing.Size(24, 13)
 		Me.Label2.TabIndex = 35
 		Me.Label2.Text = "Min"
 		'
 		'Label3
 		'
-		Me.Label3.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Left), AnchorStyles)
+		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 Point(576, 372)
+		Me.Label3.Location = New System.Drawing.Point(576, 372)
 		Me.Label3.Name = "Label3"
-		Me.Label3.Size = New Size(27, 13)
+		Me.Label3.Size = New System.Drawing.Size(27, 13)
 		Me.Label3.TabIndex = 35
 		Me.Label3.Text = "Max"
 		'
 		'BtZoomIn
 		'
-		Me.BtZoomIn.Anchor = CType((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
-		Me.BtZoomIn.Location = New Point(1103, 366)
+		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 Size(24, 24)
+		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((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
-		Me.BtZoomOut.Location = New Point(1126, 366)
+		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 Size(24, 24)
+		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((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
-		Me.BtMoveL.Location = New Point(1199, 366)
+		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 Size(24, 24)
+		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((AnchorStyles.Bottom Or AnchorStyles.Right), AnchorStyles)
-		Me.BtMoveR.Location = New Point(1222, 366)
+		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 Size(24, 24)
+		Me.BtMoveR.Size = New System.Drawing.Size(24, 24)
 		Me.BtMoveR.TabIndex = 36
 		Me.BtMoveR.Text = ">"
 		Me.BtMoveR.UseVisualStyleBackColor = True
 		'
-		'F_Graph
+		'GraphForm
 		'
-		Me.AutoScaleDimensions = New SizeF(6.0!, 13.0!)
-		Me.AutoScaleMode = AutoScaleMode.Font
-		Me.ClientSize = New Size(1258, 400)
+		Me.ClientSize = New System.Drawing.Size(1258, 400)
 		Me.Controls.Add(Me.BtZoomOut)
 		Me.Controls.Add(Me.BtMoveR)
 		Me.Controls.Add(Me.BtMoveL)
@@ -308,12 +307,12 @@ Partial Class GraphForm
 		Me.Controls.Add(Me.ToolStrip1)
 		Me.Controls.Add(Me.GroupBox1)
 		Me.Controls.Add(Me.PictureBox1)
-		Me.Icon = CType(resources.GetObject("$this.Icon"), Icon)
-		Me.MinimumSize = New Size(1000, 300)
+		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+		Me.MinimumSize = New System.Drawing.Size(1000, 300)
 		Me.Name = "GraphForm"
-		Me.SizeGripStyle = SizeGripStyle.Show
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "Graph"
-		CType(Me.PictureBox1, ISupportInitialize).EndInit()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
 		Me.GroupBox1.ResumeLayout(False)
 		Me.ToolStrip1.ResumeLayout(False)
 		Me.ToolStrip1.PerformLayout()
diff --git a/VECTO/GUI/JiraDialog.Designer.vb b/VECTO/GUI/JiraDialog.Designer.vb
index d2d57d1518e80337401cd3af7da4161c6e3f4c1c..2d91d2c46028ff58791d54bea95d249603f010d0 100644
--- a/VECTO/GUI/JiraDialog.Designer.vb
+++ b/VECTO/GUI/JiraDialog.Designer.vb
@@ -118,7 +118,7 @@ Partial Class JiraDialog
 		Me.MinimizeBox = False
 		Me.Name = "JiraDialog"
 		Me.ShowInTaskbar = False
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "Report Issue via CITnet"
 		Me.GroupBox1.ResumeLayout(False)
 		Me.GroupBox1.PerformLayout()
diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb
index 017f81d8f88c791a04aa6fe4a1f9e70abe770a8c..44b28367293482244e3e37eb44083c6a81847368 100644
--- a/VECTO/GUI/MainForm.Designer.vb
+++ b/VECTO/GUI/MainForm.Designer.vb
@@ -209,9 +209,9 @@ Partial Class MainForm
 		'btnImportXML
 		'
 		Me.btnImportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-		Me.btnImportXML.Location = New System.Drawing.Point(464, 271)
+		Me.btnImportXML.Location = New System.Drawing.Point(460, 267)
 		Me.btnImportXML.Name = "btnImportXML"
-		Me.btnImportXML.Size = New System.Drawing.Size(104, 23)
+		Me.btnImportXML.Size = New System.Drawing.Size(115, 30)
 		Me.btnImportXML.TabIndex = 23
 		Me.btnImportXML.Text = "Import from XML"
 		Me.btnImportXML.UseVisualStyleBackColor = True
@@ -221,9 +221,9 @@ Partial Class MainForm
 		'
 		Me.btnExportXML.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.btnExportXML.Enabled = False
-		Me.btnExportXML.Location = New System.Drawing.Point(343, 272)
+		Me.btnExportXML.Location = New System.Drawing.Point(344, 267)
 		Me.btnExportXML.Name = "btnExportXML"
-		Me.btnExportXML.Size = New System.Drawing.Size(115, 23)
+		Me.btnExportXML.Size = New System.Drawing.Size(115, 30)
 		Me.btnExportXML.TabIndex = 22
 		Me.btnExportXML.Text = "Export as XML"
 		Me.btnExportXML.UseVisualStyleBackColor = True
@@ -783,19 +783,19 @@ Partial Class MainForm
 		'OpenWithToolStripMenuItem
 		'
 		Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
-		Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(198, 22)
+		Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
 		Me.OpenWithToolStripMenuItem.Text = "Open with ..."
 		'
 		'OpenInGraphWindowToolStripMenuItem
 		'
 		Me.OpenInGraphWindowToolStripMenuItem.Name = "OpenInGraphWindowToolStripMenuItem"
-		Me.OpenInGraphWindowToolStripMenuItem.Size = New System.Drawing.Size(198, 22)
+		Me.OpenInGraphWindowToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
 		Me.OpenInGraphWindowToolStripMenuItem.Text = "Open in Graph Window"
 		'
 		'ShowInFolderToolStripMenuItem
 		'
 		Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
-		Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(198, 22)
+		Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
 		Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
 		'
 		'MainForm
@@ -808,6 +808,7 @@ Partial Class MainForm
 		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
 		Me.MinimumSize = New System.Drawing.Size(785, 485)
 		Me.Name = "MainForm"
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "VECTO"
 		Me.StatusBAR.ResumeLayout(False)
 		Me.StatusBAR.PerformLayout()
diff --git a/VECTO/GUI/Settings.Designer.vb b/VECTO/GUI/Settings.Designer.vb
index 6c44023dfcc949d46651d819d9f1bb6a2b6736c2..65a116160fd9938d7545d783551cb24bd4800b95 100644
--- a/VECTO/GUI/Settings.Designer.vb
+++ b/VECTO/GUI/Settings.Designer.vb
@@ -85,7 +85,7 @@ Partial Class Settings
 		Me.GroupBox3.Controls.Add(Me.Label16)
 		Me.GroupBox3.Location = New System.Drawing.Point(5, 6)
 		Me.GroupBox3.Name = "GroupBox3"
-		Me.GroupBox3.Size = New System.Drawing.Size(268, 129)
+		Me.GroupBox3.Size = New System.Drawing.Size(287, 129)
 		Me.GroupBox3.TabIndex = 0
 		Me.GroupBox3.TabStop = False
 		Me.GroupBox3.Text = "Interface"
@@ -98,7 +98,7 @@ Partial Class Settings
 		Me.GroupBox5.Controls.Add(Me.Label12)
 		Me.GroupBox5.Location = New System.Drawing.Point(7, 45)
 		Me.GroupBox5.Name = "GroupBox5"
-		Me.GroupBox5.Size = New System.Drawing.Size(253, 76)
+		Me.GroupBox5.Size = New System.Drawing.Size(274, 76)
 		Me.GroupBox5.TabIndex = 1
 		Me.GroupBox5.TabStop = False
 		Me.GroupBox5.Text = "File Open Command"
@@ -107,7 +107,7 @@ Partial Class Settings
 		'
 		Me.TbOpenCmdName.Location = New System.Drawing.Point(66, 19)
 		Me.TbOpenCmdName.Name = "TbOpenCmdName"
-		Me.TbOpenCmdName.Size = New System.Drawing.Size(174, 20)
+		Me.TbOpenCmdName.Size = New System.Drawing.Size(202, 20)
 		Me.TbOpenCmdName.TabIndex = 0
 		'
 		'Label7
@@ -123,7 +123,7 @@ Partial Class Settings
 		'
 		Me.TbOpenCmd.Location = New System.Drawing.Point(66, 45)
 		Me.TbOpenCmd.Name = "TbOpenCmd"
-		Me.TbOpenCmd.Size = New System.Drawing.Size(174, 20)
+		Me.TbOpenCmd.Size = New System.Drawing.Size(202, 20)
 		Me.TbOpenCmd.TabIndex = 1
 		'
 		'Label12
@@ -188,7 +188,7 @@ Partial Class Settings
 		Me.GrCalc.Controls.Add(Me.Label2)
 		Me.GrCalc.Location = New System.Drawing.Point(6, 141)
 		Me.GrCalc.Name = "GrCalc"
-		Me.GrCalc.Size = New System.Drawing.Size(267, 107)
+		Me.GrCalc.Size = New System.Drawing.Size(286, 107)
 		Me.GrCalc.TabIndex = 1
 		Me.GrCalc.TabStop = False
 		Me.GrCalc.Text = "Calculation"
@@ -302,6 +302,7 @@ Partial Class Settings
 		Me.MaximizeBox = False
 		Me.MinimizeBox = False
 		Me.Name = "Settings"
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "Settings"
 		Me.GroupBox3.ResumeLayout(False)
 		Me.GroupBox3.PerformLayout()
diff --git a/VECTO/GUI/VectoJobForm.Designer.vb b/VECTO/GUI/VectoJobForm.Designer.vb
index 6c0c061bde50d33c1eba7552d77772bf3bed8dc2..1aca9323ebc1829b85de32709edb1292b8e0cce1 100644
--- a/VECTO/GUI/VectoJobForm.Designer.vb
+++ b/VECTO/GUI/VectoJobForm.Designer.vb
@@ -284,7 +284,7 @@ Partial Class VectoJobForm
 		'Label9
 		'
 		Me.Label9.AutoSize = True
-		Me.Label9.Location = New System.Drawing.Point(187, 74)
+		Me.Label9.Location = New System.Drawing.Point(191, 74)
 		Me.Label9.Name = "Label9"
 		Me.Label9.Size = New System.Drawing.Size(24, 13)
 		Me.Label9.TabIndex = 44
@@ -309,7 +309,7 @@ Partial Class VectoJobForm
 		'btnAAUXOpen
 		'
 		Me.btnAAUXOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
-		Me.btnAAUXOpen.Location = New System.Drawing.Point(465, 43)
+		Me.btnAAUXOpen.Location = New System.Drawing.Point(485, 43)
 		Me.btnAAUXOpen.Name = "btnAAUXOpen"
 		Me.btnAAUXOpen.Size = New System.Drawing.Size(24, 24)
 		Me.btnAAUXOpen.TabIndex = 41
@@ -327,7 +327,7 @@ Partial Class VectoJobForm
 		'btnBrowseAAUXFile
 		'
 		Me.btnBrowseAAUXFile.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-		Me.btnBrowseAAUXFile.Location = New System.Drawing.Point(441, 43)
+		Me.btnBrowseAAUXFile.Location = New System.Drawing.Point(461, 43)
 		Me.btnBrowseAAUXFile.Name = "btnBrowseAAUXFile"
 		Me.btnBrowseAAUXFile.Size = New System.Drawing.Size(24, 24)
 		Me.btnBrowseAAUXFile.TabIndex = 39
@@ -338,14 +338,14 @@ Partial Class VectoJobForm
 		'
 		Me.txtAdvancedAuxiliaryFile.Location = New System.Drawing.Point(109, 45)
 		Me.txtAdvancedAuxiliaryFile.Name = "txtAdvancedAuxiliaryFile"
-		Me.txtAdvancedAuxiliaryFile.Size = New System.Drawing.Size(331, 20)
+		Me.txtAdvancedAuxiliaryFile.Size = New System.Drawing.Size(351, 20)
 		Me.txtAdvancedAuxiliaryFile.TabIndex = 38
 		'
 		'picAuxInfo
 		'
 		Me.picAuxInfo.Image = Global.TUGraz.VECTO.My.Resources.Resources.Information_icon
 		Me.picAuxInfo.InitialImage = Global.TUGraz.VECTO.My.Resources.Resources.Information_icon
-		Me.picAuxInfo.Location = New System.Drawing.Point(443, 19)
+		Me.picAuxInfo.Location = New System.Drawing.Point(463, 19)
 		Me.picAuxInfo.Name = "picAuxInfo"
 		Me.picAuxInfo.Size = New System.Drawing.Size(16, 16)
 		Me.picAuxInfo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
@@ -357,7 +357,7 @@ Partial Class VectoJobForm
 		Me.cboAdvancedAuxiliaries.FormattingEnabled = True
 		Me.cboAdvancedAuxiliaries.Location = New System.Drawing.Point(109, 18)
 		Me.cboAdvancedAuxiliaries.Name = "cboAdvancedAuxiliaries"
-		Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(331, 21)
+		Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(351, 21)
 		Me.cboAdvancedAuxiliaries.TabIndex = 36
 		'
 		'lbAdvancedAuxiliaries
@@ -1294,10 +1294,11 @@ Partial Class VectoJobForm
 		Me.Controls.Add(Me.TabControl1)
 		Me.Controls.Add(Me.ButOK)
 		Me.Controls.Add(Me.StatusStrip1)
+		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
 		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
 		Me.MaximizeBox = False
 		Me.Name = "VectoJobForm"
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "Job Editor"
 		Me.TabPgGen.ResumeLayout(False)
 		Me.TabPgGen.PerformLayout()
diff --git a/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb b/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb
index 929f10003e84da14230e44dbc6671e2c39e2a0e1..4e43384ebc21cf37a4828bfdfc50017c98f3278d 100644
--- a/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb
+++ b/VECTO/GUI/VehicleAuxiliariesDialog.Designer.vb
@@ -280,7 +280,7 @@ Partial Class VehicleAuxiliariesDialog
 		Me.MinimizeBox = False
 		Me.Name = "VehicleAuxiliariesDialog"
 		Me.ShowInTaskbar = False
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "Auxiliary"
 		Me.TableLayoutPanel1.ResumeLayout(False)
 		Me.PnTech.ResumeLayout(False)
diff --git a/VECTO/GUI/VehicleAxleDialog.Designer.vb b/VECTO/GUI/VehicleAxleDialog.Designer.vb
index 3b413fa40fe1f93e26bfeff4ec422c48ac36cf33..1261f0b94580cbfdcca7ba379b49c530f0f8bb2c 100644
--- a/VECTO/GUI/VehicleAxleDialog.Designer.vb
+++ b/VECTO/GUI/VehicleAxleDialog.Designer.vb
@@ -276,7 +276,7 @@ Partial Class VehicleAxleDialog
 		Me.MinimizeBox = False
 		Me.Name = "VehicleAxleDialog"
 		Me.ShowInTaskbar = False
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "Axle configuration"
 		Me.TableLayoutPanel1.ResumeLayout(False)
 		Me.PnAxle.ResumeLayout(False)
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index f61e7d84b970e9a199ea6e17839a251678d9539d..ead357ed24c3c0a1b654e7f539890db4b14c1b28 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -786,9 +786,9 @@ Partial Class VehicleForm
 		'
 		Me.PictureBox1.BackColor = System.Drawing.Color.White
 		Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_VEH
-		Me.PictureBox1.Location = New System.Drawing.Point(12, 28)
+		Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
 		Me.PictureBox1.Name = "PictureBox1"
-		Me.PictureBox1.Size = New System.Drawing.Size(569, 40)
+		Me.PictureBox1.Size = New System.Drawing.Size(589, 40)
 		Me.PictureBox1.TabIndex = 37
 		Me.PictureBox1.TabStop = False
 		'
@@ -1018,6 +1018,7 @@ Partial Class VehicleForm
 		'PicVehicle
 		'
 		Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
+		Me.PicVehicle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
 		Me.PicVehicle.Location = New System.Drawing.Point(281, 70)
 		Me.PicVehicle.Name = "PicVehicle"
 		Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
@@ -1059,7 +1060,7 @@ Partial Class VehicleForm
 		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
 		Me.MaximizeBox = False
 		Me.Name = "VehicleForm"
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "F05_VEH"
 		Me.GroupBox6.ResumeLayout(False)
 		Me.GroupBox6.PerformLayout()
diff --git a/VECTO/GUI/WelcomeDialog.Designer.vb b/VECTO/GUI/WelcomeDialog.Designer.vb
index 44a365833eeb68d9807d249b4452239d937cbecc..eb950bbe9adc13aff641ad8b4d42c298996f9b82 100644
--- a/VECTO/GUI/WelcomeDialog.Designer.vb
+++ b/VECTO/GUI/WelcomeDialog.Designer.vb
@@ -46,7 +46,7 @@ Partial Class WelcomeDialog
 		'
 		Me.Cancel_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
-		Me.Cancel_Button.Location = New System.Drawing.Point(239, 152)
+		Me.Cancel_Button.Location = New System.Drawing.Point(239, 133)
 		Me.Cancel_Button.Name = "Cancel_Button"
 		Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
 		Me.Cancel_Button.TabIndex = 1
@@ -56,7 +56,7 @@ Partial Class WelcomeDialog
 		'
 		Me.Label1.AutoSize = True
 		Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-		Me.Label1.Location = New System.Drawing.Point(12, 18)
+		Me.Label1.Location = New System.Drawing.Point(123, 19)
 		Me.Label1.Name = "Label1"
 		Me.Label1.Size = New System.Drawing.Size(77, 16)
 		Me.Label1.TabIndex = 1
@@ -83,7 +83,7 @@ Partial Class WelcomeDialog
 		'WelcomeDialog
 		'
 		Me.CancelButton = Me.Cancel_Button
-		Me.ClientSize = New System.Drawing.Size(318, 187)
+		Me.ClientSize = New System.Drawing.Size(318, 168)
 		Me.Controls.Add(Me.Button2)
 		Me.Controls.Add(Me.Cancel_Button)
 		Me.Controls.Add(Me.Button1)
@@ -92,7 +92,7 @@ Partial Class WelcomeDialog
 		Me.MinimizeBox = False
 		Me.Name = "WelcomeDialog"
 		Me.ShowInTaskbar = False
-		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "Welcome"
 		Me.ResumeLayout(False)
 		Me.PerformLayout()