diff --git a/Shadowrun5e/Shadowrun5.html b/Shadowrun5e/Shadowrun5.html
index af52674dc0..62472eed8b 100644
--- a/Shadowrun5e/Shadowrun5.html
+++ b/Shadowrun5e/Shadowrun5.html
@@ -3,15 +3,15 @@
      <!-- Sheet Header -->
     <div class="sheet-2colrow">
     
-        <div class="sheet-col">	
+        <div class="sheet-col">    
             <p style="text-align: left;">
                 <img src="https://i.imgur.com/TQ8WzzX.png" style="max-height: 100px;" />
-            </p>	
+            </p>    
         </div>
     
-        <div class="sheet-col">	
+        <div class="sheet-col">    
             <label>Player:</label><input type="text" name="attr_player" /><br />
-            <label>Notes:</label><input type="text" name="attr_notes" />		
+            <label>Notes:</label><input type="text" name="attr_notes" />    	
         </div> 
     </div>
     
@@ -152,8 +152,8 @@
 						<label class="sheet-medium">Composure:</label><input type="number" name="attr_composure" class = "sheet-number" value="@{charisma} + @{willpower}" disabled="true" /><br />
 						<label class="sheet-medium">Judge Intentions:</label><input type="number" name="attr_judgeintent" class="sheet-number" value="@{charisma} + @{intuition}" disabled="true" /><br />
 						<label class="sheet-medium">Memory:</label><input type="number" name="attr_memory" class="sheet-number" value="@{logic} + @{willpower}" disabled="true" /><br />
-						<label class="sheet-medium">Lift/Carry:</label><input type="text" name="attr_liftcarry" class="sheet-short" value="0 / 0" /><br />
-						<label class="sheet-medium">Movement:</label><input type="text" name="attr_movement" value="0 / 0" class="sheet-short" />
+						<label class="sheet-medium">Lift/Carry:</label><input type="number" name="attr_liftweight" style="width:25px;" value="@{strength}*15" disabled="true" />/<input type="number" name="attr_carryweight" style="width:25px;" value="@{strength}*10" disabled="true" /><br />
+						<label class="sheet-medium">Movement:</label><input type="number" name="attr_walkmovement" value="@{agility}*2" style="width:25px;" disabled="true" />/<input type="number" name="attr_runmovement" value="@{agility}*4" style="width:25px;" disabled="true" />
 						<label class="sheet-medium">Physical Limit:</label><input type="number" name="attr_physicallimit" class="sheet-number" value="ceil(((@{strength}*2) + @{body} + @{reaction})/3)" disabled="true" />
 						<label class="sheet-medium">Mental Limit:</label><input type="number" name="attr_mentallimit" class = "sheet-number" value="ceil(((@{logic}*2)+@{intuition}+@{willpower})/3)" disabled="true" />
 						<label class="sheet-medium">Social Limit:</label><input type="number" name="attr_sociallimit" class = "sheet-number" value="ceil(((@{charisma}*2) + @{willpower} + @{essence})/3)" disabled="true" /><br/>
@@ -224,10 +224,11 @@
           <h3 style="margin-bottom: 10px;">Positive Qualities</h3>
           <div class="sheet-box">
 
-            
+              <div class="sheet-baseinfo sheet-longlist" style="width:120px;"><label>Quality</label></div>
+              <div class="sheet-baseinfo sheet-long sheet-longlist"><label>Notes</label></div>            
             <fieldset class="repeating_posqualities">
-              <div class="sheet-baseinfo" style="width:120px;"><input type="text" name="attr_posqualityname" /><label>Quality</label></div>
-              <div class="sheet-baseinfo sheet-long"><input type="text" name="attr_posqualitynotes" /><label>Notes</label></div>
+              <div class="sheet-baseinfo" style="width:120px;"><input type="text" name="attr_posqualityname" /></div>
+              <div class="sheet-baseinfo sheet-long"><input type="text" name="attr_posqualitynotes" /></div>
             </fieldset>
           </div>
             
@@ -237,10 +238,11 @@
         	<h3 style="margin-bottom: 10px;">Negative Qualities</h3>
           <div class="sheet-box">
 
-            
+              <div class="sheet-baseinfo sheet-longlist" style="width:120px;"><label>Quality</label></div>
+              <div class="sheet-baseinfo sheet-long sheet-longlist"><label>Notes</label></div>                
             <fieldset class="repeating_negqualities">
