diff --git a/AW/apocalypse-world.html b/AW/apocalypse-world.html
index 72e8c1c3db..c60fc65de6 100644
--- a/AW/apocalypse-world.html
+++ b/AW/apocalypse-world.html
@@ -2,22 +2,48 @@
     <label class="sheet-name">Name:</label>
     <input type="text" name="attr_name"/>
 
-    <input type='checkbox' name='lock_class' class='sheet-lock'>
+    <input type='checkbox' name='attr_lock_class' class='sheet-lock'>
     <label class="sheet-lock"><small>Lock/Unlock Class</small></label><br/>
     <label class="sheet-name">Class:</label>
-    <input type="radio" name="attr_class" class="sheet-class" value='Angel'/><label>Angel </label>    		
-    <input type="radio" name="attr_class" class="sheet-class" value='Battlebabe'/><label>Battlebabe </label>
-    <input type="radio" name="attr_class" class="sheet-class" value='Brainer'/><label>Brainer </label>
-    <input type="radio" name="attr_class" class="sheet-class" value='Chopper'/><label>Chopper </label>
-    <input type="radio" name="attr_class" class="sheet-class" value='Driver'/><label>Driver </label>
-    <input type="radio" name="attr_class" class="sheet-class" value='GunLugger'/><label>GunLugger </label>    
-    <input type="radio" name="attr_class" class="sheet-class" value='Hardholder'/><label>Hardholder </label>
-    <input type="radio" name="attr_class" class="sheet-class" value='Hocus'/><label>Hocus </label>    
-    <input type="radio" name="attr_class" class="sheet-class" value='Operator'/><label>Operator </label>			
-    <input type="radio" name="attr_class" class="sheet-class" value='SavvyHead'/><label>SavvyHead </label>			
-    <input type="radio" name="attr_class" class="sheet-class" value='Skinner'/><label>Skinner </label>			            
+    <input type='checkbox' name='attr_lock_class' class='sheet-lock' style="display: none;">
+    <div class="sheet-classSelected" style=" width: 100%; padding-left: 20px;">
+    	<input type='checkbox' name='attr_lock_class' class='sheet-lock' style="display: none;">
+    	<input type="checkbox" name="attr_class" class="sheet-class" value='Angel'/><label>Angel </label>    		
+		<input type="checkbox" name="attr_class" class="sheet-class" value='Battlebabe'/><label>Battlebabe </label>
+		<input type="checkbox" name="attr_class" class="sheet-class" value='Brainer'/><label>Brainer </label>
+		<input type="checkbox" name="attr_class" class="sheet-class" value='Chopper'/><label>Chopper </label>
+		<input type="checkbox" name="attr_class" class="sheet-class" value='Driver'/><label>Driver </label>
+		<input type="checkbox" name="attr_class" class="sheet-class" value='GunLugger'/><label>GunLugger </label>    
+		<input type="checkbox" name="attr_class" class="sheet-class" value='Hardholder'/><label>Hardholder </label>
+		<input type="checkbox" name="attr_class" class="sheet-class" value='Hocus'/><label>Hocus </label>    
+		<input type="checkbox" name="attr_class" class="sheet-class" value='Operator'/><label>Operator </label>			
+		<input type="checkbox" name="attr_class" class="sheet-class" value='SavvyHead'/><label>SavvyHead </label>			
+		<input type="checkbox" name="attr_class" class="sheet-class" value='Skinner'/><label>Skinner </label>	
+    </div>
+    <div class="sheet-2colrow" style="padding-left: 20px;">
+    	<input type='checkbox' name='attr_lock_class' class='sheet-lock' style="display: none;">
+    	<div class="sheet-col sheet-classcol" style="width: 120px;">
+    		<input type='checkbox' name='attr_lock_class' class='sheet-lock' style="display: none;">
+			<input type="checkbox" name="attr_class" class="sheet-class" value='Angel' /><label style="width: 70%;">Angel</label>
+			<input type="checkbox" name="attr_class" class="sheet-class" value='Battlebabe'/><label style="width: 70%;">Battlebabe</label>
+			<input type="checkbox" name="attr_class" class="sheet-class" value='Brainer'/><label style="width: 70%;">Brainer</label>
+			<input type="checkbox" name="attr_class" class="sheet-class" value='Chopper'/><label style="width: 70%;">Chopper</label>
+			<input type="checkbox" name="attr_class" class="sheet-class" value='Driver'/><label style="width: 70%;">Driver</label>
+			<input type="checkbox" name="attr_class" class="sheet-class" value='GunLugger'/><label style="width: 70%;">GunLugger</label>
+		</div>
+		<div class="sheet-col sheet-classcol" style="width: 120px;">    
+			<input type='checkbox' name='attr_lock_class' class='sheet-lock' style="display: none;">
+			<input type="checkbox" name="attr_class" class="sheet-class" value='Hardholder'/><label style="width: 70%;">Hardholder </label>
+			<input type="checkbox" name="attr_class" class="sheet-class" value='Hocus'/><label style="width: 70%;">Hocus </label>    
+			<input type="checkbox" name="attr_class" class="sheet-class" value='Operator'/><label style="width: 70%;">Operator </label>	
+			<input type="checkbox" name="attr_class" class="sheet-class" value='SavvyHead'/><label style="width: 70%;">SavvyHead </label>			
+			<input type="checkbox" name="attr_class" class="sheet-class" value='Skinner'/><label style="width: 70%;">Skinner </label>	
+		</div>
+	</div>           
 
     <div class="sheet-3colrow">
+    <!--<div class="sheet-row">
+    <div class="sheet-col" style="width: 33%;">-->
         <div class="sheet-col odd">
         	<label class="sheet-class-moves sheet-section-title">Stats:</label>
         	<div class="sheet-attr-box">
@@ -68,20 +94,272 @@
 				<button type='roll' value='&{template:aw} {{name=@{character_name}}} {{roll_name=Weird}} {{roll_mod=@{weird}}} {{result=[[2d6 + @{weird}]]}}' name='roll_oyb' ></button>
 				</div>
         	</div>
