diff --git a/Starfinder (simple)/Starfinder (simple).css b/Starfinder (simple)/Starfinder (simple).css
index 790533c42e..e0e05c47bc 100644
--- a/Starfinder (simple)/Starfinder (simple).css	
+++ b/Starfinder (simple)/Starfinder (simple).css	
@@ -306,7 +306,7 @@ button:active
 
 .sheet-rolltemplate-pf_check .sheet-content {
     color: #E0E0E0;
-	    padding: 10px 0px 10px 0px;
+	    padding: 10px 10px 10px 15px;
 	font-size: 1em;
     text-align: center;
 }
diff --git a/Starfinder (simple)/Starfinder (simple).html b/Starfinder (simple)/Starfinder (simple).html
index 825e84c130..6b5b4c8eb4 100644
--- a/Starfinder (simple)/Starfinder (simple).html	
+++ b/Starfinder (simple)/Starfinder (simple).html	
@@ -73,7 +73,7 @@
 					</div>
 					<div class="sheet-table-row">
 					    <input type="radio" class="key-ability" title="key-ability" name="attr_key-ability" value="@{STR-mod}" checked/>
-						<span class="sheet-table-row-name"><button class="sheet-text-button" title="STR-Check" type="roll" name="roll_STR-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=STR Check}} {{skill_chk=[[d20 + @{STR-mod}]]}}">STR</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="STR-Check" type="roll" name="roll_STR-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=STR Check}} {{skill_chk=[[d20 + [[@{STR-mod}]] ]]}}">STR</button></span>
 						<span class="sheet-table-data-center"><input title="STR" type="number" name="attr_STR" value="(10 + @{STR-race} + @{STR-theme} + @{STR-augment} + @{STR-point_buy} + @{STR-abil_incr})" disabled></span>
 						<span class="sheet-table-data-center"><input title="STR-mod" type="number" name="attr_STR-mod" value="(floor(@{STR} / 2) - 5)" disabled></span>
 						<span class="sheet-table-data-center"><input title="STR-race" type="number" name="attr_STR-race" value="0"></span>
@@ -84,7 +84,7 @@
 					</div>
 					<div class="sheet-table-row">
 					    <input type="radio" class="key-ability" title="key-ability" name="attr_key-ability" value="@{DEX-mod}"/>
-						<span class="sheet-table-row-name"><button class="sheet-text-button" title="DEX-Check" type="roll" name="roll_DEX-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=DEX Check}} {{skill_chk=[[d20 + @{DEX-mod}]]}}">DEX</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="DEX-Check" type="roll" name="roll_DEX-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=DEX Check}} {{skill_chk=[[d20 + [[@{DEX-mod}]] ]]}}">DEX</button></span>
 						<span class="sheet-table-data-center"><input title="DEX" type="number" name="attr_DEX" value="(10 + @{DEX-race} + @{DEX-theme} + @{DEX-augment} + @{DEX-point_buy} + @{DEX-abil_incr})" disabled></span>
 						<span class="sheet-table-data-center"><input title="DEX-mod" type="number" name="attr_DEX-mod" value="(floor(@{DEX} / 2) - 5)" disabled></span>
 						<span class="sheet-table-data-center"><input title="DEX-race" type="number" name="attr_DEX-race" value="0"></span>
@@ -95,7 +95,7 @@
 					</div>
 					<div class="sheet-table-row">
 					    <input type="radio" class="key-ability" title="key-ability" name="attr_key-ability" value="@{CON-mod}"/>
-						<span class="sheet-table-row-name"><button class="sheet-text-button" title="CON-Check" type="roll" name="roll_CON-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=CON Check}} {{skill_chk=[[d20 + @{CON-mod}]]}}">CON</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="CON-Check" type="roll" name="roll_CON-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=CON Check}} {{skill_chk=[[d20 + [[@{CON-mod}]] ]]}}">CON</button></span>
 						<span class="sheet-table-data-center"><input title="CON" type="number" name="attr_CON" value="(10 + @{CON-race} + @{CON-theme} + @{CON-augment} + @{CON-point_buy} + @{CON-abil_incr})" disabled></span>
 						<span class="sheet-table-data-center"><input title="CON-mod" type="number" name="attr_CON-mod" value="(floor(@{CON} / 2) - 5)" disabled></span>
 						<span class="sheet-table-data-center"><input title="CON-race" type="number" name="attr_CON-race" value="0"></span>
@@ -106,7 +106,7 @@
 					</div>
 					<div class="sheet-table-row">
 					    <input type="radio" class="key-ability" title="key-ability" name="attr_key-ability" value="@{INT-mod}"/>