-              <div class="sheet-baseinfo" style="width:120px;"><input type="text" name="attr_negqualityname" /><label>Quality</label></div>
-              <div class="sheet-baseinfo sheet-long"><input type="text" name="attr_negqualitynotes" /><label>Notes</label></div>
+              <div class="sheet-baseinfo" style="width:120px;"><input type="text" name="attr_negqualityname" /></div>
+              <div class="sheet-baseinfo sheet-long"><input type="text" name="attr_negqualitynotes" /></div>
             </fieldset>
           </div>
             
@@ -260,21 +262,21 @@
             <div class="sheet-box">
               <table>
                 <tr>
-                  <th width="110px;">Skill</th>
-                  <th width="35px;">Attr.</th>
-                  <th width="35px;">Base</th>
-                  <th width="35px;">Misc</th>
-                  <th width="150px;">Notes</th>
+                  <th><div class="sheet-baseinfo sheet-longlist" style="width:110px;"><label>Skill</label></div></th>
+                  <th><div class="sheet-baseinfo sheet-longlist" style="width:35px;"><label>Attr.</label></div></th>
+                  <th><div class="sheet-baseinfo sheet-longlist" style="width:30px;"><label>Base</label></th>
+                  <th><div class="sheet-baseinfo sheet-longlist" style="width:33px;"><label>Misc</label></th>
+                  <th><div class="sheet-baseinfo sheet-longlist" style="width:121px;"><label>Notes</label></th>
                   <th><button type="roll" name="roll_skillroll" value="/r ([[?{Amount of Dice|6}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
                     </tr>
               </table>
-              
+ 
+
               <fieldset class="repeating_activeskills">
-                <table>
-                  <tr>
+                  <table> <tr>
                     <td><input type="text" name="attr_activeskillname" style="width:110px;" /></td>
-                    <td><input type="number" name="attr_activeskillattr" style="width:35px;" /></td>						
-                    <!--<select name="attr_activeskillattr" style="width:35px;">
+                    <td><input type="number" name="attr_activeskillattr" style="width:35px;" /></td>				
+                    <!--<select name="attr_activeskillattr" style="width:60px; margin-bottom:-2px;">
 							  <option value="@{body}">BOD</option>
 							  <option value="@{agility}">AGI</option>
 							  <option value="@{reaction}">REA</option>
@@ -282,13 +284,14 @@
 							  <option value="@{willpower}">WIL</option>
 							  <option value="@{logic}">LOG</option>
 							  <option value="@{intuition}">INT</option>
-							  <option value="@{charisma}">CHA</option>-->
-                    <td><input type="number" name="attr_activeskillbase" style="width:35px;" value="0" /></td>
+							  <option value="@{charisma}">CHA</option></td>-->
+                    <td><input type="number" name="attr_activeskillbase" style="width:35px;" /></td>
                     <td><input type="number" name="attr_activeskillmisc" style="width:35px;" value="0" /></td>
-                    <td><input type="text" name="attr_activeskillnotes" style="width:130px;" /></td>
+                    <td><input type="text" name="attr_activeskillnotes" style="width:121px;" /></td>
 					<td><button type="roll" name="roll_activeskillroll" value="/r [@{activeskillname}] ([[@{activeskillattr} + @{activeskillbase} + @{activeskillmisc}]]-@{woundmod})d6>5s"></button></td>					
-                  </tr></table>
+                  </table></tr>
                 </fieldset>
+
             </div>
 
         
@@ -302,18 +305,18 @@
             <div class="sheet-box">
               <table>
                 <tr>
-                  <th width="110px;">Skill</th>
-                  <th width="35px;">Attr.</th>
-                  <th width="35px;">Base</th>
-                  <th width="35px;">Misc</th>
-                  <th width="150px;">Notes</th>
+                  <th><div class="sheet-baseinfo sheet-longlist" style="width:110px;"><label>Skill</label></div></th>
+                  <th><div class="sheet-baseinfo sheet-longlist" style="width:35px;"><label>Attr.</label></div></th>
+                  <th><div class="sheet-baseinfo sheet-longlist" style="width:30px;"><label>Base</label></th>
+                  <th><div class="sheet-baseinfo sheet-longlist" style="width:33px;"><label>Misc</label></th>
+                  <th><div class="sheet-baseinfo sheet-longlist" style="width:145px;"><label>Notes</label></th>
                   </tr>
               </table>
               
               <fieldset class="repeating_knowskills">
                 <table>
                   <tr>
-                    <td><input type="text" name="attr_knowskillname" style="width:110px;" /></td>
+                    <td><input type="text" name="attr_knowskillname" style="width:115px;" /></td>
                     <td><input type="number" name="attr_knowskillattr" style="width:35px;" /></td>
                     <td><input type="number" name="attr_knowskillbase" style="width:35px;" value="0" /></td>
                     <td><input type="number" name="attr_knowskillmisc" style="width:35px;" value="0" /></td>
