diff --git a/Directory.Build.props b/Directory.Build.props
index 92c36748b8987c817046d58c052de73f1ee9c6d3..b9e9577cd23a3b9c1b1deb133a629690cec45fed 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -8,7 +8,7 @@
     <!--<DefineConstants>CERTIFICATION_RELEASE</DefineConstants>-->
 
     <!-- Global VECTO Version -->
-    <MainProductVersion>0.7.7</MainProductVersion>
+    <MainProductVersion>0.7.8</MainProductVersion>
     <VersionSuffix>DEV</VersionSuffix>
 
     <!-- The following settings are used as default values for ALL projects -->
@@ -41,4 +41,13 @@
     <DebugSymbols>true</DebugSymbols>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='Deploy'">
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <RemoveIntegerChecks>true</RemoveIntegerChecks>
+    <WarningLevel>1</WarningLevel>
+    <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 2db189c5ccd6c253dda6e9cae41a4a9a33ac881e..adb0bbe5ce19a05275019ed062324e91848e840d 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -10,7 +10,7 @@
 
 	<Target Name="AfterBuild" Condition="'$(Configuration)'=='Deploy'">
 
-		<Exec Command="cscript &quot;$(solutiondir)documentation\user manual source\convertpptxtopdf.vbs&quot; &quot;$(solutiondir)documentation\user manual source\release notes vecto3.x.pptx&quot; &quot;$(solutiondir)documentation\user manual source\release notes vecto3.x.pdf&quot;"/>
+		<Exec Command="cscript &quot;$(SolutionDir)documentation\user manual source\convertpptxtopdf.vbs&quot; &quot;$(SolutionDir)documentation\user manual source\release notes vecto3.x.pptx&quot; &quot;$(SolutionDir)documentation\user manual source\release notes vecto3.x.pdf&quot;"/>
 		<PropertyGroup>
 			<CurrentDate>$([System.DateTime]::Now.ToString(yyy_MM_dd))</CurrentDate>
 			<DeployPath>$(SolutionDir)Deploy\$(CurrentDate)-VECTO-$(Version)\</DeployPath>
@@ -50,24 +50,28 @@
 		<Copy SourceFiles="@(Net48VECTO)" DestinationFolder="$(DeployPath)net48"/>
 
 		<ItemGroup>
-			<!-- All files for net5.0 -->
-			<Vecto Include="$(SolutionDir)VECTO\bin\Release\net5.0-windows\VECTO.*" Exclude="*.dev.json"/>
-			<Vecto Include="$(SolutionDir)VECTO\bin\Release\net5.0-windows\*.dll"/>
-			<Vecto Include="$(SolutionDir)VECTO\bin\Release\net5.0-windows\runtimes\**\*.*"/>
-			<VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net5.0\vectocmd.*" Exclude="*.dev.json"/>
-			<VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net5.0\*.dll"/>
-			<VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net5.0\runtimes\**\*.*"/>
-			<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net5.0\hashingcmd.*" Exclude="*.dev.json"/>
-			<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net5.0\*.dll"/>
-			<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net5.0\runtimes\**\*.*"/>
-			<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net5.0-windows\VECTOMultistage.*" Exclude="*.dev.json"/>
-			<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net5.0-windows\*.dll"/>
-			<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net5.0-windows\runtimes\**\*.*"/>
+			<!-- All files for net6.0 -->
+			<Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\VECTO.*" Exclude="*.dev.json"/>
+			<Vecto Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\*.dll"/>
+			<VectoRuntimes Include="$(SolutionDir)VECTO\bin\Release\net6.0-windows\runtimes\**\*.*"/>
+			<VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net6.0\vectocmd.*" Exclude="*.dev.json"/>
+			<VectoCommandLine Include="$(SolutionDir)VectoConsole\bin\Release\net6.0\*.dll"/>
+			<VectoCommandLineRuntimes Include="$(SolutionDir)VectoConsole\bin\Release\net6.0\runtimes\**\*.*"/>
+			<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\hashingcmd.*" Exclude="*.dev.json"/>
+			<HashingTool Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\*.dll"/>
+			<HashingToolRuntimes Include="$(SolutionDir)HashingCmd\bin\Release\net6.0\runtimes\**\*.*"/>
+			<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net6.0-windows\VECTOMultistage.*" Exclude="*.dev.json"/>
+			<VectoMultistage Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net6.0-windows\*.dll"/>
+			<VectoMultistageRuntimes Include="$(SolutionDir)VECTO3GUI2020\bin\Release\net6.0-windows\runtimes\**\*.*"/>
 		</ItemGroup>
-		<Copy SourceFiles="@(HashingTool)" DestinationFolder="$(DeployPath)net50"/>
-		<Copy SourceFiles="@(VectoMultistage)" DestinationFolder="$(DeployPath)net50"/>
-		<Copy SourceFiles="@(VectoCommandLine)" DestinationFolder="$(DeployPath)net50"/>
-		<Copy SourceFiles="@(Vecto)" DestinationFolder="$(DeployPath)net50"/>
+		<Copy SourceFiles="@(HashingTool)" DestinationFolder="$(DeployPath)net60"/>
+		<Copy SourceFiles="@(VectoMultistage)" DestinationFolder="$(DeployPath)net60"/>
+		<Copy SourceFiles="@(VectoCommandLine)" DestinationFolder="$(DeployPath)net60"/>
+		<Copy SourceFiles="@(Vecto)" DestinationFolder="$(DeployPath)net60"/>
+		<Copy SourceFiles="@(HashingToolRuntimes)" DestinationFiles="@(HashingToolRuntimes->'$(DeployPath)net60\runtimes\%(RecursiveDir)%(Filename)%(Extension)')"/>
+		<Copy SourceFiles="@(VectoMultistageRuntimes)" DestinationFiles="@(VectoMultistageRuntimes->'$(DeployPath)net60\runtimes\%(RecursiveDir)%(Filename)%(Extension)')"/>
+		<Copy SourceFiles="@(VectoCommandLineRuntimes)" DestinationFiles="@(VectoCommandLineRuntimes->'$(DeployPath)net60\runtimes\%(RecursiveDir)%(Filename)%(Extension)')"/>
+		<Copy SourceFiles="@(VectoRuntimes)" DestinationFiles="@(VectoRuntimes->'$(DeployPath)net60\runtimes\%(RecursiveDir)%(Filename)%(Extension)')"/>
 
 		<ItemGroup>
 			<!-- All files for the VECTO starters -->
@@ -114,8 +118,4 @@
 		<Copy SourceFiles="$(SolutionDir)\Documentation\User Manual Source\README for Declaration Directory.txt" DestinationFiles="$(DeployPath)Declaration\!! README !!.TXT"/>
 		<ZipDirectory SourceDirectory="$(SolutionDir)Deploy\" DestinationFile="$(SolutionDir)$(CurrentDate)-VECTO-$(Version).zip" Overwrite="true"/>
 	</Target>
-
-	<Target Name="CleanVectoDeploy" AfterTargets="Clean">
-		<RemoveDir Directories="$(SolutionDir)Deploy" Condition="Exists('$(SolutionDir)Deploy')"/>
-	</Target>
 </Project>
\ No newline at end of file
diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf
index cb3c180c9433ea9e792c541f850981d4276789a9..f4fd08c9171912a98a390276108b8255e24260bb 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pdf and b/Documentation/User Manual Source/Release Notes Vecto3.x.pdf differ
diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx
index c07daf89ee5e522ae932a1cae1cd64b7588cca04..d0a0e0aea336c18e477643c8ee6bfd639fae05a4 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx and b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx differ
diff --git a/HashingCmd/HashingCmd.csproj b/HashingCmd/HashingCmd.csproj
index c9d59a06e4cfe45615e3a218db9bb9a58b1b90fd..4868200609d2647ab12ce9343eb55ce07c4e78c2 100644
--- a/HashingCmd/HashingCmd.csproj
+++ b/HashingCmd/HashingCmd.csproj
@@ -6,7 +6,7 @@
 
     <RootNamespace>HashingCmd</RootNamespace>
     <AssemblyName>hashingcmd</AssemblyName>
-    <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
+    <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
     <DefineConstants />
     <OutputType>Exe</OutputType>
   </PropertyGroup>
diff --git a/HashingTool/App.config b/HashingTool/App.config
index 2d7c95c83af9b756449112dd9939e1c8242c3336..85cc8776a95bbdefd69ffefd4e2fed9d299e1166 100644
--- a/HashingTool/App.config
+++ b/HashingTool/App.config
@@ -3,12 +3,4 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj b/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
index fcef676f339aef78819dcf2a0f0a61305c78a88c..7426ce847c7e001cb3da56e82a9a73293b69b435 100644
--- a/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
+++ b/Tools/DeclarationCycleZip/DeclarationCycleZip.csproj
@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>DeclarationCycleZip</RootNamespace>
     <AssemblyName>DeclarationCycleZip</AssemblyName>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
 
diff --git a/Tools/GraphDrawer/GraphDrawer.csproj b/Tools/GraphDrawer/GraphDrawer.csproj
index e26fef0a461607748f47be4df98184b65178c292..fedd980a65886e9f4df4de0c3dce29bc8467ec3d 100644
--- a/Tools/GraphDrawer/GraphDrawer.csproj
+++ b/Tools/GraphDrawer/GraphDrawer.csproj
@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>GraphDrawer</RootNamespace>
     <AssemblyName>GraphDrawer</AssemblyName>
-    <TargetFrameworks>net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
 
diff --git a/Tools/HashingCmdStart/Program.cs b/Tools/HashingCmdStart/Program.cs
index f2b7ce9a75fcc600e171ea34fdd016e4923ea334..4ee38c806d52ec7f2ee2e774945c926e400537ee 100644
--- a/Tools/HashingCmdStart/Program.cs
+++ b/Tools/HashingCmdStart/Program.cs
@@ -18,8 +18,8 @@ namespace TUGraz.VECTO
 
 		private static string GetHighestNETVersion()
 		{
-			if (SupportsNet50()) {
-				return "net50";
+			if (SupportsNet60()) {
+				return "net60";
 			}
 
 			if (SupportsNet48()) {
@@ -29,7 +29,7 @@ namespace TUGraz.VECTO
 			return "net45";
 		}
 
-		private static bool SupportsNet50()
+		private static bool SupportsNet60()
 		{
 			try {
 				var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
@@ -41,7 +41,7 @@ namespace TUGraz.VECTO
 
 				p.WaitForExit();
 				var output = p.StandardOutput.ReadToEnd();
-				return output.Contains("Microsoft.WindowsDesktop.App 5.0");
+				return output.Contains("Microsoft.WindowsDesktop.App 6");
 			} catch (Exception e) {
 				Console.WriteLine(e);
 			}
diff --git a/Tools/HashingToolStart/Program.cs b/Tools/HashingToolStart/Program.cs
index bfcdf003cf209889f0ad5bc0f8dde78cba475be0..c02231108231f8e676d4c49d64708861628ef3af 100644
--- a/Tools/HashingToolStart/Program.cs
+++ b/Tools/HashingToolStart/Program.cs
@@ -19,8 +19,8 @@ namespace TUGraz.VECTO
 		private static string GetHighestNETVersion()
 		{
 			//todo mk2022-02-17 hashing tool currently only works under net45. this has to be fixed.
-			//if (SupportsNet50()) {
-			//	return "net50";
+			//if (SupportsNet60()) {
+			//	return "net60";
 			//}
 
 			//if (SupportsNet48()) {
@@ -30,7 +30,7 @@ namespace TUGraz.VECTO
 			return "net45";
 		}
 
-		private static bool SupportsNet50()
+		private static bool SupportsNet60()
 		{
 			try {
 				var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
@@ -42,7 +42,7 @@ namespace TUGraz.VECTO
 
 				p.WaitForExit();
 				var output = p.StandardOutput.ReadToEnd();
-				return output.Contains("Microsoft.WindowsDesktop.App 5.0");
+				return output.Contains("Microsoft.WindowsDesktop.App 6");
 			} catch (Exception e) {
 				Console.WriteLine(e);
 			}
diff --git a/Tools/LicenceHeader/LicenceHeader.csproj b/Tools/LicenceHeader/LicenceHeader.csproj
index daf6950908b73103d7f79dd9511f5a551e3313ab..832dd4037d1ee0285597297ff630353f748a7c8f 100644
--- a/Tools/LicenceHeader/LicenceHeader.csproj
+++ b/Tools/LicenceHeader/LicenceHeader.csproj
@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>LicenceHeader</RootNamespace>
     <AssemblyName>LicenceHeader</AssemblyName>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
   <ItemGroup>
diff --git a/Tools/VECTOConsoleStart/Program.cs b/Tools/VECTOConsoleStart/Program.cs
index f2b7ce9a75fcc600e171ea34fdd016e4923ea334..4ee38c806d52ec7f2ee2e774945c926e400537ee 100644
--- a/Tools/VECTOConsoleStart/Program.cs
+++ b/Tools/VECTOConsoleStart/Program.cs
@@ -18,8 +18,8 @@ namespace TUGraz.VECTO
 
 		private static string GetHighestNETVersion()
 		{
-			if (SupportsNet50()) {
-				return "net50";
+			if (SupportsNet60()) {
+				return "net60";
 			}
 
 			if (SupportsNet48()) {
@@ -29,7 +29,7 @@ namespace TUGraz.VECTO
 			return "net45";
 		}
 
-		private static bool SupportsNet50()
+		private static bool SupportsNet60()
 		{
 			try {
 				var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
@@ -41,7 +41,7 @@ namespace TUGraz.VECTO
 
 				p.WaitForExit();
 				var output = p.StandardOutput.ReadToEnd();
-				return output.Contains("Microsoft.WindowsDesktop.App 5.0");
+				return output.Contains("Microsoft.WindowsDesktop.App 6");
 			} catch (Exception e) {
 				Console.WriteLine(e);
 			}
diff --git a/Tools/VECTOMultistageStart/Program.cs b/Tools/VECTOMultistageStart/Program.cs
index d200b44ac9db780dc3c801eefe0fa0768a147a1a..2dce9c985988ae71a5b9ae7bff4d3f32ca46718a 100644
--- a/Tools/VECTOMultistageStart/Program.cs
+++ b/Tools/VECTOMultistageStart/Program.cs
@@ -17,14 +17,14 @@ namespace TUGraz.VECTO
 
 		private static string GetHighestNETVersion()
 		{
-			if (SupportsNet50()) {
-				return "net50";
+			if (SupportsNet60()) {
+				return "net60";
 			}
 
 			return "net48";
 		}
 
-		private static bool SupportsNet50()
+		private static bool SupportsNet60()
 		{
 			try {
 				var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
@@ -36,7 +36,7 @@ namespace TUGraz.VECTO
 
 				p.WaitForExit();
 				var output = p.StandardOutput.ReadToEnd();
-				return output.Contains("Microsoft.WindowsDesktop.App 5.0");
+				return output.Contains("Microsoft.WindowsDesktop.App 6");
 			} catch (Exception e) {
 				Console.WriteLine(e);
 			}
diff --git a/Tools/VECTOStart/Program.cs b/Tools/VECTOStart/Program.cs
index 0cd67d633c0af56ac581968532f8afb20a43c079..e5896e5d2f72524d42735eed5cff5d2af1143e1e 100644
--- a/Tools/VECTOStart/Program.cs
+++ b/Tools/VECTOStart/Program.cs
@@ -18,8 +18,8 @@ namespace TUGraz.VECTO
 
 		private static string GetHighestNETVersion()
 		{
-			if (SupportsNet50()) {
-				return "net50";
+			if (SupportsNet60()) {
+				return "net60";
 			}
 
 			if (SupportsNet48()) {
@@ -29,7 +29,7 @@ namespace TUGraz.VECTO
 			return "net45";
 		}
 
-		private static bool SupportsNet50()
+		private static bool SupportsNet60()
 		{
 			try {
 				var p = Process.Start(new ProcessStartInfo("dotnet", "--list-runtimes") {
@@ -41,7 +41,7 @@ namespace TUGraz.VECTO
 
 				p.WaitForExit();
 				var output = p.StandardOutput.ReadToEnd();
-				return output.Contains("Microsoft.WindowsDesktop.App 5.0");
+				return output.Contains("Microsoft.WindowsDesktop.App 6");
 			} catch (Exception e) {
 				Console.WriteLine(e);
 			}
diff --git a/VECTO.sln b/VECTO.sln
index 1d76fea814b93e823b575d10b4901861112dbbba..38119df7b8760691ca111fdeedee85ef88184aff 100644
--- a/VECTO.sln
+++ b/VECTO.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31112.23
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "VECTO", "VECTO\VECTO.vbproj", "{AAC0F132-0A9F-45B3-B682-77AC9B24B352}"
 	ProjectSection(ProjectDependencies) = postProject
diff --git a/VECTO/GUI/HybridStrategyParamsForm.Designer.vb b/VECTO/GUI/HybridStrategyParamsForm.Designer.vb
index 62c92631f139d84b3d7ab9fd53a9c08169fe5412..ea9dc113ef42c878a819371dff5b5785c8e41bee 100644
--- a/VECTO/GUI/HybridStrategyParamsForm.Designer.vb
+++ b/VECTO/GUI/HybridStrategyParamsForm.Designer.vb
@@ -35,745 +35,760 @@ Partial Class HybridStrategyParamsForm
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(HybridStrategyParamsForm))
-        Me.tbEquivalenceFactorDischarge = New System.Windows.Forms.TextBox()
-        Me.lblEquivFactorUnit = New System.Windows.Forms.Label()
-        Me.lblEvquivFactorDischg = New System.Windows.Forms.Label()
-        Me.ButCancel = New System.Windows.Forms.Button()
-        Me.ButOK = New System.Windows.Forms.Button()
-        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-        Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
-        Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
-        Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.pnEquivFactor = New System.Windows.Forms.Panel()
-        Me.lblTitle = New System.Windows.Forms.Label()
-        Me.pnMinSoC = New System.Windows.Forms.Panel()
-        Me.lblMinSoC = New System.Windows.Forms.Label()
-        Me.lblMinSoCUnit = New System.Windows.Forms.Label()
-        Me.tbMinSoC = New System.Windows.Forms.TextBox()
-        Me.pnMaxSoC = New System.Windows.Forms.Panel()
-        Me.lblMaxSoC = New System.Windows.Forms.Label()
-        Me.lblMaxSoCUnit = New System.Windows.Forms.Label()
-        Me.tbMaxSoC = New System.Windows.Forms.TextBox()
-        Me.pnTargetSoC = New System.Windows.Forms.Panel()
-        Me.lblTargetSoC = New System.Windows.Forms.Label()
-        Me.lblTargetSoCUnit = New System.Windows.Forms.Label()
-        Me.tbTargetSoC = New System.Windows.Forms.TextBox()
-        Me.pnAuxBufferTime = New System.Windows.Forms.Panel()
-        Me.lblAuxBufferTime = New System.Windows.Forms.Label()
-        Me.lblAuxBufferTimeUnit = New System.Windows.Forms.Label()
-        Me.tbauxBufferTime = New System.Windows.Forms.TextBox()
-        Me.pnAuxBufferChgTime = New System.Windows.Forms.Panel()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.lblAuxBufferChgTimeUnit = New System.Windows.Forms.Label()
-        Me.tbAuxBufferChargeTime = New System.Windows.Forms.TextBox()
-        Me.Panel1 = New System.Windows.Forms.Panel()
-        Me.lblMinIceOnTime = New System.Windows.Forms.Label()
-        Me.lblMinIceOnTimeUnit = New System.Windows.Forms.Label()
-        Me.tbMinICEOnTime = New System.Windows.Forms.TextBox()
-        Me.Panel2 = New System.Windows.Forms.Panel()
-        Me.EquivalenceFactorChg = New System.Windows.Forms.Label()
-        Me.lblEquivFactorChargeUnit = New System.Windows.Forms.Label()
-        Me.tbEquivalenceFactorCharge = New System.Windows.Forms.TextBox()
-        Me.pnICEStartPenaltyFactor = New System.Windows.Forms.Panel()
-        Me.lblICEStartPenaltyFactor = New System.Windows.Forms.Label()
-        Me.lblICEStartPenaltyFactorUnit = New System.Windows.Forms.Label()
-        Me.tbICEStartPenaltyFactor = New System.Windows.Forms.TextBox()
-        Me.pnCostFactorSoCExponent = New System.Windows.Forms.Panel()
-        Me.lblCostFactorSoCExponent = New System.Windows.Forms.Label()
-        Me.lblCostFactorSoCExponentUnit = New System.Windows.Forms.Label()
-        Me.tbCostFactorSoCExponent = New System.Windows.Forms.TextBox()
-        Me.Panel3 = New System.Windows.Forms.Panel()
-        Me.lblGensetMinPwrFactor = New System.Windows.Forms.Label()
-        Me.lblGensetMinPowerFactorUnit = New System.Windows.Forms.Label()
-        Me.tbGensetMinOptPowerFactor = New System.Windows.Forms.TextBox()
-        Me.ToolStrip1.SuspendLayout
-        Me.StatusStrip1.SuspendLayout
-        CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.CmOpenFile.SuspendLayout
-        Me.pnEquivFactor.SuspendLayout
-        Me.pnMinSoC.SuspendLayout
-        Me.pnMaxSoC.SuspendLayout
-        Me.pnTargetSoC.SuspendLayout
-        Me.pnAuxBufferTime.SuspendLayout
-        Me.pnAuxBufferChgTime.SuspendLayout
-        Me.Panel1.SuspendLayout
-        Me.Panel2.SuspendLayout
-        Me.pnICEStartPenaltyFactor.SuspendLayout
-        Me.pnCostFactorSoCExponent.SuspendLayout
-        Me.Panel3.SuspendLayout
-        Me.SuspendLayout
-        '
-        'tbEquivalenceFactorDischarge
-        '
-        Me.tbEquivalenceFactorDischarge.Location = New System.Drawing.Point(272, 6)
-        Me.tbEquivalenceFactorDischarge.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbEquivalenceFactorDischarge.Name = "tbEquivalenceFactorDischarge"
-        Me.tbEquivalenceFactorDischarge.Size = New System.Drawing.Size(84, 26)
-        Me.tbEquivalenceFactorDischarge.TabIndex = 3
-        '
-        'lblEquivFactorUnit
-        '
-        Me.lblEquivFactorUnit.AutoSize = true
-        Me.lblEquivFactorUnit.Location = New System.Drawing.Point(366, 11)
-        Me.lblEquivFactorUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblEquivFactorUnit.Name = "lblEquivFactorUnit"
-        Me.lblEquivFactorUnit.Size = New System.Drawing.Size(22, 20)
-        Me.lblEquivFactorUnit.TabIndex = 24
-        Me.lblEquivFactorUnit.Text = "[-]"
-        '
-        'lblEvquivFactorDischg
-        '
-        Me.lblEvquivFactorDischg.AutoSize = true
-        Me.lblEvquivFactorDischg.Location = New System.Drawing.Point(4, 11)
-        Me.lblEvquivFactorDischg.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblEvquivFactorDischg.Name = "lblEvquivFactorDischg"
-        Me.lblEvquivFactorDischg.Size = New System.Drawing.Size(221, 20)
-        Me.lblEvquivFactorDischg.TabIndex = 0
-        Me.lblEvquivFactorDischg.Text = "Equivalence Factor Discharge"
-        '
-        'ButCancel
-        '
-        Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.ButCancel.Location = New System.Drawing.Point(543, 660)
-        Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.ButCancel.Name = "ButCancel"
-        Me.ButCancel.Size = New System.Drawing.Size(112, 35)
-        Me.ButCancel.TabIndex = 11
-        Me.ButCancel.Text = "Cancel"
-        Me.ButCancel.UseVisualStyleBackColor = true
-        '
-        'ButOK
-        '
-        Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.ButOK.Location = New System.Drawing.Point(422, 660)
-        Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.ButOK.Name = "ButOK"
-        Me.ButOK.Size = New System.Drawing.Size(112, 35)
-        Me.ButOK.TabIndex = 10
-        Me.ButOK.Text = "Save"
-        Me.ButOK.UseVisualStyleBackColor = true
-        '
-        'ToolStrip1
-        '
-        Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
-        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
-        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
-        Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0)
-        Me.ToolStrip1.Size = New System.Drawing.Size(674, 33)
-        Me.ToolStrip1.TabIndex = 30
-        Me.ToolStrip1.Text = "ToolStrip1"
-        '
-        'ToolStripBtNew
-        '
-        Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
-        Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtNew.Name = "ToolStripBtNew"
-        Me.ToolStripBtNew.Size = New System.Drawing.Size(34, 28)
-        Me.ToolStripBtNew.Text = "ToolStripButton1"
-        Me.ToolStripBtNew.ToolTipText = "New"
-        '
-        'ToolStripBtOpen
-        '
-        Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
-        Me.ToolStripBtOpen.Size = New System.Drawing.Size(34, 28)
-        Me.ToolStripBtOpen.Text = "ToolStripButton1"
-        Me.ToolStripBtOpen.ToolTipText = "Open..."
-        '
-        'ToolStripBtSave
-        '
-        Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
-        Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSave.Name = "ToolStripBtSave"
-        Me.ToolStripBtSave.Size = New System.Drawing.Size(34, 28)
-        Me.ToolStripBtSave.Text = "ToolStripButton1"
-        Me.ToolStripBtSave.ToolTipText = "Save"
-        '
-        'ToolStripBtSaveAs
-        '
-        Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
-        Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
-        Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(34, 28)
-        Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
-        Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
-        '
-        'ToolStripSeparator3
-        '
-        Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 33)
-        '
-        'ToolStripBtSendTo
-        '
-        Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
-        Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
-        Me.ToolStripBtSendTo.Size = New System.Drawing.Size(34, 28)
-        Me.ToolStripBtSendTo.Text = "Send to Job Editor"
-        Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor"
-        '
-        'ToolStripSeparator1
-        '
-        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 33)
-        '
-        'ToolStripButton1
-        '
-        Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
-        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(34, 28)
-        Me.ToolStripButton1.Text = "Help"
-        '
-        'StatusStrip1
-        '
-        Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 702)
-        Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
-        Me.StatusStrip1.Size = New System.Drawing.Size(674, 32)
-        Me.StatusStrip1.SizingGrip = false
-        Me.StatusStrip1.TabIndex = 37
-        Me.StatusStrip1.Text = "StatusStrip1"
-        '
-        'LbStatus
-        '
-        Me.LbStatus.Name = "LbStatus"
-        Me.LbStatus.Size = New System.Drawing.Size(60, 25)
-        Me.LbStatus.Text = "Status"
-        '
-        'PictureBox1
-        '
-        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(0, 43)
-        Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(753, 62)
-        Me.PictureBox1.TabIndex = 39
-        Me.PictureBox1.TabStop = false
-        '
-        'CmOpenFile
-        '
-        Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
-        Me.CmOpenFile.Name = "CmOpenFile"
-        Me.CmOpenFile.Size = New System.Drawing.Size(203, 68)
-        '
-        'OpenWithToolStripMenuItem
-        '
-        Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
-        Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
-        Me.OpenWithToolStripMenuItem.Text = "Open with ..."
-        '
-        'ShowInFolderToolStripMenuItem
-        '
-        Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
-        Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(202, 32)
-        Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
-        '
-        'pnEquivFactor
-        '
-        Me.pnEquivFactor.Controls.Add(Me.lblEvquivFactorDischg)
-        Me.pnEquivFactor.Controls.Add(Me.lblEquivFactorUnit)
-        Me.pnEquivFactor.Controls.Add(Me.tbEquivalenceFactorDischarge)
-        Me.pnEquivFactor.Location = New System.Drawing.Point(18, 114)
-        Me.pnEquivFactor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.pnEquivFactor.Name = "pnEquivFactor"
-        Me.pnEquivFactor.Size = New System.Drawing.Size(432, 43)
-        Me.pnEquivFactor.TabIndex = 0
-        '
-        'lblTitle
-        '
-        Me.lblTitle.AutoSize = true
-        Me.lblTitle.BackColor = System.Drawing.Color.White
-        Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.lblTitle.Location = New System.Drawing.Point(178, 54)
-        Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblTitle.Name = "lblTitle"
-        Me.lblTitle.Size = New System.Drawing.Size(461, 40)
-        Me.lblTitle.TabIndex = 48
-        Me.lblTitle.Text = "Hybrid Strategy Parameters"
-        '
-        'pnMinSoC
-        '
-        Me.pnMinSoC.Controls.Add(Me.lblMinSoC)
-        Me.pnMinSoC.Controls.Add(Me.lblMinSoCUnit)
-        Me.pnMinSoC.Controls.Add(Me.tbMinSoC)
-        Me.pnMinSoC.Location = New System.Drawing.Point(18, 206)
-        Me.pnMinSoC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.pnMinSoC.Name = "pnMinSoC"
-        Me.pnMinSoC.Size = New System.Drawing.Size(432, 43)
-        Me.pnMinSoC.TabIndex = 2
-        '
-        'lblMinSoC
-        '
-        Me.lblMinSoC.AutoSize = true
-        Me.lblMinSoC.Location = New System.Drawing.Point(4, 11)
-        Me.lblMinSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblMinSoC.Name = "lblMinSoC"
-        Me.lblMinSoC.Size = New System.Drawing.Size(69, 20)
-        Me.lblMinSoC.TabIndex = 0
-        Me.lblMinSoC.Text = "Min SoC"
-        '
-        'lblMinSoCUnit
-        '
-        Me.lblMinSoCUnit.AutoSize = true
-        Me.lblMinSoCUnit.Location = New System.Drawing.Point(366, 11)
-        Me.lblMinSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblMinSoCUnit.Name = "lblMinSoCUnit"
-        Me.lblMinSoCUnit.Size = New System.Drawing.Size(31, 20)
-        Me.lblMinSoCUnit.TabIndex = 24
-        Me.lblMinSoCUnit.Text = "[%]"
-        '
-        'tbMinSoC
-        '
-        Me.tbMinSoC.Location = New System.Drawing.Point(272, 6)
-        Me.tbMinSoC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbMinSoC.Name = "tbMinSoC"
-        Me.tbMinSoC.Size = New System.Drawing.Size(84, 26)
-        Me.tbMinSoC.TabIndex = 3
-        '
-        'pnMaxSoC
-        '
-        Me.pnMaxSoC.Controls.Add(Me.lblMaxSoC)
-        Me.pnMaxSoC.Controls.Add(Me.lblMaxSoCUnit)
-        Me.pnMaxSoC.Controls.Add(Me.tbMaxSoC)
-        Me.pnMaxSoC.Location = New System.Drawing.Point(18, 252)
-        Me.pnMaxSoC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.pnMaxSoC.Name = "pnMaxSoC"
-        Me.pnMaxSoC.Size = New System.Drawing.Size(432, 43)
-        Me.pnMaxSoC.TabIndex = 3
-        '
-        'lblMaxSoC
-        '
-        Me.lblMaxSoC.AutoSize = true
-        Me.lblMaxSoC.Location = New System.Drawing.Point(4, 11)
-        Me.lblMaxSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblMaxSoC.Name = "lblMaxSoC"
-        Me.lblMaxSoC.Size = New System.Drawing.Size(73, 20)
-        Me.lblMaxSoC.TabIndex = 0
-        Me.lblMaxSoC.Text = "Max SoC"
-        '
-        'lblMaxSoCUnit
-        '
-        Me.lblMaxSoCUnit.AutoSize = true
-        Me.lblMaxSoCUnit.Location = New System.Drawing.Point(366, 11)
-        Me.lblMaxSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblMaxSoCUnit.Name = "lblMaxSoCUnit"
-        Me.lblMaxSoCUnit.Size = New System.Drawing.Size(31, 20)
-        Me.lblMaxSoCUnit.TabIndex = 24
-        Me.lblMaxSoCUnit.Text = "[%]"
-        '
-        'tbMaxSoC
-        '
-        Me.tbMaxSoC.Location = New System.Drawing.Point(272, 6)
-        Me.tbMaxSoC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbMaxSoC.Name = "tbMaxSoC"
-        Me.tbMaxSoC.Size = New System.Drawing.Size(84, 26)
-        Me.tbMaxSoC.TabIndex = 3
-        '
-        'pnTargetSoC
-        '
-        Me.pnTargetSoC.Controls.Add(Me.lblTargetSoC)
-        Me.pnTargetSoC.Controls.Add(Me.lblTargetSoCUnit)
-        Me.pnTargetSoC.Controls.Add(Me.tbTargetSoC)
-        Me.pnTargetSoC.Location = New System.Drawing.Point(18, 298)
-        Me.pnTargetSoC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.pnTargetSoC.Name = "pnTargetSoC"
-        Me.pnTargetSoC.Size = New System.Drawing.Size(432, 43)
-        Me.pnTargetSoC.TabIndex = 4
-        '
-        'lblTargetSoC
-        '
-        Me.lblTargetSoC.AutoSize = true
-        Me.lblTargetSoC.Location = New System.Drawing.Point(4, 11)
-        Me.lblTargetSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblTargetSoC.Name = "lblTargetSoC"
-        Me.lblTargetSoC.Size = New System.Drawing.Size(90, 20)
-        Me.lblTargetSoC.TabIndex = 0
-        Me.lblTargetSoC.Text = "Target SoC"
-        '
-        'lblTargetSoCUnit
-        '
-        Me.lblTargetSoCUnit.AutoSize = true
-        Me.lblTargetSoCUnit.Location = New System.Drawing.Point(366, 11)
-        Me.lblTargetSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblTargetSoCUnit.Name = "lblTargetSoCUnit"
-        Me.lblTargetSoCUnit.Size = New System.Drawing.Size(31, 20)
-        Me.lblTargetSoCUnit.TabIndex = 24
-        Me.lblTargetSoCUnit.Text = "[%]"
-        '
-        'tbTargetSoC
-        '
-        Me.tbTargetSoC.Location = New System.Drawing.Point(272, 6)
-        Me.tbTargetSoC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbTargetSoC.Name = "tbTargetSoC"
-        Me.tbTargetSoC.Size = New System.Drawing.Size(84, 26)
-        Me.tbTargetSoC.TabIndex = 3
-        '
-        'pnAuxBufferTime
-        '
-        Me.pnAuxBufferTime.Controls.Add(Me.lblAuxBufferTime)
-        Me.pnAuxBufferTime.Controls.Add(Me.lblAuxBufferTimeUnit)
-        Me.pnAuxBufferTime.Controls.Add(Me.tbauxBufferTime)
-        Me.pnAuxBufferTime.Location = New System.Drawing.Point(18, 391)
-        Me.pnAuxBufferTime.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.pnAuxBufferTime.Name = "pnAuxBufferTime"
-        Me.pnAuxBufferTime.Size = New System.Drawing.Size(432, 43)
-        Me.pnAuxBufferTime.TabIndex = 6
-        '
-        'lblAuxBufferTime
-        '
-        Me.lblAuxBufferTime.AutoSize = true
-        Me.lblAuxBufferTime.Location = New System.Drawing.Point(4, 11)
-        Me.lblAuxBufferTime.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblAuxBufferTime.Name = "lblAuxBufferTime"
-        Me.lblAuxBufferTime.Size = New System.Drawing.Size(122, 20)
-        Me.lblAuxBufferTime.TabIndex = 0
-        Me.lblAuxBufferTime.Text = "Aux Buffer Time"
-        '
-        'lblAuxBufferTimeUnit
-        '
-        Me.lblAuxBufferTimeUnit.AutoSize = true
-        Me.lblAuxBufferTimeUnit.Location = New System.Drawing.Point(366, 11)
-        Me.lblAuxBufferTimeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblAuxBufferTimeUnit.Name = "lblAuxBufferTimeUnit"
-        Me.lblAuxBufferTimeUnit.Size = New System.Drawing.Size(25, 20)
-        Me.lblAuxBufferTimeUnit.TabIndex = 24
-        Me.lblAuxBufferTimeUnit.Text = "[s]"
-        '
-        'tbauxBufferTime
-        '
-        Me.tbauxBufferTime.Location = New System.Drawing.Point(272, 6)
-        Me.tbauxBufferTime.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbauxBufferTime.Name = "tbauxBufferTime"
-        Me.tbauxBufferTime.Size = New System.Drawing.Size(84, 26)
-        Me.tbauxBufferTime.TabIndex = 3
-        '
-        'pnAuxBufferChgTime
-        '
-        Me.pnAuxBufferChgTime.Controls.Add(Me.Label1)
-        Me.pnAuxBufferChgTime.Controls.Add(Me.lblAuxBufferChgTimeUnit)
-        Me.pnAuxBufferChgTime.Controls.Add(Me.tbAuxBufferChargeTime)
-        Me.pnAuxBufferChgTime.Location = New System.Drawing.Point(18, 437)
-        Me.pnAuxBufferChgTime.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.pnAuxBufferChgTime.Name = "pnAuxBufferChgTime"
-        Me.pnAuxBufferChgTime.Size = New System.Drawing.Size(432, 43)
-        Me.pnAuxBufferChgTime.TabIndex = 7
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = true
-        Me.Label1.Location = New System.Drawing.Point(4, 11)
-        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(178, 20)
-        Me.Label1.TabIndex = 0
-        Me.Label1.Text = "Aux Buffer Charge Time"
-        '
-        'lblAuxBufferChgTimeUnit
-        '
-        Me.lblAuxBufferChgTimeUnit.AutoSize = true
-        Me.lblAuxBufferChgTimeUnit.Location = New System.Drawing.Point(366, 11)
-        Me.lblAuxBufferChgTimeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblAuxBufferChgTimeUnit.Name = "lblAuxBufferChgTimeUnit"
-        Me.lblAuxBufferChgTimeUnit.Size = New System.Drawing.Size(25, 20)
-        Me.lblAuxBufferChgTimeUnit.TabIndex = 24
-        Me.lblAuxBufferChgTimeUnit.Text = "[s]"
-        '
-        'tbAuxBufferChargeTime
-        '
-        Me.tbAuxBufferChargeTime.Location = New System.Drawing.Point(272, 6)
-        Me.tbAuxBufferChargeTime.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbAuxBufferChargeTime.Name = "tbAuxBufferChargeTime"
-        Me.tbAuxBufferChargeTime.Size = New System.Drawing.Size(84, 26)
-        Me.tbAuxBufferChargeTime.TabIndex = 3
-        '
-        'Panel1
-        '
-        Me.Panel1.Controls.Add(Me.lblMinIceOnTime)
-        Me.Panel1.Controls.Add(Me.lblMinIceOnTimeUnit)
-        Me.Panel1.Controls.Add(Me.tbMinICEOnTime)
-        Me.Panel1.Location = New System.Drawing.Point(18, 345)
-        Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(432, 43)
-        Me.Panel1.TabIndex = 5
-        '
-        'lblMinIceOnTime
-        '
-        Me.lblMinIceOnTime.AutoSize = true
-        Me.lblMinIceOnTime.Location = New System.Drawing.Point(4, 11)
-        Me.lblMinIceOnTime.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblMinIceOnTime.Name = "lblMinIceOnTime"
-        Me.lblMinIceOnTime.Size = New System.Drawing.Size(128, 20)
-        Me.lblMinIceOnTime.TabIndex = 0
-        Me.lblMinIceOnTime.Text = "Min ICE On Time"
-        '
-        'lblMinIceOnTimeUnit
-        '
-        Me.lblMinIceOnTimeUnit.AutoSize = true
-        Me.lblMinIceOnTimeUnit.Location = New System.Drawing.Point(366, 11)
-        Me.lblMinIceOnTimeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblMinIceOnTimeUnit.Name = "lblMinIceOnTimeUnit"
-        Me.lblMinIceOnTimeUnit.Size = New System.Drawing.Size(25, 20)
-        Me.lblMinIceOnTimeUnit.TabIndex = 24
-        Me.lblMinIceOnTimeUnit.Text = "[s]"
-        '
-        'tbMinICEOnTime
-        '
-        Me.tbMinICEOnTime.Location = New System.Drawing.Point(272, 6)
-        Me.tbMinICEOnTime.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbMinICEOnTime.Name = "tbMinICEOnTime"
-        Me.tbMinICEOnTime.Size = New System.Drawing.Size(84, 26)
-        Me.tbMinICEOnTime.TabIndex = 3
-        '
-        'Panel2
-        '
-        Me.Panel2.Controls.Add(Me.EquivalenceFactorChg)
-        Me.Panel2.Controls.Add(Me.lblEquivFactorChargeUnit)
-        Me.Panel2.Controls.Add(Me.tbEquivalenceFactorCharge)
-        Me.Panel2.Location = New System.Drawing.Point(18, 160)
-        Me.Panel2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.Panel2.Name = "Panel2"
-        Me.Panel2.Size = New System.Drawing.Size(432, 43)
-        Me.Panel2.TabIndex = 1
-        '
-        'EquivalenceFactorChg
-        '
-        Me.EquivalenceFactorChg.AutoSize = true
-        Me.EquivalenceFactorChg.Location = New System.Drawing.Point(4, 11)
-        Me.EquivalenceFactorChg.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.EquivalenceFactorChg.Name = "EquivalenceFactorChg"
-        Me.EquivalenceFactorChg.Size = New System.Drawing.Size(201, 20)
-        Me.EquivalenceFactorChg.TabIndex = 0
-        Me.EquivalenceFactorChg.Text = "Equivalence Factor Charge"
-        '
-        'lblEquivFactorChargeUnit
-        '
-        Me.lblEquivFactorChargeUnit.AutoSize = true
-        Me.lblEquivFactorChargeUnit.Location = New System.Drawing.Point(366, 11)
-        Me.lblEquivFactorChargeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblEquivFactorChargeUnit.Name = "lblEquivFactorChargeUnit"
-        Me.lblEquivFactorChargeUnit.Size = New System.Drawing.Size(22, 20)
-        Me.lblEquivFactorChargeUnit.TabIndex = 24
-        Me.lblEquivFactorChargeUnit.Text = "[-]"
-        '
-        'tbEquivalenceFactorCharge
-        '
-        Me.tbEquivalenceFactorCharge.Location = New System.Drawing.Point(272, 6)
-        Me.tbEquivalenceFactorCharge.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbEquivalenceFactorCharge.Name = "tbEquivalenceFactorCharge"
-        Me.tbEquivalenceFactorCharge.Size = New System.Drawing.Size(84, 26)
-        Me.tbEquivalenceFactorCharge.TabIndex = 3
-        '
-        'pnICEStartPenaltyFactor
-        '
-        Me.pnICEStartPenaltyFactor.Controls.Add(Me.lblICEStartPenaltyFactor)
-        Me.pnICEStartPenaltyFactor.Controls.Add(Me.lblICEStartPenaltyFactorUnit)
-        Me.pnICEStartPenaltyFactor.Controls.Add(Me.tbICEStartPenaltyFactor)
-        Me.pnICEStartPenaltyFactor.Location = New System.Drawing.Point(18, 483)
-        Me.pnICEStartPenaltyFactor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.pnICEStartPenaltyFactor.Name = "pnICEStartPenaltyFactor"
-        Me.pnICEStartPenaltyFactor.Size = New System.Drawing.Size(432, 43)
-        Me.pnICEStartPenaltyFactor.TabIndex = 8
-        '
-        'lblICEStartPenaltyFactor
-        '
-        Me.lblICEStartPenaltyFactor.AutoSize = true
-        Me.lblICEStartPenaltyFactor.Location = New System.Drawing.Point(4, 11)
-        Me.lblICEStartPenaltyFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblICEStartPenaltyFactor.Name = "lblICEStartPenaltyFactor"
-        Me.lblICEStartPenaltyFactor.Size = New System.Drawing.Size(172, 20)
-        Me.lblICEStartPenaltyFactor.TabIndex = 0
-        Me.lblICEStartPenaltyFactor.Text = "ICE start penalty factor"
-        '
-        'lblICEStartPenaltyFactorUnit
-        '
-        Me.lblICEStartPenaltyFactorUnit.AutoSize = true
-        Me.lblICEStartPenaltyFactorUnit.Location = New System.Drawing.Point(366, 11)
-        Me.lblICEStartPenaltyFactorUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblICEStartPenaltyFactorUnit.Name = "lblICEStartPenaltyFactorUnit"
-        Me.lblICEStartPenaltyFactorUnit.Size = New System.Drawing.Size(22, 20)
-        Me.lblICEStartPenaltyFactorUnit.TabIndex = 24
-        Me.lblICEStartPenaltyFactorUnit.Text = "[-]"
-        '
-        'tbICEStartPenaltyFactor
-        '
-        Me.tbICEStartPenaltyFactor.Location = New System.Drawing.Point(272, 6)
-        Me.tbICEStartPenaltyFactor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbICEStartPenaltyFactor.Name = "tbICEStartPenaltyFactor"
-        Me.tbICEStartPenaltyFactor.Size = New System.Drawing.Size(84, 26)
-        Me.tbICEStartPenaltyFactor.TabIndex = 3
-        '
-        'pnCostFactorSoCExponent
-        '
-        Me.pnCostFactorSoCExponent.Controls.Add(Me.lblCostFactorSoCExponent)
-        Me.pnCostFactorSoCExponent.Controls.Add(Me.lblCostFactorSoCExponentUnit)
-        Me.pnCostFactorSoCExponent.Controls.Add(Me.tbCostFactorSoCExponent)
-        Me.pnCostFactorSoCExponent.Location = New System.Drawing.Point(18, 529)
-        Me.pnCostFactorSoCExponent.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.pnCostFactorSoCExponent.Name = "pnCostFactorSoCExponent"
-        Me.pnCostFactorSoCExponent.Size = New System.Drawing.Size(432, 43)
-        Me.pnCostFactorSoCExponent.TabIndex = 9
-        '
-        'lblCostFactorSoCExponent
-        '
-        Me.lblCostFactorSoCExponent.AutoSize = true
-        Me.lblCostFactorSoCExponent.Location = New System.Drawing.Point(4, 11)
-        Me.lblCostFactorSoCExponent.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblCostFactorSoCExponent.Name = "lblCostFactorSoCExponent"
-        Me.lblCostFactorSoCExponent.Size = New System.Drawing.Size(199, 20)
-        Me.lblCostFactorSoCExponent.TabIndex = 0
-        Me.lblCostFactorSoCExponent.Text = "Cost Factor SoC Exponent"
-        '
-        'lblCostFactorSoCExponentUnit
-        '
-        Me.lblCostFactorSoCExponentUnit.AutoSize = true
-        Me.lblCostFactorSoCExponentUnit.Location = New System.Drawing.Point(366, 11)
-        Me.lblCostFactorSoCExponentUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblCostFactorSoCExponentUnit.Name = "lblCostFactorSoCExponentUnit"
-        Me.lblCostFactorSoCExponentUnit.Size = New System.Drawing.Size(22, 20)
-        Me.lblCostFactorSoCExponentUnit.TabIndex = 24
-        Me.lblCostFactorSoCExponentUnit.Text = "[-]"
-        '
-        'tbCostFactorSoCExponent
-        '
-        Me.tbCostFactorSoCExponent.Location = New System.Drawing.Point(272, 6)
-        Me.tbCostFactorSoCExponent.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbCostFactorSoCExponent.Name = "tbCostFactorSoCExponent"
-        Me.tbCostFactorSoCExponent.Size = New System.Drawing.Size(84, 26)
-        Me.tbCostFactorSoCExponent.TabIndex = 3
-        '
-        'Panel3
-        '
-        Me.Panel3.Controls.Add(Me.lblGensetMinPwrFactor)
-        Me.Panel3.Controls.Add(Me.lblGensetMinPowerFactorUnit)
-        Me.Panel3.Controls.Add(Me.tbGensetMinOptPowerFactor)
-        Me.Panel3.Location = New System.Drawing.Point(18, 582)
-        Me.Panel3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(432, 43)
-        Me.Panel3.TabIndex = 25
-        '
-        'lblGensetMinPwrFactor
-        '
-        Me.lblGensetMinPwrFactor.AutoSize = true
-        Me.lblGensetMinPwrFactor.Location = New System.Drawing.Point(4, 11)
-        Me.lblGensetMinPwrFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblGensetMinPwrFactor.Name = "lblGensetMinPwrFactor"
-        Me.lblGensetMinPwrFactor.Size = New System.Drawing.Size(244, 20)
-        Me.lblGensetMinPwrFactor.TabIndex = 0
-        Me.lblGensetMinPwrFactor.Text = "Genset min optimal Power Factor"
-        '
-        'lblGensetMinPowerFactorUnit
-        '
-        Me.lblGensetMinPowerFactorUnit.AutoSize = true
-        Me.lblGensetMinPowerFactorUnit.Location = New System.Drawing.Point(366, 11)
-        Me.lblGensetMinPowerFactorUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
-        Me.lblGensetMinPowerFactorUnit.Name = "lblGensetMinPowerFactorUnit"
-        Me.lblGensetMinPowerFactorUnit.Size = New System.Drawing.Size(22, 20)
-        Me.lblGensetMinPowerFactorUnit.TabIndex = 24
-        Me.lblGensetMinPowerFactorUnit.Text = "[-]"
-        '
-        'tbGensetMinOptPowerFactor
-        '
-        Me.tbGensetMinOptPowerFactor.Location = New System.Drawing.Point(272, 6)
-        Me.tbGensetMinOptPowerFactor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tbGensetMinOptPowerFactor.Name = "tbGensetMinOptPowerFactor"
-        Me.tbGensetMinOptPowerFactor.Size = New System.Drawing.Size(84, 26)
-        Me.tbGensetMinOptPowerFactor.TabIndex = 3
-        '
-        'HybridStrategyParamsForm
-        '
-        Me.AcceptButton = Me.ButOK
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.CancelButton = Me.ButCancel
-        Me.ClientSize = New System.Drawing.Size(674, 734)
-        Me.Controls.Add(Me.Panel3)
-        Me.Controls.Add(Me.pnCostFactorSoCExponent)
-        Me.Controls.Add(Me.pnICEStartPenaltyFactor)
-        Me.Controls.Add(Me.Panel2)
-        Me.Controls.Add(Me.Panel1)
-        Me.Controls.Add(Me.pnAuxBufferChgTime)
-        Me.Controls.Add(Me.pnAuxBufferTime)
-        Me.Controls.Add(Me.pnTargetSoC)
-        Me.Controls.Add(Me.pnMaxSoC)
-        Me.Controls.Add(Me.pnMinSoC)
-        Me.Controls.Add(Me.lblTitle)
-        Me.Controls.Add(Me.pnEquivFactor)
-        Me.Controls.Add(Me.PictureBox1)
-        Me.Controls.Add(Me.StatusStrip1)
-        Me.Controls.Add(Me.ToolStrip1)
-        Me.Controls.Add(Me.ButCancel)
-        Me.Controls.Add(Me.ButOK)
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
-        Me.Icon = CType(resources.GetObject("$this.Icon"),System.Drawing.Icon)
-        Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.MaximizeBox = false
-        Me.Name = "HybridStrategyParamsForm"
-        Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
-        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-        Me.Text = "Hybrid Strategy Parameters"
-        Me.ToolStrip1.ResumeLayout(false)
-        Me.ToolStrip1.PerformLayout
-        Me.StatusStrip1.ResumeLayout(false)
-        Me.StatusStrip1.PerformLayout
-        CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
-        Me.CmOpenFile.ResumeLayout(false)
-        Me.pnEquivFactor.ResumeLayout(false)
-        Me.pnEquivFactor.PerformLayout
-        Me.pnMinSoC.ResumeLayout(false)
-        Me.pnMinSoC.PerformLayout
-        Me.pnMaxSoC.ResumeLayout(false)
-        Me.pnMaxSoC.PerformLayout
-        Me.pnTargetSoC.ResumeLayout(false)
-        Me.pnTargetSoC.PerformLayout
-        Me.pnAuxBufferTime.ResumeLayout(false)
-        Me.pnAuxBufferTime.PerformLayout
-        Me.pnAuxBufferChgTime.ResumeLayout(false)
-        Me.pnAuxBufferChgTime.PerformLayout
-        Me.Panel1.ResumeLayout(false)
-        Me.Panel1.PerformLayout
-        Me.Panel2.ResumeLayout(false)
-        Me.Panel2.PerformLayout
-        Me.pnICEStartPenaltyFactor.ResumeLayout(false)
-        Me.pnICEStartPenaltyFactor.PerformLayout
-        Me.pnCostFactorSoCExponent.ResumeLayout(false)
-        Me.pnCostFactorSoCExponent.PerformLayout
-        Me.Panel3.ResumeLayout(false)
-        Me.Panel3.PerformLayout
-        Me.ResumeLayout(false)
-        Me.PerformLayout
+		Me.components = New System.ComponentModel.Container()
+		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(HybridStrategyParamsForm))
+		Me.tbEquivalenceFactorDischarge = New System.Windows.Forms.TextBox()
+		Me.lblEquivFactorUnit = New System.Windows.Forms.Label()
+		Me.lblEvquivFactorDischg = New System.Windows.Forms.Label()
+		Me.ButCancel = New System.Windows.Forms.Button()
+		Me.ButOK = New System.Windows.Forms.Button()
+		Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+		Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
+		Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+		Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+		Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+		Me.LbStatus = New System.Windows.Forms.ToolStripStatusLabel()
+		Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+		Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+		Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+		Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+		Me.pnEquivFactor = New System.Windows.Forms.Panel()
+		Me.lblTitle = New System.Windows.Forms.Label()
+		Me.pnMinSoC = New System.Windows.Forms.Panel()
+		Me.lblMinSoC = New System.Windows.Forms.Label()
+		Me.lblMinSoCUnit = New System.Windows.Forms.Label()
+		Me.tbMinSoC = New System.Windows.Forms.TextBox()
+		Me.pnMaxSoC = New System.Windows.Forms.Panel()
+		Me.lblMaxSoC = New System.Windows.Forms.Label()
+		Me.lblMaxSoCUnit = New System.Windows.Forms.Label()
+		Me.tbMaxSoC = New System.Windows.Forms.TextBox()
+		Me.pnTargetSoC = New System.Windows.Forms.Panel()
+		Me.lblTargetSoC = New System.Windows.Forms.Label()
+		Me.lblTargetSoCUnit = New System.Windows.Forms.Label()
+		Me.tbTargetSoC = New System.Windows.Forms.TextBox()
+		Me.pnAuxBufferTime = New System.Windows.Forms.Panel()
+		Me.lblAuxBufferTime = New System.Windows.Forms.Label()
+		Me.lblAuxBufferTimeUnit = New System.Windows.Forms.Label()
+		Me.tbauxBufferTime = New System.Windows.Forms.TextBox()
+		Me.pnAuxBufferChgTime = New System.Windows.Forms.Panel()
+		Me.Label1 = New System.Windows.Forms.Label()
+		Me.lblAuxBufferChgTimeUnit = New System.Windows.Forms.Label()
+		Me.tbAuxBufferChargeTime = New System.Windows.Forms.TextBox()
+		Me.pnICEOnTime = New System.Windows.Forms.Panel()
+		Me.lblMinIceOnTime = New System.Windows.Forms.Label()
+		Me.lblMinIceOnTimeUnit = New System.Windows.Forms.Label()
+		Me.tbMinICEOnTime = New System.Windows.Forms.TextBox()
+		Me.pnEquivFactorCharge = New System.Windows.Forms.Panel()
+		Me.EquivalenceFactorChg = New System.Windows.Forms.Label()
+		Me.lblEquivFactorChargeUnit = New System.Windows.Forms.Label()
+		Me.tbEquivalenceFactorCharge = New System.Windows.Forms.TextBox()
+		Me.pnICEStartPenaltyFactor = New System.Windows.Forms.Panel()
+		Me.lblICEStartPenaltyFactor = New System.Windows.Forms.Label()
+		Me.lblICEStartPenaltyFactorUnit = New System.Windows.Forms.Label()
+		Me.tbICEStartPenaltyFactor = New System.Windows.Forms.TextBox()
+		Me.pnCostFactorSoCExponent = New System.Windows.Forms.Panel()
+		Me.lblCostFactorSoCExponent = New System.Windows.Forms.Label()
+		Me.lblCostFactorSoCExponentUnit = New System.Windows.Forms.Label()
+		Me.tbCostFactorSoCExponent = New System.Windows.Forms.TextBox()
+		Me.pnGenset = New System.Windows.Forms.Panel()
+		Me.lblGensetMinPwrFactor = New System.Windows.Forms.Label()
+		Me.lblGensetMinPowerFactorUnit = New System.Windows.Forms.Label()
+		Me.tbGensetMinOptPowerFactor = New System.Windows.Forms.TextBox()
+		Me.Panel1 = New System.Windows.Forms.Panel()
+		Me.ToolStrip1.SuspendLayout()
+		Me.StatusStrip1.SuspendLayout()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.CmOpenFile.SuspendLayout()
+		Me.pnEquivFactor.SuspendLayout()
+		Me.pnMinSoC.SuspendLayout()
+		Me.pnMaxSoC.SuspendLayout()
+		Me.pnTargetSoC.SuspendLayout()
+		Me.pnAuxBufferTime.SuspendLayout()
+		Me.pnAuxBufferChgTime.SuspendLayout()
+		Me.pnICEOnTime.SuspendLayout()
+		Me.pnEquivFactorCharge.SuspendLayout()
+		Me.pnICEStartPenaltyFactor.SuspendLayout()
+		Me.pnCostFactorSoCExponent.SuspendLayout()
+		Me.pnGenset.SuspendLayout()
+		Me.Panel1.SuspendLayout()
+		Me.SuspendLayout()
+		'
+		'tbEquivalenceFactorDischarge
+		'
+		Me.tbEquivalenceFactorDischarge.Location = New System.Drawing.Point(211, 5)
+		Me.tbEquivalenceFactorDischarge.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbEquivalenceFactorDischarge.Name = "tbEquivalenceFactorDischarge"
+		Me.tbEquivalenceFactorDischarge.Size = New System.Drawing.Size(66, 23)
+		Me.tbEquivalenceFactorDischarge.TabIndex = 3
+		'
+		'lblEquivFactorUnit
+		'
+		Me.lblEquivFactorUnit.AutoSize = True
+		Me.lblEquivFactorUnit.Location = New System.Drawing.Point(285, 8)
+		Me.lblEquivFactorUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblEquivFactorUnit.Name = "lblEquivFactorUnit"
+		Me.lblEquivFactorUnit.Size = New System.Drawing.Size(20, 15)
+		Me.lblEquivFactorUnit.TabIndex = 24
+		Me.lblEquivFactorUnit.Text = "[-]"
+		'
+		'lblEvquivFactorDischg
+		'
+		Me.lblEvquivFactorDischg.AutoSize = True
+		Me.lblEvquivFactorDischg.Location = New System.Drawing.Point(4, 8)
+		Me.lblEvquivFactorDischg.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblEvquivFactorDischg.Name = "lblEvquivFactorDischg"
+		Me.lblEvquivFactorDischg.Size = New System.Drawing.Size(161, 15)
+		Me.lblEvquivFactorDischg.TabIndex = 0
+		Me.lblEvquivFactorDischg.Text = "Equivalence Factor Discharge"
+		'
+		'ButCancel
+		'
+		Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+		Me.ButCancel.Location = New System.Drawing.Point(402, 495)
+		Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.ButCancel.Name = "ButCancel"
+		Me.ButCancel.Size = New System.Drawing.Size(88, 27)
+		Me.ButCancel.TabIndex = 11
+		Me.ButCancel.Text = "Cancel"
+		Me.ButCancel.UseVisualStyleBackColor = True
+		'
+		'ButOK
+		'
+		Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButOK.Location = New System.Drawing.Point(308, 495)
+		Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.ButOK.Name = "ButOK"
+		Me.ButOK.Size = New System.Drawing.Size(88, 27)
+		Me.ButOK.TabIndex = 10
+		Me.ButOK.Text = "Save"
+		Me.ButOK.UseVisualStyleBackColor = True
+		'
+		'ToolStrip1
+		'
+		Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+		Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
+		Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator3, Me.ToolStripBtSendTo, Me.ToolStripSeparator1, Me.ToolStripButton1})
+		Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+		Me.ToolStrip1.Name = "ToolStrip1"
+		Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
+		Me.ToolStrip1.Size = New System.Drawing.Size(504, 31)
+		Me.ToolStrip1.TabIndex = 30
+		Me.ToolStrip1.Text = "ToolStrip1"
+		'
+		'ToolStripBtNew
+		'
+		Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
+		Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtNew.Name = "ToolStripBtNew"
+		Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
+		Me.ToolStripBtNew.Text = "ToolStripButton1"
+		Me.ToolStripBtNew.ToolTipText = "New"
+		'
+		'ToolStripBtOpen
+		'
+		Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+		Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
+		Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
+		Me.ToolStripBtOpen.Text = "ToolStripButton1"
+		Me.ToolStripBtOpen.ToolTipText = "Open..."
+		'
+		'ToolStripBtSave
+		'
+		Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
+		Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSave.Name = "ToolStripBtSave"
+		Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
+		Me.ToolStripBtSave.Text = "ToolStripButton1"
+		Me.ToolStripBtSave.ToolTipText = "Save"
+		'
+		'ToolStripBtSaveAs
+		'
+		Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
+		Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
+		Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
+		Me.ToolStripBtSaveAs.Text = "ToolStripButton1"
+		Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
+		'
+		'ToolStripSeparator3
+		'
+		Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
+		Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31)
+		'
+		'ToolStripBtSendTo
+		'
+		Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
+		Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
+		Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
+		Me.ToolStripBtSendTo.Text = "Send to Job Editor"
+		Me.ToolStripBtSendTo.ToolTipText = "Send to Job Editor"
+		'
+		'ToolStripSeparator1
+		'
+		Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+		Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
+		'
+		'ToolStripButton1
+		'
+		Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
+		Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripButton1.Name = "ToolStripButton1"
+		Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
+		Me.ToolStripButton1.Text = "Help"
+		'
+		'StatusStrip1
+		'
+		Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
+		Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LbStatus})
+		Me.StatusStrip1.Location = New System.Drawing.Point(0, 528)
+		Me.StatusStrip1.Name = "StatusStrip1"
+		Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(1, 0, 16, 0)
+		Me.StatusStrip1.Size = New System.Drawing.Size(504, 22)
+		Me.StatusStrip1.SizingGrip = False
+		Me.StatusStrip1.TabIndex = 37
+		Me.StatusStrip1.Text = "StatusStrip1"
+		'
+		'LbStatus
+		'
+		Me.LbStatus.Name = "LbStatus"
+		Me.LbStatus.Size = New System.Drawing.Size(39, 17)
+		Me.LbStatus.Text = "Status"
+		'
+		'PictureBox1
+		'
+		Me.PictureBox1.BackColor = System.Drawing.Color.White
+		Me.PictureBox1.Dock = System.Windows.Forms.DockStyle.Left
+		Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
+		Me.PictureBox1.Location = New System.Drawing.Point(0, 0)
+		Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.PictureBox1.Name = "PictureBox1"
+		Me.PictureBox1.Size = New System.Drawing.Size(133, 53)
+		Me.PictureBox1.TabIndex = 39
+		Me.PictureBox1.TabStop = False
+		'
+		'CmOpenFile
+		'
+		Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
+		Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+		Me.CmOpenFile.Name = "CmOpenFile"
+		Me.CmOpenFile.Size = New System.Drawing.Size(153, 48)
+		'
+		'OpenWithToolStripMenuItem
+		'
+		Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+		Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+		Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+		'
+		'ShowInFolderToolStripMenuItem
+		'
+		Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+		Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
+		Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+		'
+		'pnEquivFactor
+		'
+		Me.pnEquivFactor.Controls.Add(Me.lblEvquivFactorDischg)
+		Me.pnEquivFactor.Controls.Add(Me.lblEquivFactorUnit)
+		Me.pnEquivFactor.Controls.Add(Me.tbEquivalenceFactorDischarge)
+		Me.pnEquivFactor.Location = New System.Drawing.Point(14, 96)
+		Me.pnEquivFactor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnEquivFactor.Name = "pnEquivFactor"
+		Me.pnEquivFactor.Size = New System.Drawing.Size(336, 32)
+		Me.pnEquivFactor.TabIndex = 0
+		'
+		'lblTitle
+		'
+		Me.lblTitle.BackColor = System.Drawing.Color.White
+		Me.lblTitle.Dock = System.Windows.Forms.DockStyle.Fill
+		Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point)
+		Me.lblTitle.Location = New System.Drawing.Point(133, 0)
+		Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblTitle.Name = "lblTitle"
+		Me.lblTitle.Size = New System.Drawing.Size(371, 53)
+		Me.lblTitle.TabIndex = 48
+		Me.lblTitle.Text = "Hybrid Strategy Parameters"
+		Me.lblTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+		'
+		'pnMinSoC
+		'
+		Me.pnMinSoC.Controls.Add(Me.lblMinSoC)
+		Me.pnMinSoC.Controls.Add(Me.lblMinSoCUnit)
+		Me.pnMinSoC.Controls.Add(Me.tbMinSoC)
+		Me.pnMinSoC.Location = New System.Drawing.Point(14, 165)
+		Me.pnMinSoC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnMinSoC.Name = "pnMinSoC"
+		Me.pnMinSoC.Size = New System.Drawing.Size(336, 32)
+		Me.pnMinSoC.TabIndex = 2
+		'
+		'lblMinSoC
+		'
+		Me.lblMinSoC.AutoSize = True
+		Me.lblMinSoC.Location = New System.Drawing.Point(4, 8)
+		Me.lblMinSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblMinSoC.Name = "lblMinSoC"
+		Me.lblMinSoC.Size = New System.Drawing.Size(52, 15)
+		Me.lblMinSoC.TabIndex = 0
+		Me.lblMinSoC.Text = "Min SoC"
+		'
+		'lblMinSoCUnit
+		'
+		Me.lblMinSoCUnit.AutoSize = True
+		Me.lblMinSoCUnit.Location = New System.Drawing.Point(285, 8)
+		Me.lblMinSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblMinSoCUnit.Name = "lblMinSoCUnit"
+		Me.lblMinSoCUnit.Size = New System.Drawing.Size(25, 15)
+		Me.lblMinSoCUnit.TabIndex = 24
+		Me.lblMinSoCUnit.Text = "[%]"
+		'
+		'tbMinSoC
+		'
+		Me.tbMinSoC.Location = New System.Drawing.Point(211, 5)
+		Me.tbMinSoC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbMinSoC.Name = "tbMinSoC"
+		Me.tbMinSoC.Size = New System.Drawing.Size(66, 23)
+		Me.tbMinSoC.TabIndex = 3
+		'
+		'pnMaxSoC
+		'
+		Me.pnMaxSoC.Controls.Add(Me.lblMaxSoC)
+		Me.pnMaxSoC.Controls.Add(Me.lblMaxSoCUnit)
+		Me.pnMaxSoC.Controls.Add(Me.tbMaxSoC)
+		Me.pnMaxSoC.Location = New System.Drawing.Point(14, 200)
+		Me.pnMaxSoC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnMaxSoC.Name = "pnMaxSoC"
+		Me.pnMaxSoC.Size = New System.Drawing.Size(336, 32)
+		Me.pnMaxSoC.TabIndex = 3
+		'
+		'lblMaxSoC
+		'
+		Me.lblMaxSoC.AutoSize = True
+		Me.lblMaxSoC.Location = New System.Drawing.Point(4, 8)
+		Me.lblMaxSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblMaxSoC.Name = "lblMaxSoC"
+		Me.lblMaxSoC.Size = New System.Drawing.Size(54, 15)
+		Me.lblMaxSoC.TabIndex = 0
+		Me.lblMaxSoC.Text = "Max SoC"
+		'
+		'lblMaxSoCUnit
+		'
+		Me.lblMaxSoCUnit.AutoSize = True
+		Me.lblMaxSoCUnit.Location = New System.Drawing.Point(285, 8)
+		Me.lblMaxSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblMaxSoCUnit.Name = "lblMaxSoCUnit"
+		Me.lblMaxSoCUnit.Size = New System.Drawing.Size(25, 15)
+		Me.lblMaxSoCUnit.TabIndex = 24
+		Me.lblMaxSoCUnit.Text = "[%]"
+		'
+		'tbMaxSoC
+		'
+		Me.tbMaxSoC.Location = New System.Drawing.Point(211, 5)
+		Me.tbMaxSoC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbMaxSoC.Name = "tbMaxSoC"
+		Me.tbMaxSoC.Size = New System.Drawing.Size(66, 23)
+		Me.tbMaxSoC.TabIndex = 3
+		'
+		'pnTargetSoC
+		'
+		Me.pnTargetSoC.Controls.Add(Me.lblTargetSoC)
+		Me.pnTargetSoC.Controls.Add(Me.lblTargetSoCUnit)
+		Me.pnTargetSoC.Controls.Add(Me.tbTargetSoC)
+		Me.pnTargetSoC.Location = New System.Drawing.Point(14, 234)
+		Me.pnTargetSoC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnTargetSoC.Name = "pnTargetSoC"
+		Me.pnTargetSoC.Size = New System.Drawing.Size(336, 32)
+		Me.pnTargetSoC.TabIndex = 4
+		'
+		'lblTargetSoC
+		'
+		Me.lblTargetSoC.AutoSize = True
+		Me.lblTargetSoC.Location = New System.Drawing.Point(4, 8)
+		Me.lblTargetSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblTargetSoC.Name = "lblTargetSoC"
+		Me.lblTargetSoC.Size = New System.Drawing.Size(63, 15)
+		Me.lblTargetSoC.TabIndex = 0
+		Me.lblTargetSoC.Text = "Target SoC"
+		'
+		'lblTargetSoCUnit
+		'
+		Me.lblTargetSoCUnit.AutoSize = True
+		Me.lblTargetSoCUnit.Location = New System.Drawing.Point(285, 8)
+		Me.lblTargetSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblTargetSoCUnit.Name = "lblTargetSoCUnit"
+		Me.lblTargetSoCUnit.Size = New System.Drawing.Size(25, 15)
+		Me.lblTargetSoCUnit.TabIndex = 24
+		Me.lblTargetSoCUnit.Text = "[%]"
+		'
+		'tbTargetSoC
+		'
+		Me.tbTargetSoC.Location = New System.Drawing.Point(211, 5)
+		Me.tbTargetSoC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbTargetSoC.Name = "tbTargetSoC"
+		Me.tbTargetSoC.Size = New System.Drawing.Size(66, 23)
+		Me.tbTargetSoC.TabIndex = 3
+		'
+		'pnAuxBufferTime
+		'
+		Me.pnAuxBufferTime.Controls.Add(Me.lblAuxBufferTime)
+		Me.pnAuxBufferTime.Controls.Add(Me.lblAuxBufferTimeUnit)
+		Me.pnAuxBufferTime.Controls.Add(Me.tbauxBufferTime)
+		Me.pnAuxBufferTime.Location = New System.Drawing.Point(14, 303)
+		Me.pnAuxBufferTime.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnAuxBufferTime.Name = "pnAuxBufferTime"
+		Me.pnAuxBufferTime.Size = New System.Drawing.Size(336, 32)
+		Me.pnAuxBufferTime.TabIndex = 6
+		'
+		'lblAuxBufferTime
+		'
+		Me.lblAuxBufferTime.AutoSize = True
+		Me.lblAuxBufferTime.Location = New System.Drawing.Point(4, 8)
+		Me.lblAuxBufferTime.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblAuxBufferTime.Name = "lblAuxBufferTime"
+		Me.lblAuxBufferTime.Size = New System.Drawing.Size(92, 15)
+		Me.lblAuxBufferTime.TabIndex = 0
+		Me.lblAuxBufferTime.Text = "Aux Buffer Time"
+		'
+		'lblAuxBufferTimeUnit
+		'
+		Me.lblAuxBufferTimeUnit.AutoSize = True
+		Me.lblAuxBufferTimeUnit.Location = New System.Drawing.Point(285, 8)
+		Me.lblAuxBufferTimeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblAuxBufferTimeUnit.Name = "lblAuxBufferTimeUnit"
+		Me.lblAuxBufferTimeUnit.Size = New System.Drawing.Size(20, 15)
+		Me.lblAuxBufferTimeUnit.TabIndex = 24
+		Me.lblAuxBufferTimeUnit.Text = "[s]"
+		'
+		'tbauxBufferTime
+		'
+		Me.tbauxBufferTime.Location = New System.Drawing.Point(211, 5)
+		Me.tbauxBufferTime.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbauxBufferTime.Name = "tbauxBufferTime"
+		Me.tbauxBufferTime.Size = New System.Drawing.Size(66, 23)
+		Me.tbauxBufferTime.TabIndex = 3
+		'
+		'pnAuxBufferChgTime
+		'
+		Me.pnAuxBufferChgTime.Controls.Add(Me.Label1)
+		Me.pnAuxBufferChgTime.Controls.Add(Me.lblAuxBufferChgTimeUnit)
+		Me.pnAuxBufferChgTime.Controls.Add(Me.tbAuxBufferChargeTime)
+		Me.pnAuxBufferChgTime.Location = New System.Drawing.Point(14, 338)
+		Me.pnAuxBufferChgTime.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnAuxBufferChgTime.Name = "pnAuxBufferChgTime"
+		Me.pnAuxBufferChgTime.Size = New System.Drawing.Size(336, 32)
+		Me.pnAuxBufferChgTime.TabIndex = 7
+		'
+		'Label1
+		'
+		Me.Label1.AutoSize = True
+		Me.Label1.Location = New System.Drawing.Point(4, 8)
+		Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label1.Name = "Label1"
+		Me.Label1.Size = New System.Drawing.Size(133, 15)
+		Me.Label1.TabIndex = 0
+		Me.Label1.Text = "Aux Buffer Charge Time"
+		'
+		'lblAuxBufferChgTimeUnit
+		'
+		Me.lblAuxBufferChgTimeUnit.AutoSize = True
+		Me.lblAuxBufferChgTimeUnit.Location = New System.Drawing.Point(285, 8)
+		Me.lblAuxBufferChgTimeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblAuxBufferChgTimeUnit.Name = "lblAuxBufferChgTimeUnit"
+		Me.lblAuxBufferChgTimeUnit.Size = New System.Drawing.Size(20, 15)
+		Me.lblAuxBufferChgTimeUnit.TabIndex = 24
+		Me.lblAuxBufferChgTimeUnit.Text = "[s]"
+		'
+		'tbAuxBufferChargeTime
+		'
+		Me.tbAuxBufferChargeTime.Location = New System.Drawing.Point(211, 5)
+		Me.tbAuxBufferChargeTime.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbAuxBufferChargeTime.Name = "tbAuxBufferChargeTime"
+		Me.tbAuxBufferChargeTime.Size = New System.Drawing.Size(66, 23)
+		Me.tbAuxBufferChargeTime.TabIndex = 3
+		'
+		'pnICEOnTime
+		'
+		Me.pnICEOnTime.Controls.Add(Me.lblMinIceOnTime)
+		Me.pnICEOnTime.Controls.Add(Me.lblMinIceOnTimeUnit)
+		Me.pnICEOnTime.Controls.Add(Me.tbMinICEOnTime)
+		Me.pnICEOnTime.Location = New System.Drawing.Point(14, 269)
+		Me.pnICEOnTime.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnICEOnTime.Name = "pnICEOnTime"
+		Me.pnICEOnTime.Size = New System.Drawing.Size(336, 32)
+		Me.pnICEOnTime.TabIndex = 5
+		'
+		'lblMinIceOnTime
+		'
+		Me.lblMinIceOnTime.AutoSize = True
+		Me.lblMinIceOnTime.Location = New System.Drawing.Point(4, 8)
+		Me.lblMinIceOnTime.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblMinIceOnTime.Name = "lblMinIceOnTime"
+		Me.lblMinIceOnTime.Size = New System.Drawing.Size(96, 15)
+		Me.lblMinIceOnTime.TabIndex = 0
+		Me.lblMinIceOnTime.Text = "Min ICE On Time"
+		'
+		'lblMinIceOnTimeUnit
+		'
+		Me.lblMinIceOnTimeUnit.AutoSize = True
+		Me.lblMinIceOnTimeUnit.Location = New System.Drawing.Point(285, 8)
+		Me.lblMinIceOnTimeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblMinIceOnTimeUnit.Name = "lblMinIceOnTimeUnit"
+		Me.lblMinIceOnTimeUnit.Size = New System.Drawing.Size(20, 15)
+		Me.lblMinIceOnTimeUnit.TabIndex = 24
+		Me.lblMinIceOnTimeUnit.Text = "[s]"
+		'
+		'tbMinICEOnTime
+		'
+		Me.tbMinICEOnTime.Location = New System.Drawing.Point(211, 5)
+		Me.tbMinICEOnTime.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbMinICEOnTime.Name = "tbMinICEOnTime"
+		Me.tbMinICEOnTime.Size = New System.Drawing.Size(66, 23)
+		Me.tbMinICEOnTime.TabIndex = 3
+		'
+		'pnEquivFactorCharge
+		'
+		Me.pnEquivFactorCharge.Controls.Add(Me.EquivalenceFactorChg)
+		Me.pnEquivFactorCharge.Controls.Add(Me.lblEquivFactorChargeUnit)
+		Me.pnEquivFactorCharge.Controls.Add(Me.tbEquivalenceFactorCharge)
+		Me.pnEquivFactorCharge.Location = New System.Drawing.Point(14, 130)
+		Me.pnEquivFactorCharge.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnEquivFactorCharge.Name = "pnEquivFactorCharge"
+		Me.pnEquivFactorCharge.Size = New System.Drawing.Size(336, 32)
+		Me.pnEquivFactorCharge.TabIndex = 1
+		'
+		'EquivalenceFactorChg
+		'
+		Me.EquivalenceFactorChg.AutoSize = True
+		Me.EquivalenceFactorChg.Location = New System.Drawing.Point(4, 8)
+		Me.EquivalenceFactorChg.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.EquivalenceFactorChg.Name = "EquivalenceFactorChg"
+		Me.EquivalenceFactorChg.Size = New System.Drawing.Size(147, 15)
+		Me.EquivalenceFactorChg.TabIndex = 0
+		Me.EquivalenceFactorChg.Text = "Equivalence Factor Charge"
+		'
+		'lblEquivFactorChargeUnit
+		'
+		Me.lblEquivFactorChargeUnit.AutoSize = True
+		Me.lblEquivFactorChargeUnit.Location = New System.Drawing.Point(285, 8)
+		Me.lblEquivFactorChargeUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblEquivFactorChargeUnit.Name = "lblEquivFactorChargeUnit"
+		Me.lblEquivFactorChargeUnit.Size = New System.Drawing.Size(20, 15)
+		Me.lblEquivFactorChargeUnit.TabIndex = 24
+		Me.lblEquivFactorChargeUnit.Text = "[-]"
+		'
+		'tbEquivalenceFactorCharge
+		'
+		Me.tbEquivalenceFactorCharge.Location = New System.Drawing.Point(211, 5)
+		Me.tbEquivalenceFactorCharge.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbEquivalenceFactorCharge.Name = "tbEquivalenceFactorCharge"
+		Me.tbEquivalenceFactorCharge.Size = New System.Drawing.Size(66, 23)
+		Me.tbEquivalenceFactorCharge.TabIndex = 3
+		'
+		'pnICEStartPenaltyFactor
+		'
+		Me.pnICEStartPenaltyFactor.Controls.Add(Me.lblICEStartPenaltyFactor)
+		Me.pnICEStartPenaltyFactor.Controls.Add(Me.lblICEStartPenaltyFactorUnit)
+		Me.pnICEStartPenaltyFactor.Controls.Add(Me.tbICEStartPenaltyFactor)
+		Me.pnICEStartPenaltyFactor.Location = New System.Drawing.Point(14, 373)
+		Me.pnICEStartPenaltyFactor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnICEStartPenaltyFactor.Name = "pnICEStartPenaltyFactor"
+		Me.pnICEStartPenaltyFactor.Size = New System.Drawing.Size(336, 32)
+		Me.pnICEStartPenaltyFactor.TabIndex = 8
+		'
+		'lblICEStartPenaltyFactor
+		'
+		Me.lblICEStartPenaltyFactor.AutoSize = True
+		Me.lblICEStartPenaltyFactor.Location = New System.Drawing.Point(4, 8)
+		Me.lblICEStartPenaltyFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblICEStartPenaltyFactor.Name = "lblICEStartPenaltyFactor"
+		Me.lblICEStartPenaltyFactor.Size = New System.Drawing.Size(126, 15)
+		Me.lblICEStartPenaltyFactor.TabIndex = 0
+		Me.lblICEStartPenaltyFactor.Text = "ICE start penalty factor"
+		'
+		'lblICEStartPenaltyFactorUnit
+		'
+		Me.lblICEStartPenaltyFactorUnit.AutoSize = True
+		Me.lblICEStartPenaltyFactorUnit.Location = New System.Drawing.Point(285, 8)
+		Me.lblICEStartPenaltyFactorUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblICEStartPenaltyFactorUnit.Name = "lblICEStartPenaltyFactorUnit"
+		Me.lblICEStartPenaltyFactorUnit.Size = New System.Drawing.Size(20, 15)
+		Me.lblICEStartPenaltyFactorUnit.TabIndex = 24
+		Me.lblICEStartPenaltyFactorUnit.Text = "[-]"
+		'
+		'tbICEStartPenaltyFactor
+		'
+		Me.tbICEStartPenaltyFactor.Location = New System.Drawing.Point(211, 5)
+		Me.tbICEStartPenaltyFactor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbICEStartPenaltyFactor.Name = "tbICEStartPenaltyFactor"
+		Me.tbICEStartPenaltyFactor.Size = New System.Drawing.Size(66, 23)
+		Me.tbICEStartPenaltyFactor.TabIndex = 3
+		'
+		'pnCostFactorSoCExponent
+		'
+		Me.pnCostFactorSoCExponent.Controls.Add(Me.lblCostFactorSoCExponent)
+		Me.pnCostFactorSoCExponent.Controls.Add(Me.lblCostFactorSoCExponentUnit)
+		Me.pnCostFactorSoCExponent.Controls.Add(Me.tbCostFactorSoCExponent)
+		Me.pnCostFactorSoCExponent.Location = New System.Drawing.Point(14, 407)
+		Me.pnCostFactorSoCExponent.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnCostFactorSoCExponent.Name = "pnCostFactorSoCExponent"
+		Me.pnCostFactorSoCExponent.Size = New System.Drawing.Size(336, 32)
+		Me.pnCostFactorSoCExponent.TabIndex = 9
+		'
+		'lblCostFactorSoCExponent
+		'
+		Me.lblCostFactorSoCExponent.AutoSize = True
+		Me.lblCostFactorSoCExponent.Location = New System.Drawing.Point(4, 8)
+		Me.lblCostFactorSoCExponent.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblCostFactorSoCExponent.Name = "lblCostFactorSoCExponent"
+		Me.lblCostFactorSoCExponent.Size = New System.Drawing.Size(144, 15)
+		Me.lblCostFactorSoCExponent.TabIndex = 0
+		Me.lblCostFactorSoCExponent.Text = "Cost Factor SoC Exponent"
+		'
+		'lblCostFactorSoCExponentUnit
+		'
+		Me.lblCostFactorSoCExponentUnit.AutoSize = True
+		Me.lblCostFactorSoCExponentUnit.Location = New System.Drawing.Point(285, 8)
+		Me.lblCostFactorSoCExponentUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblCostFactorSoCExponentUnit.Name = "lblCostFactorSoCExponentUnit"
+		Me.lblCostFactorSoCExponentUnit.Size = New System.Drawing.Size(20, 15)
+		Me.lblCostFactorSoCExponentUnit.TabIndex = 24
+		Me.lblCostFactorSoCExponentUnit.Text = "[-]"
+		'
+		'tbCostFactorSoCExponent
+		'
+		Me.tbCostFactorSoCExponent.Location = New System.Drawing.Point(211, 5)
+		Me.tbCostFactorSoCExponent.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbCostFactorSoCExponent.Name = "tbCostFactorSoCExponent"
+		Me.tbCostFactorSoCExponent.Size = New System.Drawing.Size(66, 23)
+		Me.tbCostFactorSoCExponent.TabIndex = 3
+		'
+		'pnGenset
+		'
+		Me.pnGenset.Controls.Add(Me.lblGensetMinPwrFactor)
+		Me.pnGenset.Controls.Add(Me.lblGensetMinPowerFactorUnit)
+		Me.pnGenset.Controls.Add(Me.tbGensetMinOptPowerFactor)
+		Me.pnGenset.Location = New System.Drawing.Point(14, 447)
+		Me.pnGenset.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnGenset.Name = "pnGenset"
+		Me.pnGenset.Size = New System.Drawing.Size(336, 32)
+		Me.pnGenset.TabIndex = 25
+		Me.pnGenset.Visible = False
+		'
+		'lblGensetMinPwrFactor
+		'
+		Me.lblGensetMinPwrFactor.AutoSize = True
+		Me.lblGensetMinPwrFactor.Location = New System.Drawing.Point(4, 8)
+		Me.lblGensetMinPwrFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblGensetMinPwrFactor.Name = "lblGensetMinPwrFactor"
+		Me.lblGensetMinPwrFactor.Size = New System.Drawing.Size(183, 15)
+		Me.lblGensetMinPwrFactor.TabIndex = 0
+		Me.lblGensetMinPwrFactor.Text = "Genset min optimal Power Factor"
+		'
+		'lblGensetMinPowerFactorUnit
+		'
+		Me.lblGensetMinPowerFactorUnit.AutoSize = True
+		Me.lblGensetMinPowerFactorUnit.Location = New System.Drawing.Point(285, 8)
+		Me.lblGensetMinPowerFactorUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblGensetMinPowerFactorUnit.Name = "lblGensetMinPowerFactorUnit"
+		Me.lblGensetMinPowerFactorUnit.Size = New System.Drawing.Size(20, 15)
+		Me.lblGensetMinPowerFactorUnit.TabIndex = 24
+		Me.lblGensetMinPowerFactorUnit.Text = "[-]"
+		'
+		'tbGensetMinOptPowerFactor
+		'
+		Me.tbGensetMinOptPowerFactor.Location = New System.Drawing.Point(211, 5)
+		Me.tbGensetMinOptPowerFactor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbGensetMinOptPowerFactor.Name = "tbGensetMinOptPowerFactor"
+		Me.tbGensetMinOptPowerFactor.Size = New System.Drawing.Size(66, 23)
+		Me.tbGensetMinOptPowerFactor.TabIndex = 3
+		'
+		'Panel1
+		'
+		Me.Panel1.Controls.Add(Me.lblTitle)
+		Me.Panel1.Controls.Add(Me.PictureBox1)
+		Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
+		Me.Panel1.Location = New System.Drawing.Point(0, 31)
+		Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.Panel1.Name = "Panel1"
+		Me.Panel1.Size = New System.Drawing.Size(504, 53)
+		Me.Panel1.TabIndex = 49
+		'
+		'HybridStrategyParamsForm
+		'
+		Me.AcceptButton = Me.ButOK
+		Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!)
+		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+		Me.CancelButton = Me.ButCancel
+		Me.ClientSize = New System.Drawing.Size(504, 550)
+		Me.Controls.Add(Me.Panel1)
+		Me.Controls.Add(Me.pnGenset)
+		Me.Controls.Add(Me.pnCostFactorSoCExponent)
+		Me.Controls.Add(Me.pnICEStartPenaltyFactor)
+		Me.Controls.Add(Me.pnEquivFactorCharge)
+		Me.Controls.Add(Me.pnICEOnTime)
+		Me.Controls.Add(Me.pnAuxBufferChgTime)
+		Me.Controls.Add(Me.pnAuxBufferTime)
+		Me.Controls.Add(Me.pnTargetSoC)
+		Me.Controls.Add(Me.pnMaxSoC)
+		Me.Controls.Add(Me.pnMinSoC)
+		Me.Controls.Add(Me.pnEquivFactor)
+		Me.Controls.Add(Me.StatusStrip1)
+		Me.Controls.Add(Me.ToolStrip1)
+		Me.Controls.Add(Me.ButCancel)
+		Me.Controls.Add(Me.ButOK)
+		Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
+		Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+		Me.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.MaximizeBox = False
+		Me.Name = "HybridStrategyParamsForm"
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+		Me.Text = "Hybrid Strategy Parameters Editor"
+		Me.ToolStrip1.ResumeLayout(False)
+		Me.ToolStrip1.PerformLayout()
+		Me.StatusStrip1.ResumeLayout(False)
+		Me.StatusStrip1.PerformLayout()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.CmOpenFile.ResumeLayout(False)
+		Me.pnEquivFactor.ResumeLayout(False)
+		Me.pnEquivFactor.PerformLayout()
+		Me.pnMinSoC.ResumeLayout(False)
+		Me.pnMinSoC.PerformLayout()
+		Me.pnMaxSoC.ResumeLayout(False)
+		Me.pnMaxSoC.PerformLayout()
+		Me.pnTargetSoC.ResumeLayout(False)
+		Me.pnTargetSoC.PerformLayout()
+		Me.pnAuxBufferTime.ResumeLayout(False)
+		Me.pnAuxBufferTime.PerformLayout()
+		Me.pnAuxBufferChgTime.ResumeLayout(False)
+		Me.pnAuxBufferChgTime.PerformLayout()
+		Me.pnICEOnTime.ResumeLayout(False)
+		Me.pnICEOnTime.PerformLayout()
+		Me.pnEquivFactorCharge.ResumeLayout(False)
+		Me.pnEquivFactorCharge.PerformLayout()
+		Me.pnICEStartPenaltyFactor.ResumeLayout(False)
+		Me.pnICEStartPenaltyFactor.PerformLayout()
+		Me.pnCostFactorSoCExponent.ResumeLayout(False)
+		Me.pnCostFactorSoCExponent.PerformLayout()
+		Me.pnGenset.ResumeLayout(False)
+		Me.pnGenset.PerformLayout()
+		Me.Panel1.ResumeLayout(False)
+		Me.ResumeLayout(False)
+		Me.PerformLayout()
 
-End Sub
-    Friend WithEvents tbEquivalenceFactorDischarge As TextBox
+	End Sub
+	Friend WithEvents tbEquivalenceFactorDischarge As TextBox
     Friend WithEvents lblEquivFactorUnit As Label
     Friend WithEvents lblEvquivFactorDischg As Label
     Friend WithEvents ButCancel As Button
@@ -815,11 +830,11 @@ End Sub
     Friend WithEvents Label1 As Label
     Friend WithEvents lblAuxBufferChgTimeUnit As Label
     Friend WithEvents tbAuxBufferChargeTime As TextBox
-    Friend WithEvents Panel1 As Panel
+    Friend WithEvents pnICEOnTime As Panel
     Friend WithEvents lblMinIceOnTime As Label
     Friend WithEvents lblMinIceOnTimeUnit As Label
     Friend WithEvents tbMinICEOnTime As TextBox
-    Friend WithEvents Panel2 As Panel
+    Friend WithEvents pnEquivFactorCharge As Panel
     Friend WithEvents EquivalenceFactorChg As Label
     Friend WithEvents lblEquivFactorChargeUnit As Label
     Friend WithEvents tbEquivalenceFactorCharge As TextBox
@@ -831,8 +846,9 @@ End Sub
     Friend WithEvents lblCostFactorSoCExponent As Label
     Friend WithEvents lblCostFactorSoCExponentUnit As Label
     Friend WithEvents tbCostFactorSoCExponent As TextBox
-    Friend WithEvents Panel3 As Panel
+    Friend WithEvents pnGenset As Panel
     Friend WithEvents lblGensetMinPwrFactor As Label
     Friend WithEvents lblGensetMinPowerFactorUnit As Label
     Friend WithEvents tbGensetMinOptPowerFactor As TextBox
+	Friend WithEvents Panel1 As Panel
 End Class
diff --git a/VECTO/GUI/HybridStrategyParamsForm.resx b/VECTO/GUI/HybridStrategyParamsForm.resx
index 81623a24e36cbaf6c70822eb47f982f654db0f27..256f87a53c1585f15c485cb58958cd0eb825b2ad 100644
--- a/VECTO/GUI/HybridStrategyParamsForm.resx
+++ b/VECTO/GUI/HybridStrategyParamsForm.resx
@@ -1,64 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
+<root>
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
diff --git a/VECTO/GUI/HybridStrategyParamsForm.vb b/VECTO/GUI/HybridStrategyParamsForm.vb
index 3778f2a61760d1e08755e3a56dec636b85612cf8..84a77e72d1eb3cf6a7f46dff1d2a2213309c3524 100644
--- a/VECTO/GUI/HybridStrategyParamsForm.vb
+++ b/VECTO/GUI/HybridStrategyParamsForm.vb
@@ -1,10 +1,4 @@
-
-
-Imports System.IO
-Imports TUGraz.VectoCommon.InputData
-Imports TUGraz.VectoCommon.Utils
-Imports TUGraz.VectoCore.InputData.FileIO.JSON
-' Copyright 2017 European Union.
+' Copyright 2017 European Union.
 ' Licensed under the EUPL (the 'Licence');
 '
 ' * You may not use this work except in compliance with the Licence.
@@ -14,52 +8,36 @@ Imports TUGraz.VectoCore.InputData.FileIO.JSON
 '   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 '
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
+Imports System.IO
+Imports TUGraz.VectoCommon.InputData
+Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.InputData.FileIO.JSON
 
 ''' <summary>
-''' Engine Editor. Open and save .VENG files.
+''' HybridStrategyParams Editor. Open and save .VENG files.
 ''' </summary>
-''' <remarks></remarks>
 Public Class HybridStrategyParamsForm
+
     Private _strategyParamsFile As String = ""
-    Public AutoSendTo As Boolean = False
-    Public JobDir As String = ""
-    Private _changed As Boolean = False
 
-    Private _contextMenuFiles As String()
+    Private _changed As Boolean = False
 
+    Public Property AutoSendTo As Boolean = False
 
+    Public Property JobDir As String = ""
 
+    Public Property JobType As VectoSimulationJobType
 
-    'Before closing Editor: Check if file was changed and ask to save.
     Private Sub F_ENG_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
-        If e.CloseReason <> CloseReason.ApplicationExitCall And e.CloseReason <> CloseReason.WindowsShutDown Then
+        If e.CloseReason <> CloseReason.ApplicationExitCall AndAlso e.CloseReason <> CloseReason.WindowsShutDown Then
             e.Cancel = ChangeCheckCancel()
         End If
     End Sub
 
-    'Initialise.
-    Private Sub EngineFormLoad(sender As Object, e As EventArgs) Handles Me.Load
-
-        ' initialize form on load - nothng to do right now
-
-        'pnInertia.Enabled = Not Cfg.DeclMode
-
-
-        _changed = False
-
-
+    Private Sub HybridStrategyParamsFormLoad(sender As Object, e As EventArgs) Handles Me.Load
         NewHybStrategyParams()
     End Sub
 
-    'Set generic values for Declaration mode.
-    Private Sub DeclInit()
-
-        If Not Cfg.DeclMode Then Exit Sub
-
-
-
-    End Sub
-
 
 #Region "Toolbar"
 
@@ -68,11 +46,11 @@ Public Class HybridStrategyParamsForm
     End Sub
 
     Private Sub ToolStripBtOpen_Click(sender As Object, e As EventArgs) Handles ToolStripBtOpen.Click
-        If EngineFileBrowser.OpenDialog(_strategyParamsFile) Then
+        If HCUFileBrowser.OpenDialog(_strategyParamsFile) Then
             Try
-                OpenHybridStrategyParametersFile(EngineFileBrowser.Files(0))
+                OpenHybridStrategyParametersFile(HCUFileBrowser.Files(0))
             Catch ex As Exception
-                MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading Engine File")
+                MsgBox(ex.Message, MsgBoxStyle.OkOnly, "Error loading HybridStrategyParams File")
             End Try
         End If
     End Sub
@@ -86,7 +64,6 @@ Public Class HybridStrategyParamsForm
     End Sub
 
     Private Sub ToolStripBtSendTo_Click(sender As Object, e As EventArgs) Handles ToolStripBtSendTo.Click
-
         If ChangeCheckCancel() Then Exit Sub
 
         If _strategyParamsFile = "" Then
@@ -111,8 +88,7 @@ Public Class HybridStrategyParamsForm
     Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click
         If File.Exists(Path.Combine(MyAppPath, "User Manual\help.html")) Then
             Dim defaultBrowserPath As String = BrowserUtils.GetDefaultBrowserPath()
-            Process.Start(defaultBrowserPath,
-                          $"""file://{Path.Combine(MyAppPath, "User Manual\help.html#engine-editor")}""")
+            Process.Start(defaultBrowserPath, $"""file://{Path.Combine(MyAppPath, "User Manual\help.html#hybrid-strategy-parameters-editor")}""")
         Else
             MsgBox("User Manual not found!", MsgBoxStyle.Critical)
         End If
@@ -120,39 +96,72 @@ Public Class HybridStrategyParamsForm
 
 #End Region
 
-    'Create new empty Engine file.
     Private Sub NewHybStrategyParams()
-
         If ChangeCheckCancel() Then Exit Sub
+        UpdateForm(JobType)
+        _changed = False
+    End Sub
 
-
-        tbEquivalenceFactorDischarge.Text = ""
-        tbMinSoC.Text = ""
-        tbMaxSoC.Text = ""
-        tbTargetSoC.Text = ""
-        tbauxBufferTime.Text = ""
-        tbAuxBufferChargeTime.Text = ""
-
-        DeclInit()
-
+    Private Sub UpdateForm(vectoSimulationJobType As VectoSimulationJobType)
         _strategyParamsFile = ""
         Text = "Hybrid Strategy Parameters Editor"
         LbStatus.Text = ""
 
-        _changed = False
+        tbEquivalenceFactorDischarge.ResetText()
+        tbEquivalenceFactorCharge.ResetText()
+        tbMinSoC.ResetText()
+        tbMaxSoC.ResetText()
+        tbTargetSoC.ResetText()
+        tbMinICEOnTime.ResetText()
+        tbauxBufferTime.ResetText()
+        tbAuxBufferChargeTime.ResetText()
+        tbICEStartPenaltyFactor.ResetText()
+        tbCostFactorSoCExponent.ResetText()
+        tbGensetMinOptPowerFactor.ResetText()
+
+        Select Case vectoSimulationJobType
+            Case VectoSimulationJobType.ParallelHybridVehicle
+                pnEquivFactor.Enabled = True
+                pnEquivFactorCharge.Enabled = True
+                pnMinSoC.Enabled = True
+                pnMaxSoC.Enabled = True
+                pnTargetSoC.Enabled = True
+                pnICEOnTime.Enabled = True
+                pnAuxBufferTime.Enabled = True
+                pnAuxBufferChgTime.Enabled = True
+                pnICEStartPenaltyFactor.Enabled = True
+                pnCostFactorSoCExponent.Enabled = True
+                pnGenset.Enabled = False
+            Case VectoSimulationJobType.SerialHybridVehicle
+                pnEquivFactor.Enabled = False
+                pnEquivFactorCharge.Enabled = False
+                pnMinSoC.Enabled = True
+                pnMaxSoC.Enabled = False
+                pnTargetSoC.Enabled = True
+                pnICEOnTime.Enabled = False
+                pnAuxBufferTime.Enabled = False
+                pnAuxBufferChgTime.Enabled = False
+                pnICEStartPenaltyFactor.Enabled = False
+                pnCostFactorSoCExponent.Enabled = False
+                pnGenset.Enabled = False
+            Case Else
+                pnEquivFactor.Enabled = True
+                pnEquivFactorCharge.Enabled = True
+                pnMinSoC.Enabled = True
+                pnMaxSoC.Enabled = True
+                pnTargetSoC.Enabled = True
+                pnICEOnTime.Enabled = True
+                pnAuxBufferTime.Enabled = True
+                pnAuxBufferChgTime.Enabled = True
+                pnICEStartPenaltyFactor.Enabled = True
+                pnCostFactorSoCExponent.Enabled = True
+                pnGenset.Enabled = True
+        End Select
     End Sub
 
-    'Open VENG file
     Public Sub OpenHybridStrategyParametersFile(file As String)
-        Dim strategyParams As IHybridStrategyParameters
-
         If ChangeCheckCancel() Then Exit Sub
 
-        Dim inputData As IEngineeringInputDataProvider = TryCast(JSONInputDataFactory.ReadComponentData(file),
-                                                                IEngineeringInputDataProvider)
-
-        strategyParams = inputData.JobInputData.HybridStrategyParameters
-
         If Cfg.DeclMode Then
             Select Case WrongMode()
                 Case 1
@@ -164,35 +173,57 @@ Public Class HybridStrategyParamsForm
             End Select
         End If
 
-        Dim basePath As String = Path.GetDirectoryName(file)
-
-        tbEquivalenceFactorDischarge.Text = strategyParams.EquivalenceFactorDischarge.ToGUIFormat()
-
-        tbEquivalenceFactorCharge.Text = strategyParams.EquivalenceFactorCharge.ToGUIFormat()
-        tbMinSoC.Text = (strategyParams.MinSoC * 100).ToGUIFormat()
-        tbMaxSoC.Text = (strategyParams.MaxSoC * 100).ToGUIFormat()
-        tbTargetSoC.Text = (strategyParams.TargetSoC * 100).ToGUIFormat()
-
-        tbAuxBufferChargeTime.Text = strategyParams.AuxBufferChargeTime.ToGUIFormat()
-        tbauxBufferTime.Text = strategyParams.AuxBufferTime.ToGUIFormat()
-        tbMinICEOnTime.Text = strategyParams.MinimumICEOnTime.ToGUIFormat()
-
-        tbICEStartPenaltyFactor.Text = strategyParams.ICEStartPenaltyFactor.ToGUIFormat()
-        tbCostFactorSoCExponent.Text = if(Double.IsNaN(strategyParams.CostFactorSOCExpponent), 5, strategyParams.CostFactorSOCExpponent).ToGUIFormat()
-        tbGensetMinOptPowerFactor.Text = if (double.IsNaN(strategyParams.GensetMinOptPowerFactor), "", strategyParams.GensetMinOptPowerFactor.ToGUIFormat())
-        DeclInit()
+        UpdateForm(JobType)
+        Dim inputData = TryCast(JSONInputDataFactory.ReadComponentData(file), IEngineeringInputDataProvider)
+        Dim strategyParams As IHybridStrategyParameters = inputData.JobInputData.HybridStrategyParameters
+
+        Select Case JobType
+            Case VectoSimulationJobType.ParallelHybridVehicle
+                tbEquivalenceFactorDischarge.Text = strategyParams.EquivalenceFactorDischarge.ToGUIFormat()
+                tbEquivalenceFactorCharge.Text = strategyParams.EquivalenceFactorCharge.ToGUIFormat()
+                tbMinSoC.Text = (strategyParams.MinSoC * 100).ToGUIFormat()
+                tbMaxSoC.Text = (strategyParams.MaxSoC * 100).ToGUIFormat()
+                tbTargetSoC.Text = (strategyParams.TargetSoC * 100).ToGUIFormat()
+
+                tbMinICEOnTime.Text = strategyParams.MinimumICEOnTime.ToGUIFormat()
+                tbauxBufferTime.Text = strategyParams.AuxBufferTime.ToGUIFormat()
+                tbAuxBufferChargeTime.Text = strategyParams.AuxBufferChargeTime.ToGUIFormat()
+
+                tbICEStartPenaltyFactor.Text = strategyParams.ICEStartPenaltyFactor.ToGUIFormat()
+                tbCostFactorSoCExponent.Text = If(Double.IsNaN(strategyParams.CostFactorSOCExpponent), 5, strategyParams.CostFactorSOCExpponent).ToGUIFormat()
+
+            Case VectoSimulationJobType.SerialHybridVehicle
+                tbMinSoC.Text = (strategyParams.MinSoC * 100).ToGUIFormat()
+                tbTargetSoC.Text = (strategyParams.TargetSoC * 100).ToGUIFormat()
+
+            Case Else
+                tbEquivalenceFactorDischarge.Text = strategyParams.EquivalenceFactorDischarge.ToGUIFormat()
+                tbEquivalenceFactorCharge.Text = strategyParams.EquivalenceFactorCharge.ToGUIFormat()
+                tbMinSoC.Text = (strategyParams.MinSoC * 100).ToGUIFormat()
+                tbMaxSoC.Text = (strategyParams.MaxSoC * 100).ToGUIFormat()
+                tbTargetSoC.Text = (strategyParams.TargetSoC * 100).ToGUIFormat()
+
+                tbMinICEOnTime.Text = strategyParams.MinimumICEOnTime.ToGUIFormat()
+                tbauxBufferTime.Text = strategyParams.AuxBufferTime.ToGUIFormat()
+                tbAuxBufferChargeTime.Text = strategyParams.AuxBufferChargeTime.ToGUIFormat()
+
+                tbICEStartPenaltyFactor.Text = strategyParams.ICEStartPenaltyFactor.ToGUIFormat()
+                tbCostFactorSoCExponent.Text = If(Double.IsNaN(strategyParams.CostFactorSOCExpponent), 5, strategyParams.CostFactorSOCExpponent).ToGUIFormat()
+                tbGensetMinOptPowerFactor.Text = If(Double.IsNaN(strategyParams.GensetMinOptPowerFactor), "", strategyParams.GensetMinOptPowerFactor.ToGUIFormat())
+        End Select
 
         REESSFileBrowser.UpdateHistory(file)
         Text = GetFilenameWithoutPath(file, True)
         LbStatus.Text = ""
         _strategyParamsFile = file
+
         Activate()
 
         _changed = False
     End Sub
 
     'Save or Save As function = true if file is saved
-    Private Function SaveOrSaveAs(ByVal saveAs As Boolean) As Boolean
+    Private Function SaveOrSaveAs(saveAs As Boolean) As Boolean
         If _strategyParamsFile = "" Or saveAs Then
             If HCUFileBrowser.SaveDialog(_strategyParamsFile) Then
                 _strategyParamsFile = HCUFileBrowser.Files(0)
@@ -203,26 +234,22 @@ Public Class HybridStrategyParamsForm
         Return SaveParamsToFile(_strategyParamsFile)
     End Function
 
-    'Save VENG file to given filepath. Called by SaveOrSaveAs. 
-    Private Function SaveParamsToFile(ByVal file As String) As Boolean
-
-        Dim strategyParams As HybridStrategyParams = New HybridStrategyParams
-        strategyParams.FilePath = file
-
-
-        strategyParams.EquivalenceFactorDischarge = tbEquivalenceFactorDischarge.Text.ToDouble(0)
-        strategyParams.EquivalenceFactorCharge = tbEquivalenceFactorCharge.Text.ToDouble(0)
-
-        strategyParams.MinSoC = tbMinSoC.Text.ToDouble(0) / 100
-        strategyParams.MaxSoC = tbMaxSoC.Text.ToDouble(0) / 100
-        strategyParams.TargetSoC = tbTargetSoC.Text.ToDouble(0) / 100
-
-        strategyParams.MinimumIceOnTime = tbMinICEOnTime.Text.ToDouble(0)
-        strategyParams.AuxiliaryBufferTime = tbauxBufferTime.Text.ToDouble(0)
-        strategyParams.AuxiliaryBufferChgTime = tbAuxBufferChargeTime.Text.ToDouble(0)
-        strategyParams.ICEStartPenaltyFactor = tbICEStartPenaltyFactor.Text.ToDouble()
-        strategyParams.CostFactorSOCExpponent = tbCostFactorSoCExponent.Text.ToDouble(5)
-        strategyParams.GensetMinOptPowerFactor = 1
+    'Save VENG file to given filepath.
+    Private Function SaveParamsToFile(file As String) As Boolean
+        Dim strategyParams = New HybridStrategyParams With {
+                .FilePath = file,
+                .EquivalenceFactorDischarge = tbEquivalenceFactorDischarge.Text.ToDouble(0),
+                .EquivalenceFactorCharge = tbEquivalenceFactorCharge.Text.ToDouble(0),
+                .MinSoC = tbMinSoC.Text.ToDouble(0) / 100,
+                .MaxSoC = tbMaxSoC.Text.ToDouble(0) / 100,
+                .TargetSoC = tbTargetSoC.Text.ToDouble(0) / 100,
+                .MinimumIceOnTime = tbMinICEOnTime.Text.ToDouble(0),
+                .AuxiliaryBufferTime = tbauxBufferTime.Text.ToDouble(0),
+                .AuxiliaryBufferChgTime = tbAuxBufferChargeTime.Text.ToDouble(0),
+                .ICEStartPenaltyFactor = tbICEStartPenaltyFactor.Text.ToDouble(0),
+                .CostFactorSOCExpponent = tbCostFactorSoCExponent.Text.ToDouble(0),
+                .GensetMinOptPowerFactor = tbGensetMinOptPowerFactor.Text.ToDouble(0)
+                }
 
         If Not strategyParams.SaveFile Then
             MsgBox("Cannot save to " & file, MsgBoxStyle.Critical)
@@ -246,130 +273,43 @@ Public Class HybridStrategyParamsForm
         Return True
     End Function
 
-
-#Region "Track changes"
-
-    'Flags current file as modified.
-    Private Sub Change()
-        If Not _changed Then
-            LbStatus.Text = "Unsaved changes in current file"
-            _changed = True
-        End If
-    End Sub
-
-    ' "Save changes ?" .... Returns True if User aborts
     Private Function ChangeCheckCancel() As Boolean
-
         If _changed Then
             Select Case MsgBox("Save changes ?", MsgBoxStyle.YesNoCancel)
                 Case MsgBoxResult.Yes
                     Return Not SaveOrSaveAs(False)
                 Case MsgBoxResult.Cancel
                     Return True
-                Case Else 'MsgBoxResult.No
+                Case Else
                     _changed = False
                     Return False
             End Select
-
         Else
-
             Return False
-
         End If
     End Function
 
-
-
-
-
-
-#End Region
-
-
-
-    'Save and close
     Private Sub ButOK_Click(sender As Object, e As EventArgs) Handles ButOK.Click
         If SaveOrSaveAs(False) Then Close()
     End Sub
 
-    'Close without saving (see FormClosing Event)
     Private Sub ButCancel_Click(sender As Object, e As EventArgs) Handles ButCancel.Click
         Close()
     End Sub
 
-
-#Region "Open File Context Menu"
-
-
-    Private Sub OpenFiles(ParamArray files() As String)
-
-        If files.Length = 0 Then Exit Sub
-
-        _contextMenuFiles = files
-
-        OpenWithToolStripMenuItem.Text = "Open with " & Cfg.OpenCmdName
-
-        CmOpenFile.Show(Windows.Forms.Cursor.Position)
-    End Sub
-
-    Private Sub OpenWithToolStripMenuItem_Click(sender As Object, e As EventArgs) _
-        Handles OpenWithToolStripMenuItem.Click
-        If Not FileOpenAlt(_contextMenuFiles(0)) Then MsgBox("Failed to open file!")
-    End Sub
-
-    Private Sub ShowInFolderToolStripMenuItem_Click(sender As Object, e As EventArgs) _
-        Handles ShowInFolderToolStripMenuItem.Click
-        If File.Exists(_contextMenuFiles(0)) Then
-            Try
-                Process.Start("explorer", "/select,""" & _contextMenuFiles(0) & "")
-            Catch ex As Exception
-                MsgBox("Failed to open file!")
-            End Try
-        Else
-            MsgBox("File not found!")
-        End If
+    Private Sub tbMinSoC_TextChanged(sender As Object, e As EventArgs) Handles tbEquivalenceFactorDischarge.TextChanged,
+                                                                               tbEquivalenceFactorCharge.TextChanged,
+                                                                               tbMinSoC.TextChanged,
+                                                                               tbMaxSoC.TextChanged,
+                                                                               tbTargetSoC.TextChanged,
+                                                                               tbMinICEOnTime.TextChanged,
+                                                                               tbauxBufferTime.TextChanged,
+                                                                               tbAuxBufferChargeTime.TextChanged,
+                                                                               tbICEStartPenaltyFactor.TextChanged,
+                                                                               tbCostFactorSoCExponent.TextChanged,
+                                                                               tbGensetMinOptPowerFactor.TextChanged
+
+        LbStatus.Text = "Unsaved changes in current file"
+        _changed = True
     End Sub
-
-    Private Sub tbMinSoC_TextChanged(sender As Object, e As EventArgs) Handles tbMinSoC.TextChanged
-        Change()
-    End Sub
-
-    Private Sub tbMaxSoC_TextChanged(sender As Object, e As EventArgs) Handles tbMaxSoC.TextChanged
-        Change()
-    End Sub
-
-    Private Sub tbTargetSoC_TextChanged(sender As Object, e As EventArgs) Handles tbTargetSoC.TextChanged
-        Change()
-    End Sub
-
-    Private Sub tbauxBufferTime_TextChanged(sender As Object, e As EventArgs) Handles tbauxBufferTime.TextChanged
-        Change()
-    End Sub
-
-    Private Sub tbAuxBufferChargeTime_TextChanged(sender As Object, e As EventArgs) Handles tbAuxBufferChargeTime.TextChanged
-        Change()
-    End Sub
-
-    Private Sub tbEquivalenceFactor_TextChanged(sender As Object, e As EventArgs) Handles tbEquivalenceFactorDischarge.TextChanged
-        Change()
-    End Sub
-
-    Private Sub Panel4_Paint(sender As Object, e As PaintEventArgs) Handles pnCostFactorSoCExponent.Paint
-
-    End Sub
-
-    Private Sub tbICEStartPenaltyFactor_TextChanged(sender As Object, e As EventArgs) Handles tbICEStartPenaltyFactor.TextChanged
-        Change()
-    End Sub
-
-    Private Sub tbCostFactorSoCExponent_TextChanged(sender As Object, e As EventArgs) Handles tbCostFactorSoCExponent.TextChanged
-        Change()
-    End Sub
-
-#End Region
-
-
-
-
-
 End Class
diff --git a/VECTO/GUI/REESSPackDialog.Designer.vb b/VECTO/GUI/REESSPackDialog.Designer.vb
index 89c43b185b1d20ed000ada470e3866b3cc8a2e40..55ee15337aed0b62a4acc343f6e3fd6f3f478553 100644
--- a/VECTO/GUI/REESSPackDialog.Designer.vb
+++ b/VECTO/GUI/REESSPackDialog.Designer.vb
@@ -59,21 +59,19 @@ Partial Class REESSPackDialog
         Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50!))
         Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
         Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
-        Me.TableLayoutPanel1.Location = New System.Drawing.Point(632, 166)
-        Me.TableLayoutPanel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(421, 119)
         Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
         Me.TableLayoutPanel1.RowCount = 1
-        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50!))
-        Me.TableLayoutPanel1.Size = New System.Drawing.Size(219, 45)
+        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
+        Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
         Me.TableLayoutPanel1.TabIndex = 4
         '
         'OK_Button
         '
         Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
-        Me.OK_Button.Location = New System.Drawing.Point(4, 5)
-        Me.OK_Button.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.OK_Button.Location = New System.Drawing.Point(3, 3)
         Me.OK_Button.Name = "OK_Button"
-        Me.OK_Button.Size = New System.Drawing.Size(100, 35)
+        Me.OK_Button.Size = New System.Drawing.Size(67, 23)
         Me.OK_Button.TabIndex = 3
         Me.OK_Button.Text = "OK"
         '
@@ -81,10 +79,9 @@ Partial Class REESSPackDialog
         '
         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(114, 5)
-        Me.Cancel_Button.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
         Me.Cancel_Button.Name = "Cancel_Button"
-        Me.Cancel_Button.Size = New System.Drawing.Size(100, 35)
+        Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
         Me.Cancel_Button.TabIndex = 4
         Me.Cancel_Button.Text = "Cancel"
         '
@@ -93,95 +90,86 @@ Partial Class REESSPackDialog
         Me.pnREESSPack.Controls.Add(Me.btnOpenBattery)
         Me.pnREESSPack.Controls.Add(Me.btnBrowseBattery)
         Me.pnREESSPack.Controls.Add(Me.tbBattery)
-        Me.pnREESSPack.Location = New System.Drawing.Point(18, 18)
-        Me.pnREESSPack.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnREESSPack.Location = New System.Drawing.Point(12, 12)
         Me.pnREESSPack.Name = "pnREESSPack"
-        Me.pnREESSPack.Size = New System.Drawing.Size(830, 42)
+        Me.pnREESSPack.Size = New System.Drawing.Size(553, 27)
         Me.pnREESSPack.TabIndex = 0
         '
         'btnOpenBattery
         '
-        Me.btnOpenBattery.Location = New System.Drawing.Point(6, 5)
-        Me.btnOpenBattery.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnOpenBattery.Location = New System.Drawing.Point(4, 3)
         Me.btnOpenBattery.Name = "btnOpenBattery"
-        Me.btnOpenBattery.Size = New System.Drawing.Size(141, 32)
+        Me.btnOpenBattery.Size = New System.Drawing.Size(94, 21)
         Me.btnOpenBattery.TabIndex = 0
-        Me.btnOpenBattery.TabStop = false
+        Me.btnOpenBattery.TabStop = False
         Me.btnOpenBattery.Text = "REESS Pack"
-        Me.btnOpenBattery.UseVisualStyleBackColor = true
+        Me.btnOpenBattery.UseVisualStyleBackColor = True
         '
         'btnBrowseBattery
         '
-        Me.btnBrowseBattery.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.btnBrowseBattery.Image = CType(resources.GetObject("btnBrowseBattery.Image"),System.Drawing.Image)
-        Me.btnBrowseBattery.Location = New System.Drawing.Point(790, 3)
-        Me.btnBrowseBattery.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnBrowseBattery.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.btnBrowseBattery.Image = CType(resources.GetObject("btnBrowseBattery.Image"), System.Drawing.Image)
+        Me.btnBrowseBattery.Location = New System.Drawing.Point(527, 2)
         Me.btnBrowseBattery.Name = "btnBrowseBattery"
-        Me.btnBrowseBattery.Size = New System.Drawing.Size(36, 37)
+        Me.btnBrowseBattery.Size = New System.Drawing.Size(24, 24)
         Me.btnBrowseBattery.TabIndex = 1
-        Me.btnBrowseBattery.UseVisualStyleBackColor = true
+        Me.btnBrowseBattery.UseVisualStyleBackColor = True
         '
         'tbBattery
         '
-        Me.tbBattery.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.tbBattery.Location = New System.Drawing.Point(156, 6)
-        Me.tbBattery.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbBattery.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.tbBattery.Location = New System.Drawing.Point(104, 4)
         Me.tbBattery.Name = "tbBattery"
-        Me.tbBattery.Size = New System.Drawing.Size(624, 26)
+        Me.tbBattery.Size = New System.Drawing.Size(417, 20)
         Me.tbBattery.TabIndex = 0
         '
         'tbBatteryPackCnt
         '
-        Me.tbBatteryPackCnt.Location = New System.Drawing.Point(321, 69)
-        Me.tbBatteryPackCnt.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbBatteryPackCnt.Location = New System.Drawing.Point(214, 45)
         Me.tbBatteryPackCnt.Name = "tbBatteryPackCnt"
-        Me.tbBatteryPackCnt.Size = New System.Drawing.Size(86, 26)
+        Me.tbBatteryPackCnt.Size = New System.Drawing.Size(59, 20)
         Me.tbBatteryPackCnt.TabIndex = 1
         '
         'lblBatteryPackCnt
         '
-        Me.lblBatteryPackCnt.AutoSize = true
-        Me.lblBatteryPackCnt.Location = New System.Drawing.Point(26, 74)
-        Me.lblBatteryPackCnt.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblBatteryPackCnt.AutoSize = True
+        Me.lblBatteryPackCnt.Location = New System.Drawing.Point(17, 48)
         Me.lblBatteryPackCnt.Name = "lblBatteryPackCnt"
-        Me.lblBatteryPackCnt.Size = New System.Drawing.Size(183, 20)
+        Me.lblBatteryPackCnt.Size = New System.Drawing.Size(124, 13)
         Me.lblBatteryPackCnt.TabIndex = 25
         Me.lblBatteryPackCnt.Text = "Number of RESS Packs:"
         '
         'tbStreamId
         '
-        Me.tbStreamId.Location = New System.Drawing.Point(321, 109)
-        Me.tbStreamId.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbStreamId.Location = New System.Drawing.Point(214, 71)
         Me.tbStreamId.Name = "tbStreamId"
-        Me.tbStreamId.Size = New System.Drawing.Size(86, 26)
+        Me.tbStreamId.Size = New System.Drawing.Size(59, 20)
         Me.tbStreamId.TabIndex = 2
         '
         'lblStreamId
         '
-        Me.lblStreamId.AutoSize = true
-        Me.lblStreamId.Location = New System.Drawing.Point(26, 114)
-        Me.lblStreamId.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblStreamId.AutoSize = True
+        Me.lblStreamId.Location = New System.Drawing.Point(17, 74)
         Me.lblStreamId.Name = "lblStreamId"
-        Me.lblStreamId.Size = New System.Drawing.Size(74, 20)
+        Me.lblStreamId.Size = New System.Drawing.Size(50, 13)
         Me.lblStreamId.TabIndex = 27
         Me.lblStreamId.Text = "Stream #"
         '
         'REESSPackDialog
         '
         Me.AcceptButton = Me.OK_Button
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+        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(868, 229)
+        Me.ClientSize = New System.Drawing.Size(579, 160)
         Me.Controls.Add(Me.tbStreamId)
         Me.Controls.Add(Me.lblStreamId)
         Me.Controls.Add(Me.tbBatteryPackCnt)
         Me.Controls.Add(Me.lblBatteryPackCnt)
         Me.Controls.Add(Me.pnREESSPack)
         Me.Controls.Add(Me.TableLayoutPanel1)
-        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
-        Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
         Me.MaximizeBox = false
         Me.MinimizeBox = false
         Me.Name = "REESSPackDialog"
diff --git a/VECTO/GUI/VectoJobForm.Designer.vb b/VECTO/GUI/VectoJobForm.Designer.vb
index 4e54b321830fb2e58d7e600db3d9c722d278a85a..1c17363f3b9258b8560357a111da41eee5137f10 100644
--- a/VECTO/GUI/VectoJobForm.Designer.vb
+++ b/VECTO/GUI/VectoJobForm.Designer.vb
@@ -25,2053 +25,2248 @@ Partial Class VectoJobForm
 	'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
 	<DebuggerStepThrough()> _
 	Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(VectoJobForm))
-        Me.TabPgGen = New System.Windows.Forms.TabPage()
-        Me.pnHybridStrategy = New System.Windows.Forms.Panel()
-        Me.btnOpenHybridStrategyParameters = New System.Windows.Forms.Button()
-        Me.tbHybridStrategyParams = New System.Windows.Forms.TextBox()
-        Me.btnBrowseHybridStrategyParams = New System.Windows.Forms.Button()
-        Me.pnVehicle = New System.Windows.Forms.Panel()
-        Me.ButOpenVEH = New System.Windows.Forms.Button()
-        Me.ButtonVEH = New System.Windows.Forms.Button()
-        Me.TbVEH = New System.Windows.Forms.TextBox()
-        Me.pnEngine = New System.Windows.Forms.Panel()
-        Me.ButOpenENG = New System.Windows.Forms.Button()
-        Me.ButtonMAP = New System.Windows.Forms.Button()
-        Me.TbENG = New System.Windows.Forms.TextBox()
-        Me.pnGearbox = New System.Windows.Forms.Panel()
-        Me.ButOpenGBX = New System.Windows.Forms.Button()
-        Me.ButtonGBX = New System.Windows.Forms.Button()
-        Me.TbGBX = New System.Windows.Forms.TextBox()
-        Me.pnShiftParams = New System.Windows.Forms.Panel()
-        Me.BtnShiftParamsForm = New System.Windows.Forms.Button()
-        Me.TbShiftStrategyParams = New System.Windows.Forms.TextBox()
-        Me.BtnShiftStrategyParams = New System.Windows.Forms.Button()
-        Me.GrCycles = New System.Windows.Forms.GroupBox()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.LvCycles = New System.Windows.Forms.ListView()
-        Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
-        Me.BtDRIrem = New System.Windows.Forms.Button()
-        Me.BtDRIadd = New System.Windows.Forms.Button()
-        Me.GrAuxMech = New System.Windows.Forms.GroupBox()
-        Me.pnAuxDeclarationMode = New System.Windows.Forms.Panel()
-        Me.LvAux = New System.Windows.Forms.ListView()
-        Me.ColumnHeader4 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader5 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
-        Me.ColumnHeader6 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
-        Me.Label32 = New System.Windows.Forms.Label()
-        Me.pnAuxEngineering = New System.Windows.Forms.Panel()
-        Me.tbPAuxStandstillICEOff = New System.Windows.Forms.TextBox()
-        Me.lblAuxStandstillICEOffUnit = New System.Windows.Forms.Label()
-        Me.lblAuxStandstillICEOff = New System.Windows.Forms.Label()
-        Me.tbPAuxDrivingICEOff = New System.Windows.Forms.TextBox()
-        Me.lblAuxDrivingICEOffUnit = New System.Windows.Forms.Label()
-        Me.lblAuxDrivingICEOff = New System.Windows.Forms.Label()
-        Me.TbAuxPAuxICEOn = New System.Windows.Forms.TextBox()
-        Me.lblAuxICEOnUnit = New System.Windows.Forms.Label()
-        Me.lblAuxICEOn = New System.Windows.Forms.Label()
-        Me.GrAux = New System.Windows.Forms.GroupBox()
-        Me.Label9 = New System.Windows.Forms.Label()
-        Me.TbAuxPAdd = New System.Windows.Forms.TextBox()
-        Me.Label8 = New System.Windows.Forms.Label()
-        Me.btnAAUXOpen = New System.Windows.Forms.Button()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.btnBrowseAAUXFile = New System.Windows.Forms.Button()
-        Me.txtAdvancedAuxiliaryFile = New System.Windows.Forms.TextBox()
-        Me.picAuxInfo = New System.Windows.Forms.PictureBox()
-        Me.cboAdvancedAuxiliaries = New System.Windows.Forms.ComboBox()
-        Me.lbAdvancedAuxiliaries = New System.Windows.Forms.Label()
-        Me.tcJob = New System.Windows.Forms.TabControl()
-        Me.tpAuxiliaries = New System.Windows.Forms.TabPage()
-        Me.gbBusAux = New System.Windows.Forms.GroupBox()
-        Me.cbEnableBusAux = New System.Windows.Forms.CheckBox()
-        Me.pnBusAux = New System.Windows.Forms.Panel()
-        Me.btnBusAuxP = New System.Windows.Forms.Button()
-        Me.tbBusAuxParams = New System.Windows.Forms.TextBox()
-        Me.btnBrowsBusAuxParams = New System.Windows.Forms.Button()
-        Me.gbElectricAux = New System.Windows.Forms.GroupBox()
-        Me.Label46 = New System.Windows.Forms.Label()
-        Me.lblElAuxConstUnit = New System.Windows.Forms.Label()
-        Me.tbElectricAuxConstant = New System.Windows.Forms.TextBox()
-        Me.lblElAuxConst = New System.Windows.Forms.Label()
-        Me.tpCycles = New System.Windows.Forms.TabPage()
-        Me.TabPgDriver = New System.Windows.Forms.TabPage()
-        Me.GrVACC = New System.Windows.Forms.GroupBox()
-        Me.Label15 = New System.Windows.Forms.Label()
-        Me.TbDesMaxFile = New System.Windows.Forms.TextBox()
-        Me.BtDesMaxBr = New System.Windows.Forms.Button()
-        Me.BtAccOpen = New System.Windows.Forms.Button()
-        Me.GrLAC = New System.Windows.Forms.GroupBox()
-        Me.pnLookAheadCoasting = New System.Windows.Forms.Panel()
-        Me.Label7 = New System.Windows.Forms.Label()
-        Me.Label6 = New System.Windows.Forms.Label()
-        Me.tbLacMinSpeed = New System.Windows.Forms.TextBox()
-        Me.btnDfVelocityDrop = New System.Windows.Forms.Button()
-        Me.Label12 = New System.Windows.Forms.Label()
-        Me.tbDfCoastingScale = New System.Windows.Forms.TextBox()
-        Me.Label11 = New System.Windows.Forms.Label()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.tbDfCoastingOffset = New System.Windows.Forms.TextBox()
-        Me.tbLacDfTargetSpeedFile = New System.Windows.Forms.TextBox()
-        Me.Label10 = New System.Windows.Forms.Label()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.Label5 = New System.Windows.Forms.Label()
-        Me.btnDfTargetSpeed = New System.Windows.Forms.Button()
-        Me.tbLacPreviewFactor = New System.Windows.Forms.TextBox()
-        Me.tbLacDfVelocityDropFile = New System.Windows.Forms.TextBox()
-        Me.CbLookAhead = New System.Windows.Forms.CheckBox()
-        Me.gbOverspeed = New System.Windows.Forms.GroupBox()
-        Me.PnEcoRoll = New System.Windows.Forms.Panel()
-        Me.Label21 = New System.Windows.Forms.Label()
-        Me.Label14 = New System.Windows.Forms.Label()
-        Me.TbVmin = New System.Windows.Forms.TextBox()
-        Me.TbOverspeed = New System.Windows.Forms.TextBox()
-        Me.Label23 = New System.Windows.Forms.Label()
-        Me.Label13 = New System.Windows.Forms.Label()
-        Me.RdOverspeed = New System.Windows.Forms.RadioButton()
-        Me.RdOff = New System.Windows.Forms.RadioButton()
-        Me.TabPgADAS = New System.Windows.Forms.TabPage()
-        Me.gbPCC = New System.Windows.Forms.GroupBox()
-        Me.Label43 = New System.Windows.Forms.Label()
-        Me.Label42 = New System.Windows.Forms.Label()
-        Me.Label40 = New System.Windows.Forms.Label()
-        Me.Label41 = New System.Windows.Forms.Label()
-        Me.tbPCCPreviewUseCase2 = New System.Windows.Forms.TextBox()
-        Me.Label38 = New System.Windows.Forms.Label()
-        Me.Label39 = New System.Windows.Forms.Label()
-        Me.tbPCCPreviewUseCase1 = New System.Windows.Forms.TextBox()
-        Me.Label36 = New System.Windows.Forms.Label()
-        Me.Label37 = New System.Windows.Forms.Label()
-        Me.tbPCCMinSpeed = New System.Windows.Forms.TextBox()
-        Me.Label34 = New System.Windows.Forms.Label()
-        Me.Label35 = New System.Windows.Forms.Label()
-        Me.tbPCCEnableSpeed = New System.Windows.Forms.TextBox()
-        Me.Label31 = New System.Windows.Forms.Label()
-        Me.Label33 = New System.Windows.Forms.Label()
-        Me.tbPCCOverspeed = New System.Windows.Forms.TextBox()
-        Me.Label20 = New System.Windows.Forms.Label()
-        Me.Label22 = New System.Windows.Forms.Label()
-        Me.tbPCCUnderspeed = New System.Windows.Forms.TextBox()
-        Me.gbEcoRoll = New System.Windows.Forms.GroupBox()
-        Me.Label44 = New System.Windows.Forms.Label()
-        Me.Label45 = New System.Windows.Forms.Label()
-        Me.tbEcoRollMaxAcc = New System.Windows.Forms.TextBox()
-        Me.Label29 = New System.Windows.Forms.Label()
-        Me.Label30 = New System.Windows.Forms.Label()
-        Me.tbEcoRollUnderspeed = New System.Windows.Forms.TextBox()
-        Me.Label27 = New System.Windows.Forms.Label()
-        Me.Label28 = New System.Windows.Forms.Label()
-        Me.tbEcoRollActivationDelay = New System.Windows.Forms.TextBox()
-        Me.Label25 = New System.Windows.Forms.Label()
-        Me.Label26 = New System.Windows.Forms.Label()
-        Me.tbEcoRollMinSpeed = New System.Windows.Forms.TextBox()
-        Me.gbEngineStopStart = New System.Windows.Forms.GroupBox()
-        Me.tbESSUtilityFactorDriving = New System.Windows.Forms.TextBox()
-        Me.lblESSUtilityFactorDriving = New System.Windows.Forms.Label()
-        Me.tbEssUtility = New System.Windows.Forms.TextBox()
-        Me.Label24 = New System.Windows.Forms.Label()
-        Me.Label18 = New System.Windows.Forms.Label()
-        Me.tbMaxEngineOffTimespan = New System.Windows.Forms.TextBox()
-        Me.Label19 = New System.Windows.Forms.Label()
-        Me.Label17 = New System.Windows.Forms.Label()
-        Me.tbEngineStopStartActivationDelay = New System.Windows.Forms.TextBox()
-        Me.Label16 = New System.Windows.Forms.Label()
-        Me.ButAuxRem = New System.Windows.Forms.Button()
-        Me.ButAuxAdd = New System.Windows.Forms.Button()
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
-        Me.TbUnderSpeed = New System.Windows.Forms.TextBox()
-        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
-        Me.ToolStripStatusLabelGEN = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.ButOK = New System.Windows.Forms.Button()
-        Me.ButCancel = New System.Windows.Forms.Button()
-        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
-        Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
-        Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.PicVehicle = New System.Windows.Forms.PictureBox()
-        Me.PicBox = New System.Windows.Forms.PictureBox()
-        Me.TbEngTxt = New System.Windows.Forms.TextBox()
-        Me.TbVehCat = New System.Windows.Forms.TextBox()
-        Me.TbAxleConf = New System.Windows.Forms.TextBox()
-        Me.TbHVCclass = New System.Windows.Forms.TextBox()
-        Me.TbGbxTxt = New System.Windows.Forms.TextBox()
-        Me.TbMass = New System.Windows.Forms.TextBox()
-        Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
-        Me.lblEngineCharacteristics = New System.Windows.Forms.Label()
-        Me.lblTitle = New System.Windows.Forms.Label()
-        Me.pnJobInfo = New System.Windows.Forms.Panel()
-        Me.TabPgGen.SuspendLayout
-        Me.pnHybridStrategy.SuspendLayout
-        Me.pnVehicle.SuspendLayout
-        Me.pnEngine.SuspendLayout
-        Me.pnGearbox.SuspendLayout
-        Me.pnShiftParams.SuspendLayout
-        Me.GrCycles.SuspendLayout
-        Me.GrAuxMech.SuspendLayout
-        Me.pnAuxDeclarationMode.SuspendLayout
-        Me.pnAuxEngineering.SuspendLayout
-        CType(Me.picAuxInfo,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.tcJob.SuspendLayout
-        Me.tpAuxiliaries.SuspendLayout
-        Me.gbBusAux.SuspendLayout
-        Me.pnBusAux.SuspendLayout
-        Me.gbElectricAux.SuspendLayout
-        Me.tpCycles.SuspendLayout
-        Me.TabPgDriver.SuspendLayout
-        Me.GrVACC.SuspendLayout
-        Me.GrLAC.SuspendLayout
-        Me.pnLookAheadCoasting.SuspendLayout
-        Me.gbOverspeed.SuspendLayout
-        Me.PnEcoRoll.SuspendLayout
-        Me.TabPgADAS.SuspendLayout
-        Me.gbPCC.SuspendLayout
-        Me.gbEcoRoll.SuspendLayout
-        Me.gbEngineStopStart.SuspendLayout
-        Me.StatusStrip1.SuspendLayout
-        Me.ToolStrip1.SuspendLayout
-        CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.CmOpenFile.SuspendLayout
-        CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).BeginInit
-        CType(Me.PicBox,System.ComponentModel.ISupportInitialize).BeginInit
-        Me.pnJobInfo.SuspendLayout
-        Me.SuspendLayout
-        '
-        'TabPgGen
-        '
-        Me.TabPgGen.Controls.Add(Me.pnHybridStrategy)
-        Me.TabPgGen.Controls.Add(Me.pnVehicle)
-        Me.TabPgGen.Controls.Add(Me.pnEngine)
-        Me.TabPgGen.Controls.Add(Me.pnGearbox)
-        Me.TabPgGen.Controls.Add(Me.pnShiftParams)
-        Me.TabPgGen.Location = New System.Drawing.Point(4, 22)
-        Me.TabPgGen.Name = "TabPgGen"
-        Me.TabPgGen.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
-        Me.TabPgGen.Size = New System.Drawing.Size(525, 494)
-        Me.TabPgGen.TabIndex = 0
-        Me.TabPgGen.Text = "General"
-        Me.TabPgGen.UseVisualStyleBackColor = true
-        '
-        'pnHybridStrategy
-        '
-        Me.pnHybridStrategy.Controls.Add(Me.btnOpenHybridStrategyParameters)
-        Me.pnHybridStrategy.Controls.Add(Me.tbHybridStrategyParams)
-        Me.pnHybridStrategy.Controls.Add(Me.btnBrowseHybridStrategyParams)
-        Me.pnHybridStrategy.Location = New System.Drawing.Point(4, 125)
-        Me.pnHybridStrategy.Name = "pnHybridStrategy"
-        Me.pnHybridStrategy.Size = New System.Drawing.Size(516, 26)
-        Me.pnHybridStrategy.TabIndex = 4
-        '
-        'btnOpenHybridStrategyParameters
-        '
-        Me.btnOpenHybridStrategyParameters.Location = New System.Drawing.Point(3, 3)
-        Me.btnOpenHybridStrategyParameters.Name = "btnOpenHybridStrategyParameters"
-        Me.btnOpenHybridStrategyParameters.Size = New System.Drawing.Size(72, 21)
-        Me.btnOpenHybridStrategyParameters.TabIndex = 0
-        Me.btnOpenHybridStrategyParameters.Text = "Hyb. Str. P."
-        Me.btnOpenHybridStrategyParameters.UseVisualStyleBackColor = true
-        '
-        'tbHybridStrategyParams
-        '
-        Me.tbHybridStrategyParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.tbHybridStrategyParams.Location = New System.Drawing.Point(81, 3)
-        Me.tbHybridStrategyParams.Name = "tbHybridStrategyParams"
-        Me.tbHybridStrategyParams.Size = New System.Drawing.Size(406, 20)
-        Me.tbHybridStrategyParams.TabIndex = 1
-        '
-        'btnBrowseHybridStrategyParams
-        '
-        Me.btnBrowseHybridStrategyParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.btnBrowseHybridStrategyParams.Image = CType(resources.GetObject("btnBrowseHybridStrategyParams.Image"),System.Drawing.Image)
-        Me.btnBrowseHybridStrategyParams.Location = New System.Drawing.Point(489, 1)
-        Me.btnBrowseHybridStrategyParams.Name = "btnBrowseHybridStrategyParams"
-        Me.btnBrowseHybridStrategyParams.Size = New System.Drawing.Size(24, 24)
-        Me.btnBrowseHybridStrategyParams.TabIndex = 2
-        Me.btnBrowseHybridStrategyParams.UseVisualStyleBackColor = true
-        '
-        'pnVehicle
-        '
-        Me.pnVehicle.Controls.Add(Me.ButOpenVEH)
-        Me.pnVehicle.Controls.Add(Me.ButtonVEH)
-        Me.pnVehicle.Controls.Add(Me.TbVEH)
-        Me.pnVehicle.Location = New System.Drawing.Point(4, 7)
-        Me.pnVehicle.Name = "pnVehicle"
-        Me.pnVehicle.Size = New System.Drawing.Size(518, 27)
-        Me.pnVehicle.TabIndex = 0
-        '
-        'ButOpenVEH
-        '
-        Me.ButOpenVEH.Location = New System.Drawing.Point(4, 3)
-        Me.ButOpenVEH.Name = "ButOpenVEH"
-        Me.ButOpenVEH.Size = New System.Drawing.Size(72, 21)
-        Me.ButOpenVEH.TabIndex = 0
-        Me.ButOpenVEH.Text = "Vehicle"
-        Me.ButOpenVEH.UseVisualStyleBackColor = true
-        '
-        'ButtonVEH
-        '
-        Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.ButtonVEH.Image = CType(resources.GetObject("ButtonVEH.Image"),System.Drawing.Image)
-        Me.ButtonVEH.Location = New System.Drawing.Point(492, 2)
-        Me.ButtonVEH.Name = "ButtonVEH"
-        Me.ButtonVEH.Size = New System.Drawing.Size(24, 24)
-        Me.ButtonVEH.TabIndex = 2
-        Me.ButtonVEH.UseVisualStyleBackColor = true
-        '
-        'TbVEH
-        '
-        Me.TbVEH.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.TbVEH.Location = New System.Drawing.Point(82, 4)
-        Me.TbVEH.Name = "TbVEH"
-        Me.TbVEH.Size = New System.Drawing.Size(404, 20)
-        Me.TbVEH.TabIndex = 1
-        '
-        'pnEngine
-        '
-        Me.pnEngine.Controls.Add(Me.ButOpenENG)
-        Me.pnEngine.Controls.Add(Me.ButtonMAP)
-        Me.pnEngine.Controls.Add(Me.TbENG)
-        Me.pnEngine.Location = New System.Drawing.Point(4, 37)
-        Me.pnEngine.Name = "pnEngine"
-        Me.pnEngine.Size = New System.Drawing.Size(519, 27)
-        Me.pnEngine.TabIndex = 1
-        '
-        'ButOpenENG
-        '
-        Me.ButOpenENG.Location = New System.Drawing.Point(4, 3)
-        Me.ButOpenENG.Name = "ButOpenENG"
-        Me.ButOpenENG.Size = New System.Drawing.Size(72, 21)
-        Me.ButOpenENG.TabIndex = 0
-        Me.ButOpenENG.Text = "Engine"
-        Me.ButOpenENG.UseVisualStyleBackColor = true
-        '
-        'ButtonMAP
-        '
-        Me.ButtonMAP.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.ButtonMAP.Image = CType(resources.GetObject("ButtonMAP.Image"),System.Drawing.Image)
-        Me.ButtonMAP.Location = New System.Drawing.Point(492, 1)
-        Me.ButtonMAP.Name = "ButtonMAP"
-        Me.ButtonMAP.Size = New System.Drawing.Size(24, 24)
-        Me.ButtonMAP.TabIndex = 2
-        Me.ButtonMAP.UseVisualStyleBackColor = true
-        '
-        'TbENG
-        '
-        Me.TbENG.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.TbENG.Location = New System.Drawing.Point(82, 3)
-        Me.TbENG.Name = "TbENG"
-        Me.TbENG.Size = New System.Drawing.Size(404, 20)
-        Me.TbENG.TabIndex = 1
-        '
-        'pnGearbox
-        '
-        Me.pnGearbox.Controls.Add(Me.ButOpenGBX)
-        Me.pnGearbox.Controls.Add(Me.ButtonGBX)
-        Me.pnGearbox.Controls.Add(Me.TbGBX)
-        Me.pnGearbox.Location = New System.Drawing.Point(3, 66)
-        Me.pnGearbox.Name = "pnGearbox"
-        Me.pnGearbox.Size = New System.Drawing.Size(517, 28)
-        Me.pnGearbox.TabIndex = 2
-        '
-        'ButOpenGBX
-        '
-        Me.ButOpenGBX.Location = New System.Drawing.Point(4, 3)
-        Me.ButOpenGBX.Name = "ButOpenGBX"
-        Me.ButOpenGBX.Size = New System.Drawing.Size(72, 21)
-        Me.ButOpenGBX.TabIndex = 0
-        Me.ButOpenGBX.Text = "Gearbox"
-        Me.ButOpenGBX.UseVisualStyleBackColor = true
-        '
-        'ButtonGBX
-        '
-        Me.ButtonGBX.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.ButtonGBX.Image = CType(resources.GetObject("ButtonGBX.Image"),System.Drawing.Image)
-        Me.ButtonGBX.Location = New System.Drawing.Point(492, 1)
-        Me.ButtonGBX.Name = "ButtonGBX"
-        Me.ButtonGBX.Size = New System.Drawing.Size(24, 24)
-        Me.ButtonGBX.TabIndex = 2
-        Me.ButtonGBX.UseVisualStyleBackColor = true
-        '
-        'TbGBX
-        '
-        Me.TbGBX.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.TbGBX.Location = New System.Drawing.Point(82, 3)
-        Me.TbGBX.Name = "TbGBX"
-        Me.TbGBX.Size = New System.Drawing.Size(404, 20)
-        Me.TbGBX.TabIndex = 1
-        '
-        'pnShiftParams
-        '
-        Me.pnShiftParams.Controls.Add(Me.BtnShiftParamsForm)
-        Me.pnShiftParams.Controls.Add(Me.TbShiftStrategyParams)
-        Me.pnShiftParams.Controls.Add(Me.BtnShiftStrategyParams)
-        Me.pnShiftParams.Location = New System.Drawing.Point(4, 96)
-        Me.pnShiftParams.Name = "pnShiftParams"
-        Me.pnShiftParams.Size = New System.Drawing.Size(516, 26)
-        Me.pnShiftParams.TabIndex = 3
-        '
-        'BtnShiftParamsForm
-        '
-        Me.BtnShiftParamsForm.Location = New System.Drawing.Point(3, 3)
-        Me.BtnShiftParamsForm.Name = "BtnShiftParamsForm"
-        Me.BtnShiftParamsForm.Size = New System.Drawing.Size(72, 21)
-        Me.BtnShiftParamsForm.TabIndex = 0
-        Me.BtnShiftParamsForm.Text = "Shift Parameters"
-        Me.BtnShiftParamsForm.UseVisualStyleBackColor = true
-        '
-        'TbShiftStrategyParams
-        '
-        Me.TbShiftStrategyParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.TbShiftStrategyParams.Location = New System.Drawing.Point(81, 3)
-        Me.TbShiftStrategyParams.Name = "TbShiftStrategyParams"
-        Me.TbShiftStrategyParams.Size = New System.Drawing.Size(406, 20)
-        Me.TbShiftStrategyParams.TabIndex = 1
-        '
-        'BtnShiftStrategyParams
-        '
-        Me.BtnShiftStrategyParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.BtnShiftStrategyParams.Image = CType(resources.GetObject("BtnShiftStrategyParams.Image"),System.Drawing.Image)
-        Me.BtnShiftStrategyParams.Location = New System.Drawing.Point(489, 1)
-        Me.BtnShiftStrategyParams.Name = "BtnShiftStrategyParams"
-        Me.BtnShiftStrategyParams.Size = New System.Drawing.Size(24, 24)
-        Me.BtnShiftStrategyParams.TabIndex = 2
-        Me.BtnShiftStrategyParams.UseVisualStyleBackColor = true
-        '
-        'GrCycles
-        '
-        Me.GrCycles.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.GrCycles.Controls.Add(Me.Label2)
-        Me.GrCycles.Controls.Add(Me.LvCycles)
-        Me.GrCycles.Controls.Add(Me.BtDRIrem)
-        Me.GrCycles.Controls.Add(Me.BtDRIadd)
-        Me.GrCycles.Location = New System.Drawing.Point(6, 6)
-        Me.GrCycles.Name = "GrCycles"
-        Me.GrCycles.Size = New System.Drawing.Size(515, 138)
-        Me.GrCycles.TabIndex = 0
-        Me.GrCycles.TabStop = false
-        Me.GrCycles.Text = "Cycles"
-        '
-        'Label2
-        '
-        Me.Label2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.Label2.AutoSize = true
-        Me.Label2.Location = New System.Drawing.Point(391, 109)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(118, 13)
-        Me.Label2.TabIndex = 3
-        Me.Label2.Text = "(Right-Click for Options)"
-        '
-        'LvCycles
-        '
-        Me.LvCycles.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.LvCycles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1})
-        Me.LvCycles.FullRowSelect = true
-        Me.LvCycles.GridLines = true
-        Me.LvCycles.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
-        Me.LvCycles.HideSelection = false
-        Me.LvCycles.LabelEdit = true
-        Me.LvCycles.Location = New System.Drawing.Point(6, 19)
-        Me.LvCycles.MultiSelect = false
-        Me.LvCycles.Name = "LvCycles"
-        Me.LvCycles.Size = New System.Drawing.Size(503, 89)
-        Me.LvCycles.TabIndex = 0
-        Me.LvCycles.TabStop = false
-        Me.LvCycles.UseCompatibleStateImageBehavior = false
-        Me.LvCycles.View = System.Windows.Forms.View.Details
-        '
-        'ColumnHeader1
-        '
-        Me.ColumnHeader1.Text = "Cycle path"
-        Me.ColumnHeader1.Width = 470
-        '
-        'BtDRIrem
-        '
-        Me.BtDRIrem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.BtDRIrem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.BtDRIrem.Location = New System.Drawing.Point(29, 109)
-        Me.BtDRIrem.Name = "BtDRIrem"
-        Me.BtDRIrem.Size = New System.Drawing.Size(24, 24)
-        Me.BtDRIrem.TabIndex = 2
-        Me.BtDRIrem.UseVisualStyleBackColor = true
-        '
-        'BtDRIadd
-        '
-        Me.BtDRIadd.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.BtDRIadd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.BtDRIadd.Location = New System.Drawing.Point(5, 109)
-        Me.BtDRIadd.Name = "BtDRIadd"
-        Me.BtDRIadd.Size = New System.Drawing.Size(24, 24)
-        Me.BtDRIadd.TabIndex = 1
-        Me.BtDRIadd.UseVisualStyleBackColor = true
-        '
-        'GrAuxMech
-        '
-        Me.GrAuxMech.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.GrAuxMech.Controls.Add(Me.pnAuxDeclarationMode)
-        Me.GrAuxMech.Controls.Add(Me.pnAuxEngineering)
-        Me.GrAuxMech.Location = New System.Drawing.Point(6, 16)
-        Me.GrAuxMech.Name = "GrAuxMech"
-        Me.GrAuxMech.Size = New System.Drawing.Size(515, 280)
-        Me.GrAuxMech.TabIndex = 0
-        Me.GrAuxMech.TabStop = false
-        Me.GrAuxMech.Text = "Mechanical Auxiliaries"
-        '
-        'pnAuxDeclarationMode
-        '
-        Me.pnAuxDeclarationMode.Controls.Add(Me.LvAux)
-        Me.pnAuxDeclarationMode.Controls.Add(Me.Label32)
-        Me.pnAuxDeclarationMode.Location = New System.Drawing.Point(6, 104)
-        Me.pnAuxDeclarationMode.Name = "pnAuxDeclarationMode"
-        Me.pnAuxDeclarationMode.Size = New System.Drawing.Size(503, 170)
-        Me.pnAuxDeclarationMode.TabIndex = 40
-        '
-        'LvAux
-        '
-        Me.LvAux.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.LvAux.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5, Me.ColumnHeader6})
-        Me.LvAux.FullRowSelect = true
-        Me.LvAux.GridLines = true
-        Me.LvAux.HideSelection = false
-        Me.LvAux.Location = New System.Drawing.Point(3, 3)
-        Me.LvAux.MultiSelect = false
-        Me.LvAux.Name = "LvAux"
-        Me.LvAux.Size = New System.Drawing.Size(504, 145)
-        Me.LvAux.TabIndex = 0
-        Me.LvAux.TabStop = false
-        Me.LvAux.UseCompatibleStateImageBehavior = false
-        Me.LvAux.View = System.Windows.Forms.View.Details
-        '
-        'ColumnHeader4
-        '
-        Me.ColumnHeader4.Text = "ID"
-        Me.ColumnHeader4.Width = 45
-        '
-        'ColumnHeader5
-        '
-        Me.ColumnHeader5.Text = "Type"
-        Me.ColumnHeader5.Width = 108
-        '
-        'ColumnHeader6
-        '
-        Me.ColumnHeader6.Text = "Input File"
-        Me.ColumnHeader6.Width = 331
-        '
-        'Label32
-        '
-        Me.Label32.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.Label32.AutoSize = true
-        Me.Label32.Location = New System.Drawing.Point(9, 151)
-        Me.Label32.Name = "Label32"
-        Me.Label32.Size = New System.Drawing.Size(106, 13)
-        Me.Label32.TabIndex = 3
-        Me.Label32.Text = "(Double-Click to Edit)"
-        '
-        'pnAuxEngineering
-        '
-        Me.pnAuxEngineering.Controls.Add(Me.tbPAuxStandstillICEOff)
-        Me.pnAuxEngineering.Controls.Add(Me.lblAuxStandstillICEOffUnit)
-        Me.pnAuxEngineering.Controls.Add(Me.lblAuxStandstillICEOff)
-        Me.pnAuxEngineering.Controls.Add(Me.tbPAuxDrivingICEOff)
-        Me.pnAuxEngineering.Controls.Add(Me.lblAuxDrivingICEOffUnit)
-        Me.pnAuxEngineering.Controls.Add(Me.lblAuxDrivingICEOff)
-        Me.pnAuxEngineering.Controls.Add(Me.TbAuxPAuxICEOn)
-        Me.pnAuxEngineering.Controls.Add(Me.lblAuxICEOnUnit)
-        Me.pnAuxEngineering.Controls.Add(Me.lblAuxICEOn)
-        Me.pnAuxEngineering.Location = New System.Drawing.Point(6, 19)
-        Me.pnAuxEngineering.Name = "pnAuxEngineering"
-        Me.pnAuxEngineering.Size = New System.Drawing.Size(500, 80)
-        Me.pnAuxEngineering.TabIndex = 0
-        '
-        'tbPAuxStandstillICEOff
-        '
-        Me.tbPAuxStandstillICEOff.Location = New System.Drawing.Point(170, 55)
-        Me.tbPAuxStandstillICEOff.Name = "tbPAuxStandstillICEOff"
-        Me.tbPAuxStandstillICEOff.Size = New System.Drawing.Size(76, 20)
-        Me.tbPAuxStandstillICEOff.TabIndex = 2
-        '
-        'lblAuxStandstillICEOffUnit
-        '
-        Me.lblAuxStandstillICEOffUnit.AutoSize = true
-        Me.lblAuxStandstillICEOffUnit.Location = New System.Drawing.Point(252, 58)
-        Me.lblAuxStandstillICEOffUnit.Name = "lblAuxStandstillICEOffUnit"
-        Me.lblAuxStandstillICEOffUnit.Size = New System.Drawing.Size(24, 13)
-        Me.lblAuxStandstillICEOffUnit.TabIndex = 50
-        Me.lblAuxStandstillICEOffUnit.Text = "[W]"
-        '
-        'lblAuxStandstillICEOff
-        '
-        Me.lblAuxStandstillICEOff.AutoSize = true
-        Me.lblAuxStandstillICEOff.Location = New System.Drawing.Point(3, 58)
-        Me.lblAuxStandstillICEOff.Name = "lblAuxStandstillICEOff"
-        Me.lblAuxStandstillICEOff.Size = New System.Drawing.Size(143, 13)
-        Me.lblAuxStandstillICEOff.TabIndex = 48
-        Me.lblAuxStandstillICEOff.Text = "Aux Load (Standstill, ICE Off)"
-        '
-        'tbPAuxDrivingICEOff
-        '
-        Me.tbPAuxDrivingICEOff.Location = New System.Drawing.Point(170, 29)
-        Me.tbPAuxDrivingICEOff.Name = "tbPAuxDrivingICEOff"
-        Me.tbPAuxDrivingICEOff.Size = New System.Drawing.Size(76, 20)
-        Me.tbPAuxDrivingICEOff.TabIndex = 1
-        '
-        'lblAuxDrivingICEOffUnit
-        '
-        Me.lblAuxDrivingICEOffUnit.AutoSize = true
-        Me.lblAuxDrivingICEOffUnit.Location = New System.Drawing.Point(252, 32)
-        Me.lblAuxDrivingICEOffUnit.Name = "lblAuxDrivingICEOffUnit"
-        Me.lblAuxDrivingICEOffUnit.Size = New System.Drawing.Size(24, 13)
-        Me.lblAuxDrivingICEOffUnit.TabIndex = 47
-        Me.lblAuxDrivingICEOffUnit.Text = "[W]"
-        '
-        'lblAuxDrivingICEOff
-        '
-        Me.lblAuxDrivingICEOff.AutoSize = true
-        Me.lblAuxDrivingICEOff.Location = New System.Drawing.Point(3, 32)
-        Me.lblAuxDrivingICEOff.Name = "lblAuxDrivingICEOff"
-        Me.lblAuxDrivingICEOff.Size = New System.Drawing.Size(134, 13)
-        Me.lblAuxDrivingICEOff.TabIndex = 45
-        Me.lblAuxDrivingICEOff.Text = "Aux Load (Driving, ICE Off)"
-        '
-        'TbAuxPAuxICEOn
-        '
-        Me.TbAuxPAuxICEOn.Location = New System.Drawing.Point(170, 3)
-        Me.TbAuxPAuxICEOn.Name = "TbAuxPAuxICEOn"
-        Me.TbAuxPAuxICEOn.Size = New System.Drawing.Size(76, 20)
-        Me.TbAuxPAuxICEOn.TabIndex = 0
-        '
-        'lblAuxICEOnUnit
-        '
-        Me.lblAuxICEOnUnit.AutoSize = true
-        Me.lblAuxICEOnUnit.Location = New System.Drawing.Point(252, 6)
-        Me.lblAuxICEOnUnit.Name = "lblAuxICEOnUnit"
-        Me.lblAuxICEOnUnit.Size = New System.Drawing.Size(24, 13)
-        Me.lblAuxICEOnUnit.TabIndex = 44
-        Me.lblAuxICEOnUnit.Text = "[W]"
-        '
-        'lblAuxICEOn
-        '
-        Me.lblAuxICEOn.AutoSize = true
-        Me.lblAuxICEOn.Location = New System.Drawing.Point(3, 6)
-        Me.lblAuxICEOn.Name = "lblAuxICEOn"
-        Me.lblAuxICEOn.Size = New System.Drawing.Size(95, 13)
-        Me.lblAuxICEOn.TabIndex = 42
-        Me.lblAuxICEOn.Text = "Aux Load (ICE On)"
-        '
-        'GrAux
-        '
-        Me.GrAux.Location = New System.Drawing.Point(0, 0)
-        Me.GrAux.Name = "GrAux"
-        Me.GrAux.Size = New System.Drawing.Size(200, 100)
-        Me.GrAux.TabIndex = 0
-        Me.GrAux.TabStop = false
-        '
-        'Label9
-        '
-        Me.Label9.Location = New System.Drawing.Point(0, 0)
-        Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(100, 23)
-        Me.Label9.TabIndex = 0
-        '
-        'TbAuxPAdd
-        '
-        Me.TbAuxPAdd.Location = New System.Drawing.Point(0, 0)
-        Me.TbAuxPAdd.Name = "TbAuxPAdd"
-        Me.TbAuxPAdd.Size = New System.Drawing.Size(100, 20)
-        Me.TbAuxPAdd.TabIndex = 0
-        '
-        'Label8
-        '
-        Me.Label8.Location = New System.Drawing.Point(0, 0)
-        Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(100, 23)
-        Me.Label8.TabIndex = 0
-        '
-        'btnAAUXOpen
-        '
-        Me.btnAAUXOpen.Location = New System.Drawing.Point(0, 0)
-        Me.btnAAUXOpen.Name = "btnAAUXOpen"
-        Me.btnAAUXOpen.Size = New System.Drawing.Size(75, 23)
-        Me.btnAAUXOpen.TabIndex = 0
-        '
-        'Label1
-        '
-        Me.Label1.Location = New System.Drawing.Point(0, 0)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(100, 23)
-        Me.Label1.TabIndex = 0
-        '
-        'btnBrowseAAUXFile
-        '
-        Me.btnBrowseAAUXFile.Location = New System.Drawing.Point(0, 0)
-        Me.btnBrowseAAUXFile.Name = "btnBrowseAAUXFile"
-        Me.btnBrowseAAUXFile.Size = New System.Drawing.Size(75, 23)
-        Me.btnBrowseAAUXFile.TabIndex = 0
-        '
-        'txtAdvancedAuxiliaryFile
-        '
-        Me.txtAdvancedAuxiliaryFile.Location = New System.Drawing.Point(0, 0)
-        Me.txtAdvancedAuxiliaryFile.Name = "txtAdvancedAuxiliaryFile"
-        Me.txtAdvancedAuxiliaryFile.Size = New System.Drawing.Size(100, 20)
-        Me.txtAdvancedAuxiliaryFile.TabIndex = 0
-        '
-        'picAuxInfo
-        '
-        Me.picAuxInfo.Location = New System.Drawing.Point(0, 0)
-        Me.picAuxInfo.Name = "picAuxInfo"
-        Me.picAuxInfo.Size = New System.Drawing.Size(100, 50)
-        Me.picAuxInfo.TabIndex = 0
-        Me.picAuxInfo.TabStop = false
-        '
-        'cboAdvancedAuxiliaries
-        '
-        Me.cboAdvancedAuxiliaries.Location = New System.Drawing.Point(0, 0)
-        Me.cboAdvancedAuxiliaries.Name = "cboAdvancedAuxiliaries"
-        Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(121, 21)
-        Me.cboAdvancedAuxiliaries.TabIndex = 0
-        '
-        'lbAdvancedAuxiliaries
-        '
-        Me.lbAdvancedAuxiliaries.Location = New System.Drawing.Point(0, 0)
-        Me.lbAdvancedAuxiliaries.Name = "lbAdvancedAuxiliaries"
-        Me.lbAdvancedAuxiliaries.Size = New System.Drawing.Size(100, 23)
-        Me.lbAdvancedAuxiliaries.TabIndex = 0
-        '
-        'tcJob
-        '
-        Me.tcJob.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.tcJob.Controls.Add(Me.TabPgGen)
-        Me.tcJob.Controls.Add(Me.tpAuxiliaries)
-        Me.tcJob.Controls.Add(Me.tpCycles)
-        Me.tcJob.Controls.Add(Me.TabPgDriver)
-        Me.tcJob.Controls.Add(Me.TabPgADAS)
-        Me.tcJob.Location = New System.Drawing.Point(1, 78)
-        Me.tcJob.Name = "tcJob"
-        Me.tcJob.SelectedIndex = 0
-        Me.tcJob.Size = New System.Drawing.Size(533, 520)
-        Me.tcJob.SizeMode = System.Windows.Forms.TabSizeMode.Fixed
-        Me.tcJob.TabIndex = 0
-        '
-        'tpAuxiliaries
-        '
-        Me.tpAuxiliaries.Controls.Add(Me.gbBusAux)
-        Me.tpAuxiliaries.Controls.Add(Me.gbElectricAux)
-        Me.tpAuxiliaries.Controls.Add(Me.GrAuxMech)
-        Me.tpAuxiliaries.Location = New System.Drawing.Point(4, 22)
-        Me.tpAuxiliaries.Name = "tpAuxiliaries"
-        Me.tpAuxiliaries.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
-        Me.tpAuxiliaries.Size = New System.Drawing.Size(525, 494)
-        Me.tpAuxiliaries.TabIndex = 9
-        Me.tpAuxiliaries.Text = "Auxiliaries"
-        Me.tpAuxiliaries.UseVisualStyleBackColor = true
-        '
-        'gbBusAux
-        '
-        Me.gbBusAux.Controls.Add(Me.cbEnableBusAux)
-        Me.gbBusAux.Controls.Add(Me.pnBusAux)
-        Me.gbBusAux.Location = New System.Drawing.Point(6, 302)
-        Me.gbBusAux.Name = "gbBusAux"
-        Me.gbBusAux.Size = New System.Drawing.Size(515, 78)
-        Me.gbBusAux.TabIndex = 1
-        Me.gbBusAux.TabStop = false
-        Me.gbBusAux.Text = "Bus Auxiliaries"
-        '
-        'cbEnableBusAux
-        '
-        Me.cbEnableBusAux.AutoSize = true
-        Me.cbEnableBusAux.Location = New System.Drawing.Point(10, 17)
-        Me.cbEnableBusAux.Name = "cbEnableBusAux"
-        Me.cbEnableBusAux.Size = New System.Drawing.Size(115, 17)
-        Me.cbEnableBusAux.TabIndex = 0
-        Me.cbEnableBusAux.Text = "Use Bus Auxiliaries"
-        Me.cbEnableBusAux.UseVisualStyleBackColor = true
-        '
-        'pnBusAux
-        '
-        Me.pnBusAux.Controls.Add(Me.btnBusAuxP)
-        Me.pnBusAux.Controls.Add(Me.tbBusAuxParams)
-        Me.pnBusAux.Controls.Add(Me.btnBrowsBusAuxParams)
-        Me.pnBusAux.Enabled = false
-        Me.pnBusAux.Location = New System.Drawing.Point(6, 40)
-        Me.pnBusAux.Name = "pnBusAux"
-        Me.pnBusAux.Size = New System.Drawing.Size(503, 26)
-        Me.pnBusAux.TabIndex = 1
-        '
-        'btnBusAuxP
-        '
-        Me.btnBusAuxP.Location = New System.Drawing.Point(3, 3)
-        Me.btnBusAuxP.Name = "btnBusAuxP"
-        Me.btnBusAuxP.Size = New System.Drawing.Size(72, 21)
-        Me.btnBusAuxP.TabIndex = 0
-        Me.btnBusAuxP.TabStop = false
-        Me.btnBusAuxP.Text = "BusAux P."
-        Me.btnBusAuxP.UseVisualStyleBackColor = true
-        '
-        'tbBusAuxParams
-        '
-        Me.tbBusAuxParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.tbBusAuxParams.Location = New System.Drawing.Point(81, 3)
-        Me.tbBusAuxParams.Name = "tbBusAuxParams"
-        Me.tbBusAuxParams.Size = New System.Drawing.Size(393, 20)
-        Me.tbBusAuxParams.TabIndex = 1
-        '
-        'btnBrowsBusAuxParams
-        '
-        Me.btnBrowsBusAuxParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.btnBrowsBusAuxParams.Image = CType(resources.GetObject("btnBrowsBusAuxParams.Image"),System.Drawing.Image)
-        Me.btnBrowsBusAuxParams.Location = New System.Drawing.Point(476, 1)
-        Me.btnBrowsBusAuxParams.Name = "btnBrowsBusAuxParams"
-        Me.btnBrowsBusAuxParams.Size = New System.Drawing.Size(24, 24)
-        Me.btnBrowsBusAuxParams.TabIndex = 2
-        Me.btnBrowsBusAuxParams.UseVisualStyleBackColor = true
-        '
-        'gbElectricAux
-        '
-        Me.gbElectricAux.Controls.Add(Me.Label46)
-        Me.gbElectricAux.Controls.Add(Me.lblElAuxConstUnit)
-        Me.gbElectricAux.Controls.Add(Me.tbElectricAuxConstant)
-        Me.gbElectricAux.Controls.Add(Me.lblElAuxConst)
-        Me.gbElectricAux.Location = New System.Drawing.Point(6, 386)
-        Me.gbElectricAux.Name = "gbElectricAux"
-        Me.gbElectricAux.Size = New System.Drawing.Size(515, 55)
-        Me.gbElectricAux.TabIndex = 2
-        Me.gbElectricAux.TabStop = false
-        Me.gbElectricAux.Text = "Electric Auxiliaries"
-        Me.gbElectricAux.Visible = false
-        '
-        'Label46
-        '
-        Me.Label46.AutoSize = true
-        Me.Label46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.Label46.Location = New System.Drawing.Point(235, 22)
-        Me.Label46.Name = "Label46"
-        Me.Label46.Size = New System.Drawing.Size(106, 13)
-        Me.Label46.TabIndex = 48
-        Me.Label46.Text = "(high voltage system)"
-        '
-        'lblElAuxConstUnit
-        '
-        Me.lblElAuxConstUnit.AutoSize = true
-        Me.lblElAuxConstUnit.Location = New System.Drawing.Point(191, 22)
-        Me.lblElAuxConstUnit.Name = "lblElAuxConstUnit"
-        Me.lblElAuxConstUnit.Size = New System.Drawing.Size(24, 13)
-        Me.lblElAuxConstUnit.TabIndex = 47
-        Me.lblElAuxConstUnit.Text = "[W]"
-        '
-        'tbElectricAuxConstant
-        '
-        Me.tbElectricAuxConstant.Location = New System.Drawing.Point(109, 19)
-        Me.tbElectricAuxConstant.Name = "tbElectricAuxConstant"
-        Me.tbElectricAuxConstant.Size = New System.Drawing.Size(76, 20)
-        Me.tbElectricAuxConstant.TabIndex = 0
-        '
-        'lblElAuxConst
-        '
-        Me.lblElAuxConst.AutoSize = true
-        Me.lblElAuxConst.Location = New System.Drawing.Point(7, 22)
-        Me.lblElAuxConst.Name = "lblElAuxConst"
-        Me.lblElAuxConst.Size = New System.Drawing.Size(97, 13)
-        Me.lblElAuxConst.TabIndex = 45
-        Me.lblElAuxConst.Text = "Constant Aux Load"
-        '
-        'tpCycles
-        '
-        Me.tpCycles.Controls.Add(Me.GrCycles)
-        Me.tpCycles.Location = New System.Drawing.Point(4, 22)
-        Me.tpCycles.Name = "tpCycles"
-        Me.tpCycles.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
-        Me.tpCycles.Size = New System.Drawing.Size(525, 494)
-        Me.tpCycles.TabIndex = 10
-        Me.tpCycles.Text = "Cycles"
-        Me.tpCycles.UseVisualStyleBackColor = true
-        '
-        'TabPgDriver
-        '
-        Me.TabPgDriver.Controls.Add(Me.GrVACC)
-        Me.TabPgDriver.Controls.Add(Me.GrLAC)
-        Me.TabPgDriver.Controls.Add(Me.gbOverspeed)
-        Me.TabPgDriver.Location = New System.Drawing.Point(4, 22)
-        Me.TabPgDriver.Name = "TabPgDriver"
-        Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
-        Me.TabPgDriver.Size = New System.Drawing.Size(525, 494)
-        Me.TabPgDriver.TabIndex = 7
-        Me.TabPgDriver.Text = "Driver Model"
-        Me.TabPgDriver.UseVisualStyleBackColor = true
-        '
-        'GrVACC
-        '
-        Me.GrVACC.Controls.Add(Me.Label15)
-        Me.GrVACC.Controls.Add(Me.TbDesMaxFile)
-        Me.GrVACC.Controls.Add(Me.BtDesMaxBr)
-        Me.GrVACC.Controls.Add(Me.BtAccOpen)
-        Me.GrVACC.Location = New System.Drawing.Point(9, 271)
-        Me.GrVACC.Name = "GrVACC"
-        Me.GrVACC.Size = New System.Drawing.Size(515, 69)
-        Me.GrVACC.TabIndex = 2
-        Me.GrVACC.TabStop = false
-        Me.GrVACC.Text = "Max. acceleration and brake curves"
-        '
-        'Label15
-        '
-        Me.Label15.AutoSize = true
-        Me.Label15.Location = New System.Drawing.Point(3, 20)
-        Me.Label15.Name = "Label15"
-        Me.Label15.Size = New System.Drawing.Size(220, 13)
-        Me.Label15.TabIndex = 4
-        Me.Label15.Text = "Driver Acceleration/Deceleration File (.vacc):"
-        '
-        'TbDesMaxFile
-        '
-        Me.TbDesMaxFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.TbDesMaxFile.Location = New System.Drawing.Point(6, 36)
-        Me.TbDesMaxFile.Name = "TbDesMaxFile"
-        Me.TbDesMaxFile.Size = New System.Drawing.Size(450, 20)
-        Me.TbDesMaxFile.TabIndex = 0
-        '
-        'BtDesMaxBr
-        '
-        Me.BtDesMaxBr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.BtDesMaxBr.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.BtDesMaxBr.Location = New System.Drawing.Point(457, 34)
-        Me.BtDesMaxBr.Name = "BtDesMaxBr"
-        Me.BtDesMaxBr.Size = New System.Drawing.Size(24, 24)
-        Me.BtDesMaxBr.TabIndex = 1
-        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.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
-        Me.BtAccOpen.Location = New System.Drawing.Point(481, 34)
-        Me.BtAccOpen.Name = "BtAccOpen"
-        Me.BtAccOpen.Size = New System.Drawing.Size(24, 24)
-        Me.BtAccOpen.TabIndex = 2
-        Me.BtAccOpen.UseVisualStyleBackColor = true
-        '
-        'GrLAC
-        '
-        Me.GrLAC.Controls.Add(Me.pnLookAheadCoasting)
-        Me.GrLAC.Controls.Add(Me.CbLookAhead)
-        Me.GrLAC.Location = New System.Drawing.Point(9, 92)
-        Me.GrLAC.Name = "GrLAC"
-        Me.GrLAC.Size = New System.Drawing.Size(514, 173)
-        Me.GrLAC.TabIndex = 1
-        Me.GrLAC.TabStop = false
-        Me.GrLAC.Text = "Look-Ahead Coasting"
-        '
-        'pnLookAheadCoasting
-        '
-        Me.pnLookAheadCoasting.Controls.Add(Me.Label7)
-        Me.pnLookAheadCoasting.Controls.Add(Me.Label6)
-        Me.pnLookAheadCoasting.Controls.Add(Me.tbLacMinSpeed)
-        Me.pnLookAheadCoasting.Controls.Add(Me.btnDfVelocityDrop)
-        Me.pnLookAheadCoasting.Controls.Add(Me.Label12)
-        Me.pnLookAheadCoasting.Controls.Add(Me.tbDfCoastingScale)
-        Me.pnLookAheadCoasting.Controls.Add(Me.Label11)
-        Me.pnLookAheadCoasting.Controls.Add(Me.Label3)
-        Me.pnLookAheadCoasting.Controls.Add(Me.tbDfCoastingOffset)
-        Me.pnLookAheadCoasting.Controls.Add(Me.tbLacDfTargetSpeedFile)
-        Me.pnLookAheadCoasting.Controls.Add(Me.Label10)
-        Me.pnLookAheadCoasting.Controls.Add(Me.Label4)
-        Me.pnLookAheadCoasting.Controls.Add(Me.Label5)
-        Me.pnLookAheadCoasting.Controls.Add(Me.btnDfTargetSpeed)
-        Me.pnLookAheadCoasting.Controls.Add(Me.tbLacPreviewFactor)
-        Me.pnLookAheadCoasting.Controls.Add(Me.tbLacDfVelocityDropFile)
-        Me.pnLookAheadCoasting.Location = New System.Drawing.Point(15, 19)
-        Me.pnLookAheadCoasting.Name = "pnLookAheadCoasting"
-        Me.pnLookAheadCoasting.Size = New System.Drawing.Size(493, 129)
-        Me.pnLookAheadCoasting.TabIndex = 0
-        '
-        'Label7
-        '
-        Me.Label7.AutoSize = true
-        Me.Label7.Location = New System.Drawing.Point(245, 6)
-        Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(38, 13)
-        Me.Label7.TabIndex = 4
-        Me.Label7.Text = "[km/h]"
-        '
-        'Label6
-        '
-        Me.Label6.AutoSize = true
-        Me.Label6.Location = New System.Drawing.Point(106, 5)
-        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(67, 13)
-        Me.Label6.TabIndex = 33
-        Me.Label6.Text = "Min. Velocity"
-        Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        '
-        'tbLacMinSpeed
-        '
-        Me.tbLacMinSpeed.Location = New System.Drawing.Point(179, 3)
-        Me.tbLacMinSpeed.Name = "tbLacMinSpeed"
-        Me.tbLacMinSpeed.Size = New System.Drawing.Size(64, 20)
-        Me.tbLacMinSpeed.TabIndex = 0
-        '
-        'btnDfVelocityDrop
-        '
-        Me.btnDfVelocityDrop.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.btnDfVelocityDrop.Image = CType(resources.GetObject("btnDfVelocityDrop.Image"),System.Drawing.Image)
-        Me.btnDfVelocityDrop.Location = New System.Drawing.Point(466, 78)
-        Me.btnDfVelocityDrop.Name = "btnDfVelocityDrop"
-        Me.btnDfVelocityDrop.Size = New System.Drawing.Size(24, 24)
-        Me.btnDfVelocityDrop.TabIndex = 5
-        Me.btnDfVelocityDrop.UseVisualStyleBackColor = true
-        '
-        'Label12
-        '
-        Me.Label12.AutoSize = true
-        Me.Label12.Location = New System.Drawing.Point(284, 110)
-        Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(130, 13)
-        Me.Label12.TabIndex = 31
-        Me.Label12.Text = "* DF_vTarget * DF_vDrop"
-        '
-        'tbDfCoastingScale
-        '
-        Me.tbDfCoastingScale.Location = New System.Drawing.Point(241, 107)
-        Me.tbDfCoastingScale.Name = "tbDfCoastingScale"
-        Me.tbDfCoastingScale.Size = New System.Drawing.Size(37, 20)
-        Me.tbDfCoastingScale.TabIndex = 7
-        '
-        'Label11
-        '
-        Me.Label11.AutoSize = true
-        Me.Label11.Location = New System.Drawing.Point(224, 109)
-        Me.Label11.Name = "Label11"
-        Me.Label11.Size = New System.Drawing.Size(13, 13)
-        Me.Label11.TabIndex = 29
-        Me.Label11.Text = "- "
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = true
-        Me.Label3.Location = New System.Drawing.Point(55, 30)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(118, 13)
-        Me.Label3.TabIndex = 20
-        Me.Label3.Text = "Preview distance factor"
-        Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        '
-        'tbDfCoastingOffset
-        '
-        Me.tbDfCoastingOffset.Location = New System.Drawing.Point(180, 107)
-        Me.tbDfCoastingOffset.Name = "tbDfCoastingOffset"
-        Me.tbDfCoastingOffset.Size = New System.Drawing.Size(37, 20)
-        Me.tbDfCoastingOffset.TabIndex = 6
-        '
-        'tbLacDfTargetSpeedFile
-        '
-        Me.tbLacDfTargetSpeedFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.tbLacDfTargetSpeedFile.Location = New System.Drawing.Point(179, 54)
-        Me.tbLacDfTargetSpeedFile.Name = "tbLacDfTargetSpeedFile"
-        Me.tbLacDfTargetSpeedFile.Size = New System.Drawing.Size(286, 20)
-        Me.tbLacDfTargetSpeedFile.TabIndex = 2
-        '
-        'Label10
-        '
-        Me.Label10.AutoSize = true
-        Me.Label10.Location = New System.Drawing.Point(94, 109)
-        Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(79, 13)
-        Me.Label10.TabIndex = 27
-        Me.Label10.Text = "DF_coasting = "
-        '
-        'Label4
-        '
-        Me.Label4.AutoSize = true
-        Me.Label4.Location = New System.Drawing.Point(18, 56)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(155, 13)
-        Me.Label4.TabIndex = 24
-        Me.Label4.Text = "Decision Factor - Target Speed"
-        Me.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        '
-        'Label5
-        '
-        Me.Label5.AutoSize = true
-        Me.Label5.Location = New System.Drawing.Point(20, 83)
-        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(153, 13)
-        Me.Label5.TabIndex = 26
-        Me.Label5.Text = "Decision Factor - Velocity Drop"
-        Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        '
-        'btnDfTargetSpeed
-        '
-        Me.btnDfTargetSpeed.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.btnDfTargetSpeed.Image = CType(resources.GetObject("btnDfTargetSpeed.Image"),System.Drawing.Image)
-        Me.btnDfTargetSpeed.Location = New System.Drawing.Point(466, 52)
-        Me.btnDfTargetSpeed.Name = "btnDfTargetSpeed"
-        Me.btnDfTargetSpeed.Size = New System.Drawing.Size(24, 24)
-        Me.btnDfTargetSpeed.TabIndex = 3
-        Me.btnDfTargetSpeed.UseVisualStyleBackColor = true
-        '
-        'tbLacPreviewFactor
-        '
-        Me.tbLacPreviewFactor.Location = New System.Drawing.Point(179, 28)
-        Me.tbLacPreviewFactor.Name = "tbLacPreviewFactor"
-        Me.tbLacPreviewFactor.Size = New System.Drawing.Size(64, 20)
-        Me.tbLacPreviewFactor.TabIndex = 1
-        '
-        'tbLacDfVelocityDropFile
-        '
-        Me.tbLacDfVelocityDropFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.tbLacDfVelocityDropFile.Location = New System.Drawing.Point(179, 81)
-        Me.tbLacDfVelocityDropFile.Name = "tbLacDfVelocityDropFile"
-        Me.tbLacDfVelocityDropFile.Size = New System.Drawing.Size(286, 20)
-        Me.tbLacDfVelocityDropFile.TabIndex = 4
-        '
-        'CbLookAhead
-        '
-        Me.CbLookAhead.AutoSize = true
-        Me.CbLookAhead.Checked = true
-        Me.CbLookAhead.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.CbLookAhead.Location = New System.Drawing.Point(16, 21)
-        Me.CbLookAhead.Name = "CbLookAhead"
-        Me.CbLookAhead.Size = New System.Drawing.Size(65, 17)
-        Me.CbLookAhead.TabIndex = 0
-        Me.CbLookAhead.Text = "Enabled"
-        Me.CbLookAhead.UseVisualStyleBackColor = true
-        '
-        'gbOverspeed
-        '
-        Me.gbOverspeed.Controls.Add(Me.PnEcoRoll)
-        Me.gbOverspeed.Controls.Add(Me.RdOverspeed)
-        Me.gbOverspeed.Controls.Add(Me.RdOff)
-        Me.gbOverspeed.Location = New System.Drawing.Point(9, 9)
-        Me.gbOverspeed.Name = "gbOverspeed"
-        Me.gbOverspeed.Size = New System.Drawing.Size(515, 77)
-        Me.gbOverspeed.TabIndex = 0
-        Me.gbOverspeed.TabStop = false
-        Me.gbOverspeed.Text = "Overspeed"
-        '
-        'PnEcoRoll
-        '
-        Me.PnEcoRoll.Controls.Add(Me.Label21)
-        Me.PnEcoRoll.Controls.Add(Me.Label14)
-        Me.PnEcoRoll.Controls.Add(Me.TbVmin)
-        Me.PnEcoRoll.Controls.Add(Me.TbOverspeed)
-        Me.PnEcoRoll.Controls.Add(Me.Label23)
-        Me.PnEcoRoll.Controls.Add(Me.Label13)
-        Me.PnEcoRoll.Location = New System.Drawing.Point(91, 17)
-        Me.PnEcoRoll.Name = "PnEcoRoll"
-        Me.PnEcoRoll.Size = New System.Drawing.Size(232, 54)
-        Me.PnEcoRoll.TabIndex = 2
-        '
-        'Label21
-        '
-        Me.Label21.AutoSize = true
-        Me.Label21.Location = New System.Drawing.Point(170, 31)
-        Me.Label21.Name = "Label21"
-        Me.Label21.Size = New System.Drawing.Size(38, 13)
-        Me.Label21.TabIndex = 3
-        Me.Label21.Text = "[km/h]"
-        '
-        'Label14
-        '
-        Me.Label14.AutoSize = true
-        Me.Label14.Location = New System.Drawing.Point(170, 5)
-        Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(38, 13)
-        Me.Label14.TabIndex = 3
-        Me.Label14.Text = "[km/h]"
-        '
-        'TbVmin
-        '
-        Me.TbVmin.Location = New System.Drawing.Point(104, 28)
-        Me.TbVmin.Name = "TbVmin"
-        Me.TbVmin.Size = New System.Drawing.Size(64, 20)
-        Me.TbVmin.TabIndex = 1
-        '
-        'TbOverspeed
-        '
-        Me.TbOverspeed.Location = New System.Drawing.Point(104, 2)
-        Me.TbOverspeed.Name = "TbOverspeed"
-        Me.TbOverspeed.Size = New System.Drawing.Size(64, 20)
-        Me.TbOverspeed.TabIndex = 0
-        '
-        'Label23
-        '
-        Me.Label23.AutoSize = true
-        Me.Label23.Location = New System.Drawing.Point(18, 31)
-        Me.Label23.Name = "Label23"
-        Me.Label23.Size = New System.Drawing.Size(80, 13)
-        Me.Label23.TabIndex = 1
-        Me.Label23.Text = "Minimum speed"
-        '
-        'Label13
-        '
-        Me.Label13.AutoSize = true
-        Me.Label13.Location = New System.Drawing.Point(13, 5)
-        Me.Label13.Name = "Label13"
-        Me.Label13.Size = New System.Drawing.Size(85, 13)
-        Me.Label13.TabIndex = 1
-        Me.Label13.Text = "Max. Overspeed"
-        '
-        'RdOverspeed
-        '
-        Me.RdOverspeed.AutoSize = true
-        Me.RdOverspeed.Checked = true
-        Me.RdOverspeed.Location = New System.Drawing.Point(16, 44)
-        Me.RdOverspeed.Name = "RdOverspeed"
-        Me.RdOverspeed.Size = New System.Drawing.Size(77, 17)
-        Me.RdOverspeed.TabIndex = 1
-        Me.RdOverspeed.TabStop = true
-        Me.RdOverspeed.Text = "Overspeed"
-        Me.RdOverspeed.UseVisualStyleBackColor = true
-        '
-        'RdOff
-        '
-        Me.RdOff.AutoSize = true
-        Me.RdOff.Location = New System.Drawing.Point(16, 21)
-        Me.RdOff.Name = "RdOff"
-        Me.RdOff.Size = New System.Drawing.Size(39, 17)
-        Me.RdOff.TabIndex = 0
-        Me.RdOff.Text = "Off"
-        Me.RdOff.UseVisualStyleBackColor = true
-        '
-        'TabPgADAS
-        '
-        Me.TabPgADAS.Controls.Add(Me.gbPCC)
-        Me.TabPgADAS.Controls.Add(Me.gbEcoRoll)
-        Me.TabPgADAS.Controls.Add(Me.gbEngineStopStart)
-        Me.TabPgADAS.Location = New System.Drawing.Point(4, 22)
-        Me.TabPgADAS.Name = "TabPgADAS"
-        Me.TabPgADAS.Size = New System.Drawing.Size(525, 494)
-        Me.TabPgADAS.TabIndex = 8
-        Me.TabPgADAS.Text = "ADAS Parameters"
-        Me.TabPgADAS.UseVisualStyleBackColor = true
-        '
-        'gbPCC
-        '
-        Me.gbPCC.Controls.Add(Me.Label43)
-        Me.gbPCC.Controls.Add(Me.Label42)
-        Me.gbPCC.Controls.Add(Me.Label40)
-        Me.gbPCC.Controls.Add(Me.Label41)
-        Me.gbPCC.Controls.Add(Me.tbPCCPreviewUseCase2)
-        Me.gbPCC.Controls.Add(Me.Label38)
-        Me.gbPCC.Controls.Add(Me.Label39)
-        Me.gbPCC.Controls.Add(Me.tbPCCPreviewUseCase1)
-        Me.gbPCC.Controls.Add(Me.Label36)
-        Me.gbPCC.Controls.Add(Me.Label37)
-        Me.gbPCC.Controls.Add(Me.tbPCCMinSpeed)
-        Me.gbPCC.Controls.Add(Me.Label34)
-        Me.gbPCC.Controls.Add(Me.Label35)
-        Me.gbPCC.Controls.Add(Me.tbPCCEnableSpeed)
-        Me.gbPCC.Controls.Add(Me.Label31)
-        Me.gbPCC.Controls.Add(Me.Label33)
-        Me.gbPCC.Controls.Add(Me.tbPCCOverspeed)
-        Me.gbPCC.Controls.Add(Me.Label20)
-        Me.gbPCC.Controls.Add(Me.Label22)
-        Me.gbPCC.Controls.Add(Me.tbPCCUnderspeed)
-        Me.gbPCC.Location = New System.Drawing.Point(7, 269)
-        Me.gbPCC.Name = "gbPCC"
-        Me.gbPCC.Size = New System.Drawing.Size(515, 217)
-        Me.gbPCC.TabIndex = 2
-        Me.gbPCC.TabStop = false
-        Me.gbPCC.Text = "Predictive Cruise Control"
-        '
-        'Label43
-        '
-        Me.Label43.AutoSize = true
-        Me.Label43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.Label43.Location = New System.Drawing.Point(39, 196)
-        Me.Label43.Name = "Label43"
-        Me.Label43.Size = New System.Drawing.Size(157, 13)
-        Me.Label43.TabIndex = 30
-        Me.Label43.Text = "(cf. column HW in driving cycle)"
-        '
-        'Label42
-        '
-        Me.Label42.AutoSize = true
-        Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.Label42.Location = New System.Drawing.Point(7, 181)
-        Me.Label42.Name = "Label42"
-        Me.Label42.Size = New System.Drawing.Size(400, 13)
-        Me.Label42.TabIndex = 29
-        Me.Label42.Text = "Note: Predictive cruise conrol is only activated on highway parts of the driving "& _ 
-    "cycle"
-        '
-        'Label40
-        '
-        Me.Label40.AutoSize = true
-        Me.Label40.Location = New System.Drawing.Point(305, 152)
-        Me.Label40.Name = "Label40"
-        Me.Label40.Size = New System.Drawing.Size(21, 13)
-        Me.Label40.TabIndex = 28
-        Me.Label40.Text = "[m]"
-        '
-        'Label41
-        '
-        Me.Label41.AutoSize = true
-        Me.Label41.Location = New System.Drawing.Point(7, 152)
-        Me.Label41.Name = "Label41"
-        Me.Label41.Size = New System.Drawing.Size(146, 13)
-        Me.Label41.TabIndex = 26
-        Me.Label41.Text = "Preview distance use case 2:"
-        '
-        'tbPCCPreviewUseCase2
-        '
-        Me.tbPCCPreviewUseCase2.Location = New System.Drawing.Point(247, 149)
-        Me.tbPCCPreviewUseCase2.Name = "tbPCCPreviewUseCase2"
-        Me.tbPCCPreviewUseCase2.Size = New System.Drawing.Size(52, 20)
-        Me.tbPCCPreviewUseCase2.TabIndex = 5
-        '
-        'Label38
-        '
-        Me.Label38.AutoSize = true
-        Me.Label38.Location = New System.Drawing.Point(305, 126)
-        Me.Label38.Name = "Label38"
-        Me.Label38.Size = New System.Drawing.Size(21, 13)
-        Me.Label38.TabIndex = 25
-        Me.Label38.Text = "[m]"
-        '
-        'Label39
-        '
-        Me.Label39.AutoSize = true
-        Me.Label39.Location = New System.Drawing.Point(7, 126)
-        Me.Label39.Name = "Label39"
-        Me.Label39.Size = New System.Drawing.Size(146, 13)
-        Me.Label39.TabIndex = 23
-        Me.Label39.Text = "Preview distance use case 1:"
-        '
-        'tbPCCPreviewUseCase1
-        '
-        Me.tbPCCPreviewUseCase1.Location = New System.Drawing.Point(247, 123)
-        Me.tbPCCPreviewUseCase1.Name = "tbPCCPreviewUseCase1"
-        Me.tbPCCPreviewUseCase1.Size = New System.Drawing.Size(52, 20)
-        Me.tbPCCPreviewUseCase1.TabIndex = 4
-        '
-        'Label36
-        '
-        Me.Label36.AutoSize = true
-        Me.Label36.Location = New System.Drawing.Point(305, 100)
-        Me.Label36.Name = "Label36"
-        Me.Label36.Size = New System.Drawing.Size(38, 13)
-        Me.Label36.TabIndex = 22
-        Me.Label36.Text = "[km/h]"
-        '
-        'Label37
-        '
-        Me.Label37.AutoSize = true
-        Me.Label37.Location = New System.Drawing.Point(7, 100)
-        Me.Label37.Name = "Label37"
-        Me.Label37.Size = New System.Drawing.Size(83, 13)
-        Me.Label37.TabIndex = 20
-        Me.Label37.Text = "Minimum speed:"
-        '
-        'tbPCCMinSpeed
-        '
-        Me.tbPCCMinSpeed.Location = New System.Drawing.Point(247, 97)
-        Me.tbPCCMinSpeed.Name = "tbPCCMinSpeed"
-        Me.tbPCCMinSpeed.Size = New System.Drawing.Size(52, 20)
-        Me.tbPCCMinSpeed.TabIndex = 3
-        '
-        'Label34
-        '
-        Me.Label34.AutoSize = true
-        Me.Label34.Location = New System.Drawing.Point(305, 74)
-        Me.Label34.Name = "Label34"
-        Me.Label34.Size = New System.Drawing.Size(38, 13)
-        Me.Label34.TabIndex = 19
-        Me.Label34.Text = "[km/h]"
-        '
-        'Label35
-        '
-        Me.Label35.AutoSize = true
-        Me.Label35.Location = New System.Drawing.Point(7, 74)
-        Me.Label35.Name = "Label35"
-        Me.Label35.Size = New System.Drawing.Size(113, 13)
-        Me.Label35.TabIndex = 17
-        Me.Label35.Text = "PCC enabling velocity:"
-        '
-        'tbPCCEnableSpeed
-        '
-        Me.tbPCCEnableSpeed.Location = New System.Drawing.Point(247, 71)
-        Me.tbPCCEnableSpeed.Name = "tbPCCEnableSpeed"
-        Me.tbPCCEnableSpeed.Size = New System.Drawing.Size(52, 20)
-        Me.tbPCCEnableSpeed.TabIndex = 2
-        '
-        'Label31
-        '
-        Me.Label31.AutoSize = true
-        Me.Label31.Location = New System.Drawing.Point(305, 48)
-        Me.Label31.Name = "Label31"
-        Me.Label31.Size = New System.Drawing.Size(38, 13)
-        Me.Label31.TabIndex = 16
-        Me.Label31.Text = "[km/h]"
-        '
-        'Label33
-        '
-        Me.Label33.AutoSize = true
-        Me.Label33.Location = New System.Drawing.Point(7, 48)
-        Me.Label33.Name = "Label33"
-        Me.Label33.Size = New System.Drawing.Size(100, 13)
-        Me.Label33.TabIndex = 14
-        Me.Label33.Text = "Allowed overspeed:"
-        '
-        'tbPCCOverspeed
-        '
-        Me.tbPCCOverspeed.Location = New System.Drawing.Point(247, 45)
-        Me.tbPCCOverspeed.Name = "tbPCCOverspeed"
-        Me.tbPCCOverspeed.Size = New System.Drawing.Size(52, 20)
-        Me.tbPCCOverspeed.TabIndex = 1
-        '
-        'Label20
-        '
-        Me.Label20.AutoSize = true
-        Me.Label20.Location = New System.Drawing.Point(305, 22)
-        Me.Label20.Name = "Label20"
-        Me.Label20.Size = New System.Drawing.Size(38, 13)
-        Me.Label20.TabIndex = 13
-        Me.Label20.Text = "[km/h]"
-        '
-        'Label22
-        '
-        Me.Label22.AutoSize = true
-        Me.Label22.Location = New System.Drawing.Point(7, 22)
-        Me.Label22.Name = "Label22"
-        Me.Label22.Size = New System.Drawing.Size(106, 13)
-        Me.Label22.TabIndex = 11
-        Me.Label22.Text = "Allowed underspeed:"
-        '
-        'tbPCCUnderspeed
-        '
-        Me.tbPCCUnderspeed.Location = New System.Drawing.Point(247, 19)
-        Me.tbPCCUnderspeed.Name = "tbPCCUnderspeed"
-        Me.tbPCCUnderspeed.Size = New System.Drawing.Size(52, 20)
-        Me.tbPCCUnderspeed.TabIndex = 0
-        '
-        'gbEcoRoll
-        '
-        Me.gbEcoRoll.Controls.Add(Me.Label44)
-        Me.gbEcoRoll.Controls.Add(Me.Label45)
-        Me.gbEcoRoll.Controls.Add(Me.tbEcoRollMaxAcc)
-        Me.gbEcoRoll.Controls.Add(Me.Label29)
-        Me.gbEcoRoll.Controls.Add(Me.Label30)
-        Me.gbEcoRoll.Controls.Add(Me.tbEcoRollUnderspeed)
-        Me.gbEcoRoll.Controls.Add(Me.Label27)
-        Me.gbEcoRoll.Controls.Add(Me.Label28)
-        Me.gbEcoRoll.Controls.Add(Me.tbEcoRollActivationDelay)
-        Me.gbEcoRoll.Controls.Add(Me.Label25)
-        Me.gbEcoRoll.Controls.Add(Me.Label26)
-        Me.gbEcoRoll.Controls.Add(Me.tbEcoRollMinSpeed)
-        Me.gbEcoRoll.Location = New System.Drawing.Point(7, 136)
-        Me.gbEcoRoll.Name = "gbEcoRoll"
-        Me.gbEcoRoll.Size = New System.Drawing.Size(515, 127)
-        Me.gbEcoRoll.TabIndex = 1
-        Me.gbEcoRoll.TabStop = false
-        Me.gbEcoRoll.Text = "Eco-Roll"
-        '
-        'Label44
-        '
-        Me.Label44.AutoSize = true
-        Me.Label44.Location = New System.Drawing.Point(305, 75)
-        Me.Label44.Name = "Label44"
-        Me.Label44.Size = New System.Drawing.Size(34, 13)
-        Me.Label44.TabIndex = 19
-        Me.Label44.Text = "[m/s²]"
-        '
-        'Label45
-        '
-        Me.Label45.AutoSize = true
-        Me.Label45.Location = New System.Drawing.Point(7, 75)
-        Me.Label45.Name = "Label45"
-        Me.Label45.Size = New System.Drawing.Size(125, 13)
-        Me.Label45.TabIndex = 17
-        Me.Label45.Text = "Upper Acceleration Limit:"
-        '
-        'tbEcoRollMaxAcc
-        '
-        Me.tbEcoRollMaxAcc.Location = New System.Drawing.Point(247, 72)
-        Me.tbEcoRollMaxAcc.Name = "tbEcoRollMaxAcc"
-        Me.tbEcoRollMaxAcc.Size = New System.Drawing.Size(52, 20)
-        Me.tbEcoRollMaxAcc.TabIndex = 2
-        '
-        'Label29
-        '
-        Me.Label29.AutoSize = true
-        Me.Label29.Location = New System.Drawing.Point(305, 100)
-        Me.Label29.Name = "Label29"
-        Me.Label29.Size = New System.Drawing.Size(38, 13)
-        Me.Label29.TabIndex = 16
-        Me.Label29.Text = "[km/h]"
-        Me.Label29.Visible = false
-        '
-        'Label30
-        '
-        Me.Label30.AutoSize = true
-        Me.Label30.Location = New System.Drawing.Point(7, 100)
-        Me.Label30.Name = "Label30"
-        Me.Label30.Size = New System.Drawing.Size(114, 13)
-        Me.Label30.TabIndex = 14
-        Me.Label30.Text = "Underspeed threshold:"
-        Me.Label30.Visible = false
-        '
-        'tbEcoRollUnderspeed
-        '
-        Me.tbEcoRollUnderspeed.Location = New System.Drawing.Point(247, 97)
-        Me.tbEcoRollUnderspeed.Name = "tbEcoRollUnderspeed"
-        Me.tbEcoRollUnderspeed.Size = New System.Drawing.Size(52, 20)
-        Me.tbEcoRollUnderspeed.TabIndex = 3
-        Me.tbEcoRollUnderspeed.Visible = false
-        '
-        'Label27
-        '
-        Me.Label27.AutoSize = true
-        Me.Label27.Location = New System.Drawing.Point(305, 48)
-        Me.Label27.Name = "Label27"
-        Me.Label27.Size = New System.Drawing.Size(18, 13)
-        Me.Label27.TabIndex = 13
-        Me.Label27.Text = "[s]"
-        '
-        'Label28
-        '
-        Me.Label28.AutoSize = true
-        Me.Label28.Location = New System.Drawing.Point(7, 48)
-        Me.Label28.Name = "Label28"
-        Me.Label28.Size = New System.Drawing.Size(85, 13)
-        Me.Label28.TabIndex = 11
-        Me.Label28.Text = "Activation delay:"
-        '
-        'tbEcoRollActivationDelay
-        '
-        Me.tbEcoRollActivationDelay.Location = New System.Drawing.Point(247, 45)
-        Me.tbEcoRollActivationDelay.Name = "tbEcoRollActivationDelay"
-        Me.tbEcoRollActivationDelay.Size = New System.Drawing.Size(52, 20)
-        Me.tbEcoRollActivationDelay.TabIndex = 1
-        '
-        'Label25
-        '
-        Me.Label25.AutoSize = true
-        Me.Label25.Location = New System.Drawing.Point(305, 22)
-        Me.Label25.Name = "Label25"
-        Me.Label25.Size = New System.Drawing.Size(38, 13)
-        Me.Label25.TabIndex = 10
-        Me.Label25.Text = "[km/h]"
-        '
-        'Label26
-        '
-        Me.Label26.AutoSize = true
-        Me.Label26.Location = New System.Drawing.Point(7, 22)
-        Me.Label26.Name = "Label26"
-        Me.Label26.Size = New System.Drawing.Size(83, 13)
-        Me.Label26.TabIndex = 8
-        Me.Label26.Text = "Minimum speed:"
-        '
-        'tbEcoRollMinSpeed
-        '
-        Me.tbEcoRollMinSpeed.Location = New System.Drawing.Point(247, 19)
-        Me.tbEcoRollMinSpeed.Name = "tbEcoRollMinSpeed"
-        Me.tbEcoRollMinSpeed.Size = New System.Drawing.Size(52, 20)
-        Me.tbEcoRollMinSpeed.TabIndex = 0
-        '
-        'gbEngineStopStart
-        '
-        Me.gbEngineStopStart.Controls.Add(Me.tbESSUtilityFactorDriving)
-        Me.gbEngineStopStart.Controls.Add(Me.lblESSUtilityFactorDriving)
-        Me.gbEngineStopStart.Controls.Add(Me.tbEssUtility)
-        Me.gbEngineStopStart.Controls.Add(Me.Label24)
-        Me.gbEngineStopStart.Controls.Add(Me.Label18)
-        Me.gbEngineStopStart.Controls.Add(Me.tbMaxEngineOffTimespan)
-        Me.gbEngineStopStart.Controls.Add(Me.Label19)
-        Me.gbEngineStopStart.Controls.Add(Me.Label17)
-        Me.gbEngineStopStart.Controls.Add(Me.tbEngineStopStartActivationDelay)
-        Me.gbEngineStopStart.Controls.Add(Me.Label16)
-        Me.gbEngineStopStart.Location = New System.Drawing.Point(7, 9)
-        Me.gbEngineStopStart.Name = "gbEngineStopStart"
-        Me.gbEngineStopStart.Size = New System.Drawing.Size(515, 121)
-        Me.gbEngineStopStart.TabIndex = 0
-        Me.gbEngineStopStart.TabStop = false
-        Me.gbEngineStopStart.Text = "Engine Stop/Start"
-        '
-        'tbESSUtilityFactorDriving
-        '
-        Me.tbESSUtilityFactorDriving.Location = New System.Drawing.Point(247, 95)
-        Me.tbESSUtilityFactorDriving.Name = "tbESSUtilityFactorDriving"
-        Me.tbESSUtilityFactorDriving.Size = New System.Drawing.Size(52, 20)
-        Me.tbESSUtilityFactorDriving.TabIndex = 3
-        '
-        'lblESSUtilityFactorDriving
-        '
-        Me.lblESSUtilityFactorDriving.AutoSize = true
-        Me.lblESSUtilityFactorDriving.Location = New System.Drawing.Point(7, 98)
-        Me.lblESSUtilityFactorDriving.Name = "lblESSUtilityFactorDriving"
-        Me.lblESSUtilityFactorDriving.Size = New System.Drawing.Size(208, 13)
-        Me.lblESSUtilityFactorDriving.TabIndex = 8
-        Me.lblESSUtilityFactorDriving.Text = "Engie stop/start utility factor (while driving):"
-        '
-        'tbEssUtility
-        '
-        Me.tbEssUtility.Location = New System.Drawing.Point(247, 69)
-        Me.tbEssUtility.Name = "tbEssUtility"
-        Me.tbEssUtility.Size = New System.Drawing.Size(52, 20)
-        Me.tbEssUtility.TabIndex = 2
-        '
-        'Label24
-        '
-        Me.Label24.AutoSize = true
-        Me.Label24.Location = New System.Drawing.Point(7, 72)
-        Me.Label24.Name = "Label24"
-        Me.Label24.Size = New System.Drawing.Size(207, 13)
-        Me.Label24.TabIndex = 6
-        Me.Label24.Text = "Engie stop/start utility factor (vehicle stop):"
-        '
-        'Label18
-        '
-        Me.Label18.AutoSize = true
-        Me.Label18.Location = New System.Drawing.Point(305, 46)
-        Me.Label18.Name = "Label18"
-        Me.Label18.Size = New System.Drawing.Size(18, 13)
-        Me.Label18.TabIndex = 5
-        Me.Label18.Text = "[s]"
-        '
-        'tbMaxEngineOffTimespan
-        '
-        Me.tbMaxEngineOffTimespan.Location = New System.Drawing.Point(247, 43)
-        Me.tbMaxEngineOffTimespan.Name = "tbMaxEngineOffTimespan"
-        Me.tbMaxEngineOffTimespan.Size = New System.Drawing.Size(52, 20)
-        Me.tbMaxEngineOffTimespan.TabIndex = 1
-        '
-        'Label19
-        '
-        Me.Label19.AutoSize = true
-        Me.Label19.Location = New System.Drawing.Point(7, 46)
-        Me.Label19.Name = "Label19"
-        Me.Label19.Size = New System.Drawing.Size(105, 13)
-        Me.Label19.TabIndex = 3
-        Me.Label19.Text = "Max. engine-off time:"
-        '
-        'Label17
-        '
-        Me.Label17.AutoSize = true
-        Me.Label17.Location = New System.Drawing.Point(305, 20)
-        Me.Label17.Name = "Label17"
-        Me.Label17.Size = New System.Drawing.Size(18, 13)
-        Me.Label17.TabIndex = 2
-        Me.Label17.Text = "[s]"
-        '
-        'tbEngineStopStartActivationDelay
-        '
-        Me.tbEngineStopStartActivationDelay.Location = New System.Drawing.Point(247, 17)
-        Me.tbEngineStopStartActivationDelay.Name = "tbEngineStopStartActivationDelay"
-        Me.tbEngineStopStartActivationDelay.Size = New System.Drawing.Size(52, 20)
-        Me.tbEngineStopStartActivationDelay.TabIndex = 0
-        '
-        'Label16
-        '
-        Me.Label16.AutoSize = true
-        Me.Label16.Location = New System.Drawing.Point(7, 20)
-        Me.Label16.Name = "Label16"
-        Me.Label16.Size = New System.Drawing.Size(87, 13)
-        Me.Label16.TabIndex = 0
-        Me.Label16.Text = "Delay engine-off:"
-        '
-        'ButAuxRem
-        '
-        Me.ButAuxRem.Location = New System.Drawing.Point(0, 0)
-        Me.ButAuxRem.Name = "ButAuxRem"
-        Me.ButAuxRem.Size = New System.Drawing.Size(75, 23)
-        Me.ButAuxRem.TabIndex = 0
-        '
-        'ButAuxAdd
-        '
-        Me.ButAuxAdd.Location = New System.Drawing.Point(0, 0)
-        Me.ButAuxAdd.Name = "ButAuxAdd"
-        Me.ButAuxAdd.Size = New System.Drawing.Size(75, 23)
-        Me.ButAuxAdd.TabIndex = 0
-        '
-        'GroupBox1
-        '
-        Me.GroupBox1.Location = New System.Drawing.Point(0, 0)
-        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(200, 100)
-        Me.GroupBox1.TabIndex = 0
-        Me.GroupBox1.TabStop = false
-        '
-        'GroupBox2
-        '
-        Me.GroupBox2.Location = New System.Drawing.Point(0, 0)
-        Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(200, 100)
-        Me.GroupBox2.TabIndex = 0
-        Me.GroupBox2.TabStop = false
-        '
-        'TbUnderSpeed
-        '
-        Me.TbUnderSpeed.Location = New System.Drawing.Point(0, 0)
-        Me.TbUnderSpeed.Name = "TbUnderSpeed"
-        Me.TbUnderSpeed.Size = New System.Drawing.Size(100, 20)
-        Me.TbUnderSpeed.TabIndex = 0
-        '
-        'StatusStrip1
-        '
-        Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 609)
-        Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Size = New System.Drawing.Size(944, 22)
-        Me.StatusStrip1.SizingGrip = false
-        Me.StatusStrip1.TabIndex = 6
-        Me.StatusStrip1.Text = "StatusStrip1"
-        '
-        'ToolStripStatusLabelGEN
-        '
-        Me.ToolStripStatusLabelGEN.Name = "ToolStripStatusLabelGEN"
-        Me.ToolStripStatusLabelGEN.Size = New System.Drawing.Size(119, 17)
-        Me.ToolStripStatusLabelGEN.Text = "ToolStripStatusLabel1"
-        '
-        '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(776, 563)
-        Me.ButOK.Name = "ButOK"
-        Me.ButOK.Size = New System.Drawing.Size(75, 23)
-        Me.ButOK.TabIndex = 1
-        Me.ButOK.Text = "Save"
-        Me.ButOK.UseVisualStyleBackColor = true
-        '
-        'ButCancel
-        '
-        Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
-        Me.ButCancel.Location = New System.Drawing.Point(857, 563)
-        Me.ButCancel.Name = "ButCancel"
-        Me.ButCancel.Size = New System.Drawing.Size(75, 23)
-        Me.ButCancel.TabIndex = 2
-        Me.ButCancel.Text = "Cancel"
-        Me.ButCancel.UseVisualStyleBackColor = true
-        '
-        'ToolStrip1
-        '
-        Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
-        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator1, Me.ToolStripBtSendTo, Me.ToolStripSeparator2, Me.ToolStripButton1})
-        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
-        Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
-        Me.ToolStrip1.Size = New System.Drawing.Size(944, 31)
-        Me.ToolStrip1.TabIndex = 20
-        Me.ToolStrip1.Text = "ToolStrip1"
-        '
-        'ToolStripBtNew
-        '
-        Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
-        Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtNew.Name = "ToolStripBtNew"
-        Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
-        Me.ToolStripBtNew.Text = "New"
-        Me.ToolStripBtNew.ToolTipText = "New"
-        '
-        'ToolStripBtOpen
-        '
-        Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
-        Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
-        Me.ToolStripBtOpen.Text = "Open"
-        Me.ToolStripBtOpen.ToolTipText = "Open..."
-        '
-        'ToolStripBtSave
-        '
-        Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
-        Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSave.Name = "ToolStripBtSave"
-        Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
-        Me.ToolStripBtSave.Text = "Save"
-        Me.ToolStripBtSave.ToolTipText = "Save"
-        '
-        'ToolStripBtSaveAs
-        '
-        Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
-        Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
-        Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
-        Me.ToolStripBtSaveAs.Text = "Save As"
-        Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
-        '
-        'ToolStripSeparator1
-        '
-        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
-        '
-        'ToolStripBtSendTo
-        '
-        Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
-        Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
-        Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
-        Me.ToolStripBtSendTo.Text = "Send to Job List"
-        Me.ToolStripBtSendTo.ToolTipText = "Send to Job List"
-        '
-        'ToolStripSeparator2
-        '
-        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
-        '
-        'ToolStripButton1
-        '
-        Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
-        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.ToolStripButton1.Name = "ToolStripButton1"
-        Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
-        Me.ToolStripButton1.Text = "Help"
-        '
-        'PictureBox1
-        '
-        Me.PictureBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-        Me.PictureBox1.BackColor = System.Drawing.Color.White
-        Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
-        Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
-        Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(944, 40)
-        Me.PictureBox1.TabIndex = 21
-        Me.PictureBox1.TabStop = false
-        '
-        'CmOpenFile
-        '
-        Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
-        Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
-        Me.CmOpenFile.Name = "CmOpenFile"
-        Me.CmOpenFile.ShowImageMargin = false
-        Me.CmOpenFile.Size = New System.Drawing.Size(128, 48)
-        '
-        'OpenWithToolStripMenuItem
-        '
-        Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
-        Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
-        Me.OpenWithToolStripMenuItem.Text = "Open with ..."
-        '
-        'ShowInFolderToolStripMenuItem
-        '
-        Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
-        Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
-        Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
-        '
-        'PicVehicle
-        '
-        Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
-        Me.PicVehicle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.PicVehicle.Location = New System.Drawing.Point(4, 3)
-        Me.PicVehicle.Name = "PicVehicle"
-        Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
-        Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
-        Me.PicVehicle.TabIndex = 36
-        Me.PicVehicle.TabStop = false
-        '
-        'PicBox
-        '
-        Me.PicBox.BackColor = System.Drawing.Color.LightGray
-        Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.PicBox.Location = New System.Drawing.Point(4, 144)
-        Me.PicBox.Name = "PicBox"
-        Me.PicBox.Size = New System.Drawing.Size(390, 296)
-        Me.PicBox.TabIndex = 36
-        Me.PicBox.TabStop = false
-        '
-        'TbEngTxt
-        '
-        Me.TbEngTxt.Location = New System.Drawing.Point(4, 93)
-        Me.TbEngTxt.Name = "TbEngTxt"
-        Me.TbEngTxt.ReadOnly = true
-        Me.TbEngTxt.Size = New System.Drawing.Size(390, 20)
-        Me.TbEngTxt.TabIndex = 6
-        '
-        'TbVehCat
-        '
-        Me.TbVehCat.Location = New System.Drawing.Point(307, 3)
-        Me.TbVehCat.Name = "TbVehCat"
-        Me.TbVehCat.ReadOnly = true
-        Me.TbVehCat.Size = New System.Drawing.Size(87, 20)
-        Me.TbVehCat.TabIndex = 2
-        '
-        'TbAxleConf
-        '
-        Me.TbAxleConf.Location = New System.Drawing.Point(363, 29)
-        Me.TbAxleConf.Name = "TbAxleConf"
-        Me.TbAxleConf.ReadOnly = true
-        Me.TbAxleConf.Size = New System.Drawing.Size(31, 20)
-        Me.TbAxleConf.TabIndex = 4
-        '
-        'TbHVCclass
-        '
-        Me.TbHVCclass.Location = New System.Drawing.Point(307, 66)
-        Me.TbHVCclass.Name = "TbHVCclass"
-        Me.TbHVCclass.ReadOnly = true
-        Me.TbHVCclass.Size = New System.Drawing.Size(87, 20)
-        Me.TbHVCclass.TabIndex = 5
-        '
-        'TbGbxTxt
-        '
-        Me.TbGbxTxt.Location = New System.Drawing.Point(4, 118)
-        Me.TbGbxTxt.Name = "TbGbxTxt"
-        Me.TbGbxTxt.ReadOnly = true
-        Me.TbGbxTxt.Size = New System.Drawing.Size(390, 20)
-        Me.TbGbxTxt.TabIndex = 7
-        '
-        'TbMass
-        '
-        Me.TbMass.Location = New System.Drawing.Point(307, 29)
-        Me.TbMass.Name = "TbMass"
-        Me.TbMass.ReadOnly = true
-        Me.TbMass.Size = New System.Drawing.Size(50, 20)
-        Me.TbMass.TabIndex = 3
-        '
-        'lblEngineCharacteristics
-        '
-        Me.lblEngineCharacteristics.AutoSize = true
-        Me.lblEngineCharacteristics.Location = New System.Drawing.Point(7, 445)
-        Me.lblEngineCharacteristics.Name = "lblEngineCharacteristics"
-        Me.lblEngineCharacteristics.Size = New System.Drawing.Size(0, 13)
-        Me.lblEngineCharacteristics.TabIndex = 37
-        '
-        'lblTitle
-        '
-        Me.lblTitle.AutoSize = true
-        Me.lblTitle.BackColor = System.Drawing.Color.White
-        Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
-        Me.lblTitle.Location = New System.Drawing.Point(114, 34)
-        Me.lblTitle.Name = "lblTitle"
-        Me.lblTitle.Size = New System.Drawing.Size(320, 29)
-        Me.lblTitle.TabIndex = 38
-        Me.lblTitle.Text = "Job Editor - VEHICLE_TYPE"
-        '
-        'pnJobInfo
-        '
-        Me.pnJobInfo.Controls.Add(Me.PicVehicle)
-        Me.pnJobInfo.Controls.Add(Me.TbVehCat)
-        Me.pnJobInfo.Controls.Add(Me.TbHVCclass)
-        Me.pnJobInfo.Controls.Add(Me.TbAxleConf)
-        Me.pnJobInfo.Controls.Add(Me.TbMass)
-        Me.pnJobInfo.Controls.Add(Me.PicBox)
-        Me.pnJobInfo.Controls.Add(Me.TbGbxTxt)
-        Me.pnJobInfo.Controls.Add(Me.TbEngTxt)
-        Me.pnJobInfo.Location = New System.Drawing.Point(532, 78)
-        Me.pnJobInfo.Name = "pnJobInfo"
-        Me.pnJobInfo.Size = New System.Drawing.Size(397, 471)
-        Me.pnJobInfo.TabIndex = 39
-        '
-        'VectoJobForm
-        '
-        Me.AcceptButton = Me.ButOK
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.CancelButton = Me.ButCancel
-        Me.ClientSize = New System.Drawing.Size(944, 631)
-        Me.Controls.Add(Me.pnJobInfo)
-        Me.Controls.Add(Me.lblTitle)
-        Me.Controls.Add(Me.tcJob)
-        Me.Controls.Add(Me.lblEngineCharacteristics)
-        Me.Controls.Add(Me.PictureBox1)
-        Me.Controls.Add(Me.ToolStrip1)
-        Me.Controls.Add(Me.ButCancel)
-        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.CenterScreen
-        Me.Text = "Job Editor"
-        Me.TabPgGen.ResumeLayout(false)
-        Me.pnHybridStrategy.ResumeLayout(false)
-        Me.pnHybridStrategy.PerformLayout
-        Me.pnVehicle.ResumeLayout(false)
-        Me.pnVehicle.PerformLayout
-        Me.pnEngine.ResumeLayout(false)
-        Me.pnEngine.PerformLayout
-        Me.pnGearbox.ResumeLayout(false)
-        Me.pnGearbox.PerformLayout
-        Me.pnShiftParams.ResumeLayout(false)
-        Me.pnShiftParams.PerformLayout
-        Me.GrCycles.ResumeLayout(false)
-        Me.GrCycles.PerformLayout
-        Me.GrAuxMech.ResumeLayout(false)
-        Me.pnAuxDeclarationMode.ResumeLayout(false)
-        Me.pnAuxDeclarationMode.PerformLayout
-        Me.pnAuxEngineering.ResumeLayout(false)
-        Me.pnAuxEngineering.PerformLayout
-        CType(Me.picAuxInfo,System.ComponentModel.ISupportInitialize).EndInit
-        Me.tcJob.ResumeLayout(false)
-        Me.tpAuxiliaries.ResumeLayout(false)
-        Me.gbBusAux.ResumeLayout(false)
-        Me.gbBusAux.PerformLayout
-        Me.pnBusAux.ResumeLayout(false)
-        Me.pnBusAux.PerformLayout
-        Me.gbElectricAux.ResumeLayout(false)
-        Me.gbElectricAux.PerformLayout
-        Me.tpCycles.ResumeLayout(false)
-        Me.TabPgDriver.ResumeLayout(false)
-        Me.GrVACC.ResumeLayout(false)
-        Me.GrVACC.PerformLayout
-        Me.GrLAC.ResumeLayout(false)
-        Me.GrLAC.PerformLayout
-        Me.pnLookAheadCoasting.ResumeLayout(false)
-        Me.pnLookAheadCoasting.PerformLayout
-        Me.gbOverspeed.ResumeLayout(false)
-        Me.gbOverspeed.PerformLayout
-        Me.PnEcoRoll.ResumeLayout(false)
-        Me.PnEcoRoll.PerformLayout
-        Me.TabPgADAS.ResumeLayout(false)
-        Me.gbPCC.ResumeLayout(false)
-        Me.gbPCC.PerformLayout
-        Me.gbEcoRoll.ResumeLayout(false)
-        Me.gbEcoRoll.PerformLayout
-        Me.gbEngineStopStart.ResumeLayout(false)
-        Me.gbEngineStopStart.PerformLayout
-        Me.StatusStrip1.ResumeLayout(false)
-        Me.StatusStrip1.PerformLayout
-        Me.ToolStrip1.ResumeLayout(false)
-        Me.ToolStrip1.PerformLayout
-        CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
-        Me.CmOpenFile.ResumeLayout(false)
-        CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).EndInit
-        CType(Me.PicBox,System.ComponentModel.ISupportInitialize).EndInit
-        Me.pnJobInfo.ResumeLayout(false)
-        Me.pnJobInfo.PerformLayout
-        Me.ResumeLayout(false)
-        Me.PerformLayout
+		Me.components = New System.ComponentModel.Container()
+		Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(VectoJobForm))
+		Me.TabPgGen = New System.Windows.Forms.TabPage()
+		Me.pnHybridStrategy = New System.Windows.Forms.Panel()
+		Me.btnOpenHybridStrategyParameters = New System.Windows.Forms.Button()
+		Me.tbHybridStrategyParams = New System.Windows.Forms.TextBox()
+		Me.btnBrowseHybridStrategyParams = New System.Windows.Forms.Button()
+		Me.pnVehicle = New System.Windows.Forms.Panel()
+		Me.ButOpenVEH = New System.Windows.Forms.Button()
+		Me.ButtonVEH = New System.Windows.Forms.Button()
+		Me.TbVEH = New System.Windows.Forms.TextBox()
+		Me.pnEngine = New System.Windows.Forms.Panel()
+		Me.ButOpenENG = New System.Windows.Forms.Button()
+		Me.ButtonMAP = New System.Windows.Forms.Button()
+		Me.TbENG = New System.Windows.Forms.TextBox()
+		Me.pnGearbox = New System.Windows.Forms.Panel()
+		Me.ButOpenGBX = New System.Windows.Forms.Button()
+		Me.ButtonGBX = New System.Windows.Forms.Button()
+		Me.TbGBX = New System.Windows.Forms.TextBox()
+		Me.pnShiftParams = New System.Windows.Forms.Panel()
+		Me.BtnShiftParamsForm = New System.Windows.Forms.Button()
+		Me.TbShiftStrategyParams = New System.Windows.Forms.TextBox()
+		Me.BtnShiftStrategyParams = New System.Windows.Forms.Button()
+		Me.GrCycles = New System.Windows.Forms.GroupBox()
+		Me.Label2 = New System.Windows.Forms.Label()
+		Me.LvCycles = New System.Windows.Forms.ListView()
+		Me.ColumnHeader1 = New System.Windows.Forms.ColumnHeader()
+		Me.BtDRIrem = New System.Windows.Forms.Button()
+		Me.BtDRIadd = New System.Windows.Forms.Button()
+		Me.GrAuxMech = New System.Windows.Forms.GroupBox()
+		Me.pnAuxDeclarationMode = New System.Windows.Forms.Panel()
+		Me.LvAux = New System.Windows.Forms.ListView()
+		Me.ColumnHeader4 = New System.Windows.Forms.ColumnHeader()
+		Me.ColumnHeader5 = New System.Windows.Forms.ColumnHeader()
+		Me.ColumnHeader6 = New System.Windows.Forms.ColumnHeader()
+		Me.Label32 = New System.Windows.Forms.Label()
+		Me.pnAuxEngineering = New System.Windows.Forms.Panel()
+		Me.tbPAuxStandstillICEOff = New System.Windows.Forms.TextBox()
+		Me.lblAuxStandstillICEOffUnit = New System.Windows.Forms.Label()
+		Me.lblAuxStandstillICEOff = New System.Windows.Forms.Label()
+		Me.tbPAuxDrivingICEOff = New System.Windows.Forms.TextBox()
+		Me.lblAuxDrivingICEOffUnit = New System.Windows.Forms.Label()
+		Me.lblAuxDrivingICEOff = New System.Windows.Forms.Label()
+		Me.TbAuxPAuxICEOn = New System.Windows.Forms.TextBox()
+		Me.lblAuxICEOnUnit = New System.Windows.Forms.Label()
+		Me.lblAuxICEOn = New System.Windows.Forms.Label()
+		Me.GrAux = New System.Windows.Forms.GroupBox()
+		Me.Label9 = New System.Windows.Forms.Label()
+		Me.TbAuxPAdd = New System.Windows.Forms.TextBox()
+		Me.Label8 = New System.Windows.Forms.Label()
+		Me.btnAAUXOpen = New System.Windows.Forms.Button()
+		Me.Label1 = New System.Windows.Forms.Label()
+		Me.btnBrowseAAUXFile = New System.Windows.Forms.Button()
+		Me.txtAdvancedAuxiliaryFile = New System.Windows.Forms.TextBox()
+		Me.picAuxInfo = New System.Windows.Forms.PictureBox()
+		Me.cboAdvancedAuxiliaries = New System.Windows.Forms.ComboBox()
+		Me.lbAdvancedAuxiliaries = New System.Windows.Forms.Label()
+		Me.tcJob = New System.Windows.Forms.TabControl()
+		Me.tpAuxiliaries = New System.Windows.Forms.TabPage()
+		Me.gbBusAux = New System.Windows.Forms.GroupBox()
+		Me.cbEnableBusAux = New System.Windows.Forms.CheckBox()
+		Me.pnBusAux = New System.Windows.Forms.Panel()
+		Me.btnBusAuxP = New System.Windows.Forms.Button()
+		Me.tbBusAuxParams = New System.Windows.Forms.TextBox()
+		Me.btnBrowsBusAuxParams = New System.Windows.Forms.Button()
+		Me.gbElectricAux = New System.Windows.Forms.GroupBox()
+		Me.Label46 = New System.Windows.Forms.Label()
+		Me.lblElAuxConstUnit = New System.Windows.Forms.Label()
+		Me.tbElectricAuxConstant = New System.Windows.Forms.TextBox()
+		Me.lblElAuxConst = New System.Windows.Forms.Label()
+		Me.tpCycles = New System.Windows.Forms.TabPage()
+		Me.TabPgDriver = New System.Windows.Forms.TabPage()
+		Me.GrVACC = New System.Windows.Forms.GroupBox()
+		Me.Label15 = New System.Windows.Forms.Label()
+		Me.TbDesMaxFile = New System.Windows.Forms.TextBox()
+		Me.BtDesMaxBr = New System.Windows.Forms.Button()
+		Me.BtAccOpen = New System.Windows.Forms.Button()
+		Me.GrLAC = New System.Windows.Forms.GroupBox()
+		Me.pnLookAheadCoasting = New System.Windows.Forms.Panel()
+		Me.Label49 = New System.Windows.Forms.Label()
+		Me.Label7 = New System.Windows.Forms.Label()
+		Me.Label6 = New System.Windows.Forms.Label()
+		Me.tbLacMinSpeed = New System.Windows.Forms.TextBox()
+		Me.btnDfVelocityDrop = New System.Windows.Forms.Button()
+		Me.Label12 = New System.Windows.Forms.Label()
+		Me.tbDfCoastingScale = New System.Windows.Forms.TextBox()
+		Me.Label11 = New System.Windows.Forms.Label()
+		Me.Label3 = New System.Windows.Forms.Label()
+		Me.tbDfCoastingOffset = New System.Windows.Forms.TextBox()
+		Me.tbLacDfTargetSpeedFile = New System.Windows.Forms.TextBox()
+		Me.Label10 = New System.Windows.Forms.Label()
+		Me.Label4 = New System.Windows.Forms.Label()
+		Me.Label5 = New System.Windows.Forms.Label()
+		Me.btnDfTargetSpeed = New System.Windows.Forms.Button()
+		Me.tbLacPreviewFactor = New System.Windows.Forms.TextBox()
+		Me.tbLacDfVelocityDropFile = New System.Windows.Forms.TextBox()
+		Me.CbLookAhead = New System.Windows.Forms.CheckBox()
+		Me.gbOverspeed = New System.Windows.Forms.GroupBox()
+		Me.PnEcoRoll = New System.Windows.Forms.Panel()
+		Me.Label21 = New System.Windows.Forms.Label()
+		Me.Label14 = New System.Windows.Forms.Label()
+		Me.TbVmin = New System.Windows.Forms.TextBox()
+		Me.TbOverspeed = New System.Windows.Forms.TextBox()
+		Me.Label23 = New System.Windows.Forms.Label()
+		Me.Label13 = New System.Windows.Forms.Label()
+		Me.RdOverspeed = New System.Windows.Forms.RadioButton()
+		Me.RdOff = New System.Windows.Forms.RadioButton()
+		Me.TabPgADAS = New System.Windows.Forms.TabPage()
+		Me.gbPCC = New System.Windows.Forms.GroupBox()
+		Me.Label43 = New System.Windows.Forms.Label()
+		Me.Label42 = New System.Windows.Forms.Label()
+		Me.Label40 = New System.Windows.Forms.Label()
+		Me.Label41 = New System.Windows.Forms.Label()
+		Me.tbPCCPreviewUseCase2 = New System.Windows.Forms.TextBox()
+		Me.Label38 = New System.Windows.Forms.Label()
+		Me.Label39 = New System.Windows.Forms.Label()
+		Me.tbPCCPreviewUseCase1 = New System.Windows.Forms.TextBox()
+		Me.Label36 = New System.Windows.Forms.Label()
+		Me.Label37 = New System.Windows.Forms.Label()
+		Me.tbPCCMinSpeed = New System.Windows.Forms.TextBox()
+		Me.Label34 = New System.Windows.Forms.Label()
+		Me.Label35 = New System.Windows.Forms.Label()
+		Me.tbPCCEnableSpeed = New System.Windows.Forms.TextBox()
+		Me.Label31 = New System.Windows.Forms.Label()
+		Me.Label33 = New System.Windows.Forms.Label()
+		Me.tbPCCOverspeed = New System.Windows.Forms.TextBox()
+		Me.Label20 = New System.Windows.Forms.Label()
+		Me.Label22 = New System.Windows.Forms.Label()
+		Me.tbPCCUnderspeed = New System.Windows.Forms.TextBox()
+		Me.gbEcoRoll = New System.Windows.Forms.GroupBox()
+		Me.Label44 = New System.Windows.Forms.Label()
+		Me.Label45 = New System.Windows.Forms.Label()
+		Me.tbEcoRollMaxAcc = New System.Windows.Forms.TextBox()
+		Me.Label29 = New System.Windows.Forms.Label()
+		Me.Label30 = New System.Windows.Forms.Label()
+		Me.tbEcoRollUnderspeed = New System.Windows.Forms.TextBox()
+		Me.Label27 = New System.Windows.Forms.Label()
+		Me.Label28 = New System.Windows.Forms.Label()
+		Me.tbEcoRollActivationDelay = New System.Windows.Forms.TextBox()
+		Me.Label25 = New System.Windows.Forms.Label()
+		Me.Label26 = New System.Windows.Forms.Label()
+		Me.tbEcoRollMinSpeed = New System.Windows.Forms.TextBox()
+		Me.gbEngineStopStart = New System.Windows.Forms.GroupBox()
+		Me.lblESSUtilityFactorDrivingUnit = New System.Windows.Forms.Label()
+		Me.Label47 = New System.Windows.Forms.Label()
+		Me.tbESSUtilityFactorDriving = New System.Windows.Forms.TextBox()
+		Me.lblESSUtilityFactorDriving = New System.Windows.Forms.Label()
+		Me.tbEssUtility = New System.Windows.Forms.TextBox()
+		Me.Label24 = New System.Windows.Forms.Label()
+		Me.Label18 = New System.Windows.Forms.Label()
+		Me.tbMaxEngineOffTimespan = New System.Windows.Forms.TextBox()
+		Me.Label19 = New System.Windows.Forms.Label()
+		Me.Label17 = New System.Windows.Forms.Label()
+		Me.tbEngineStopStartActivationDelay = New System.Windows.Forms.TextBox()
+		Me.Label16 = New System.Windows.Forms.Label()
+		Me.ButAuxRem = New System.Windows.Forms.Button()
+		Me.ButAuxAdd = New System.Windows.Forms.Button()
+		Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+		Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+		Me.TbUnderSpeed = New System.Windows.Forms.TextBox()
+		Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+		Me.ToolStripStatusLabelGEN = New System.Windows.Forms.ToolStripStatusLabel()
+		Me.ButOK = New System.Windows.Forms.Button()
+		Me.ButCancel = New System.Windows.Forms.Button()
+		Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+		Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
+		Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
+		Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+		Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
+		Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+		Me.CmOpenFile = New System.Windows.Forms.ContextMenuStrip(Me.components)
+		Me.OpenWithToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+		Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+		Me.PicVehicle = New System.Windows.Forms.PictureBox()
+		Me.PicBox = New System.Windows.Forms.PictureBox()
+		Me.TbEngTxt = New System.Windows.Forms.TextBox()
+		Me.TbVehCat = New System.Windows.Forms.TextBox()
+		Me.TbAxleConf = New System.Windows.Forms.TextBox()
+		Me.TbHVCclass = New System.Windows.Forms.TextBox()
+		Me.TbGbxTxt = New System.Windows.Forms.TextBox()
+		Me.TbMass = New System.Windows.Forms.TextBox()
+		Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+		Me.lblEngineCharacteristics = New System.Windows.Forms.Label()
+		Me.lblTitle = New System.Windows.Forms.Label()
+		Me.pnJobInfo = New System.Windows.Forms.Panel()
+		Me.TabPgGen.SuspendLayout()
+		Me.pnHybridStrategy.SuspendLayout()
+		Me.pnVehicle.SuspendLayout()
+		Me.pnEngine.SuspendLayout()
+		Me.pnGearbox.SuspendLayout()
+		Me.pnShiftParams.SuspendLayout()
+		Me.GrCycles.SuspendLayout()
+		Me.GrAuxMech.SuspendLayout()
+		Me.pnAuxDeclarationMode.SuspendLayout()
+		Me.pnAuxEngineering.SuspendLayout()
+		CType(Me.picAuxInfo, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.tcJob.SuspendLayout()
+		Me.tpAuxiliaries.SuspendLayout()
+		Me.gbBusAux.SuspendLayout()
+		Me.pnBusAux.SuspendLayout()
+		Me.gbElectricAux.SuspendLayout()
+		Me.tpCycles.SuspendLayout()
+		Me.TabPgDriver.SuspendLayout()
+		Me.GrVACC.SuspendLayout()
+		Me.GrLAC.SuspendLayout()
+		Me.pnLookAheadCoasting.SuspendLayout()
+		Me.gbOverspeed.SuspendLayout()
+		Me.PnEcoRoll.SuspendLayout()
+		Me.TabPgADAS.SuspendLayout()
+		Me.gbPCC.SuspendLayout()
+		Me.gbEcoRoll.SuspendLayout()
+		Me.gbEngineStopStart.SuspendLayout()
+		Me.StatusStrip1.SuspendLayout()
+		Me.ToolStrip1.SuspendLayout()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.CmOpenFile.SuspendLayout()
+		CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
+		CType(Me.PicBox, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.pnJobInfo.SuspendLayout()
+		Me.SuspendLayout()
+		'
+		'TabPgGen
+		'
+		Me.TabPgGen.Controls.Add(Me.pnHybridStrategy)
+		Me.TabPgGen.Controls.Add(Me.pnVehicle)
+		Me.TabPgGen.Controls.Add(Me.pnEngine)
+		Me.TabPgGen.Controls.Add(Me.pnGearbox)
+		Me.TabPgGen.Controls.Add(Me.pnShiftParams)
+		Me.TabPgGen.Location = New System.Drawing.Point(4, 24)
+		Me.TabPgGen.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TabPgGen.Name = "TabPgGen"
+		Me.TabPgGen.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TabPgGen.Size = New System.Drawing.Size(614, 572)
+		Me.TabPgGen.TabIndex = 0
+		Me.TabPgGen.Text = "General"
+		Me.TabPgGen.UseVisualStyleBackColor = True
+		'
+		'pnHybridStrategy
+		'
+		Me.pnHybridStrategy.Controls.Add(Me.btnOpenHybridStrategyParameters)
+		Me.pnHybridStrategy.Controls.Add(Me.tbHybridStrategyParams)
+		Me.pnHybridStrategy.Controls.Add(Me.btnBrowseHybridStrategyParams)
+		Me.pnHybridStrategy.Location = New System.Drawing.Point(5, 144)
+		Me.pnHybridStrategy.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnHybridStrategy.Name = "pnHybridStrategy"
+		Me.pnHybridStrategy.Size = New System.Drawing.Size(602, 30)
+		Me.pnHybridStrategy.TabIndex = 4
+		'
+		'btnOpenHybridStrategyParameters
+		'
+		Me.btnOpenHybridStrategyParameters.Location = New System.Drawing.Point(4, 3)
+		Me.btnOpenHybridStrategyParameters.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.btnOpenHybridStrategyParameters.Name = "btnOpenHybridStrategyParameters"
+		Me.btnOpenHybridStrategyParameters.Size = New System.Drawing.Size(84, 24)
+		Me.btnOpenHybridStrategyParameters.TabIndex = 0
+		Me.btnOpenHybridStrategyParameters.Text = "Hyb. Str. P."
+		Me.btnOpenHybridStrategyParameters.UseVisualStyleBackColor = True
+		'
+		'tbHybridStrategyParams
+		'
+		Me.tbHybridStrategyParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.tbHybridStrategyParams.Location = New System.Drawing.Point(94, 3)
+		Me.tbHybridStrategyParams.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbHybridStrategyParams.Name = "tbHybridStrategyParams"
+		Me.tbHybridStrategyParams.Size = New System.Drawing.Size(473, 23)
+		Me.tbHybridStrategyParams.TabIndex = 1
+		'
+		'btnBrowseHybridStrategyParams
+		'
+		Me.btnBrowseHybridStrategyParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.btnBrowseHybridStrategyParams.Image = CType(resources.GetObject("btnBrowseHybridStrategyParams.Image"), System.Drawing.Image)
+		Me.btnBrowseHybridStrategyParams.Location = New System.Drawing.Point(570, 1)
+		Me.btnBrowseHybridStrategyParams.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.btnBrowseHybridStrategyParams.Name = "btnBrowseHybridStrategyParams"
+		Me.btnBrowseHybridStrategyParams.Size = New System.Drawing.Size(28, 28)
+		Me.btnBrowseHybridStrategyParams.TabIndex = 2
+		Me.btnBrowseHybridStrategyParams.UseVisualStyleBackColor = True
+		'
+		'pnVehicle
+		'
+		Me.pnVehicle.Controls.Add(Me.ButOpenVEH)
+		Me.pnVehicle.Controls.Add(Me.ButtonVEH)
+		Me.pnVehicle.Controls.Add(Me.TbVEH)
+		Me.pnVehicle.Location = New System.Drawing.Point(5, 8)
+		Me.pnVehicle.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnVehicle.Name = "pnVehicle"
+		Me.pnVehicle.Size = New System.Drawing.Size(604, 31)
+		Me.pnVehicle.TabIndex = 0
+		'
+		'ButOpenVEH
+		'
+		Me.ButOpenVEH.Location = New System.Drawing.Point(5, 3)
+		Me.ButOpenVEH.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.ButOpenVEH.Name = "ButOpenVEH"
+		Me.ButOpenVEH.Size = New System.Drawing.Size(84, 24)
+		Me.ButOpenVEH.TabIndex = 0
+		Me.ButOpenVEH.Text = "Vehicle"
+		Me.ButOpenVEH.UseVisualStyleBackColor = True
+		'
+		'ButtonVEH
+		'
+		Me.ButtonVEH.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButtonVEH.Image = CType(resources.GetObject("ButtonVEH.Image"), System.Drawing.Image)
+		Me.ButtonVEH.Location = New System.Drawing.Point(574, 2)
+		Me.ButtonVEH.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.ButtonVEH.Name = "ButtonVEH"
+		Me.ButtonVEH.Size = New System.Drawing.Size(28, 28)
+		Me.ButtonVEH.TabIndex = 2
+		Me.ButtonVEH.UseVisualStyleBackColor = True
+		'
+		'TbVEH
+		'
+		Me.TbVEH.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbVEH.Location = New System.Drawing.Point(96, 5)
+		Me.TbVEH.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TbVEH.Name = "TbVEH"
+		Me.TbVEH.Size = New System.Drawing.Size(471, 23)
+		Me.TbVEH.TabIndex = 1
+		'
+		'pnEngine
+		'
+		Me.pnEngine.Controls.Add(Me.ButOpenENG)
+		Me.pnEngine.Controls.Add(Me.ButtonMAP)
+		Me.pnEngine.Controls.Add(Me.TbENG)
+		Me.pnEngine.Location = New System.Drawing.Point(5, 43)
+		Me.pnEngine.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnEngine.Name = "pnEngine"
+		Me.pnEngine.Size = New System.Drawing.Size(606, 31)
+		Me.pnEngine.TabIndex = 1
+		'
+		'ButOpenENG
+		'
+		Me.ButOpenENG.Location = New System.Drawing.Point(5, 3)
+		Me.ButOpenENG.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.ButOpenENG.Name = "ButOpenENG"
+		Me.ButOpenENG.Size = New System.Drawing.Size(84, 24)
+		Me.ButOpenENG.TabIndex = 0
+		Me.ButOpenENG.Text = "Engine"
+		Me.ButOpenENG.UseVisualStyleBackColor = True
+		'
+		'ButtonMAP
+		'
+		Me.ButtonMAP.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButtonMAP.Image = CType(resources.GetObject("ButtonMAP.Image"), System.Drawing.Image)
+		Me.ButtonMAP.Location = New System.Drawing.Point(574, 1)
+		Me.ButtonMAP.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.ButtonMAP.Name = "ButtonMAP"
+		Me.ButtonMAP.Size = New System.Drawing.Size(28, 28)
+		Me.ButtonMAP.TabIndex = 2
+		Me.ButtonMAP.UseVisualStyleBackColor = True
+		'
+		'TbENG
+		'
+		Me.TbENG.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbENG.Location = New System.Drawing.Point(96, 3)
+		Me.TbENG.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TbENG.Name = "TbENG"
+		Me.TbENG.Size = New System.Drawing.Size(471, 23)
+		Me.TbENG.TabIndex = 1
+		'
+		'pnGearbox
+		'
+		Me.pnGearbox.Controls.Add(Me.ButOpenGBX)
+		Me.pnGearbox.Controls.Add(Me.ButtonGBX)
+		Me.pnGearbox.Controls.Add(Me.TbGBX)
+		Me.pnGearbox.Location = New System.Drawing.Point(4, 76)
+		Me.pnGearbox.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnGearbox.Name = "pnGearbox"
+		Me.pnGearbox.Size = New System.Drawing.Size(603, 32)
+		Me.pnGearbox.TabIndex = 2
+		'
+		'ButOpenGBX
+		'
+		Me.ButOpenGBX.Location = New System.Drawing.Point(5, 3)
+		Me.ButOpenGBX.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.ButOpenGBX.Name = "ButOpenGBX"
+		Me.ButOpenGBX.Size = New System.Drawing.Size(84, 24)
+		Me.ButOpenGBX.TabIndex = 0
+		Me.ButOpenGBX.Text = "Gearbox"
+		Me.ButOpenGBX.UseVisualStyleBackColor = True
+		'
+		'ButtonGBX
+		'
+		Me.ButtonGBX.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButtonGBX.Image = CType(resources.GetObject("ButtonGBX.Image"), System.Drawing.Image)
+		Me.ButtonGBX.Location = New System.Drawing.Point(574, 1)
+		Me.ButtonGBX.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.ButtonGBX.Name = "ButtonGBX"
+		Me.ButtonGBX.Size = New System.Drawing.Size(28, 28)
+		Me.ButtonGBX.TabIndex = 2
+		Me.ButtonGBX.UseVisualStyleBackColor = True
+		'
+		'TbGBX
+		'
+		Me.TbGBX.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbGBX.Location = New System.Drawing.Point(96, 3)
+		Me.TbGBX.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TbGBX.Name = "TbGBX"
+		Me.TbGBX.Size = New System.Drawing.Size(471, 23)
+		Me.TbGBX.TabIndex = 1
+		'
+		'pnShiftParams
+		'
+		Me.pnShiftParams.Controls.Add(Me.BtnShiftParamsForm)
+		Me.pnShiftParams.Controls.Add(Me.TbShiftStrategyParams)
+		Me.pnShiftParams.Controls.Add(Me.BtnShiftStrategyParams)
+		Me.pnShiftParams.Location = New System.Drawing.Point(5, 111)
+		Me.pnShiftParams.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnShiftParams.Name = "pnShiftParams"
+		Me.pnShiftParams.Size = New System.Drawing.Size(602, 30)
+		Me.pnShiftParams.TabIndex = 3
+		'
+		'BtnShiftParamsForm
+		'
+		Me.BtnShiftParamsForm.Location = New System.Drawing.Point(4, 3)
+		Me.BtnShiftParamsForm.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.BtnShiftParamsForm.Name = "BtnShiftParamsForm"
+		Me.BtnShiftParamsForm.Size = New System.Drawing.Size(84, 24)
+		Me.BtnShiftParamsForm.TabIndex = 0
+		Me.BtnShiftParamsForm.Text = "Shift Parameters"
+		Me.BtnShiftParamsForm.UseVisualStyleBackColor = True
+		'
+		'TbShiftStrategyParams
+		'
+		Me.TbShiftStrategyParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbShiftStrategyParams.Location = New System.Drawing.Point(94, 3)
+		Me.TbShiftStrategyParams.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TbShiftStrategyParams.Name = "TbShiftStrategyParams"
+		Me.TbShiftStrategyParams.Size = New System.Drawing.Size(473, 23)
+		Me.TbShiftStrategyParams.TabIndex = 1
+		'
+		'BtnShiftStrategyParams
+		'
+		Me.BtnShiftStrategyParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtnShiftStrategyParams.Image = CType(resources.GetObject("BtnShiftStrategyParams.Image"), System.Drawing.Image)
+		Me.BtnShiftStrategyParams.Location = New System.Drawing.Point(570, 1)
+		Me.BtnShiftStrategyParams.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.BtnShiftStrategyParams.Name = "BtnShiftStrategyParams"
+		Me.BtnShiftStrategyParams.Size = New System.Drawing.Size(28, 28)
+		Me.BtnShiftStrategyParams.TabIndex = 2
+		Me.BtnShiftStrategyParams.UseVisualStyleBackColor = True
+		'
+		'GrCycles
+		'
+		Me.GrCycles.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.GrCycles.Controls.Add(Me.Label2)
+		Me.GrCycles.Controls.Add(Me.LvCycles)
+		Me.GrCycles.Controls.Add(Me.BtDRIrem)
+		Me.GrCycles.Controls.Add(Me.BtDRIadd)
+		Me.GrCycles.Location = New System.Drawing.Point(7, 7)
+		Me.GrCycles.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.GrCycles.Name = "GrCycles"
+		Me.GrCycles.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.GrCycles.Size = New System.Drawing.Size(601, 159)
+		Me.GrCycles.TabIndex = 0
+		Me.GrCycles.TabStop = False
+		Me.GrCycles.Text = "Cycles"
+		'
+		'Label2
+		'
+		Me.Label2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label2.AutoSize = True
+		Me.Label2.Location = New System.Drawing.Point(456, 126)
+		Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label2.Name = "Label2"
+		Me.Label2.Size = New System.Drawing.Size(137, 15)
+		Me.Label2.TabIndex = 3
+		Me.Label2.Text = "(Right-Click for Options)"
+		'
+		'LvCycles
+		'
+		Me.LvCycles.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.LvCycles.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1})
+		Me.LvCycles.FullRowSelect = True
+		Me.LvCycles.GridLines = True
+		Me.LvCycles.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
+		Me.LvCycles.LabelEdit = True
+		Me.LvCycles.Location = New System.Drawing.Point(7, 22)
+		Me.LvCycles.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.LvCycles.MultiSelect = False
+		Me.LvCycles.Name = "LvCycles"
+		Me.LvCycles.Size = New System.Drawing.Size(586, 102)
+		Me.LvCycles.TabIndex = 0
+		Me.LvCycles.TabStop = False
+		Me.LvCycles.UseCompatibleStateImageBehavior = False
+		Me.LvCycles.View = System.Windows.Forms.View.Details
+		'
+		'ColumnHeader1
+		'
+		Me.ColumnHeader1.Text = "Cycle path"
+		Me.ColumnHeader1.Width = 470
+		'
+		'BtDRIrem
+		'
+		Me.BtDRIrem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtDRIrem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
+		Me.BtDRIrem.Location = New System.Drawing.Point(34, 126)
+		Me.BtDRIrem.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.BtDRIrem.Name = "BtDRIrem"
+		Me.BtDRIrem.Size = New System.Drawing.Size(28, 28)
+		Me.BtDRIrem.TabIndex = 2
+		Me.BtDRIrem.UseVisualStyleBackColor = True
+		'
+		'BtDRIadd
+		'
+		Me.BtDRIadd.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtDRIadd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
+		Me.BtDRIadd.Location = New System.Drawing.Point(6, 126)
+		Me.BtDRIadd.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.BtDRIadd.Name = "BtDRIadd"
+		Me.BtDRIadd.Size = New System.Drawing.Size(28, 28)
+		Me.BtDRIadd.TabIndex = 1
+		Me.BtDRIadd.UseVisualStyleBackColor = True
+		'
+		'GrAuxMech
+		'
+		Me.GrAuxMech.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.GrAuxMech.Controls.Add(Me.pnAuxDeclarationMode)
+		Me.GrAuxMech.Controls.Add(Me.pnAuxEngineering)
+		Me.GrAuxMech.Location = New System.Drawing.Point(7, 18)
+		Me.GrAuxMech.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.GrAuxMech.Name = "GrAuxMech"
+		Me.GrAuxMech.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.GrAuxMech.Size = New System.Drawing.Size(601, 323)
+		Me.GrAuxMech.TabIndex = 0
+		Me.GrAuxMech.TabStop = False
+		Me.GrAuxMech.Text = "Mechanical Auxiliaries"
+		'
+		'pnAuxDeclarationMode
+		'
+		Me.pnAuxDeclarationMode.Controls.Add(Me.LvAux)
+		Me.pnAuxDeclarationMode.Controls.Add(Me.Label32)
+		Me.pnAuxDeclarationMode.Location = New System.Drawing.Point(7, 120)
+		Me.pnAuxDeclarationMode.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnAuxDeclarationMode.Name = "pnAuxDeclarationMode"
+		Me.pnAuxDeclarationMode.Size = New System.Drawing.Size(587, 196)
+		Me.pnAuxDeclarationMode.TabIndex = 40
+		'
+		'LvAux
+		'
+		Me.LvAux.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.LvAux.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader4, Me.ColumnHeader5, Me.ColumnHeader6})
+		Me.LvAux.FullRowSelect = True
+		Me.LvAux.GridLines = True
+		Me.LvAux.Location = New System.Drawing.Point(4, 3)
+		Me.LvAux.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.LvAux.MultiSelect = False
+		Me.LvAux.Name = "LvAux"
+		Me.LvAux.Size = New System.Drawing.Size(587, 167)
+		Me.LvAux.TabIndex = 0
+		Me.LvAux.TabStop = False
+		Me.LvAux.UseCompatibleStateImageBehavior = False
+		Me.LvAux.View = System.Windows.Forms.View.Details
+		'
+		'ColumnHeader4
+		'
+		Me.ColumnHeader4.Text = "ID"
+		Me.ColumnHeader4.Width = 45
+		'
+		'ColumnHeader5
+		'
+		Me.ColumnHeader5.Text = "Type"
+		Me.ColumnHeader5.Width = 108
+		'
+		'ColumnHeader6
+		'
+		Me.ColumnHeader6.Text = "Input File"
+		Me.ColumnHeader6.Width = 331
+		'
+		'Label32
+		'
+		Me.Label32.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label32.AutoSize = True
+		Me.Label32.Location = New System.Drawing.Point(10, 174)
+		Me.Label32.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label32.Name = "Label32"
+		Me.Label32.Size = New System.Drawing.Size(121, 15)
+		Me.Label32.TabIndex = 3
+		Me.Label32.Text = "(Double-Click to Edit)"
+		'
+		'pnAuxEngineering
+		'
+		Me.pnAuxEngineering.Controls.Add(Me.tbPAuxStandstillICEOff)
+		Me.pnAuxEngineering.Controls.Add(Me.lblAuxStandstillICEOffUnit)
+		Me.pnAuxEngineering.Controls.Add(Me.lblAuxStandstillICEOff)
+		Me.pnAuxEngineering.Controls.Add(Me.tbPAuxDrivingICEOff)
+		Me.pnAuxEngineering.Controls.Add(Me.lblAuxDrivingICEOffUnit)
+		Me.pnAuxEngineering.Controls.Add(Me.lblAuxDrivingICEOff)
+		Me.pnAuxEngineering.Controls.Add(Me.TbAuxPAuxICEOn)
+		Me.pnAuxEngineering.Controls.Add(Me.lblAuxICEOnUnit)
+		Me.pnAuxEngineering.Controls.Add(Me.lblAuxICEOn)
+		Me.pnAuxEngineering.Location = New System.Drawing.Point(7, 22)
+		Me.pnAuxEngineering.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnAuxEngineering.Name = "pnAuxEngineering"
+		Me.pnAuxEngineering.Size = New System.Drawing.Size(583, 92)
+		Me.pnAuxEngineering.TabIndex = 0
+		'
+		'tbPAuxStandstillICEOff
+		'
+		Me.tbPAuxStandstillICEOff.Location = New System.Drawing.Point(198, 63)
+		Me.tbPAuxStandstillICEOff.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbPAuxStandstillICEOff.Name = "tbPAuxStandstillICEOff"
+		Me.tbPAuxStandstillICEOff.Size = New System.Drawing.Size(88, 23)
+		Me.tbPAuxStandstillICEOff.TabIndex = 2
+		'
+		'lblAuxStandstillICEOffUnit
+		'
+		Me.lblAuxStandstillICEOffUnit.AutoSize = True
+		Me.lblAuxStandstillICEOffUnit.Location = New System.Drawing.Point(294, 67)
+		Me.lblAuxStandstillICEOffUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblAuxStandstillICEOffUnit.Name = "lblAuxStandstillICEOffUnit"
+		Me.lblAuxStandstillICEOffUnit.Size = New System.Drawing.Size(26, 15)
+		Me.lblAuxStandstillICEOffUnit.TabIndex = 50
+		Me.lblAuxStandstillICEOffUnit.Text = "[W]"
+		'
+		'lblAuxStandstillICEOff
+		'
+		Me.lblAuxStandstillICEOff.AutoSize = True
+		Me.lblAuxStandstillICEOff.Location = New System.Drawing.Point(4, 67)
+		Me.lblAuxStandstillICEOff.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblAuxStandstillICEOff.Name = "lblAuxStandstillICEOff"
+		Me.lblAuxStandstillICEOff.Size = New System.Drawing.Size(159, 15)
+		Me.lblAuxStandstillICEOff.TabIndex = 48
+		Me.lblAuxStandstillICEOff.Text = "Aux Load (Standstill, ICE Off)"
+		'
+		'tbPAuxDrivingICEOff
+		'
+		Me.tbPAuxDrivingICEOff.Location = New System.Drawing.Point(198, 33)
+		Me.tbPAuxDrivingICEOff.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbPAuxDrivingICEOff.Name = "tbPAuxDrivingICEOff"
+		Me.tbPAuxDrivingICEOff.Size = New System.Drawing.Size(88, 23)
+		Me.tbPAuxDrivingICEOff.TabIndex = 1
+		'
+		'lblAuxDrivingICEOffUnit
+		'
+		Me.lblAuxDrivingICEOffUnit.AutoSize = True
+		Me.lblAuxDrivingICEOffUnit.Location = New System.Drawing.Point(294, 37)
+		Me.lblAuxDrivingICEOffUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblAuxDrivingICEOffUnit.Name = "lblAuxDrivingICEOffUnit"
+		Me.lblAuxDrivingICEOffUnit.Size = New System.Drawing.Size(26, 15)
+		Me.lblAuxDrivingICEOffUnit.TabIndex = 47
+		Me.lblAuxDrivingICEOffUnit.Text = "[W]"
+		'
+		'lblAuxDrivingICEOff
+		'
+		Me.lblAuxDrivingICEOff.AutoSize = True
+		Me.lblAuxDrivingICEOff.Location = New System.Drawing.Point(4, 37)
+		Me.lblAuxDrivingICEOff.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblAuxDrivingICEOff.Name = "lblAuxDrivingICEOff"
+		Me.lblAuxDrivingICEOff.Size = New System.Drawing.Size(149, 15)
+		Me.lblAuxDrivingICEOff.TabIndex = 45
+		Me.lblAuxDrivingICEOff.Text = "Aux Load (Driving, ICE Off)"
+		'
+		'TbAuxPAuxICEOn
+		'
+		Me.TbAuxPAuxICEOn.Location = New System.Drawing.Point(198, 3)
+		Me.TbAuxPAuxICEOn.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TbAuxPAuxICEOn.Name = "TbAuxPAuxICEOn"
+		Me.TbAuxPAuxICEOn.Size = New System.Drawing.Size(88, 23)
+		Me.TbAuxPAuxICEOn.TabIndex = 0
+		'
+		'lblAuxICEOnUnit
+		'
+		Me.lblAuxICEOnUnit.AutoSize = True
+		Me.lblAuxICEOnUnit.Location = New System.Drawing.Point(294, 7)
+		Me.lblAuxICEOnUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblAuxICEOnUnit.Name = "lblAuxICEOnUnit"
+		Me.lblAuxICEOnUnit.Size = New System.Drawing.Size(26, 15)
+		Me.lblAuxICEOnUnit.TabIndex = 44
+		Me.lblAuxICEOnUnit.Text = "[W]"
+		'
+		'lblAuxICEOn
+		'
+		Me.lblAuxICEOn.AutoSize = True
+		Me.lblAuxICEOn.Location = New System.Drawing.Point(4, 7)
+		Me.lblAuxICEOn.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblAuxICEOn.Name = "lblAuxICEOn"
+		Me.lblAuxICEOn.Size = New System.Drawing.Size(104, 15)
+		Me.lblAuxICEOn.TabIndex = 42
+		Me.lblAuxICEOn.Text = "Aux Load (ICE On)"
+		'
+		'GrAux
+		'
+		Me.GrAux.Location = New System.Drawing.Point(0, 0)
+		Me.GrAux.Name = "GrAux"
+		Me.GrAux.Size = New System.Drawing.Size(200, 100)
+		Me.GrAux.TabIndex = 0
+		Me.GrAux.TabStop = False
+		'
+		'Label9
+		'
+		Me.Label9.Location = New System.Drawing.Point(0, 0)
+		Me.Label9.Name = "Label9"
+		Me.Label9.Size = New System.Drawing.Size(100, 23)
+		Me.Label9.TabIndex = 0
+		'
+		'TbAuxPAdd
+		'
+		Me.TbAuxPAdd.Location = New System.Drawing.Point(0, 0)
+		Me.TbAuxPAdd.Name = "TbAuxPAdd"
+		Me.TbAuxPAdd.Size = New System.Drawing.Size(100, 23)
+		Me.TbAuxPAdd.TabIndex = 0
+		'
+		'Label8
+		'
+		Me.Label8.Location = New System.Drawing.Point(0, 0)
+		Me.Label8.Name = "Label8"
+		Me.Label8.Size = New System.Drawing.Size(100, 23)
+		Me.Label8.TabIndex = 0
+		'
+		'btnAAUXOpen
+		'
+		Me.btnAAUXOpen.Location = New System.Drawing.Point(0, 0)
+		Me.btnAAUXOpen.Name = "btnAAUXOpen"
+		Me.btnAAUXOpen.Size = New System.Drawing.Size(75, 23)
+		Me.btnAAUXOpen.TabIndex = 0
+		'
+		'Label1
+		'
+		Me.Label1.Location = New System.Drawing.Point(0, 0)
+		Me.Label1.Name = "Label1"
+		Me.Label1.Size = New System.Drawing.Size(100, 23)
+		Me.Label1.TabIndex = 0
+		'
+		'btnBrowseAAUXFile
+		'
+		Me.btnBrowseAAUXFile.Location = New System.Drawing.Point(0, 0)
+		Me.btnBrowseAAUXFile.Name = "btnBrowseAAUXFile"
+		Me.btnBrowseAAUXFile.Size = New System.Drawing.Size(75, 23)
+		Me.btnBrowseAAUXFile.TabIndex = 0
+		'
+		'txtAdvancedAuxiliaryFile
+		'
+		Me.txtAdvancedAuxiliaryFile.Location = New System.Drawing.Point(0, 0)
+		Me.txtAdvancedAuxiliaryFile.Name = "txtAdvancedAuxiliaryFile"
+		Me.txtAdvancedAuxiliaryFile.Size = New System.Drawing.Size(100, 23)
+		Me.txtAdvancedAuxiliaryFile.TabIndex = 0
+		'
+		'picAuxInfo
+		'
+		Me.picAuxInfo.Location = New System.Drawing.Point(0, 0)
+		Me.picAuxInfo.Name = "picAuxInfo"
+		Me.picAuxInfo.Size = New System.Drawing.Size(100, 50)
+		Me.picAuxInfo.TabIndex = 0
+		Me.picAuxInfo.TabStop = False
+		'
+		'cboAdvancedAuxiliaries
+		'
+		Me.cboAdvancedAuxiliaries.Location = New System.Drawing.Point(0, 0)
+		Me.cboAdvancedAuxiliaries.Name = "cboAdvancedAuxiliaries"
+		Me.cboAdvancedAuxiliaries.Size = New System.Drawing.Size(121, 23)
+		Me.cboAdvancedAuxiliaries.TabIndex = 0
+		'
+		'lbAdvancedAuxiliaries
+		'
+		Me.lbAdvancedAuxiliaries.Location = New System.Drawing.Point(0, 0)
+		Me.lbAdvancedAuxiliaries.Name = "lbAdvancedAuxiliaries"
+		Me.lbAdvancedAuxiliaries.Size = New System.Drawing.Size(100, 23)
+		Me.lbAdvancedAuxiliaries.TabIndex = 0
+		'
+		'tcJob
+		'
+		Me.tcJob.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.tcJob.Controls.Add(Me.TabPgGen)
+		Me.tcJob.Controls.Add(Me.tpAuxiliaries)
+		Me.tcJob.Controls.Add(Me.tpCycles)
+		Me.tcJob.Controls.Add(Me.TabPgDriver)
+		Me.tcJob.Controls.Add(Me.TabPgADAS)
+		Me.tcJob.Location = New System.Drawing.Point(1, 90)
+		Me.tcJob.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tcJob.Name = "tcJob"
+		Me.tcJob.SelectedIndex = 0
+		Me.tcJob.Size = New System.Drawing.Size(622, 600)
+		Me.tcJob.SizeMode = System.Windows.Forms.TabSizeMode.Fixed
+		Me.tcJob.TabIndex = 0
+		'
+		'tpAuxiliaries
+		'
+		Me.tpAuxiliaries.Controls.Add(Me.gbBusAux)
+		Me.tpAuxiliaries.Controls.Add(Me.gbElectricAux)
+		Me.tpAuxiliaries.Controls.Add(Me.GrAuxMech)
+		Me.tpAuxiliaries.Location = New System.Drawing.Point(4, 24)
+		Me.tpAuxiliaries.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tpAuxiliaries.Name = "tpAuxiliaries"
+		Me.tpAuxiliaries.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tpAuxiliaries.Size = New System.Drawing.Size(614, 572)
+		Me.tpAuxiliaries.TabIndex = 9
+		Me.tpAuxiliaries.Text = "Auxiliaries"
+		Me.tpAuxiliaries.UseVisualStyleBackColor = True
+		'
+		'gbBusAux
+		'
+		Me.gbBusAux.Controls.Add(Me.cbEnableBusAux)
+		Me.gbBusAux.Controls.Add(Me.pnBusAux)
+		Me.gbBusAux.Location = New System.Drawing.Point(7, 348)
+		Me.gbBusAux.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.gbBusAux.Name = "gbBusAux"
+		Me.gbBusAux.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.gbBusAux.Size = New System.Drawing.Size(601, 90)
+		Me.gbBusAux.TabIndex = 1
+		Me.gbBusAux.TabStop = False
+		Me.gbBusAux.Text = "Bus Auxiliaries"
+		'
+		'cbEnableBusAux
+		'
+		Me.cbEnableBusAux.AutoSize = True
+		Me.cbEnableBusAux.Location = New System.Drawing.Point(12, 20)
+		Me.cbEnableBusAux.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.cbEnableBusAux.Name = "cbEnableBusAux"
+		Me.cbEnableBusAux.Size = New System.Drawing.Size(124, 19)
+		Me.cbEnableBusAux.TabIndex = 0
+		Me.cbEnableBusAux.Text = "Use Bus Auxiliaries"
+		Me.cbEnableBusAux.UseVisualStyleBackColor = True
+		'
+		'pnBusAux
+		'
+		Me.pnBusAux.Controls.Add(Me.btnBusAuxP)
+		Me.pnBusAux.Controls.Add(Me.tbBusAuxParams)
+		Me.pnBusAux.Controls.Add(Me.btnBrowsBusAuxParams)
+		Me.pnBusAux.Enabled = False
+		Me.pnBusAux.Location = New System.Drawing.Point(7, 46)
+		Me.pnBusAux.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnBusAux.Name = "pnBusAux"
+		Me.pnBusAux.Size = New System.Drawing.Size(587, 30)
+		Me.pnBusAux.TabIndex = 1
+		'
+		'btnBusAuxP
+		'
+		Me.btnBusAuxP.Location = New System.Drawing.Point(4, 3)
+		Me.btnBusAuxP.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.btnBusAuxP.Name = "btnBusAuxP"
+		Me.btnBusAuxP.Size = New System.Drawing.Size(84, 24)
+		Me.btnBusAuxP.TabIndex = 0
+		Me.btnBusAuxP.TabStop = False
+		Me.btnBusAuxP.Text = "BusAux P."
+		Me.btnBusAuxP.UseVisualStyleBackColor = True
+		'
+		'tbBusAuxParams
+		'
+		Me.tbBusAuxParams.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.tbBusAuxParams.Location = New System.Drawing.Point(94, 3)
+		Me.tbBusAuxParams.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbBusAuxParams.Name = "tbBusAuxParams"
+		Me.tbBusAuxParams.Size = New System.Drawing.Size(458, 23)
+		Me.tbBusAuxParams.TabIndex = 1
+		'
+		'btnBrowsBusAuxParams
+		'
+		Me.btnBrowsBusAuxParams.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.btnBrowsBusAuxParams.Image = CType(resources.GetObject("btnBrowsBusAuxParams.Image"), System.Drawing.Image)
+		Me.btnBrowsBusAuxParams.Location = New System.Drawing.Point(555, 1)
+		Me.btnBrowsBusAuxParams.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.btnBrowsBusAuxParams.Name = "btnBrowsBusAuxParams"
+		Me.btnBrowsBusAuxParams.Size = New System.Drawing.Size(28, 28)
+		Me.btnBrowsBusAuxParams.TabIndex = 2
+		Me.btnBrowsBusAuxParams.UseVisualStyleBackColor = True
+		'
+		'gbElectricAux
+		'
+		Me.gbElectricAux.Controls.Add(Me.Label46)
+		Me.gbElectricAux.Controls.Add(Me.lblElAuxConstUnit)
+		Me.gbElectricAux.Controls.Add(Me.tbElectricAuxConstant)
+		Me.gbElectricAux.Controls.Add(Me.lblElAuxConst)
+		Me.gbElectricAux.Location = New System.Drawing.Point(7, 445)
+		Me.gbElectricAux.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.gbElectricAux.Name = "gbElectricAux"
+		Me.gbElectricAux.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.gbElectricAux.Size = New System.Drawing.Size(601, 63)
+		Me.gbElectricAux.TabIndex = 2
+		Me.gbElectricAux.TabStop = False
+		Me.gbElectricAux.Text = "Electric Auxiliaries"
+		Me.gbElectricAux.Visible = False
+		'
+		'Label46
+		'
+		Me.Label46.AutoSize = True
+		Me.Label46.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point)
+		Me.Label46.Location = New System.Drawing.Point(274, 25)
+		Me.Label46.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label46.Name = "Label46"
+		Me.Label46.Size = New System.Drawing.Size(106, 13)
+		Me.Label46.TabIndex = 48
+		Me.Label46.Text = "(high voltage system)"
+		'
+		'lblElAuxConstUnit
+		'
+		Me.lblElAuxConstUnit.AutoSize = True
+		Me.lblElAuxConstUnit.Location = New System.Drawing.Point(223, 25)
+		Me.lblElAuxConstUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblElAuxConstUnit.Name = "lblElAuxConstUnit"
+		Me.lblElAuxConstUnit.Size = New System.Drawing.Size(26, 15)
+		Me.lblElAuxConstUnit.TabIndex = 47
+		Me.lblElAuxConstUnit.Text = "[W]"
+		'
+		'tbElectricAuxConstant
+		'
+		Me.tbElectricAuxConstant.Location = New System.Drawing.Point(127, 22)
+		Me.tbElectricAuxConstant.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbElectricAuxConstant.Name = "tbElectricAuxConstant"
+		Me.tbElectricAuxConstant.Size = New System.Drawing.Size(88, 23)
+		Me.tbElectricAuxConstant.TabIndex = 0
+		'
+		'lblElAuxConst
+		'
+		Me.lblElAuxConst.AutoSize = True
+		Me.lblElAuxConst.Location = New System.Drawing.Point(8, 25)
+		Me.lblElAuxConst.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblElAuxConst.Name = "lblElAuxConst"
+		Me.lblElAuxConst.Size = New System.Drawing.Size(108, 15)
+		Me.lblElAuxConst.TabIndex = 45
+		Me.lblElAuxConst.Text = "Constant Aux Load"
+		'
+		'tpCycles
+		'
+		Me.tpCycles.Controls.Add(Me.GrCycles)
+		Me.tpCycles.Location = New System.Drawing.Point(4, 24)
+		Me.tpCycles.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tpCycles.Name = "tpCycles"
+		Me.tpCycles.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tpCycles.Size = New System.Drawing.Size(614, 572)
+		Me.tpCycles.TabIndex = 10
+		Me.tpCycles.Text = "Cycles"
+		Me.tpCycles.UseVisualStyleBackColor = True
+		'
+		'TabPgDriver
+		'
+		Me.TabPgDriver.Controls.Add(Me.GrVACC)
+		Me.TabPgDriver.Controls.Add(Me.GrLAC)
+		Me.TabPgDriver.Controls.Add(Me.gbOverspeed)
+		Me.TabPgDriver.Location = New System.Drawing.Point(4, 24)
+		Me.TabPgDriver.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TabPgDriver.Name = "TabPgDriver"
+		Me.TabPgDriver.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TabPgDriver.Size = New System.Drawing.Size(614, 572)
+		Me.TabPgDriver.TabIndex = 7
+		Me.TabPgDriver.Text = "Driver Model"
+		Me.TabPgDriver.UseVisualStyleBackColor = True
+		'
+		'GrVACC
+		'
+		Me.GrVACC.Controls.Add(Me.Label15)
+		Me.GrVACC.Controls.Add(Me.TbDesMaxFile)
+		Me.GrVACC.Controls.Add(Me.BtDesMaxBr)
+		Me.GrVACC.Controls.Add(Me.BtAccOpen)
+		Me.GrVACC.Location = New System.Drawing.Point(10, 313)
+		Me.GrVACC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.GrVACC.Name = "GrVACC"
+		Me.GrVACC.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.GrVACC.Size = New System.Drawing.Size(601, 80)
+		Me.GrVACC.TabIndex = 2
+		Me.GrVACC.TabStop = False
+		Me.GrVACC.Text = "Max. acceleration and brake curves"
+		'
+		'Label15
+		'
+		Me.Label15.AutoSize = True
+		Me.Label15.Location = New System.Drawing.Point(4, 23)
+		Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label15.Name = "Label15"
+		Me.Label15.Size = New System.Drawing.Size(240, 15)
+		Me.Label15.TabIndex = 4
+		Me.Label15.Text = "Driver Acceleration/Deceleration File (.vacc):"
+		'
+		'TbDesMaxFile
+		'
+		Me.TbDesMaxFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbDesMaxFile.Location = New System.Drawing.Point(7, 42)
+		Me.TbDesMaxFile.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TbDesMaxFile.Name = "TbDesMaxFile"
+		Me.TbDesMaxFile.Size = New System.Drawing.Size(524, 23)
+		Me.TbDesMaxFile.TabIndex = 0
+		'
+		'BtDesMaxBr
+		'
+		Me.BtDesMaxBr.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtDesMaxBr.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+		Me.BtDesMaxBr.Location = New System.Drawing.Point(533, 39)
+		Me.BtDesMaxBr.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.BtDesMaxBr.Name = "BtDesMaxBr"
+		Me.BtDesMaxBr.Size = New System.Drawing.Size(28, 28)
+		Me.BtDesMaxBr.TabIndex = 1
+		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.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
+		Me.BtAccOpen.Location = New System.Drawing.Point(561, 39)
+		Me.BtAccOpen.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.BtAccOpen.Name = "BtAccOpen"
+		Me.BtAccOpen.Size = New System.Drawing.Size(28, 28)
+		Me.BtAccOpen.TabIndex = 2
+		Me.BtAccOpen.UseVisualStyleBackColor = True
+		'
+		'GrLAC
+		'
+		Me.GrLAC.Controls.Add(Me.pnLookAheadCoasting)
+		Me.GrLAC.Controls.Add(Me.CbLookAhead)
+		Me.GrLAC.Location = New System.Drawing.Point(10, 106)
+		Me.GrLAC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.GrLAC.Name = "GrLAC"
+		Me.GrLAC.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.GrLAC.Size = New System.Drawing.Size(600, 200)
+		Me.GrLAC.TabIndex = 1
+		Me.GrLAC.TabStop = False
+		Me.GrLAC.Text = "Look-Ahead Coasting"
+		'
+		'pnLookAheadCoasting
+		'
+		Me.pnLookAheadCoasting.Controls.Add(Me.Label49)
+		Me.pnLookAheadCoasting.Controls.Add(Me.Label7)
+		Me.pnLookAheadCoasting.Controls.Add(Me.Label6)
+		Me.pnLookAheadCoasting.Controls.Add(Me.tbLacMinSpeed)
+		Me.pnLookAheadCoasting.Controls.Add(Me.btnDfVelocityDrop)
+		Me.pnLookAheadCoasting.Controls.Add(Me.Label12)
+		Me.pnLookAheadCoasting.Controls.Add(Me.tbDfCoastingScale)
+		Me.pnLookAheadCoasting.Controls.Add(Me.Label11)
+		Me.pnLookAheadCoasting.Controls.Add(Me.Label3)
+		Me.pnLookAheadCoasting.Controls.Add(Me.tbDfCoastingOffset)
+		Me.pnLookAheadCoasting.Controls.Add(Me.tbLacDfTargetSpeedFile)
+		Me.pnLookAheadCoasting.Controls.Add(Me.Label10)
+		Me.pnLookAheadCoasting.Controls.Add(Me.Label4)
+		Me.pnLookAheadCoasting.Controls.Add(Me.Label5)
+		Me.pnLookAheadCoasting.Controls.Add(Me.btnDfTargetSpeed)
+		Me.pnLookAheadCoasting.Controls.Add(Me.tbLacPreviewFactor)
+		Me.pnLookAheadCoasting.Controls.Add(Me.tbLacDfVelocityDropFile)
+		Me.pnLookAheadCoasting.Location = New System.Drawing.Point(18, 22)
+		Me.pnLookAheadCoasting.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnLookAheadCoasting.Name = "pnLookAheadCoasting"
+		Me.pnLookAheadCoasting.Size = New System.Drawing.Size(575, 149)
+		Me.pnLookAheadCoasting.TabIndex = 0
+		'
+		'Label49
+		'
+		Me.Label49.AutoSize = True
+		Me.Label49.Location = New System.Drawing.Point(287, 36)
+		Me.Label49.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label49.Name = "Label49"
+		Me.Label49.Size = New System.Drawing.Size(20, 15)
+		Me.Label49.TabIndex = 34
+		Me.Label49.Text = "[-]"
+		'
+		'Label7
+		'
+		Me.Label7.AutoSize = True
+		Me.Label7.Location = New System.Drawing.Point(286, 7)
+		Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label7.Name = "Label7"
+		Me.Label7.Size = New System.Drawing.Size(44, 15)
+		Me.Label7.TabIndex = 4
+		Me.Label7.Text = "[km/h]"
+		'
+		'Label6
+		'
+		Me.Label6.AutoSize = True
+		Me.Label6.Location = New System.Drawing.Point(124, 6)
+		Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label6.Name = "Label6"
+		Me.Label6.Size = New System.Drawing.Size(75, 15)
+		Me.Label6.TabIndex = 33
+		Me.Label6.Text = "Min. Velocity"
+		Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+		'
+		'tbLacMinSpeed
+		'
+		Me.tbLacMinSpeed.Location = New System.Drawing.Point(209, 3)
+		Me.tbLacMinSpeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbLacMinSpeed.Name = "tbLacMinSpeed"
+		Me.tbLacMinSpeed.Size = New System.Drawing.Size(74, 23)
+		Me.tbLacMinSpeed.TabIndex = 0
+		'
+		'btnDfVelocityDrop
+		'
+		Me.btnDfVelocityDrop.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.btnDfVelocityDrop.Image = CType(resources.GetObject("btnDfVelocityDrop.Image"), System.Drawing.Image)
+		Me.btnDfVelocityDrop.Location = New System.Drawing.Point(544, 90)
+		Me.btnDfVelocityDrop.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.btnDfVelocityDrop.Name = "btnDfVelocityDrop"
+		Me.btnDfVelocityDrop.Size = New System.Drawing.Size(28, 28)
+		Me.btnDfVelocityDrop.TabIndex = 5
+		Me.btnDfVelocityDrop.UseVisualStyleBackColor = True
+		'
+		'Label12
+		'
+		Me.Label12.AutoSize = True
+		Me.Label12.Location = New System.Drawing.Point(331, 127)
+		Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label12.Name = "Label12"
+		Me.Label12.Size = New System.Drawing.Size(134, 15)
+		Me.Label12.TabIndex = 31
+		Me.Label12.Text = "* DF_vTarget * DF_vDrop"
+		'
+		'tbDfCoastingScale
+		'
+		Me.tbDfCoastingScale.Location = New System.Drawing.Point(281, 123)
+		Me.tbDfCoastingScale.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbDfCoastingScale.Name = "tbDfCoastingScale"
+		Me.tbDfCoastingScale.Size = New System.Drawing.Size(42, 23)
+		Me.tbDfCoastingScale.TabIndex = 7
+		'
+		'Label11
+		'
+		Me.Label11.AutoSize = True
+		Me.Label11.Location = New System.Drawing.Point(261, 126)
+		Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label11.Name = "Label11"
+		Me.Label11.Size = New System.Drawing.Size(15, 15)
+		Me.Label11.TabIndex = 29
+		Me.Label11.Text = "- "
+		'
+		'Label3
+		'
+		Me.Label3.AutoSize = True
+		Me.Label3.Location = New System.Drawing.Point(64, 35)
+		Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label3.Name = "Label3"
+		Me.Label3.Size = New System.Drawing.Size(129, 15)
+		Me.Label3.TabIndex = 20
+		Me.Label3.Text = "Preview distance factor"
+		Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+		'
+		'tbDfCoastingOffset
+		'
+		Me.tbDfCoastingOffset.Location = New System.Drawing.Point(210, 123)
+		Me.tbDfCoastingOffset.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbDfCoastingOffset.Name = "tbDfCoastingOffset"
+		Me.tbDfCoastingOffset.Size = New System.Drawing.Size(42, 23)
+		Me.tbDfCoastingOffset.TabIndex = 6
+		'
+		'tbLacDfTargetSpeedFile
+		'
+		Me.tbLacDfTargetSpeedFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.tbLacDfTargetSpeedFile.Location = New System.Drawing.Point(209, 62)
+		Me.tbLacDfTargetSpeedFile.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbLacDfTargetSpeedFile.Name = "tbLacDfTargetSpeedFile"
+		Me.tbLacDfTargetSpeedFile.Size = New System.Drawing.Size(333, 23)
+		Me.tbLacDfTargetSpeedFile.TabIndex = 2
+		'
+		'Label10
+		'
+		Me.Label10.AutoSize = True
+		Me.Label10.Location = New System.Drawing.Point(110, 126)
+		Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label10.Name = "Label10"
+		Me.Label10.Size = New System.Drawing.Size(85, 15)
+		Me.Label10.TabIndex = 27
+		Me.Label10.Text = "DF_coasting = "
+		'
+		'Label4
+		'
+		Me.Label4.AutoSize = True
+		Me.Label4.Location = New System.Drawing.Point(21, 65)
+		Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label4.Name = "Label4"
+		Me.Label4.Size = New System.Drawing.Size(166, 15)
+		Me.Label4.TabIndex = 24
+		Me.Label4.Text = "Decision Factor - Target Speed"
+		Me.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+		'
+		'Label5
+		'
+		Me.Label5.AutoSize = True
+		Me.Label5.Location = New System.Drawing.Point(23, 96)
+		Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label5.Name = "Label5"
+		Me.Label5.Size = New System.Drawing.Size(169, 15)
+		Me.Label5.TabIndex = 26
+		Me.Label5.Text = "Decision Factor - Velocity Drop"
+		Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+		'
+		'btnDfTargetSpeed
+		'
+		Me.btnDfTargetSpeed.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.btnDfTargetSpeed.Image = CType(resources.GetObject("btnDfTargetSpeed.Image"), System.Drawing.Image)
+		Me.btnDfTargetSpeed.Location = New System.Drawing.Point(544, 60)
+		Me.btnDfTargetSpeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.btnDfTargetSpeed.Name = "btnDfTargetSpeed"
+		Me.btnDfTargetSpeed.Size = New System.Drawing.Size(28, 28)
+		Me.btnDfTargetSpeed.TabIndex = 3
+		Me.btnDfTargetSpeed.UseVisualStyleBackColor = True
+		'
+		'tbLacPreviewFactor
+		'
+		Me.tbLacPreviewFactor.Location = New System.Drawing.Point(209, 32)
+		Me.tbLacPreviewFactor.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbLacPreviewFactor.Name = "tbLacPreviewFactor"
+		Me.tbLacPreviewFactor.Size = New System.Drawing.Size(74, 23)
+		Me.tbLacPreviewFactor.TabIndex = 1
+		'
+		'tbLacDfVelocityDropFile
+		'
+		Me.tbLacDfVelocityDropFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.tbLacDfVelocityDropFile.Location = New System.Drawing.Point(209, 93)
+		Me.tbLacDfVelocityDropFile.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbLacDfVelocityDropFile.Name = "tbLacDfVelocityDropFile"
+		Me.tbLacDfVelocityDropFile.Size = New System.Drawing.Size(333, 23)
+		Me.tbLacDfVelocityDropFile.TabIndex = 4
+		'
+		'CbLookAhead
+		'
+		Me.CbLookAhead.AutoSize = True
+		Me.CbLookAhead.Checked = True
+		Me.CbLookAhead.CheckState = System.Windows.Forms.CheckState.Checked
+		Me.CbLookAhead.Location = New System.Drawing.Point(19, 24)
+		Me.CbLookAhead.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.CbLookAhead.Name = "CbLookAhead"
+		Me.CbLookAhead.Size = New System.Drawing.Size(68, 19)
+		Me.CbLookAhead.TabIndex = 0
+		Me.CbLookAhead.Text = "Enabled"
+		Me.CbLookAhead.UseVisualStyleBackColor = True
+		'
+		'gbOverspeed
+		'
+		Me.gbOverspeed.Controls.Add(Me.PnEcoRoll)
+		Me.gbOverspeed.Controls.Add(Me.RdOverspeed)
+		Me.gbOverspeed.Controls.Add(Me.RdOff)
+		Me.gbOverspeed.Location = New System.Drawing.Point(10, 10)
+		Me.gbOverspeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.gbOverspeed.Name = "gbOverspeed"
+		Me.gbOverspeed.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.gbOverspeed.Size = New System.Drawing.Size(601, 89)
+		Me.gbOverspeed.TabIndex = 0
+		Me.gbOverspeed.TabStop = False
+		Me.gbOverspeed.Text = "Overspeed"
+		'
+		'PnEcoRoll
+		'
+		Me.PnEcoRoll.Controls.Add(Me.Label21)
+		Me.PnEcoRoll.Controls.Add(Me.Label14)
+		Me.PnEcoRoll.Controls.Add(Me.TbVmin)
+		Me.PnEcoRoll.Controls.Add(Me.TbOverspeed)
+		Me.PnEcoRoll.Controls.Add(Me.Label23)
+		Me.PnEcoRoll.Controls.Add(Me.Label13)
+		Me.PnEcoRoll.Location = New System.Drawing.Point(106, 20)
+		Me.PnEcoRoll.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.PnEcoRoll.Name = "PnEcoRoll"
+		Me.PnEcoRoll.Size = New System.Drawing.Size(271, 62)
+		Me.PnEcoRoll.TabIndex = 2
+		'
+		'Label21
+		'
+		Me.Label21.AutoSize = True
+		Me.Label21.Location = New System.Drawing.Point(198, 36)
+		Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label21.Name = "Label21"
+		Me.Label21.Size = New System.Drawing.Size(44, 15)
+		Me.Label21.TabIndex = 3
+		Me.Label21.Text = "[km/h]"
+		'
+		'Label14
+		'
+		Me.Label14.AutoSize = True
+		Me.Label14.Location = New System.Drawing.Point(198, 6)
+		Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label14.Name = "Label14"
+		Me.Label14.Size = New System.Drawing.Size(44, 15)
+		Me.Label14.TabIndex = 3
+		Me.Label14.Text = "[km/h]"
+		'
+		'TbVmin
+		'
+		Me.TbVmin.Location = New System.Drawing.Point(121, 32)
+		Me.TbVmin.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TbVmin.Name = "TbVmin"
+		Me.TbVmin.Size = New System.Drawing.Size(74, 23)
+		Me.TbVmin.TabIndex = 1
+		'
+		'TbOverspeed
+		'
+		Me.TbOverspeed.Location = New System.Drawing.Point(121, 2)
+		Me.TbOverspeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TbOverspeed.Name = "TbOverspeed"
+		Me.TbOverspeed.Size = New System.Drawing.Size(74, 23)
+		Me.TbOverspeed.TabIndex = 0
+		'
+		'Label23
+		'
+		Me.Label23.AutoSize = True
+		Me.Label23.Location = New System.Drawing.Point(21, 36)
+		Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label23.Name = "Label23"
+		Me.Label23.Size = New System.Drawing.Size(94, 15)
+		Me.Label23.TabIndex = 1
+		Me.Label23.Text = "Minimum speed"
+		'
+		'Label13
+		'
+		Me.Label13.AutoSize = True
+		Me.Label13.Location = New System.Drawing.Point(15, 6)
+		Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label13.Name = "Label13"
+		Me.Label13.Size = New System.Drawing.Size(92, 15)
+		Me.Label13.TabIndex = 1
+		Me.Label13.Text = "Max. Overspeed"
+		'
+		'RdOverspeed
+		'
+		Me.RdOverspeed.AutoSize = True
+		Me.RdOverspeed.Checked = True
+		Me.RdOverspeed.Location = New System.Drawing.Point(19, 51)
+		Me.RdOverspeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.RdOverspeed.Name = "RdOverspeed"
+		Me.RdOverspeed.Size = New System.Drawing.Size(81, 19)
+		Me.RdOverspeed.TabIndex = 1
+		Me.RdOverspeed.TabStop = True
+		Me.RdOverspeed.Text = "Overspeed"
+		Me.RdOverspeed.UseVisualStyleBackColor = True
+		'
+		'RdOff
+		'
+		Me.RdOff.AutoSize = True
+		Me.RdOff.Location = New System.Drawing.Point(19, 24)
+		Me.RdOff.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.RdOff.Name = "RdOff"
+		Me.RdOff.Size = New System.Drawing.Size(42, 19)
+		Me.RdOff.TabIndex = 0
+		Me.RdOff.Text = "Off"
+		Me.RdOff.UseVisualStyleBackColor = True
+		'
+		'TabPgADAS
+		'
+		Me.TabPgADAS.Controls.Add(Me.gbPCC)
+		Me.TabPgADAS.Controls.Add(Me.gbEcoRoll)
+		Me.TabPgADAS.Controls.Add(Me.gbEngineStopStart)
+		Me.TabPgADAS.Location = New System.Drawing.Point(4, 24)
+		Me.TabPgADAS.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TabPgADAS.Name = "TabPgADAS"
+		Me.TabPgADAS.Size = New System.Drawing.Size(614, 572)
+		Me.TabPgADAS.TabIndex = 8
+		Me.TabPgADAS.Text = "ADAS Parameters"
+		Me.TabPgADAS.UseVisualStyleBackColor = True
+		'
+		'gbPCC
+		'
+		Me.gbPCC.Controls.Add(Me.Label43)
+		Me.gbPCC.Controls.Add(Me.Label42)
+		Me.gbPCC.Controls.Add(Me.Label40)
+		Me.gbPCC.Controls.Add(Me.Label41)
+		Me.gbPCC.Controls.Add(Me.tbPCCPreviewUseCase2)
+		Me.gbPCC.Controls.Add(Me.Label38)
+		Me.gbPCC.Controls.Add(Me.Label39)
+		Me.gbPCC.Controls.Add(Me.tbPCCPreviewUseCase1)
+		Me.gbPCC.Controls.Add(Me.Label36)
+		Me.gbPCC.Controls.Add(Me.Label37)
+		Me.gbPCC.Controls.Add(Me.tbPCCMinSpeed)
+		Me.gbPCC.Controls.Add(Me.Label34)
+		Me.gbPCC.Controls.Add(Me.Label35)
+		Me.gbPCC.Controls.Add(Me.tbPCCEnableSpeed)
+		Me.gbPCC.Controls.Add(Me.Label31)
+		Me.gbPCC.Controls.Add(Me.Label33)
+		Me.gbPCC.Controls.Add(Me.tbPCCOverspeed)
+		Me.gbPCC.Controls.Add(Me.Label20)
+		Me.gbPCC.Controls.Add(Me.Label22)
+		Me.gbPCC.Controls.Add(Me.tbPCCUnderspeed)
+		Me.gbPCC.Location = New System.Drawing.Point(8, 310)
+		Me.gbPCC.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.gbPCC.Name = "gbPCC"
+		Me.gbPCC.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.gbPCC.Size = New System.Drawing.Size(601, 250)
+		Me.gbPCC.TabIndex = 2
+		Me.gbPCC.TabStop = False
+		Me.gbPCC.Text = "Predictive Cruise Control"
+		'
+		'Label43
+		'
+		Me.Label43.AutoSize = True
+		Me.Label43.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point)
+		Me.Label43.Location = New System.Drawing.Point(46, 226)
+		Me.Label43.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label43.Name = "Label43"
+		Me.Label43.Size = New System.Drawing.Size(157, 13)
+		Me.Label43.TabIndex = 30
+		Me.Label43.Text = "(cf. column HW in driving cycle)"
+		'
+		'Label42
+		'
+		Me.Label42.AutoSize = True
+		Me.Label42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point)
+		Me.Label42.Location = New System.Drawing.Point(8, 209)
+		Me.Label42.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label42.Name = "Label42"
+		Me.Label42.Size = New System.Drawing.Size(403, 13)
+		Me.Label42.TabIndex = 29
+		Me.Label42.Text = "Note: Predictive cruise control is only activated on highway parts of the driving" &
+	" cycle"
+		'
+		'Label40
+		'
+		Me.Label40.AutoSize = True
+		Me.Label40.Location = New System.Drawing.Point(356, 175)
+		Me.Label40.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label40.Name = "Label40"
+		Me.Label40.Size = New System.Drawing.Size(26, 15)
+		Me.Label40.TabIndex = 28
+		Me.Label40.Text = "[m]"
+		'
+		'Label41
+		'
+		Me.Label41.AutoSize = True
+		Me.Label41.Location = New System.Drawing.Point(8, 175)
+		Me.Label41.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label41.Name = "Label41"
+		Me.Label41.Size = New System.Drawing.Size(154, 15)
+		Me.Label41.TabIndex = 26
+		Me.Label41.Text = "Preview distance use case 2:"
+		'
+		'tbPCCPreviewUseCase2
+		'
+		Me.tbPCCPreviewUseCase2.Location = New System.Drawing.Point(288, 172)
+		Me.tbPCCPreviewUseCase2.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbPCCPreviewUseCase2.Name = "tbPCCPreviewUseCase2"
+		Me.tbPCCPreviewUseCase2.Size = New System.Drawing.Size(60, 23)
+		Me.tbPCCPreviewUseCase2.TabIndex = 5
+		'
+		'Label38
+		'
+		Me.Label38.AutoSize = True
+		Me.Label38.Location = New System.Drawing.Point(356, 145)
+		Me.Label38.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label38.Name = "Label38"
+		Me.Label38.Size = New System.Drawing.Size(26, 15)
+		Me.Label38.TabIndex = 25
+		Me.Label38.Text = "[m]"
+		'
+		'Label39
+		'
+		Me.Label39.AutoSize = True
+		Me.Label39.Location = New System.Drawing.Point(8, 145)
+		Me.Label39.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label39.Name = "Label39"
+		Me.Label39.Size = New System.Drawing.Size(154, 15)
+		Me.Label39.TabIndex = 23
+		Me.Label39.Text = "Preview distance use case 1:"
+		'
+		'tbPCCPreviewUseCase1
+		'
+		Me.tbPCCPreviewUseCase1.Location = New System.Drawing.Point(288, 142)
+		Me.tbPCCPreviewUseCase1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbPCCPreviewUseCase1.Name = "tbPCCPreviewUseCase1"
+		Me.tbPCCPreviewUseCase1.Size = New System.Drawing.Size(60, 23)
+		Me.tbPCCPreviewUseCase1.TabIndex = 4
+		'
+		'Label36
+		'
+		Me.Label36.AutoSize = True
+		Me.Label36.Location = New System.Drawing.Point(356, 115)
+		Me.Label36.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label36.Name = "Label36"
+		Me.Label36.Size = New System.Drawing.Size(44, 15)
+		Me.Label36.TabIndex = 22
+		Me.Label36.Text = "[km/h]"
+		'
+		'Label37
+		'
+		Me.Label37.AutoSize = True
+		Me.Label37.Location = New System.Drawing.Point(8, 115)
+		Me.Label37.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label37.Name = "Label37"
+		Me.Label37.Size = New System.Drawing.Size(97, 15)
+		Me.Label37.TabIndex = 20
+		Me.Label37.Text = "Minimum speed:"
+		'
+		'tbPCCMinSpeed
+		'
+		Me.tbPCCMinSpeed.Location = New System.Drawing.Point(288, 112)
+		Me.tbPCCMinSpeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbPCCMinSpeed.Name = "tbPCCMinSpeed"
+		Me.tbPCCMinSpeed.Size = New System.Drawing.Size(60, 23)
+		Me.tbPCCMinSpeed.TabIndex = 3
+		'
+		'Label34
+		'
+		Me.Label34.AutoSize = True
+		Me.Label34.Location = New System.Drawing.Point(356, 85)
+		Me.Label34.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label34.Name = "Label34"
+		Me.Label34.Size = New System.Drawing.Size(44, 15)
+		Me.Label34.TabIndex = 19
+		Me.Label34.Text = "[km/h]"
+		'
+		'Label35
+		'
+		Me.Label35.AutoSize = True
+		Me.Label35.Location = New System.Drawing.Point(8, 85)
+		Me.Label35.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label35.Name = "Label35"
+		Me.Label35.Size = New System.Drawing.Size(126, 15)
+		Me.Label35.TabIndex = 17
+		Me.Label35.Text = "PCC enabling velocity:"
+		'
+		'tbPCCEnableSpeed
+		'
+		Me.tbPCCEnableSpeed.Location = New System.Drawing.Point(288, 82)
+		Me.tbPCCEnableSpeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbPCCEnableSpeed.Name = "tbPCCEnableSpeed"
+		Me.tbPCCEnableSpeed.Size = New System.Drawing.Size(60, 23)
+		Me.tbPCCEnableSpeed.TabIndex = 2
+		'
+		'Label31
+		'
+		Me.Label31.AutoSize = True
+		Me.Label31.Location = New System.Drawing.Point(356, 55)
+		Me.Label31.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label31.Name = "Label31"
+		Me.Label31.Size = New System.Drawing.Size(44, 15)
+		Me.Label31.TabIndex = 16
+		Me.Label31.Text = "[km/h]"
+		'
+		'Label33
+		'
+		Me.Label33.AutoSize = True
+		Me.Label33.Location = New System.Drawing.Point(8, 55)
+		Me.Label33.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label33.Name = "Label33"
+		Me.Label33.Size = New System.Drawing.Size(110, 15)
+		Me.Label33.TabIndex = 14
+		Me.Label33.Text = "Allowed overspeed:"
+		'
+		'tbPCCOverspeed
+		'
+		Me.tbPCCOverspeed.Location = New System.Drawing.Point(288, 52)
+		Me.tbPCCOverspeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbPCCOverspeed.Name = "tbPCCOverspeed"
+		Me.tbPCCOverspeed.Size = New System.Drawing.Size(60, 23)
+		Me.tbPCCOverspeed.TabIndex = 1
+		'
+		'Label20
+		'
+		Me.Label20.AutoSize = True
+		Me.Label20.Location = New System.Drawing.Point(356, 25)
+		Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label20.Name = "Label20"
+		Me.Label20.Size = New System.Drawing.Size(44, 15)
+		Me.Label20.TabIndex = 13
+		Me.Label20.Text = "[km/h]"
+		'
+		'Label22
+		'
+		Me.Label22.AutoSize = True
+		Me.Label22.Location = New System.Drawing.Point(8, 25)
+		Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label22.Name = "Label22"
+		Me.Label22.Size = New System.Drawing.Size(118, 15)
+		Me.Label22.TabIndex = 11
+		Me.Label22.Text = "Allowed underspeed:"
+		'
+		'tbPCCUnderspeed
+		'
+		Me.tbPCCUnderspeed.Location = New System.Drawing.Point(288, 22)
+		Me.tbPCCUnderspeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbPCCUnderspeed.Name = "tbPCCUnderspeed"
+		Me.tbPCCUnderspeed.Size = New System.Drawing.Size(60, 23)
+		Me.tbPCCUnderspeed.TabIndex = 0
+		'
+		'gbEcoRoll
+		'
+		Me.gbEcoRoll.Controls.Add(Me.Label44)
+		Me.gbEcoRoll.Controls.Add(Me.Label45)
+		Me.gbEcoRoll.Controls.Add(Me.tbEcoRollMaxAcc)
+		Me.gbEcoRoll.Controls.Add(Me.Label29)
+		Me.gbEcoRoll.Controls.Add(Me.Label30)
+		Me.gbEcoRoll.Controls.Add(Me.tbEcoRollUnderspeed)
+		Me.gbEcoRoll.Controls.Add(Me.Label27)
+		Me.gbEcoRoll.Controls.Add(Me.Label28)
+		Me.gbEcoRoll.Controls.Add(Me.tbEcoRollActivationDelay)
+		Me.gbEcoRoll.Controls.Add(Me.Label25)
+		Me.gbEcoRoll.Controls.Add(Me.Label26)
+		Me.gbEcoRoll.Controls.Add(Me.tbEcoRollMinSpeed)
+		Me.gbEcoRoll.Location = New System.Drawing.Point(8, 157)
+		Me.gbEcoRoll.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.gbEcoRoll.Name = "gbEcoRoll"
+		Me.gbEcoRoll.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.gbEcoRoll.Size = New System.Drawing.Size(601, 147)
+		Me.gbEcoRoll.TabIndex = 1
+		Me.gbEcoRoll.TabStop = False
+		Me.gbEcoRoll.Text = "Eco-Roll"
+		'
+		'Label44
+		'
+		Me.Label44.AutoSize = True
+		Me.Label44.Location = New System.Drawing.Point(356, 87)
+		Me.Label44.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label44.Name = "Label44"
+		Me.Label44.Size = New System.Drawing.Size(40, 15)
+		Me.Label44.TabIndex = 19
+		Me.Label44.Text = "[m/s²]"
+		'
+		'Label45
+		'
+		Me.Label45.AutoSize = True
+		Me.Label45.Location = New System.Drawing.Point(8, 87)
+		Me.Label45.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label45.Name = "Label45"
+		Me.Label45.Size = New System.Drawing.Size(141, 15)
+		Me.Label45.TabIndex = 17
+		Me.Label45.Text = "Upper Acceleration Limit:"
+		'
+		'tbEcoRollMaxAcc
+		'
+		Me.tbEcoRollMaxAcc.Location = New System.Drawing.Point(288, 83)
+		Me.tbEcoRollMaxAcc.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbEcoRollMaxAcc.Name = "tbEcoRollMaxAcc"
+		Me.tbEcoRollMaxAcc.Size = New System.Drawing.Size(60, 23)
+		Me.tbEcoRollMaxAcc.TabIndex = 2
+		'
+		'Label29
+		'
+		Me.Label29.AutoSize = True
+		Me.Label29.Location = New System.Drawing.Point(356, 115)
+		Me.Label29.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label29.Name = "Label29"
+		Me.Label29.Size = New System.Drawing.Size(44, 15)
+		Me.Label29.TabIndex = 16
+		Me.Label29.Text = "[km/h]"
+		Me.Label29.Visible = False
+		'
+		'Label30
+		'
+		Me.Label30.AutoSize = True
+		Me.Label30.Location = New System.Drawing.Point(8, 115)
+		Me.Label30.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label30.Name = "Label30"
+		Me.Label30.Size = New System.Drawing.Size(126, 15)
+		Me.Label30.TabIndex = 14
+		Me.Label30.Text = "Underspeed threshold:"
+		Me.Label30.Visible = False
+		'
+		'tbEcoRollUnderspeed
+		'
+		Me.tbEcoRollUnderspeed.Location = New System.Drawing.Point(288, 112)
+		Me.tbEcoRollUnderspeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbEcoRollUnderspeed.Name = "tbEcoRollUnderspeed"
+		Me.tbEcoRollUnderspeed.Size = New System.Drawing.Size(60, 23)
+		Me.tbEcoRollUnderspeed.TabIndex = 3
+		Me.tbEcoRollUnderspeed.Visible = False
+		'
+		'Label27
+		'
+		Me.Label27.AutoSize = True
+		Me.Label27.Location = New System.Drawing.Point(356, 55)
+		Me.Label27.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label27.Name = "Label27"
+		Me.Label27.Size = New System.Drawing.Size(20, 15)
+		Me.Label27.TabIndex = 13
+		Me.Label27.Text = "[s]"
+		'
+		'Label28
+		'
+		Me.Label28.AutoSize = True
+		Me.Label28.Location = New System.Drawing.Point(8, 55)
+		Me.Label28.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label28.Name = "Label28"
+		Me.Label28.Size = New System.Drawing.Size(95, 15)
+		Me.Label28.TabIndex = 11
+		Me.Label28.Text = "Activation delay:"
+		'
+		'tbEcoRollActivationDelay
+		'
+		Me.tbEcoRollActivationDelay.Location = New System.Drawing.Point(288, 52)
+		Me.tbEcoRollActivationDelay.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbEcoRollActivationDelay.Name = "tbEcoRollActivationDelay"
+		Me.tbEcoRollActivationDelay.Size = New System.Drawing.Size(60, 23)
+		Me.tbEcoRollActivationDelay.TabIndex = 1
+		'
+		'Label25
+		'
+		Me.Label25.AutoSize = True
+		Me.Label25.Location = New System.Drawing.Point(356, 25)
+		Me.Label25.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label25.Name = "Label25"
+		Me.Label25.Size = New System.Drawing.Size(44, 15)
+		Me.Label25.TabIndex = 10
+		Me.Label25.Text = "[km/h]"
+		'
+		'Label26
+		'
+		Me.Label26.AutoSize = True
+		Me.Label26.Location = New System.Drawing.Point(8, 25)
+		Me.Label26.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label26.Name = "Label26"
+		Me.Label26.Size = New System.Drawing.Size(97, 15)
+		Me.Label26.TabIndex = 8
+		Me.Label26.Text = "Minimum speed:"
+		'
+		'tbEcoRollMinSpeed
+		'
+		Me.tbEcoRollMinSpeed.Location = New System.Drawing.Point(288, 22)
+		Me.tbEcoRollMinSpeed.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbEcoRollMinSpeed.Name = "tbEcoRollMinSpeed"
+		Me.tbEcoRollMinSpeed.Size = New System.Drawing.Size(60, 23)
+		Me.tbEcoRollMinSpeed.TabIndex = 0
+		'
+		'gbEngineStopStart
+		'
+		Me.gbEngineStopStart.Controls.Add(Me.lblESSUtilityFactorDrivingUnit)
+		Me.gbEngineStopStart.Controls.Add(Me.Label47)
+		Me.gbEngineStopStart.Controls.Add(Me.tbESSUtilityFactorDriving)
+		Me.gbEngineStopStart.Controls.Add(Me.lblESSUtilityFactorDriving)
+		Me.gbEngineStopStart.Controls.Add(Me.tbEssUtility)
+		Me.gbEngineStopStart.Controls.Add(Me.Label24)
+		Me.gbEngineStopStart.Controls.Add(Me.Label18)
+		Me.gbEngineStopStart.Controls.Add(Me.tbMaxEngineOffTimespan)
+		Me.gbEngineStopStart.Controls.Add(Me.Label19)
+		Me.gbEngineStopStart.Controls.Add(Me.Label17)
+		Me.gbEngineStopStart.Controls.Add(Me.tbEngineStopStartActivationDelay)
+		Me.gbEngineStopStart.Controls.Add(Me.Label16)
+		Me.gbEngineStopStart.Location = New System.Drawing.Point(8, 10)
+		Me.gbEngineStopStart.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.gbEngineStopStart.Name = "gbEngineStopStart"
+		Me.gbEngineStopStart.Padding = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.gbEngineStopStart.Size = New System.Drawing.Size(601, 140)
+		Me.gbEngineStopStart.TabIndex = 0
+		Me.gbEngineStopStart.TabStop = False
+		Me.gbEngineStopStart.Text = "Engine Stop/Start"
+		'
+		'lblESSUtilityFactorDrivingUnit
+		'
+		Me.lblESSUtilityFactorDrivingUnit.AutoSize = True
+		Me.lblESSUtilityFactorDrivingUnit.Location = New System.Drawing.Point(356, 113)
+		Me.lblESSUtilityFactorDrivingUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblESSUtilityFactorDrivingUnit.Name = "lblESSUtilityFactorDrivingUnit"
+		Me.lblESSUtilityFactorDrivingUnit.Size = New System.Drawing.Size(20, 15)
+		Me.lblESSUtilityFactorDrivingUnit.TabIndex = 10
+		Me.lblESSUtilityFactorDrivingUnit.Text = "[-]"
+		'
+		'Label47
+		'
+		Me.Label47.AutoSize = True
+		Me.Label47.Location = New System.Drawing.Point(356, 83)
+		Me.Label47.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label47.Name = "Label47"
+		Me.Label47.Size = New System.Drawing.Size(20, 15)
+		Me.Label47.TabIndex = 9
+		Me.Label47.Text = "[-]"
+		'
+		'tbESSUtilityFactorDriving
+		'
+		Me.tbESSUtilityFactorDriving.Location = New System.Drawing.Point(288, 110)
+		Me.tbESSUtilityFactorDriving.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbESSUtilityFactorDriving.Name = "tbESSUtilityFactorDriving"
+		Me.tbESSUtilityFactorDriving.Size = New System.Drawing.Size(60, 23)
+		Me.tbESSUtilityFactorDriving.TabIndex = 3
+		'
+		'lblESSUtilityFactorDriving
+		'
+		Me.lblESSUtilityFactorDriving.AutoSize = True
+		Me.lblESSUtilityFactorDriving.Location = New System.Drawing.Point(8, 113)
+		Me.lblESSUtilityFactorDriving.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblESSUtilityFactorDriving.Name = "lblESSUtilityFactorDriving"
+		Me.lblESSUtilityFactorDriving.Size = New System.Drawing.Size(246, 15)
+		Me.lblESSUtilityFactorDriving.TabIndex = 8
+		Me.lblESSUtilityFactorDriving.Text = "Engine stop/start utility factor (while driving):"
+		'
+		'tbEssUtility
+		'
+		Me.tbEssUtility.Location = New System.Drawing.Point(288, 80)
+		Me.tbEssUtility.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbEssUtility.Name = "tbEssUtility"
+		Me.tbEssUtility.Size = New System.Drawing.Size(60, 23)
+		Me.tbEssUtility.TabIndex = 2
+		'
+		'Label24
+		'
+		Me.Label24.AutoSize = True
+		Me.Label24.Location = New System.Drawing.Point(8, 83)
+		Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label24.Name = "Label24"
+		Me.Label24.Size = New System.Drawing.Size(241, 15)
+		Me.Label24.TabIndex = 6
+		Me.Label24.Text = "Engine stop/start utility factor (vehicle stop):"
+		'
+		'Label18
+		'
+		Me.Label18.AutoSize = True
+		Me.Label18.Location = New System.Drawing.Point(356, 53)
+		Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label18.Name = "Label18"
+		Me.Label18.Size = New System.Drawing.Size(20, 15)
+		Me.Label18.TabIndex = 5
+		Me.Label18.Text = "[s]"
+		'
+		'tbMaxEngineOffTimespan
+		'
+		Me.tbMaxEngineOffTimespan.Location = New System.Drawing.Point(288, 50)
+		Me.tbMaxEngineOffTimespan.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbMaxEngineOffTimespan.Name = "tbMaxEngineOffTimespan"
+		Me.tbMaxEngineOffTimespan.Size = New System.Drawing.Size(60, 23)
+		Me.tbMaxEngineOffTimespan.TabIndex = 1
+		'
+		'Label19
+		'
+		Me.Label19.AutoSize = True
+		Me.Label19.Location = New System.Drawing.Point(8, 53)
+		Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label19.Name = "Label19"
+		Me.Label19.Size = New System.Drawing.Size(122, 15)
+		Me.Label19.TabIndex = 3
+		Me.Label19.Text = "Max. engine-off time:"
+		'
+		'Label17
+		'
+		Me.Label17.AutoSize = True
+		Me.Label17.Location = New System.Drawing.Point(356, 23)
+		Me.Label17.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label17.Name = "Label17"
+		Me.Label17.Size = New System.Drawing.Size(20, 15)
+		Me.Label17.TabIndex = 2
+		Me.Label17.Text = "[s]"
+		'
+		'tbEngineStopStartActivationDelay
+		'
+		Me.tbEngineStopStartActivationDelay.Location = New System.Drawing.Point(288, 20)
+		Me.tbEngineStopStartActivationDelay.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.tbEngineStopStartActivationDelay.Name = "tbEngineStopStartActivationDelay"
+		Me.tbEngineStopStartActivationDelay.Size = New System.Drawing.Size(60, 23)
+		Me.tbEngineStopStartActivationDelay.TabIndex = 0
+		'
+		'Label16
+		'
+		Me.Label16.AutoSize = True
+		Me.Label16.Location = New System.Drawing.Point(8, 23)
+		Me.Label16.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.Label16.Name = "Label16"
+		Me.Label16.Size = New System.Drawing.Size(98, 15)
+		Me.Label16.TabIndex = 0
+		Me.Label16.Text = "Delay engine-off:"
+		'
+		'ButAuxRem
+		'
+		Me.ButAuxRem.Location = New System.Drawing.Point(0, 0)
+		Me.ButAuxRem.Name = "ButAuxRem"
+		Me.ButAuxRem.Size = New System.Drawing.Size(75, 23)
+		Me.ButAuxRem.TabIndex = 0
+		'
+		'ButAuxAdd
+		'
+		Me.ButAuxAdd.Location = New System.Drawing.Point(0, 0)
+		Me.ButAuxAdd.Name = "ButAuxAdd"
+		Me.ButAuxAdd.Size = New System.Drawing.Size(75, 23)
+		Me.ButAuxAdd.TabIndex = 0
+		'
+		'GroupBox1
+		'
+		Me.GroupBox1.Location = New System.Drawing.Point(0, 0)
+		Me.GroupBox1.Name = "GroupBox1"
+		Me.GroupBox1.Size = New System.Drawing.Size(200, 100)
+		Me.GroupBox1.TabIndex = 0
+		Me.GroupBox1.TabStop = False
+		'
+		'GroupBox2
+		'
+		Me.GroupBox2.Location = New System.Drawing.Point(0, 0)
+		Me.GroupBox2.Name = "GroupBox2"
+		Me.GroupBox2.Size = New System.Drawing.Size(200, 100)
+		Me.GroupBox2.TabIndex = 0
+		Me.GroupBox2.TabStop = False
+		'
+		'TbUnderSpeed
+		'
+		Me.TbUnderSpeed.Location = New System.Drawing.Point(0, 0)
+		Me.TbUnderSpeed.Name = "TbUnderSpeed"
+		Me.TbUnderSpeed.Size = New System.Drawing.Size(100, 23)
+		Me.TbUnderSpeed.TabIndex = 0
+		'
+		'StatusStrip1
+		'
+		Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
+		Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN})
+		Me.StatusStrip1.Location = New System.Drawing.Point(0, 706)
+		Me.StatusStrip1.Name = "StatusStrip1"
+		Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(1, 0, 16, 0)
+		Me.StatusStrip1.Size = New System.Drawing.Size(1101, 22)
+		Me.StatusStrip1.SizingGrip = False
+		Me.StatusStrip1.TabIndex = 6
+		Me.StatusStrip1.Text = "StatusStrip1"
+		'
+		'ToolStripStatusLabelGEN
+		'
+		Me.ToolStripStatusLabelGEN.Name = "ToolStripStatusLabelGEN"
+		Me.ToolStripStatusLabelGEN.Size = New System.Drawing.Size(119, 17)
+		Me.ToolStripStatusLabelGEN.Text = "ToolStripStatusLabel1"
+		'
+		'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(905, 650)
+		Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.ButOK.Name = "ButOK"
+		Me.ButOK.Size = New System.Drawing.Size(88, 27)
+		Me.ButOK.TabIndex = 1
+		Me.ButOK.Text = "Save"
+		Me.ButOK.UseVisualStyleBackColor = True
+		'
+		'ButCancel
+		'
+		Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
+		Me.ButCancel.Location = New System.Drawing.Point(1000, 650)
+		Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.ButCancel.Name = "ButCancel"
+		Me.ButCancel.Size = New System.Drawing.Size(88, 27)
+		Me.ButCancel.TabIndex = 2
+		Me.ButCancel.Text = "Cancel"
+		Me.ButCancel.UseVisualStyleBackColor = True
+		'
+		'ToolStrip1
+		'
+		Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
+		Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
+		Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator1, Me.ToolStripBtSendTo, Me.ToolStripSeparator2, Me.ToolStripButton1})
+		Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+		Me.ToolStrip1.Name = "ToolStrip1"
+		Me.ToolStrip1.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0)
+		Me.ToolStrip1.Size = New System.Drawing.Size(1101, 31)
+		Me.ToolStrip1.TabIndex = 20
+		Me.ToolStrip1.Text = "ToolStrip1"
+		'
+		'ToolStripBtNew
+		'
+		Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtNew.Image = Global.TUGraz.VECTO.My.Resources.Resources.blue_document_icon
+		Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtNew.Name = "ToolStripBtNew"
+		Me.ToolStripBtNew.Size = New System.Drawing.Size(28, 28)
+		Me.ToolStripBtNew.Text = "New"
+		Me.ToolStripBtNew.ToolTipText = "New"
+		'
+		'ToolStripBtOpen
+		'
+		Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
+		Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
+		Me.ToolStripBtOpen.Size = New System.Drawing.Size(28, 28)
+		Me.ToolStripBtOpen.Text = "Open"
+		Me.ToolStripBtOpen.ToolTipText = "Open..."
+		'
+		'ToolStripBtSave
+		'
+		Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSave.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_icon
+		Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSave.Name = "ToolStripBtSave"
+		Me.ToolStripBtSave.Size = New System.Drawing.Size(28, 28)
+		Me.ToolStripBtSave.Text = "Save"
+		Me.ToolStripBtSave.ToolTipText = "Save"
+		'
+		'ToolStripBtSaveAs
+		'
+		Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSaveAs.Image = Global.TUGraz.VECTO.My.Resources.Resources.Actions_document_save_as_icon
+		Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
+		Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(28, 28)
+		Me.ToolStripBtSaveAs.Text = "Save As"
+		Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
+		'
+		'ToolStripSeparator1
+		'
+		Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+		Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 31)
+		'
+		'ToolStripBtSendTo
+		'
+		Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripBtSendTo.Image = Global.TUGraz.VECTO.My.Resources.Resources.export_icon
+		Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
+		Me.ToolStripBtSendTo.Size = New System.Drawing.Size(28, 28)
+		Me.ToolStripBtSendTo.Text = "Send to Job List"
+		Me.ToolStripBtSendTo.ToolTipText = "Send to Job List"
+		'
+		'ToolStripSeparator2
+		'
+		Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
+		Me.ToolStripSeparator2.Size = New System.Drawing.Size(6, 31)
+		'
+		'ToolStripButton1
+		'
+		Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+		Me.ToolStripButton1.Image = Global.TUGraz.VECTO.My.Resources.Resources.Help_icon
+		Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+		Me.ToolStripButton1.Name = "ToolStripButton1"
+		Me.ToolStripButton1.Size = New System.Drawing.Size(28, 28)
+		Me.ToolStripButton1.Text = "Help"
+		'
+		'PictureBox1
+		'
+		Me.PictureBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.PictureBox1.BackColor = System.Drawing.Color.White
+		Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_Mainform
+		Me.PictureBox1.Location = New System.Drawing.Point(0, 32)
+		Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.PictureBox1.Name = "PictureBox1"
+		Me.PictureBox1.Size = New System.Drawing.Size(1101, 46)
+		Me.PictureBox1.TabIndex = 21
+		Me.PictureBox1.TabStop = False
+		'
+		'CmOpenFile
+		'
+		Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
+		Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
+		Me.CmOpenFile.Name = "CmOpenFile"
+		Me.CmOpenFile.ShowImageMargin = False
+		Me.CmOpenFile.Size = New System.Drawing.Size(128, 48)
+		'
+		'OpenWithToolStripMenuItem
+		'
+		Me.OpenWithToolStripMenuItem.Name = "OpenWithToolStripMenuItem"
+		Me.OpenWithToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
+		Me.OpenWithToolStripMenuItem.Text = "Open with ..."
+		'
+		'ShowInFolderToolStripMenuItem
+		'
+		Me.ShowInFolderToolStripMenuItem.Name = "ShowInFolderToolStripMenuItem"
+		Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(127, 22)
+		Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
+		'
+		'PicVehicle
+		'
+		Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
+		Me.PicVehicle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+		Me.PicVehicle.Location = New System.Drawing.Point(5, 3)
+		Me.PicVehicle.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.PicVehicle.Name = "PicVehicle"
+		Me.PicVehicle.Size = New System.Drawing.Size(350, 101)
+		Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+		Me.PicVehicle.TabIndex = 36
+		Me.PicVehicle.TabStop = False
+		'
+		'PicBox
+		'
+		Me.PicBox.BackColor = System.Drawing.Color.LightGray
+		Me.PicBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+		Me.PicBox.Location = New System.Drawing.Point(5, 166)
+		Me.PicBox.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.PicBox.Name = "PicBox"
+		Me.PicBox.Size = New System.Drawing.Size(455, 341)
+		Me.PicBox.TabIndex = 36
+		Me.PicBox.TabStop = False
+		'
+		'TbEngTxt
+		'
+		Me.TbEngTxt.Location = New System.Drawing.Point(5, 107)
+		Me.TbEngTxt.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TbEngTxt.Name = "TbEngTxt"
+		Me.TbEngTxt.ReadOnly = True
+		Me.TbEngTxt.Size = New System.Drawing.Size(454, 23)
+		Me.TbEngTxt.TabIndex = 6
+		'
+		'TbVehCat
+		'
+		Me.TbVehCat.Location = New System.Drawing.Point(358, 3)
+		Me.TbVehCat.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TbVehCat.Name = "TbVehCat"
+		Me.TbVehCat.ReadOnly = True
+		Me.TbVehCat.Size = New System.Drawing.Size(101, 23)
+		Me.TbVehCat.TabIndex = 2
+		'
+		'TbAxleConf
+		'
+		Me.TbAxleConf.Location = New System.Drawing.Point(424, 33)
+		Me.TbAxleConf.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TbAxleConf.Name = "TbAxleConf"
+		Me.TbAxleConf.ReadOnly = True
+		Me.TbAxleConf.Size = New System.Drawing.Size(35, 23)
+		Me.TbAxleConf.TabIndex = 4
+		'
+		'TbHVCclass
+		'
+		Me.TbHVCclass.Location = New System.Drawing.Point(358, 76)
+		Me.TbHVCclass.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TbHVCclass.Name = "TbHVCclass"
+		Me.TbHVCclass.ReadOnly = True
+		Me.TbHVCclass.Size = New System.Drawing.Size(101, 23)
+		Me.TbHVCclass.TabIndex = 5
+		'
+		'TbGbxTxt
+		'
+		Me.TbGbxTxt.Location = New System.Drawing.Point(5, 136)
+		Me.TbGbxTxt.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TbGbxTxt.Name = "TbGbxTxt"
+		Me.TbGbxTxt.ReadOnly = True
+		Me.TbGbxTxt.Size = New System.Drawing.Size(454, 23)
+		Me.TbGbxTxt.TabIndex = 7
+		'
+		'TbMass
+		'
+		Me.TbMass.Location = New System.Drawing.Point(358, 33)
+		Me.TbMass.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.TbMass.Name = "TbMass"
+		Me.TbMass.ReadOnly = True
+		Me.TbMass.Size = New System.Drawing.Size(58, 23)
+		Me.TbMass.TabIndex = 3
+		'
+		'lblEngineCharacteristics
+		'
+		Me.lblEngineCharacteristics.AutoSize = True
+		Me.lblEngineCharacteristics.Location = New System.Drawing.Point(8, 513)
+		Me.lblEngineCharacteristics.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblEngineCharacteristics.Name = "lblEngineCharacteristics"
+		Me.lblEngineCharacteristics.Size = New System.Drawing.Size(0, 15)
+		Me.lblEngineCharacteristics.TabIndex = 37
+		'
+		'lblTitle
+		'
+		Me.lblTitle.AutoSize = True
+		Me.lblTitle.BackColor = System.Drawing.Color.White
+		Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point)
+		Me.lblTitle.Location = New System.Drawing.Point(133, 39)
+		Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+		Me.lblTitle.Name = "lblTitle"
+		Me.lblTitle.Size = New System.Drawing.Size(320, 29)
+		Me.lblTitle.TabIndex = 38
+		Me.lblTitle.Text = "Job Editor - VEHICLE_TYPE"
+		'
+		'pnJobInfo
+		'
+		Me.pnJobInfo.Controls.Add(Me.PicVehicle)
+		Me.pnJobInfo.Controls.Add(Me.TbVehCat)
+		Me.pnJobInfo.Controls.Add(Me.TbHVCclass)
+		Me.pnJobInfo.Controls.Add(Me.TbAxleConf)
+		Me.pnJobInfo.Controls.Add(Me.TbMass)
+		Me.pnJobInfo.Controls.Add(Me.PicBox)
+		Me.pnJobInfo.Controls.Add(Me.TbGbxTxt)
+		Me.pnJobInfo.Controls.Add(Me.TbEngTxt)
+		Me.pnJobInfo.Location = New System.Drawing.Point(621, 90)
+		Me.pnJobInfo.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.pnJobInfo.Name = "pnJobInfo"
+		Me.pnJobInfo.Size = New System.Drawing.Size(463, 543)
+		Me.pnJobInfo.TabIndex = 39
+		'
+		'VectoJobForm
+		'
+		Me.AcceptButton = Me.ButOK
+		Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!)
+		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+		Me.CancelButton = Me.ButCancel
+		Me.ClientSize = New System.Drawing.Size(1101, 728)
+		Me.Controls.Add(Me.pnJobInfo)
+		Me.Controls.Add(Me.lblTitle)
+		Me.Controls.Add(Me.tcJob)
+		Me.Controls.Add(Me.lblEngineCharacteristics)
+		Me.Controls.Add(Me.PictureBox1)
+		Me.Controls.Add(Me.ToolStrip1)
+		Me.Controls.Add(Me.ButCancel)
+		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.Margin = New System.Windows.Forms.Padding(4, 3, 4, 3)
+		Me.MaximizeBox = False
+		Me.Name = "VectoJobForm"
+		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+		Me.Text = "Job Editor"
+		Me.TabPgGen.ResumeLayout(False)
+		Me.pnHybridStrategy.ResumeLayout(False)
+		Me.pnHybridStrategy.PerformLayout()
+		Me.pnVehicle.ResumeLayout(False)
+		Me.pnVehicle.PerformLayout()
+		Me.pnEngine.ResumeLayout(False)
+		Me.pnEngine.PerformLayout()
+		Me.pnGearbox.ResumeLayout(False)
+		Me.pnGearbox.PerformLayout()
+		Me.pnShiftParams.ResumeLayout(False)
+		Me.pnShiftParams.PerformLayout()
+		Me.GrCycles.ResumeLayout(False)
+		Me.GrCycles.PerformLayout()
+		Me.GrAuxMech.ResumeLayout(False)
+		Me.pnAuxDeclarationMode.ResumeLayout(False)
+		Me.pnAuxDeclarationMode.PerformLayout()
+		Me.pnAuxEngineering.ResumeLayout(False)
+		Me.pnAuxEngineering.PerformLayout()
+		CType(Me.picAuxInfo, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.tcJob.ResumeLayout(False)
+		Me.tpAuxiliaries.ResumeLayout(False)
+		Me.gbBusAux.ResumeLayout(False)
+		Me.gbBusAux.PerformLayout()
+		Me.pnBusAux.ResumeLayout(False)
+		Me.pnBusAux.PerformLayout()
+		Me.gbElectricAux.ResumeLayout(False)
+		Me.gbElectricAux.PerformLayout()
+		Me.tpCycles.ResumeLayout(False)
+		Me.TabPgDriver.ResumeLayout(False)
+		Me.GrVACC.ResumeLayout(False)
+		Me.GrVACC.PerformLayout()
+		Me.GrLAC.ResumeLayout(False)
+		Me.GrLAC.PerformLayout()
+		Me.pnLookAheadCoasting.ResumeLayout(False)
+		Me.pnLookAheadCoasting.PerformLayout()
+		Me.gbOverspeed.ResumeLayout(False)
+		Me.gbOverspeed.PerformLayout()
+		Me.PnEcoRoll.ResumeLayout(False)
+		Me.PnEcoRoll.PerformLayout()
+		Me.TabPgADAS.ResumeLayout(False)
+		Me.gbPCC.ResumeLayout(False)
+		Me.gbPCC.PerformLayout()
+		Me.gbEcoRoll.ResumeLayout(False)
+		Me.gbEcoRoll.PerformLayout()
+		Me.gbEngineStopStart.ResumeLayout(False)
+		Me.gbEngineStopStart.PerformLayout()
+		Me.StatusStrip1.ResumeLayout(False)
+		Me.StatusStrip1.PerformLayout()
+		Me.ToolStrip1.ResumeLayout(False)
+		Me.ToolStrip1.PerformLayout()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.CmOpenFile.ResumeLayout(False)
+		CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
+		CType(Me.PicBox, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.pnJobInfo.ResumeLayout(False)
+		Me.pnJobInfo.PerformLayout()
+		Me.ResumeLayout(False)
+		Me.PerformLayout()
 
-End Sub
+	End Sub
 
-    Friend WithEvents TabPgGen As TabPage
+	Friend WithEvents TabPgGen As TabPage
     Friend WithEvents tcJob As TabControl
     Friend WithEvents StatusStrip1 As StatusStrip
     Friend WithEvents ButtonVEH As Button
@@ -2256,5 +2451,7 @@ End Sub
 	Friend WithEvents Label15 As System.Windows.Forms.Label
 	Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
 	Friend WithEvents lblEngineCharacteristics As System.Windows.Forms.Label
-
+	Friend WithEvents lblESSUtilityFactorDrivingUnit As Label
+	Friend WithEvents Label47 As Label
+    Friend WithEvents Label49 As Label
 End Class
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index 0216c7c5ae8bedaa334ce19df312c4d02648b4e3..50b382bc2aec489410654f71bd0162de543fa4d7 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -83,8 +83,8 @@ Public Class VectoJobForm
 		PnEcoRoll.Enabled = Not Cfg.DeclMode
 
 		gbEcoRoll.Enabled = not Cfg.DeclMode
-		gbEngineStopStart.Enabled = not cfg.DeclMode
-		gbPCC.Enabled = Not Cfg.DeclMode
+        gbEngineStopStart.Visible = Not Cfg.DeclMode
+        gbPCC.Enabled = Not Cfg.DeclMode
 
 		_changed = False
 
@@ -1017,13 +1017,13 @@ Public Class VectoJobForm
         pnEngine.Enabled = True
         pnShiftParams.Enabled = True
         pnHybridStrategy.Enabled = False
-        lblESSUtilityFactorDriving.Enabled  = false
-        tbESSUtilityFactorDriving.Enabled = false
+        gbEngineStopStart.Visible = True
+        lblESSUtilityFactorDriving.Visible = True
+        tbESSUtilityFactorDriving.Visible = True
+        lblESSUtilityFactorDrivingUnit.Visible = True
         Select Case JobType
             Case VectoSimulationJobType.ConventionalVehicle
                 gbElectricAux.Enabled = False
-                lblESSUtilityFactorDriving.Enabled  = true
-                tbESSUtilityFactorDriving.Enabled = true
             Case VectoSimulationJobType.EngineOnlySimulation
                 pnVehicle.Enabled = False
                 pnGearbox.Enabled = False
@@ -1031,15 +1031,21 @@ Public Class VectoJobForm
                 TabPgADAS.Enabled = False
                 tpAuxiliaries.Enabled = False
                 pnShiftParams.Enabled = False
+                gbEngineStopStart.Visible = False
             Case VectoSimulationJobType.ParallelHybridVehicle
-                ' empty line - do not fall-through
-                pnHybridStrategy.Enabled = True
                 pnHybridStrategy.Enabled = Not Cfg.DeclMode
+                lblESSUtilityFactorDriving.Visible = False
+                tbESSUtilityFactorDriving.Visible = False
+                lblESSUtilityFactorDrivingUnit.Visible = False
+            Case VectoSimulationJobType.SerialHybridVehicle
+                pnHybridStrategy.Enabled = Not Cfg.DeclMode
+                gbEngineStopStart.Visible = False
             Case VectoSimulationJobType.BatteryElectricVehicle
                 pnEngine.Enabled = False
                 pnGearbox.Enabled = True
                 GrAuxMech.Enabled = False
-                pnShiftParams.Enabled = true
+                pnShiftParams.Enabled = True
+                gbEngineStopStart.Visible = False
         End Select
     End Sub
 
@@ -1432,6 +1438,7 @@ Public Class VectoJobForm
 
         'Thus Veh-file is returned
         HybridStrategyParamsForm.JobDir = GetPath(VectoFile)
+        HybridStrategyParamsForm.JobType = JobType
         HybridStrategyParamsForm.AutoSendTo = True
 
         If Not Trim(f) = "" Then
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index 9a6280e1f8592646e470044f8725746a9115b015..d36b5f0f8799864a3b650c19a79575f4e6a8a629 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -203,10 +203,11 @@ Partial Class VehicleForm
 		Me.btDelMaxTorqueEntry = New System.Windows.Forms.Button()
 		Me.tpADAS = New System.Windows.Forms.TabPage()
 		Me.gbADAS = New System.Windows.Forms.GroupBox()
-		Me.cbAtEcoRollReleaseLockupClutch = New System.Windows.Forms.CheckBox()
-		Me.cbPcc = New System.Windows.Forms.ComboBox()
+		Me.pnEcoRoll = New System.Windows.Forms.Panel()
 		Me.cbEcoRoll = New System.Windows.Forms.ComboBox()
 		Me.Label22 = New System.Windows.Forms.Label()
+		Me.cbAtEcoRollReleaseLockupClutch = New System.Windows.Forms.CheckBox()
+		Me.cbPcc = New System.Windows.Forms.ComboBox()
 		Me.cbEngineStopStart = New System.Windows.Forms.CheckBox()
 		Me.lblPCC = New System.Windows.Forms.Label()
 		Me.tpRoadSweeper = New System.Windows.Forms.TabPage()
@@ -228,52 +229,53 @@ Partial Class VehicleForm
 		Me.cbLegislativeClass = New System.Windows.Forms.ComboBox()
 		Me.Label21 = New System.Windows.Forms.Label()
 		Me.lblTitle = New System.Windows.Forms.Label()
-		Me.GroupBox6.SuspendLayout
-		Me.ToolStrip1.SuspendLayout
-		Me.gbRetarderLosses.SuspendLayout
-		Me.PnRt.SuspendLayout
-		Me.GroupBox8.SuspendLayout
-		Me.PnWheelDiam.SuspendLayout
-		Me.StatusStrip1.SuspendLayout
-		Me.GroupBox1.SuspendLayout
-		Me.PnLoad.SuspendLayout
-		Me.GrAirRes.SuspendLayout
-		Me.PnCdATrTr.SuspendLayout
-		CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
-		Me.CmOpenFile.SuspendLayout
-		Me.GroupBox3.SuspendLayout
-		Me.gbAngledrive.SuspendLayout
-		Me.pnAngledriveFields.SuspendLayout
-		CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).BeginInit
-		Me.tcVehicleComponents.SuspendLayout
-		Me.tpGeneral.SuspendLayout
-		Me.tpPowertrain.SuspendLayout
-		Me.gbVehicleIdlingSpeed.SuspendLayout
-		Me.Panel1.SuspendLayout
-		Me.gbTankSystem.SuspendLayout
-		Me.tpElectricComponents.SuspendLayout
-		Me.gbBattery.SuspendLayout
-		Me.gpElectricMotor.SuspendLayout
-		Me.gbRatiosPerGear.SuspendLayout
-		Me.pnElectricMotor.SuspendLayout
-		Me.tpGensetComponents.SuspendLayout
-		Me.gbGenSet.SuspendLayout
-		Me.pnGenSetEM.SuspendLayout
-		Me.tpTorqueLimits.SuspendLayout
-		Me.gbPropulsionTorque.SuspendLayout
-		Me.gbEMTorqueLimits.SuspendLayout
-		Me.bgVehicleTorqueLimits.SuspendLayout
-		Me.tpADAS.SuspendLayout
-		Me.gbADAS.SuspendLayout
-		Me.tpRoadSweeper.SuspendLayout
-		Me.pnPTO.SuspendLayout
-		Me.gbPTODrive.SuspendLayout
-		Me.gbPTO.SuspendLayout
-		Me.SuspendLayout
+		Me.GroupBox6.SuspendLayout()
+		Me.ToolStrip1.SuspendLayout()
+		Me.gbRetarderLosses.SuspendLayout()
+		Me.PnRt.SuspendLayout()
+		Me.GroupBox8.SuspendLayout()
+		Me.PnWheelDiam.SuspendLayout()
+		Me.StatusStrip1.SuspendLayout()
+		Me.GroupBox1.SuspendLayout()
+		Me.PnLoad.SuspendLayout()
+		Me.GrAirRes.SuspendLayout()
+		Me.PnCdATrTr.SuspendLayout()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.CmOpenFile.SuspendLayout()
+		Me.GroupBox3.SuspendLayout()
+		Me.gbAngledrive.SuspendLayout()
+		Me.pnAngledriveFields.SuspendLayout()
+		CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).BeginInit()
+		Me.tcVehicleComponents.SuspendLayout()
+		Me.tpGeneral.SuspendLayout()
+		Me.tpPowertrain.SuspendLayout()
+		Me.gbVehicleIdlingSpeed.SuspendLayout()
+		Me.Panel1.SuspendLayout()
+		Me.gbTankSystem.SuspendLayout()
+		Me.tpElectricComponents.SuspendLayout()
+		Me.gbBattery.SuspendLayout()
+		Me.gpElectricMotor.SuspendLayout()
+		Me.gbRatiosPerGear.SuspendLayout()
+		Me.pnElectricMotor.SuspendLayout()
+		Me.tpGensetComponents.SuspendLayout()
+		Me.gbGenSet.SuspendLayout()
+		Me.pnGenSetEM.SuspendLayout()
+		Me.tpTorqueLimits.SuspendLayout()
+		Me.gbPropulsionTorque.SuspendLayout()
+		Me.gbEMTorqueLimits.SuspendLayout()
+		Me.bgVehicleTorqueLimits.SuspendLayout()
+		Me.tpADAS.SuspendLayout()
+		Me.gbADAS.SuspendLayout()
+		Me.pnEcoRoll.SuspendLayout()
+		Me.tpRoadSweeper.SuspendLayout()
+		Me.pnPTO.SuspendLayout()
+		Me.gbPTODrive.SuspendLayout()
+		Me.gbPTO.SuspendLayout()
+		Me.SuspendLayout()
 		'
 		'Label1
 		'
-		Me.Label1.AutoSize = true
+		Me.Label1.AutoSize = True
 		Me.Label1.Location = New System.Drawing.Point(6, 22)
 		Me.Label1.Name = "Label1"
 		Me.Label1.Size = New System.Drawing.Size(177, 13)
@@ -289,7 +291,7 @@ Partial Class VehicleForm
 		'
 		'Label2
 		'
-		Me.Label2.AutoSize = true
+		Me.Label2.AutoSize = True
 		Me.Label2.Location = New System.Drawing.Point(128, 31)
 		Me.Label2.Name = "Label2"
 		Me.Label2.Size = New System.Drawing.Size(45, 13)
@@ -305,7 +307,7 @@ Partial Class VehicleForm
 		'
 		'Label3
 		'
-		Me.Label3.AutoSize = true
+		Me.Label3.AutoSize = True
 		Me.Label3.Location = New System.Drawing.Point(10, 6)
 		Me.Label3.Name = "Label3"
 		Me.Label3.Size = New System.Drawing.Size(38, 13)
@@ -321,7 +323,7 @@ Partial Class VehicleForm
 		'
 		'Label13
 		'
-		Me.Label13.AutoSize = true
+		Me.Label13.AutoSize = True
 		Me.Label13.Location = New System.Drawing.Point(136, 6)
 		Me.Label13.Name = "Label13"
 		Me.Label13.Size = New System.Drawing.Size(40, 13)
@@ -337,28 +339,28 @@ Partial Class VehicleForm
 		'
 		'ButOK
 		'
-		Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		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(498, 577)
 		Me.ButOK.Name = "ButOK"
 		Me.ButOK.Size = New System.Drawing.Size(75, 23)
 		Me.ButOK.TabIndex = 6
 		Me.ButOK.Text = "Save"
-		Me.ButOK.UseVisualStyleBackColor = true
+		Me.ButOK.UseVisualStyleBackColor = True
 		'
 		'ButCancel
 		'
-		Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		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(579, 577)
 		Me.ButCancel.Name = "ButCancel"
 		Me.ButCancel.Size = New System.Drawing.Size(75, 23)
 		Me.ButCancel.TabIndex = 7
 		Me.ButCancel.Text = "Cancel"
-		Me.ButCancel.UseVisualStyleBackColor = true
+		Me.ButCancel.UseVisualStyleBackColor = True
 		'
 		'Label14
 		'
-		Me.Label14.AutoSize = true
+		Me.Label14.AutoSize = True
 		Me.Label14.Location = New System.Drawing.Point(247, 22)
 		Me.Label14.Name = "Label14"
 		Me.Label14.Size = New System.Drawing.Size(25, 13)
@@ -367,7 +369,7 @@ Partial Class VehicleForm
 		'
 		'Label31
 		'
-		Me.Label31.AutoSize = true
+		Me.Label31.AutoSize = True
 		Me.Label31.Location = New System.Drawing.Point(241, 31)
 		Me.Label31.Name = "Label31"
 		Me.Label31.Size = New System.Drawing.Size(25, 13)
@@ -376,7 +378,7 @@ Partial Class VehicleForm
 		'
 		'Label35
 		'
-		Me.Label35.AutoSize = true
+		Me.Label35.AutoSize = True
 		Me.Label35.Location = New System.Drawing.Point(244, 6)
 		Me.Label35.Name = "Label35"
 		Me.Label35.Size = New System.Drawing.Size(29, 13)
@@ -385,11 +387,11 @@ Partial Class VehicleForm
 		'
 		'CbCdMode
 		'
-		Me.CbCdMode.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.CbCdMode.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.CbCdMode.DisplayMember = "Value"
 		Me.CbCdMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.CbCdMode.FormattingEnabled = true
+		Me.CbCdMode.FormattingEnabled = True
 		Me.CbCdMode.Items.AddRange(New Object() {"No Correction", "Speed dependent (User-defined)", "Speed dependent (Declaration Mode)", "Vair & Beta Input"})
 		Me.CbCdMode.Location = New System.Drawing.Point(6, 19)
 		Me.CbCdMode.Name = "CbCdMode"
@@ -399,9 +401,9 @@ Partial Class VehicleForm
 		'
 		'TbCdFile
 		'
-		Me.TbCdFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.TbCdFile.Enabled = false
+		Me.TbCdFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.TbCdFile.Enabled = False
 		Me.TbCdFile.Location = New System.Drawing.Point(9, 65)
 		Me.TbCdFile.Name = "TbCdFile"
 		Me.TbCdFile.Size = New System.Drawing.Size(276, 20)
@@ -409,14 +411,14 @@ Partial Class VehicleForm
 		'
 		'BtCdFileBrowse
 		'
-		Me.BtCdFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.BtCdFileBrowse.Enabled = false
+		Me.BtCdFileBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtCdFileBrowse.Enabled = False
 		Me.BtCdFileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
 		Me.BtCdFileBrowse.Location = New System.Drawing.Point(291, 62)
 		Me.BtCdFileBrowse.Name = "BtCdFileBrowse"
 		Me.BtCdFileBrowse.Size = New System.Drawing.Size(24, 24)
 		Me.BtCdFileBrowse.TabIndex = 2
-		Me.BtCdFileBrowse.UseVisualStyleBackColor = true
+		Me.BtCdFileBrowse.UseVisualStyleBackColor = True
 		'
 		'GroupBox6
 		'
@@ -429,23 +431,23 @@ Partial Class VehicleForm
 		Me.GroupBox6.Name = "GroupBox6"
 		Me.GroupBox6.Size = New System.Drawing.Size(346, 96)
 		Me.GroupBox6.TabIndex = 3
-		Me.GroupBox6.TabStop = false
+		Me.GroupBox6.TabStop = False
 		Me.GroupBox6.Text = "Cross Wind Correction"
 		'
 		'BtCdFileOpen
 		'
-		Me.BtCdFileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.BtCdFileOpen.Enabled = false
+		Me.BtCdFileOpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.BtCdFileOpen.Enabled = False
 		Me.BtCdFileOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
 		Me.BtCdFileOpen.Location = New System.Drawing.Point(315, 62)
 		Me.BtCdFileOpen.Name = "BtCdFileOpen"
 		Me.BtCdFileOpen.Size = New System.Drawing.Size(24, 24)
 		Me.BtCdFileOpen.TabIndex = 3
-		Me.BtCdFileOpen.UseVisualStyleBackColor = true
+		Me.BtCdFileOpen.UseVisualStyleBackColor = True
 		'
 		'LbCdMode
 		'
-		Me.LbCdMode.AutoSize = true
+		Me.LbCdMode.AutoSize = True
 		Me.LbCdMode.Location = New System.Drawing.Point(6, 47)
 		Me.LbCdMode.Name = "LbCdMode"
 		Me.LbCdMode.Size = New System.Drawing.Size(59, 13)
@@ -542,14 +544,14 @@ Partial Class VehicleForm
 		Me.gbRetarderLosses.Name = "gbRetarderLosses"
 		Me.gbRetarderLosses.Size = New System.Drawing.Size(310, 111)
 		Me.gbRetarderLosses.TabIndex = 1
-		Me.gbRetarderLosses.TabStop = false
+		Me.gbRetarderLosses.TabStop = False
 		Me.gbRetarderLosses.Text = "Retarder Losses"
 		'
 		'PnRt
 		'
-		Me.PnRt.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.PnRt.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.PnRt.Controls.Add(Me.Label15)
 		Me.PnRt.Controls.Add(Me.BtRtBrowse)
 		Me.PnRt.Controls.Add(Me.TbRtPath)
@@ -563,8 +565,8 @@ Partial Class VehicleForm
 		'
 		'Label15
 		'
-		Me.Label15.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.Label15.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.Label15.Location = New System.Drawing.Point(2, 23)
 		Me.Label15.Name = "Label15"
 		Me.Label15.Size = New System.Drawing.Size(232, 16)
@@ -574,18 +576,18 @@ Partial Class VehicleForm
 		'
 		'BtRtBrowse
 		'
-		Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.BtRtBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
 		Me.BtRtBrowse.Location = New System.Drawing.Point(272, 37)
 		Me.BtRtBrowse.Name = "BtRtBrowse"
 		Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24)
 		Me.BtRtBrowse.TabIndex = 2
-		Me.BtRtBrowse.UseVisualStyleBackColor = true
+		Me.BtRtBrowse.UseVisualStyleBackColor = True
 		'
 		'TbRtPath
 		'
-		Me.TbRtPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.TbRtPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.TbRtPath.Location = New System.Drawing.Point(3, 39)
 		Me.TbRtPath.Name = "TbRtPath"
 		Me.TbRtPath.Size = New System.Drawing.Size(269, 20)
@@ -593,8 +595,8 @@ Partial Class VehicleForm
 		'
 		'Label45
 		'
-		Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.Label45.AutoSize = true
+		Me.Label45.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label45.AutoSize = True
 		Me.Label45.Location = New System.Drawing.Point(263, 5)
 		Me.Label45.Name = "Label45"
 		Me.Label45.Size = New System.Drawing.Size(16, 13)
@@ -603,7 +605,7 @@ Partial Class VehicleForm
 		'
 		'LbRtRatio
 		'
-		Me.LbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.LbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.LbRtRatio.Location = New System.Drawing.Point(35, 5)
 		Me.LbRtRatio.Name = "LbRtRatio"
 		Me.LbRtRatio.Size = New System.Drawing.Size(167, 17)
@@ -613,7 +615,7 @@ Partial Class VehicleForm
 		'
 		'TbRtRatio
 		'
-		Me.TbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.TbRtRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.TbRtRatio.Location = New System.Drawing.Point(205, 3)
 		Me.TbRtRatio.Name = "TbRtRatio"
 		Me.TbRtRatio.Size = New System.Drawing.Size(56, 20)
@@ -621,8 +623,8 @@ Partial Class VehicleForm
 		'
 		'CbRtType
 		'
-		Me.CbRtType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.CbRtType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.CbRtType.DisplayMember = "Value"
 		Me.CbRtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
 		Me.CbRtType.Items.AddRange(New Object() {"Included in Transmission Loss Maps", "Primary Retarder", "Secondary Retarder"})
@@ -634,7 +636,7 @@ Partial Class VehicleForm
 		'
 		'Label46
 		'
-		Me.Label46.AutoSize = true
+		Me.Label46.AutoSize = True
 		Me.Label46.Location = New System.Drawing.Point(32, 5)
 		Me.Label46.Name = "Label46"
 		Me.Label46.Size = New System.Drawing.Size(145, 13)
@@ -643,7 +645,7 @@ Partial Class VehicleForm
 		'
 		'Label50
 		'
-		Me.Label50.AutoSize = true
+		Me.Label50.AutoSize = True
 		Me.Label50.Location = New System.Drawing.Point(241, 5)
 		Me.Label50.Name = "Label50"
 		Me.Label50.Size = New System.Drawing.Size(25, 13)
@@ -667,13 +669,13 @@ Partial Class VehicleForm
 		Me.GroupBox8.Name = "GroupBox8"
 		Me.GroupBox8.Size = New System.Drawing.Size(633, 182)
 		Me.GroupBox8.TabIndex = 4
-		Me.GroupBox8.TabStop = false
+		Me.GroupBox8.TabStop = False
 		Me.GroupBox8.Text = "Axles / Wheels"
 		'
 		'Label6
 		'
-		Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.Label6.AutoSize = true
+		Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label6.AutoSize = True
 		Me.Label6.Location = New System.Drawing.Point(525, 152)
 		Me.Label6.Name = "Label6"
 		Me.Label6.Size = New System.Drawing.Size(106, 13)
@@ -682,30 +684,30 @@ Partial Class VehicleForm
 		'
 		'ButAxlRem
 		'
-		Me.ButAxlRem.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+		Me.ButAxlRem.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.ButAxlRem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
 		Me.ButAxlRem.Location = New System.Drawing.Point(29, 151)
 		Me.ButAxlRem.Name = "ButAxlRem"
 		Me.ButAxlRem.Size = New System.Drawing.Size(24, 24)
 		Me.ButAxlRem.TabIndex = 2
-		Me.ButAxlRem.UseVisualStyleBackColor = true
+		Me.ButAxlRem.UseVisualStyleBackColor = True
 		'
 		'LvRRC
 		'
-		Me.LvRRC.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.LvRRC.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.LvRRC.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader7, Me.ColumnHeader8, Me.ColumnHeader2, Me.ColumnHeader9, Me.ColumnHeader1, Me.ColumnHeader3, Me.ColumnHeader4, Me.ColumnHeader10})
-		Me.LvRRC.FullRowSelect = true
-		Me.LvRRC.GridLines = true
-		Me.LvRRC.HideSelection = false
+		Me.LvRRC.FullRowSelect = True
+		Me.LvRRC.GridLines = True
+		Me.LvRRC.HideSelection = False
 		Me.LvRRC.Location = New System.Drawing.Point(6, 19)
-		Me.LvRRC.MultiSelect = false
+		Me.LvRRC.MultiSelect = False
 		Me.LvRRC.Name = "LvRRC"
 		Me.LvRRC.Size = New System.Drawing.Size(621, 131)
 		Me.LvRRC.TabIndex = 0
-		Me.LvRRC.TabStop = false
-		Me.LvRRC.UseCompatibleStateImageBehavior = false
+		Me.LvRRC.TabStop = False
+		Me.LvRRC.UseCompatibleStateImageBehavior = False
 		Me.LvRRC.View = System.Windows.Forms.View.Details
 		'
 		'ColumnHeader7
@@ -749,13 +751,13 @@ Partial Class VehicleForm
 		'
 		'ButAxlAdd
 		'
-		Me.ButAxlAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+		Me.ButAxlAdd.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.ButAxlAdd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
 		Me.ButAxlAdd.Location = New System.Drawing.Point(5, 151)
 		Me.ButAxlAdd.Name = "ButAxlAdd"
 		Me.ButAxlAdd.Size = New System.Drawing.Size(24, 24)
 		Me.ButAxlAdd.TabIndex = 1
-		Me.ButAxlAdd.UseVisualStyleBackColor = true
+		Me.ButAxlAdd.UseVisualStyleBackColor = True
 		'
 		'PnWheelDiam
 		'
@@ -772,7 +774,7 @@ Partial Class VehicleForm
 		'
 		Me.CbAxleConfig.DisplayMember = "Value"
 		Me.CbAxleConfig.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.CbAxleConfig.FormattingEnabled = true
+		Me.CbAxleConfig.FormattingEnabled = True
 		Me.CbAxleConfig.Items.AddRange(New Object() {"-", "4x2", "4x4", "6x2", "6x4", "6x6", "8x2", "8x4", "8x6", "8x8"})
 		Me.CbAxleConfig.Location = New System.Drawing.Point(153, 80)
 		Me.CbAxleConfig.Name = "CbAxleConfig"
@@ -784,7 +786,7 @@ Partial Class VehicleForm
 		'
 		Me.CbCat.DisplayMember = "Value"
 		Me.CbCat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.CbCat.FormattingEnabled = true
+		Me.CbCat.FormattingEnabled = True
 		Me.CbCat.Items.AddRange(New Object() {"-", "Rigid Truck", "Tractor", "City Bus", "Interurban Bus", "Coach"})
 		Me.CbCat.Location = New System.Drawing.Point(12, 80)
 		Me.CbCat.Name = "CbCat"
@@ -794,7 +796,7 @@ Partial Class VehicleForm
 		'
 		'Label5
 		'
-		Me.Label5.AutoSize = true
+		Me.Label5.AutoSize = True
 		Me.Label5.Location = New System.Drawing.Point(31, 108)
 		Me.Label5.Name = "Label5"
 		Me.Label5.Size = New System.Drawing.Size(116, 13)
@@ -803,7 +805,7 @@ Partial Class VehicleForm
 		'
 		'Label9
 		'
-		Me.Label9.AutoSize = true
+		Me.Label9.AutoSize = True
 		Me.Label9.Location = New System.Drawing.Point(197, 114)
 		Me.Label9.Name = "Label9"
 		Me.Label9.Size = New System.Drawing.Size(16, 13)
@@ -825,7 +827,7 @@ Partial Class VehicleForm
 		Me.StatusStrip1.Location = New System.Drawing.Point(0, 603)
 		Me.StatusStrip1.Name = "StatusStrip1"
 		Me.StatusStrip1.Size = New System.Drawing.Size(666, 22)
-		Me.StatusStrip1.SizingGrip = false
+		Me.StatusStrip1.SizingGrip = False
 		Me.StatusStrip1.TabIndex = 36
 		Me.StatusStrip1.Text = "StatusStrip1"
 		'
@@ -839,10 +841,10 @@ Partial Class VehicleForm
 		'
 		Me.TbHDVclass.Location = New System.Drawing.Point(153, 141)
 		Me.TbHDVclass.Name = "TbHDVclass"
-		Me.TbHDVclass.ReadOnly = true
+		Me.TbHDVclass.ReadOnly = True
 		Me.TbHDVclass.Size = New System.Drawing.Size(42, 20)
 		Me.TbHDVclass.TabIndex = 3
-		Me.TbHDVclass.TabStop = false
+		Me.TbHDVclass.TabStop = False
 		Me.TbHDVclass.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
 		'
 		'GroupBox1
@@ -855,7 +857,7 @@ Partial Class VehicleForm
 		Me.GroupBox1.Name = "GroupBox1"
 		Me.GroupBox1.Size = New System.Drawing.Size(278, 118)
 		Me.GroupBox1.TabIndex = 0
-		Me.GroupBox1.TabStop = false
+		Me.GroupBox1.TabStop = False
 		Me.GroupBox1.Text = "Masses / Loading"
 		'
 		'PnLoad
@@ -878,7 +880,7 @@ Partial Class VehicleForm
 		Me.GrAirRes.Name = "GrAirRes"
 		Me.GrAirRes.Size = New System.Drawing.Size(349, 72)
 		Me.GrAirRes.TabIndex = 2
-		Me.GrAirRes.TabStop = false
+		Me.GrAirRes.TabStop = False
 		Me.GrAirRes.Text = "Air Resistance"
 		'
 		'PnCdATrTr
@@ -904,7 +906,7 @@ Partial Class VehicleForm
 		'
 		'Label11
 		'
-		Me.Label11.AutoSize = true
+		Me.Label11.AutoSize = True
 		Me.Label11.Location = New System.Drawing.Point(117, 32)
 		Me.Label11.Name = "Label11"
 		Me.Label11.Size = New System.Drawing.Size(21, 13)
@@ -913,7 +915,7 @@ Partial Class VehicleForm
 		'
 		'Label20
 		'
-		Me.Label20.AutoSize = true
+		Me.Label20.AutoSize = True
 		Me.Label20.Location = New System.Drawing.Point(10, 32)
 		Me.Label20.Name = "Label20"
 		Me.Label20.Size = New System.Drawing.Size(38, 13)
@@ -922,7 +924,7 @@ Partial Class VehicleForm
 		'
 		'Label38
 		'
-		Me.Label38.AutoSize = true
+		Me.Label38.AutoSize = True
 		Me.Label38.Location = New System.Drawing.Point(117, 6)
 		Me.Label38.Name = "Label38"
 		Me.Label38.Size = New System.Drawing.Size(24, 13)
@@ -937,14 +939,14 @@ Partial Class VehicleForm
 		Me.PictureBox1.Name = "PictureBox1"
 		Me.PictureBox1.Size = New System.Drawing.Size(666, 40)
 		Me.PictureBox1.TabIndex = 37
-		Me.PictureBox1.TabStop = false
+		Me.PictureBox1.TabStop = False
 		'
 		'CmOpenFile
 		'
 		Me.CmOpenFile.ImageScalingSize = New System.Drawing.Size(24, 24)
 		Me.CmOpenFile.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.OpenWithToolStripMenuItem, Me.ShowInFolderToolStripMenuItem})
 		Me.CmOpenFile.Name = "CmOpenFile"
-		Me.CmOpenFile.ShowImageMargin = false
+		Me.CmOpenFile.ShowImageMargin = False
 		Me.CmOpenFile.Size = New System.Drawing.Size(128, 48)
 		'
 		'OpenWithToolStripMenuItem
@@ -966,7 +968,7 @@ Partial Class VehicleForm
 		Me.GroupBox3.Name = "GroupBox3"
 		Me.GroupBox3.Size = New System.Drawing.Size(278, 50)
 		Me.GroupBox3.TabIndex = 1
-		Me.GroupBox3.TabStop = false
+		Me.GroupBox3.TabStop = False
 		Me.GroupBox3.Text = "Dynamic Tyre Radius"
 		'
 		'gbAngledrive
@@ -977,14 +979,14 @@ Partial Class VehicleForm
 		Me.gbAngledrive.Name = "gbAngledrive"
 		Me.gbAngledrive.Size = New System.Drawing.Size(313, 111)
 		Me.gbAngledrive.TabIndex = 3
-		Me.gbAngledrive.TabStop = false
+		Me.gbAngledrive.TabStop = False
 		Me.gbAngledrive.Text = "Angledrive"
 		'
 		'pnAngledriveFields
 		'
-		Me.pnAngledriveFields.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.pnAngledriveFields.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.pnAngledriveFields.Controls.Add(Me.Label4)
 		Me.pnAngledriveFields.Controls.Add(Me.Label10)
 		Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveRatio)
@@ -998,8 +1000,8 @@ Partial Class VehicleForm
 		'
 		'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.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(277, 6)
 		Me.Label4.Name = "Label4"
 		Me.Label4.Size = New System.Drawing.Size(16, 13)
@@ -1008,7 +1010,7 @@ Partial Class VehicleForm
 		'
 		'Label10
 		'
-		Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.Label10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.Label10.Location = New System.Drawing.Point(170, 6)
 		Me.Label10.Name = "Label10"
 		Me.Label10.Size = New System.Drawing.Size(44, 18)
@@ -1018,7 +1020,7 @@ Partial Class VehicleForm
 		'
 		'tbAngledriveRatio
 		'
-		Me.tbAngledriveRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.tbAngledriveRatio.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.tbAngledriveRatio.Location = New System.Drawing.Point(219, 4)
 		Me.tbAngledriveRatio.Name = "tbAngledriveRatio"
 		Me.tbAngledriveRatio.Size = New System.Drawing.Size(56, 20)
@@ -1026,18 +1028,18 @@ Partial Class VehicleForm
 		'
 		'btAngledriveLossMapBrowse
 		'
-		Me.btAngledriveLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.btAngledriveLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.btAngledriveLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
 		Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(276, 39)
 		Me.btAngledriveLossMapBrowse.Name = "btAngledriveLossMapBrowse"
 		Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(24, 24)
 		Me.btAngledriveLossMapBrowse.TabIndex = 2
-		Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = true
+		Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = True
 		'
 		'tbAngledriveLossMapPath
 		'
-		Me.tbAngledriveLossMapPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.tbAngledriveLossMapPath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(3, 41)
 		Me.tbAngledriveLossMapPath.Name = "tbAngledriveLossMapPath"
 		Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(273, 20)
@@ -1045,8 +1047,8 @@ Partial Class VehicleForm
 		'
 		'Label12
 		'
-		Me.Label12.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.Label12.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.Label12.Location = New System.Drawing.Point(0, 24)
 		Me.Label12.Name = "Label12"
 		Me.Label12.Size = New System.Drawing.Size(294, 16)
@@ -1056,8 +1058,8 @@ Partial Class VehicleForm
 		'
 		'cbAngledriveType
 		'
-		Me.cbAngledriveType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.cbAngledriveType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.cbAngledriveType.DisplayMember = "Value"
 		Me.cbAngledriveType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
 		Me.cbAngledriveType.Location = New System.Drawing.Point(6, 19)
@@ -1075,11 +1077,11 @@ Partial Class VehicleForm
 		Me.PicVehicle.Size = New System.Drawing.Size(300, 88)
 		Me.PicVehicle.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
 		Me.PicVehicle.TabIndex = 39
-		Me.PicVehicle.TabStop = false
+		Me.PicVehicle.TabStop = False
 		'
 		'Label8
 		'
-		Me.Label8.AutoSize = true
+		Me.Label8.AutoSize = True
 		Me.Label8.Location = New System.Drawing.Point(85, 144)
 		Me.Label8.Name = "Label8"
 		Me.Label8.Size = New System.Drawing.Size(62, 13)
@@ -1088,8 +1090,8 @@ Partial Class VehicleForm
 		'
 		'cbPTOType
 		'
-		Me.cbPTOType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.cbPTOType.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.cbPTOType.DisplayMember = "Value"
 		Me.cbPTOType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
 		Me.cbPTOType.Location = New System.Drawing.Point(6, 24)
@@ -1151,7 +1153,7 @@ Partial Class VehicleForm
 		Me.tpGeneral.Size = New System.Drawing.Size(648, 374)
 		Me.tpGeneral.TabIndex = 0
 		Me.tpGeneral.Text = "General"
-		Me.tpGeneral.UseVisualStyleBackColor = true
+		Me.tpGeneral.UseVisualStyleBackColor = True
 		'
 		'tpPowertrain
 		'
@@ -1165,7 +1167,7 @@ Partial Class VehicleForm
 		Me.tpPowertrain.Size = New System.Drawing.Size(648, 374)
 		Me.tpPowertrain.TabIndex = 1
 		Me.tpPowertrain.Text = "Powertrain"
-		Me.tpPowertrain.UseVisualStyleBackColor = true
+		Me.tpPowertrain.UseVisualStyleBackColor = True
 		'
 		'gbVehicleIdlingSpeed
 		'
@@ -1174,7 +1176,7 @@ Partial Class VehicleForm
 		Me.gbVehicleIdlingSpeed.Name = "gbVehicleIdlingSpeed"
 		Me.gbVehicleIdlingSpeed.Size = New System.Drawing.Size(310, 63)
 		Me.gbVehicleIdlingSpeed.TabIndex = 0
-		Me.gbVehicleIdlingSpeed.TabStop = false
+		Me.gbVehicleIdlingSpeed.TabStop = False
 		Me.gbVehicleIdlingSpeed.Text = "Vehicle Idling Speed"
 		'
 		'Panel1
@@ -1190,15 +1192,15 @@ Partial Class VehicleForm
 		'
 		'tbVehIdlingSpeed
 		'
-		Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(173, 3)
+		Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(205, 4)
 		Me.tbVehIdlingSpeed.Name = "tbVehIdlingSpeed"
-		Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(57, 20)
+		Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(56, 20)
 		Me.tbVehIdlingSpeed.TabIndex = 0
 		'
 		'Label18
 		'
-		Me.Label18.AutoSize = true
-		Me.Label18.Location = New System.Drawing.Point(233, 6)
+		Me.Label18.AutoSize = True
+		Me.Label18.Location = New System.Drawing.Point(264, 7)
 		Me.Label18.Name = "Label18"
 		Me.Label18.Size = New System.Drawing.Size(30, 13)
 		Me.Label18.TabIndex = 24
@@ -1206,8 +1208,8 @@ Partial Class VehicleForm
 		'
 		'Label19
 		'
-		Me.Label19.AutoSize = true
-		Me.Label19.Location = New System.Drawing.Point(73, 6)
+		Me.Label19.AutoSize = True
+		Me.Label19.Location = New System.Drawing.Point(104, 7)
 		Me.Label19.Name = "Label19"
 		Me.Label19.Size = New System.Drawing.Size(94, 13)
 		Me.Label19.TabIndex = 8
@@ -1221,13 +1223,13 @@ Partial Class VehicleForm
 		Me.gbTankSystem.Name = "gbTankSystem"
 		Me.gbTankSystem.Size = New System.Drawing.Size(310, 63)
 		Me.gbTankSystem.TabIndex = 2
-		Me.gbTankSystem.TabStop = false
+		Me.gbTankSystem.TabStop = False
 		Me.gbTankSystem.Text = "Tank System"
 		'
 		'cbTankSystem
 		'
-		Me.cbTankSystem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.cbTankSystem.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.cbTankSystem.DisplayMember = "Value"
 		Me.cbTankSystem.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
 		Me.cbTankSystem.Location = New System.Drawing.Point(6, 19)
@@ -1238,8 +1240,8 @@ Partial Class VehicleForm
 		'
 		'Label23
 		'
-		Me.Label23.AutoSize = true
-		Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+		Me.Label23.AutoSize = True
+		Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
 		Me.Label23.Location = New System.Drawing.Point(3, 43)
 		Me.Label23.Name = "Label23"
 		Me.Label23.Size = New System.Drawing.Size(187, 13)
@@ -1256,7 +1258,7 @@ Partial Class VehicleForm
 		Me.tpElectricComponents.Size = New System.Drawing.Size(648, 374)
 		Me.tpElectricComponents.TabIndex = 4
 		Me.tpElectricComponents.Text = "Electric Powertrain Components"
-		Me.tpElectricComponents.UseVisualStyleBackColor = true
+		Me.tpElectricComponents.UseVisualStyleBackColor = True
 		'
 		'gbBattery
 		'
@@ -1271,24 +1273,24 @@ Partial Class VehicleForm
 		Me.gbBattery.Name = "gbBattery"
 		Me.gbBattery.Size = New System.Drawing.Size(633, 187)
 		Me.gbBattery.TabIndex = 2
-		Me.gbBattery.TabStop = false
+		Me.gbBattery.TabStop = False
 		Me.gbBattery.Text = "Electric Energy Storage system"
 		'
 		'lvREESSPacks
 		'
-		Me.lvREESSPacks.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.lvREESSPacks.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.lvREESSPacks.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.chReessPackPack, Me.chReessPackCount, Me.chReessPackStringId})
-		Me.lvREESSPacks.FullRowSelect = true
-		Me.lvREESSPacks.GridLines = true
-		Me.lvREESSPacks.HideSelection = false
+		Me.lvREESSPacks.FullRowSelect = True
+		Me.lvREESSPacks.GridLines = True
+		Me.lvREESSPacks.HideSelection = False
 		Me.lvREESSPacks.Location = New System.Drawing.Point(6, 45)
-		Me.lvREESSPacks.MultiSelect = false
+		Me.lvREESSPacks.MultiSelect = False
 		Me.lvREESSPacks.Name = "lvREESSPacks"
 		Me.lvREESSPacks.Size = New System.Drawing.Size(553, 102)
 		Me.lvREESSPacks.TabIndex = 31
-		Me.lvREESSPacks.TabStop = false
-		Me.lvREESSPacks.UseCompatibleStateImageBehavior = false
+		Me.lvREESSPacks.TabStop = False
+		Me.lvREESSPacks.UseCompatibleStateImageBehavior = False
 		Me.lvREESSPacks.View = System.Windows.Forms.View.Details
 		'
 		'chReessPackPack
@@ -1313,12 +1315,12 @@ Partial Class VehicleForm
 		Me.btnAddReessPack.Name = "btnAddReessPack"
 		Me.btnAddReessPack.Size = New System.Drawing.Size(24, 24)
 		Me.btnAddReessPack.TabIndex = 1
-		Me.btnAddReessPack.UseVisualStyleBackColor = true
+		Me.btnAddReessPack.UseVisualStyleBackColor = True
 		'
 		'lblEditReessPack
 		'
-		Me.lblEditReessPack.AutoSize = true
-		Me.lblEditReessPack.Location = New System.Drawing.Point(451, 159)
+		Me.lblEditReessPack.AutoSize = True
+		Me.lblEditReessPack.Location = New System.Drawing.Point(452, 148)
 		Me.lblEditReessPack.Name = "lblEditReessPack"
 		Me.lblEditReessPack.Size = New System.Drawing.Size(106, 13)
 		Me.lblEditReessPack.TabIndex = 30
@@ -1331,11 +1333,11 @@ Partial Class VehicleForm
 		Me.btnRemoveReessPack.Name = "btnRemoveReessPack"
 		Me.btnRemoveReessPack.Size = New System.Drawing.Size(24, 24)
 		Me.btnRemoveReessPack.TabIndex = 2
-		Me.btnRemoveReessPack.UseVisualStyleBackColor = true
+		Me.btnRemoveReessPack.UseVisualStyleBackColor = True
 		'
 		'lblInitialSoCUnit
 		'
-		Me.lblInitialSoCUnit.AutoSize = true
+		Me.lblInitialSoCUnit.AutoSize = True
 		Me.lblInitialSoCUnit.Location = New System.Drawing.Point(265, 21)
 		Me.lblInitialSoCUnit.Name = "lblInitialSoCUnit"
 		Me.lblInitialSoCUnit.Size = New System.Drawing.Size(21, 13)
@@ -1351,7 +1353,7 @@ Partial Class VehicleForm
 		'
 		'lblInitialSoC
 		'
-		Me.lblInitialSoC.AutoSize = true
+		Me.lblInitialSoC.AutoSize = True
 		Me.lblInitialSoC.Location = New System.Drawing.Point(7, 22)
 		Me.lblInitialSoC.Name = "lblInitialSoC"
 		Me.lblInitialSoC.RightToLeft = System.Windows.Forms.RightToLeft.Yes
@@ -1378,13 +1380,13 @@ Partial Class VehicleForm
 		Me.gpElectricMotor.Name = "gpElectricMotor"
 		Me.gpElectricMotor.Size = New System.Drawing.Size(633, 163)
 		Me.gpElectricMotor.TabIndex = 0
-		Me.gpElectricMotor.TabStop = false
+		Me.gpElectricMotor.TabStop = False
 		Me.gpElectricMotor.Text = "Electric Machine"
 		'
 		'Label33
 		'
-		Me.Label33.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.Label33.AutoSize = true
+		Me.Label33.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label33.AutoSize = True
 		Me.Label33.Location = New System.Drawing.Point(203, 108)
 		Me.Label33.Name = "Label33"
 		Me.Label33.Size = New System.Drawing.Size(16, 13)
@@ -1393,8 +1395,8 @@ Partial Class VehicleForm
 		'
 		'Label32
 		'
-		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.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(203, 82)
 		Me.Label32.Name = "Label32"
 		Me.Label32.Size = New System.Drawing.Size(16, 13)
@@ -1411,24 +1413,24 @@ Partial Class VehicleForm
 		Me.gbRatiosPerGear.Name = "gbRatiosPerGear"
 		Me.gbRatiosPerGear.Size = New System.Drawing.Size(181, 145)
 		Me.gbRatiosPerGear.TabIndex = 1
-		Me.gbRatiosPerGear.TabStop = false
+		Me.gbRatiosPerGear.TabStop = False
 		Me.gbRatiosPerGear.Text = "Transmission Ratio per Gear"
 		'
 		'lvRatioPerGear
 		'
-		Me.lvRatioPerGear.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.lvRatioPerGear.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.lvRatioPerGear.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader11, Me.ColumnHeader12})
-		Me.lvRatioPerGear.FullRowSelect = true
-		Me.lvRatioPerGear.GridLines = true
-		Me.lvRatioPerGear.HideSelection = false
+		Me.lvRatioPerGear.FullRowSelect = True
+		Me.lvRatioPerGear.GridLines = True
+		Me.lvRatioPerGear.HideSelection = False
 		Me.lvRatioPerGear.Location = New System.Drawing.Point(6, 16)
-		Me.lvRatioPerGear.MultiSelect = false
+		Me.lvRatioPerGear.MultiSelect = False
 		Me.lvRatioPerGear.Name = "lvRatioPerGear"
 		Me.lvRatioPerGear.Size = New System.Drawing.Size(169, 94)
 		Me.lvRatioPerGear.TabIndex = 7
-		Me.lvRatioPerGear.TabStop = false
-		Me.lvRatioPerGear.UseCompatibleStateImageBehavior = false
+		Me.lvRatioPerGear.TabStop = False
+		Me.lvRatioPerGear.UseCompatibleStateImageBehavior = False
 		Me.lvRatioPerGear.View = System.Windows.Forms.View.Details
 		'
 		'ColumnHeader11
@@ -1448,12 +1450,12 @@ Partial Class VehicleForm
 		Me.btnAddEMRatio.Name = "btnAddEMRatio"
 		Me.btnAddEMRatio.Size = New System.Drawing.Size(24, 24)
 		Me.btnAddEMRatio.TabIndex = 4
-		Me.btnAddEMRatio.UseVisualStyleBackColor = true
+		Me.btnAddEMRatio.UseVisualStyleBackColor = True
 		'
 		'Label29
 		'
-		Me.Label29.AutoSize = true
-		Me.Label29.Location = New System.Drawing.Point(71, 121)
+		Me.Label29.AutoSize = True
+		Me.Label29.Location = New System.Drawing.Point(71, 111)
 		Me.Label29.Name = "Label29"
 		Me.Label29.Size = New System.Drawing.Size(106, 13)
 		Me.Label29.TabIndex = 6
@@ -1466,17 +1468,17 @@ Partial Class VehicleForm
 		Me.btnRemoveEMRatio.Name = "btnRemoveEMRatio"
 		Me.btnRemoveEMRatio.Size = New System.Drawing.Size(24, 24)
 		Me.btnRemoveEMRatio.TabIndex = 5
-		Me.btnRemoveEMRatio.UseVisualStyleBackColor = true
+		Me.btnRemoveEMRatio.UseVisualStyleBackColor = True
 		'
 		'btnEmADCLossMap
 		'
-		Me.btnEmADCLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+		Me.btnEmADCLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.btnEmADCLossMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
 		Me.btnEmADCLossMap.Location = New System.Drawing.Point(346, 129)
 		Me.btnEmADCLossMap.Name = "btnEmADCLossMap"
 		Me.btnEmADCLossMap.Size = New System.Drawing.Size(24, 24)
 		Me.btnEmADCLossMap.TabIndex = 5
-		Me.btnEmADCLossMap.UseVisualStyleBackColor = true
+		Me.btnEmADCLossMap.UseVisualStyleBackColor = True
 		'
 		'tbEmADCLossMap
 		'
@@ -1487,7 +1489,7 @@ Partial Class VehicleForm
 		'
 		'lblEmADCLossmap
 		'
-		Me.lblEmADCLossmap.AutoSize = true
+		Me.lblEmADCLossmap.AutoSize = True
 		Me.lblEmADCLossmap.Location = New System.Drawing.Point(7, 134)
 		Me.lblEmADCLossmap.Name = "lblEmADCLossmap"
 		Me.lblEmADCLossmap.Size = New System.Drawing.Size(100, 13)
@@ -1503,7 +1505,7 @@ Partial Class VehicleForm
 		'
 		'lblRatioEm
 		'
-		Me.lblRatioEm.AutoSize = true
+		Me.lblRatioEm.AutoSize = True
 		Me.lblRatioEm.Location = New System.Drawing.Point(7, 108)
 		Me.lblRatioEm.Name = "lblRatioEm"
 		Me.lblRatioEm.Size = New System.Drawing.Size(79, 13)
@@ -1521,7 +1523,7 @@ Partial Class VehicleForm
 		'
 		Me.cbEmPos.DisplayMember = "Value"
 		Me.cbEmPos.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.cbEmPos.FormattingEnabled = true
+		Me.cbEmPos.FormattingEnabled = True
 		Me.cbEmPos.Location = New System.Drawing.Point(110, 52)
 		Me.cbEmPos.Name = "cbEmPos"
 		Me.cbEmPos.Size = New System.Drawing.Size(153, 21)
@@ -1530,7 +1532,7 @@ Partial Class VehicleForm
 		'
 		'lblEmCount
 		'
-		Me.lblEmCount.AutoSize = true
+		Me.lblEmCount.AutoSize = True
 		Me.lblEmCount.Location = New System.Drawing.Point(7, 82)
 		Me.lblEmCount.Name = "lblEmCount"
 		Me.lblEmCount.Size = New System.Drawing.Size(83, 13)
@@ -1539,7 +1541,7 @@ Partial Class VehicleForm
 		'
 		'lblEmPosition
 		'
-		Me.lblEmPosition.AutoSize = true
+		Me.lblEmPosition.AutoSize = True
 		Me.lblEmPosition.Location = New System.Drawing.Point(7, 56)
 		Me.lblEmPosition.Name = "lblEmPosition"
 		Me.lblEmPosition.Size = New System.Drawing.Size(47, 13)
@@ -1563,22 +1565,22 @@ Partial Class VehicleForm
 		Me.btnOpenElectricMotor.Size = New System.Drawing.Size(94, 21)
 		Me.btnOpenElectricMotor.TabIndex = 0
 		Me.btnOpenElectricMotor.Text = "Electric Machine"
-		Me.btnOpenElectricMotor.UseVisualStyleBackColor = true
+		Me.btnOpenElectricMotor.UseVisualStyleBackColor = True
 		'
 		'btnBrowseElectricMotor
 		'
-		Me.btnBrowseElectricMotor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.btnBrowseElectricMotor.Image = CType(resources.GetObject("btnBrowseElectricMotor.Image"),System.Drawing.Image)
+		Me.btnBrowseElectricMotor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.btnBrowseElectricMotor.Image = CType(resources.GetObject("btnBrowseElectricMotor.Image"), System.Drawing.Image)
 		Me.btnBrowseElectricMotor.Location = New System.Drawing.Point(406, 2)
 		Me.btnBrowseElectricMotor.Name = "btnBrowseElectricMotor"
 		Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(24, 24)
 		Me.btnBrowseElectricMotor.TabIndex = 2
-		Me.btnBrowseElectricMotor.UseVisualStyleBackColor = true
+		Me.btnBrowseElectricMotor.UseVisualStyleBackColor = True
 		'
 		'tbElectricMotor
 		'
-		Me.tbElectricMotor.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.tbElectricMotor.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.tbElectricMotor.Location = New System.Drawing.Point(104, 4)
 		Me.tbElectricMotor.Name = "tbElectricMotor"
 		Me.tbElectricMotor.Size = New System.Drawing.Size(300, 20)
@@ -1594,17 +1596,18 @@ Partial Class VehicleForm
 		Me.tpGensetComponents.Size = New System.Drawing.Size(648, 374)
 		Me.tpGensetComponents.TabIndex = 5
 		Me.tpGensetComponents.Text = "GenSet Components"
-		Me.tpGensetComponents.UseVisualStyleBackColor = true
+		Me.tpGensetComponents.UseVisualStyleBackColor = True
 		'
 		'Label30
 		'
-		Me.Label30.AutoSize = true
+		Me.Label30.AutoSize = True
+		Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
 		Me.Label30.Location = New System.Drawing.Point(13, 153)
 		Me.Label30.Name = "Label30"
 		Me.Label30.Size = New System.Drawing.Size(429, 13)
 		Me.Label30.TabIndex = 21
-		Me.Label30.Text = "Note: The internal combustion engine of the GenSet is configured in the Job-Edito"& _ 
-    "r dialog."
+		Me.Label30.Text = "Note: The internal combustion engine of the GenSet is configured in the Job-Edito" &
+	"r dialog."
 		'
 		'gbGenSet
 		'
@@ -1622,13 +1625,13 @@ Partial Class VehicleForm
 		Me.gbGenSet.Name = "gbGenSet"
 		Me.gbGenSet.Size = New System.Drawing.Size(633, 135)
 		Me.gbGenSet.TabIndex = 1
-		Me.gbGenSet.TabStop = false
+		Me.gbGenSet.TabStop = False
 		Me.gbGenSet.Text = "Electric Machine"
 		'
 		'Label36
 		'
-		Me.Label36.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.Label36.AutoSize = true
+		Me.Label36.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label36.AutoSize = True
 		Me.Label36.Location = New System.Drawing.Point(203, 83)
 		Me.Label36.Name = "Label36"
 		Me.Label36.Size = New System.Drawing.Size(16, 13)
@@ -1637,8 +1640,8 @@ Partial Class VehicleForm
 		'
 		'Label34
 		'
-		Me.Label34.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.Label34.AutoSize = true
+		Me.Label34.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label34.AutoSize = True
 		Me.Label34.Location = New System.Drawing.Point(203, 57)
 		Me.Label34.Name = "Label34"
 		Me.Label34.Size = New System.Drawing.Size(16, 13)
@@ -1647,13 +1650,13 @@ Partial Class VehicleForm
 		'
 		'btnGenSetLossMap
 		'
-		Me.btnGenSetLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+		Me.btnGenSetLossMap.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.btnGenSetLossMap.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
 		Me.btnGenSetLossMap.Location = New System.Drawing.Point(412, 105)
 		Me.btnGenSetLossMap.Name = "btnGenSetLossMap"
 		Me.btnGenSetLossMap.Size = New System.Drawing.Size(24, 24)
 		Me.btnGenSetLossMap.TabIndex = 5
-		Me.btnGenSetLossMap.UseVisualStyleBackColor = true
+		Me.btnGenSetLossMap.UseVisualStyleBackColor = True
 		'
 		'tbGenSetADC
 		'
@@ -1664,7 +1667,7 @@ Partial Class VehicleForm
 		'
 		'lblGenSetADC
 		'
-		Me.lblGenSetADC.AutoSize = true
+		Me.lblGenSetADC.AutoSize = True
 		Me.lblGenSetADC.Location = New System.Drawing.Point(7, 110)
 		Me.lblGenSetADC.Name = "lblGenSetADC"
 		Me.lblGenSetADC.Size = New System.Drawing.Size(100, 13)
@@ -1680,7 +1683,7 @@ Partial Class VehicleForm
 		'
 		'lblGenSetRatio
 		'
-		Me.lblGenSetRatio.AutoSize = true
+		Me.lblGenSetRatio.AutoSize = True
 		Me.lblGenSetRatio.Location = New System.Drawing.Point(7, 84)
 		Me.lblGenSetRatio.Name = "lblGenSetRatio"
 		Me.lblGenSetRatio.Size = New System.Drawing.Size(79, 13)
@@ -1696,7 +1699,7 @@ Partial Class VehicleForm
 		'
 		'lblGenSetCount
 		'
-		Me.lblGenSetCount.AutoSize = true
+		Me.lblGenSetCount.AutoSize = True
 		Me.lblGenSetCount.Location = New System.Drawing.Point(7, 58)
 		Me.lblGenSetCount.Name = "lblGenSetCount"
 		Me.lblGenSetCount.Size = New System.Drawing.Size(83, 13)
@@ -1720,25 +1723,25 @@ Partial Class VehicleForm
 		Me.btnOpenGenSetEM.Size = New System.Drawing.Size(94, 21)
 		Me.btnOpenGenSetEM.TabIndex = 0
 		Me.btnOpenGenSetEM.Text = "Electric Machine"
-		Me.btnOpenGenSetEM.UseVisualStyleBackColor = true
+		Me.btnOpenGenSetEM.UseVisualStyleBackColor = True
 		'
 		'btnBrowseGenSetEM
 		'
-		Me.btnBrowseGenSetEM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.btnBrowseGenSetEM.Image = CType(resources.GetObject("btnBrowseGenSetEM.Image"),System.Drawing.Image)
+		Me.btnBrowseGenSetEM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.btnBrowseGenSetEM.Image = CType(resources.GetObject("btnBrowseGenSetEM.Image"), System.Drawing.Image)
 		Me.btnBrowseGenSetEM.Location = New System.Drawing.Point(406, 2)
 		Me.btnBrowseGenSetEM.Name = "btnBrowseGenSetEM"
 		Me.btnBrowseGenSetEM.Size = New System.Drawing.Size(24, 24)
 		Me.btnBrowseGenSetEM.TabIndex = 2
-		Me.btnBrowseGenSetEM.UseVisualStyleBackColor = true
+		Me.btnBrowseGenSetEM.UseVisualStyleBackColor = True
 		'
 		'tbGenSetEM
 		'
-		Me.tbGenSetEM.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.tbGenSetEM.Location = New System.Drawing.Point(109, 4)
+		Me.tbGenSetEM.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.tbGenSetEM.Location = New System.Drawing.Point(104, 4)
 		Me.tbGenSetEM.Name = "tbGenSetEM"
-		Me.tbGenSetEM.Size = New System.Drawing.Size(296, 20)
+		Me.tbGenSetEM.Size = New System.Drawing.Size(301, 20)
 		Me.tbGenSetEM.TabIndex = 1
 		'
 		'tpTorqueLimits
@@ -1751,7 +1754,7 @@ Partial Class VehicleForm
 		Me.tpTorqueLimits.Size = New System.Drawing.Size(648, 374)
 		Me.tpTorqueLimits.TabIndex = 2
 		Me.tpTorqueLimits.Text = "Torque Limits"
-		Me.tpTorqueLimits.UseVisualStyleBackColor = true
+		Me.tpTorqueLimits.UseVisualStyleBackColor = True
 		'
 		'gbPropulsionTorque
 		'
@@ -1761,23 +1764,23 @@ Partial Class VehicleForm
 		Me.gbPropulsionTorque.Name = "gbPropulsionTorque"
 		Me.gbPropulsionTorque.Size = New System.Drawing.Size(403, 52)
 		Me.gbPropulsionTorque.TabIndex = 2
-		Me.gbPropulsionTorque.TabStop = false
+		Me.gbPropulsionTorque.TabStop = False
 		Me.gbPropulsionTorque.Text = "Propulsion Torque Limit"
 		'
 		'btnPropulsionTorqueLimit
 		'
-		Me.btnPropulsionTorqueLimit.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.btnPropulsionTorqueLimit.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.btnPropulsionTorqueLimit.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
 		Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(373, 18)
 		Me.btnPropulsionTorqueLimit.Name = "btnPropulsionTorqueLimit"
 		Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(24, 24)
 		Me.btnPropulsionTorqueLimit.TabIndex = 1
-		Me.btnPropulsionTorqueLimit.UseVisualStyleBackColor = true
+		Me.btnPropulsionTorqueLimit.UseVisualStyleBackColor = True
 		'
 		'tbPropulsionTorqueLimit
 		'
-		Me.tbPropulsionTorqueLimit.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.tbPropulsionTorqueLimit.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.tbPropulsionTorqueLimit.Location = New System.Drawing.Point(6, 20)
 		Me.tbPropulsionTorqueLimit.Name = "tbPropulsionTorqueLimit"
 		Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(365, 20)
@@ -1791,23 +1794,23 @@ Partial Class VehicleForm
 		Me.gbEMTorqueLimits.Name = "gbEMTorqueLimits"
 		Me.gbEMTorqueLimits.Size = New System.Drawing.Size(403, 52)
 		Me.gbEMTorqueLimits.TabIndex = 1
-		Me.gbEMTorqueLimits.TabStop = false
+		Me.gbEMTorqueLimits.TabStop = False
 		Me.gbEMTorqueLimits.Text = "Electric Machine Torque Limits"
 		'
 		'btnEmTorqueLimits
 		'
-		Me.btnEmTorqueLimits.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.btnEmTorqueLimits.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.btnEmTorqueLimits.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
 		Me.btnEmTorqueLimits.Location = New System.Drawing.Point(373, 17)
 		Me.btnEmTorqueLimits.Name = "btnEmTorqueLimits"
 		Me.btnEmTorqueLimits.Size = New System.Drawing.Size(24, 24)
 		Me.btnEmTorqueLimits.TabIndex = 1
-		Me.btnEmTorqueLimits.UseVisualStyleBackColor = true
+		Me.btnEmTorqueLimits.UseVisualStyleBackColor = True
 		'
 		'tbEmTorqueLimits
 		'
-		Me.tbEmTorqueLimits.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.tbEmTorqueLimits.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
 		Me.tbEmTorqueLimits.Location = New System.Drawing.Point(6, 19)
 		Me.tbEmTorqueLimits.Name = "tbEmTorqueLimits"
 		Me.tbEmTorqueLimits.Size = New System.Drawing.Size(365, 20)
@@ -1823,25 +1826,25 @@ Partial Class VehicleForm
 		Me.bgVehicleTorqueLimits.Name = "bgVehicleTorqueLimits"
 		Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(221, 227)
 		Me.bgVehicleTorqueLimits.TabIndex = 0
-		Me.bgVehicleTorqueLimits.TabStop = false
+		Me.bgVehicleTorqueLimits.TabStop = False
 		Me.bgVehicleTorqueLimits.Text = "ICE Torque Limits"
 		'
 		'lvTorqueLimits
 		'
-		Me.lvTorqueLimits.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.lvTorqueLimits.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.lvTorqueLimits.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader5, Me.ColumnHeader6})
-		Me.lvTorqueLimits.FullRowSelect = true
-		Me.lvTorqueLimits.GridLines = true
-		Me.lvTorqueLimits.HideSelection = false
+		Me.lvTorqueLimits.FullRowSelect = True
+		Me.lvTorqueLimits.GridLines = True
+		Me.lvTorqueLimits.HideSelection = False
 		Me.lvTorqueLimits.Location = New System.Drawing.Point(6, 19)
-		Me.lvTorqueLimits.MultiSelect = false
+		Me.lvTorqueLimits.MultiSelect = False
 		Me.lvTorqueLimits.Name = "lvTorqueLimits"
 		Me.lvTorqueLimits.Size = New System.Drawing.Size(209, 169)
 		Me.lvTorqueLimits.TabIndex = 7
-		Me.lvTorqueLimits.TabStop = false
-		Me.lvTorqueLimits.UseCompatibleStateImageBehavior = false
+		Me.lvTorqueLimits.TabStop = False
+		Me.lvTorqueLimits.UseCompatibleStateImageBehavior = False
 		Me.lvTorqueLimits.View = System.Windows.Forms.View.Details
 		'
 		'ColumnHeader5
@@ -1857,18 +1860,18 @@ Partial Class VehicleForm
 		'
 		'btAddMaxTorqueEntry
 		'
-		Me.btAddMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+		Me.btAddMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.btAddMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
 		Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(6, 193)
 		Me.btAddMaxTorqueEntry.Name = "btAddMaxTorqueEntry"
 		Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
 		Me.btAddMaxTorqueEntry.TabIndex = 4
-		Me.btAddMaxTorqueEntry.UseVisualStyleBackColor = true
+		Me.btAddMaxTorqueEntry.UseVisualStyleBackColor = True
 		'
 		'Label17
 		'
-		Me.Label17.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
-		Me.Label17.AutoSize = true
+		Me.Label17.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.Label17.AutoSize = True
 		Me.Label17.Location = New System.Drawing.Point(112, 190)
 		Me.Label17.Name = "Label17"
 		Me.Label17.Size = New System.Drawing.Size(106, 13)
@@ -1878,13 +1881,13 @@ Partial Class VehicleForm
 		'
 		'btDelMaxTorqueEntry
 		'
-		Me.btDelMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
+		Me.btDelMaxTorqueEntry.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
 		Me.btDelMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
 		Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(30, 193)
 		Me.btDelMaxTorqueEntry.Name = "btDelMaxTorqueEntry"
 		Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
 		Me.btDelMaxTorqueEntry.TabIndex = 5
-		Me.btDelMaxTorqueEntry.UseVisualStyleBackColor = true
+		Me.btDelMaxTorqueEntry.UseVisualStyleBackColor = True
 		'
 		'tpADAS
 		'
@@ -1895,52 +1898,39 @@ Partial Class VehicleForm
 		Me.tpADAS.Size = New System.Drawing.Size(648, 374)
 		Me.tpADAS.TabIndex = 3
 		Me.tpADAS.Text = "ADAS"
-		Me.tpADAS.UseVisualStyleBackColor = true
+		Me.tpADAS.UseVisualStyleBackColor = True
 		'
 		'gbADAS
 		'
-		Me.gbADAS.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left)  _
-            Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+		Me.gbADAS.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+			Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+		Me.gbADAS.Controls.Add(Me.pnEcoRoll)
 		Me.gbADAS.Controls.Add(Me.cbAtEcoRollReleaseLockupClutch)
 		Me.gbADAS.Controls.Add(Me.cbPcc)
-		Me.gbADAS.Controls.Add(Me.cbEcoRoll)
-		Me.gbADAS.Controls.Add(Me.Label22)
 		Me.gbADAS.Controls.Add(Me.cbEngineStopStart)
 		Me.gbADAS.Controls.Add(Me.lblPCC)
 		Me.gbADAS.Location = New System.Drawing.Point(6, 6)
 		Me.gbADAS.Name = "gbADAS"
-		Me.gbADAS.Size = New System.Drawing.Size(636, 143)
+		Me.gbADAS.Size = New System.Drawing.Size(636, 161)
 		Me.gbADAS.TabIndex = 0
-		Me.gbADAS.TabStop = false
+		Me.gbADAS.TabStop = False
 		Me.gbADAS.Text = "ADAS Options"
 		'
-		'cbAtEcoRollReleaseLockupClutch
+		'pnEcoRoll
 		'
-		Me.cbAtEcoRollReleaseLockupClutch.AutoSize = true
-		Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(138, 42)
-		Me.cbAtEcoRollReleaseLockupClutch.Name = "cbAtEcoRollReleaseLockupClutch"
-		Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(243, 17)
-		Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 3
-		Me.cbAtEcoRollReleaseLockupClutch.Text = "AT Gearbox: Eco-Roll Release Lockup Clutch"
-		Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = true
-		'
-		'cbPcc
-		'
-		Me.cbPcc.DisplayMember = "Value"
-		Me.cbPcc.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.cbPcc.FormattingEnabled = true
-		Me.cbPcc.Location = New System.Drawing.Point(138, 99)
-		Me.cbPcc.Name = "cbPcc"
-		Me.cbPcc.Size = New System.Drawing.Size(266, 21)
-		Me.cbPcc.TabIndex = 2
-		Me.cbPcc.ValueMember = "Key"
+		Me.pnEcoRoll.Controls.Add(Me.cbEcoRoll)
+		Me.pnEcoRoll.Controls.Add(Me.Label22)
+		Me.pnEcoRoll.Location = New System.Drawing.Point(0, 44)
+		Me.pnEcoRoll.Name = "pnEcoRoll"
+		Me.pnEcoRoll.Size = New System.Drawing.Size(300, 46)
+		Me.pnEcoRoll.TabIndex = 7
 		'
 		'cbEcoRoll
 		'
 		Me.cbEcoRoll.DisplayMember = "Value"
 		Me.cbEcoRoll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.cbEcoRoll.FormattingEnabled = true
-		Me.cbEcoRoll.Location = New System.Drawing.Point(138, 72)
+		Me.cbEcoRoll.FormattingEnabled = True
+		Me.cbEcoRoll.Location = New System.Drawing.Point(10, 20)
 		Me.cbEcoRoll.Name = "cbEcoRoll"
 		Me.cbEcoRoll.Size = New System.Drawing.Size(266, 21)
 		Me.cbEcoRoll.TabIndex = 1
@@ -1948,27 +1938,48 @@ Partial Class VehicleForm
 		'
 		'Label22
 		'
-		Me.Label22.AutoSize = true
-		Me.Label22.Location = New System.Drawing.Point(82, 75)
+		Me.Label22.AutoSize = True
+		Me.Label22.Location = New System.Drawing.Point(7, 5)
 		Me.Label22.Name = "Label22"
 		Me.Label22.Size = New System.Drawing.Size(50, 13)
 		Me.Label22.TabIndex = 6
 		Me.Label22.Text = "Eco-Roll:"
 		'
+		'cbAtEcoRollReleaseLockupClutch
+		'
+		Me.cbAtEcoRollReleaseLockupClutch.AutoSize = True
+		Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(238, 21)
+		Me.cbAtEcoRollReleaseLockupClutch.Name = "cbAtEcoRollReleaseLockupClutch"
+		Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(243, 17)
+		Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 3
+		Me.cbAtEcoRollReleaseLockupClutch.Text = "AT Gearbox: Eco-Roll Release Lockup Clutch"
+		Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = True
+		'
+		'cbPcc
+		'
+		Me.cbPcc.DisplayMember = "Value"
+		Me.cbPcc.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+		Me.cbPcc.FormattingEnabled = True
+		Me.cbPcc.Location = New System.Drawing.Point(10, 124)
+		Me.cbPcc.Name = "cbPcc"
+		Me.cbPcc.Size = New System.Drawing.Size(266, 21)
+		Me.cbPcc.TabIndex = 2
+		Me.cbPcc.ValueMember = "Key"
+		'
 		'cbEngineStopStart
 		'
-		Me.cbEngineStopStart.AutoSize = true
-		Me.cbEngineStopStart.Location = New System.Drawing.Point(138, 19)
+		Me.cbEngineStopStart.AutoSize = True
+		Me.cbEngineStopStart.Location = New System.Drawing.Point(10, 21)
 		Me.cbEngineStopStart.Name = "cbEngineStopStart"
 		Me.cbEngineStopStart.Size = New System.Drawing.Size(203, 17)
 		Me.cbEngineStopStart.TabIndex = 0
 		Me.cbEngineStopStart.Text = "Engine Stop/Start during vehicle stop"
-		Me.cbEngineStopStart.UseVisualStyleBackColor = true
+		Me.cbEngineStopStart.UseVisualStyleBackColor = True
 		'
 		'lblPCC
 		'
-		Me.lblPCC.AutoSize = true
-		Me.lblPCC.Location = New System.Drawing.Point(7, 102)
+		Me.lblPCC.AutoSize = True
+		Me.lblPCC.Location = New System.Drawing.Point(7, 108)
 		Me.lblPCC.Name = "lblPCC"
 		Me.lblPCC.Size = New System.Drawing.Size(125, 13)
 		Me.lblPCC.TabIndex = 3
@@ -1983,7 +1994,7 @@ Partial Class VehicleForm
 		Me.tpRoadSweeper.Size = New System.Drawing.Size(648, 374)
 		Me.tpRoadSweeper.TabIndex = 4
 		Me.tpRoadSweeper.Text = "PTO"
-		Me.tpRoadSweeper.UseVisualStyleBackColor = true
+		Me.tpRoadSweeper.UseVisualStyleBackColor = True
 		'
 		'pnPTO
 		'
@@ -2014,12 +2025,12 @@ Partial Class VehicleForm
 		Me.gbPTODrive.Name = "gbPTODrive"
 		Me.gbPTODrive.Size = New System.Drawing.Size(633, 55)
 		Me.gbPTODrive.TabIndex = 4
-		Me.gbPTODrive.TabStop = false
+		Me.gbPTODrive.TabStop = False
 		Me.gbPTODrive.Text = "Working operation settings (PTO mode 2)"
 		'
 		'Label27
 		'
-		Me.Label27.AutoSize = true
+		Me.Label27.AutoSize = True
 		Me.Label27.Location = New System.Drawing.Point(446, 24)
 		Me.Label27.Name = "Label27"
 		Me.Label27.Size = New System.Drawing.Size(20, 13)
@@ -2036,7 +2047,7 @@ Partial Class VehicleForm
 		'
 		'Label26
 		'
-		Me.Label26.AutoSize = true
+		Me.Label26.AutoSize = True
 		Me.Label26.Location = New System.Drawing.Point(189, 24)
 		Me.Label26.Name = "Label26"
 		Me.Label26.Size = New System.Drawing.Size(30, 13)
@@ -2053,7 +2064,7 @@ Partial Class VehicleForm
 		'
 		'Label25
 		'
-		Me.Label25.AutoSize = true
+		Me.Label25.AutoSize = True
 		Me.Label25.Location = New System.Drawing.Point(297, 24)
 		Me.Label25.Name = "Label25"
 		Me.Label25.Size = New System.Drawing.Size(68, 13)
@@ -2062,7 +2073,7 @@ Partial Class VehicleForm
 		'
 		'Label24
 		'
-		Me.Label24.AutoSize = true
+		Me.Label24.AutoSize = True
 		Me.Label24.Location = New System.Drawing.Point(7, 24)
 		Me.Label24.Name = "Label24"
 		Me.Label24.Size = New System.Drawing.Size(97, 13)
@@ -2076,7 +2087,7 @@ Partial Class VehicleForm
 		Me.btPTOCycleDrive.Name = "btPTOCycleDrive"
 		Me.btPTOCycleDrive.Size = New System.Drawing.Size(24, 24)
 		Me.btPTOCycleDrive.TabIndex = 6
-		Me.btPTOCycleDrive.UseVisualStyleBackColor = true
+		Me.btPTOCycleDrive.UseVisualStyleBackColor = True
 		'
 		'Label28
 		'
@@ -2094,7 +2105,7 @@ Partial Class VehicleForm
 		Me.btPTOCycle.Name = "btPTOCycle"
 		Me.btPTOCycle.Size = New System.Drawing.Size(24, 24)
 		Me.btPTOCycle.TabIndex = 3
-		Me.btPTOCycle.UseVisualStyleBackColor = true
+		Me.btPTOCycle.UseVisualStyleBackColor = True
 		'
 		'Label16
 		'
@@ -2112,7 +2123,7 @@ Partial Class VehicleForm
 		Me.btPTOLossMapBrowse.Name = "btPTOLossMapBrowse"
 		Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(24, 24)
 		Me.btPTOLossMapBrowse.TabIndex = 1
-		Me.btPTOLossMapBrowse.UseVisualStyleBackColor = true
+		Me.btPTOLossMapBrowse.UseVisualStyleBackColor = True
 		'
 		'Label7
 		'
@@ -2130,14 +2141,14 @@ Partial Class VehicleForm
 		Me.gbPTO.Name = "gbPTO"
 		Me.gbPTO.Size = New System.Drawing.Size(633, 61)
 		Me.gbPTO.TabIndex = 0
-		Me.gbPTO.TabStop = false
+		Me.gbPTO.TabStop = False
 		Me.gbPTO.Text = "PTO Design Variant"
 		'
 		'cbLegislativeClass
 		'
 		Me.cbLegislativeClass.DisplayMember = "Value"
 		Me.cbLegislativeClass.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-		Me.cbLegislativeClass.FormattingEnabled = true
+		Me.cbLegislativeClass.FormattingEnabled = True
 		Me.cbLegislativeClass.Location = New System.Drawing.Point(220, 140)
 		Me.cbLegislativeClass.Name = "cbLegislativeClass"
 		Me.cbLegislativeClass.Size = New System.Drawing.Size(52, 21)
@@ -2146,7 +2157,7 @@ Partial Class VehicleForm
 		'
 		'Label21
 		'
-		Me.Label21.AutoSize = true
+		Me.Label21.AutoSize = True
 		Me.Label21.Location = New System.Drawing.Point(32, 123)
 		Me.Label21.Name = "Label21"
 		Me.Label21.Size = New System.Drawing.Size(112, 13)
@@ -2155,9 +2166,9 @@ Partial Class VehicleForm
 		'
 		'lblTitle
 		'
-		Me.lblTitle.AutoSize = true
+		Me.lblTitle.AutoSize = True
 		Me.lblTitle.BackColor = System.Drawing.Color.White
-		Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+		Me.lblTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 18.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
 		Me.lblTitle.Location = New System.Drawing.Point(117, 34)
 		Me.lblTitle.Name = "lblTitle"
 		Me.lblTitle.Size = New System.Drawing.Size(166, 29)
@@ -2167,7 +2178,7 @@ Partial Class VehicleForm
 		'VehicleForm
 		'
 		Me.AcceptButton = Me.ButOK
-		Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
+		Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
 		Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
 		Me.CancelButton = Me.ButCancel
 		Me.ClientSize = New System.Drawing.Size(666, 625)
@@ -2189,78 +2200,80 @@ Partial Class VehicleForm
 		Me.Controls.Add(Me.Label5)
 		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.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+		Me.MaximizeBox = False
 		Me.Name = "VehicleForm"
 		Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
 		Me.Text = "F05_VEH"
-		Me.GroupBox6.ResumeLayout(false)
-		Me.GroupBox6.PerformLayout
-		Me.ToolStrip1.ResumeLayout(false)
-		Me.ToolStrip1.PerformLayout
-		Me.gbRetarderLosses.ResumeLayout(false)
-		Me.PnRt.ResumeLayout(false)
-		Me.PnRt.PerformLayout
-		Me.GroupBox8.ResumeLayout(false)
-		Me.GroupBox8.PerformLayout
-		Me.PnWheelDiam.ResumeLayout(false)
-		Me.PnWheelDiam.PerformLayout
-		Me.StatusStrip1.ResumeLayout(false)
-		Me.StatusStrip1.PerformLayout
-		Me.GroupBox1.ResumeLayout(false)
-		Me.GroupBox1.PerformLayout
-		Me.PnLoad.ResumeLayout(false)
-		Me.PnLoad.PerformLayout
-		Me.GrAirRes.ResumeLayout(false)
-		Me.PnCdATrTr.ResumeLayout(false)
-		Me.PnCdATrTr.PerformLayout
-		CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
-		Me.CmOpenFile.ResumeLayout(false)
-		Me.GroupBox3.ResumeLayout(false)
-		Me.gbAngledrive.ResumeLayout(false)
-		Me.pnAngledriveFields.ResumeLayout(false)
-		Me.pnAngledriveFields.PerformLayout
-		CType(Me.PicVehicle,System.ComponentModel.ISupportInitialize).EndInit
-		Me.tcVehicleComponents.ResumeLayout(false)
-		Me.tpGeneral.ResumeLayout(false)
-		Me.tpPowertrain.ResumeLayout(false)
-		Me.gbVehicleIdlingSpeed.ResumeLayout(false)
-		Me.Panel1.ResumeLayout(false)
-		Me.Panel1.PerformLayout
-		Me.gbTankSystem.ResumeLayout(false)
-		Me.gbTankSystem.PerformLayout
-		Me.tpElectricComponents.ResumeLayout(false)
-		Me.gbBattery.ResumeLayout(false)
-		Me.gbBattery.PerformLayout
-		Me.gpElectricMotor.ResumeLayout(false)
-		Me.gpElectricMotor.PerformLayout
-		Me.gbRatiosPerGear.ResumeLayout(false)
-		Me.gbRatiosPerGear.PerformLayout
-		Me.pnElectricMotor.ResumeLayout(false)
-		Me.pnElectricMotor.PerformLayout
-		Me.tpGensetComponents.ResumeLayout(false)
-		Me.tpGensetComponents.PerformLayout
-		Me.gbGenSet.ResumeLayout(false)
-		Me.gbGenSet.PerformLayout
-		Me.pnGenSetEM.ResumeLayout(false)
-		Me.pnGenSetEM.PerformLayout
-		Me.tpTorqueLimits.ResumeLayout(false)
-		Me.gbPropulsionTorque.ResumeLayout(false)
-		Me.gbPropulsionTorque.PerformLayout
-		Me.gbEMTorqueLimits.ResumeLayout(false)
-		Me.gbEMTorqueLimits.PerformLayout
-		Me.bgVehicleTorqueLimits.ResumeLayout(false)
-		Me.bgVehicleTorqueLimits.PerformLayout
-		Me.tpADAS.ResumeLayout(false)
-		Me.gbADAS.ResumeLayout(false)
-		Me.gbADAS.PerformLayout
-		Me.tpRoadSweeper.ResumeLayout(false)
-		Me.pnPTO.ResumeLayout(false)
-		Me.pnPTO.PerformLayout
-		Me.gbPTODrive.ResumeLayout(false)
-		Me.gbPTODrive.PerformLayout
-		Me.gbPTO.ResumeLayout(false)
-		Me.ResumeLayout(false)
+		Me.GroupBox6.ResumeLayout(False)
+		Me.GroupBox6.PerformLayout()
+		Me.ToolStrip1.ResumeLayout(False)
+		Me.ToolStrip1.PerformLayout()
+		Me.gbRetarderLosses.ResumeLayout(False)
+		Me.PnRt.ResumeLayout(False)
+		Me.PnRt.PerformLayout()
+		Me.GroupBox8.ResumeLayout(False)
+		Me.GroupBox8.PerformLayout()
+		Me.PnWheelDiam.ResumeLayout(False)
+		Me.PnWheelDiam.PerformLayout()
+		Me.StatusStrip1.ResumeLayout(False)
+		Me.StatusStrip1.PerformLayout()
+		Me.GroupBox1.ResumeLayout(False)
+		Me.GroupBox1.PerformLayout()
+		Me.PnLoad.ResumeLayout(False)
+		Me.PnLoad.PerformLayout()
+		Me.GrAirRes.ResumeLayout(False)
+		Me.PnCdATrTr.ResumeLayout(False)
+		Me.PnCdATrTr.PerformLayout()
+		CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.CmOpenFile.ResumeLayout(False)
+		Me.GroupBox3.ResumeLayout(False)
+		Me.gbAngledrive.ResumeLayout(False)
+		Me.pnAngledriveFields.ResumeLayout(False)
+		Me.pnAngledriveFields.PerformLayout()
+		CType(Me.PicVehicle, System.ComponentModel.ISupportInitialize).EndInit()
+		Me.tcVehicleComponents.ResumeLayout(False)
+		Me.tpGeneral.ResumeLayout(False)
+		Me.tpPowertrain.ResumeLayout(False)
+		Me.gbVehicleIdlingSpeed.ResumeLayout(False)
+		Me.Panel1.ResumeLayout(False)
+		Me.Panel1.PerformLayout()
+		Me.gbTankSystem.ResumeLayout(False)
+		Me.gbTankSystem.PerformLayout()
+		Me.tpElectricComponents.ResumeLayout(False)
+		Me.gbBattery.ResumeLayout(False)
+		Me.gbBattery.PerformLayout()
+		Me.gpElectricMotor.ResumeLayout(False)
+		Me.gpElectricMotor.PerformLayout()
+		Me.gbRatiosPerGear.ResumeLayout(False)
+		Me.gbRatiosPerGear.PerformLayout()
+		Me.pnElectricMotor.ResumeLayout(False)
+		Me.pnElectricMotor.PerformLayout()
+		Me.tpGensetComponents.ResumeLayout(False)
+		Me.tpGensetComponents.PerformLayout()
+		Me.gbGenSet.ResumeLayout(False)
+		Me.gbGenSet.PerformLayout()
+		Me.pnGenSetEM.ResumeLayout(False)
+		Me.pnGenSetEM.PerformLayout()
+		Me.tpTorqueLimits.ResumeLayout(False)
+		Me.gbPropulsionTorque.ResumeLayout(False)
+		Me.gbPropulsionTorque.PerformLayout()
+		Me.gbEMTorqueLimits.ResumeLayout(False)
+		Me.gbEMTorqueLimits.PerformLayout()
+		Me.bgVehicleTorqueLimits.ResumeLayout(False)
+		Me.bgVehicleTorqueLimits.PerformLayout()
+		Me.tpADAS.ResumeLayout(False)
+		Me.gbADAS.ResumeLayout(False)
+		Me.gbADAS.PerformLayout()
+		Me.pnEcoRoll.ResumeLayout(False)
+		Me.pnEcoRoll.PerformLayout()
+		Me.tpRoadSweeper.ResumeLayout(False)
+		Me.pnPTO.ResumeLayout(False)
+		Me.pnPTO.PerformLayout()
+		Me.gbPTODrive.ResumeLayout(False)
+		Me.gbPTODrive.PerformLayout()
+		Me.gbPTO.ResumeLayout(False)
+		Me.ResumeLayout(False)
 		Me.PerformLayout
 
 End Sub
@@ -2474,5 +2487,6 @@ End Sub
 	Friend WithEvents Label32 As Label
 	Friend WithEvents Label36 As Label
 	Friend WithEvents Label34 As Label
+	Friend WithEvents pnEcoRoll As Panel
 	'>>>>>>> VECTO_CERT/master
 End Class
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index 671152777634fd165c8c73f2dae879ae910cb0a6..7c4c7ad338e6175635a6b9cd82cae975d4974562 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -521,69 +521,121 @@ Public Class VehicleForm
 	Private Sub UpdateForm(vehType As VectoSimulationJobType)
 		VehicleType = vehType
 
-		gbVehicleIdlingSpeed.Enabled = True
-		gbTankSystem.Enabled = True
-		gbAngledrive.Enabled = True
-		tcVehicleComponents.TabPages.Remove(tpGensetComponents)
-		tcVehicleComponents.TabPages.Remove(tpElectricComponents)
+		If Not tcVehicleComponents.TabPages.Contains(tpElectricComponents) Then
+			tcVehicleComponents.TabPages.Insert(2, tpElectricComponents)
+			tpElectricComponents.BindingContext = BindingContext
+		End If
+		If Not tcVehicleComponents.TabPages.Contains(tpGensetComponents) Then
+			tcVehicleComponents.TabPages.Insert(3, tpGensetComponents)
+			tpGensetComponents.BindingContext = BindingContext
+		End If
+		If Not tcVehicleComponents.TabPages.Contains(tpTorqueLimits) Then
+			tcVehicleComponents.TabPages.Insert(4, tpTorqueLimits)
+			tpTorqueLimits.BindingContext = BindingContext
+		End If
+
 
 		Select Case vehType
 			Case VectoSimulationJobType.ConventionalVehicle
 				lblTitle.Text = "Conventional Vehicle"
+
+				'Powertrain ---------------------------------------------------------------
+				gbVehicleIdlingSpeed.Enabled = True
+				gbTankSystem.Enabled = True
 				gbRetarderLosses.Enabled = True
-				cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition) _
-					(Function(t) t.GetLabel(), Function(t) t = PowertrainPosition.HybridPositionNotSet)
-				cbEngineStopStart.Enabled = True
-				cbEcoRoll.DataSource = EnumHelper.GetKeyValuePairs(Of EcoRollType)(Function(t) t.GetName())
-				cbEcoRoll.Enabled = True
+				gbAngledrive.Enabled = True
+
+				'Electric Powertrain Components -------------------------------------------
+				tcVehicleComponents.TabPages.Remove(tpElectricComponents)
+
+				'GenSet Components --------------------------------------------------------
+				tcVehicleComponents.TabPages.Remove(tpGensetComponents)
+
+				'Torque Limits ------------------------------------------------------------
 				gbEMTorqueLimits.Enabled = False
+
+				'ADAS ---------------------------------------------------------------------
+				cbEngineStopStart.Visible = True
+				cbAtEcoRollReleaseLockupClutch.Visible = True
+				pnEcoRoll.Visible = True
+
 			Case VectoSimulationJobType.ParallelHybridVehicle
-				gbRetarderLosses.Enabled = True
 				lblTitle.Text = "Parallel Hybrid Vehicle"
+
+				'Powertrain ---------------------------------------------------------------
+				gbVehicleIdlingSpeed.Enabled = True
+				gbTankSystem.Enabled = True
+				gbRetarderLosses.Enabled = True
+				gbAngledrive.Enabled = True
+
+				'Electric Powertrain Components -------------------------------------------
 				cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition) _
 					(Function(t) t.GetLabel(), Function(x) x.IsParallelHybrid())
+
+				'GenSet Components --------------------------------------------------------
+				tcVehicleComponents.TabPages.Remove(tpGensetComponents)
+
+				'Torque Limits ------------------------------------------------------------
 				gbEMTorqueLimits.Enabled = True
-				cbEcoRoll.Enabled = True
-				If Not tcVehicleComponents.TabPages.Contains(tpElectricComponents) Then
-					tcVehicleComponents.TabPages.Insert(2, tpElectricComponents)
-					tpElectricComponents.BindingContext = BindingContext
-				End If
+
+				'ADAS ---------------------------------------------------------------------
+				cbEngineStopStart.Visible = True
+				cbAtEcoRollReleaseLockupClutch.Visible = False
+				pnEcoRoll.Visible = False
+				cbEcoRoll.SelectedIndex = 0
+
 			Case VectoSimulationJobType.SerialHybridVehicle
-				gbRetarderLosses.Enabled = False
 				lblTitle.Text = "Serial Hybrid Vehicle"
+
+				'Powertrain ---------------------------------------------------------------
+				gbVehicleIdlingSpeed.Enabled = True
+				gbTankSystem.Enabled = True
+				gbRetarderLosses.Enabled = False
+				gbAngledrive.Enabled = True
+
+				'Electric Powertrain Components -------------------------------------------
 				cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition) _
 					(Function(t) t.GetLabel(), Function(x) x.IsSerialHybrid())
-				tpTorqueLimits.Enabled = False
-				cbEngineStopStart.Checked = False
-				cbEngineStopStart.Enabled = False
-				cbEcoRoll.DataSource = {New With {.Key = EcoRollType.None, .Value = EcoRollType.None.GetName()}}
-				cbEcoRoll.Enabled = False
+
+				'GenSet Components --------------------------------------------------------
+				'-
+
+				'Torque Limits ------------------------------------------------------------
 				gbEMTorqueLimits.Enabled = False
-				If Not tcVehicleComponents.TabPages.Contains(tpElectricComponents) Then
-					tcVehicleComponents.TabPages.Insert(2, tpElectricComponents)
-					tpElectricComponents.BindingContext = BindingContext
-				End If
-				If Not tcVehicleComponents.TabPages.Contains(tpGensetComponents) Then
-					tcVehicleComponents.TabPages.Insert(3, tpGensetComponents)
-				End If
+				tpTorqueLimits.Enabled = False
+
+				'ADAS ---------------------------------------------------------------------
+				cbEngineStopStart.Visible = False
+				cbAtEcoRollReleaseLockupClutch.Visible = False
+				pnEcoRoll.Visible = False
+				cbEcoRoll.SelectedIndex = 0
+
 			Case VectoSimulationJobType.BatteryElectricVehicle
-				gbRetarderLosses.Enabled = False
 				lblTitle.Text = "Battery Electric Vehicle"
+
+				'Powertrain ---------------------------------------------------------------
 				gbVehicleIdlingSpeed.Enabled = False
 				gbTankSystem.Enabled = False
+				gbRetarderLosses.Enabled = False
 				gbAngledrive.Enabled = False
-				tpTorqueLimits.Enabled = False
+
+				'Electric Powertrain Components -------------------------------------------
 				cbEmPos.DataSource = EnumHelper.GetKeyValuePairs(Of PowertrainPosition) _
 					(Function(t) t.GetLabel(), Function(x) x.IsBatteryElectric())
-				cbEngineStopStart.Checked = False
-				cbEngineStopStart.Enabled = False
-				cbEcoRoll.DataSource = {New With {.Key = EcoRollType.None, .Value = EcoRollType.None.GetName()}}
-				cbEcoRoll.Enabled = False
+
+				'GenSet Components --------------------------------------------------------
+				tcVehicleComponents.TabPages.Remove(tpGensetComponents)
+
+				'Torque Limits ------------------------------------------------------------
 				gbEMTorqueLimits.Enabled = False
-				If Not tcVehicleComponents.TabPages.Contains(tpElectricComponents) Then
-					tcVehicleComponents.TabPages.Insert(2, tpElectricComponents)
-					tpElectricComponents.BindingContext = BindingContext
-				End If
+				tcVehicleComponents.TabPages.Remove(tpTorqueLimits)
+
+				'ADAS ---------------------------------------------------------------------
+				cbEngineStopStart.Visible = False
+				cbAtEcoRollReleaseLockupClutch.Visible = False
+				pnEcoRoll.Visible = False
+				cbEcoRoll.SelectedIndex = 0
+
 			Case Else
 				If Not tcVehicleComponents.TabPages.Contains(tpElectricComponents) Then
 					tcVehicleComponents.TabPages.Insert(2, tpElectricComponents)
@@ -593,8 +645,11 @@ Public Class VehicleForm
 					tcVehicleComponents.TabPages.Insert(3, tpGensetComponents)
 					tpGensetComponents.BindingContext = BindingContext
 				End If
-
+				pnEcoRoll.Visible = True
+				cbAtEcoRollReleaseLockupClutch.Visible = True
+				cbEngineStopStart.Visible = True
 		End Select
+
 	End Sub
 
 	Private Function CreateListViewItem(axleNumber As Integer, share As Double, twinTire As Boolean, rrc As Double,
@@ -1247,7 +1302,7 @@ Public Class VehicleForm
 			gbRetarderLosses.Enabled = False
 			TbRtRatio.Text = ""
 			TbRtPath.Text = ""
-			CbRtType.SelectedIndex = 0
+			CbRtType.SelectedIndex = -1
 			CType(CbRtType.DataSource, DataView).RowFilter = $"Key <> {CInt(RetarderType.AxlegearInputRetarder)}"
 		ElseIf PowertrainPosition.BatteryElectricE3.Equals(cbEmPos.SelectedValue) Then
 			gbRetarderLosses.Enabled = True
diff --git a/VECTO/Input Files/HybridStrategyParams.vb b/VECTO/Input Files/HybridStrategyParams.vb
index b560bfa0ae54df5f42be292b5a484c1d65af1aa0..04af1dc246ebe1988b093c1ef0252502146869f4 100644
--- a/VECTO/Input Files/HybridStrategyParams.vb	
+++ b/VECTO/Input Files/HybridStrategyParams.vb	
@@ -41,7 +41,7 @@ Public Class HybridStrategyParams
         End If
 
         Try
-            Dim writer As JSONFileWriter = New JSONFileWriter()
+            Dim writer = New JSONFileWriter()
             writer.SaveStrategyParameters(Me, _filePath, Cfg.DeclMode)
 
         Catch ex As Exception
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index c2e705429b25d160239cf2fb5ea2750da45b214b..80c3048ca9208e3e6a992e75997d868f19c94a9c 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -8,10 +8,8 @@
     <OptionStrict>On</OptionStrict>
     <UseWindowsForms>true</UseWindowsForms>
     <MyType>WindowsForms</MyType>
-    <!--<TargetFrameworks>net45;net48;net5.0-windows</TargetFrameworks>-->
-    <!-- The GUI Editor of Visual Studio 2019 has problems with multitargets.
-         If you want to change GUI stuff, then only use one target (uncomment the following line): -->
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
+    <TargetFrameworks Condition="'$(Configuration)' == 'Release'">net45;net48;net6.0-windows</TargetFrameworks>
     <DefineTrace>false</DefineTrace>
     <DefineConstants />
   </PropertyGroup>
@@ -34,7 +32,7 @@
     <Reference Include="System.Windows.Forms.DataVisualization" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
     <PackageReference Include="System.Data.SqlClient">
       <Version>4.8.3</Version>
     </PackageReference>
diff --git a/VECTO3GUI2020/VECTO3GUI2020.csproj b/VECTO3GUI2020/VECTO3GUI2020.csproj
index 007757b3f5667d997cc95cd818402ec46ba7dc2a..49a079e8ee588fb2c2db90ce38466ea75590eb38 100644
--- a/VECTO3GUI2020/VECTO3GUI2020.csproj
+++ b/VECTO3GUI2020/VECTO3GUI2020.csproj
@@ -10,7 +10,7 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-    <TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
 
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index 28d399122f5e3c47736429da2b291d609a39c775..709802e110259afb2ea612c12eeab84f033a3b2e 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -7,7 +7,7 @@
     <OptionCompare>Binary</OptionCompare>
     <OptionStrict>On</OptionStrict>
     <OptionInfer>On</OptionInfer>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
 
diff --git a/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj b/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
index 5c5f2a81a41420b230453450d9c3350b66f14005..101e922cd35337d3af8f5798aebb2386c55f2884 100644
--- a/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
+++ b/Vecto3GUI2020Test/Vecto3GUI2020Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
 
diff --git a/VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs b/VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs
index bd79c84873e7f77b5150d9436a1d519bfcd29867..9c1e08b9ca2e514378e6049e2bac91c79df26a44 100644
--- a/VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs
+++ b/VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs
@@ -278,9 +278,9 @@ namespace TUGraz.VectoCommon.Utils
 
 		[DebuggerStepThrough]
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
-		public static string ToGUIFormat(this double self)
+		public static string ToGUIFormat(this double self, int decimals = 12)
 		{
-			return self.ToString(CultureInfo.InvariantCulture);
+			return Math.Round(self, decimals).ToString(CultureInfo.InvariantCulture);
 		}
 
 		[DebuggerStepThrough]
diff --git a/VectoCommon/VectoCommon/VectoCommon.csproj b/VectoCommon/VectoCommon/VectoCommon.csproj
index ed662b4f867780a517523d66324d9280a8355bb9..157a10ad21b5f0c50a7fbbe0aeff1af3af72eb44 100644
--- a/VectoCommon/VectoCommon/VectoCommon.csproj
+++ b/VectoCommon/VectoCommon/VectoCommon.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>TUGraz.VectoCommon</RootNamespace>
     <AssemblyName>VectoCommon</AssemblyName>
-    <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
+    <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
 
diff --git a/VectoCommon/VectoHashing/VectoHashing.csproj b/VectoCommon/VectoHashing/VectoHashing.csproj
index 967277c8d796529df42f81bcb8a915ba69a288ad..f833fa86eb34d4986fa7a4a941b5fefba4267658 100644
--- a/VectoCommon/VectoHashing/VectoHashing.csproj
+++ b/VectoCommon/VectoHashing/VectoHashing.csproj
@@ -6,7 +6,7 @@
 
     <RootNamespace>TUGraz.VectoHashing</RootNamespace>
     <AssemblyName>VectoHashing</AssemblyName>
-    <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
+    <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
 
@@ -21,7 +21,7 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="System.Security.Cryptography.Xml">
       <Version>6.0.0</Version>
     </PackageReference>
diff --git a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
index fea05be9f6d088f78ed5b9d67418c9daca099923..762bdaa894b986a0b04bd057a1156e6ec08b296f 100644
--- a/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
+++ b/VectoCommon/VectoHashingTest/VectoHashingTest.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>VectoHashingTest</RootNamespace>
     <AssemblyName>VectoHashingTest</AssemblyName>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
 
diff --git a/VectoConsole/App.config b/VectoConsole/App.config
index 8ef55200ef768a6f524eb6abb8e17dc9059a5294..f3e7e3a3ca744804e9aff833998fa34e9908842b 100644
--- a/VectoConsole/App.config
+++ b/VectoConsole/App.config
@@ -3,15 +3,6 @@
 	<configSections>
 		<section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog" />
 	</configSections>
-	<runtime>
-		<loadFromRemoteSources enabled="true" />
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-3.3.4.0" newVersion="3.3.4.0" />
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
 	<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd" autoReload="false" throwExceptions="false" internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
 		<targets async="true">
 			<target xsi:type="Console" name="ConsoleLogger" error="true" />
diff --git a/VectoConsole/Program.cs b/VectoConsole/Program.cs
index 9019335655d7860fd03c48f629bc4363587f2a97..7af3dd2e2c22ea290fe667a63c4259b20ff7de66 100644
--- a/VectoConsole/Program.cs
+++ b/VectoConsole/Program.cs
@@ -146,7 +146,7 @@ Examples:
 
 				var config = LogManager.Configuration;
 				if (config is null) {
-					// in .net5.0 the app is exported as dll, therefore the default config lookup of nlog doesn't work.
+					// in .net6.0 the app is exported as dll, therefore the default config lookup of nlog doesn't work.
 					LogManager.LoadConfiguration($"{Assembly.GetExecutingAssembly().GetName().Name}.dll.config");
 					config = LogManager.Configuration;
 				}
diff --git a/VectoConsole/VectoConsole.csproj b/VectoConsole/VectoConsole.csproj
index 7f48f347ae5be890cb3fa022303fcee68cdca42b..cf2935dcb40b6f82b1d797fb0bf8e72cf50e96cf 100644
--- a/VectoConsole/VectoConsole.csproj
+++ b/VectoConsole/VectoConsole.csproj
@@ -4,7 +4,7 @@
     <RootNamespace>VectoConsole</RootNamespace>
     <AssemblyName>vectocmd</AssemblyName>
     <ApplicationIcon>VECTO.ico</ApplicationIcon>
-    <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
+    <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
 
diff --git a/VectoCore/ModelbasedTests/ModelbasedTests.csproj b/VectoCore/ModelbasedTests/ModelbasedTests.csproj
index c95a2d9eed184a25ecb845febb21e1160cca065d..b547fa8f6f44ba3421888e9f7153b3617aeea0bc 100644
--- a/VectoCore/ModelbasedTests/ModelbasedTests.csproj
+++ b/VectoCore/ModelbasedTests/ModelbasedTests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>TUGraz.VectoCore.ModelbasedTests</RootNamespace>
     <AssemblyName>ModelbasedTests</AssemblyName>
-    <TargetFrameworks>net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
   
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONHybridStrategyParameters.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONHybridStrategyParameters.cs
index 2309583af933986c7985a94a16fdf31e9ad5d700..b4b766fc89e7ed1a18675235b1f2f055fdf05ab9 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONHybridStrategyParameters.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONHybridStrategyParameters.cs
@@ -54,7 +54,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 		public Second AuxBufferChargeTime => null;
 		public double ICEStartPenaltyFactor => double.NaN;
 		public double CostFactorSOCExpponent => double.NaN;
-		public double GensetMinOptPowerFactor => Body.GetEx<double>("GensetMinOptPowerFactor");
+		public double GensetMinOptPowerFactor => 0; //Body.GetEx<double>("GensetMinOptPowerFactor");
 		
 		#endregion
 	}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
index 669132a8cf95aa2fc1905d6f7afd204b7e29dcde..627b76836238251d1788b9801e01521bed48afdc 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Strategies/HybridStrategy.cs
@@ -1446,13 +1446,13 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Strategies
 			var result = ResponseEmOff;
 			if (DataBus.DriverInfo.PCCState.IsOneOf(PCCStates.UseCase1, PCCStates.UseCase2)) {
 				result.ICEOff = AllowICEOff(absTime);
-				result.Setting.CombustionEngineOn = !result.ICEOff;
 
 				if (DataBus.PowertrainInfo.ElectricMotorPositions.Contains(PowertrainPosition.HybridP1)) {
 					// special logic for HybridP1 (VECTO-1493)
 					result.Setting.GearboxInNeutral = true;
 					result.ICEOff &= ModelData.VehicleData.ADAS.EngineStopStart;
 				}
+				result.Setting.CombustionEngineOn = !result.ICEOff;
 			}
 			eval.Add(result);
 		}
diff --git a/VectoCore/VectoCore/Utils/SearchAlgorithm.cs b/VectoCore/VectoCore/Utils/SearchAlgorithm.cs
index 11ff01cdc000f8a8aedcac9716c33771f9973920..d821eaf669d44e01054d220d36b619588a79c13d 100644
--- a/VectoCore/VectoCore/Utils/SearchAlgorithm.cs
+++ b/VectoCore/VectoCore/Utils/SearchAlgorithm.cs
@@ -181,7 +181,7 @@ namespace TUGraz.VectoCore.Utils
 			log.Error("debug: {0}", debug);
 
 			WriteSearch(debug, "LineSearch.csv");
-			throw new VectoSearchFailedException("Failed to find operating point! points: {0}", debug);
+			throw new VectoSearchFailedException("Failed to find operating point! points: {0}", debug.LocalData.Select(d => d.b).Join());
 		}
 
 		[Conditional("TRACE")]
@@ -298,7 +298,7 @@ namespace TUGraz.VectoCore.Utils
 			log.Error("debug: {0}", debug);
 #endif
 			WriteSearch(debug, "InterpolateSearch.csv");
-			throw new VectoSearchFailedException("Failed to find operating point! points: {0}", debug);
+			throw new VectoSearchFailedException("Failed to find operating point! points: {0}", debug.LocalData.Select(d => d.b).Join());
 		}
 
 		[Conditional("TRACE")]
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index c1290de9f64efe895a30aff06448a4c3b040bd8e..b12fffd2d0d04bfce81c117c2bb58f13e9c90136 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>TUGraz.VectoCore</RootNamespace>
     <AssemblyName>VectoCore</AssemblyName>
-    <TargetFrameworks>net45;net48;net5.0</TargetFrameworks>
+    <TargetFrameworks>net45;net48;net6.0</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>
   <ItemGroup>
diff --git a/VectoCore/VectoCoreTest/NUnitConfiguration.cs b/VectoCore/VectoCoreTest/NUnitConfiguration.cs
new file mode 100644
index 0000000000000000000000000000000000000000..f3faab02f2369752d9cc49d1828c95f234c64fb1
--- /dev/null
+++ b/VectoCore/VectoCoreTest/NUnitConfiguration.cs
@@ -0,0 +1,4 @@
+using NUnit.Framework;
+[assembly: Parallelizable(ParallelScope.All)]
+//[assembly: LevelOfParallelism(4)]
+//[assembly: Timeout(1000)]
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/VectoCoreTest.csproj b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
index c7cfb795a38b03b75a40aed7d5e2a17444b9ee94..2d2271a7187577126581344c79abc78d16ffefad 100644
--- a/VectoCore/VectoCoreTest/VectoCoreTest.csproj
+++ b/VectoCore/VectoCoreTest/VectoCoreTest.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <RootNamespace>TUGraz.VectoCore.Tests</RootNamespace>
     <AssemblyName>VectoCoreTest</AssemblyName>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <DefineConstants />
   </PropertyGroup>