-						<span class="sheet-table-row-name"><button class="sheet-text-button" title="INT-Check" type="roll" name="roll_INT-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=INT Check}} {{skill_chk=[[d20 + @{INT-mod}]]}}">INT</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="INT-Check" type="roll" name="roll_INT-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=INT Check}} {{skill_chk=[[d20 + [[@{INT-mod}]] ]]}}">INT</button></span>
 						<span class="sheet-table-data-center"><input title="INT" type="number" name="attr_INT" value="(10 + @{INT-race} + @{INT-theme} + @{INT-augment} + @{INT-point_buy} + @{INT-abil_incr})" disabled></span>
 						<span class="sheet-table-data-center"><input title="INT-mod" type="number" name="attr_INT-mod" value="(floor(@{INT} / 2) - 5)" disabled></span>
 						<span class="sheet-table-data-center"><input title="INT-race" type="number" name="attr_INT-race" value="0"></span>
@@ -117,7 +117,7 @@
 					</div>
 					<div class="sheet-table-row">
 					    <input type="radio" class="key-ability" title="key-ability" name="attr_key-ability" value="@{WIS-mod}"/>
-						<span class="sheet-table-row-name"><button class="sheet-text-button" title="WIS-Check" type="roll" name="roll_WIS-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=WIS Check}} {{skill_chk=[[d20 + @{WIS-mod}]]}}">WIS</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="WIS-Check" type="roll" name="roll_WIS-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=WIS Check}} {{skill_chk=[[d20 + [[@{WIS-mod}]] ]]}}">WIS</button></span>
 						<span class="sheet-table-data-center"><input title="WIS" type="number" name="attr_WIS" value="(10 + @{WIS-race} + @{WIS-theme} + @{WIS-augment} + @{WIS-point_buy} + @{WIS-abil_incr})" disabled></span>
 						<span class="sheet-table-data-center"><input title="WIS-mod" type="number" name="attr_WIS-mod" value="(floor(@{WIS} / 2) - 5)" disabled></span>
 						<span class="sheet-table-data-center"><input title="WIS-race" type="number" name="attr_WIS-race" value="0"></span>
@@ -128,7 +128,7 @@
 					</div>
 					<div class="sheet-table-row">
 					    <input type="radio" class="key-ability" title="key-ability" name="attr_key-ability" value="@{CHA-mod}"/>
-						<span class="sheet-table-row-name"><button class="sheet-text-button" title="CHA-Check" type="roll" name="roll_CHA-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=CHA Check}} {{skill_chk=[[d20 + @{CHA-mod}]]}}">CHA</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="CHA-Check" type="roll" name="roll_CHA-Check" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=CHA Check}} {{skill_chk=[[d20 + [[@{CHA-mod}]] ]]}}">CHA</button></span>
 						<span class="sheet-table-data-center"><input title="CHA" type="number" name="attr_CHA" value="(10 + @{CHA-race} + @{CHA-theme} + @{CHA-augment} + @{CHA-point_buy} + @{CHA-abil_incr})" disabled></span>
 						<span class="sheet-table-data-center"><input title="CHA-mod" type="number" name="attr_CHA-mod" value="(floor(@{CHA} / 2) - 5)" disabled></span>
 						<span class="sheet-table-data-center"><input title="CHA-race" type="number" name="attr_CHA-race" value="0"></span>
@@ -336,7 +336,7 @@
 						<span class="sheet-table-header">Temp</span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-row-name"><button class="sheet-text-button" title="Fort-Save" type="roll" name="roll_Fort-Save" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Fort save}} {{skill_chk=[[1d20 + @{Fort}]]}} {{notes=@{save-notes}}}">Fort</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="Fort-Save" type="roll" name="roll_Fort-Save" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Fort save}} {{skill_chk=[[1d20 + [[@{Fort}]] ]]}} {{notes=@{save-notes}}}">Fort</button></span>
 						<span class="sheet-table-data-center"><input title="Fort" type="number" name="attr_Fort" value="(@{total-Fort} + @{CON-mod} + @{Fort-enhance} + @{Fort-misc} + @{Fort-temp})" disabled></span>
 						<span class="sheet-table-data-center"><input title="total-Fort" type="number" name="attr_Fort-base" value="@{total-Fort}" disabled></span>
 						<span class="sheet-table-data-center"><input title="CON-mod" type="number" name="attr_Fort-ability" value="@{CON-mod}" disabled></span>