@@ -501,34 +504,34 @@
             <h3 style="margin-bottom: 10px;">Armor</h3>
             <div class="sheet-box">
   			  <!-- Primary -->
-              <div class="sheet-baseinfo" style="width:200px;"><input type="text" name="attr_armorname" /><label class="sheet-medium">Armor</label></div>
-              <div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_armor" /><label style="width:50px;">Rating</label></div>
-              <div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_armormisc" value="0" /><label style="width:40px;">Misc</label></div>
-              <div class="sheet-baseinfo" style="width:42px;"><button type="roll" name="roll_primarydefense"
-						value="/em tries to avoid while relying on armor to absorb at least [[(@{body}+@{armor}+@{armormisc}+?{Armor Penetration?|0})d6>5s]] damage!\n/roll ([[@{avoid}+@{avoidmisc}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button><label>Defense</label></div>
+              <div class="sheet-baseinfo sheet-longlist" style="width:200px;"><label class="sheet-medium">Armor</label><input type="text" name="attr_armorname" /></div>
+              <div class="sheet-baseinfo sheet-longlist" style="width:42px;"><label style="width:50px;">Rating</label><input type="number" name="attr_armor" /></div>
+              <div class="sheet-baseinfo sheet-longlist" style="width:42px;"><label style="width:40px;">Misc</label><input type="number" name="attr_armormisc" value="0" /></div>
+              <div class="sheet-baseinfo sheet-longlist" style="width:42px;"><label>Defense</label><button type="roll" name="roll_primarydefense"
+						value="/em tries to avoid while relying on armor to absorb at least [[(@{body}+@{armor}+@{armormisc}+?{Armor Penetration?|0})d6>5s]] damage!\n/roll ([[@{avoid}+@{avoidmisc}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button></div>
               <br />
               
               <!-- Secondary -->
-              <div class="sheet-baseinfo" style="width:200px;"><input type="text" name="attr_secondaryarmorname" /><label class="sheet-medium">Armor</label></div>
-              <div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_secondaryarmor" /><label style="width:50px;">Rating</label></div>
-              <div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_secondaryarmormisc" value="0" /><label style="width:40px;">Misc</label></div>
+              <div class="sheet-baseinfo" style="width:200px;"><input type="text" name="attr_secondaryarmorname" /></div>
+              <div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_secondaryarmor" value="0" /></div>
+              <div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_secondaryarmormisc" value="0" /></div>
               <div class="sheet-baseinfo" style="width:42px;"><button type="roll" name="roll_secondarydefense"
-						value="/em tries to avoid while relying on Armor to absorb at least [[(@{body}+@{secondaryarmor}+@{secondaryarmormisc}+?{Armor Penetration?|0})d6>5s]] damage!\n/roll ([[@{avoid}+@{avoidmisc}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button><label>Defense</label></div>
+						value="/em tries to avoid while relying on Armor to absorb at least [[(@{body}+@{secondaryarmor}+@{secondaryarmormisc}+?{Armor Penetration?|0})d6>5s]] damage!\n/roll ([[@{avoid}+@{avoidmisc}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button></div>
               <br />
               
               <!-- Tertiary -->
-              <div class="sheet-baseinfo" style="width:200px;"><input type="text" name="attr_tertiaryarmorname" /><label class="sheet-medium">Armor</label></div>
-              <div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_tertiaryarmor" /><label style="width:50px;">Rating</label></div>
-              <div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_tertiaryarmormisc" value="0" /><label style="width:40px;">Misc</label></div>
+              <div class="sheet-baseinfo" style="width:200px;"><input type="text" name="attr_tertiaryarmorname" /></div>
+              <div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_tertiaryarmor" value="0" /></div>
+              <div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_tertiaryarmormisc" value="0" /></div>
               <div class="sheet-baseinfo" style="width:42px;"><button type="roll" name="roll_tertiarydefense"
-						value="/em tries to avoid while relying on Armor to absorb at least [[(@{body}+@{tertiaryarmor}+@{tertiaryarmormisc}+?{Armor Penetration?|0})d6>5s]] damage!\n/roll ([[@{avoid}+@{avoidmisc}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button><label>Defense</label></div>
+						value="/em tries to avoid while relying on Armor to absorb at least [[(@{body}+@{tertiaryarmor}+@{tertiaryarmormisc}+?{Armor Penetration?|0})d6>5s]] damage!\n/roll ([[@{avoid}+@{avoidmisc}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button></div>
               <br />
               
               <!-- Repeating -->
               <fieldset class="repeating_armor">