+        	
+        	<div class="sheet-box">
+				<label class="sheet-improvements sheet-section-title">Improvements:</label>
+
+				<div class="sheet-tracker">
+					<label class="sheet-improvement">Experience:</label>
+					<input type="checkbox" name="attr_sheet-improvement-1" value="0"  />
+					<input type="checkbox" name="attr_sheet-improvement-2" value="0"  />
+					<input type="checkbox" name="attr_sheet-improvement-3" value="0"  />
+					<input type="checkbox" name="attr_sheet-improvement-4" value="0"  />
+					<input type="checkbox" name="attr_sheet-improvement-5" value="0"  />
+				</div>
+				<input type='checkbox' name='attr_sheet-show_improvements' class='sheet-showhide'/>
+				<label class="sheet-showhide"><small>Show/Hide Improvements</small></label><br/>
+				<small>Add all these improvements manually into your stats, they will not be auto-calculated</small>
+				
+				<!-- Class Selected -->
+				<input type="checkbox" name="attr_class" class="sheet-isAngel" value='Angel' style="display: none;" />
+				<input type="checkbox" name="attr_class" class="sheet-isBattlebabe" value='Battlebabe' style="display: none;" />
+				<input type="checkbox" name="attr_class" class="sheet-isBrainer" value='Brainer' style="display: none;" />
+				<input type="checkbox" name="attr_class" class="sheet-isChopper" value='Chopper' style="display: none;" />
+				<input type="checkbox" name="attr_class" class="sheet-isDriver" value='Driver' style="display: none;" />
+				<input type="checkbox" name="attr_class" class="sheet-isGunlugger" value='GunLugger' style="display: none;" />
+				<input type="checkbox" name="attr_class" class="sheet-isHardholder" value='Hardholder' style="display: none;" />
+				<input type="checkbox" name="attr_class" class="sheet-isHocus" value='Hocus' style="display: none;" />
+				<input type="checkbox" name="attr_class" class="sheet-isOperator" value='Operator' style="display: none;" />
+				<input type="checkbox" name="attr_class" class="sheet-isSavvyhead" value='SavvyHead' style="display: none;" />
+				<input type="checkbox" name="attr_class" class="sheet-isSkinner" value='Skinner' style="display: none;" />
+				<!-- End Class Selected -->
+				
+				<div class="sheet-angel">
+					<ul>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-6" value="0" /> get +1sharp (max sharp+3)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-7" value="0" /> get +1cool (max cool+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-8" value="0" /> get +1hard (max hard+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-9" value="0" /> get +1hard (max hard+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-10" value="0" /> get +1weird (max weird+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-11" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-12" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-13" value="0" /> get 2 gigs (detail) and moonlighting</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-14" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-15" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-16" value="0" /> get +1 to any stat (max stat+3)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-17" value="0" /> retire your character (to safety)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-18" value="0" /> create a second character to play</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-19" value="0" /> change your character to a new type</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-20" value="0" /> choose 3 basic moves and advance them.</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_angel-improvement-21" value="0" /> advance the other 4 basic moves.</label></li>
+					</ul>
+				</div>
+				<div class="sheet-battlebabe">
+					<ul>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-6" value="0" /> get +1hard (max hard+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-7" value="0" /> get +1hot (max hot+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-8" value="0" /> get +1sharp (max sharp+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-9" value="0" /> get +1weird (max weird+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-11" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-12" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-13" value="0" /> get 2 gigs (detail) and moonlighting</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-10" value="0" /> get a gang (detail) and leadership</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-14" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-15" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-16" value="0" /> get +1 to any stat (max stat+3)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-17" value="0" /> retire your character (to safety)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-18" value="0" /> create a second character to play</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-19" value="0" /> change your character to a new type</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-20" value="0" /> choose 3 basic moves and advance them.</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_battlebabe-improvement-21" value="0" /> advance the other 4 basic moves.</label></li>
+					</ul>
+				</div>
+				<div class="sheet-brainer">
+					<ul>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-6" value="0" /> get +1cool (max cool+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-7" value="0" /> get +1sharp (max sharp+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-8" value="0" /> get +1hard (max hard+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-9" value="0" /> get +1hard (max hard+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-11" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-12" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-13" value="0" /> get 2 gigs (detail) and moonlighting</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-10" value="0" /> get a holding (detail) and wealth</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-14" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-15" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-16" value="0" /> get +1 to any stat (max stat+3)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-17" value="0" /> retire your character (to safety)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-18" value="0" /> create a second character to play</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-19" value="0" /> change your character to a new type</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-20" value="0" /> choose 3 basic moves and advance them.</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-21" value="0" /> advance the other 4 basic moves.</label></li>
+					</ul>
+				</div>
+				<div class="sheet-chopper">
+					<ul>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-6" value="0" /> get +1hard (max hard+3)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-7" value="0" /> get +1cool (max cool+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-8" value="0" /> get +1sharp (max sharp+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-9" value="0" /> get +1weird (max weird+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-12" value="0" /> get +1weird (max weird+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-11" value="0" /> choose a new option for your gang</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-13" value="0" /> get 2 gigs (detail) and moonlighting</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-10" value="0" /> get a holding (detail) and wealth</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-14" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-15" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-16" value="0" /> get +1 to any stat (max stat+3)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-17" value="0" /> retire your character (to safety)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-18" value="0" /> create a second character to play</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-19" value="0" /> change your character to a new type</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-20" value="0" /> choose 3 basic moves and advance them.</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_chopper-improvement-21" value="0" /> advance the other 4 basic moves.</label></li>
+					</ul>
+				</div>
+				<div class="sheet-driver">
+					<ul>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-6" value="0" /> get +1cool (max cool+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-7" value="0" /> get +1hard (max hard+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-8" value="0" /> get +1hot (max hot+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-9" value="0" /> get +1weird (max weird+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-11" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-12" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-13" value="0" /> get 2 gigs (detail) and moonlighting</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-10" value="0" /> get a garage (workspace, detail) and crew</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-14" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-15" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-16" value="0" /> get +1 to any stat (max stat+3)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-17" value="0" /> retire your character (to safety)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-18" value="0" /> create a second character to play</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-19" value="0" /> change your character to a new type</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-20" value="0" /> choose 3 basic moves and advance them.</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_brainer-improvement-21" value="0" /> advance the other 4 basic moves.</label></li>
+					</ul>
+				</div>
+				<div class="sheet-gunlugger">
+					<ul>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-6" value="0" /> get +1cool (max cool+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-7" value="0" /> get +1sharp (max sharp+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-8" value="0" /> get +1weird (max weird+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-9" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-10" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-11" value="0" /> get 2 gigs (detail) and moonlighting</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-12" value="0" /> get a holding (detail) and wealth</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-13" value="0" /> get a gang (detail) and pack alpha</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-14" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-15" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-16" value="0" /> get +1 to any stat (max stat+3)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-17" value="0" /> retire your character (to safety)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-18" value="0" /> create a second character to play</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-19" value="0" /> change your character to a new type</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-20" value="0" /> choose 3 basic moves and advance them.</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_gunlugger-improvement-21" value="0" /> advance the other 4 basic moves.</label></li>
+					</ul>
+				</div>
+				<div class="sheet-holder">
+					<ul>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-6" value="0" /> get +1hard (max hard+3)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-7" value="0" /> get +1weird (max weird+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-8" value="0" /> get +1cool (max cool+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-9" value="0" /> get +1hot (max hot+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-10" value="0" /> get +1sharp (max sharp+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-11" value="0" /> choose a new option for your holding</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-12" value="0" /> choose a new option for your holding</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-13" value="0" /> erase an option from your holding</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-14" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-15" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-16" value="0" /> get +1 to any stat (max stat+3)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-17" value="0" /> retire your character (to safety)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-18" value="0" /> create a second character to play</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-19" value="0" /> change your character to a new type</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-20" value="0" /> choose 3 basic moves and advance them.</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hardholder-improvement-21" value="0" /> advance the other 4 basic moves.</label></li>
+					</ul>
+				</div>
+				<div class="sheet-hocus">
+					<ul>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-6" value="0" /> get +1cool (max cool+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-7" value="0" /> get +1hard (max hard+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-8" value="0" /> get +1sharp (max sharp+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-9" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-10" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-11" value="0" /> choose a new option for your followers</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-12" value="0" /> choose a new option for your followers</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-13" value="0" /> get a holding (detail) and wealth</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-14" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-15" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-16" value="0" /> get +1 to any stat (max stat+3)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-17" value="0" /> retire your character (to safety)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-18" value="0" /> create a second character to play</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-19" value="0" /> change your character to a new type</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-20" value="0" /> choose 3 basic moves and advance them.</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_hocus-improvement-21" value="0" /> advance the other 4 basic moves.</label></li>
+					</ul>
+				</div>
+				<div class="sheet-operator" style="padding-left: 20px;">
+					<ul>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-6" value="0" /> get +1cool (max cool+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-7" value="0" /> get +1hard (max hard+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-8" value="0" /> get +1sharp (max sharp+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-9" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-10" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-11" value="0" /> get a gig and you may change your crew</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-12" value="0" /> get a gig and you may change your crew</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-13" value="0" /> abandon or resolve an obligation gig for good</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-14" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-15" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-16" value="0" /> get +1 to any stat (max stat+3)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-17" value="0" /> retire your character (to safety)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-18" value="0" /> create a second character to play</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-19" value="0" /> change your character to a new type</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-20" value="0" /> choose 3 basic moves and advance them.</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_operator-improvement-21" value="0" /> advance the other 4 basic moves.</label></li>
+					</ul>
+				</div>
+				<div class="sheet-savvy">
+					<ul>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-6" value="0" /> get +1cool (max cool+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-7" value="0" /> get +1hard (max hard+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-8" value="0" /> get +1sharp (max sharp+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-9" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-10" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-11" value="0" /> get 2 gigs (detail) and moonlighting</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-12" value="0" /> get a gang (detail) for security, and leadership</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-13" value="0" /> add life support to your workspace, and now you can work on people there too</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-14" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-15" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-16" value="0" /> get +1 to any stat (max stat+3)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-17" value="0" /> retire your character (to safety)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-18" value="0" /> create a second character to play</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-19" value="0" /> change your character to a new type</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-20" value="0" /> choose 3 basic moves and advance them.</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_savvyhead-improvement-21" value="0" /> advance the other 4 basic moves.</label></li>
+					</ul>
+				</div>
+				<div class="sheet-skinner">
+					<ul>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-6" value="0" /> get +1cool (max cool+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-7" value="0" /> get +1cool (max cool+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-8" value="0" /> get +1hard (max hard+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-9" value="0" /> get +1sharp (max sharp+2)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-10" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-11" value="0" /> get a new move from your class</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-12" value="0" /> get 2 gigs (detail) and moonlighting</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-13" value="0" /> get followers (detail) and fortunes</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-14" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-15" value="0" /> get a move from another playbook</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-16" value="0" /> get +1 to any stat (max stat+3)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-17" value="0" /> retire your character (to safety)</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-18" value="0" /> create a second character to play</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-19" value="0" /> change your character to a new type</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-20" value="0" /> choose 3 basic moves and advance them.</label></li>
+						<li><label class="sheet-improvement"><input type="checkbox" name="attr_skinner-improvement-21" value="0" /> advance the other 4 basic moves.</label></li>
+					</ul>
+				</div>
+			</div>
+		</div>
 			
-        </div>
+        <!--</div>-->
         <div class="sheet-col even">
         	<label class="sheet-class-moves sheet-section-title">Class Moves:</label>
 			<fieldset class="repeating_moves">            
  			     <label class="sheet-movename">Move:</label>
  			     <input type="text" name="attr_classmovename" /> 
  			     <label class="sheet-stat">Stat:</label>
-			     <select name="attr_classmoves" class="moves">                
-			          <option type="radio" name="attr_class"value="@{cool} - @{shattered}">Cool</option>
-			          <option type="radio" name="attr_class"value="@{hard} - @{crippled}">Hard</option>
-			          <option type="radio" name="attr_class"value="@{hot} - @{disfigured}">Hot</option>
-			          <option type="radio" name="attr_class"value="@{sharp} - @{broken}">Sharp</option>
-			          <option type="radio" name="attr_class"value="@{weird}">Weird</option>
+			     <select name="attr_classmoves" class="sheet-moves">                
+			          <option value="@{cool} - @{shattered}">Cool</option>
+			          <option value="@{hard} - @{crippled}">Hard</option>
+			          <option value="@{hot} - @{disfigured}">Hot</option>
+			          <option value="@{sharp} - @{broken}">Sharp</option>
+			          <option value="@{weird}">Weird</option>
 			      </select>
   			     <button type='roll' value='&{template:aw} {{name=@{character_name}}} {{roll_name=@{classmovename}}} {{roll_mod=[[@{classmoves}]]}} {{result=[[2d6 + @{classmoves}]]}}' name='roll_move'></button> 
  			     <label class="sheet-desc">Description:</label>
@@ -90,16 +368,16 @@
 			</fieldset>	
 			
         	<label class="sheet-other-moves sheet-section-title">Other Moves:</label>
-			<fieldset class="repeating_moves">            
+			<fieldset class="repeating_othermoves">            
  			     <label class="sheet-movename">Move:</label>
  			     <input type="text" name="attr_movename" /> 
  			     <label class="sheet-stat">Stat:</label>
 			     <select name="attr_moves" class="sheet-moves">                
-			          <option type="radio" name="attr_class"value="@{cool} - @{shattered}">Cool</option>
-			          <option type="radio" name="attr_class"value="@{hard} - @{crippled}">Hard</option>
-			          <option type="radio" name="attr_class"value="@{hot} - @{disfigured}">Hot</option>
-			          <option type="radio" name="attr_class"value="@{sharp} - @{broken}">Sharp</option>
-			          <option type="radio" name="attr_class"value="@{weird}">Weird</option>
+			          <option value="@{cool} - @{shattered}">Cool</option>
+			          <option value="@{hard} - @{crippled}">Hard</option>
+			          <option value="@{hot} - @{disfigured}">Hot</option>
+			          <option value="@{sharp} - @{broken}">Sharp</option>
+			          <option value="@{weird}">Weird</option>
 			      </select>
 			     <button type='roll' value='&{template:aw} {{name=@{character_name}}} {{roll_name=@{movename}}} {{roll_mod=[[@{moves}]]}} {{result=[[2d6 + @{moves}]]}}' name='roll_move'></button>     
  			     <label class="sheet-desc">Description:</label>
@@ -107,31 +385,46 @@
 
 			</fieldset>	
 
-        </div>          
-        <div class="sheet-col odd">
+        </div>
+    <!--</div>
+    <div class="sheet-2colrow">   -->       
+        <div class="sheet-col">
 			<div class="sheet-box">
    				<label class="sheet-harm sheet-section-title">Harm:</label>
    				<label class="sheet-harm">3</label>
-				<input type="checkbox" name="sheet-harm-1" value="0"  />
+				<input type="checkbox" name="attr_sheet-harm-1" value="0"  />
    				<label class="sheet-harm">6</label>
-				<input type="checkbox" name="sheet-harm-2" value="0"  />
+				<input type="checkbox" name="attr_sheet-harm-2" value="0"  />
    				<label class="sheet-harm">9</label>
-				<input type="checkbox" name="sheet-harm-3" value="0"  />
+				<input type="checkbox" name="attr_sheet-harm-3" value="0"  />
    				<label class="sheet-harm">10</label>
-				<input type="checkbox" name="sheet-harm-4" value="0"  />
+				<input type="checkbox" name="attr_sheet-harm-4" value="0"  />
    				<label class="sheet-harm">11</label>
-				<input type="checkbox" name="sheet-harm-5" value="0"  />				
+				<input type="checkbox" name="attr_sheet-harm-5" value="0"  />				
    				<label class="sheet-harm">12</label>
-				<input type="checkbox" name="sheet-harm-6" value="0"  />				
+				<input type="checkbox" name="attr_sheet-harm-6" value="0"  />	<br />			
 	
-				<label>Shattered <input type="checkbox" name="attr_shattered" value="0"  /></label> 
-				<label>Crippled <input type="checkbox" name="attr_crippled" value="0"  /></label> 
-				<label>Disfigured <input type="checkbox" name="attr_disfigured" value="0"  /></label> 
-				<label>Broken <input type="checkbox" name="attr_broken" value="0"  /></label> 
+				<input type="checkbox" name="attr_shattered" value="1"  /> <label>Shattered</label><br /> 
+				<input type="checkbox" name="attr_crippled" value="1"  /> <label>Crippled</label> <br /> 
+				<input type="checkbox" name="attr_disfigured" value="1"  /><label>Disfigured</label> <br /> 
+				<input type="checkbox" name="attr_broken" value="1"  /><label>Broken</label> 
         	
         	</div>
         
         	<div class="sheet-box">
+        	<!-- Class Selected -->
+			<input type="checkbox" name="attr_class" class="sheet-isAngel" value='Angel' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isBattlebabe" value='Battlebabe' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isBrainer" value='Brainer' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isChopper" value='Chopper' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isDriver" value='Driver' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isGunlugger" value='GunLugger' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isHardholder" value='Hardholder' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isHocus" value='Hocus' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isOperator" value='Operator' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isSavvyhead" value='SavvyHead' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isSkinner" value='Skinner' style="display: none;" />
+			<!-- End Class Selected -->
         	<label class="sheet-other sheet-section-title">Other:</label>
 
 					<label class="sheet-hx">Hx:</label>
@@ -143,6 +436,7 @@
 					<label class="sheet-hold">Hold:</label>
 					<textarea rows="4" cols="50" name="attr_hold"></textarea>
 
+				<input type="checkbox" name="attr_class" class="sheet-isAngel" value='Angel' style="display: none;" />
 				<div class="sheet-angel">
 					<label class="sheet-stock">Stock:</label>
 					<textarea rows="4" cols="50" name="attr_stock"></textarea>
@@ -164,7 +458,21 @@
                 </div>
                 
         	</div>
-			<div class="sheet-box sheet-holder">
+        	<!-- Class Selected -->
+			<input type="checkbox" name="attr_class" class="sheet-isAngel" value='Angel' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isBattlebabe" value='Battlebabe' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isBrainer" value='Brainer' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isChopper" value='Chopper' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isDriver" value='Driver' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isGunlugger" value='GunLugger' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isHardholder" value='Hardholder' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isHocus" value='Hocus' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isOperator" value='Operator' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isSavvyhead" value='SavvyHead' style="display: none;" />
+			<input type="checkbox" name="attr_class" class="sheet-isSkinner" value='Skinner' style="display: none;" />
+			<!-- End Class Selected -->
+			
+			<div class="sheet-holder sheet-box">
 			<h3><span>Holding</span></h3>
 				  <label class="sheet-custom">Size:</label>
   			      <input type="text" name="attr_holdingsize" />   
@@ -227,244 +535,10 @@
 	  				  <textarea rows="4" cols="50" name="attr_cartags"></textarea>
  				  </fieldset>
 			</div>
-			<div class="sheet-box">
-			    <label class="sheet-improvements sheet-section-title">Improvements:</label>
-
-				<div class="sheet-tracker">
-					<label class="sheet-improvement">Experience:</label>
-					<input type="checkbox" name="sheet-improvement-1" value="0"  />
-					<input type="checkbox" name="sheet-improvement-2" value="0"  />
-					<input type="checkbox" name="sheet-improvement-3" value="0"  />
-					<input type="checkbox" name="sheet-improvement-4" value="0"  />
-					<input type="checkbox" name="sheet-improvement-5" value="0"  />
-				</div>
-				<input type='checkbox' name='sheet-show_improvements' class='sheet-showhide'/>
-				<label class="sheet-showhide"><small>Show/Hide Improvements</small></label><br/>
-				<small>Add all these improvements manually into your stats, they will not be auto-calculated</small>
-				<div class="sheet-subbox angel">
-					<ul>
-					<li><input type="checkbox" name="sheet-improvement-6" value="0" /><label class="sheet-improvement"> get +1sharp (max sharp+3)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-7" value="0" /><label class="sheet-improvement"> get +1cool (max cool+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-8" value="0" /><label class="sheet-improvement"> get +1hard (max hard+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-9" value="0" /><label class="sheet-improvement"> get +1hard (max hard+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-10" value="0" /><label class="sheet-improvement"> get +1weird (max weird+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-11" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-12" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-13" value="0" /><label class="sheet-improvement"> get 2 gigs (detail) and moonlighting</label></li>
-					<li><input type="checkbox" name="sheet-improvement-14" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-15" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-16" value="0" /><label class="sheet-improvement"> get +1 to any stat (max stat+3)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-17" value="0" /><label class="sheet-improvement"> retire your character (to safety)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-18" value="0" /><label class="sheet-improvement"> create a second character to play</label></li>
-					<li><input type="checkbox" name="sheet-improvement-19" value="0" /><label class="sheet-improvement"> change your character to a new type</label></li>
-					<li><input type="checkbox" name="sheet-improvement-20" value="0" /><label class="sheet-improvement"> choose 3 basic moves and advance them.</label></li>
-					<li><input type="checkbox" name="sheet-improvement-21" value="0" /><label class="sheet-improvement"> advance the other 4 basic moves.</label></li>
-					</ul>
-				</div>
-                <div class="sheet-subbox battlebabe">
-    				<ul>
-					<li><input type="checkbox" name="sheet-improvement-6" value="0" /><label class="sheet-improvement"> get +1hard (max hard+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-7" value="0" /><label class="sheet-improvement"> get +1hot (max hot+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-8" value="0" /><label class="sheet-improvement"> get +1sharp (max sharp+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-9" value="0" /><label class="sheet-improvement"> get +1weird (max weird+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-11" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-12" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-13" value="0" /><label class="sheet-improvement"> get 2 gigs (detail) and moonlighting</label></li>
-                    <li><input type="checkbox" name="sheet-improvement-10" value="0" /><label class="sheet-improvement"> get a gang (detail) and leadership</label></li>
-					<li><input type="checkbox" name="sheet-improvement-14" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-15" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-16" value="0" /><label class="sheet-improvement"> get +1 to any stat (max stat+3)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-17" value="0" /><label class="sheet-improvement"> retire your character (to safety)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-18" value="0" /><label class="sheet-improvement"> create a second character to play</label></li>
-					<li><input type="checkbox" name="sheet-improvement-19" value="0" /><label class="sheet-improvement"> change your character to a new type</label></li>
-					<li><input type="checkbox" name="sheet-improvement-20" value="0" /><label class="sheet-improvement"> choose 3 basic moves and advance them.</label></li>
-					<li><input type="checkbox" name="sheet-improvement-21" value="0" /><label class="sheet-improvement"> advance the other 4 basic moves.</label></li>
-					</ul>
-				</div>
-                <div class="sheet-subbox brainer">
-        			<ul>
-					<li><input type="checkbox" name="sheet-improvement-6" value="0" /><label class="sheet-improvement"> get +1cool (max cool+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-7" value="0" /><label class="sheet-improvement"> get +1sharp (max sharp+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-8" value="0" /><label class="sheet-improvement"> get +1hard (max hard+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-9" value="0" /><label class="sheet-improvement"> get +1hard (max hard+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-11" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-12" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-13" value="0" /><label class="sheet-improvement"> get 2 gigs (detail) and moonlighting</label></li>
-                    <li><input type="checkbox" name="sheet-improvement-10" value="0" /><label class="sheet-improvement"> get a holding (detail) and wealth</label></li>
-					<li><input type="checkbox" name="sheet-improvement-14" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-15" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-16" value="0" /><label class="sheet-improvement"> get +1 to any stat (max stat+3)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-17" value="0" /><label class="sheet-improvement"> retire your character (to safety)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-18" value="0" /><label class="sheet-improvement"> create a second character to play</label></li>
-					<li><input type="checkbox" name="sheet-improvement-19" value="0" /><label class="sheet-improvement"> change your character to a new type</label></li>
-					<li><input type="checkbox" name="sheet-improvement-20" value="0" /><label class="sheet-improvement"> choose 3 basic moves and advance them.</label></li>
-					<li><input type="checkbox" name="sheet-improvement-21" value="0" /><label class="sheet-improvement"> advance the other 4 basic moves.</label></li>
-					</ul>
-				</div>
-                <div class="sheet-subbox chopper">
-            		<ul>
-					<li><input type="checkbox" name="sheet-improvement-6" value="0" /><label class="sheet-improvement"> get +1hard (max hard+3)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-7" value="0" /><label class="sheet-improvement"> get +1cool (max cool+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-8" value="0" /><label class="sheet-improvement"> get +1sharp (max sharp+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-9" value="0" /><label class="sheet-improvement"> get +1weird (max weird+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-12" value="0" /><label class="sheet-improvement"> get +1weird (max weird+2)</label></li>
-                    <li><input type="checkbox" name="sheet-improvement-11" value="0" /><label class="sheet-improvement"> choose a new option for your gang</label></li>
-					<li><input type="checkbox" name="sheet-improvement-13" value="0" /><label class="sheet-improvement"> get 2 gigs (detail) and moonlighting</label></li>
-                    <li><input type="checkbox" name="sheet-improvement-10" value="0" /><label class="sheet-improvement"> get a holding (detail) and wealth</label></li>
-					<li><input type="checkbox" name="sheet-improvement-14" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-15" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-16" value="0" /><label class="sheet-improvement"> get +1 to any stat (max stat+3)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-17" value="0" /><label class="sheet-improvement"> retire your character (to safety)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-18" value="0" /><label class="sheet-improvement"> create a second character to play</label></li>
-					<li><input type="checkbox" name="sheet-improvement-19" value="0" /><label class="sheet-improvement"> change your character to a new type</label></li>
-					<li><input type="checkbox" name="sheet-improvement-20" value="0" /><label class="sheet-improvement"> choose 3 basic moves and advance them.</label></li>
-					<li><input type="checkbox" name="sheet-improvement-21" value="0" /><label class="sheet-improvement"> advance the other 4 basic moves.</label></li>
-					</ul>
-				</div>
-                <div class="sheet-subbox brainer">
-            		<ul>
-					<li><input type="checkbox" name="sheet-improvement-6" value="0" /><label class="sheet-improvement"> get +1cool (max cool+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-7" value="0" /><label class="sheet-improvement"> get +1hard (max hard+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-8" value="0" /><label class="sheet-improvement"> get +1hot (max hot+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-9" value="0" /><label class="sheet-improvement"> get +1weird (max weird+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-11" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-12" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-13" value="0" /><label class="sheet-improvement"> get 2 gigs (detail) and moonlighting</label></li>
-                    <li><input type="checkbox" name="sheet-improvement-10" value="0" /><label class="sheet-improvement"> get a garage (workspace, detail) and crew</label></li>
-					<li><input type="checkbox" name="sheet-improvement-14" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-15" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-16" value="0" /><label class="sheet-improvement"> get +1 to any stat (max stat+3)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-17" value="0" /><label class="sheet-improvement"> retire your character (to safety)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-18" value="0" /><label class="sheet-improvement"> create a second character to play</label></li>
-					<li><input type="checkbox" name="sheet-improvement-19" value="0" /><label class="sheet-improvement"> change your character to a new type</label></li>
-					<li><input type="checkbox" name="sheet-improvement-20" value="0" /><label class="sheet-improvement"> choose 3 basic moves and advance them.</label></li>
-					<li><input type="checkbox" name="sheet-improvement-21" value="0" /><label class="sheet-improvement"> advance the other 4 basic moves.</label></li>
-					</ul>
-				</div>
-                <div class="sheet-subbox gunlugger">
-    				<ul>
-					<li><input type="checkbox" name="sheet-improvement-6" value="0" /><label class="sheet-improvement"> get +1cool (max cool+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-7" value="0" /><label class="sheet-improvement"> get +1sharp (max sharp+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-8" value="0" /><label class="sheet-improvement"> get +1weird (max weird+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-9" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-10" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-11" value="0" /><label class="sheet-improvement"> get 2 gigs (detail) and moonlighting</label></li>
-					<li><input type="checkbox" name="sheet-improvement-12" value="0" /><label class="sheet-improvement"> get a holding (detail) and wealth</label></li>
-					<li><input type="checkbox" name="sheet-improvement-13" value="0" /><label class="sheet-improvement"> get a gang (detail) and pack alpha</label></li>
-					<li><input type="checkbox" name="sheet-improvement-14" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-15" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-16" value="0" /><label class="sheet-improvement"> get +1 to any stat (max stat+3)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-17" value="0" /><label class="sheet-improvement"> retire your character (to safety)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-18" value="0" /><label class="sheet-improvement"> create a second character to play</label></li>
-					<li><input type="checkbox" name="sheet-improvement-19" value="0" /><label class="sheet-improvement"> change your character to a new type</label></li>
-					<li><input type="checkbox" name="sheet-improvement-20" value="0" /><label class="sheet-improvement"> choose 3 basic moves and advance them.</label></li>
-					<li><input type="checkbox" name="sheet-improvement-21" value="0" /><label class="sheet-improvement"> advance the other 4 basic moves.</label></li>
-					</ul>
-				</div>
-                <div class="sheet-subbox hardholder">
-    				<ul>
-					<li><input type="checkbox" name="sheet-improvement-6" value="0" /><label class="sheet-improvement"> get +1hard (max hard+3)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-7" value="0" /><label class="sheet-improvement"> get +1weird (max weird+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-8" value="0" /><label class="sheet-improvement"> get +1cool (max cool+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-9" value="0" /><label class="sheet-improvement"> get +1hot (max hot+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-10" value="0" /><label class="sheet-improvement"> get +1sharp (max sharp+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-11" value="0" /><label class="sheet-improvement"> choose a new option for your holding</label></li>
-					<li><input type="checkbox" name="sheet-improvement-12" value="0" /><label class="sheet-improvement"> choose a new option for your holding</label></li>
-					<li><input type="checkbox" name="sheet-improvement-13" value="0" /><label class="sheet-improvement"> erase an option from your holding</label></li>
-					<li><input type="checkbox" name="sheet-improvement-14" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-15" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-16" value="0" /><label class="sheet-improvement"> get +1 to any stat (max stat+3)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-17" value="0" /><label class="sheet-improvement"> retire your character (to safety)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-18" value="0" /><label class="sheet-improvement"> create a second character to play</label></li>
-					<li><input type="checkbox" name="sheet-improvement-19" value="0" /><label class="sheet-improvement"> change your character to a new type</label></li>
-					<li><input type="checkbox" name="sheet-improvement-20" value="0" /><label class="sheet-improvement"> choose 3 basic moves and advance them.</label></li>
-					<li><input type="checkbox" name="sheet-improvement-21" value="0" /><label class="sheet-improvement"> advance the other 4 basic moves.</label></li>
-					</ul>
-				</div>
-                <div class="sheet-subbox hocus">
-        			<ul>
-					<li><input type="checkbox" name="sheet-improvement-6" value="0" /><label class="sheet-improvement"> get +1cool (max cool+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-7" value="0" /><label class="sheet-improvement"> get +1hard (max hard+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-8" value="0" /><label class="sheet-improvement"> get +1sharp (max sharp+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-9" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-10" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-11" value="0" /><label class="sheet-improvement"> choose a new option for your followers</label></li>
-					<li><input type="checkbox" name="sheet-improvement-12" value="0" /><label class="sheet-improvement"> choose a new option for your followers</label></li>
-					<li><input type="checkbox" name="sheet-improvement-13" value="0" /><label class="sheet-improvement"> get a holding (detail) and wealth</label></li>
-					<li><input type="checkbox" name="sheet-improvement-14" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-15" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-16" value="0" /><label class="sheet-improvement"> get +1 to any stat (max stat+3)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-17" value="0" /><label class="sheet-improvement"> retire your character (to safety)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-18" value="0" /><label class="sheet-improvement"> create a second character to play</label></li>
-					<li><input type="checkbox" name="sheet-improvement-19" value="0" /><label class="sheet-improvement"> change your character to a new type</label></li>
-					<li><input type="checkbox" name="sheet-improvement-20" value="0" /><label class="sheet-improvement"> choose 3 basic moves and advance them.</label></li>
-					<li><input type="checkbox" name="sheet-improvement-21" value="0" /><label class="sheet-improvement"> advance the other 4 basic moves.</label></li>
-					</ul>
-				</div>
-                <div class="sheet-subbox operator">
-        			<ul>
-					<li><input type="checkbox" name="sheet-improvement-6" value="0" /><label class="sheet-improvement"> get +1cool (max cool+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-7" value="0" /><label class="sheet-improvement"> get +1hard (max hard+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-8" value="0" /><label class="sheet-improvement"> get +1sharp (max sharp+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-9" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-10" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-11" value="0" /><label class="sheet-improvement"> get a gig and you may change your crew</label></li>
-					<li><input type="checkbox" name="sheet-improvement-12" value="0" /><label class="sheet-improvement"> get a gig and you may change your crew</label></li>
-					<li><input type="checkbox" name="sheet-improvement-13" value="0" /><label class="sheet-improvement"> abandon or resolve an obligation gig for good</label></li>
-					<li><input type="checkbox" name="sheet-improvement-14" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-15" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-16" value="0" /><label class="sheet-improvement"> get +1 to any stat (max stat+3)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-17" value="0" /><label class="sheet-improvement"> retire your character (to safety)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-18" value="0" /><label class="sheet-improvement"> create a second character to play</label></li>
-					<li><input type="checkbox" name="sheet-improvement-19" value="0" /><label class="sheet-improvement"> change your character to a new type</label></li>
-					<li><input type="checkbox" name="sheet-improvement-20" value="0" /><label class="sheet-improvement"> choose 3 basic moves and advance them.</label></li>
-					<li><input type="checkbox" name="sheet-improvement-21" value="0" /><label class="sheet-improvement"> advance the other 4 basic moves.</label></li>
-					</ul>
-				</div>
-                <div class="sheet-subbox savvyhead">
-        			<ul>
-					<li><input type="checkbox" name="sheet-improvement-6" value="0" /><label class="sheet-improvement"> get +1cool (max cool+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-7" value="0" /><label class="sheet-improvement"> get +1hard (max hard+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-8" value="0" /><label class="sheet-improvement"> get +1sharp (max sharp+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-9" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-10" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-11" value="0" /><label class="sheet-improvement"> get 2 gigs (detail) and moonlighting</label></li>
-					<li><input type="checkbox" name="sheet-improvement-12" value="0" /><label class="sheet-improvement"> get a gang (detail) for security, and leadership</label></li>
-					<li><input type="checkbox" name="sheet-improvement-13" value="0" /><label class="sheet-improvement"> add life support to your workspace, and now you can work on people there too</label></li>
-					<li><input type="checkbox" name="sheet-improvement-14" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-15" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-16" value="0" /><label class="sheet-improvement"> get +1 to any stat (max stat+3)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-17" value="0" /><label class="sheet-improvement"> retire your character (to safety)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-18" value="0" /><label class="sheet-improvement"> create a second character to play</label></li>
-					<li><input type="checkbox" name="sheet-improvement-19" value="0" /><label class="sheet-improvement"> change your character to a new type</label></li>
-					<li><input type="checkbox" name="sheet-improvement-20" value="0" /><label class="sheet-improvement"> choose 3 basic moves and advance them.</label></li>
-					<li><input type="checkbox" name="sheet-improvement-21" value="0" /><label class="sheet-improvement"> advance the other 4 basic moves.</label></li>
-					</ul>
-				</div>
-                <div class="sheet-subbox skinner">
-            		<ul>
-					<li><input type="checkbox" name="sheet-improvement-6" value="0" /><label class="sheet-improvement"> get +1cool (max cool+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-7" value="0" /><label class="sheet-improvement"> get +1cool (max cool+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-8" value="0" /><label class="sheet-improvement"> get +1hard (max hard+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-9" value="0" /><label class="sheet-improvement"> get +1sharp (max sharp+2)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-10" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-11" value="0" /><label class="sheet-improvement"> get a new @{class} move</label></li>
-					<li><input type="checkbox" name="sheet-improvement-12" value="0" /><label class="sheet-improvement"> get 2 gigs (detail) and moonlighting</label></li>
-					<li><input type="checkbox" name="sheet-improvement-13" value="0" /><label class="sheet-improvement"> get followers (detail) and fortunes</label></li>
-					<li><input type="checkbox" name="sheet-improvement-14" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-15" value="0" /><label class="sheet-improvement"> get a move from another playbook</label></li>
-					<li><input type="checkbox" name="sheet-improvement-16" value="0" /><label class="sheet-improvement"> get +1 to any stat (max stat+3)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-17" value="0" /><label class="sheet-improvement"> retire your character (to safety)</label></li>
-					<li><input type="checkbox" name="sheet-improvement-18" value="0" /><label class="sheet-improvement"> create a second character to play</label></li>
-					<li><input type="checkbox" name="sheet-improvement-19" value="0" /><label class="sheet-improvement"> change your character to a new type</label></li>
-					<li><input type="checkbox" name="sheet-improvement-20" value="0" /><label class="sheet-improvement"> choose 3 basic moves and advance them.</label></li>
-					<li><input type="checkbox" name="sheet-improvement-21" value="0" /><label class="sheet-improvement"> advance the other 4 basic moves.</label></li>
-					</ul>
-				</div>
-                
-			</div>
-        </div>	
+		</div>
 	</div>
+	</div>
+	
 	
 </div>
 
@@ -543,4 +617,4 @@
             {{/rollTotal() result -1}}
         </tr>
     </table>
-</rolltemplate>
+</rolltemplate>
\ No newline at end of file
diff --git a/AW/style.css b/AW/style.css
index 6a5b42b6cc..bea561e3e1 100644
--- a/AW/style.css
+++ b/AW/style.css
@@ -50,13 +50,18 @@ list-style: none;
 .charsheet .sheet-maindiv .sheet-col.sheet-even .sheet-section-title {
 	background: url('http://i.imgur.com/RNob7Yh.jpg') repeat-x left center transparent;
 }
+
 .charsheet .sheet-maindiv .sheet-col .sheet-harm.sheet-section-title,
 .charsheet .sheet-maindiv .sheet-col .sheet-other.sheet-section-title,
 .charsheet .sheet-maindiv .sheet-col .sheet-improvements.sheet-section-title {
 	margin-bottom: 10px;
 }
 
-label.sheet-lock {
+.charsheet label.sheet-improvement {
+	font-size: 1em;
+}
+
+.charsheet label.sheet-lock {
 	width: auto;
 	font-size: 12px;
 	font-weight: 400;
@@ -150,50 +155,63 @@ input[name="attr_movedesc"]{
 }
 
 
-.sheet-angel, .sheet-holder, .sheet-battlebabe, .sheet-operator, .sheet-chopper, .sheet-driver, .sheet-gunlugger, .sheet-hocus, .sheet-savvy, .sheet-skinner, .sheet-brainer {
+.sheet-angel, 
+.sheet-holder, 
+.sheet-battlebabe, 
+.sheet-operator, 
+.sheet-chopper, 
+.sheet-driver, 
+.sheet-gunlugger, 
+.sheet-hocus, 
+.sheet-savvy, 
+.sheet-skinner, 
+.sheet-brainer {
 	display: none;
 }
 
-input[name="sheet-lock_class"]:checked ~ .sheet-class,
-input[name="sheet-lock_class"]:checked ~ .sheet-class + label {
+.sheet-classSelected {
 	display: none;
 }
-input[name="sheet-lock_class"]:checked ~ .sheet-class:checked,
-input[name="sheet-lock_class"]:checked ~ .sheet-class:checked + label {
+
+.sheet-lock:checked ~ .sheet-class,
+.sheet-lock:checked ~ .sheet-class + label {
+	display: none;
+}
+.sheet-lock:checked ~ .sheet-class:checked,
+.sheet-lock:checked ~ .sheet-class:checked + label,
+.sheet-lock:checked ~ .sheet-classSelected {
 	display: inline-block;
 }
+
+.sheet-lock:not(:checked) ~ .sheet-class,
+.sheet-lock:not(:checked) ~ .sheet-class + label {
+	display: inline-block;
+}
+
+.sheet-lock:checked ~ .sheet-classcol {
+	display: none;
+}
+
+.sheet-classcol > .sheet-class:checked,
+.sheet-classcol > .sheet-class:checked + label {
+	display: inline-block;
+}
+
 input.sheet-showhide:checked ~ .sheet-subbox {display: none;}
 
-input[value="Angel"]:checked ~ .sheet-3colrow .sheet-col .sheet-angel {
+.sheet-isAngel:checked ~ .sheet-angel,
+.sheet-isBattlebabe:checked ~ .sheet-battlebabe,
+.sheet-isHardholder:checked ~ .sheet-holder,
+.sheet-isChopper:checked ~ .sheet-chopper,
+.sheet-isDriver:checked ~ .sheet-driver,
+.sheet-isGunlugger:checked ~ .sheet-gunlugger,
+.sheet-isHocus:checked ~ .sheet-hocus,
+.sheet-isOperator:checked ~ .sheet-operator,
+.sheet-isSavvyhead:checked ~ .sheet-savvy,
+.sheet-isSkinner:checked ~ .sheet-skinner,
+.sheet-isBrainer:checked ~ .sheet-brainer {
 	display: block;
 }
-input[value="Battlebabe"]:checked ~ .sheet-3colrow .sheet-col .sheet-battlebabe {
-	display: block;
-}
-input[value="Hardholder"]:checked ~ .sheet-3colrow .sheet-col .sheet-holder {
-	display: block;
-}
-input[value="Chopper"]:checked ~ .sheet-3colrow .sheet-col .sheet-chopper {
-	display: block;
-}
-input[value="Driver"]:checked ~ .sheet-3colrow .sheet-col .sheet-driver {
-	display: block;
-}
-input[value="Gunlugger"]:checked ~ .sheet-3colrow .sheet-col .sheet-gunlugger {
-	display: block;
-}
-input[value="Hocus"]:checked ~ .sheet-3colrow .sheet-col .sheet-hocus {
-	display: block;
-}
-input[value="Savvyhead"]:checked ~ .sheet-3colrow .sheet-col .sheet-savvy {
-	display: block;
-}
-input[value="Skinner"]:checked ~ .sheet-3colrow .sheet-col .sheet-skinner {
-	display: block;
-}
-input[value="Brainer"]:checked ~ .sheet-3colrow .sheet-col .sheet-brainer {
-    display: block;
-}
 
 /**
 * http://nicolasgallagher.com/micro-clearfix-hack/