@@ -345,7 +345,7 @@
 						<span class="sheet-table-data-center"><input title="Fort-temp" type="number" name="attr_Fort-temp" value="0"></span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-row-name"><button class="sheet-text-button" title="Ref-Save" type="roll" name="roll_Ref-Save" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Ref save}} {{skill_chk=[[1d20 + @{Ref}]]}} {{notes=@{save-notes}}}">Ref</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="Ref-Save" type="roll" name="roll_Ref-Save" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Ref save}} {{skill_chk=[[1d20 + [[@{Ref}]] ]]}} {{notes=@{save-notes}}}">Ref</button></span>
 						<span class="sheet-table-data-center"><input title="Ref" type="number" name="attr_Ref" value="(@{total-Ref} + @{DEX-mod} + @{Ref-enhance} + @{Ref-misc} + @{Ref-temp})" disabled></span>
 						<span class="sheet-table-data-center"><input title="total-Ref" type="number" name="attr_Ref-base" value="@{total-Ref}" disabled></span>
 						<span class="sheet-table-data-center"><input title="DEX-mod" type="number" name="attr_Ref-ability" value="@{DEX-mod}" disabled></span>
@@ -354,7 +354,7 @@
 						<span class="sheet-table-data-center"><input title="Ref-temp" type="number" name="attr_Ref-temp" value="0"></span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-row-name"><button class="sheet-text-button" title="Will-Save" type="roll" name="roll_Will-Save" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Will save}} {{skill_chk=[[1d20 + @{Will}]]}} {{notes=@{save-notes}}}">Will</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" title="Will-Save" type="roll" name="roll_Will-Save" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Will save}} {{skill_chk=[[1d20 + [[@{Will}]] ]]}} {{notes=@{save-notes}}}">Will</button></span>
 						<span class="sheet-table-data-center"><input title="Will" type="number" name="attr_Will" value="(@{total-Will} + @{WIS-mod} + @{Will-enhance} + @{Will-misc} + @{Will-temp})" disabled></span>
 						<span class="sheet-table-data-center"><input title="total-Will" type="number" name="attr_Will-base" value="@{total-Will}" disabled></span>
 						<span class="sheet-table-data-center"><input title="WIS-mod" type="number" name="attr_Will-ability" value="@{WIS-mod}" disabled></span>
@@ -382,7 +382,7 @@
 						<span class="sheet-table-header">Misc</span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="Melee-Attack-Roll" name="roll_Melee-Attack-Roll" value="&{template:pf_attack} {{name=@{character_name}'s Attack}} {{subtags=Melee}} {{attack=[[1d20 + @{attk-melee}]]}} {{attk-notes=@{attack-notes}}}">Melee</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="Melee-Attack-Roll" name="roll_Melee-Attack-Roll" value="&{template:pf_attack} {{name=@{character_name}'s Attack}} {{subtags=Melee}} {{attack=[[1d20 + [[@{attk-melee}]] ]]}} {{attk-notes=@{attack-notes}}}">Melee</button></span>
 						<span class="sheet-table-data-center"><input title="attk-melee" type="number" name="attr_attk-melee" value="(@{bab} + @{attk-melee-ability} + @{attk-melee-misc})" disabled></span>
 						<span class="sheet-table-data-center"><input title="bab" type="number" name="attr_attk-melee-bab" value="@{bab}" disabled></span>
 						<span class="sheet-table-data-center">
@@ -400,7 +400,7 @@
 						<span class="sheet-table-data-center"><input title="attk-melee-misc" type="number" name="attr_attk-melee-misc" value="0"></span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="Ranged-Attack-Roll" name="roll_Ranged-Attack-Roll" value="&{template:pf_attack} {{name=@{character_name}'s Attack}} {{subtags=Ranged}} {{attack=[[1d20 + @{attk-ranged}]]}} {{attk-notes=@{attack-notes}}}">Ranged</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="Ranged-Attack-Roll" name="roll_Ranged-Attack-Roll" value="&{template:pf_attack} {{name=@{character_name}'s Attack}} {{subtags=Ranged}} {{attack=[[1d20 + [[@{attk-ranged}]] ]]}} {{attk-notes=@{attack-notes}}}">Ranged</button></span>
 						<span class="sheet-table-data-center"><input title="attk-ranged" type="number" name="attr_attk-ranged" value="(@{bab} + @{attk-ranged-ability} + @{attk-ranged-misc})" disabled></span>
 						<span class="sheet-table-data-center"><input title="bab" type="number" name="attr_attk-ranged-bab" value="@{bab}" disabled></span>
 						<span class="sheet-table-data-center">
