diff --git a/Shadowrun2e/shadowrun2e.html b/Shadowrun2e/shadowrun2e.html
index 87efafa15c..317a7c4d0a 100644
--- a/Shadowrun2e/shadowrun2e.html
+++ b/Shadowrun2e/shadowrun2e.html
@@ -1,7 +1,7 @@
 <div class="sheet-row"> <!-- Start of General Information -->
 
 		<h2 style="color:#663399;">General Information</h2>
-    	Name: <input type="text" style="width:130px" name="attr_name"> Race: <input type="text" style="width:50px" name="attr_metatype">
+    	Name/Streetname: <input type="text" style="width:180px" name="attr_name"> Race: <input type="text" style="width:50px" name="attr_metatype">
 		Sex: <input type="text" name="attr_sex" style='width:46px;'> Age: <input type="number" name="attr_age">
         Height: <input type='number' name="attr_height" style='width:46px'>cm
         Weight: <input type='number' name="attr_weight" step='0.01' style='width:60px'>kg
@@ -95,7 +95,8 @@
     <button type="action" name="act_magic" style="color:#663399;">Magic/Spells</button>
 	<button type="action" name="act_decks" style="color:#663399;">Decks</button>
 	<button type="action" name="act_gear"style="color:#663399;"> Gear</button>
-	<button type="action" name="act_vehicles" style="color:#663399;">Vehicles/Drones</button>
+	<button type="action" name="act_vehicles" style="color:#663399;">Vehicles</button>
+	<button type="action" name="act_drones" style="color:#663399;">Drones</button>
 	<button type="action" name="act_combat" style="color:#663399;">Combat</button>
 	
 </div>
@@ -324,7 +325,7 @@ Legal Credstick:<input type='text' name='attr_money' style='width:80px;'/>¥
 <textarea name="attr_spellnotes" style='width:750px;height:50px'></textarea>
 	<div class="2colrow">
 	<div class="col">
-	<h2 style="color:#663399;">Physical Adept Powers</h2>
+	<h2 style="color:#663399;">Adept Powers/Foci/Fetishes</h2>
                     <table>
                         <tr>
                             <td style='width:203px;'>Name</td>
@@ -348,71 +349,66 @@ Legal Credstick:<input type='text' name='attr_money' style='width:80px;'/>¥
 <div class='sheet-decks'> <!--Decks Tab -->
     
 	<h2 style="color:#663399;">Decks and Programs</h2>
