diff --git a/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md b/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md
index 2f65fef4a468ce39585b7201abe1bb0a6d5e82a9..bfbbcf306b1761553095b007377598574564b92a 100644
--- a/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md	
+++ b/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md	
@@ -51,9 +51,14 @@ $\textrm{E\_BusAux\_ES\_consumed} = \sum{\textrm{P\_BusAux\_ES\_consumed} \cdot
 
 $\textrm{E\_BusAux\_ES\_gen} =  \sum{\textrm{P\_BusAux\_ES\_gen} \cdot dt}$
 
-$\Delta\textrm{E\_BusAux\_ES\_mech} = (\textrm{E\_BusAux\_ES\_consumed} - \textrm{E\_BusAux\_ES\_gen}) / \textrm{AlternatorEfficiency} / \textrm{AlternatorGearEfficiency}$
+$\Delta\textrm{E\_BusAux\_ES\_mech} = \begin{cases}
+0 & \textrm{if Alternator type is none} \\
+\frac{\textrm{E\_BusAux\_ES\_consumed} - \textrm{E\_BusAux\_ES\_gen}}{\textrm{AlternatorEfficiency} \cdot \textrm{AlternatorGearEfficiency}} & \textrm{otherwise}
+\end{cases}$
 
-$\textbf{\textrm{FC\_BusAux\_ES}} = \textrm{E\_BusAux\_ES} \cdot k_\textrm{engline}$
+$\textbf{\textrm{FC\_BusAux\_ES}} = \Delta\textrm{E\_BusAux\_ES\_mech} \cdot k_\textrm{engline}$
+
+*Note:* In case the alternator is simulated without alternator, the power generated by the alternator is always 0 and the auxiliaries are supplied from the high-voltage REESS via the DC/DC converter. In this case, no correction for the electric system needs to be applied because the energy is either taken from the REESS already during the simulation or corrected via DCDC_missing (see below).
 
 ####Bus Auxiliaries Correction -- Electric System Supply from REESS
 
@@ -129,9 +134,9 @@ $\textrm{E\_WHR\_el} = \sum{\textrm{P\_WHR\_el} \cdot dt}$
 
 $$
 \textrm{E\_WHR\_el\_mech} = \begin{cases}
-\textrm{E\_WHR\_el} / \textrm{AlternatorEfficiency} & if conventional truck \\
-\textrm{E\_WHR\_el} / \eta_{\textrm{EM}_\textrm{chg}} & if bus with ES connected to REES and smart alternator \\
-\textrm{E\_WHR\_el} / \textrm{BusAlternatorEfficiency} & otherwise
+\textrm{E\_WHR\_el} / \textrm{AlternatorEfficiency} & \textrm{if conventional truck} \\
+\textrm{E\_WHR\_el} / \eta_{\textrm{EM}_\textrm{chg}} & \textrm{if bus with ES connected to REES and smart alternator} \\
+\textrm{E\_WHR\_el} / \textrm{BusAlternatorEfficiency} & \textrm{otherwise}
 \end{cases}
 $$
 
diff --git a/Documentation/User Manual/help.html b/Documentation/User Manual/help.html
index 426d2e8897a98919432427e7bd7ad86faf49c3da..14f93f3846a781c5a3ef07e0f130458bd78a2b7a 100644
--- a/Documentation/User Manual/help.html	
+++ b/Documentation/User Manual/help.html	
@@ -2658,8 +2658,9 @@ Example: “Gears\Gear1.vtlm” points to the “Gears” subdirectory of the Ge
 <p>The bus auxiliaries electric system correction is used for conventional vehicles with ESS and buses with smart electric system in the same way.</p>
 <p><img style="vertical-align:middle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAdMAAAAaBAMAAAAeQKtWAAAAMFBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAIondmbvvMs0QZnarVESUG+88AAAACXBIWXMAAA7EAAAOxAGVKw4bAAAEUklEQVRYCd1XbWhbVRh+btr09uY2H0zwh6C5hPqBDLL9EEHEhuqQTUqDoOAEFxUmAzHBrRNhkKi/9M8uZYzNP7ktK2I/aJnij2lZ/eNnWaMbKttag4jK/ixRuxLW7vq+5+Tkoy30jzeBvKU573PyvPc5zznn3nMDtDLStw5zpF3XLbZStw1as6tSVJt2k22Qb6Wk33WqcqfKrdRtg5aRrjm80nr5XQOD/c/zbjIe+De2r9A4gD67EVFe5f7YP9bE28RqhH+VGhFw8x+FfTZG04P9XzP2XHpEznAc0HMs6EtBu82JivycylQruEELRx3Vs0OrbbLqcxMNFXS5bJGx19KhFM6SDOnBon+YKWCYExUTe1SmWsHtsuFzVM8O7WarOLnRUPEZ0Jdi7LW0uYAXSSYOAx8rvbjNWTXmazeW6hHccASao3p2aLdYPe1G6iVktbvCkK16Ke13sEYycZgQBlnvEepQoRVeUalqBbf3BaBhvOq7bdstVoNurk5sWlUvpcMRPUWycZyR4mR1JIGRcuiQHVieoKnGk5BwYlV71WKS4Orud3Ltf5vK4NpUUT90z/UiZq4mRelIeWbow+kiApP7EXp4piSvXf8c/ruek9VogaG30ub8T6GH3nVo+LElKW5uLI87MMqI2m+ij61mMxLiWXwrOJJ7whXDDSaRMy0cQH5OT+kWFkSpcRvHHXoMxHAU0wiw1e5FDkuqdDW8J12c/Fw8geGZtNA8iEX4HUrj8NEnBW/gb4AywvYvER14Cz0JCXH6hlzHKlcfdojfU9SO5G1EES4aleA7yIhS3EGeMNnuensNWzYwNPcI1cq4qBLPpO/KAIEkvgc9YNhqkP4oWC/riPH23foSOB+7n3rYOUJvMKHK1WidcgSyZP9XkFG6TAVLr0cklwoiZH1j+fJKZRurmF2nWhlNVj2RPl6kJXHwGv5gRT5AApyw1XCCxktLde+SjTnod9gqQe05JlS5Jh3EewjcbLKqXa9ILs+NUeGdGyptZ7Wvftw0WfVMOhrRS9ithr/CSW1Vo/YYuguhDPA4W43aMHvnmCGmZaWXTCwQyNOdTN9lbV7VQARDkiutanSInC1Lq033KnotqpXRZFWs6v8tzTpZmMniB0ZBDN/Yy130yoL3gCcwmzkHX8ZPXbTiDJEw5A4mbOwNW/DTNMCXxJjPwjO8YcuBBB6UXNoGtIExiGDkC5ji2CRyPRbrKW8oEZ5K9+CM5TxKe3FXejD2VSnsuhV+B7aA3yezL03NzIROvo/AwEEBP1nTD++n35iS6xs9/zSooDQ+mcHUeEEfvnRs/caFqwXBPbb+5/ClE+uZwIWPEJhfXuVJaQwzV0OjA0Oc04U9lQ4N/XzAvvZDTbZlyWW7ZVJtFtJfbvMAWid/d7F1Wm1WekzpV99bFOy81m8pT+dU0qntPmXsFL2ddHRUTxrjvgk31dFG6V2SztBqWB1u9dOnatH64/U/IbZOnS+GAp0AAAAASUVORK5CYII=" alt="\textrm{E\_BusAux\_ES\_consumed} = \sum{\textrm{P\_BusAux\_ES\_consumed} \cdot dt}" title="\textrm{E\_BusAux\_ES\_consumed} = \sum{\textrm{P\_BusAux\_ES\_consumed} \cdot dt}" /></p>
 <p><img style="vertical-align:middle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXAAAAAaBAMAAABcLxqEAAAAMFBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAIondmbvvMs0QZnarVESUG+88AAAACXBIWXMAAA7EAAAOxAGVKw4bAAAEZUlEQVRYCdVXXYgbVRT+ZrLpZDL5GSuICHXHWC20QnYfRBBrw2qRgpIqKLgP3ahY0Ac3tLv1RdioL/apo9Tii+y0bJBmXTasCtJ2YX0p/pQ2tiJ9MDbUouBLk9qu1O52PPfeuclk3WDHJrCekNxzznz3O989c3MnAXpgo4u7mY26rlvrAX3vKGevCW7lU3dn76r0gDnsOh7rwUYP6HtHqY829f7Qsyrrtw1tfIHdUP3Bq6ntFX+dmO2PyPewZzcebsOtQFF4+Q+ZU21O/HSeEt2qoI2YjD4NaAXmqDkoN5gjbbIsPTlybNzCXkdmVh9VN+O7oNah3WRxtyr8Ct3mwmExWiMHZJkjrTggPTmScFghG6ojMx3GA8u+C4z4JIu7VeEEwtTTNHQclbRpWknT5ps7VaY4NmlCcWSmw3jINVtXuF5GzJxuVBhGMs+EG+ByGe3DrXJQKi/7Iu5ybORFwJOlrwTIOO4WpCv0NjsesIKQ1uLiXgP7aEzjI5En4eMZjDcSI3a0WqR6eAIiLF5TXrEYiGM191u+UGyZm7eipR3ayD0/1dhVv2WvtCIiVvjWCVxBPb7lLEpT9nhj5nST73g1d/G9zSQmdUbkjOXqEQd6A/32HsSY8Im8CPEcvuEYgX3L5apUK1ZGCnsxWdZydLnvFDOLAxHyPTONv6ZP0K0lxoAViP07qJY2oN/gPebUYSe2gGFy01B5gu/Ar4EGkvZ5UwPexLqMCHHod9FjD6tlHZoSqhgFWmYon6zp1wVF61NxX2sGRt1zqeMIUgFb8SUmTTyCm5gkBXey5RdB/WLfvjTi9CJjtBMOFx5b/AqYSz1AGbYOJN5gAA+rUHMLFMTK6kJ8uXquQt/WfwjH7BJBhLUJD1KB+v0QLlSrW4UK7KsR4etYl0/kyGFHXJTeXHgyQxha3IYzNsr89OWh8jwDeFiDDv4BChKDd9tR1sxVhcdaB2Kb8CAV8Msd+zHLCvP2MQdKAxNQF8hjwn+md6vj/fZh9FUSdF8eY1P6bRiRMkMIbIQ0L1BgxGtQqNW2J7xtjyNiEURYm3De8VusgDIJo/K6T7hWxxeJiPMxF6MPsgr0XMO7wOOYzU9BzYcpRYtiITK62CsU64NJC2FaFEHoYwhxM2nSVl9pp1oJenIKC1oBm2hen4Xv2TYwPZKc/k40lC9j/ehQ6mQ96brX2W8VC7hUmtg1PTOTOLAf0W3DPPzsT233DvpxLbDqB3NPgSY03MVdiB77RMueHluqebRyMArSg37/1QoFNP9fKhDnFa5GVqj3u6/WMF3Kjy39lpXn4aXq2NH4vFxGs0oA50Pz/R87zj9nB2DqBNWf1Te81Onif88fo9vIWrmaaV2pZzjAM6vR315uHIh06vhdtdvjFrO1ncDb3SBq59A2l+5rz7SiR6XrPdxkGHDcUzrSqTUBmW4RHrYkcEo6/49xu5R5kP+BkNGaH72zUL+36ObWvFi/wMt0Zntm+fNr3v/8yabZvRL7NzKYtaPI6kgNAAAAAElFTkSuQmCC" alt="\textrm{E\_BusAux\_ES\_gen} = \sum{\textrm{P\_BusAux\_ES\_gen} \cdot dt}" title="\textrm{E\_BusAux\_ES\_gen} = \sum{\textrm{P\_BusAux\_ES\_gen} \cdot dt}" /></p>
-<p><img style="vertical-align:middle" src="data:image/png;base64,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" alt="\Delta\textrm{E\_BusAux\_ES\_mech} = (\textrm{E\_BusAux\_ES\_consumed} - \textrm{E\_BusAux\_ES\_gen}) / \textrm{AlternatorEfficiency} / \textrm{AlternatorGearEfficiency}" title="\Delta\textrm{E\_BusAux\_ES\_mech} = (\textrm{E\_BusAux\_ES\_consumed} - \textrm{E\_BusAux\_ES\_gen}) / \textrm{AlternatorEfficiency} / \textrm{AlternatorGearEfficiency}" /></p>
-<p><img style="vertical-align:middle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAU8AAAATBAMAAADi2JL5AAAAMFBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAMs3d74lURKsiu3ZmEJlws2FlAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAE10lEQVRIDc1W32scVRT+Jpvd2dlfGdOCIGK2G622gg0l/nhI3RAUiw/drU2gRNusYERkccfqQ1AhIz5UxJiBhD6I0BF/gArZBWNeFLJFjC8Vh1SfhGYRUkVCmWzSkMRuxnPuzGx34j+wZ9l7z3fOd+Z+ufee2aC7fyjz1NMAnjv+jVyjWep1Mr1PGOS12GMtvueKwiEoH3x9pdaaVc7sjfzzLEd+z62e/7I1hakAAjxuZGTtkp+5p+F7++eSDfkk8NLjiBzTORnZBHrWAzS5HoAuoEKljMsaxvRANmwD3SIyDFyutOSS/7YA4brccUgDfkYe9L39M62HC5A3LGBS5yQLje4GaDHHCGABuHDFeo/IeiDJi4dFZB5IEWha4rOm6zku9wTwgp8J6763f+b1Qui8TfGYILHQ1EaAtpytBbAAVKhG1X5A1gNJWtxKWBwioeHWk4yXjACT0oK7A3ziJzqqvrd/LtmKGcci/+UJnZMsNHSLvaYtLA42/aZDQtMRdfqwBbUZY4cWryRFhISGTOG5w6XOfAti1+UetaD4ia7gw/wwzSU7YQLlPg4JEglVpmuYyWF+GxOrf1I8vbJFN7/fjuf0b53K5JDF5JIdT9N1cTbOMbpjYTuZdtE8pDlIZeOtBpaKJlBJ9bkwUTZnH2WOy+3Z/sUtoHES91aaIOCU6lkT4K9nEefm30+SZAeR7aSNGTrbfJS7qctGSUe5uix0ggrTtP85Z5PISL3PlicvfOusTRPZ4stFunsrhtKQ8tBJqEQ9yhCxfFQ8xOVK0w4XChuV7hr03H1Tyb5uAsfo6xkffYyO3oG8Le1pMnWLJXE3kVBqt9DWEZdYsuU0efKo0+dVuhMdp7csHX00jS4DjcgROi1JxSl6CkEkn3H30Ofexy0yo9LwwN3JgvscGg9oHRxzrWRLJjAmFhNRFio5qhCKsnOINiGTcWq+0GSu4BcijTSVzFIztBgtXqAPGQmVbrvKpk8aiI+MfO4JxZuaqHC5BsAX7CDHdt2EyCKlSa7DI/UEESe5O+U8B1ho0qm6Qmm/LCwAvw76QlE+wSxRCEknEP6fUKDKDBKKPRKabEB5pYE4vZ81F+JjkwncTMSt0N4JSBLWRz2Pp5TWAkgoWXiPhqjK7p0djWzLFfQU0EebSt1ER093NLXkvf25MFUZAOL8hJY7SjCi8ZP8HVUaCQM38Dq9BHQSSncUlYeZIIRGtDQwISAFzJCmFq/KA69V499/d107oL2xtIbiVUrzemRjh6B8KDwWurxN/WVFd+UddFlyjS4tqQs1MG1iBGOEybhwsZCtYLYisD/wLl0zGA0DHX0IaYn1RA2nYQphDJHCbxozXC41xKeMyDqqIfVFM2qtJtPXkumURp/8skQBdGfrh5mhjB6fM9DlOA7/1g9V6Wdw7q/NB+c+uijdvwGl13kE0tGbk0NndjFWrxKtnq1nso7x1asZUc/PEKYM742czYEY/Fv/BZ3m2pXdd34oFi7ULfy4W2X4dlY9eGrFcXZc7rnnz6tedciKLIQvTmg3MLic7BNCC50c8PJtNaUqoIsyGP1J9YRyoB1NMhWDhFLveUI50I5CMV6UHvpjK5Z5t3uqW++eWiyMF9tSpyeq6P2z2M4ahbbTiLW9RiEwvPBzi9D/AIRItfl7RRDEAAAAAElFTkSuQmCC" alt="\textbf{\textrm{FC\_BusAux\_ES}} = \textrm{E\_BusAux\_ES} \cdot k_\textrm{engline}" title="\textbf{\textrm{FC\_BusAux\_ES}} = \textrm{E\_BusAux\_ES} \cdot k_\textrm{engline}" /></p>
+<p><img style="vertical-align:middle" src="data:image/png;base64,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" alt="\Delta\textrm{E\_BusAux\_ES\_mech} = \begin{cases} 0 &amp; \textrm{if Alternator type is none} \\ \frac{\textrm{E\_BusAux\_ES\_consumed} - \textrm{E\_BusAux\_ES\_gen}}{\textrm{AlternatorEfficiency} \cdot \textrm{AlternatorGearEfficiency}} &amp; \textrm{otherwise} \end{cases}" title="\Delta\textrm{E\_BusAux\_ES\_mech} = \begin{cases} 0 &amp; \textrm{if Alternator type is none} \\ \frac{\textrm{E\_BusAux\_ES\_consumed} - \textrm{E\_BusAux\_ES\_gen}}{\textrm{AlternatorEfficiency} \cdot \textrm{AlternatorGearEfficiency}} &amp; \textrm{otherwise} \end{cases}" /></p>
+<p><img style="vertical-align:middle" src="data:image/png;base64,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" alt="\textbf{\textrm{FC\_BusAux\_ES}} = \Delta\textrm{E\_BusAux\_ES\_mech} \cdot k_\textrm{engline}" title="\textbf{\textrm{FC\_BusAux\_ES}} = \Delta\textrm{E\_BusAux\_ES\_mech} \cdot k_\textrm{engline}" /></p>
+<p><em>Note:</em> In case the alternator is simulated without alternator, the power generated by the alternator is always 0 and the auxiliaries are supplied from the high-voltage REESS via the DC/DC converter. In this case, no correction for the electric system needs to be applied because the energy is either taken from the REESS already during the simulation or corrected via DCDC_missing (see below).</p>
 </div>
 <div id="bus-auxiliaries-correction-electric-system-supply-from-reess" class="section level4">
 <h4>Bus Auxiliaries Correction – Electric System Supply from REESS</h4>
@@ -2711,17 +2712,17 @@ Example: “Gears\Gear1.vtlm” points to the “Gears” subdirectory of the Ge
 <h4>Waste Heat Recovery Systems</h4>
 <p><img style="vertical-align:middle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAS4AAAAaBAMAAAD78qx/AAAAMFBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAIondmbvvMs0QZnarVESUG+88AAAACXBIWXMAAA7EAAAOxAGVKw4bAAADSklEQVRIDc2XP0wTcRTHv23B9g6ubTo4uIAFB1mKLsappCEmJDYlDg440MlBE1ojMJlASCDExepg1ER7iyEQDV1EIppWB10MNDHGMKCNMZo4tQTRQuF879e79qA4tDSmr7n7/d57v9/3Pr9/dylweDuiXRamadru4dXqpyBr/UWxYyu/6qdaB6XBLV1ECrnrIFc3ibuagaP01EvU4w90XuR1kG/dREch45x63bGR9viDdyKBzpMHPWUkvz/q1LqNEPXgju/Yr1HRPihG6QPs4ywTT0DJAR5Ys8A5gBILogUnTSZVcMG3Ycpzx7EMB2pU/A4pJh6PdlZpHodlG1g1uBYAVz8n9lsll0NLmxpRx9Yw+zUqvkRzgrkkzLKKnIcyDagmLls3J/ZbJZcUoYkuGXE1iTY1Kg7AFWWuFsRYU9qCPO/ew0ULcYBVcuHLH1O70nzVqJjDKKn5cE/XnIQSTzjd5fl6dElkRnJPgw+eZCDP9cHZ9Ry5uWUThag2ae3lEHG1pYVbi+LSWvjrdBdxeVd0ySRWHeMyYF33eqeA5NqiKjLSNkZVZxheXMdHOEAux8+/J3sjWgB+05s+ObckziNJVKfIWs1qawoDVPHByj5ZW1qV88yVFeeRhn26mNhFPCPlpRxs0SEcjZErFr6YLN7bNsuhZClRnaLlDHV8jNYEeLf6oNCPzZZSpa1rZi79CTm43FJe2Vn78In3FrllCNGTDo2W0ms8S4ZVp2gfon5XcCRKa8NcpEoX8ey4Manu4XJzXIBIeTkLOP/FhZW0aMq3Mlf1ipYcxmBNkQpzfaaLXq8F0kyYueYzIsETJOUtxHT/NxDT52vP/sKEaCluZa4qFam3PYtnTof6UHBJp4qiV2mPRUtcIfIShMnzFad1RACK+wRkN7vFDuU7bdaS8Uh1q14xLE3ItmgCnkjA+zbr0rQscJyOA2Dh72Mk6OkNQhlIU2aj8CO0fKMQlV/MQO6aGWbXeLBRLhoV+j76g+TUqvhtbXhWeVUx7rJ8VTXlbFXN/1vj0XoNsL7EFj7hDWg21YBqNyoNUV4wKOQeo9YIZVO/TiGFMo3AYzDoL4nbPwc3jVAjlE7646jbeiPwGAwtvSXrM2KHLf8CDcaLgaDtrbwAAAAASUVORK5CYII=" alt="\textrm{E\_WHR\_mech} = \sum{\textrm{P\_WHR\_mech} \cdot dt}" title="\textrm{E\_WHR\_mech} = \sum{\textrm{P\_WHR\_mech} \cdot dt}" /></p>
 <p><img style="vertical-align:middle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPgAAAAaBAMAAABoc4yxAAAAMFBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAIondmbvvMs0QZnarVESUG+88AAAACXBIWXMAAA7EAAAOxAGVKw4bAAADIElEQVRIDb2WP2gTURzHv7k0Xu/SS0IGRxvTIugSdSkIUglVECzp5FAH4yKoYCJWV4PQUlwapIiL9oYWaSskgxbRSurSqWikLh2iQcS1Sa1Ca+v5e3f3cpfUiyQp+YXc+/N73+/n3rt7LwGaisSvqywSmqYVmzJoRZT5aahdz7WhVnya0no01dRNlpsyaEUkJSrMTy34BPujvRfZ0skTD9CzU/SNvevZzAf7Bx8mor1HK8Z3KjCja/0HTwlpSEc2wxeS//UQLwe4CGY9Aogp1jmVhUKIIIQScA6gxII1ugYuaGeYxgxSiH9Yvb6H37LDd0hpnYEQE3pScP0G1jh8AfAPsYQeNXBM7PIMld44sMza9T3s8EV4sgwuYZYJ5S0o44Bqg7uPs4QetfBHWoCnDHgsTe36Hnb4MPxJBveC6SBtQ84EquC0ijxq4YqW4inbzOt72OFl3CV9BI9Nl1EoU1lfwJr500tGZm46jVo4YhtVcJfxGBw95LnzsOBvCvGv48cIHv5guuSw1pmSAWEjHB4DcoVXqp4RQuJxHd6xwiJkDHfbzjbv9vwiLSKFkwfCuG3BPWrXEoZpeASCLgO686q8xeAl/W2nF+6knpkKoG/vzF3aNVNHy04KI5w8pDLcSTZzVx8NnEFXVneMQKEPC/eSKm3fssNzev+XQuH0XjgyO3qWXSy4k4eyW1jNM7h4k8Zfx4GkL04V2s6g6VIIuwGMqlVwGg1k2GXPM0eXtdksuJOHzNaGP3NXGfcgLFEPg3+mL90UTSWXtcMzRdbfTWeYDq965ugMsaQeFtzJw7UFpDlcLOGlr1N9osOlE4bHDQIlK/AYtbJ0L+gI4eM/Zr5iiNiVvSVmOHggCiXA4YhL92V3MotgIhpeLvk1jfSH6YiiV4Kd7YnB4MAglOE8y8zPJUd2itzeLL2pSodECmrQj7uzh/z6mRh7b0q+FUZmlbeBikHDldV0w5J9E4hX9s2qcaODxcY1+6Y4xZ34EcXbbSg9IQ6Z5pX2lWc5alL/E8FbbSnNfSYdmtHibQHaIeu0p80I2fvbUn8xUIkWtvtfRF41xgceYsIAAAAASUVORK5CYII=" alt="\textrm{E\_WHR\_el} = \sum{\textrm{P\_WHR\_el} \cdot dt}" title="\textrm{E\_WHR\_el} = \sum{\textrm{P\_WHR\_el} \cdot dt}" /></p>
-<p><br /><img style="vertical-align:middle" src="data:image/png;base64,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" alt="
+<p><br /><img style="vertical-align:middle" src="data:image/png;base64,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" alt="
 \textrm{E\_WHR\_el\_mech} = \begin{cases}
-\textrm{E\_WHR\_el} / \textrm{AlternatorEfficiency} &amp; if conventional truck \\
-\textrm{E\_WHR\_el} / \eta_{\textrm{EM}_\textrm{chg}} &amp; if bus with ES connected to REES and smart alternator \\
-\textrm{E\_WHR\_el} / \textrm{BusAlternatorEfficiency} &amp; otherwise
+\textrm{E\_WHR\_el} / \textrm{AlternatorEfficiency} &amp; \textrm{if conventional truck} \\
+\textrm{E\_WHR\_el} / \eta_{\textrm{EM}_\textrm{chg}} &amp; \textrm{if bus with ES connected to REES and smart alternator} \\
+\textrm{E\_WHR\_el} / \textrm{BusAlternatorEfficiency} &amp; \textrm{otherwise}
 \end{cases}
 " title="
 \textrm{E\_WHR\_el\_mech} = \begin{cases}
-\textrm{E\_WHR\_el} / \textrm{AlternatorEfficiency} &amp; if conventional truck \\
-\textrm{E\_WHR\_el} / \eta_{\textrm{EM}_\textrm{chg}} &amp; if bus with ES connected to REES and smart alternator \\
-\textrm{E\_WHR\_el} / \textrm{BusAlternatorEfficiency} &amp; otherwise
+\textrm{E\_WHR\_el} / \textrm{AlternatorEfficiency} &amp; \textrm{if conventional truck} \\
+\textrm{E\_WHR\_el} / \eta_{\textrm{EM}_\textrm{chg}} &amp; \textrm{if bus with ES connected to REES and smart alternator} \\
+\textrm{E\_WHR\_el} / \textrm{BusAlternatorEfficiency} &amp; \textrm{otherwise}
 \end{cases}
 " /><br /></p>
 <p><img style="vertical-align:middle" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAdAAAAAUBAMAAADPfXElAAAAMFBMVEX///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAv3aB7AAAAD3RSTlMAMs3d74lURKsiu3ZmEJlws2FlAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAFwElEQVRYCd1WbWhbVRh+bpvcNOm9TVYnzP3QuzK0jEm64ewUR4ooijraWSN1busVpaJuSzYngn8aRemEjQW1oDJcEEF000YZ+GNCouBQFrdrh/rDj+yHbYc6m7XrbF3b+L7n5ib3xqRK2l++Iee853nP+5zz3PNxL7BIU5OLJFiK9Mb/QNJ80+0td9xJHe9ff9RzjurG4OSNw6GJLiW4sTk0ofmCkzdQ3XKrTrEK1oDB0MiOdxIUUoJr0T0d9ax+uXteHwyNfts5smN7hRRIQ4YD9nbPh3+9518ZpKG4I000BJd6rhgo5y4GEMnBczfwWDvkYIzh+r+A/hmgDhyDf5bqDrgnSil27xOgF5A0xrJJyJQ4CDfl/SICxyvMjToa3L1k3L+Zmwsz+CuRCa6dJa59JdfpsZi98EzS2P0xDjXmDbimgBUOocgnnXmFlib0oIubPg3eK8AuS+hxekwJDpSbnwYTppoVC3WzuzBDRaGCixbFsh7LKa9ZaD1ctG7wxTio5tPIXgLGnEI7RZA72E1Os1AVXzOozEFuAdI2ofVtHCi3olAlKkIk1FAMchdmqC7UrReHWFv0ypxIzptoRIrkQomJ2JCG0/koNKdQkl/BfHEW2gieJdRZKGfiDqG0FytYBaFJsbgLM1QX6okVR7lY9MqcSE5JAENtDAdELDIDLRTzdDmEvkmbuYK5COvFcCGyBnI26YmXVvT7oyIiDR3evSszAGROG3jmVMB/+MuoCBRXVNVMimoMUDIXIISunDk5+iOlM+DZ9hFMrg4zHfDkpFOW76wjE6EEwH/LXFPeWCrXECehEy0tQb6M5s/TEpM17WejR2BZPTm94UOFZgq76jSFzttUOLwaSPV9nDYj2aR0H/bB3SW1yQlo/qTUIQKW0KmenNmxKkMYV5lC1StYnvZ0gIEn6cY0uQrpNHRi2XKTqryM5H5OAEH6W9Z0yR3NzvL5tt26RypviVeoV695kZB3RE8rcyyUxqVbly6jDSapP6r+SXdtNo51rqh3MzXnRMASmkPh4VVjUGdQHzC3LhFRugDuwmuGybWZ6F4NUFG3JfqdOSaVUjtWFRuRnJSgybYxwD0pnN8L30SGPJtQ37SIFYvn3ic7Jl4KvZDpx1YfS6uz19iFpswEmuIMCY309d18nUF3cRws9Pz+F1r3v0QOPRidfmTVGOTLfY/qptAZSlfnGHiESUyuTeQtj3LzXSqKNlaQxACJidObhXP4WLKFNkDOc6pNaMOkCJUXZwmg9yhoGcncl+NYk3YIJW4yMZuscYbcfsOaHDVKK8qXNVk1BiVHwaJQQ51jwFMS2sHJbP1XJ0RtFvTmKBqLoQHmqWgImGiK3vr5GPk2oU15fh7/OKPmZQQ8LjIlWvZU0i70TFQECkKPGFCzAaiiyQGbUFn0rMbgJU2GXSgDP9FxYpDcDjEMFVvRLsmZ9NMnf8eJE9vHpHbPbbvTBJhiqEPvKngPFHpnNWBcp4ZNqJwPvFcI26s6Q6yoeosJ3kvnNFAUOk6tZJIjtNl46zZ14Ql3Al+JJuM2oWfjDKAawwjkuCU0S1sXDGyFQiBRexMimYq1WCevxMGmrmG1bZi+BcYwomoEgL5jr+dO3q3rP4zDn8/n6cMhTRueMIolCt+6MXy+UUyZ+9qsUcdg50j4xRxE5kOUTFz8rds5OvjHKORjOnFeHB+4dnrPoedxKhPAF5ll3IwyiynU+8B8uKdzQYac8uln0vgAcc1P7xkfWDEdIADKNgaJS0lbc9qEp/SeZweadJeqnRVCR9FBgBWvtfbGas0UeYUVXRQHJ/sMO8VvdMZ0Fw5ssYQSsGj7YFEMqmOCtVO97khdiTdYKO1A3rq0ogQ4OtTSeKuWpCXPueBglB9MNx9M6W+3Lmv9plVq/eEyAY4OtTQ8ei1ZS5yjBCoQymlJqwDXDMVrzly6RG8lKncAiUr4/w97eGe0JOpvyfpkZpxeOHEAAAAASUVORK5CYII=" alt="\textbf{\textrm{FC\_WHR}} = - (\textrm{E\_WHR\_mech} + \textrm{E\_WHR\_el\_mech}) \cdot k_\textrm{engline}" title="\textbf{\textrm{FC\_WHR}} = - (\textrm{E\_WHR\_mech} + \textrm{E\_WHR\_el\_mech}) \cdot k_\textrm{engline}" /></p>
diff --git a/VECTO/GUI/VectoJobForm.vb b/VECTO/GUI/VectoJobForm.vb
index 2feaeb0e1a7272912dbecf29d9776ea1b7fd6fa3..1002f2e569a5f416a2d8295ed63f0eae4555177b 100644
--- a/VECTO/GUI/VectoJobForm.vb
+++ b/VECTO/GUI/VectoJobForm.vb
@@ -1011,6 +1011,7 @@ Public Class VectoJobForm
         pnHybridStrategy.Enabled = False
         lblESSUtilityFactorDriving.Enabled  = false
         tbESSUtilityFactorDriving.Enabled = false
+        pnHybridStrategy.Enabled = Not Cfg.DeclMode
         Select Case JobType
             Case VectoSimulationJobType.ConventionalVehicle
                 gbElectricAux.Enabled = False
@@ -1023,6 +1024,7 @@ Public Class VectoJobForm
                 TabPgADAS.Enabled = False
                 tpAuxiliaries.Enabled = False
                 pnShiftParams.Enabled = False
+                pnHybridStrategy.Enabled = False
             Case VectoSimulationJobType.ParallelHybridVehicle
                 ' empty line - do not fall-through
                 pnHybridStrategy.Enabled = True
diff --git a/VECTO/GUI/VehicleForm.Designer.vb b/VECTO/GUI/VehicleForm.Designer.vb
index 2d45ca420460135fcf6e92deb530f2eec6029d75..ae21a2d56dbba296fbfa23f62f421773ab93f583 100644
--- a/VECTO/GUI/VehicleForm.Designer.vb
+++ b/VECTO/GUI/VehicleForm.Designer.vb
@@ -184,7 +184,7 @@ Partial Class VehicleForm
         Me.Label17 = New System.Windows.Forms.Label()
         Me.btDelMaxTorqueEntry = New System.Windows.Forms.Button()
         Me.tpADAS = New System.Windows.Forms.TabPage()
-        Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+        Me.gbADAS = New System.Windows.Forms.GroupBox()
         Me.cbAtEcoRollReleaseLockupClutch = New System.Windows.Forms.CheckBox()
         Me.cbPcc = New System.Windows.Forms.ComboBox()
         Me.cbEcoRoll = New System.Windows.Forms.ComboBox()
@@ -243,7 +243,7 @@ Partial Class VehicleForm
         Me.gbEMTorqueLimits.SuspendLayout
         Me.bgVehicleTorqueLimits.SuspendLayout
         Me.tpADAS.SuspendLayout
-        Me.GroupBox5.SuspendLayout
+        Me.gbADAS.SuspendLayout
         Me.tpRoadSweeper.SuspendLayout
         Me.pnPTO.SuspendLayout
         Me.gbPTODrive.SuspendLayout
@@ -253,82 +253,73 @@ Partial Class VehicleForm
         'Label1
         '
         Me.Label1.AutoSize = true
-        Me.Label1.Location = New System.Drawing.Point(9, 34)
-        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label1.Location = New System.Drawing.Point(6, 22)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(264, 20)
+        Me.Label1.Size = New System.Drawing.Size(177, 13)
         Me.Label1.TabIndex = 0
         Me.Label1.Text = "Corrected Actual Curb Mass Vehicle"
         '
         'TbMass
         '
-        Me.TbMass.Location = New System.Drawing.Point(282, 29)
-        Me.TbMass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbMass.Location = New System.Drawing.Point(188, 19)
         Me.TbMass.Name = "TbMass"
-        Me.TbMass.Size = New System.Drawing.Size(84, 26)
+        Me.TbMass.Size = New System.Drawing.Size(57, 20)
         Me.TbMass.TabIndex = 0
         '
         'Label2
         '
         Me.Label2.AutoSize = true
-        Me.Label2.Location = New System.Drawing.Point(192, 48)
-        Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label2.Location = New System.Drawing.Point(128, 31)
         Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(66, 20)
+        Me.Label2.Size = New System.Drawing.Size(45, 13)
         Me.Label2.TabIndex = 2
         Me.Label2.Text = "Loading"
         '
         'TbLoad
         '
-        Me.TbLoad.Location = New System.Drawing.Point(273, 43)
-        Me.TbLoad.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbLoad.Location = New System.Drawing.Point(182, 28)
         Me.TbLoad.Name = "TbLoad"
-        Me.TbLoad.Size = New System.Drawing.Size(84, 26)
+        Me.TbLoad.Size = New System.Drawing.Size(57, 20)
         Me.TbLoad.TabIndex = 1
         '
         'Label3
         '
         Me.Label3.AutoSize = true
-        Me.Label3.Location = New System.Drawing.Point(112, 9)
-        Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label3.Location = New System.Drawing.Point(75, 6)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(55, 20)
+        Me.Label3.Size = New System.Drawing.Size(38, 13)
         Me.Label3.TabIndex = 8
         Me.Label3.Text = "Cd x A"
         '
         'TBcdA
         '
-        Me.TBcdA.Location = New System.Drawing.Point(178, 5)
-        Me.TBcdA.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TBcdA.Location = New System.Drawing.Point(119, 3)
         Me.TBcdA.Name = "TBcdA"
-        Me.TBcdA.Size = New System.Drawing.Size(84, 26)
+        Me.TBcdA.Size = New System.Drawing.Size(57, 20)
         Me.TBcdA.TabIndex = 0
         '
         'Label13
         '
         Me.Label13.AutoSize = true
-        Me.Label13.Location = New System.Drawing.Point(204, 9)
-        Me.Label13.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label13.Location = New System.Drawing.Point(136, 6)
         Me.Label13.Name = "Label13"
-        Me.Label13.Size = New System.Drawing.Size(59, 20)
+        Me.Label13.Size = New System.Drawing.Size(40, 13)
         Me.Label13.TabIndex = 6
         Me.Label13.Text = "Radius"
         '
         'TBrdyn
         '
-        Me.TBrdyn.Location = New System.Drawing.Point(278, 5)
-        Me.TBrdyn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TBrdyn.Location = New System.Drawing.Point(185, 3)
         Me.TBrdyn.Name = "TBrdyn"
-        Me.TBrdyn.Size = New System.Drawing.Size(84, 26)
+        Me.TBrdyn.Size = New System.Drawing.Size(57, 20)
         Me.TBrdyn.TabIndex = 0
         '
         '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(747, 888)
-        Me.ButOK.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButOK.Location = New System.Drawing.Point(498, 577)
         Me.ButOK.Name = "ButOK"
-        Me.ButOK.Size = New System.Drawing.Size(112, 35)
+        Me.ButOK.Size = New System.Drawing.Size(75, 23)
         Me.ButOK.TabIndex = 6
         Me.ButOK.Text = "Save"
         Me.ButOK.UseVisualStyleBackColor = true
@@ -337,10 +328,9 @@ Partial Class VehicleForm
         '
         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(868, 888)
-        Me.ButCancel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButCancel.Location = New System.Drawing.Point(579, 577)
         Me.ButCancel.Name = "ButCancel"
-        Me.ButCancel.Size = New System.Drawing.Size(112, 35)
+        Me.ButCancel.Size = New System.Drawing.Size(75, 23)
         Me.ButCancel.TabIndex = 7
         Me.ButCancel.Text = "Cancel"
         Me.ButCancel.UseVisualStyleBackColor = true
@@ -348,30 +338,27 @@ Partial Class VehicleForm
         'Label14
         '
         Me.Label14.AutoSize = true
-        Me.Label14.Location = New System.Drawing.Point(370, 34)
-        Me.Label14.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label14.Location = New System.Drawing.Point(247, 22)
         Me.Label14.Name = "Label14"
-        Me.Label14.Size = New System.Drawing.Size(34, 20)
+        Me.Label14.Size = New System.Drawing.Size(25, 13)
         Me.Label14.TabIndex = 24
         Me.Label14.Text = "[kg]"
         '
         'Label31
         '
         Me.Label31.AutoSize = true
-        Me.Label31.Location = New System.Drawing.Point(362, 48)
-        Me.Label31.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label31.Location = New System.Drawing.Point(241, 31)
         Me.Label31.Name = "Label31"
-        Me.Label31.Size = New System.Drawing.Size(34, 20)
+        Me.Label31.Size = New System.Drawing.Size(25, 13)
         Me.Label31.TabIndex = 24
         Me.Label31.Text = "[kg]"
         '
         'Label35
         '
         Me.Label35.AutoSize = true
-        Me.Label35.Location = New System.Drawing.Point(366, 9)
-        Me.Label35.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label35.Location = New System.Drawing.Point(244, 6)
         Me.Label35.Name = "Label35"
-        Me.Label35.Size = New System.Drawing.Size(43, 20)
+        Me.Label35.Size = New System.Drawing.Size(29, 13)
         Me.Label35.TabIndex = 24
         Me.Label35.Text = "[mm]"
         '
@@ -380,20 +367,18 @@ Partial Class VehicleForm
         Me.CbCdMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         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(9, 29)
-        Me.CbCdMode.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.CbCdMode.Location = New System.Drawing.Point(6, 19)
         Me.CbCdMode.Name = "CbCdMode"
-        Me.CbCdMode.Size = New System.Drawing.Size(398, 28)
+        Me.CbCdMode.Size = New System.Drawing.Size(267, 21)
         Me.CbCdMode.TabIndex = 0
         '
         'TbCdFile
         '
         Me.TbCdFile.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.TbCdFile.Enabled = false
-        Me.TbCdFile.Location = New System.Drawing.Point(14, 100)
-        Me.TbCdFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbCdFile.Location = New System.Drawing.Point(9, 65)
         Me.TbCdFile.Name = "TbCdFile"
-        Me.TbCdFile.Size = New System.Drawing.Size(313, 26)
+        Me.TbCdFile.Size = New System.Drawing.Size(210, 20)
         Me.TbCdFile.TabIndex = 1
         '
         'BtCdFileBrowse
@@ -401,10 +386,9 @@ Partial Class VehicleForm
         Me.BtCdFileBrowse.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.BtCdFileBrowse.Enabled = false
         Me.BtCdFileBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.BtCdFileBrowse.Location = New System.Drawing.Point(338, 95)
-        Me.BtCdFileBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.BtCdFileBrowse.Location = New System.Drawing.Point(225, 62)
         Me.BtCdFileBrowse.Name = "BtCdFileBrowse"
-        Me.BtCdFileBrowse.Size = New System.Drawing.Size(36, 37)
+        Me.BtCdFileBrowse.Size = New System.Drawing.Size(24, 24)
         Me.BtCdFileBrowse.TabIndex = 2
         Me.BtCdFileBrowse.UseVisualStyleBackColor = true
         '
@@ -415,11 +399,9 @@ Partial Class VehicleForm
         Me.GroupBox6.Controls.Add(Me.CbCdMode)
         Me.GroupBox6.Controls.Add(Me.BtCdFileBrowse)
         Me.GroupBox6.Controls.Add(Me.TbCdFile)
-        Me.GroupBox6.Location = New System.Drawing.Point(435, 129)
-        Me.GroupBox6.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox6.Location = New System.Drawing.Point(290, 84)
         Me.GroupBox6.Name = "GroupBox6"
-        Me.GroupBox6.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox6.Size = New System.Drawing.Size(422, 148)
+        Me.GroupBox6.Size = New System.Drawing.Size(281, 96)
         Me.GroupBox6.TabIndex = 3
         Me.GroupBox6.TabStop = false
         Me.GroupBox6.Text = "Cross Wind Correction"
@@ -429,20 +411,18 @@ Partial Class VehicleForm
         Me.BtCdFileOpen.Anchor = System.Windows.Forms.AnchorStyles.None
         Me.BtCdFileOpen.Enabled = false
         Me.BtCdFileOpen.Image = Global.TUGraz.VECTO.My.Resources.Resources.application_export_icon_small
-        Me.BtCdFileOpen.Location = New System.Drawing.Point(374, 95)
-        Me.BtCdFileOpen.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.BtCdFileOpen.Location = New System.Drawing.Point(249, 62)
         Me.BtCdFileOpen.Name = "BtCdFileOpen"
-        Me.BtCdFileOpen.Size = New System.Drawing.Size(36, 37)
+        Me.BtCdFileOpen.Size = New System.Drawing.Size(24, 24)
         Me.BtCdFileOpen.TabIndex = 3
         Me.BtCdFileOpen.UseVisualStyleBackColor = true
         '
         'LbCdMode
         '
         Me.LbCdMode.AutoSize = true
-        Me.LbCdMode.Location = New System.Drawing.Point(9, 72)
-        Me.LbCdMode.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.LbCdMode.Location = New System.Drawing.Point(6, 47)
         Me.LbCdMode.Name = "LbCdMode"
-        Me.LbCdMode.Size = New System.Drawing.Size(87, 20)
+        Me.LbCdMode.Size = New System.Drawing.Size(59, 13)
         Me.LbCdMode.TabIndex = 28
         Me.LbCdMode.Text = "LbCdMode"
         Me.LbCdMode.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -454,8 +434,7 @@ Partial Class VehicleForm
         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(999, 33)
+        Me.ToolStrip1.Size = New System.Drawing.Size(666, 33)
         Me.ToolStrip1.TabIndex = 29
         Me.ToolStrip1.Text = "ToolStrip1"
         '
@@ -532,11 +511,9 @@ Partial Class VehicleForm
         '
         Me.GroupBox7.Controls.Add(Me.PnRt)
         Me.GroupBox7.Controls.Add(Me.CbRtType)
-        Me.GroupBox7.Location = New System.Drawing.Point(9, 117)
-        Me.GroupBox7.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox7.Location = New System.Drawing.Point(6, 76)
         Me.GroupBox7.Name = "GroupBox7"
-        Me.GroupBox7.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox7.Size = New System.Drawing.Size(418, 171)
+        Me.GroupBox7.Size = New System.Drawing.Size(279, 111)
         Me.GroupBox7.TabIndex = 1
         Me.GroupBox7.TabStop = false
         Me.GroupBox7.Text = "Retarder Losses"
@@ -549,18 +526,16 @@ Partial Class VehicleForm
         Me.PnRt.Controls.Add(Me.Label45)
         Me.PnRt.Controls.Add(Me.LbRtRatio)
         Me.PnRt.Controls.Add(Me.TbRtRatio)
-        Me.PnRt.Location = New System.Drawing.Point(4, 65)
-        Me.PnRt.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PnRt.Location = New System.Drawing.Point(3, 42)
         Me.PnRt.Name = "PnRt"
-        Me.PnRt.Size = New System.Drawing.Size(402, 97)
+        Me.PnRt.Size = New System.Drawing.Size(268, 63)
         Me.PnRt.TabIndex = 1
         '
         'Label15
         '
-        Me.Label15.Location = New System.Drawing.Point(9, 35)
-        Me.Label15.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label15.Location = New System.Drawing.Point(6, 23)
         Me.Label15.Name = "Label15"
-        Me.Label15.Size = New System.Drawing.Size(302, 25)
+        Me.Label15.Size = New System.Drawing.Size(201, 16)
         Me.Label15.TabIndex = 15
         Me.Label15.Text = "Retarder Loss Map"
         Me.Label15.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -569,39 +544,35 @@ Partial Class VehicleForm
         '
         Me.BtRtBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
         Me.BtRtBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.BtRtBrowse.Location = New System.Drawing.Point(354, 60)
-        Me.BtRtBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.BtRtBrowse.Location = New System.Drawing.Point(236, 39)
         Me.BtRtBrowse.Name = "BtRtBrowse"
-        Me.BtRtBrowse.Size = New System.Drawing.Size(36, 37)
+        Me.BtRtBrowse.Size = New System.Drawing.Size(24, 24)
         Me.BtRtBrowse.TabIndex = 2
         Me.BtRtBrowse.UseVisualStyleBackColor = true
         '
         'TbRtPath
         '
         Me.TbRtPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
-        Me.TbRtPath.Location = New System.Drawing.Point(9, 63)
-        Me.TbRtPath.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbRtPath.Location = New System.Drawing.Point(6, 41)
         Me.TbRtPath.Name = "TbRtPath"
-        Me.TbRtPath.Size = New System.Drawing.Size(334, 26)
+        Me.TbRtPath.Size = New System.Drawing.Size(224, 20)
         Me.TbRtPath.TabIndex = 1
         '
         '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.Location = New System.Drawing.Point(348, 8)
-        Me.Label45.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label45.Location = New System.Drawing.Point(232, 5)
         Me.Label45.Name = "Label45"
-        Me.Label45.Size = New System.Drawing.Size(22, 20)
+        Me.Label45.Size = New System.Drawing.Size(16, 13)
         Me.Label45.TabIndex = 10
         Me.Label45.Text = "[-]"
         '
         'LbRtRatio
         '
-        Me.LbRtRatio.Location = New System.Drawing.Point(6, 8)
-        Me.LbRtRatio.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.LbRtRatio.Location = New System.Drawing.Point(4, 5)
         Me.LbRtRatio.Name = "LbRtRatio"
-        Me.LbRtRatio.Size = New System.Drawing.Size(250, 26)
+        Me.LbRtRatio.Size = New System.Drawing.Size(167, 17)
         Me.LbRtRatio.TabIndex = 1
         Me.LbRtRatio.Text = "Ratio"
         Me.LbRtRatio.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -609,10 +580,9 @@ 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.Location = New System.Drawing.Point(261, 5)
-        Me.TbRtRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbRtRatio.Location = New System.Drawing.Point(174, 3)
         Me.TbRtRatio.Name = "TbRtRatio"
-        Me.TbRtRatio.Size = New System.Drawing.Size(82, 26)
+        Me.TbRtRatio.Size = New System.Drawing.Size(56, 20)
         Me.TbRtRatio.TabIndex = 0
         '
         'CbRtType
@@ -620,38 +590,34 @@ Partial Class VehicleForm
         Me.CbRtType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.CbRtType.FormattingEnabled = true
         Me.CbRtType.Items.AddRange(New Object() {"Included in Transmission Loss Maps", "Primary Retarder", "Secondary Retarder"})
-        Me.CbRtType.Location = New System.Drawing.Point(9, 29)
-        Me.CbRtType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.CbRtType.Location = New System.Drawing.Point(6, 19)
         Me.CbRtType.Name = "CbRtType"
-        Me.CbRtType.Size = New System.Drawing.Size(397, 28)
+        Me.CbRtType.Size = New System.Drawing.Size(266, 21)
         Me.CbRtType.TabIndex = 0
         '
         'Label46
         '
         Me.Label46.AutoSize = true
-        Me.Label46.Location = New System.Drawing.Point(48, 8)
-        Me.Label46.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label46.Location = New System.Drawing.Point(32, 5)
         Me.Label46.Name = "Label46"
-        Me.Label46.Size = New System.Drawing.Size(213, 20)
+        Me.Label46.Size = New System.Drawing.Size(145, 13)
         Me.Label46.TabIndex = 31
         Me.Label46.Text = "Curb Mass Extra Trailer/Body"
         '
         'Label50
         '
         Me.Label50.AutoSize = true
-        Me.Label50.Location = New System.Drawing.Point(362, 8)
-        Me.Label50.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label50.Location = New System.Drawing.Point(241, 5)
         Me.Label50.Name = "Label50"
-        Me.Label50.Size = New System.Drawing.Size(34, 20)
+        Me.Label50.Size = New System.Drawing.Size(25, 13)
         Me.Label50.TabIndex = 24
         Me.Label50.Text = "[kg]"
         '
         'TbMassExtra
         '
-        Me.TbMassExtra.Location = New System.Drawing.Point(273, 3)
-        Me.TbMassExtra.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbMassExtra.Location = New System.Drawing.Point(182, 2)
         Me.TbMassExtra.Name = "TbMassExtra"
-        Me.TbMassExtra.Size = New System.Drawing.Size(84, 26)
+        Me.TbMassExtra.Size = New System.Drawing.Size(57, 20)
         Me.TbMassExtra.TabIndex = 0
         '
         'GroupBox8
@@ -660,11 +626,9 @@ Partial Class VehicleForm
         Me.GroupBox8.Controls.Add(Me.ButAxlRem)
         Me.GroupBox8.Controls.Add(Me.LvRRC)
         Me.GroupBox8.Controls.Add(Me.ButAxlAdd)
-        Me.GroupBox8.Location = New System.Drawing.Point(9, 286)
-        Me.GroupBox8.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox8.Location = New System.Drawing.Point(6, 186)
         Me.GroupBox8.Name = "GroupBox8"
-        Me.GroupBox8.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox8.Size = New System.Drawing.Size(846, 232)
+        Me.GroupBox8.Size = New System.Drawing.Size(564, 151)
         Me.GroupBox8.TabIndex = 4
         Me.GroupBox8.TabStop = false
         Me.GroupBox8.Text = "Axles / Wheels"
@@ -672,20 +636,18 @@ Partial Class VehicleForm
         'Label6
         '
         Me.Label6.AutoSize = true
-        Me.Label6.Location = New System.Drawing.Point(675, 186)
-        Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label6.Location = New System.Drawing.Point(450, 121)
         Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(158, 20)
+        Me.Label6.Size = New System.Drawing.Size(106, 13)
         Me.Label6.TabIndex = 3
         Me.Label6.Text = "(Double-Click to Edit)"
         '
         'ButAxlRem
         '
         Me.ButAxlRem.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.ButAxlRem.Location = New System.Drawing.Point(44, 188)
-        Me.ButAxlRem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButAxlRem.Location = New System.Drawing.Point(29, 122)
         Me.ButAxlRem.Name = "ButAxlRem"
-        Me.ButAxlRem.Size = New System.Drawing.Size(36, 37)
+        Me.ButAxlRem.Size = New System.Drawing.Size(24, 24)
         Me.ButAxlRem.TabIndex = 2
         Me.ButAxlRem.UseVisualStyleBackColor = true
         '
@@ -697,11 +659,10 @@ Partial Class VehicleForm
         Me.LvRRC.FullRowSelect = true
         Me.LvRRC.GridLines = true
         Me.LvRRC.HideSelection = false
-        Me.LvRRC.Location = New System.Drawing.Point(9, 29)
-        Me.LvRRC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.LvRRC.Location = New System.Drawing.Point(6, 19)
         Me.LvRRC.MultiSelect = false
         Me.LvRRC.Name = "LvRRC"
-        Me.LvRRC.Size = New System.Drawing.Size(826, 155)
+        Me.LvRRC.Size = New System.Drawing.Size(552, 102)
         Me.LvRRC.TabIndex = 0
         Me.LvRRC.TabStop = false
         Me.LvRRC.UseCompatibleStateImageBehavior = false
@@ -749,10 +710,9 @@ Partial Class VehicleForm
         'ButAxlAdd
         '
         Me.ButAxlAdd.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.ButAxlAdd.Location = New System.Drawing.Point(8, 188)
-        Me.ButAxlAdd.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.ButAxlAdd.Location = New System.Drawing.Point(5, 122)
         Me.ButAxlAdd.Name = "ButAxlAdd"
-        Me.ButAxlAdd.Size = New System.Drawing.Size(36, 37)
+        Me.ButAxlAdd.Size = New System.Drawing.Size(24, 24)
         Me.ButAxlAdd.TabIndex = 1
         Me.ButAxlAdd.UseVisualStyleBackColor = true
         '
@@ -762,10 +722,9 @@ Partial Class VehicleForm
         Me.PnWheelDiam.Controls.Add(Me.TBrdyn)
         Me.PnWheelDiam.Controls.Add(Me.Label35)
         Me.PnWheelDiam.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.PnWheelDiam.Location = New System.Drawing.Point(4, 24)
-        Me.PnWheelDiam.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PnWheelDiam.Location = New System.Drawing.Point(3, 16)
         Me.PnWheelDiam.Name = "PnWheelDiam"
-        Me.PnWheelDiam.Size = New System.Drawing.Size(409, 48)
+        Me.PnWheelDiam.Size = New System.Drawing.Size(272, 31)
         Me.PnWheelDiam.TabIndex = 0
         '
         'CbAxleConfig
@@ -773,10 +732,9 @@ Partial Class VehicleForm
         Me.CbAxleConfig.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         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(230, 123)
-        Me.CbAxleConfig.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.CbAxleConfig.Location = New System.Drawing.Point(153, 80)
         Me.CbAxleConfig.Name = "CbAxleConfig"
-        Me.CbAxleConfig.Size = New System.Drawing.Size(88, 28)
+        Me.CbAxleConfig.Size = New System.Drawing.Size(60, 21)
         Me.CbAxleConfig.TabIndex = 1
         '
         'CbCat
@@ -784,49 +742,44 @@ Partial Class VehicleForm
         Me.CbCat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         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(18, 123)
-        Me.CbCat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.CbCat.Location = New System.Drawing.Point(12, 80)
         Me.CbCat.Name = "CbCat"
-        Me.CbCat.Size = New System.Drawing.Size(200, 28)
+        Me.CbCat.Size = New System.Drawing.Size(135, 21)
         Me.CbCat.TabIndex = 0
         '
         'Label5
         '
         Me.Label5.AutoSize = true
-        Me.Label5.Location = New System.Drawing.Point(46, 166)
-        Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label5.Location = New System.Drawing.Point(31, 108)
         Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(170, 20)
+        Me.Label5.Size = New System.Drawing.Size(116, 13)
         Me.Label5.TabIndex = 2
         Me.Label5.Text = "Technically Permissible"
         '
         'Label9
         '
         Me.Label9.AutoSize = true
-        Me.Label9.Location = New System.Drawing.Point(296, 175)
-        Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label9.Location = New System.Drawing.Point(197, 114)
         Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(22, 20)
+        Me.Label9.Size = New System.Drawing.Size(16, 13)
         Me.Label9.TabIndex = 3
         Me.Label9.Text = "[t]"
         Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'TbMassMass
         '
-        Me.TbMassMass.Location = New System.Drawing.Point(230, 171)
-        Me.TbMassMass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbMassMass.Location = New System.Drawing.Point(153, 111)
         Me.TbMassMass.Name = "TbMassMass"
-        Me.TbMassMass.Size = New System.Drawing.Size(61, 26)
+        Me.TbMassMass.Size = New System.Drawing.Size(42, 20)
         Me.TbMassMass.TabIndex = 2
         '
         '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, 930)
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 593)
         Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0)