@@ -418,7 +418,7 @@
 						<span class="sheet-table-data-center"><input title="attk-ranged-misc" type="number" name="attr_attk-ranged-misc" value="0"></span>
 					</div>
 					<div class="sheet-table-row">
-						<span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="Thrown-Attack-Roll" name="roll_Thrown-Attack-Roll" value="&{template:pf_attack} {{name=@{character_name}'s Attack}} {{subtags=Thrown}} {{attack=[[1d20 + @{attk-thrown}]]}} {{attk-notes=@{attack-notes}}}">Thrown</button></span>
+						<span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="Thrown-Attack-Roll" name="roll_Thrown-Attack-Roll" value="&{template:pf_attack} {{name=@{character_name}'s Attack}} {{subtags=Thrown}} {{attack=[[1d20 + [[@{attk-thrown}]] ]]}} {{attk-notes=@{attack-notes}}}">Thrown</button></span>
 						<span class="sheet-table-data-center"><input title="thrown" type="number" name="attr_attk-thrown" value="(@{bab} + @{attk-thrown-ability} + @{attk-thrown-misc})" disabled></span>
 						<span class="sheet-table-data-center"><input title="bab" type="number" name="attr_attk-thrown-bab" value="@{bab}" disabled></span>
 						<span class="sheet-table-data-center">
@@ -474,9 +474,9 @@
 				</div>
 				<div class="sheet-table">
 				    <div class="sheet-table-row">
-    				    <span class="sheet-table-header" style="width:30%">Upgrade</span>
+    				    <span class="sheet-table-header" style="width:45%">Upgrade</span>
     				    <span class="sheet-table-header" style="width:5%">Slots</span>
-    				    <span class="sheet-table-header" style="width:60%">Notes</span>
+    				    <span class="sheet-table-header" style="width:45%">Notes</span>
 				    </div>
 				    <div class="sheet-table-row">
 				        <span class="sheet-table-data-center"><input type="text" title="upgrade name" name="attr_upgrade1-name"></span>
@@ -605,7 +605,7 @@
 					<span class="sheet-table-header" style="width:5%">Misc</span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Acrobatics-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Acrobatics Check}} {{skill_chk=[[1d20 + @{Acrobatics}]]}}" name="roll_Acrobatics-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Acrobatics-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Acrobatics Check}} {{skill_chk=[[1d20 + [[@{Acrobatics}]] ]]}}" name="roll_Acrobatics-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Acrobatics-cs" type="checkbox" name="attr_Acrobatics-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Acrobatics *</span>
@@ -616,7 +616,7 @@
 					<span class="sheet-table-data-center"><input title="Acrobatics-misc" type="number" name="attr_Acrobatics-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Athletics-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Athletics Check}} {{skill_chk=[[1d20 + @{Athletics}]]}}" name="roll_Athletics-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Athletics-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Athletics Check}} {{skill_chk=[[1d20 + [[@{Athletics}]] ]]}}" name="roll_Athletics-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Athletics-cs" type="checkbox" name="attr_Athletics-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Athletics *</span>
@@ -627,7 +627,7 @@
 					<span class="sheet-table-data-center"><input title="Athletics-misc" type="number" name="attr_Athletics-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Bluff-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Bluff Check}} {{skill_chk=[[1d20 + @{Bluff}]]}}" name="roll_Bluff-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Bluff-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Bluff Check}} {{skill_chk=[[1d20 + [[@{Bluff}]] ]]}}" name="roll_Bluff-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Bluff-cs" type="checkbox" name="attr_Bluff-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Bluff</span>
@@ -638,7 +638,7 @@
 					<span class="sheet-table-data-center"><input title="Bluff-misc" type="number" name="attr_Bluff-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Computers-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Computers Check}} {{skill_chk=[[1d20 + @{Computers}]]}}" name="roll_Computers-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Computers-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Computers Check}} {{skill_chk=[[1d20 + [[@{Computers}]] ]]}}" name="roll_Computers-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Computers-cs" type="checkbox" name="attr_Computers-cs" value="1" /></span>
 					<span class="sheet-table-data-center">†</span>
 					<span class="sheet-table-data-left">Computers</span>
@@ -649,7 +649,7 @@
 					<span class="sheet-table-data-center"><input title="Computers-misc" type="number" name="attr_Computers-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Culture-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Culture Check}} {{skill_chk=[[1d20 + @{Culture}]]}}" name="roll_Culture-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Culture-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Culture Check}} {{skill_chk=[[1d20 + [[@{Culture}]] ]]}}" name="roll_Culture-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Culture-cs" type="checkbox" name="attr_Culture-cs" value="1" /></span>
 					<span class="sheet-table-data-center">†</span>
 					<span class="sheet-table-data-left">Culture</span>