- <div class="grid2">
- <div class="col">
-  <h3 style="color:#663399;">Cyberdeck</h3>
-            		<fieldset class="repeating_deck">
-                        <table>
-                            <tr>
-                                <td>Model</td>
-                                <td><input type="text" name="attr_deck"></td>
-                                <td></td>
-                            </tr><tr>
-                                <td></td><td></td><td style='text-align:right;'><h4 style="color:#663399;">Condition</h4></td>
-                            </tr><tr>
-                                <td></td>
-                                <td><h4 style="color:#663399;">RATING</h4></td>
-                                <td style='text-align:right;'><h4 style="color:#663399;">Monitor</h4></td>
-                            </tr><tr>
-                        		<td>Persona</td>
-                                <td><input type="number" name="attr_persona"></td>
-                                <td style='text-align:right;'>Crash><input type="radio" name="attr_deckcond"></td>
-                            </tr><tr>
-                        		<td>Hardening</td>
-                                <td><input type="number" name="attr_hard"></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_deckcond"></td>
-                            </tr><tr>
-                                <td>Active Mem</td>
-                                <td><input type="number" name="attr_active">Mp</td>
-                                <td style='text-align:right;'><input type="radio" name="attr_deckcond"></td>
-                            </tr><tr>
-                                <td>Storage Mem</td>
-                                <td><input type="number" name="attr_storage">Mp</td>
-                                <td style='text-align:right;'><input type="radio" name="attr_deckcond"></td>
-                            </tr><tr>
-                        		<td>Offline Mem</td>
-                                <td><input type="number" name="attr_offline">Mp</td>
-                                <td style='text-align:right;'>Serious><input type="radio" name="attr_deckcond"></td>
-                            </tr><tr>
-                        		<td>I/O</td>
-                                <td><input type="number" name="attr_io"></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_deckcond"></td>
-                            </tr><tr>
-                        		<td>Response</td>
-                                <td><input type="number" name="attr_response"><button type="roll" class="d6-dice" name="roll_matrix_initiative" title="Matrix Initiative" value="/r (1+@{response})d6+2*@{response}+@{reaction}-@{stun_pen}-@{wound_pen} &{tracker}"></button></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_deckcond"></td>
-                            </tr><tr>
-                        		<td>Bod</td>
-                                <td><input type="number" name="attr_bod"></td>
-                                <td style='text-align:right;'>Moderate><input type="radio" name="attr_deckcond"></td>
-                            </tr><tr>
-                        		<td>Evasion</td>
-                                <td><input type="number" name="attr_evasion"></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_deckcond"></td>
-                            </tr><tr>
-                        		<td>Masking</td>
-                                <td><input type="number" name="attr_masking"></td>
-                                <td style='text-align:right;'>Light><input type="radio" name="attr_deckcond"></td>
-                            </tr><tr>
-                        		<td>Sensors</td>
-                                <td><input type="number" name="attr_sensors"></td>
-                                <td style='text-align:right;'>Undamaged><input type="radio" name="attr_deckcond" CHECKED></td>
-                            </tr>
-                        </table>
-            			Notes: <textarea name="attr_decknotes"></textarea><br />
-			</fieldset><br />
-	</div>
-  <div class="col">                
+ <fieldset class="repeating_decks">
+ <div class="atable deckstable">
+					<div class="atablecell">Model</div><span style="padding-left: 90px;">
+					<div class="atablecell">Persona</div><span style="padding-left: 20px;">
+					<div class="atablecell">Hard.</div><span style="padding-left: 10px;">
+					<div class="atablecell">Active</div><span style="padding-left: 10px;">
+					<div class="atablecell">Storage</div><span style="padding-left: 10px;">
+					<div class="atablecell">Offline</div><span style="padding-left: 10px;">
+					<div class="atablecell">I/O</div><span style="padding-left: 20px;">
+					<div class="atablecell">Response</div><span style="padding-left: 20px;">
+					<div class="atablecell">Bod</div><span style="padding-left:20px;">
+					<div class="atablecell">Evasion</div><span style="padding-left: 10px;">
+					<div class="atablecell">Masking</div><span style="padding-left: 5px;">
+					<div class="atablecell">Sensors</div><span style="padding-left: 10px;">
+				</div>
+					<div class="atablecell"><input type="text" name="attr_deck" class="aname"></div>
+					<div class="atablecell"><input type="number" name="attr_persona"></div>
+					<div class="atablecell"><input type="number" name="attr_hard"></div>
+					<div class="atablecell"><input type="number" name="attr_active"></div>
+					<div class="atablecell"><input type="number" name="attr_storage"></div>
+					<div class="atablecell"><input type="number" name="attr_offline"></div>
+					<div class="atablecell"><input type="number" name="attr_io"></div>
+					<div class="atablecell"><input type="number" name="attr_response"><button type="roll" class="d6-dice" name="roll_matrix_initiative" title="Matrix Initiative" value="&{template:default} {{character=@{character_name}}} {{roll=[[(1+@{response})d6+2*@{response}+@{reaction}-@{stun_pen}-@{wound_pen} &{tracker}]]}}"></button></div>			
+					<div class="atablecell"><input type="number" name="attr_bod"></div>
+					<div class="atablecell"><input type="number" name="attr_evasion"></div>
+					<div class="atablecell"><input type="number" name="attr_masking"></div>
+					<div class="atablecell"><input type="number" name="attr_sensors"></div>
+				    <textarea name="attr_decknotes" placeholder="Deck Notes" style="width:750px; height:80px"></textarea>
+				<table style='text-align:left;vertical-align:top;' cellpadding=5>
+            			<tr>
+            				<td></td>
+            				<td>Mint</td>
+            				<td>Light</td><br>
+            				<td>Moderate</td>
+            				<td>Serious</td>
+            				<td>Crashed</td>
+            			</tr><tr>
+            				<td>
+            				<h4 style="color:#663399;">Deck Damage:</h4>
+            				</td><td>
+            					<input type="radio" name="attr_deckcond" value="0" CHECKED><span style="padding-left: 20px;">
+            				</td><td>
+            					<input type="radio" name="attr_deckcond" value="1">
+								<input type="radio" name="attr_deckcond" value="2"><span style="padding-left: 20px;">
+            				</td><td>
+            					<input type="radio" name="attr_deckcond" value="3">
+								<input type="radio" name="attr_deckcond" value="4">
+								<input type="radio" name="attr_deckcond" value="5"><span style="padding-left: 20px;">
+            				</td><td>
+            					<input type="radio" name="attr_deckcond" value="6">
+								<input type="radio" name="attr_deckcond" value="7">
+								<input type="radio" name="attr_deckcond" value="9">
+								<input type="radio" name="attr_deckcond" value="10"><span style="padding-left: 20px;">
+            				</td><td>
+            					<input type="radio" name="attr_deckcond">
+            				</td>
+            			</tr><tr>
+            				<td><br>
+					</fieldset><br>
+					<div class="col">                
   <h3 style="color:#663399;">Programs</h3>
                     <table>
                         <tr>