-        Me.StatusStrip1.Size = New System.Drawing.Size(999, 32)
+        Me.StatusStrip1.Size = New System.Drawing.Size(666, 32)
         Me.StatusStrip1.SizingGrip = false
         Me.StatusStrip1.TabIndex = 36
         Me.StatusStrip1.Text = "StatusStrip1"
@@ -839,11 +792,10 @@ Partial Class VehicleForm
         '
         'TbHDVclass
         '
-        Me.TbHDVclass.Location = New System.Drawing.Point(230, 217)
-        Me.TbHDVclass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.TbHDVclass.Location = New System.Drawing.Point(153, 141)
         Me.TbHDVclass.Name = "TbHDVclass"
         Me.TbHDVclass.ReadOnly = true
-        Me.TbHDVclass.Size = New System.Drawing.Size(61, 26)
+        Me.TbHDVclass.Size = New System.Drawing.Size(42, 20)
         Me.TbHDVclass.TabIndex = 3
         Me.TbHDVclass.TabStop = false
         Me.TbHDVclass.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
@@ -854,11 +806,9 @@ Partial Class VehicleForm
         Me.GroupBox1.Controls.Add(Me.TbMass)
         Me.GroupBox1.Controls.Add(Me.Label1)
         Me.GroupBox1.Controls.Add(Me.Label14)
