diff --git a/Mongoose_Traveller2e/MongooseTraveller.css b/Mongoose_Traveller2e/MongooseTraveller.css
index b621a51bb4..390d1a32ef 100644
--- a/Mongoose_Traveller2e/MongooseTraveller.css
+++ b/Mongoose_Traveller2e/MongooseTraveller.css
@@ -30,7 +30,9 @@ select[multiple]:focus option:checked {
 .sheet-speculative,
 .sheet-tradelog,
 .sheet-trade,
-.sheet-vehicle {
+.sheet-vehicle,
+.sheet-vehicledetails,
+.sheet-vehiclenotes {
     display: none;
     opacity: 0;
 }
@@ -77,7 +79,7 @@ select[multiple]:focus option:checked {
     animation-duration: 1s;
     opacity: 1;
 }
-
+/*
 .sheet-shiptypetoggle[value="ship"] ~ .sheet-ship {
     display: block;
     animation-name: slide-in;
@@ -91,7 +93,7 @@ select[multiple]:focus option:checked {
     animation-duration: 1s;
     opacity: 1;
 }
-
+*/
 .sheet-shiptype[value="shipdetails"] ~ .sheet-shipdetails {
     display: block;
     animation-name: slide-in;
@@ -120,6 +122,20 @@ select[multiple]:focus option:checked {
     opacity: 1;
 }
 
+.sheet-vehicletype[value="vehicledetails"] ~ .sheet-vehicledetails {
+    display: block;
+    animation-name: slide-in;
+    animation-duration: 1s;
+    opacity: 1;
+}
+
+.sheet-vehicletype[value="vehiclenotes"] ~ .sheet-vehiclenotes {
+    display: block;
+    animation-name: slide-in;
+    animation-duration: 1s;
+    opacity: 1;
+}
+
 .sheet-tradetoggle[value="passengers"] ~ .sheet-passengers {
     display: block;
     margin-left: 3px;
@@ -1337,6 +1353,8 @@ input.sheet-typeshow[value="ship"] ~ .sheet-type-ship,
 input.sheet-shiptypeshow[value="shipdetails"] ~ .sheet-type-shipdetails,
 input.sheet-shiptypeshow[value="shipnotes"] ~ .sheet-type-shipnotes,
 input.sheet-typeshow[value="vehicle"] ~ .sheet-type-vehicle,
+input.sheet-vehicletypeshow[value="vehicledetails"] ~ .sheet-type-vehicledetails,
+input.sheet-vehicletypeshow[value="vehiclenotes"] ~ .sheet-type-vehiclenotes,
 input.sheet-tradetypeshow[value="passengers"] ~ .sheet-type-passengers,
 input.sheet-tradetypeshow[value="freight"] ~ .sheet-type-freight,
 input.sheet-tradetypeshow[value="speculative"] ~ .sheet-type-speculative,
diff --git a/Mongoose_Traveller2e/MongooseTraveller.html b/Mongoose_Traveller2e/MongooseTraveller.html
index 980a51717c..63d1e511f7 100644
--- a/Mongoose_Traveller2e/MongooseTraveller.html
+++ b/Mongoose_Traveller2e/MongooseTraveller.html
@@ -3316,184 +3316,235 @@
     </div>
 </div>
 <div class="sheet-tab-content sheet-vehicle">
-    <h3 class="sheet-header">Vehicle Name</h3>
-    <div>
-        <input type="text" class="sheet-input sheet-laf-vehicle-textarea sheet-redbold" name="attr_vehicle_name">
-    </div>
-    <br>
-    <h3>Armor</h3>
-    <div class="sheet-redborder sheet-laf-centredgrid sheet-laf-vehicle-armor sheet-bold">
-        <span class="sheet-textright">Front</span>
-        <input class="sheet-laf-wnum2" type="number" name="attr_vehicle_armorfront" value="0" min="0">
-        <span class="sheet-textright">Rear</span>
-        <input class="sheet-laf-wnum2" type="number" name="attr_vehicle_armorrear" value="0" min="0">
-        <span class="sheet-textright">Sides</span>
-        <input class="sheet-laf-wnum2" type="number" name="attr_vehicle_armorsides" value="0" min="0">
-    </div>
-    <br>
-    <h4>Details</h4>
-    <div class="sheet-redborder sheet-laf-centredgrid sheet sheet-laf-vehicle-data sheet-bold">
-        <span>Tech Level</span>
-        <input type="text" name="attr_vehicle_tl">
-        <span>Skill</span>
-        <input type="text" name="attr_vehicle_skill">
-        <span>Agility</span>
-        <input type="text" name="attr_vehicle_agility">
-        <span>Speed (Cruise)</span>
-        <input type="text" name="attr_vehicle_speed">
-        <span>Range (Cruise)</span>
-        <input type="text" name="attr_vehicle_range">
-        <span>Crew</span>
-        <input type="text" name="attr_vehicle_crew">
-        <span>Passengers</span>
-        <input type="text" name="attr_vehicle_passengers">
-        <span>Cargo</span>
-        <input type="text" name="attr_vehicle_cargo">
-        <span>Hull</span>
-        <input type="text" name="attr_vehicle_hull">
-        <span>Shipping</span>
-        <input type="text" name="attr_vehicle_shipping">
-        <span>Cost</span>
-        <input type="text" name="attr_vehicle_cost">
-    </div>
-    <br>
-    <div class="sheet-redborder sheet-laf-centredgrid sheet-laf-vehicle-data sheet-bold">
-        <span>Autopilot (skill level)</span>
-        <div class="sheet-trade_content">
-            <input type="number" name="attr_vehicle_autopilot" value="0">
-            <button class="sheet-weaponroll" name="act_vehicle-autopilot" type="action">
-                <span class="sheet-weaponrollbutton">b</span>
-            </button>
-        </div>
-        <span>Communications Range</span>
-        <input type="text" name="attr_vehicle_commsrange">
-        <span>Navigation (Navigation DM)</span>
-        <div class="sheet-trade_content">
-            <input type="number" name="attr_vehicle_navigation" value="0">
-            <button class="sheet-weaponroll" name="act_vehicle-navigation" type="action">
-                <span class="sheet-weaponrollbutton">b</span>
-            </button>
-        </div>
-        <span>Sensors (Electronics (sensors) DM)</span>
-        <div class="sheet-trade_content">
-            <input type="number" name="attr_vehicle_sensors" value="0">
-            <button class="sheet-weaponroll" name="act_vehicle-sensors" type="action">
-                <span class="sheet-weaponrollbutton">b</span>
-            </button>
-        </div>
-        <span>Camoflage (Recon DM)</span>
-        <div class="sheet-trade_content">
-            <input type="number" name="attr_vehicle_camoflage" value="0">
-            <button class="sheet-weaponroll" name="act_vehicle-camoflage" type="action">
-                <span class="sheet-weaponrollbutton">b</span>
-            </button>
-        </div>
-        <span>Stealth (Electronics (sensors) DM)</span>
-        <div class="sheet-trade_content">
-            <input type="number" name="attr_vehicle_stealth" value="0">
-            <button class="sheet-weaponroll" name="act_vehicle-stealth" type="action">
-                <span class="sheet-weaponrollbutton">b</span>
-            </button>
-        </div>
-    </div>
-    <br>
-    <div class="sheet-redborder">
-        <h4>Sensors</h4>
-        <div class="sheet-laf-centredgrid sheet-laf-vehicle-sensors sheet-bold">
-            <span>Type</span>
-            <span>Sensor Mod</span>
-            <span>Player Mod</span>
-            <span>Roll</span>
-            <span></span>
-            <input class="sheet-redbold" type="text" name="attr_vehicle_sensor_type">
-            <input class="" type="number" value="0" name="attr_vehicle_sensor_playermod">
-            <input class="" type="number" value="0" name="attr_vehicle_sensor_sensormod">
-            <button type="roll" class="sheet-button btn ui-draggable" name="roll_vehicle-sensor" value="@{whispertoggle}&{template:skill-attrib@{alt_rolltemplate_val}} {{skill=Sensors: @{vehicle_sensor_type}}} {{character= @{character_name} }} @{ro_default_rolltype} + @{vehicle_sensor_playermod} + @{vehicle_sensor_sensormod} @{ro_default_mod}]] }}  }}">
-                <div class="sheet-weaponrollbutton">b</div>
-            </button>
-        </div>
-    </div>
-    <br>
-    <div class="sheet-redborder">
-        <div class="sheet-redborder sheet-laf-centredgrid">
-            <h4>Mounts</h4>
-            <p>Add a mount then add the weapons below for that mount. Destructive weapons should have their damage in the form e.g.: 2DD</p>
-            <span class="sheet-redbold-noborder" name="attr_vehiclemount_error"></span>
-            <fieldset class="repeating_vehiclemount">
-                <div class="sheet-laf-ship-hardpoint">
-                    <div class="sheet-redborder sheet-boldspan">
-                        <span>Name: </span>
-                        <input class="sheet-laf-ship-traitstext sheet-redbold" type="text" name="attr_mount_name">
-                        <span>Type: </span>
-                        <input type="text" name="attr_hp_type">
-                        <span>Gunner Skill:</span>
-                        <input class="sheet-laf-wnum" type="number" name="attr_gunner" value="0">
-                        <span>DEX Mod.</span>
-                        <input class="sheet-laf-wnum" type="number" name="attr_dexmod" value="0">
-                        <span>Custom Mod.</span>
-                        <input class="sheet-laf-wnum" type="number" name="attr_custommod" value="0">
-                        <input class="sheet-hidden" type="text" name="attr_mount_id">
 
-                    </div>
+    <!-- Sub-tabs-->
+    <input type='hidden' class='sheet-vehicletype' name='attr_sheetVehicleType' value='vehicledetails'/>
+    <div>
+        <input type='hidden' class='sheet-vehicletypeshow' name='attr_sheetVehicleTypeShow' value='vehicledetails'/>
+        <button type="action" name="act_vehicledetails" class="sheet-type sheet-type-vehicledetails">Details</button>
+        <button type="action" name="act_vehiclenotes" class="sheet-type sheet-type-vehiclenotes">Notes</button>
+    </div>
+    <div class="sheet-tab-content sheet-vehicledetails">
+
+        <h3 class="sheet-header">Vehicle Name</h3>
+        <div>
+            <input type="text" class="sheet-input sheet-laf-vehicle-textarea sheet-redbold" name="attr_vehicle_name">
+        </div>
+        <br>
+        <h3>Armor</h3>
+        <div class="sheet-redborder sheet-laf-centredgrid sheet-laf-vehicle-armor sheet-bold">
+            <span class="sheet-textright">Front</span>
+            <input class="sheet-laf-wnum2" type="number" name="attr_vehicle_armorfront" value="0" min="0">
+            <span class="sheet-textright">Rear</span>
+            <input class="sheet-laf-wnum2" type="number" name="attr_vehicle_armorrear" value="0" min="0">
+            <span class="sheet-textright">Sides</span>
+            <input class="sheet-laf-wnum2" type="number" name="attr_vehicle_armorsides" value="0" min="0">
+        </div>
+        <br>
+        <h3>Critical Damage</h3>
+        <div class="sheet-laf-centredgrid sheet-laf-ship-component-rep2">
+            <fieldset class="repeating_vehiclecrit">
+                <div class="sheet-laf-centredgrid sheet-laf-ship-hulldamage">
+                    <span class="sheet-header sheet-shipcomponent"></span>
+                    <span class="sheet-header sheet-textright" data-i18n="hulllocations-u"></span>
+                    <select class="sheet-input" name="attr_vehicle_loc-rep" value="0">
+                        <option selected></option>
+                        <option>Fuel</option>
+                        <option>Power Plant</option>
+                        <option>Weapon</option>
+                        <option>Armour</option>
+                        <option>Hull</option>
+                        <option>Cargo</option>
+                        <option>Occupants</option>
+                        <option>Drive System</option>
+                        <option>Systems</option>
+                    </select>
+                    <span class="sheet-header sheet-textright" data-i18n="hullcritlevel-u"></span>
+                    <select class="sheet-critseverity" name="attr_vehicle_crit-rep" value="0">>
+                        <option selected></option>
+                        <option>1</option>
+                        <option>2</option>
+                        <option>3</option>
+                        <option>4</option>
+                        <option>5</option>
+                        <option>6</option>
+                    </select>
+                    <span></span>
                 </div>
             </fieldset>
         </div>
+
+
         <br>
-        <h4>Weapons</h4>
-        <div class="sheet-redborder">
-            <span><strong>Note:</strong> For Destructive weapons enter the damage as e.g. 3DD.</span>
-            <br>
-            <span class="sheet-redbold-noborder" name="attr_vehicleweapon_error"></span>
-            <hr class="sheet-hr">
-            <div class="sheet-laf-centredgrid sheet-laf-vehicle-weaponsrow sheet-bold sheet-laf-wauto">
-                <span>Mount</span>
-                <span>Weapon</span>
-                <span>Range</span>
-                <span>Damage</span>
-                <span>Magazine</span>
-                <span>Mag. Cost</span>
-                <span>Traits</span>
-                <span>Fire Control</span>
-                <!--            <span>Mod.</span>-->
-                <span></span>
+        <h4>Details</h4>
+        <div class="sheet-redborder sheet-laf-centredgrid sheet sheet-laf-vehicle-data sheet-bold">
+            <span>Tech Level</span>
+            <input type="text" name="attr_vehicle_tl">
+            <span>Skill</span>
+            <input type="text" name="attr_vehicle_skill">
+            <span>Agility</span>
+            <input type="text" name="attr_vehicle_agility">
+            <span>Speed (Cruise)</span>
+            <input type="text" name="attr_vehicle_speed">
+            <span>Range (Cruise)</span>
+            <input type="text" name="attr_vehicle_range">
+            <span>Crew</span>
+            <input type="text" name="attr_vehicle_crew">
+            <span>Passengers</span>
+            <input type="text" name="attr_vehicle_passengers">
+            <span>Cargo</span>
+            <input type="text" name="attr_vehicle_cargo">
+            <span>Hull</span>
+            <input type="text" name="attr_vehicle_hull">
+            <span>Shipping</span>
+            <input type="text" name="attr_vehicle_shipping">
+            <span>Cost</span>
+            <input type="text" name="attr_vehicle_cost">
+        </div>
+        <br>
+        <div class="sheet-redborder sheet-laf-centredgrid sheet-laf-vehicle-data sheet-bold">
+            <span>Autopilot (skill level)</span>
+            <div class="sheet-trade_content">
+                <input type="number" name="attr_vehicle_autopilot" value="0">
+                <button class="sheet-weaponroll" name="act_vehicle-autopilot" type="action">
+                    <span class="sheet-weaponrollbutton">b</span>
+                </button>
             </div>
-            <div>
-                <fieldset class="repeating_vehicleweapons">
-                    <div class="sheet-laf-centredgrid sheet-laf-vehicle-weaponsrow sheet-bold sheet-laf-wauto">
-                        <input class="sheet-redbold" type="text" name="attr_mount_name">
-                        <input class="sheet-redbold" type="text" name="attr_weapon">
-                        <input type="text" name="attr_range">
-                        <input type="text" name="attr_damage">
-                        <input type="text" name="attr_magazine">
-                        <input type="text" name="attr_magcost">
-                        <input type="text" name="attr_traits">
-                        <input type="text" name="attr_firecontrol">
-                        <!--                    <input type="number" name="attr_mod" value="0">-->
-                        <button class="sheet-weaponroll" name="act_vehicle-weapon" type="action">
-                            <span class="sheet-weaponrollbutton">b</span>
-                        </button>
+            <span>Communications Range</span>
+            <input type="text" name="attr_vehicle_commsrange">
+            <span>Navigation (Navigation DM)</span>
+            <div class="sheet-trade_content">
+                <input type="number" name="attr_vehicle_navigation" value="0">
+                <button class="sheet-weaponroll" name="act_vehicle-navigation" type="action">
+                    <span class="sheet-weaponrollbutton">b</span>
+                </button>
+            </div>
+            <span>Sensors (Electronics (sensors) DM)</span>
+            <div class="sheet-trade_content">
+                <input type="number" name="attr_vehicle_sensors" value="0">
+                <button class="sheet-weaponroll" name="act_vehicle-sensors" type="action">
+                    <span class="sheet-weaponrollbutton">b</span>
+                </button>
+            </div>
+            <span>Camoflage (Recon DM)</span>
+            <div class="sheet-trade_content">
+                <input type="number" name="attr_vehicle_camoflage" value="0">
+                <button class="sheet-weaponroll" name="act_vehicle-camoflage" type="action">
+                    <span class="sheet-weaponrollbutton">b</span>
+                </button>
+            </div>
+            <span>Stealth (Electronics (sensors) DM)</span>
+            <div class="sheet-trade_content">
+                <input type="number" name="attr_vehicle_stealth" value="0">
+                <button class="sheet-weaponroll" name="act_vehicle-stealth" type="action">
+                    <span class="sheet-weaponrollbutton">b</span>
+                </button>
+            </div>
+        </div>
+        <br>
+        <div class="sheet-redborder">
+            <h4>Sensors</h4>
+            <div class="sheet-laf-centredgrid sheet-laf-vehicle-sensors sheet-bold">
+                <span>Type</span>
+                <span>Sensor Mod</span>
+                <span>Player Mod</span>
+                <span>Roll</span>
+                <span></span>
+                <input class="sheet-redbold" type="text" name="attr_vehicle_sensor_type">
+                <input class="" type="number" value="0" name="attr_vehicle_sensor_playermod">
+                <input class="" type="number" value="0" name="attr_vehicle_sensor_sensormod">
+                <button type="roll" class="sheet-button btn ui-draggable" name="roll_vehicle-sensor" value="@{whispertoggle}&{template:skill-attrib@{alt_rolltemplate_val}} {{skill=Sensors: @{vehicle_sensor_type}}} {{character= @{character_name} }} @{ro_default_rolltype} + @{vehicle_sensor_playermod} + @{vehicle_sensor_sensormod} @{ro_default_mod}]] }}  }}">
+                    <div class="sheet-weaponrollbutton">b</div>
+                </button>
+            </div>
+        </div>
+        <br>
+        <div class="sheet-redborder">
+            <div class="sheet-redborder sheet-laf-centredgrid">
+                <h4>Mounts</h4>
+                <p>Add a mount then add the weapons below for that mount. Destructive weapons should have their damage in the form e.g.: 2DD</p>
+                <span class="sheet-redbold-noborder" name="attr_vehiclemount_error"></span>
+                <fieldset class="repeating_vehiclemount">
+                    <div class="sheet-laf-ship-hardpoint">
+                        <div class="sheet-redborder sheet-boldspan">
+                            <span>Name: </span>
+                            <input class="sheet-laf-ship-traitstext sheet-redbold" type="text" name="attr_mount_name">
+                            <span>Type: </span>
+                            <input type="text" name="attr_hp_type">
+                            <span>Gunner Skill:</span>
+                            <input class="sheet-laf-wnum" type="number" name="attr_gunner" value="0">
+                            <span>DEX Mod.</span>
+                            <input class="sheet-laf-wnum" type="number" name="attr_dexmod" value="0">
+                            <span>Custom Mod.</span>
+                            <input class="sheet-laf-wnum" type="number" name="attr_custommod" value="0">
+                            <input class="sheet-hidden" type="text" name="attr_mount_id">
+
+                        </div>
                     </div>
                 </fieldset>
             </div>
+            <br>
+            <h4>Weapons</h4>
+            <div class="sheet-redborder">
+                <span><strong>Note:</strong> For Destructive weapons enter the damage as e.g. 3DD.</span>
+                <br>
+                <span class="sheet-redbold-noborder" name="attr_vehicleweapon_error"></span>
+                <hr class="sheet-hr">
+                <div class="sheet-laf-centredgrid sheet-laf-vehicle-weaponsrow sheet-bold sheet-laf-wauto">
+                    <span>Mount</span>
+                    <span>Weapon</span>
+                    <span>Range</span>
+                    <span>Damage</span>
+                    <span>Magazine</span>
+                    <span>Mag. Cost</span>
+                    <span>Traits</span>
+                    <span>Fire Control</span>
+                    <!--            <span>Mod.</span>-->
+                    <span></span>
+                </div>
+                <div>
+                    <fieldset class="repeating_vehicleweapons">
+                        <div class="sheet-laf-centredgrid sheet-laf-vehicle-weaponsrow sheet-bold sheet-laf-wauto">
+                            <input class="sheet-redbold" type="text" name="attr_mount_name">
+                            <input class="sheet-redbold" type="text" name="attr_weapon">
+                            <input type="text" name="attr_range">
+                            <input type="text" name="attr_damage">
+                            <input type="text" name="attr_magazine">
+                            <input type="text" name="attr_magcost">
+                            <input type="text" name="attr_traits">
+                            <input type="text" name="attr_firecontrol">
+                            <!--                    <input type="number" name="attr_mod" value="0">-->
+                            <button class="sheet-weaponroll" name="act_vehicle-weapon" type="action">
+                                <span class="sheet-weaponrollbutton">b</span>
+                            </button>
+                        </div>
+                    </fieldset>
+                </div>
+            </div>
+        </div>
+        <br>
+        <hr class="sheet-hr">
+        <div class="sheet-narrowtext">
+            <h4>Traits</h4>
+            <textarea class="sheet-laf-vehicle-textarea" name="attr_vehicle_traits"></textarea>
+            <br>
+            <hr class="sheet-hr">
+            <h4>Equipment</h4>
+            <textarea class="sheet-laf-vehicle-textarea" name="attr_vehicle_equipment"></textarea>
+            <br>
+            <hr class="sheet-hr">
+            <h4>Description</h4>
+            <textarea class="sheet-laf-vehicle-textarea" name="attr_vehicle_description"></textarea>
+            <br>
+            <hr class="sheet-hr">
+            <h4>Notes</h4>
+            <textarea class="sheet-laf-vehicle-textarea" name="attr_vehicle_weapons"></textarea>
         </div>
     </div>
-    <br>
-    <hr class="sheet-hr">
-    <div class="sheet-narrowtext">
-        <h4>Traits</h4>
-        <textarea class="sheet-laf-vehicle-textarea" name="attr_vehicle_traits"></textarea>
-        <br>
-        <hr class="sheet-hr">
-        <h4>Equipment</h4>
-        <textarea class="sheet-laf-vehicle-textarea" name="attr_vehicle_equipment"></textarea>
-        <br>
-        <hr class="sheet-hr">
-        <h4>Description</h4>
-        <textarea class="sheet-laf-vehicle-textarea" name="attr_vehicle_description"></textarea>
-        <br>
-        <hr class="sheet-hr">
-        <h4>Notes</h4>
-        <textarea class="sheet-laf-vehicle-textarea" name="attr_vehicle_weapons"></textarea>
+    <div class="sheet-tab-content sheet-vehiclenotes">
+        <div class="sheet-redborder">
+            <textarea class="sheet-laf-width-99" style="height: 750px;" name="attr_vehicle_notes"></textarea>
+        </div>
     </div>
 </div>
 <div class="sheet-tab-content sheet-trade">
@@ -6109,6 +6160,16 @@
 			});
 		});
 
+		const buttonlist_sheetvehicletype = ["vehicledetails", "vehiclenotes"];
+		buttonlist_sheetvehicletype.forEach(button => {
+			on(`clicked:${button}`, function() {
+				setAttrs({
+				    sheetVehicleType: button,
+					sheetVehicleTypeShow: button
+				});
+			});
+		});
+
 		const buttonlist_sheettradetype = ["passengers", "freight", "speculative", "tradelog"];
 		buttonlist_sheettradetype.forEach(button => {
 			on(`clicked:${button}`, function() {
@@ -9721,5 +9782,6 @@
 
 
 
+
     </script>
 </div>