@@ -660,7 +660,7 @@
 					<span class="sheet-table-data-center"><input title="Culture-misc" type="number" name="attr_Culture-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Diplomacy-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Diplomacy Check}} {{skill_chk=[[1d20 + @{Diplomacy}]]}}" name="roll_Diplomacy-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Diplomacy-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Diplomacy Check}} {{skill_chk=[[1d20 + [[@{Diplomacy}]] ]]}}" name="roll_Diplomacy-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Diplomacy-cs" type="checkbox" name="attr_Diplomacy-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Diplomacy</span>
@@ -671,7 +671,7 @@
 					<span class="sheet-table-data-center"><input title="Diplomacy-misc" type="number" name="attr_Diplomacy-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Disguise-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Disguise Check}} {{skill_chk=[[1d20 + @{Disguise}]]}}" name="roll_Disguise-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Disguise-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Disguise Check}} {{skill_chk=[[1d20 + [[@{Disguise}]] ]]}}" name="roll_Disguise-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Disguise-cs" type="checkbox" name="attr_Disguise-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Disguise</span>
@@ -682,7 +682,7 @@
 					<span class="sheet-table-data-center"><input title="Disguise-misc" type="number" name="attr_Disguise-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Engineering-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Engineering Check}} {{skill_chk=[[1d20 + @{Engineering}]]}}" name="roll_Escape-Artist-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Engineering-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Engineering Check}} {{skill_chk=[[1d20 + [[@{Engineering}]] ]]}}" name="roll_Escape-Artist-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Engineering-cs" type="checkbox" name="attr_Engineering-cs" value="1" /></span>
 					<span class="sheet-table-data-center">†</span>
 					<span class="sheet-table-data-left">Engineering</span>
@@ -693,7 +693,7 @@
 					<span class="sheet-table-data-center"><input title="Engineering-misc" type="number" name="attr_Engineering-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Intimidate-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Intimidate Check}} {{skill_chk=[[1d20 + @{Intimidate}]]}}" name="roll_Intimidate-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Intimidate-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Intimidate Check}} {{skill_chk=[[1d20 + [[@{Intimidate}]] ]]}}" name="roll_Intimidate-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Intimidate-cs" type="checkbox" name="attr_Intimidate-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Intimidate</span>
@@ -704,7 +704,7 @@
 					<span class="sheet-table-data-center"><input title="Intimidate-misc" type="number" name="attr_Intimidate-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Life-Science-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Life Science Check}} {{skill_chk=[[1d20 + @{Life-Science}]]}}" name="roll_Life-Science-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Life-Science-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Life Science Check}} {{skill_chk=[[1d20 + [[@{Life-Science}]] ]]}}" name="roll_Life-Science-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Life-Science-cs" type="checkbox" name="attr_Life-Science-cs" value="1" /></span>
 					<span class="sheet-table-data-center">†</span>
 					<span class="sheet-table-data-left">Life Science</span>
@@ -715,7 +715,7 @@
 					<span class="sheet-table-data-center"><input title="Life-Science-misc" type="number" name="attr_Life-Science-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Medicine-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Medicine Check}} {{skill_chk=[[1d20 + @{Medicine}]]}}" name="roll_Medicine-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Medicine-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Medicine Check}} {{skill_chk=[[1d20 + [[@{Medicine}]] ]]}}" name="roll_Medicine-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Medicine-cs" type="checkbox" name="attr_Medicine-cs" value="1" /></span>
 					<span class="sheet-table-data-center">†</span>
 					<span class="sheet-table-data-left">Medicine</span>
@@ -726,7 +726,7 @@
 					<span class="sheet-table-data-center"><input title="Medicine-misc" type="number" name="attr_Medicine-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Mysticism-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Mysticism Check}} {{skill_chk=[[1d20 + @{Mysticism}]]}}" name="roll_Mysticism-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Mysticism-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Mysticism Check}} {{skill_chk=[[1d20 + [[@{Mysticism}]] ]]}}" name="roll_Mysticism-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Mysticism-cs" type="checkbox" name="attr_Mysticism-cs" value="1" /></span>
 					<span class="sheet-table-data-center">†</span>
 					<span class="sheet-table-data-left">Mysticism</span>