-        Me.GroupBox1.Location = New System.Drawing.Point(9, 9)
-        Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox1.Location = New System.Drawing.Point(6, 6)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox1.Size = New System.Drawing.Size(417, 182)
+        Me.GroupBox1.Size = New System.Drawing.Size(278, 118)
         Me.GroupBox1.TabIndex = 0
         Me.GroupBox1.TabStop = false
         Me.GroupBox1.Text = "Masses / Loading"
@@ -871,20 +821,17 @@ Partial Class VehicleForm
         Me.PnLoad.Controls.Add(Me.TbMassExtra)
         Me.PnLoad.Controls.Add(Me.Label50)
         Me.PnLoad.Controls.Add(Me.Label46)
-        Me.PnLoad.Location = New System.Drawing.Point(9, 66)
-        Me.PnLoad.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PnLoad.Location = New System.Drawing.Point(6, 43)
         Me.PnLoad.Name = "PnLoad"
-        Me.PnLoad.Size = New System.Drawing.Size(404, 89)
+        Me.PnLoad.Size = New System.Drawing.Size(269, 58)
         Me.PnLoad.TabIndex = 1
         '
         'GrAirRes
         '
         Me.GrAirRes.Controls.Add(Me.PnCdATrTr)
-        Me.GrAirRes.Location = New System.Drawing.Point(435, 9)
-        Me.GrAirRes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GrAirRes.Location = New System.Drawing.Point(290, 6)
         Me.GrAirRes.Name = "GrAirRes"