@@ -437,7 +433,6 @@ Legal Credstick:<input type='text' name='attr_money' style='width:80px;'/>¥
             	</div>
             </div> 
 </div>
-</div>
 
 <div class='sheet-gear'> <!--Gear Tab -->
 
@@ -486,299 +481,250 @@ Legal Credstick:<input type='text' name='attr_money' style='width:80px;'/>¥
 
 <div class='sheet-vehicles'> <!-- Vehicles Tab -->
  
- <h2 style="color:#663399;">Vehicles/Drones</h2>
-    <div class="grid2">
-	<div class="col">
-            		<h3 style="color:#663399;">Vehicles</h3>
-            		<fieldset class="repeating_vehicle">
-            			<table>
-                            <tr>
-                                <td>Name</td><td><input type="text" name="attr_vehicle"></td><td style='text-align:right;'><h4 style="color:#663399;">Condition</h4></td>
-                            </tr>
-                            <tr>
-                                <td></td><td></td><td style='text-align:right;'><h4 style="color:#663399;">Monitor</h4></td>
-                            </tr>
-                            <tr>
-                                <td></td><td><h4 style="color:#663399;">RATING</h4></td>
-                                <td style='text-align:right;'>Crash><input type="radio" name="attr_vehiclecond"></td>
-                            </tr>
-                            <tr>
-                    		    <td>Handling</td>
-                                <td><input type="number" name="attr_handling"></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_vehiclecond"></td>
-                            </tr>
-                            <tr>
-                                <td>Speed</td>
-                                <td><input type="number" name="attr_speed" />/<input type="number" name="attr_speed_max" /></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_vehiclecond"></td>
-                            </tr>
-                            <tr>
-                    		    <td>Acceleration</td>
-                                <td><input type="number" name="attr_accel"></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_vehiclecond"></td>
-                            </tr>
-                            <tr>
-                                <td>Body</td>
-                                <td><input type="number" name="attr_vehiclebody"></td>
-                                <td style='text-align:right;'>Serious><input type="radio" name="attr_vehiclecond"></td>
-                            </tr>
-                            <tr>
-                    		    <td>Armor</td>
-                                <td><input type="number" name="attr_vehiclearmor"></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_vehiclecond"></td>
-                            </tr>
-                            <tr>
-                                <td>Signature</td>
-                                <td><input type="number" name="attr_signature"></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_vehiclecond"></td>
-                            </tr>
-                            <tr>
-                    		    <td>Sensor</td>
-                                <td><input type="number" name="attr_vehiclesensor"></td>
-                                <td style='text-align:right;'>Moderate><input type="radio" name="attr_vehiclecond"></td>
-                            </tr>
-                            <tr>
-                    		    <td>Pilot</td>
-                                <td><input type="number" name="attr_pilot" /></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_vehiclecond"></td>
-                            </tr>
-                            <tr>
-                    		    <td>Fuel</td>
-                                <td><input type="number" name="attr_fuel">/<input type="number" name="attr_fuel_max"></td>
-                                <td style='text-align:right;'>Light><input type="radio" name="attr_vehiclecond"></td>
-                            </tr>
-                            <tr>
-                    		    <td>Economy</td>
-                                <td><input type="number" name="attr_fueleco" /></td>
-                                <td style='text-align:right;'>Undamaged><input type="radio" name="attr_vehiclecond" CHECKED></td>
-                            </tr>
-                            <tr>
-                    		    <td>Firmpoints</td>
-                                <td><input type="number" name="attr_firm"></td>
-                                <td><table width='100%'><tr><td>Cargo</td><td style='text-align:right;'><input type="number" name="attr_cargo"></td></tr></table></td>
-                            </tr>
-                            <tr>
-                    		    <td>Hardpoints</td>
-                                <td><input type="number" name="attr_hard"></td>
-                                <td><table width='100%'><tr><td>Load</td><td style='text-align:right;'><input type="number" name="attr_load"></td></tr></table></td>
-                            </tr>
-                            <tr>
-                    		    <td>Stress</td>
-                                <td><input type="number" name="attr_stress"></td>
-                            </tr>
-                        </table>
-            			Notes <textarea name="attr_vehiclenotes"></textarea>
-            		</fieldset>
+ <h2 style="color:#663399;">Vehicles</h2>
+    <fieldset class="repeating_vehicles">
+ <div class="atable deckstable">
+					<div class="atablecell">Name</div><span style="padding-left: 90px;">
+					<div class="atablecell">Handling</div><span style="padding-left: 30px;">
+					<div class="atablecell">Speed</div><span style="padding-left: 40px;">
+					<div class="atablecell">Acc.</div><span style="padding-left: 20px;">
+					<div class="atablecell">Body</div><span style="padding-left: 15px;">
+					<div class="atablecell">Armour</div><span style="padding-left: 5px;">
+					<div class="atablecell">Signature</div><span style="padding-left: 0px;">
+					<div class="atablecell">Sensor</div><span style="padding-left:10px;">
+					<div class="atablecell">Pilot</div><span style="padding-left:50px;">
+					<div class="atablecell">Fuel</div><span style="padding-left: 40px;">
+					<div class="atablecell">Economy</div><span style="padding-left: 5px;">
+					<div class="atablecell">Stress</div><span style="padding-left: 10px;">
+				</div>
+					<div class="atablecell"><input type="text" name="attr_vehicle" class="aname"></div>
+					<div class="atablecell"><input type="number" name="attr_handling"></div>
+					<div class="atablecell"><input type="number" name="attr_speed">/<input type="number" name="attr_speed_max"></div>
+					<div class="atablecell"><input type="number" name="attr_accel"></div>
+					<div class="atablecell"><input type="number" name="attr_vehiclebody"></div>
+					<div class="atablecell"><input type="number" name="attr_vehiclearmor"></div>
+					<div class="atablecell"><input type="number" name="attr_signature"></div>
+					<div class="atablecell"><input type="number" name="attr_vehiclesensor"></div>
+					<div class="atablecell"><input type="number" name="attr_pilot"></div>
+					<div class="atablecell"><input type="number" name="attr_fuel">/<input type="number" name="attr_fuel_max"></div>
+					<div class="atablecell"><input type="number" name="attr_fueleco"></div>
+					<div class="atablecell"><input type="number" name="attr_stress"></div>
+				    <textarea name="attr_vehiclenotes" placeholder="Vehicle Notes" style="width:750px; height:80px"></textarea><br>
+					
+					Firmpoints: <input type="number" name="attr_firm">
+					Hardpoints: <input type="number" name="attr_hard">
+					Cargo: <input type="number" name="attr_cargo">
+					Load: <input type="number" name="attr_load"><br>
+			
+				<table style='text-align:left;vertical-align:top;' cellpadding=5>
+            			<tr>
+            				<td></td>
+            				<td>Mint</td>
+            				<td>Light</td><br>
+            				<td>Moderate</td>
+            				<td>Serious</td>
+            				<td>Disengaged</td>
+            			</tr><tr>
+            				<td>
+            				<h4 style="color:#663399;">Vehicle Damage:</h4>
+            				</td><td>
+            					<input type="radio" name="attr_vehiclecond" value="0" CHECKED><span style="padding-left: 20px;">
+            				</td><td>
+            					<input type="radio" name="attr_vehiclecond" value="1">
+								<input type="radio" name="attr_vehiclecond" value="2"><span style="padding-left: 20px;">
+            				</td><td>
+            					<input type="radio" name="attr_vehiclecond" value="3">
+								<input type="radio" name="attr_vehiclecond" value="4">
+								<input type="radio" name="attr_vehiclecond" value="5"><span style="padding-left: 20px;">
+            				</td><td>
+								<input type="radio" name="attr_vehiclecond" value="6">
+								<input type="radio" name="attr_vehiclecond" value="7">
+								<input type="radio" name="attr_vehiclecond" value="9">
+								<input type="radio" name="attr_vehiclecond" value="10"><span style="padding-left: 20px;">
+            				</td><td>
+            					<input type="radio" name="attr_vehiclecond">
+            				</td>
+            			</tr><tr>
+            				<td><br>
+					</fieldset><br>
             	</div>