-                <div class="sheet-baseinfo" style="width:200px;"><input type="text" name="attr_reparmorname" /><label class="sheet-medium">Armor</label></div>
-                <div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_reparmor" /><label style="width:50px;">Rating</label></div>
-                <div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_reparmormisc" /><label style="width:40px;">Misc</label></div>
+                <div class="sheet-baseinfo" style="width:200px;"><input type="text" name="attr_reparmorname" /></div>
+                <div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_reparmor" /></div>
+                <div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_reparmormisc" /></div>
                 </fieldset><br />
               
               <label class="sheet-long">Armor Notes:</label><br />
@@ -542,11 +545,15 @@
             <h3 style="margin-bottom: 10px;">Augmentation</h3>
             
             <div class="sheet-box">
+                    <div class="sheet-baseinfo sheet-longlist" style="width:100px;"><label>Augmentation</label></div>
+                    <div class="sheet-baseinfo sheet-longlist" style="width:45px;"><label>RTG</label></div>
+                    <div class="sheet-baseinfo sheet-longlist" style="width:175px;"><label>Notes</label></div>
+                    <div class="sheet-baseinfo sheet-longlist" style="width:40px;"><label>Ess</label></div>			
                 <fieldset class="repeating_aug">
-                    <div class="sheet-baseinfo" style="width:100px;"><input type="text" name="attr_augname" /><label>Augmentation</label></div>
-                    <div class="sheet-baseinfo" style="width:45px;"><input type="number" name="attr_augrtg" class="sheet-short" /><label>RTG</label></div>
-                    <div class="sheet-baseinfo" style="width:175px;"><input type="text" name="attr_augnotes" /><label>Notes</label></div>
-                    <div class="sheet-baseinfo" style="width:40px;"><input type="number" name="attr_augessence" class="sheet-short" /><label>Ess</label></div>
+                    <div class="sheet-baseinfo" style="width:100px;"><input type="text" name="attr_augname" /></div>
+                    <div class="sheet-baseinfo" style="width:45px;"><input type="number" name="attr_augrtg" class="sheet-short" /></div>
+                    <div class="sheet-baseinfo" style="width:175px;"><input type="text" name="attr_augnotes" /></div>
+                    <div class="sheet-baseinfo" style="width:40px;"><input type="number" name="attr_augessence" class="sheet-short" /></div>
                 </fieldset>
             </div>
         </div>
@@ -617,14 +624,21 @@
             <h3 style="margin-bottom: 10px;">Spells/Preparations/Rituals/Complex Forms</h3>		
         
         	<div class="sheet-box">
+                	<div class="sheet-baseinfo sheet-long sheet-longlist"><label>Name</label></div>
+                    <div class="sheet-baseinfo sheet-short sheet-longlist"><label>Type/Target</label></div>
+                    <div class="sheet-baseinfo sheet-short sheet-longlist"><label>Range</label></div>
+                    <div class="sheet-baseinfo sheet-short sheet-longlist"><label>Duration</label></div>
+					<div class="sheet-baseinfo sheet-longlist" style="width:35px; margin-right:-5px;"><label>Drain</label></div>
+                    <div class="sheet-baseinfo sheet-short sheet-longlist"><label>/ Fade</label></div>
+                    <div class="sheet-baseinfo sheet-long sheet-longlist"><label>Notes / Keywords</label></div>
                 <fieldset class="repeating_spells">