@@ -737,7 +737,7 @@
 					<span class="sheet-table-data-center"><input title="Mysticism-misc" type="number" name="attr_Mysticism-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Perception-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Perception Check}} {{skill_chk=[[1d20 + @{Perception}]]}}" name="roll_Perception-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Perception-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Perception Check}} {{skill_chk=[[1d20 + [[@{Perception}]] ]]}}" name="roll_Perception-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Perception-cs" type="checkbox" name="attr_Perception-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Perception</span>
@@ -748,7 +748,7 @@
 					<span class="sheet-table-data-center"><input title="Perception-misc" type="number" name="attr_Perception-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Physical-Science-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Physical-Science Check}} {{skill_chk=[[1d20 + @{Physical-Science}]]}}" name="roll_Physical-Science-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Physical-Science-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Physical-Science Check}} {{skill_chk=[[1d20 + [[@{Physical-Science}]] ]]}}" name="roll_Physical-Science-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Physical-Science-cs" type="checkbox" name="attr_Physical-Science-cs" value="1" /></span>
 					<span class="sheet-table-data-center">†</span>
 					<span class="sheet-table-data-left">Physical Science</span>
@@ -759,7 +759,7 @@
 					<span class="sheet-table-data-center"><input title="Physical-Science-misc" type="number" name="attr_Physical-Science-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Piloting-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Piloting Check}} {{skill_chk=[[1d20 + @{Piloting}]]}}" name="roll_Piloting-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Piloting-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Piloting Check}} {{skill_chk=[[1d20 + [[@{Piloting}]] ]]}}" name="roll_Piloting-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Piloting-cs" type="checkbox" name="attr_Piloting-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Piloting</span>
@@ -770,7 +770,7 @@
 					<span class="sheet-table-data-center"><input title="Piloting-misc" type="number" name="attr_Piloting-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Profession-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Profession: @{Profession-name} Check}} {{skill_chk=[[1d20 + @{Profession}]]}}" name="roll_Profession-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Profession-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Profession: @{Profession-name} Check}} {{skill_chk=[[1d20 + [[@{Profession}]] ]]}}" name="roll_Profession-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Profession-cs" type="checkbox" name="attr_Profession-cs" value="1" /></span>
 					<span class="sheet-table-data-center">†</span>
 					<span class="sheet-table-data-left">Profession:<input title="Profession-name" type="text" name="attr_Profession-name"></span>
@@ -787,7 +787,7 @@
 					<span class="sheet-table-data-center"><input title="Profession-misc" type="number" name="attr_Profession-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Profession2-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Profession: @{Profession2-name} Check}} {{skill_chk=[[1d20 + @{Profession2}]]}}" name="roll_Profession2-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Profession2-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Profession: @{Profession2-name} Check}} {{skill_chk=[[1d20 + [[@{Profession2}]] ]]}}" name="roll_Profession2-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Profession2-cs" type="checkbox" name="attr_Profession2-cs" value="1" /></span>
 					<span class="sheet-table-data-center">†</span>
 					<span class="sheet-table-data-left">Profession:<input title="Profession2-name" type="text" name="attr_Profession2-name"></span>
@@ -804,7 +804,7 @@
 					<span class="sheet-table-data-center"><input title="Profession2-misc" type="number" name="attr_Profession2-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Sense-Motive-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Sense Motive Check}} {{skill_chk=[[1d20 + @{Sense-Motive}]]}}" name="roll_Sense-Motive-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Sense-Motive-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Sense Motive Check}} {{skill_chk=[[1d20 + [[@{Sense-Motive}]] ]]}}" name="roll_Sense-Motive-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Sense-Motive-cs" type="checkbox" name="attr_Sense-Motive-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Sense Motive</span>
@@ -815,7 +815,7 @@
 					<span class="sheet-table-data-center"><input title="Sense-Motive-misc" type="number" name="attr_Sense-Motive-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Sleight-of-Hand-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Sleight of Hand Check}} {{skill_chk=[[1d20 + @{Sleight-of-Hand}]]}}" name="roll_Sleight-of-Hand-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Sleight-of-Hand-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Sleight of Hand Check}} {{skill_chk=[[1d20 + [[@{Sleight-of-Hand}]] ]]}}" name="roll_Sleight-of-Hand-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Sleight-of-Hand-cs" type="checkbox" name="attr_Sleight-of-Hand-cs" value="1" /></span>
 					<span class="sheet-table-data-center">†</span>
 					<span class="sheet-table-data-left">Sleight of Hand *</span>