-        Me.GrAirRes.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GrAirRes.Size = New System.Drawing.Size(420, 111)
+        Me.GrAirRes.Size = New System.Drawing.Size(280, 72)
         Me.GrAirRes.TabIndex = 2
         Me.GrAirRes.TabStop = false
         Me.GrAirRes.Text = "Air Resistance"
@@ -898,47 +845,42 @@ Partial Class VehicleForm
         Me.PnCdATrTr.Controls.Add(Me.Label38)
         Me.PnCdATrTr.Controls.Add(Me.Label3)
         Me.PnCdATrTr.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.PnCdATrTr.Location = New System.Drawing.Point(4, 24)
-        Me.PnCdATrTr.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PnCdATrTr.Location = New System.Drawing.Point(3, 16)
         Me.PnCdATrTr.Name = "PnCdATrTr"
-        Me.PnCdATrTr.Size = New System.Drawing.Size(412, 82)
+        Me.PnCdATrTr.Size = New System.Drawing.Size(274, 53)
         Me.PnCdATrTr.TabIndex = 0
         '
         'tbVehicleHeight
         '
-        Me.tbVehicleHeight.Location = New System.Drawing.Point(178, 45)
-        Me.tbVehicleHeight.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbVehicleHeight.Location = New System.Drawing.Point(119, 29)
         Me.tbVehicleHeight.Name = "tbVehicleHeight"
-        Me.tbVehicleHeight.Size = New System.Drawing.Size(84, 26)
+        Me.tbVehicleHeight.Size = New System.Drawing.Size(57, 20)
         Me.tbVehicleHeight.TabIndex = 1
         '
         'Label11
         '
         Me.Label11.AutoSize = true
-        Me.Label11.Location = New System.Drawing.Point(273, 49)
-        Me.Label11.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label11.Location = New System.Drawing.Point(182, 32)
         Me.Label11.Name = "Label11"
-        Me.Label11.Size = New System.Drawing.Size(30, 20)
+        Me.Label11.Size = New System.Drawing.Size(21, 13)
         Me.Label11.TabIndex = 27
         Me.Label11.Text = "[m]"
         '
         'Label20
         '
         Me.Label20.AutoSize = true
-        Me.Label20.Location = New System.Drawing.Point(112, 49)
-        Me.Label20.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label20.Location = New System.Drawing.Point(75, 32)
         Me.Label20.Name = "Label20"
-        Me.Label20.Size = New System.Drawing.Size(56, 20)
+        Me.Label20.Size = New System.Drawing.Size(38, 13)
         Me.Label20.TabIndex = 26
         Me.Label20.Text = "Height"
         '
         'Label38
         '
         Me.Label38.AutoSize = true
-        Me.Label38.Location = New System.Drawing.Point(273, 9)
-        Me.Label38.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label38.Location = New System.Drawing.Point(182, 6)
         Me.Label38.Name = "Label38"
-        Me.Label38.Size = New System.Drawing.Size(35, 20)
+        Me.Label38.Size = New System.Drawing.Size(24, 13)
         Me.Label38.TabIndex = 24
         Me.Label38.Text = "[m²]"
         '
@@ -946,10 +888,9 @@ Partial Class VehicleForm
         '
         Me.PictureBox1.BackColor = System.Drawing.Color.White
         Me.PictureBox1.Image = Global.TUGraz.VECTO.My.Resources.Resources.VECTO_VEH
-        Me.PictureBox1.Location = New System.Drawing.Point(0, 43)
-        Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PictureBox1.Location = New System.Drawing.Point(0, 28)
         Me.PictureBox1.Name = "PictureBox1"
-        Me.PictureBox1.Size = New System.Drawing.Size(906, 62)
+        Me.PictureBox1.Size = New System.Drawing.Size(604, 40)
         Me.PictureBox1.TabIndex = 37
         Me.PictureBox1.TabStop = false
         '
@@ -976,11 +917,9 @@ Partial Class VehicleForm
         'GroupBox3
         '
         Me.GroupBox3.Controls.Add(Me.PnWheelDiam)
-        Me.GroupBox3.Location = New System.Drawing.Point(9, 200)
-        Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox3.Location = New System.Drawing.Point(6, 130)
         Me.GroupBox3.Name = "GroupBox3"
-        Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox3.Size = New System.Drawing.Size(417, 77)
+        Me.GroupBox3.Size = New System.Drawing.Size(278, 50)
         Me.GroupBox3.TabIndex = 1
         Me.GroupBox3.TabStop = false
         Me.GroupBox3.Text = "Dynamic Tyre Radius"
@@ -989,11 +928,9 @@ Partial Class VehicleForm
         '
         Me.GroupBox2.Controls.Add(Me.pnAngledriveFields)
         Me.GroupBox2.Controls.Add(Me.cbAngledriveType)
-        Me.GroupBox2.Location = New System.Drawing.Point(436, 117)
-        Me.GroupBox2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox2.Location = New System.Drawing.Point(291, 76)
         Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox2.Size = New System.Drawing.Size(423, 171)
+        Me.GroupBox2.Size = New System.Drawing.Size(282, 111)
         Me.GroupBox2.TabIndex = 3
         Me.GroupBox2.TabStop = false
         Me.GroupBox2.Text = "Angledrive"
@@ -1006,39 +943,35 @@ Partial Class VehicleForm
         Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveRatio)
         Me.pnAngledriveFields.Controls.Add(Me.btAngledriveLossMapBrowse)
         Me.pnAngledriveFields.Controls.Add(Me.tbAngledriveLossMapPath)
-        Me.pnAngledriveFields.Location = New System.Drawing.Point(4, 65)
-        Me.pnAngledriveFields.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnAngledriveFields.Location = New System.Drawing.Point(3, 42)
         Me.pnAngledriveFields.Name = "pnAngledriveFields"
-        Me.pnAngledriveFields.Size = New System.Drawing.Size(408, 97)
+        Me.pnAngledriveFields.Size = New System.Drawing.Size(272, 63)
         Me.pnAngledriveFields.TabIndex = 1
         '
         'Label4
         '
         Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
         Me.Label4.AutoSize = true
-        Me.Label4.Location = New System.Drawing.Point(369, 9)
-        Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label4.Location = New System.Drawing.Point(246, 6)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(22, 20)
+        Me.Label4.Size = New System.Drawing.Size(16, 13)
         Me.Label4.TabIndex = 16
         Me.Label4.Text = "[-]"
         '
         'Label12
         '
-        Me.Label12.Location = New System.Drawing.Point(9, 35)
-        Me.Label12.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label12.Location = New System.Drawing.Point(6, 23)
         Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(394, 25)
+        Me.Label12.Size = New System.Drawing.Size(263, 16)
         Me.Label12.TabIndex = 17
         Me.Label12.Text = "Transmission Loss Map or Efficiency Value [0..1]"
         Me.Label12.TextAlign = System.Drawing.ContentAlignment.BottomLeft
         '
         'Label10
         '
-        Me.Label10.Location = New System.Drawing.Point(208, 9)
-        Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label10.Location = New System.Drawing.Point(139, 6)
         Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(66, 28)
+        Me.Label10.Size = New System.Drawing.Size(44, 18)
         Me.Label10.TabIndex = 15
         Me.Label10.Text = "Ratio"
         Me.Label10.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -1046,50 +979,45 @@ 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.Location = New System.Drawing.Point(282, 6)
-        Me.tbAngledriveRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbAngledriveRatio.Location = New System.Drawing.Point(188, 4)
         Me.tbAngledriveRatio.Name = "tbAngledriveRatio"
-        Me.tbAngledriveRatio.Size = New System.Drawing.Size(82, 26)
+        Me.tbAngledriveRatio.Size = New System.Drawing.Size(56, 20)
         Me.tbAngledriveRatio.TabIndex = 0
         '
         'btAngledriveLossMapBrowse
         '
         Me.btAngledriveLossMapBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
         Me.btAngledriveLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(368, 60)
-        Me.btAngledriveLossMapBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btAngledriveLossMapBrowse.Location = New System.Drawing.Point(245, 39)
         Me.btAngledriveLossMapBrowse.Name = "btAngledriveLossMapBrowse"
-        Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(36, 37)
+        Me.btAngledriveLossMapBrowse.Size = New System.Drawing.Size(24, 24)
         Me.btAngledriveLossMapBrowse.TabIndex = 2
         Me.btAngledriveLossMapBrowse.UseVisualStyleBackColor = true
         '
         'tbAngledriveLossMapPath
         '
         Me.tbAngledriveLossMapPath.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles)
-        Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(9, 63)
-        Me.tbAngledriveLossMapPath.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbAngledriveLossMapPath.Location = New System.Drawing.Point(6, 41)
         Me.tbAngledriveLossMapPath.Name = "tbAngledriveLossMapPath"
-        Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(356, 26)
+        Me.tbAngledriveLossMapPath.Size = New System.Drawing.Size(239, 20)
         Me.tbAngledriveLossMapPath.TabIndex = 1
         '
         'cbAngledriveType
         '
         Me.cbAngledriveType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.cbAngledriveType.FormattingEnabled = true
-        Me.cbAngledriveType.Location = New System.Drawing.Point(9, 29)
-        Me.cbAngledriveType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbAngledriveType.Location = New System.Drawing.Point(6, 19)
         Me.cbAngledriveType.Name = "cbAngledriveType"
-        Me.cbAngledriveType.Size = New System.Drawing.Size(397, 28)
+        Me.cbAngledriveType.Size = New System.Drawing.Size(266, 21)
         Me.cbAngledriveType.TabIndex = 0
         '
         'PicVehicle
         '
         Me.PicVehicle.BackColor = System.Drawing.Color.LightGray
         Me.PicVehicle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.PicVehicle.Location = New System.Drawing.Point(422, 108)
-        Me.PicVehicle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PicVehicle.Location = New System.Drawing.Point(281, 70)
         Me.PicVehicle.Name = "PicVehicle"
-        Me.PicVehicle.Size = New System.Drawing.Size(449, 134)
+        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
@@ -1097,47 +1025,42 @@ Partial Class VehicleForm
         'Label8
         '
         Me.Label8.AutoSize = true
-        Me.Label8.Location = New System.Drawing.Point(128, 222)
-        Me.Label8.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label8.Location = New System.Drawing.Point(85, 144)
         Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(93, 20)
+        Me.Label8.Size = New System.Drawing.Size(62, 13)
         Me.Label8.TabIndex = 10
         Me.Label8.Text = "HDV Group"
         '
         'cbPTOType
         '
         Me.cbPTOType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cbPTOType.Location = New System.Drawing.Point(9, 26)
-        Me.cbPTOType.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbPTOType.Location = New System.Drawing.Point(6, 17)
         Me.cbPTOType.Name = "cbPTOType"