-                	<div class="sheet-baseinfo sheet-long"><input type="text" name="attr_spellname" /><label>Name</label></div>
-                    <div class="sheet-baseinfo sheet-short"><input type="text" name="attr_spelltype" /><label>Type/Target</label></div>
-                    <div class="sheet-baseinfo sheet-short"><input type="text" name="attr_spellrange" /><label>Range</label></div>
-                    <div class="sheet-baseinfo sheet-short"><input type="text" name="attr_spellduration" /><label>Duration</label></div>
-					<div class="sheet-baseinfo" style="width:35px; margin-right:-5px;"><input type="text" value="F/L" disabled="true" style="font-weight:bold"/><label>Drain</label></div>
-                    <div class="sheet-baseinfo sheet-short"><input type="text" name="attr_spelldrain" style="width:50px;" /><label>/ Fade</label></div>
-                    <div class="sheet-baseinfo sheet-long"><input type="text" name="attr_spellnotes" /><label>Notes / Keywords</label></div>
+                	<div class="sheet-baseinfo sheet-long"><input type="text" name="attr_spellname" /></div>
+                    <div class="sheet-baseinfo sheet-short"><input type="text" name="attr_spelltype" /></div>
+                    <div class="sheet-baseinfo sheet-short"><input type="text" name="attr_spellrange" /></div>
+                    <div class="sheet-baseinfo sheet-short"><input type="text" name="attr_spellduration" /></div>
+					<div class="sheet-baseinfo" style="width:35px; margin-right:-5px;"><input type="text" value="F/L" disabled="true" style="font-weight:bold"/></div>
+                    <div class="sheet-baseinfo sheet-short"><input type="text" name="attr_spelldrain" style="width:50px;" /></div>
+                    <div class="sheet-baseinfo sheet-long"><input type="text" name="attr_spellnotes" /></div>
 					<!--<div class="sheet-baseinfo sheet-number">
 						<button type="roll" name="roll_spellroll" 
 							value="/em casts @{spellname} with a Force/Level of [[?{Force/Level?|4}]] and takes [[(?{Force?|4}+@{spelldrain})-(@{willpower}+@{drainfadeattribute})]] Drain/Fade damage!\n
@@ -632,7 +646,7 @@
 						</button>
 					</div>-->
                 </fieldset>
-			</div>                
+			</div>
         
         </div>
     
@@ -646,10 +660,13 @@
             <h3 style="margin-bottom: 10px;">Adept Powers/Other abilities</h3>
             
             <div class="sheet-box">
+				    <div class="sheet-baseinfo sheet-medium sheet-longlist"><label>Name</label></div>
+                    <div class="sheet-baseinfo sheet-number sheet-longlist"><label>RTG</label></div>
+                    <div class="sheet-baseinfo sheet-longlist" style="width:220px;"><label>Notes</label></div>
                 <fieldset class="repeating_powers">
-                    <div class="sheet-baseinfo sheet-medium"><input type="text" name="attr_powername" /><label>Name</label></div>
-                    <div class="sheet-baseinfo sheet-number"><input type="number" name="attr_powerrtg" class="sheet-short" /><label>RTG</label></div>
-                    <div class="sheet-baseinfo" style="width:220px;"><input type="text" name="attr_powernotes" /><label>Notes</label></div>
+                    <div class="sheet-baseinfo sheet-medium"><input type="text" name="attr_powername" /></div>
+                    <div class="sheet-baseinfo sheet-number"><input type="number" name="attr_powerrtg" class="sheet-short" /></div>
+                    <div class="sheet-baseinfo" style="width:220px;"><input type="text" name="attr_powernotes" /></div>
                 </fieldset>
             </div>
             
@@ -662,11 +679,15 @@
             <h3 style="margin-bottom: 10px;">Contacts</h3>
             
             <div class="sheet-box">
+                    <div class="sheet-baseinfo sheet-medium sheet-longlist"><label>Name</label><input type="text" name="attr_contactname" /></div>
+                    <div class="sheet-baseinfo sheet-number sheet-longlist"><label>Loyalty</label><input type="number" name="attr_contactloyalty" /></div>
+                    <div class="sheet-baseinfo sheet-number sheet-longlist"><label>Connection</label><input type="number" name="attr_contactconnection" /></div>
+                    <div class="sheet-baseinfo sheet-longlist" style="width:170px;"><label style="text-align:center;">Notes</label><input type="text" name="attr_contactnotes" /></div>			
                 <fieldset class="repeating_contacts">
-                    <div class="sheet-baseinfo sheet-medium"><input type="text" name="attr_contactname" /><label>Name</label></div>
-                    <div class="sheet-baseinfo sheet-number"><input type="number" name="attr_contactloyalty" /><label>Loyalty</label></div>
-                    <div class="sheet-baseinfo sheet-number"><input type="number" name="attr_contactconnection" /><label>Connection</label></div>
-                    <div class="sheet-baseinfo" style="width:170px;"><input type="text" name="attr_contactnotes" /><label style="text-align:center;">Notes</label></div>
+                    <div class="sheet-baseinfo sheet-medium"><input type="text" name="attr_recontactname" /></div>
+                    <div class="sheet-baseinfo sheet-number"><input type="number" name="attr_recontactloyalty" /></div>
+                    <div class="sheet-baseinfo sheet-number"><input type="number" name="attr_recontactconnection" /></div>
+                    <div class="sheet-baseinfo" style="width:170px;"><input type="text" name="attr_recontactnotes" /></div>
                 </fieldset>
             </div>
         
@@ -701,4 +722,4 @@
     
     </div>
     
-</div>
\ No newline at end of file
+</div>