@@ -826,7 +826,7 @@
 					<span class="sheet-table-data-center"><input title="Sleight-of-Hand-misc" type="number" name="attr_Sleight-of-Hand-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Stealth-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Stealth Check}} {{skill_chk=[[1d20 + @{Stealth}]]}}" name="roll_Stealth-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Stealth-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Stealth Check}} {{skill_chk=[[1d20 + [[@{Stealth}]] ]]}}" name="roll_Stealth-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Stealth-cs" type="checkbox" name="attr_Stealth-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Stealth *</span>
@@ -837,7 +837,7 @@
 					<span class="sheet-table-data-center"><input title="Stealth-misc" type="number" name="attr_Stealth-misc" value="0"></span>
 				</div>
 				<div class="sheet-table-row">
-					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Survival-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Survival Check}} {{skill_chk=[[1d20 + @{Survival}]]}}" name="roll_Survival-Check"></button></span>
+					<span class="sheet-table-data-center"><button style="font-size:100%;" title="Survival-Check" type="roll" value="&{template:pf_check} {{name=@{character_name}'s}} {{check=Survival Check}} {{skill_chk=[[1d20 + [[@{Survival}]] ]]}}" name="roll_Survival-Check"></button></span>
 					<span class="sheet-table-data-center"><input title="Survival-cs" type="checkbox" name="attr_Survival-cs" value="1" /></span>
 					<span class="sheet-table-data-center"></span>
 					<span class="sheet-table-data-left">Survival</span>
@@ -873,80 +873,69 @@
 			<div class="sheet-table">
 			    <span class="sheet-table-name">Augments</span>
 			    <div class="sheet-table-row">
-			        <span class="sheet-table-header" style="width:5%"></span>
-				    <span class="sheet-table-header" style="width:35%">Augmentation</span>
+			        <span class="sheet-table-header" style="width:2%"></span>
+				    <span class="sheet-table-header" style="width:45%">Augmentation</span>
 				    <span class="sheet-table-header" style="width:5%">Level</span>
-				    <span class="sheet-table-header" style="width:5%">Price</span>
-				    <span class="sheet-table-header" style="width:35%">Notes</span>
+				    <span class="sheet-table-header" style="width:45%">Notes</span>
 			    </div>
 			    <div class="sheet-table-row">
 			        <span class="sheet-table-data-center">1</span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Name" name="attr_agument1-name"></span>
 			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Level" name="attr_agument1-level"></span>
-			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Price" name="attr_agument1-price"></span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Notes" name="attr_agument1-notes"></span>
 			    </div>
 			    <div class="sheet-table-row">
 			        <span class="sheet-table-data-center">2</span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Name" name="attr_agument2-name"></span>
 			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Level" name="attr_agument2-level"></span>
-			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Price" name="attr_agument2-price"></span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Notes" name="attr_agument2-notes"></span>
 			    </div>
 			    <div class="sheet-table-row">
 			        <span class="sheet-table-data-center">3</span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Name" name="attr_agument3-name"></span>
 			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Level" name="attr_agument3-level"></span>
-			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Price" name="attr_agument3-price"></span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Notes" name="attr_agument3-notes"></span>
 			    </div>
 			    <div class="sheet-table-row">
 			        <span class="sheet-table-data-center">4</span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Name" name="attr_agument4-name"></span>
 			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Level" name="attr_agument4-level"></span>
-			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Price" name="attr_agument4-price"></span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Notes" name="attr_agument4-notes"></span>
 			    </div>
 			    <div class="sheet-table-row">
 			        <span class="sheet-table-data-center">5</span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Name" name="attr_agument5-name"></span>
 			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Level" name="attr_agument5-level"></span>
-			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Price" name="attr_agument5-price"></span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Notes" name="attr_agument5-notes"></span>
 			    </div>
 			    <div class="sheet-table-row">
 			        <span class="sheet-table-data-center">6</span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Name" name="attr_agument6-name"></span>
 			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Level" name="attr_agument6-level"></span>
-			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Price" name="attr_agument6-price"></span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Notes" name="attr_agument6-notes"></span>
 			    </div>
 			    <div class="sheet-table-row">
 			        <span class="sheet-table-data-center">7</span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Name" name="attr_agument7-name"></span>
 			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Level" name="attr_agument7-level"></span>
-			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Price" name="attr_agument7-price"></span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Notes" name="attr_agument7-notes"></span>
 			    </div>
 			    <div class="sheet-table-row">
 			        <span class="sheet-table-data-center">8</span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Name" name="attr_agument8-name"></span>
 			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Level" name="attr_agument8-level"></span>
-			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Price" name="attr_agument8-price"></span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Notes" name="attr_agument8-notes"></span>
 			    </div>
 			    <div class="sheet-table-row">
 			        <span class="sheet-table-data-center">9</span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Name" name="attr_agument9-name"></span>
 			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Level" name="attr_agument9-level"></span>