-        Me.cbPTOType.Size = New System.Drawing.Size(823, 28)
+        Me.cbPTOType.Size = New System.Drawing.Size(550, 21)
         Me.cbPTOType.TabIndex = 0
         Me.ToolTip1.SetToolTip(Me.cbPTOType, "Transmission type to the PTO consumer")
         '
         'tbPTOCycle
         '
-        Me.tbPTOCycle.Location = New System.Drawing.Point(9, 109)
-        Me.tbPTOCycle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPTOCycle.Location = New System.Drawing.Point(6, 71)
         Me.tbPTOCycle.Name = "tbPTOCycle"
-        Me.tbPTOCycle.Size = New System.Drawing.Size(356, 26)
+        Me.tbPTOCycle.Size = New System.Drawing.Size(239, 20)
         Me.tbPTOCycle.TabIndex = 2
         Me.ToolTip1.SetToolTip(Me.tbPTOCycle, "PTO Consumer Loss Map")
         '
         'tbPTOLossMap
         '
-        Me.tbPTOLossMap.Location = New System.Drawing.Point(9, 37)
-        Me.tbPTOLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPTOLossMap.Location = New System.Drawing.Point(6, 24)
         Me.tbPTOLossMap.Name = "tbPTOLossMap"
-        Me.tbPTOLossMap.Size = New System.Drawing.Size(356, 26)
+        Me.tbPTOLossMap.Size = New System.Drawing.Size(239, 20)
         Me.tbPTOLossMap.TabIndex = 0
         Me.ToolTip1.SetToolTip(Me.tbPTOLossMap, "PTO Consumer Loss Map")
         '
         'tbPTODrive
         '
-        Me.tbPTODrive.Location = New System.Drawing.Point(9, 282)
-        Me.tbPTODrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPTODrive.Location = New System.Drawing.Point(6, 183)
         Me.tbPTODrive.Name = "tbPTODrive"
-        Me.tbPTODrive.Size = New System.Drawing.Size(356, 26)
+        Me.tbPTODrive.Size = New System.Drawing.Size(239, 20)
         Me.tbPTODrive.TabIndex = 5
         Me.ToolTip1.SetToolTip(Me.tbPTODrive, "PTO Consumer Loss Map")
         '
@@ -1149,11 +1072,10 @@ Partial Class VehicleForm
         Me.tcVehicleComponents.Controls.Add(Me.tpTorqueLimits)
         Me.tcVehicleComponents.Controls.Add(Me.tpADAS)
         Me.tcVehicleComponents.Controls.Add(Me.tpRoadSweeper)
-        Me.tcVehicleComponents.Location = New System.Drawing.Point(9, 266)
-        Me.tcVehicleComponents.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tcVehicleComponents.Location = New System.Drawing.Point(6, 173)
         Me.tcVehicleComponents.Name = "tcVehicleComponents"
         Me.tcVehicleComponents.SelectedIndex = 0
-        Me.tcVehicleComponents.Size = New System.Drawing.Size(984, 615)
+        Me.tcVehicleComponents.Size = New System.Drawing.Size(656, 400)
         Me.tcVehicleComponents.TabIndex = 5
         '
         'tpGeneral
@@ -1163,11 +1085,10 @@ Partial Class VehicleForm
         Me.tpGeneral.Controls.Add(Me.GroupBox6)
         Me.tpGeneral.Controls.Add(Me.GroupBox8)
         Me.tpGeneral.Controls.Add(Me.GrAirRes)
-        Me.tpGeneral.Location = New System.Drawing.Point(4, 29)
-        Me.tpGeneral.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tpGeneral.Location = New System.Drawing.Point(4, 22)
         Me.tpGeneral.Name = "tpGeneral"
-        Me.tpGeneral.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tpGeneral.Size = New System.Drawing.Size(976, 582)
+        Me.tpGeneral.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.tpGeneral.Size = New System.Drawing.Size(648, 374)
         Me.tpGeneral.TabIndex = 0
         Me.tpGeneral.Text = "General"
         Me.tpGeneral.UseVisualStyleBackColor = true
@@ -1178,11 +1099,10 @@ Partial Class VehicleForm
         Me.tpPowertrain.Controls.Add(Me.GroupBox9)
         Me.tpPowertrain.Controls.Add(Me.GroupBox7)
         Me.tpPowertrain.Controls.Add(Me.GroupBox2)
-        Me.tpPowertrain.Location = New System.Drawing.Point(4, 29)
-        Me.tpPowertrain.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tpPowertrain.Location = New System.Drawing.Point(4, 22)
         Me.tpPowertrain.Name = "tpPowertrain"
-        Me.tpPowertrain.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tpPowertrain.Size = New System.Drawing.Size(976, 582)
+        Me.tpPowertrain.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.tpPowertrain.Size = New System.Drawing.Size(648, 374)
         Me.tpPowertrain.TabIndex = 1
         Me.tpPowertrain.Text = "Powertrain"
         Me.tpPowertrain.UseVisualStyleBackColor = true
@@ -1190,11 +1110,9 @@ Partial Class VehicleForm
         'GroupBox4
         '
         Me.GroupBox4.Controls.Add(Me.Panel1)
-        Me.GroupBox4.Location = New System.Drawing.Point(9, 11)
-        Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox4.Location = New System.Drawing.Point(6, 7)
         Me.GroupBox4.Name = "GroupBox4"
-        Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox4.Size = New System.Drawing.Size(418, 97)
+        Me.GroupBox4.Size = New System.Drawing.Size(279, 63)
         Me.GroupBox4.TabIndex = 0
         Me.GroupBox4.TabStop = false
         Me.GroupBox4.Text = "Vehicle Idling Speed"
@@ -1205,37 +1123,33 @@ Partial Class VehicleForm
         Me.Panel1.Controls.Add(Me.Label18)
         Me.Panel1.Controls.Add(Me.Label19)
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Panel1.Location = New System.Drawing.Point(4, 24)
-        Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.Panel1.Location = New System.Drawing.Point(3, 16)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(410, 68)
+        Me.Panel1.Size = New System.Drawing.Size(273, 44)
         Me.Panel1.TabIndex = 0
         '
         'tbVehIdlingSpeed
         '
-        Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(260, 5)
-        Me.tbVehIdlingSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbVehIdlingSpeed.Location = New System.Drawing.Point(173, 3)
         Me.tbVehIdlingSpeed.Name = "tbVehIdlingSpeed"
-        Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(84, 26)
+        Me.tbVehIdlingSpeed.Size = New System.Drawing.Size(57, 20)
         Me.tbVehIdlingSpeed.TabIndex = 0
         '
         'Label18
         '
         Me.Label18.AutoSize = true
-        Me.Label18.Location = New System.Drawing.Point(350, 9)
-        Me.Label18.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label18.Location = New System.Drawing.Point(233, 6)
         Me.Label18.Name = "Label18"
-        Me.Label18.Size = New System.Drawing.Size(44, 20)
+        Me.Label18.Size = New System.Drawing.Size(30, 13)
         Me.Label18.TabIndex = 24
         Me.Label18.Text = "[rpm]"
         '
         'Label19
         '
         Me.Label19.AutoSize = true
-        Me.Label19.Location = New System.Drawing.Point(110, 9)
-        Me.Label19.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label19.Location = New System.Drawing.Point(73, 6)
         Me.Label19.Name = "Label19"
-        Me.Label19.Size = New System.Drawing.Size(140, 20)
+        Me.Label19.Size = New System.Drawing.Size(94, 13)
         Me.Label19.TabIndex = 8
         Me.Label19.Text = "Engine Idle Speed"
         '
@@ -1243,11 +1157,9 @@ Partial Class VehicleForm
         '
         Me.GroupBox9.Controls.Add(Me.cbTankSystem)
         Me.GroupBox9.Controls.Add(Me.Label23)
-        Me.GroupBox9.Location = New System.Drawing.Point(459, 11)
-        Me.GroupBox9.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.GroupBox9.Location = New System.Drawing.Point(306, 7)
         Me.GroupBox9.Name = "GroupBox9"
-        Me.GroupBox9.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox9.Size = New System.Drawing.Size(396, 97)
+        Me.GroupBox9.Size = New System.Drawing.Size(264, 63)
         Me.GroupBox9.TabIndex = 2
         Me.GroupBox9.TabStop = false
         Me.GroupBox9.Text = "Tank System"
@@ -1255,18 +1167,16 @@ Partial Class VehicleForm
         'cbTankSystem
         '
         Me.cbTankSystem.FormattingEnabled = true
-        Me.cbTankSystem.Location = New System.Drawing.Point(14, 51)
-        Me.cbTankSystem.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbTankSystem.Location = New System.Drawing.Point(9, 33)
         Me.cbTankSystem.Name = "cbTankSystem"
-        Me.cbTankSystem.Size = New System.Drawing.Size(368, 28)
+        Me.cbTankSystem.Size = New System.Drawing.Size(247, 21)
         Me.cbTankSystem.TabIndex = 1
         '
         '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.Location = New System.Drawing.Point(9, 25)
-        Me.Label23.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label23.Location = New System.Drawing.Point(6, 16)
         Me.Label23.Name = "Label23"
         Me.Label23.Size = New System.Drawing.Size(277, 20)
         Me.Label23.TabIndex = 0
@@ -1276,11 +1186,10 @@ Partial Class VehicleForm
         '
         Me.tpElectricComponents.Controls.Add(Me.gbBattery)
         Me.tpElectricComponents.Controls.Add(Me.gpElectricMotor)
-        Me.tpElectricComponents.Location = New System.Drawing.Point(4, 29)
-        Me.tpElectricComponents.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tpElectricComponents.Location = New System.Drawing.Point(4, 22)
         Me.tpElectricComponents.Name = "tpElectricComponents"
-        Me.tpElectricComponents.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tpElectricComponents.Size = New System.Drawing.Size(976, 582)
+        Me.tpElectricComponents.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.tpElectricComponents.Size = New System.Drawing.Size(648, 374)
         Me.tpElectricComponents.TabIndex = 4
         Me.tpElectricComponents.Text = "Electric Components"
         Me.tpElectricComponents.UseVisualStyleBackColor = true
@@ -1294,11 +1203,9 @@ Partial Class VehicleForm
         Me.gbBattery.Controls.Add(Me.lblInitialSoCUnit)
         Me.gbBattery.Controls.Add(Me.tbInitialSoC)
         Me.gbBattery.Controls.Add(Me.lblInitialSoC)
-        Me.gbBattery.Location = New System.Drawing.Point(9, 269)
-        Me.gbBattery.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbBattery.Location = New System.Drawing.Point(6, 175)
         Me.gbBattery.Name = "gbBattery"
-        Me.gbBattery.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbBattery.Size = New System.Drawing.Size(950, 288)
+        Me.gbBattery.Size = New System.Drawing.Size(633, 187)
         Me.gbBattery.TabIndex = 2
         Me.gbBattery.TabStop = false
         Me.gbBattery.Text = "Electric Energy Storage system"
@@ -1311,11 +1218,10 @@ Partial Class VehicleForm
         Me.lvREESSPacks.FullRowSelect = true
         Me.lvREESSPacks.GridLines = true
         Me.lvREESSPacks.HideSelection = false
-        Me.lvREESSPacks.Location = New System.Drawing.Point(9, 69)
-        Me.lvREESSPacks.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.lvREESSPacks.Location = New System.Drawing.Point(6, 45)
         Me.lvREESSPacks.MultiSelect = false
         Me.lvREESSPacks.Name = "lvREESSPacks"
-        Me.lvREESSPacks.Size = New System.Drawing.Size(828, 155)
+        Me.lvREESSPacks.Size = New System.Drawing.Size(553, 102)
         Me.lvREESSPacks.TabIndex = 31
         Me.lvREESSPacks.TabStop = false
         Me.lvREESSPacks.UseCompatibleStateImageBehavior = false
@@ -1339,59 +1245,53 @@ Partial Class VehicleForm
         'btnAddReessPack
         '
         Me.btnAddReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.btnAddReessPack.Location = New System.Drawing.Point(9, 235)
-        Me.btnAddReessPack.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnAddReessPack.Location = New System.Drawing.Point(6, 153)
         Me.btnAddReessPack.Name = "btnAddReessPack"
-        Me.btnAddReessPack.Size = New System.Drawing.Size(36, 37)
+        Me.btnAddReessPack.Size = New System.Drawing.Size(24, 24)
         Me.btnAddReessPack.TabIndex = 1
         Me.btnAddReessPack.UseVisualStyleBackColor = true
         '
         'lblEditReessPack
         '
         Me.lblEditReessPack.AutoSize = true
-        Me.lblEditReessPack.Location = New System.Drawing.Point(676, 245)
-        Me.lblEditReessPack.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblEditReessPack.Location = New System.Drawing.Point(451, 159)
         Me.lblEditReessPack.Name = "lblEditReessPack"
-        Me.lblEditReessPack.Size = New System.Drawing.Size(158, 20)
+        Me.lblEditReessPack.Size = New System.Drawing.Size(106, 13)
         Me.lblEditReessPack.TabIndex = 30
         Me.lblEditReessPack.Text = "(Double-Click to Edit)"
         '
         'btnRemoveReessPack
         '
         Me.btnRemoveReessPack.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.btnRemoveReessPack.Location = New System.Drawing.Point(50, 235)
-        Me.btnRemoveReessPack.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnRemoveReessPack.Location = New System.Drawing.Point(33, 153)
         Me.btnRemoveReessPack.Name = "btnRemoveReessPack"
-        Me.btnRemoveReessPack.Size = New System.Drawing.Size(36, 37)
+        Me.btnRemoveReessPack.Size = New System.Drawing.Size(24, 24)
         Me.btnRemoveReessPack.TabIndex = 2
         Me.btnRemoveReessPack.UseVisualStyleBackColor = true
         '
         'lblInitialSoCUnit
         '
         Me.lblInitialSoCUnit.AutoSize = true
-        Me.lblInitialSoCUnit.Location = New System.Drawing.Point(404, 34)
-        Me.lblInitialSoCUnit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblInitialSoCUnit.Location = New System.Drawing.Point(269, 22)
         Me.lblInitialSoCUnit.Name = "lblInitialSoCUnit"
-        Me.lblInitialSoCUnit.Size = New System.Drawing.Size(31, 20)
+        Me.lblInitialSoCUnit.Size = New System.Drawing.Size(21, 13)
         Me.lblInitialSoCUnit.TabIndex = 27
         Me.lblInitialSoCUnit.Text = "[%]"
         '
         'tbInitialSoC
         '
-        Me.tbInitialSoC.Location = New System.Drawing.Point(306, 29)
-        Me.tbInitialSoC.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbInitialSoC.Location = New System.Drawing.Point(204, 19)
         Me.tbInitialSoC.Name = "tbInitialSoC"
-        Me.tbInitialSoC.Size = New System.Drawing.Size(86, 26)
+        Me.tbInitialSoC.Size = New System.Drawing.Size(59, 20)
         Me.tbInitialSoC.TabIndex = 0
         '
         'lblInitialSoC
         '
         Me.lblInitialSoC.AutoSize = true
-        Me.lblInitialSoC.Location = New System.Drawing.Point(10, 34)
-        Me.lblInitialSoC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblInitialSoC.Location = New System.Drawing.Point(7, 22)
         Me.lblInitialSoC.Name = "lblInitialSoC"
         Me.lblInitialSoC.RightToLeft = System.Windows.Forms.RightToLeft.Yes
-        Me.lblInitialSoC.Size = New System.Drawing.Size(81, 20)
+        Me.lblInitialSoC.Size = New System.Drawing.Size(54, 13)
         Me.lblInitialSoC.TabIndex = 25
         Me.lblInitialSoC.Text = "Initial SoC"
         '
@@ -1408,11 +1308,9 @@ Partial Class VehicleForm
         Me.gpElectricMotor.Controls.Add(Me.lblEmCount)
         Me.gpElectricMotor.Controls.Add(Me.lblEmPosition)
         Me.gpElectricMotor.Controls.Add(Me.pnElectricMotor)
-        Me.gpElectricMotor.Location = New System.Drawing.Point(9, 9)
-        Me.gpElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gpElectricMotor.Location = New System.Drawing.Point(6, 6)
         Me.gpElectricMotor.Name = "gpElectricMotor"
-        Me.gpElectricMotor.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gpElectricMotor.Size = New System.Drawing.Size(950, 251)
+        Me.gpElectricMotor.Size = New System.Drawing.Size(633, 163)
         Me.gpElectricMotor.TabIndex = 0
         Me.gpElectricMotor.TabStop = false
         Me.gpElectricMotor.Text = "Electric Motor"
@@ -1423,11 +1321,9 @@ Partial Class VehicleForm
         Me.gbRatiosPerGear.Controls.Add(Me.btnAddEMRatio)
         Me.gbRatiosPerGear.Controls.Add(Me.Label29)
         Me.gbRatiosPerGear.Controls.Add(Me.btnRemoveEMRatio)
-        Me.gbRatiosPerGear.Location = New System.Drawing.Point(666, 18)
-        Me.gbRatiosPerGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbRatiosPerGear.Location = New System.Drawing.Point(444, 12)
         Me.gbRatiosPerGear.Name = "gbRatiosPerGear"
-        Me.gbRatiosPerGear.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbRatiosPerGear.Size = New System.Drawing.Size(272, 223)
+        Me.gbRatiosPerGear.Size = New System.Drawing.Size(181, 145)
         Me.gbRatiosPerGear.TabIndex = 1
         Me.gbRatiosPerGear.TabStop = false
         Me.gbRatiosPerGear.Text = "Transmission Ratio per Gear"
@@ -1440,11 +1336,10 @@ Partial Class VehicleForm
         Me.lvRatioPerGear.FullRowSelect = true
         Me.lvRatioPerGear.GridLines = true
         Me.lvRatioPerGear.HideSelection = false
-        Me.lvRatioPerGear.Location = New System.Drawing.Point(9, 25)
-        Me.lvRatioPerGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.lvRatioPerGear.Location = New System.Drawing.Point(6, 16)
         Me.lvRatioPerGear.MultiSelect = false
         Me.lvRatioPerGear.Name = "lvRatioPerGear"