-            	<div class="col">
-            		<h3 style="color:#663399;">Drones</h3>
-            		<fieldset class="repeating_drone">
-            			<table>
-                            <tr>
-                                <td>Name</td><td><input type="text" name="attr_drone"></td><td style='text-align:right;'><h4 style="color:#663399;">Condition</h4></td>
-                            </tr>
-                            <tr>
-                                <td></td><td></td><td style='text-align:right;'><h4 style="color:#663399;">Monitor</h4></td>
-                            </tr>
-                            <tr>
-                                <td></td><td><h4 style="color:#663399;">RATING</h4></td>
-                                <td style='text-align:right;'>Crash><input type="radio" name="attr_dronecond"></td>
-                            </tr>
-                            <tr>
-                        	    <td>Handling</td>
-                                <td><input type="number" name="attr_dronehandling" /></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_dronecond"></td>
-                            </tr>
-                            <tr>
-                                <td>Speed</td>
-                                <td><input type="number" name="attr_dronespeed">/<input type="number" name="attr_dronespeed_max"></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_dronecond"></td>
-                            </tr>
-                            <tr>
-                    		    <td>Acceleration</td>
-                                <td><input type="number" name="attr_droneaccel"></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_dronecond"></td>
-                            </tr>
-                            <tr>
-                                <td>Body</td>
-                                <td><input type="number" name="attr_dronebody"></td>
-                                <td style='text-align:right;'>Serious><input type="radio" name="attr_dronecond"></td>
-                            </tr>
-                            <tr>
-                    		    <td>Armor</td>
-                                <td><input type="number" name="attr_dronearmor"></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_dronecond"></td>
-                            </tr>
-                            <tr>
-                                <td>Signature</td>
-                                <td><input type="number" name="attr_dronesignature"></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_dronecond"></td>
-                            </tr>
-                            <tr>
-            			        <td>Autonav</td>
-                                <td><input type="number" name="attr_dronepilot"></td>
-                                <td style='text-align:right;'><input type="radio" name="attr_dronecond"></td>
-                            </tr>
-                            <tr>
-                        	    <td>Fuel</td>
-                                <td><input type="number" name="attr_dronefuel">/<input type="number" name="attr_dronefuel_max"></td>
-                                <td style='text-align:right;'>Light><input type="radio" name="attr_dronecond"></td>
-                            </tr>
-                            <tr>
-                    		    <td>Economy</td>
-                                <td><input type="number" name="attr_dronefueleco"></td>
-                                <td style='text-align:right;'>Undamaged><input type="radio" name="attr_dronecond" CHECKED></td>
-                            </tr>
-                            <tr>
-                    		    <td>Firmpoints</td>
-                                <td><input type="number" name="attr_dronefirm"></td>
-                                <td><table width='100%'><tr><td>Cargo</td><td style='text-align:right;'><input type="number" name="attr_dronecargo"></td></tr></table></td>
-                            </tr>
-                            <tr>
-                    		    <td>Hardpoints</td>
-                                <td><input type="number" name="attr_dronehard"></td>
-                                <td><table width='100%'><tr><td>Load</td><td style='text-align:right;'><input type="number" name="attr_droneload"></td></tr></table></td>
-                            </tr>
-                            <tr>
-                    		    <td>Stress</td>
-                                <td><input type="number" name="attr_dronestress"></td>
-                            </tr>
-                        </table>
-            			<h4 style="color:#663399;">Sensors</h4>
-                        <table>
-                            <tr>
-                			    <td></td>
-                                <td><h5 style="color:#663399;">RATING</h5></td>
-                                <td style='text-align:right;width:50px'>FLUX:</td>
-                                <td style='text-align:center'>Current</td>
-                                <td style='text-align:center'>Max</td>
-                            </tr>
-                            <tr>
-                			    <td>Sensors</td>
-                                <td><input type="number" name="attr_dronesensors"></td>
-                                <td></td>
-                                <td><input type="number" name="attr_sensorsflux"> /</td>
-                                <td><input type="number" name="attr_sensorsflux_max"></td>
-                            </tr>
-                            <tr>
-                			    <td>ECM</td>
-                                <td><input type="number" name="attr_ECM"></td>
-                                <td></td>
-                                <td><input type="number" name="attr_ECMflux"> /</td>
-                                <td><input type="number" name="attr_ECMflux_max"></td>
-                            </tr>
-                            <tr>
-                			    <td>ECCM</td>
-                                <td><input type="number" name="attr_ECCM"></td>
-                                <td></td>
-                                <td><input type="number" name="attr_ECCMflux"> /</td>
-                                <td><input type="number" name="attr_ECCMflux_max"></td>
-                            </tr>
-                            <tr>
-                			    <td>ED</td>
-                                <td><input type="number" name="attr_ED"></td>
-                                <td></td>
-                                <td><input type="number" name="attr_EDflux"> /</td>
-                                <td><input type="number" name="attr_EDflux_max"></td>
-                            </tr>
-                            <tr>
-                			    <td>ECD</td>
-                                <td><input type="number" name="attr_ECD"></td>
-                                <td></td>
-                                <td><input type="number" name="attr_ECDflux"> /</td>
-                                <td><input type="number" name="attr_ECDflux_max"></td>
-                            </tr>
-                        </table>
-            			<h4 style="color:#663399;">Signal Condition Monitors</h4>
-            			<table>
-                            <tr>
-                                <td></td>
-                                <td>Command<br />Channel</td>
-                                <td>Simsense<br />Channel</td>
-                                <td>System<br />Channel</td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <td>Channel Disengaged</td>
-                                <td><input type="radio" name="attr_commcond" value="4"></td>
-                                <td><input type="radio" name="attr_simcond" value="4"></td>
-                                <td><input type="radio" name="attr_syscond" value="4"></td>
-                                <td>Channel Disengaged</td>
-                            </tr>
-                            <tr>
-                                <td></td>
-                                <td><input type="radio" name="attr_commcond" value="3"></td>
-                                <td><input type="radio" name="attr_simcond" value="3"></td>
-                                <td><input type="radio" name="attr_syscond" value="3"></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <td></td>
-                                <td><input type="radio" name="attr_commcond" value="3"></td>
-                                <td><input type="radio" name="attr_simcond" value="3"></td>
-                                <td><input type="radio" name="attr_syscond" value="3"></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <td></td>
-                                <td><input type="radio" name="attr_commcond" value="3"></td>
-                                <td><input type="radio" name="attr_simcond" value="3"></td>
-                                <td><input type="radio" name="attr_syscond" value="3"></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <td>Serious Degredation</td>
-                                <td><input type="radio" name="attr_commcond" value="3"></td>
-                                <td><input type="radio" name="attr_simcond" value="3"></td>
-                                <td><input type="radio" name="attr_syscond" value="3"></td>
-                                <td>Serious Degredation</td>
-                            </tr>
-                            <tr>
-                                <td></td>
-                                <td><input type="radio" name="attr_commcond" value="2"></td>
-                                <td><input type="radio" name="attr_simcond" value="2"></td>
-                                <td><input type="radio" name="attr_syscond" value="2"></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <td></td>
-                                <td><input type="radio" name="attr_commcond" value="2"></td>
-                                <td><input type="radio" name="attr_simcond" value="2"></td>
-                                <td><input type="radio" name="attr_syscond" value="2"></td>
-                                <td></td>
-                            </tr>
-                            <tr>
-                                <td>Moderate Degredation</td>
-                                <td><input type="radio" name="attr_commcond" value="2"></td>
-                                <td><input type="radio" name="attr_simcond" value="2"></td>
-                                <td><input type="radio" name="attr_syscond" value="2"></td>
-                                <td>Moderate Degredation</td>
-                            </tr>
-                            <tr>
-                                <td></td>
-                                <td><input type="radio" name="attr_commcond" value="1"></td>
-                                <td><input type="radio" name="attr_simcond" value="1"></td>
-                                <td><input type="radio" name="attr_syscond" value="1"></td>
-                                <td></td>
-                            </tr>
-            				<tr>
-                			    <td>Light Degredation</td>
-                                <td><input type="radio" name="attr_commcond" value="1"></td>
-                                <td><input type="radio" name="attr_simcond" value="1"></td>
-                                <td><input type="radio" name="attr_syscond" value="1"></td>
-                                <td>Light Degredation</td>
-            				</tr>
-                            <tr>
-                                <td>No Degredation</td>
-                                <td><input type="radio" name="attr_commcond" value="0"></td>
-                                <td><input type="radio" name="attr_simcond" value="0"></td>
-                                <td><input type="radio" name="attr_syscond" value="0"></td>
-                                <td>No Degredation</td>
-                            </tr>
-            			</table>
-            			Notes <textarea name="attr_dronenotes"></textarea>
-            		</fieldset>
             	</div>