-			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Price" name="attr_agument9-price"></span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Notes" name="attr_agument9-notes"></span>
 			    </div>
 			    <div class="sheet-table-row">
 			        <span class="sheet-table-data-center">10</span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Name" name="attr_agument10-name"></span>
 			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Level" name="attr_agument10-level"></span>
-			        <span class="sheet-table-data-center"><input type="number" title="Augmentation Price" name="attr_agument10-price"></span>
 			        <span class="sheet-table-data-center"><input type="text" title="Augmentation Notes" name="attr_agument10-notes"></span>
 			    </div>
 			</div>
@@ -954,9 +943,9 @@
 				<div class="sheet-table">
 					<span class="sheet-table-name">Worn Magic/Hybrid Equipment</span>
 					<div class="sheet-table-row">
-					    <span class="sheet-table-header"></span>
-					    <span class="sheet-table-header">Item Name</span>
-					    <span class="sheet-table-header">Level</span>
+					    <span class="sheet-table-header" style="width:15%;"></span>
+					    <span class="sheet-table-header" style="width:80%;">Item Name</span>
+					    <span class="sheet-table-header" style="width:5%;">Level</span>
 					</div>
 					<div class="sheet-table-row">
 						<span class="sheet-table-header">Slot 1:</span>
@@ -1069,7 +1058,7 @@
 				</div>
 				<b>Macro Text&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
 				<input type="checkbox" class="sheet-macro-show" title="@{repeating_pc-weapon_$X_macro-text-show}" name="attr_macro-text-show" value="1" />
-				<textarea class="sheet-macro" title="@{repeating_pc-weapon_$X_macro-text}" name="attr_macro-text">&{template:pf_attack} {{name=@{character_name}'s @{pc-weapon-name}}} {{subtags=@{pc-weapon-type}}} {{attack=[[1d20cs>20+@{pc-weapon-total-attack}]]}} {{damage=[[@{pc-damage-dice-num}d@{pc-damage-die}+@{pc-weapon-total-damage}]]}} {{dmgcrit=[[@{pc-damage-dice-num}d@{pc-damage-die}+@{pc-weapon-total-damage}]] and @{pc-weapon-critical}}} {{notes=@{pc-weapon-notes}}} {{attk-notes=@{attack-notes}}}</textarea>
+				<textarea class="sheet-macro" title="@{repeating_pc-weapon_$X_macro-text}" name="attr_macro-text">&{template:pf_attack} {{name=@{character_name}'s @{pc-weapon-name}}} {{subtags=@{pc-weapon-type}}} {{attack=[[1d20cs>20 + [[@{pc-weapon-total-attack}]] ]]}} {{damage=[[@{pc-damage-dice-num}d@{pc-damage-die}+@{pc-weapon-total-damage}]]}} {{dmgcrit=[[@{pc-damage-dice-num}d@{pc-damage-die}+@{pc-weapon-total-damage}]] and @{pc-weapon-critical}}} {{notes=@{pc-weapon-notes}}} {{attk-notes=@{attack-notes}}}</textarea>
 			</fieldset>
 		</div>
 	</div>
@@ -1092,7 +1081,7 @@
 				<span class="sheet-table-data-center" style="width:40%;"><input title="repeating_item_$X_name" type="text" name="attr_item-name"></span>
 				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_item_$X_qty" type="number" name="attr_item-qty" value="1"></span>
 				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_item_$X_level" type="number" name="attr_item-level" value="1"></span>
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_item_$X_bulk" type="text" name="attr_item-bulk" value="L"></span>
+				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_item_$X_bulk" type="number" step="0.1" name="attr_item-bulk" value="0.1"></span>
 				<span class="sheet-table-data-center" style="width:50%;"><input title="repeating_item_$X_description" type="text" name="attr_item-description"></span>
 			</fieldset>
 		</div>
@@ -3222,6 +3211,8 @@
             <div class="sheet-content"><span class="tcat">Caster Level Check:</span> {{caster_lvl_chk}}</div>{{/caster_lvl_chk}}
             {{#notes}}
             <div class="sheet-content"><span class="tcat">Notes:</span> {{notes}}</div>{{/notes}}
+            {{#foo}}
+            <div class="sheet-content"><span class="tcat"></span>{{foo}}</div>{{/foo}}
         </div>
     <div class="sheet-footer_background"><div class="sheet-footer">Starfinder©</div></div>
 </rolltemplate>