-        Me.lvRatioPerGear.Size = New System.Drawing.Size(252, 142)
+        Me.lvRatioPerGear.Size = New System.Drawing.Size(169, 94)
         Me.lvRatioPerGear.TabIndex = 7
         Me.lvRatioPerGear.TabStop = false
         Me.lvRatioPerGear.UseCompatibleStateImageBehavior = false
@@ -1463,30 +1358,27 @@ Partial Class VehicleForm
         'btnAddEMRatio
         '
         Me.btnAddEMRatio.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.btnAddEMRatio.Location = New System.Drawing.Point(9, 178)
-        Me.btnAddEMRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnAddEMRatio.Location = New System.Drawing.Point(6, 116)
         Me.btnAddEMRatio.Name = "btnAddEMRatio"
-        Me.btnAddEMRatio.Size = New System.Drawing.Size(36, 37)
+        Me.btnAddEMRatio.Size = New System.Drawing.Size(24, 24)
         Me.btnAddEMRatio.TabIndex = 4
         Me.btnAddEMRatio.UseVisualStyleBackColor = true
         '
         'Label29
         '
         Me.Label29.AutoSize = true
-        Me.Label29.Location = New System.Drawing.Point(106, 186)
-        Me.Label29.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label29.Location = New System.Drawing.Point(71, 121)
         Me.Label29.Name = "Label29"
-        Me.Label29.Size = New System.Drawing.Size(158, 20)
+        Me.Label29.Size = New System.Drawing.Size(106, 13)
         Me.Label29.TabIndex = 6
         Me.Label29.Text = "(Double-Click to Edit)"
         '
         'btnRemoveEMRatio
         '
         Me.btnRemoveEMRatio.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.btnRemoveEMRatio.Location = New System.Drawing.Point(50, 178)
-        Me.btnRemoveEMRatio.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnRemoveEMRatio.Location = New System.Drawing.Point(33, 116)
         Me.btnRemoveEMRatio.Name = "btnRemoveEMRatio"
-        Me.btnRemoveEMRatio.Size = New System.Drawing.Size(36, 37)
+        Me.btnRemoveEMRatio.Size = New System.Drawing.Size(24, 24)
         Me.btnRemoveEMRatio.TabIndex = 5
         Me.btnRemoveEMRatio.UseVisualStyleBackColor = true
         '
@@ -1494,83 +1386,74 @@ Partial Class VehicleForm
         '
         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(621, 195)
-        Me.btnEmADCLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnEmADCLossMap.Location = New System.Drawing.Point(414, 127)
         Me.btnEmADCLossMap.Name = "btnEmADCLossMap"
-        Me.btnEmADCLossMap.Size = New System.Drawing.Size(36, 37)
+        Me.btnEmADCLossMap.Size = New System.Drawing.Size(24, 24)
         Me.btnEmADCLossMap.TabIndex = 5
         Me.btnEmADCLossMap.UseVisualStyleBackColor = true
         '
         'tbEmADCLossMap
         '
-        Me.tbEmADCLossMap.Location = New System.Drawing.Point(306, 202)
-        Me.tbEmADCLossMap.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbEmADCLossMap.Location = New System.Drawing.Point(204, 131)
         Me.tbEmADCLossMap.Name = "tbEmADCLossMap"
-        Me.tbEmADCLossMap.Size = New System.Drawing.Size(301, 26)
+        Me.tbEmADCLossMap.Size = New System.Drawing.Size(202, 20)
         Me.tbEmADCLossMap.TabIndex = 4
         '
         'lblEmADCLossmap
         '
         Me.lblEmADCLossmap.AutoSize = true
-        Me.lblEmADCLossmap.Location = New System.Drawing.Point(10, 206)
-        Me.lblEmADCLossmap.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblEmADCLossmap.Location = New System.Drawing.Point(7, 134)
         Me.lblEmADCLossmap.Name = "lblEmADCLossmap"
-        Me.lblEmADCLossmap.Size = New System.Drawing.Size(148, 20)
+        Me.lblEmADCLossmap.Size = New System.Drawing.Size(100, 13)
         Me.lblEmADCLossmap.TabIndex = 25
         Me.lblEmADCLossmap.Text = "Loss Map EM ADC:"
         '
         'tbRatioEm
         '
-        Me.tbRatioEm.Location = New System.Drawing.Point(306, 162)
-        Me.tbRatioEm.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbRatioEm.Location = New System.Drawing.Point(204, 105)
         Me.tbRatioEm.Name = "tbRatioEm"
-        Me.tbRatioEm.Size = New System.Drawing.Size(86, 26)
+        Me.tbRatioEm.Size = New System.Drawing.Size(59, 20)
         Me.tbRatioEm.TabIndex = 3
         '
         'lblRatioEm
         '
         Me.lblRatioEm.AutoSize = true
-        Me.lblRatioEm.Location = New System.Drawing.Point(10, 166)
-        Me.lblRatioEm.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblRatioEm.Location = New System.Drawing.Point(7, 108)
         Me.lblRatioEm.Name = "lblRatioEm"
-        Me.lblRatioEm.Size = New System.Drawing.Size(117, 20)
+        Me.lblRatioEm.Size = New System.Drawing.Size(79, 13)
         Me.lblRatioEm.TabIndex = 23
         Me.lblRatioEm.Text = "Ratio EM ADC:"
         '
         'tbEmCount
         '
-        Me.tbEmCount.Location = New System.Drawing.Point(306, 122)
-        Me.tbEmCount.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbEmCount.Location = New System.Drawing.Point(204, 79)
         Me.tbEmCount.Name = "tbEmCount"
-        Me.tbEmCount.Size = New System.Drawing.Size(86, 26)
+        Me.tbEmCount.Size = New System.Drawing.Size(59, 20)
         Me.tbEmCount.TabIndex = 2
         '
         'cbEmPos
         '
         Me.cbEmPos.FormattingEnabled = true
-        Me.cbEmPos.Location = New System.Drawing.Point(213, 80)
-        Me.cbEmPos.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbEmPos.Location = New System.Drawing.Point(142, 52)
         Me.cbEmPos.Name = "cbEmPos"
-        Me.cbEmPos.Size = New System.Drawing.Size(180, 28)
+        Me.cbEmPos.Size = New System.Drawing.Size(121, 21)
         Me.cbEmPos.TabIndex = 1
         '
         'lblEmCount
         '
         Me.lblEmCount.AutoSize = true
-        Me.lblEmCount.Location = New System.Drawing.Point(10, 126)
-        Me.lblEmCount.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblEmCount.Location = New System.Drawing.Point(7, 82)
         Me.lblEmCount.Name = "lblEmCount"
-        Me.lblEmCount.Size = New System.Drawing.Size(123, 20)
+        Me.lblEmCount.Size = New System.Drawing.Size(83, 13)
         Me.lblEmCount.TabIndex = 20
         Me.lblEmCount.Text = "Number of EMs:"
         '
         'lblEmPosition
         '
         Me.lblEmPosition.AutoSize = true
-        Me.lblEmPosition.Location = New System.Drawing.Point(10, 86)
-        Me.lblEmPosition.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblEmPosition.Location = New System.Drawing.Point(7, 56)
         Me.lblEmPosition.Name = "lblEmPosition"
-        Me.lblEmPosition.Size = New System.Drawing.Size(69, 20)
+        Me.lblEmPosition.Size = New System.Drawing.Size(47, 13)
         Me.lblEmPosition.TabIndex = 19
         Me.lblEmPosition.Text = "Position:"
         '
@@ -1579,18 +1462,16 @@ Partial Class VehicleForm
         Me.pnElectricMotor.Controls.Add(Me.btnOpenElectricMotor)
         Me.pnElectricMotor.Controls.Add(Me.btnBrowseElectricMotor)
         Me.pnElectricMotor.Controls.Add(Me.tbElectricMotor)
-        Me.pnElectricMotor.Location = New System.Drawing.Point(9, 29)
-        Me.pnElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnElectricMotor.Location = New System.Drawing.Point(6, 19)
         Me.pnElectricMotor.Name = "pnElectricMotor"
-        Me.pnElectricMotor.Size = New System.Drawing.Size(648, 42)
+        Me.pnElectricMotor.Size = New System.Drawing.Size(432, 27)
         Me.pnElectricMotor.TabIndex = 0
         '
         'btnOpenElectricMotor
         '
-        Me.btnOpenElectricMotor.Location = New System.Drawing.Point(6, 5)
-        Me.btnOpenElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnOpenElectricMotor.Location = New System.Drawing.Point(4, 3)
         Me.btnOpenElectricMotor.Name = "btnOpenElectricMotor"
-        Me.btnOpenElectricMotor.Size = New System.Drawing.Size(141, 32)
+        Me.btnOpenElectricMotor.Size = New System.Drawing.Size(94, 21)
         Me.btnOpenElectricMotor.TabIndex = 0
         Me.btnOpenElectricMotor.Text = "Electric Motor"
         Me.btnOpenElectricMotor.UseVisualStyleBackColor = true
@@ -1599,10 +1480,9 @@ Partial Class VehicleForm
         '
         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(609, 3)
-        Me.btnBrowseElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnBrowseElectricMotor.Location = New System.Drawing.Point(406, 2)
         Me.btnBrowseElectricMotor.Name = "btnBrowseElectricMotor"
-        Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(36, 37)
+        Me.btnBrowseElectricMotor.Size = New System.Drawing.Size(24, 24)
         Me.btnBrowseElectricMotor.TabIndex = 2
         Me.btnBrowseElectricMotor.UseVisualStyleBackColor = true
         '
@@ -1610,10 +1490,9 @@ Partial Class VehicleForm
         '
         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(156, 6)
-        Me.tbElectricMotor.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbElectricMotor.Location = New System.Drawing.Point(104, 4)
         Me.tbElectricMotor.Name = "tbElectricMotor"
-        Me.tbElectricMotor.Size = New System.Drawing.Size(442, 26)
+        Me.tbElectricMotor.Size = New System.Drawing.Size(296, 20)
         Me.tbElectricMotor.TabIndex = 1
         '
         'tpTorqueLimits
@@ -1621,10 +1500,9 @@ Partial Class VehicleForm
         Me.tpTorqueLimits.Controls.Add(Me.gbPropulsionTorque)
         Me.tpTorqueLimits.Controls.Add(Me.gbEMTorqueLimits)
         Me.tpTorqueLimits.Controls.Add(Me.bgVehicleTorqueLimits)
-        Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 29)
-        Me.tpTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tpTorqueLimits.Location = New System.Drawing.Point(4, 22)
         Me.tpTorqueLimits.Name = "tpTorqueLimits"
-        Me.tpTorqueLimits.Size = New System.Drawing.Size(976, 582)
+        Me.tpTorqueLimits.Size = New System.Drawing.Size(648, 374)
         Me.tpTorqueLimits.TabIndex = 2
         Me.tpTorqueLimits.Text = "Torque Limits"
         Me.tpTorqueLimits.UseVisualStyleBackColor = true
@@ -1633,11 +1511,9 @@ Partial Class VehicleForm
         '
         Me.gbPropulsionTorque.Controls.Add(Me.btnPropulsionTorqueLimit)
         Me.gbPropulsionTorque.Controls.Add(Me.tbPropulsionTorqueLimit)
-        Me.gbPropulsionTorque.Location = New System.Drawing.Point(4, 363)
-        Me.gbPropulsionTorque.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbPropulsionTorque.Location = New System.Drawing.Point(3, 236)
         Me.gbPropulsionTorque.Name = "gbPropulsionTorque"
-        Me.gbPropulsionTorque.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbPropulsionTorque.Size = New System.Drawing.Size(610, 80)
+        Me.gbPropulsionTorque.Size = New System.Drawing.Size(407, 52)
         Me.gbPropulsionTorque.TabIndex = 2
         Me.gbPropulsionTorque.TabStop = false
         Me.gbPropulsionTorque.Text = "Propulsion Torque Limit"
@@ -1645,30 +1521,26 @@ Partial Class VehicleForm
         'btnPropulsionTorqueLimit
         '
         Me.btnPropulsionTorqueLimit.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(496, 26)
-        Me.btnPropulsionTorqueLimit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnPropulsionTorqueLimit.Location = New System.Drawing.Point(331, 17)
         Me.btnPropulsionTorqueLimit.Name = "btnPropulsionTorqueLimit"
-        Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(36, 37)
+        Me.btnPropulsionTorqueLimit.Size = New System.Drawing.Size(24, 24)
         Me.btnPropulsionTorqueLimit.TabIndex = 1
         Me.btnPropulsionTorqueLimit.UseVisualStyleBackColor = true
         '
         'tbPropulsionTorqueLimit
         '
-        Me.tbPropulsionTorqueLimit.Location = New System.Drawing.Point(9, 31)
-        Me.tbPropulsionTorqueLimit.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPropulsionTorqueLimit.Location = New System.Drawing.Point(6, 20)
         Me.tbPropulsionTorqueLimit.Name = "tbPropulsionTorqueLimit"
-        Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(476, 26)
+        Me.tbPropulsionTorqueLimit.Size = New System.Drawing.Size(319, 20)
         Me.tbPropulsionTorqueLimit.TabIndex = 0
         '
         'gbEMTorqueLimits
         '
         Me.gbEMTorqueLimits.Controls.Add(Me.btnEmTorqueLimits)
         Me.gbEMTorqueLimits.Controls.Add(Me.tbEmTorqueLimits)
-        Me.gbEMTorqueLimits.Location = New System.Drawing.Point(4, 274)
-        Me.gbEMTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbEMTorqueLimits.Location = New System.Drawing.Point(3, 178)
         Me.gbEMTorqueLimits.Name = "gbEMTorqueLimits"
-        Me.gbEMTorqueLimits.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbEMTorqueLimits.Size = New System.Drawing.Size(610, 80)
+        Me.gbEMTorqueLimits.Size = New System.Drawing.Size(407, 52)
         Me.gbEMTorqueLimits.TabIndex = 1
         Me.gbEMTorqueLimits.TabStop = false
         Me.gbEMTorqueLimits.Text = "Electric Machine Torque Limits"
@@ -1676,19 +1548,17 @@ Partial Class VehicleForm
         'btnEmTorqueLimits
         '
         Me.btnEmTorqueLimits.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.btnEmTorqueLimits.Location = New System.Drawing.Point(496, 26)
-        Me.btnEmTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btnEmTorqueLimits.Location = New System.Drawing.Point(331, 17)
         Me.btnEmTorqueLimits.Name = "btnEmTorqueLimits"
-        Me.btnEmTorqueLimits.Size = New System.Drawing.Size(36, 37)
+        Me.btnEmTorqueLimits.Size = New System.Drawing.Size(24, 24)
         Me.btnEmTorqueLimits.TabIndex = 1
         Me.btnEmTorqueLimits.UseVisualStyleBackColor = true
         '
         'tbEmTorqueLimits
         '
-        Me.tbEmTorqueLimits.Location = New System.Drawing.Point(9, 31)
-        Me.tbEmTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbEmTorqueLimits.Location = New System.Drawing.Point(6, 20)
         Me.tbEmTorqueLimits.Name = "tbEmTorqueLimits"
-        Me.tbEmTorqueLimits.Size = New System.Drawing.Size(476, 26)
+        Me.tbEmTorqueLimits.Size = New System.Drawing.Size(319, 20)
         Me.tbEmTorqueLimits.TabIndex = 0
         '
         'bgVehicleTorqueLimits
@@ -1697,11 +1567,9 @@ Partial Class VehicleForm
         Me.bgVehicleTorqueLimits.Controls.Add(Me.btAddMaxTorqueEntry)
         Me.bgVehicleTorqueLimits.Controls.Add(Me.Label17)
         Me.bgVehicleTorqueLimits.Controls.Add(Me.btDelMaxTorqueEntry)
-        Me.bgVehicleTorqueLimits.Location = New System.Drawing.Point(4, 14)
-        Me.bgVehicleTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.bgVehicleTorqueLimits.Location = New System.Drawing.Point(3, 9)
         Me.bgVehicleTorqueLimits.Name = "bgVehicleTorqueLimits"
-        Me.bgVehicleTorqueLimits.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(610, 251)
+        Me.bgVehicleTorqueLimits.Size = New System.Drawing.Size(407, 163)
         Me.bgVehicleTorqueLimits.TabIndex = 0
         Me.bgVehicleTorqueLimits.TabStop = false
         Me.bgVehicleTorqueLimits.Text = "ICE Torque Limits"
@@ -1714,11 +1582,10 @@ Partial Class VehicleForm
         Me.lvTorqueLimits.FullRowSelect = true
         Me.lvTorqueLimits.GridLines = true
         Me.lvTorqueLimits.HideSelection = false
-        Me.lvTorqueLimits.Location = New System.Drawing.Point(9, 29)
-        Me.lvTorqueLimits.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.lvTorqueLimits.Location = New System.Drawing.Point(6, 19)
         Me.lvTorqueLimits.MultiSelect = false
         Me.lvTorqueLimits.Name = "lvTorqueLimits"
-        Me.lvTorqueLimits.Size = New System.Drawing.Size(421, 155)
+        Me.lvTorqueLimits.Size = New System.Drawing.Size(282, 102)
         Me.lvTorqueLimits.TabIndex = 7
         Me.lvTorqueLimits.TabStop = false
         Me.lvTorqueLimits.UseCompatibleStateImageBehavior = false
@@ -1737,69 +1604,62 @@ Partial Class VehicleForm
         'btAddMaxTorqueEntry
         '
         Me.btAddMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.plus_circle_icon
-        Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(9, 195)
-        Me.btAddMaxTorqueEntry.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btAddMaxTorqueEntry.Location = New System.Drawing.Point(6, 127)
         Me.btAddMaxTorqueEntry.Name = "btAddMaxTorqueEntry"