+				</div>
+	
+	<div class="sheet-drones">	
+				<fieldset class="repeating_drone">
+	<h2 style="color:#663399;">Drone</h2>
+	<div class="atable dronestable">
+					<div class="atablecell">Name</div><span style="padding-left: 90px;">
+					<div class="atablecell">Handling</div><span style="padding-left: 30px;">
+					<div class="atablecell">Speed</div><span style="padding-left: 40px;">
+					<div class="atablecell">Acc.</div><span style="padding-left: 20px;">
+					<div class="atablecell">Body</div><span style="padding-left: 15px;">
+					<div class="atablecell">Armour</div><span style="padding-left: 5px;">
+					<div class="atablecell">Signature</div><span style="padding-left: 0px;">
+					<div class="atablecell">Autonav</div><span style="padding-left:30px;">
+					<div class="atablecell">Fuel</div><span style="padding-left:40px;">
+					<div class="atablecell">Economy</div><span style="padding-left: 10px;">
+					<div class="atablecell">Stress</div><span style="padding-left: 40px;">
+				</div>		
+					<div class="atablecell"><input type="text" name="attr_drone" class="aname"></div>
+					<div class="atablecell"><input type="number" name="attr_dronehandling"></div>
+					<div class="atablecell"><input type="number" name="attr_dronespeed">/<input type="number" name="attr_dronespeed_max"></div>
+					<div class="atablecell"><input type="number" name="attr_droneaccel"></div>
+					<div class="atablecell"><input type="number" name="attr_dronebody"></div>
+					<div class="atablecell"><input type="number" name="attr_dronearmor"></div>
+					<div class="atablecell"><input type="number" name="attr_dronesignature"></div>
+					<div class="atablecell"><input type="number" name="attr_dronepilot"></div>			
+					<div class="atablecell"><input type="number" name="attr_dronefuel">/<input type="number" name="attr_dronefuel_max"></div>
+					<div class="atablecell"><input type="number" name="attr_dronefueleco"></div>
+					<div class="atablecell"><input type="number" name="attr_dronestress"></div><br>
+					
+					<textarea name="attr_dronenotes" placeholder="Drone Notes" style="width:750px; height:80px"></textarea><br>
+				
+					Firmpoints: <input type="number" name="attr_dronefirm">
+					Hardpoints: <input type="number" name="attr_dronehard">
+					Cargo: <input type="number" name="attr_dronecargo">
+					Load: <input type="number" name="attr_droneload"><br>
+				
+				<div class="dronecond">
+				<table style='text-align:left;vertical-align:top;' cellpadding=5>
+            			<tr>
+            				<td></td>
+            				<td>Mint</td>
+            				<td>Light</td><br>
+            				<td>Moderate</td>
+            				<td>Serious</td>
+            				<td>Destroyed</td>
+            			</tr><tr>
+            				<td>
+            				<h4 style="color:#663399;">Drone Condition:</h4>
+            				</td><td>
+            					<input type="radio" name="attr_dronecond" value="0" CHECKED><span style="padding-left: 20px;">
+            				</td><td>
+            					<input type="radio" name="attr_dronecond" value="1" >
+								<input type="radio" name="attr_dronecond" value="2"><span style="padding-left: 20px;">
+            				</td><td>
+            					<input type="radio" name="attr_dronecond" value="3">
+								<input type="radio" name="attr_dronecond" value="4">
+								<input type="radio" name="attr_dronecond" value="5"><span style="padding-left: 20px;">
+            				</td><td>
+								<input type="radio" name="attr_dronecond" value="6">
+								<input type="radio" name="attr_dronecond" value="7">
+								<input type="radio" name="attr_dronecond" value="8" >
+								<input type="radio" name="attr_dronecond" value="9"><span style="padding-left: 20px;">
+            				</td><td>
+            					<input type="radio" name="attr_dronecond" value="10">
+            				</td>
+            			</tr><tr>
+            				<td><br>
+				</div>			
+				<h4 style="color:#663399;">Electronics</h4>
+				<div class="atable sensorstable">
+					<div class="atablecell "style="color:#663399;">SENSOR</div><span style="padding-left: 10px;">
+					<div class="atablecell">Flux</div><span style="padding-left: 10px;">
+					<div class="atablecell">MAX Flux</div><span style="padding-left: 10px;">
+					<div class="atablecell "style="color:#663399;">ECM</div><span style="padding-left: 10px;">
+					<div class="atablecell">Flux</div><span style="padding-left: 10px;">
+					<div class="atablecell">MAX Flux</div><span style="padding-left: 5px;">
+					<div class="atablecell "style="color:#663399;">ECCM</div><span style="padding-left:10px;">
+					<div class="atablecell">Flux</div><span style="padding-left:10px;">
+					<div class="atablecell">MAX Flux</div><span style="padding-left:10px;">
+					<div class="atablecell "style="color:#663399;" >ED</div><span style="padding-left: 20px;">
+					<div class="atablecell">Flux</div><span style="padding-left: 15px;">
+					<div class="atablecell">MAX Flux</div><span style="padding-left: 5px;">
+					<div class="atablecell "style="color:#663399;" >ECD</div><span style="padding-left: 20px;">
+					<div class="atablecell">Flux</div><span style="padding-left: 10px">
+					<div class="atablecell">MAX Flux</div><span style="padding-left: 10px;">
+				</div>
+					<div class="atablecell"><input type="number" name="attr_dronesensors"></div>
+					<div class="atablecell"><input type="number" name="attr_sensorsflux">/<input type="number" name="attr_sensorsflux_max"></div>
+					<div class="atablecell"><input type="number" name="attr_ECM"></div>
+					<div class="atablecell"><input type="number" name="attr_ECMflux">/<input type="number" name="attr_ECMflux_max"></div>
+					<div class="atablecell"><input type="number" name="attr_ECCM"></div>
+					<div class="atablecell"><input type="number" name="attr_ECCMflux">/<input type="number" name="attr_ECCMflux_max"></div>
+					<div class="atablecell"><input type="number" name="attr_ED"></div>
+					<div class="atablecell"><input type="number" name="attr_EDflux">/<input type="number" name="attr_EDflux_max"></div>			
+					<div class="atablecell"><input type="number" name="attr_ECD"></div>
+					<div class="atablecell"><input type="number" name="attr_ECDflux">/<input type="number" name="attr_ECDflux_max"></div>
+				<br>
+					
+				<div class="channelcond">
+				<h4 style="color:#663399;">Signal Degredation Monitors</h4>
+				<table style='text-align:left;vertical-align:top;' cellpadding=5>
+            			<tr>
+            				<td></td>
+            				<td>None</td>
+            				<td>Light</td><br>
+            				<td>Moderate</td>
+            				<td>Serious</td>
+            				<td>Destroyed</td>
+            			</tr><tr>
+            				<td>
+            				<h4 style="color:#663399;">Command Channel:</h4>
+            				</td><td>
+            					<input type="radio" name="attr_commcond" value="0" CHECKED><span style="padding-left: 20px;">
+            				</td><td>
+            					<input type="radio" name="attr_commcond" value="1">
+								<input type="radio" name="attr_commcond" value="2"><span style="padding-left: 20px;">
+							</td><td>
+            					<input type="radio" name="attr_commcond" value="3">
+								<input type="radio" name="attr_commcond" value="4">
+								<input type="radio" name="attr_commcond" value="5"><span style="padding-left: 20px;">
+            				</td><td>
+								<input type="radio" name="attr_commcond" value="6">
+								<input type="radio" name="attr_commcond" value="7">
+								<input type="radio" name="attr_commcond" value="8">
+								<input type="radio" name="attr_commcond" value="9"><span style="padding-left: 20px;">
+            				</td><td>
+								<input type="radio" name="attr_commcond" value="10">	
+            				</td>
+            			</tr><tr>
+            				<td>
+							
+            				
+							<h4 style="color:#663399;">Simsense Channel:</h4>
+            				</td><td>
+								<input type="radio" name="attr_simcond" value="0" CHECKED><span style="padding-left: 20px;">
+            				</td><td>
+            					<input type="radio" name="attr_simcond" value="1">
+								<input type="radio" name="attr_simcond" value="2"><span style="padding-left: 20px;">
+							</td><td>
+            					<input type="radio" name="attr_simcond" value="3">
+								<input type="radio" name="attr_simcond" value="4">
+								<input type="radio" name="attr_simcond" value="5"><span style="padding-left: 20px;">
+            				</td><td>
+								<input type="radio" name="attr_simcond" value="6">
+								<input type="radio" name="attr_simcond" value="7">
+								<input type="radio" name="attr_simcond" value="8">
+								<input type="radio" name="attr_simcond" value="9"><span style="padding-left: 20px;">
+            				</td><td>
+								<input type="radio" name="attr_simcond" value="10">	
+            				</td>
+            			</tr><tr>
+            				<td>
+            				
+							<h4 style="color:#663399;">System Channel:</h4>
+            				</td><td>
+								<input type="radio" name="attr_syscond" value="0" CHECKED><span style="padding-left: 20px;">
+            				</td><td>
+            					<input type="radio" name="attr_syscond" value="1">
+								<input type="radio" name="attr_syscond" value="2"><span style="padding-left: 20px;">
+							</td><td>
+            					<input type="radio" name="attr_syscond" value="3">
+								<input type="radio" name="attr_syscond" value="4">
+								<input type="radio" name="attr_syscond" value="5"><span style="padding-left: 20px;">
+            				</td><td>
+								<input type="radio" name="attr_syscond" value="6">
+								<input type="radio" name="attr_syscond" value="7">
+								<input type="radio" name="attr_syscond" value="8">
+								<input type="radio" name="attr_syscond" value="9"><span style="padding-left: 20px;">
+            				</td><td>
+								<input type="radio" name="attr_syscond" value="10">	
+            				</td>
+            			</tr><tr>
+            				<td><br>
+				</fieldset>
+            </div>
 </div>
 </div>
 
@@ -999,7 +945,7 @@ Legal Credstick:<input type='text' name='attr_money' style='width:80px;'/>¥
 
 	
 <script type="text/worker">
-    const buttonlist = ["character","skills","magic","decks","gear","vehicles","combat",];
+    const buttonlist = ["character","skills","magic","decks","gear","vehicles","combat","drones",];
     buttonlist.forEach(button => {
         on(`clicked:${button}`, function() {
             setAttrs({