-        Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(36, 37)
+        Me.btAddMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
         Me.btAddMaxTorqueEntry.TabIndex = 4
         Me.btAddMaxTorqueEntry.UseVisualStyleBackColor = true
         '
         'Label17
         '
         Me.Label17.AutoSize = true
-        Me.Label17.Location = New System.Drawing.Point(273, 191)
-        Me.Label17.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label17.Location = New System.Drawing.Point(182, 124)
         Me.Label17.Name = "Label17"
-        Me.Label17.Size = New System.Drawing.Size(158, 20)
+        Me.Label17.Size = New System.Drawing.Size(106, 13)
         Me.Label17.TabIndex = 6
         Me.Label17.Text = "(Double-Click to Edit)"
         '
         'btDelMaxTorqueEntry
         '
         Me.btDelMaxTorqueEntry.Image = Global.TUGraz.VECTO.My.Resources.Resources.minus_circle_icon
-        Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(45, 195)
-        Me.btDelMaxTorqueEntry.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btDelMaxTorqueEntry.Location = New System.Drawing.Point(30, 127)
         Me.btDelMaxTorqueEntry.Name = "btDelMaxTorqueEntry"
-        Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(36, 37)
+        Me.btDelMaxTorqueEntry.Size = New System.Drawing.Size(24, 24)
         Me.btDelMaxTorqueEntry.TabIndex = 5
         Me.btDelMaxTorqueEntry.UseVisualStyleBackColor = true
         '
         'tpADAS
         '
-        Me.tpADAS.Controls.Add(Me.GroupBox5)
-        Me.tpADAS.Location = New System.Drawing.Point(4, 29)
-        Me.tpADAS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tpADAS.Controls.Add(Me.gbADAS)
+        Me.tpADAS.Location = New System.Drawing.Point(4, 22)
         Me.tpADAS.Name = "tpADAS"
-        Me.tpADAS.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.tpADAS.Size = New System.Drawing.Size(976, 582)
+        Me.tpADAS.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3)
+        Me.tpADAS.Size = New System.Drawing.Size(648, 374)
         Me.tpADAS.TabIndex = 3
         Me.tpADAS.Text = "ADAS"
         Me.tpADAS.UseVisualStyleBackColor = true
         '
-        'GroupBox5
-        '
-        Me.GroupBox5.Controls.Add(Me.cbAtEcoRollReleaseLockupClutch)
-        Me.GroupBox5.Controls.Add(Me.cbPcc)
-        Me.GroupBox5.Controls.Add(Me.cbEcoRoll)
-        Me.GroupBox5.Controls.Add(Me.Label22)
-        Me.GroupBox5.Controls.Add(Me.cbEngineStopStart)
-        Me.GroupBox5.Controls.Add(Me.lblPCC)
-        Me.GroupBox5.Location = New System.Drawing.Point(9, 9)
-        Me.GroupBox5.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox5.Name = "GroupBox5"
-        Me.GroupBox5.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.GroupBox5.Size = New System.Drawing.Size(848, 209)
-        Me.GroupBox5.TabIndex = 0
-        Me.GroupBox5.TabStop = false
-        Me.GroupBox5.Text = "ADAS Options"
+        'gbADAS
+        '
+        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(565, 136)
+        Me.gbADAS.TabIndex = 0
+        Me.gbADAS.TabStop = false
+        Me.gbADAS.Text = "ADAS Options"
         '
         'cbAtEcoRollReleaseLockupClutch
         '
         Me.cbAtEcoRollReleaseLockupClutch.AutoSize = true
-        Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(398, 29)
-        Me.cbAtEcoRollReleaseLockupClutch.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbAtEcoRollReleaseLockupClutch.Location = New System.Drawing.Point(265, 19)
         Me.cbAtEcoRollReleaseLockupClutch.Name = "cbAtEcoRollReleaseLockupClutch"
-        Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(356, 24)
+        Me.cbAtEcoRollReleaseLockupClutch.Size = New System.Drawing.Size(250, 21)
         Me.cbAtEcoRollReleaseLockupClutch.TabIndex = 3
         Me.cbAtEcoRollReleaseLockupClutch.Text = "AT Gearbox: Eco-Roll Release Lockup Clutch"
         Me.cbAtEcoRollReleaseLockupClutch.UseVisualStyleBackColor = true
@@ -1807,38 +1667,34 @@ Partial Class VehicleForm
         'cbPcc
         '
         Me.cbPcc.FormattingEnabled = true
-        Me.cbPcc.Location = New System.Drawing.Point(27, 160)
-        Me.cbPcc.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbPcc.Location = New System.Drawing.Point(18, 104)
         Me.cbPcc.Name = "cbPcc"
-        Me.cbPcc.Size = New System.Drawing.Size(266, 28)
+        Me.cbPcc.Size = New System.Drawing.Size(179, 21)
         Me.cbPcc.TabIndex = 2
         '
         'cbEcoRoll
         '
         Me.cbEcoRoll.FormattingEnabled = true
-        Me.cbEcoRoll.Location = New System.Drawing.Point(27, 89)
-        Me.cbEcoRoll.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbEcoRoll.Location = New System.Drawing.Point(18, 58)
         Me.cbEcoRoll.Name = "cbEcoRoll"
-        Me.cbEcoRoll.Size = New System.Drawing.Size(266, 28)
+        Me.cbEcoRoll.Size = New System.Drawing.Size(179, 21)
         Me.cbEcoRoll.TabIndex = 1
         '
         'Label22
         '
         Me.Label22.AutoSize = true
-        Me.Label22.Location = New System.Drawing.Point(9, 65)
-        Me.Label22.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label22.Location = New System.Drawing.Point(6, 42)
         Me.Label22.Name = "Label22"
-        Me.Label22.Size = New System.Drawing.Size(69, 20)
+        Me.Label22.Size = New System.Drawing.Size(47, 13)
         Me.Label22.TabIndex = 6
         Me.Label22.Text = "Eco-Roll"
         '
         'cbEngineStopStart
         '
         Me.cbEngineStopStart.AutoSize = true
-        Me.cbEngineStopStart.Location = New System.Drawing.Point(9, 29)
-        Me.cbEngineStopStart.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbEngineStopStart.Location = New System.Drawing.Point(6, 19)
         Me.cbEngineStopStart.Name = "cbEngineStopStart"
-        Me.cbEngineStopStart.Size = New System.Drawing.Size(297, 24)
+        Me.cbEngineStopStart.Size = New System.Drawing.Size(210, 21)
         Me.cbEngineStopStart.TabIndex = 0
         Me.cbEngineStopStart.Text = "Engine Stop/Start during vehicle stop"
         Me.cbEngineStopStart.UseVisualStyleBackColor = true
@@ -1846,10 +1702,9 @@ Partial Class VehicleForm
         'lblPCC
         '
         Me.lblPCC.AutoSize = true
-        Me.lblPCC.Location = New System.Drawing.Point(9, 135)
-        Me.lblPCC.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblPCC.Location = New System.Drawing.Point(6, 88)
         Me.lblPCC.Name = "lblPCC"
-        Me.lblPCC.Size = New System.Drawing.Size(181, 20)
+        Me.lblPCC.Size = New System.Drawing.Size(122, 13)
         Me.lblPCC.TabIndex = 3
         Me.lblPCC.Text = "Predictive Cruise Control"
         '
@@ -1857,10 +1712,9 @@ Partial Class VehicleForm
         '
         Me.tpRoadSweeper.Controls.Add(Me.pnPTO)
         Me.tpRoadSweeper.Controls.Add(Me.gbPTO)
-        Me.tpRoadSweeper.Location = New System.Drawing.Point(4, 29)
-        Me.tpRoadSweeper.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tpRoadSweeper.Location = New System.Drawing.Point(4, 22)
         Me.tpRoadSweeper.Name = "tpRoadSweeper"
-        Me.tpRoadSweeper.Size = New System.Drawing.Size(976, 582)
+        Me.tpRoadSweeper.Size = New System.Drawing.Size(648, 374)
         Me.tpRoadSweeper.TabIndex = 4
         Me.tpRoadSweeper.Text = "PTO"
         Me.tpRoadSweeper.UseVisualStyleBackColor = true
@@ -1877,10 +1731,9 @@ Partial Class VehicleForm
         Me.pnPTO.Controls.Add(Me.btPTOLossMapBrowse)
         Me.pnPTO.Controls.Add(Me.Label7)
         Me.pnPTO.Controls.Add(Me.tbPTOLossMap)
-        Me.pnPTO.Location = New System.Drawing.Point(8, 112)
-        Me.pnPTO.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.pnPTO.Location = New System.Drawing.Point(5, 73)
         Me.pnPTO.Name = "pnPTO"
-        Me.pnPTO.Size = New System.Drawing.Size(849, 325)
+        Me.pnPTO.Size = New System.Drawing.Size(566, 211)
         Me.pnPTO.TabIndex = 1
         '
         'gbPTODrive
@@ -1891,11 +1744,9 @@ Partial Class VehicleForm
         Me.gbPTODrive.Controls.Add(Me.tbPtoEngineSpeed)
         Me.gbPTODrive.Controls.Add(Me.Label25)
         Me.gbPTODrive.Controls.Add(Me.Label24)
-        Me.gbPTODrive.Location = New System.Drawing.Point(4, 152)
-        Me.gbPTODrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbPTODrive.Location = New System.Drawing.Point(3, 99)
         Me.gbPTODrive.Name = "gbPTODrive"
-        Me.gbPTODrive.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbPTODrive.Size = New System.Drawing.Size(834, 85)
+        Me.gbPTODrive.Size = New System.Drawing.Size(556, 55)
         Me.gbPTODrive.TabIndex = 4
         Me.gbPTODrive.TabStop = false
         Me.gbPTODrive.Text = "Working operation settings (PTO mode 2)"
@@ -1903,77 +1754,69 @@ Partial Class VehicleForm
         'Label27
         '
         Me.Label27.AutoSize = true
-        Me.Label27.Location = New System.Drawing.Point(669, 37)
-        Me.Label27.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label27.Location = New System.Drawing.Point(446, 24)
         Me.Label27.Name = "Label27"
-        Me.Label27.Size = New System.Drawing.Size(26, 20)
+        Me.Label27.Size = New System.Drawing.Size(20, 13)
         Me.Label27.TabIndex = 6
         Me.Label27.Text = "[#]"
         Me.Label27.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'tbPtoGear
         '
-        Me.tbPtoGear.Location = New System.Drawing.Point(556, 32)
-        Me.tbPtoGear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPtoGear.Location = New System.Drawing.Point(371, 21)
         Me.tbPtoGear.Name = "tbPtoGear"
-        Me.tbPtoGear.Size = New System.Drawing.Size(103, 26)
+        Me.tbPtoGear.Size = New System.Drawing.Size(70, 20)
         Me.tbPtoGear.TabIndex = 1
         '
         'Label26
         '
         Me.Label26.AutoSize = true
-        Me.Label26.Location = New System.Drawing.Point(294, 37)
-        Me.Label26.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label26.Location = New System.Drawing.Point(196, 24)
         Me.Label26.Name = "Label26"
-        Me.Label26.Size = New System.Drawing.Size(44, 20)
+        Me.Label26.Size = New System.Drawing.Size(30, 13)
         Me.Label26.TabIndex = 4
         Me.Label26.Text = "[rpm]"
         Me.Label26.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         '
         'tbPtoEngineSpeed
         '
-        Me.tbPtoEngineSpeed.Location = New System.Drawing.Point(180, 32)
-        Me.tbPtoEngineSpeed.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.tbPtoEngineSpeed.Location = New System.Drawing.Point(120, 21)
         Me.tbPtoEngineSpeed.Name = "tbPtoEngineSpeed"
-        Me.tbPtoEngineSpeed.Size = New System.Drawing.Size(103, 26)
+        Me.tbPtoEngineSpeed.Size = New System.Drawing.Size(70, 20)
         Me.tbPtoEngineSpeed.TabIndex = 0
         '
         'Label25
         '
         Me.Label25.AutoSize = true
-        Me.Label25.Location = New System.Drawing.Point(446, 37)
-        Me.Label25.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label25.Location = New System.Drawing.Point(297, 24)
         Me.Label25.Name = "Label25"
-        Me.Label25.Size = New System.Drawing.Size(103, 20)
+        Me.Label25.Size = New System.Drawing.Size(68, 13)
         Me.Label25.TabIndex = 1
         Me.Label25.Text = "Gear number"
         '
         'Label24
         '
         Me.Label24.AutoSize = true
-        Me.Label24.Location = New System.Drawing.Point(10, 37)
-        Me.Label24.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label24.Location = New System.Drawing.Point(7, 24)
         Me.Label24.Name = "Label24"
-        Me.Label24.Size = New System.Drawing.Size(143, 20)
+        Me.Label24.Size = New System.Drawing.Size(97, 13)
         Me.Label24.TabIndex = 0
         Me.Label24.Text = "Min. Engine Speed"
         '
         'btPTOCycleDrive
         '
         Me.btPTOCycleDrive.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.btPTOCycleDrive.Location = New System.Drawing.Point(368, 278)
-        Me.btPTOCycleDrive.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btPTOCycleDrive.Location = New System.Drawing.Point(245, 181)
         Me.btPTOCycleDrive.Name = "btPTOCycleDrive"
-        Me.btPTOCycleDrive.Size = New System.Drawing.Size(36, 37)
+        Me.btPTOCycleDrive.Size = New System.Drawing.Size(24, 24)
         Me.btPTOCycleDrive.TabIndex = 6
         Me.btPTOCycleDrive.UseVisualStyleBackColor = true
         '
         'Label28
         '
-        Me.Label28.Location = New System.Drawing.Point(4, 252)
-        Me.Label28.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label28.Location = New System.Drawing.Point(3, 164)
         Me.Label28.Name = "Label28"
-        Me.Label28.Size = New System.Drawing.Size(399, 25)
+        Me.Label28.Size = New System.Drawing.Size(266, 16)
         Me.Label28.TabIndex = 21
         Me.Label28.Text = "PTO Cycle during driving (PTO mode 3) (.vptor)"
         Me.Label28.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -1981,19 +1824,17 @@ Partial Class VehicleForm
         'btPTOCycle
         '
         Me.btPTOCycle.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.btPTOCycle.Location = New System.Drawing.Point(368, 106)
-        Me.btPTOCycle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btPTOCycle.Location = New System.Drawing.Point(245, 69)
         Me.btPTOCycle.Name = "btPTOCycle"
-        Me.btPTOCycle.Size = New System.Drawing.Size(36, 37)
+        Me.btPTOCycle.Size = New System.Drawing.Size(24, 24)
         Me.btPTOCycle.TabIndex = 3
         Me.btPTOCycle.UseVisualStyleBackColor = true
         '
         'Label16
         '
-        Me.Label16.Location = New System.Drawing.Point(4, 80)
-        Me.Label16.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label16.Location = New System.Drawing.Point(3, 52)
         Me.Label16.Name = "Label16"
-        Me.Label16.Size = New System.Drawing.Size(399, 25)
+        Me.Label16.Size = New System.Drawing.Size(266, 16)
         Me.Label16.TabIndex = 18
         Me.Label16.Text = "PTO Cycle during standstill (PTO mode 1) (.vptoc)"
         Me.Label16.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -2001,19 +1842,17 @@ Partial Class VehicleForm
         'btPTOLossMapBrowse
         '
         Me.btPTOLossMapBrowse.Image = Global.TUGraz.VECTO.My.Resources.Resources.Open_icon
-        Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(368, 34)
-        Me.btPTOLossMapBrowse.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.btPTOLossMapBrowse.Location = New System.Drawing.Point(245, 22)
         Me.btPTOLossMapBrowse.Name = "btPTOLossMapBrowse"
-        Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(36, 37)
+        Me.btPTOLossMapBrowse.Size = New System.Drawing.Size(24, 24)
         Me.btPTOLossMapBrowse.TabIndex = 1
         Me.btPTOLossMapBrowse.UseVisualStyleBackColor = true
         '
         'Label7
         '
-        Me.Label7.Location = New System.Drawing.Point(4, 8)
-        Me.Label7.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label7.Location = New System.Drawing.Point(3, 5)
         Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(302, 25)
+        Me.Label7.Size = New System.Drawing.Size(201, 16)
         Me.Label7.TabIndex = 15
         Me.Label7.Text = "PTO Consumer Loss Map (.vptoi)"
         Me.Label7.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@@ -2021,11 +1860,9 @@ Partial Class VehicleForm
         'gbPTO
         '
         Me.gbPTO.Controls.Add(Me.cbPTOType)
-        Me.gbPTO.Location = New System.Drawing.Point(8, 15)
-        Me.gbPTO.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.gbPTO.Location = New System.Drawing.Point(5, 10)
         Me.gbPTO.Name = "gbPTO"
-        Me.gbPTO.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.gbPTO.Size = New System.Drawing.Size(846, 88)
+        Me.gbPTO.Size = New System.Drawing.Size(564, 57)
         Me.gbPTO.TabIndex = 0
         Me.gbPTO.TabStop = false
         Me.gbPTO.Text = "PTO Design Variant"
@@ -2034,19 +1871,17 @@ Partial Class VehicleForm
         '
         Me.cbLegislativeClass.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.cbLegislativeClass.FormattingEnabled = true
-        Me.cbLegislativeClass.Location = New System.Drawing.Point(330, 215)
-        Me.cbLegislativeClass.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.cbLegislativeClass.Location = New System.Drawing.Point(220, 140)
         Me.cbLegislativeClass.Name = "cbLegislativeClass"
-        Me.cbLegislativeClass.Size = New System.Drawing.Size(76, 28)
+        Me.cbLegislativeClass.Size = New System.Drawing.Size(52, 21)
         Me.cbLegislativeClass.TabIndex = 4
         '
         'Label21
         '
         Me.Label21.AutoSize = true
-        Me.Label21.Location = New System.Drawing.Point(48, 189)
-        Me.Label21.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label21.Location = New System.Drawing.Point(32, 123)
         Me.Label21.Name = "Label21"
-        Me.Label21.Size = New System.Drawing.Size(167, 20)
+        Me.Label21.Size = New System.Drawing.Size(112, 13)
         Me.Label21.TabIndex = 42
         Me.Label21.Text = "Maximum Laden Mass"
         '
@@ -2055,8 +1890,7 @@ Partial Class VehicleForm
         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(182, 52)
-        Me.lblTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.lblTitle.Location = New System.Drawing.Point(121, 34)
         Me.lblTitle.Name = "lblTitle"
         Me.lblTitle.Size = New System.Drawing.Size(242, 40)
         Me.lblTitle.TabIndex = 43
@@ -2065,10 +1899,10 @@ Partial Class VehicleForm
         'VehicleForm
         '
         Me.AcceptButton = Me.ButOK
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(9!, 20!)
+        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(999, 962)
+        Me.ClientSize = New System.Drawing.Size(666, 625)
         Me.Controls.Add(Me.lblTitle)
         Me.Controls.Add(Me.Label21)
         Me.Controls.Add(Me.cbLegislativeClass)
@@ -2088,7 +1922,6 @@ Partial Class VehicleForm
         Me.Controls.Add(Me.ToolStrip1)
         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 = "VehicleForm"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
@@ -2145,8 +1978,8 @@ Partial Class VehicleForm
         Me.bgVehicleTorqueLimits.ResumeLayout(false)
         Me.bgVehicleTorqueLimits.PerformLayout
         Me.tpADAS.ResumeLayout(false)
-        Me.GroupBox5.ResumeLayout(false)
-        Me.GroupBox5.PerformLayout
+        Me.gbADAS.ResumeLayout(false)
+        Me.gbADAS.PerformLayout
         Me.tpRoadSweeper.ResumeLayout(false)
         Me.pnPTO.ResumeLayout(false)
         Me.pnPTO.PerformLayout
@@ -2272,7 +2105,7 @@ End Sub
     Friend WithEvents Label20 As System.Windows.Forms.Label
     Friend WithEvents Label21 As Label
     Friend WithEvents tpADAS As TabPage
-    Friend WithEvents GroupBox5 As GroupBox
+    Friend WithEvents gbADAS As GroupBox
     Friend WithEvents cbEngineStopStart As CheckBox
     Friend WithEvents lblPCC As Label
     Friend WithEvents Label22 As Label
diff --git a/VECTO/GUI/VehicleForm.vb b/VECTO/GUI/VehicleForm.vb
index 304115e9de5288c1c93c328ab79b70750ff97d2f..659ba9de93507f0f3328f8b0b1246f741f5260c2 100644
--- a/VECTO/GUI/VehicleForm.vb
+++ b/VECTO/GUI/VehicleForm.vb
@@ -943,7 +943,7 @@ Public Class VehicleForm
 		_axlDlog.TbRRC.Text = lv0.SubItems(AxleTbl.RRC).Text
 		_axlDlog.TbFzISO.Text = lv0.SubItems(AxleTbl.FzISO).Text
 		_axlDlog.TbI_wheels.Text = lv0.SubItems(AxleTbl.Inertia).Text
-		_axlDlog.CbWheels.Text = lv0.SubItems(AxleTbl.WheelsDimension).Text
+		_axlDlog.CbWheels.SelectedItem = if(string.IsNullOrWhiteSpace(lv0.SubItems(AxleTbl.WheelsDimension).Text), "-", lv0.SubItems(AxleTbl.WheelsDimension).Text)
 		_axlDlog.cbAxleType.SelectedValue = lv0.SubItems(AxleTbl.AxleType).Text.ParseEnum(Of AxleType)()
 
 		If _axlDlog.ShowDialog = DialogResult.OK Then
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index 5a7007d523be7360d0422998957a790cdfd6f6be..7282f95f8215648c8f28855365501fe70c46a01e 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -908,7 +908,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
 			return new ElectricMotorData() {
 				EfficiencyData = new VoltageLevelData() { VoltageLevels = voltageLevels},
 				DragCurve = ElectricMotorDragCurveReader.Create(motorData.DragCurve, count),
-				Inertia = motorData.Inertia,
+				Inertia = motorData.Inertia * count,
 				ContinuousTorque = motorData.ContinuousTorque * count,
 				ContinuousTorqueSpeed = motorData.ContinuousTorqueSpeed,
 				OverloadTorque = (motorData.OverloadTorque ?? 0.SI<NewtonMeter>()) * count,
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
index 91ffad2f5135ba0e3462d5df684bebad8aa68a29..108fab48c75dfe1663229378016efe59feffcdeb 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/ElectricMotor.cs
@@ -66,7 +66,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 			OverloadBuffer = (peakPwrLoss - ContinuousPowerLoss) * ModelData.OverloadTime;
 			if (OverloadBuffer.IsSmallerOrEqual(0) && !(container is SimplePowertrainContainer)) {
-				Log.Error("Overload buffer for thermal de-rating is negative! Please check electric motor data!");
+				Log.Error("Overload buffer for thermal de-rating is zero or negative! Please check electric motor data!");
 			}
 		}
 
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
index 3361457d26c1a3ec738b5c1500cefcb567ec1031..6443025dec6d4bc990ff597d0e9c7dfee8aa770f 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/PEVAMTShiftStrategy.cs
@@ -38,6 +38,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 		private Battery TestContainerBattery;
 		private BatterySystem TestContainerBatterySystem;
 		private SuperCap TestContainerSuperCap;
+		private ElectricMotor TestContainerElectricMotor;
 
 		private VoltageLevelData VoltageLevels;
 		private SI TransmissionRatio;
@@ -46,7 +47,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
         private Dictionary<uint, ShiftPolygon> DeRatedShiftpolygons;
 
 
-        public static string Name => "AMT - EffShift (BEV)";
+		public static string Name => "AMT - EffShift (BEV)";
 
 
 		protected bool DriveOffStandstill { get; set; }
@@ -98,6 +99,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			TestContainerBattery = TestContainer.BatteryInfo as Battery;
 			TestContainerBatterySystem = TestContainer.BatteryInfo as BatterySystem;
 			TestContainerSuperCap = TestContainer.BatteryInfo as SuperCap;
+			TestContainerElectricMotor =
+				TestContainer.ElectricMotorInfo(PowertrainPosition.BatteryElectricE2) as ElectricMotor;
 			if (TestContainerGbx == null) {
 				throw new VectoException("Unknown gearboxtype: {0}", TestContainer.GearboxCtl.GetType().FullName);
 			}
@@ -409,7 +412,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 					var resp = RequestDryRunWithGear(absTime, dt, outTorque, outAngularVelocity, nextGear);
 
 					inAngularVelocity = resp.ElectricMotor.AngularVelocity;
-					inTorque = resp.ElectricMotor.PowerRequest / inAngularVelocity;
+					inTorque = resp.ElectricMotor.PowerRequest / resp.ElectricMotor.AvgDrivetrainSpeed;
+
+					if (IsAboveUpShiftCurve(nextGear, inTorque, inAngularVelocity, resp.ElectricMotor.DeRatingActive)) {
+						nextGear = GearList.Successor(nextGear);
+						break;
+					}
 
 					var maxTorque = VectoMath.Min(-resp.ElectricMotor.MaxDriveTorque,
 						!nextGear.Equals(GearList.First())
@@ -423,6 +431,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 						continue;
 					}
 
+					
 					nextGear = GearList.Successor(nextGear);
 					break;
 				}
@@ -572,6 +581,12 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			}
 			TestContainerSuperCap?.Initialize(DataBus.BatteryInfo.StateOfCharge);
 
+			//var pos = ModelData.ElectricMachinesData.FirstOrDefault().Item1;
+			TestContainerElectricMotor.ThermalBuffer =
+				(DataBus.ElectricMotorInfo(PowertrainPosition.BatteryElectricE2) as ElectricMotor).ThermalBuffer;
+			TestContainerElectricMotor.DeRatingActive =
+				(DataBus.ElectricMotorInfo(PowertrainPosition.BatteryElectricE2) as ElectricMotor).DeRatingActive;
+
 			TestContainer.GearboxOutPort.Initialize(outTorque, outAngularVelocity);
 			var response = (ResponseDryRun)TestContainer.GearboxOutPort.Request(
 				0.SI<Second>(), dt, outTorque, outAngularVelocity, true);
diff --git a/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs b/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs
index 105ef20864a38a9d55c5a4ffb864f2afdda48519..cb86cb60a5b2fa1a2ad23569cbf54fa00029ac7e 100644
--- a/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs
+++ b/VectoCore/VectoCore/OutputData/ModalDataPostprocessingCorrection.cs
@@ -36,6 +36,9 @@ namespace TUGraz.VectoCore.OutputData
 				SetBusAuxMissingPSWork(modData, runData, r);
 
 				var workBusAuxES = modData.EnergyBusAuxESConsumed() - modData.EnergyBusAuxESGenerated();
+				if (runData.BusAuxiliaries.ElectricalUserInputsConfig.AlternatorType == AlternatorType.None) {
+					workBusAuxES = 0.SI<WattSecond>();
+				}
 				r.WorkBusAuxESMech = workBusAuxES /
 									runData.BusAuxiliaries.ElectricalUserInputsConfig.AlternatorMap.GetEfficiency(0.RPMtoRad(), 0.SI<Ampere>()) /
 									runData.BusAuxiliaries.ElectricalUserInputsConfig.AlternatorGearEfficiency;
diff --git a/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs b/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
index f6da8e1e92b7e8f95d3adeffabf92461feb4650d..2caf693f3854e47eee759127925a9be03137c40b 100644
--- a/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
+++ b/VectoCore/VectoCoreTest/Models/SimulationComponent/ElectricMotorTest.cs
@@ -36,6 +36,45 @@ namespace TUGraz.VectoCore.Tests.Models.SimulationComponent
 			Directory.SetCurrentDirectory(TestContext.CurrentContext.TestDirectory);
 		}
 
+
+		[TestCase(1),
+		TestCase(2),
+		]
+		public void ElectricMotorModelDataTest(int count)
+		{
+			var inputData = JSONInputDataFactory.ReadElectricMotorData(MotorFile, false);
+			var dao = new EngineeringDataAdapter();
+			var electricMachine = new MockElectricMachinesInputData() {
+				Entries = new List<ElectricMachineEntry<IElectricMotorEngineeringInputData>>() {
+					new ElectricMachineEntry<IElectricMotorEngineeringInputData>() {
+						ElectricMachine = inputData,
+						Count = count,
+						RatioADC = 1,
+						MechanicalTransmissionEfficiency = 1
+					}
+				}
+			};
+			var data = dao.CreateElectricMachines(electricMachine, null);
+			var emModelData = data.First().Item2;
+
+			Assert.AreEqual(0.15 * count, emModelData.Inertia.Value(), 1e-3);
+
+			Assert.AreEqual(2000, emModelData.ContinuousTorqueSpeed.AsRPM, 1e-3);
+			Assert.AreEqual(238.7323 * count, emModelData.ContinuousTorque.Value(), 1e-3);
+
+			Assert.AreEqual(334.23 * count, -emModelData.EfficiencyData.VoltageLevels.First().FullLoadCurve.FullLoadDriveTorque(2000.RPMtoRad()).Value(), 1e-3);
+			Assert.AreEqual(-334.23 * count, -emModelData.EfficiencyData.VoltageLevels.First().FullLoadCurve.FullGenerationTorque(2000.RPMtoRad()).Value(), 1e-3);
+
+			Assert.AreEqual(30 * count, emModelData.DragCurve.Lookup(2500.RPMtoRad()).Value(), 1e-3);
+
+			Assert.AreEqual(-14579 * count,
+				emModelData.EfficiencyData.VoltageLevels.First().EfficiencyMap
+					.LookupElectricPower(190.99.RPMtoRad(), (-500 * count).SI<NewtonMeter>(), false).ElectricalPower.Value(),
+				1e-3);
+
+
+		}
+
 		[TestCase(100, 100, -1484.401151),
 		 TestCase(100, 30, -498.336701),
 		 TestCase(100, 300, -5058.393920),
diff --git a/VectoCore/VectoCoreTest/Reports/ModDataPostprocessingTest.cs b/VectoCore/VectoCoreTest/Reports/ModDataPostprocessingTest.cs
index 8bbb6b9db598474954cd4aa2b882facc9e01ed43..b5fa9cc8fb50fe065eada3338599514518facf63 100644
--- a/VectoCore/VectoCoreTest/Reports/ModDataPostprocessingTest.cs
+++ b/VectoCore/VectoCoreTest/Reports/ModDataPostprocessingTest.cs
@@ -950,12 +950,17 @@ namespace TUGraz.VectoCore.Tests.Reports
 			Assert.AreEqual(fcModSum + fcPSAir + fcPSICEOffDriving + fcESS, f.FcFinal.Value(), 1e-6);
 		}
 
-		[TestCase(500, 0, 4000),
-		TestCase(500, 500, 4000),
-		TestCase(500, 0, 550)]
-		public void TestBusAuxSmartES_ModDataCorrection(double p_es_cons, double p_es_gen, double p_es_smartgen)
+		[TestCase(500, 0, 4000, AlternatorType.Conventional),
+		TestCase(500, 500, 4000, AlternatorType.Conventional),
+		TestCase(500, 0, 550, AlternatorType.Conventional),
+		TestCase(500, 0, 4000, AlternatorType.None),
+		TestCase(500, 500, 4000, AlternatorType.None),
+		TestCase(500, 0, 550, AlternatorType.None),
+		]
+		public void TestBusAuxSmartES_ModDataCorrection(double p_es_cons, double p_es_gen, double p_es_smartgen,
+			AlternatorType alternatorType)
 		{
-			var runData = GetRunData(true);
+			var runData = GetRunData(true, alternatorType: alternatorType);
 			runData.JobName = new StackTrace().GetFrame(0).GetMethod().Name + $"_{p_es_cons}_{p_es_gen}_{p_es_smartgen}";
 			var writer = new FileOutputWriter(".");
 			var modData = new ModalDataContainer(runData, writer, null) {
@@ -998,7 +1003,7 @@ namespace TUGraz.VectoCore.Tests.Reports
 				modData[ModalResultField.FCWHTCc] = fc;
 				modData[ModalResultField.FCFinal] = fc;
 
-				modData[ModalResultField.P_busAux_ES_generated] = P_ES_gen;
+				modData[ModalResultField.P_busAux_ES_generated] = alternatorType == AlternatorType.None ? 0.SI<Watt>() : P_ES_gen;
 				modData[ModalResultField.P_busAux_ES_consumer_sum] = P_ES_cons;
 
 				modData[ModalResultField.P_aux_ESS_mech_ice_off] = 0.SI<Watt>();
@@ -1036,7 +1041,7 @@ namespace TUGraz.VectoCore.Tests.Reports
 				modData[ModalResultField.FCWHTCc] = 0.SI<KilogramPerSecond>();
 				modData[ModalResultField.FCFinal] = 0.SI<KilogramPerSecond>();
 
-				modData[ModalResultField.P_busAux_ES_generated] = P_ES_smartGen;
+				modData[ModalResultField.P_busAux_ES_generated] = alternatorType == AlternatorType.None ? 0.SI<Watt>() : P_ES_smartGen;
 				modData[ModalResultField.P_busAux_ES_consumer_sum] = P_ES_cons;
 
 
@@ -1078,7 +1083,7 @@ namespace TUGraz.VectoCore.Tests.Reports
 				modData[ModalResultField.FCWHTCc] = fc;
 				modData[ModalResultField.FCFinal] = fc;
 
-				modData[ModalResultField.P_busAux_ES_generated] = P_ES_gen;
+				modData[ModalResultField.P_busAux_ES_generated] = alternatorType == AlternatorType.None ? 0.SI<Watt>() : P_ES_gen;
 				modData[ModalResultField.P_busAux_ES_consumer_sum] = P_ES_cons;
 
 
@@ -1105,9 +1110,16 @@ namespace TUGraz.VectoCore.Tests.Reports
 
 			var k_engline = 2.6254521511724e-8;
 
-			var E_es_missing_mech = (P_ES_cons * (T1 + T2 + T3) - (P_ES_gen * (T1 + T3) + P_ES_smartGen * T2)).Value() / busAuxAlternatorEff; // -171229.97701000841
-																																			  // -237850.27541296941
-																																			  // 63222.43732563284
+			var E_es_missing_mech = 0.0;
+
+			if (alternatorType != AlternatorType.None) {
+				E_es_missing_mech = (P_ES_cons * (T1 + T2 + T3) - (P_ES_gen * (T1 + T3) + P_ES_smartGen * T2)).Value() /
+									busAuxAlternatorEff; // -171229.97701000841
+														// -237850.27541296941
+														// 63222.43732563284
+			}
+
+			
 			var fcModSum = 0.195725; // 
 
 			var fcEs = E_es_missing_mech * k_engline; // -0.0044955611148612719
@@ -1136,7 +1148,11 @@ namespace TUGraz.VectoCore.Tests.Reports
 			Assert.AreEqual(0, f.FcESS_AuxDriving_ICEOff.Value(), 1e-12);
 			Assert.AreEqual(0, f.FcESS_AuxDriving_ICEOn.Value(), 1e-12);
 
-            Assert.AreEqual(fcEs, f.FcBusAuxEs.Value(), 1e-12);
+			Assert.AreEqual(0, f.FcESS_DCDCMissing.Value(), 1e-12);
+
+			Assert.AreEqual(fcModSum, modData.TotalFuelConsumption(ModalResultField.FCWHTCc, fuel.FuelData).Value(), 1e-6);
+			
+			Assert.AreEqual(fcEs, f.FcBusAuxEs.Value(), 1e-12);
 
             Assert.AreEqual(fcModSum, modData.TotalFuelConsumption(ModalResultField.FCWHTCc, fuel.FuelData).Value(), 1e-6);
             Assert.AreEqual(fcModSum + fcEs, f.FcBusAuxEsCorr.Value(), 1e-6);