diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.html b/Star Wars Saga Edition/StarWarsSagaEdition.html
index 4f11df0a14..433fb05d1d 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.html	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.html	
@@ -17,7 +17,7 @@
 			<span class="table-data long"><label data-i18n="level">Level</label>		</span>
 			<span class="table-data">	<input type="number" name="attr_level" title="Total number of Heroic levels @{level}" value="1" /> <input type="number" name="attr_level_max" value="[[(floor((@{level}+@{nonlevel})/2))]]"  title="Half Level @{level|max}" disabled="true" /></span>
 			<span class="table-data" style="width:15px"></span>	
-			<span class="table-data"><label><span data-i18n="background">Background:</span></label>		</span>
+			<span class="table-data"><label><span data-i18n="background">Background</span></label>		</span>
 			<span class="table-data">	<input type="text" name="attr_background" title="Background @{Background}" class="header" /></span>
 		</div>
 		<div class="table-row">
@@ -49,57 +49,57 @@
 	<hr/>
 
 	<div class="3colrow">
-		<div class="col">
+		<div class="col" style="width:calc(30% - 21px); margin-right:15px;">
 			<table class="spacing">
 				<tr><div class="textHead"><span data-i18n="attributes">Attributes</div>	</tr>
 				<tr>
 					<td class="col1"><span data-i18n="str">STR</span><br><div class="small"><span data-i18n="strength">Strength</span></div></td>
 					<td><input type="number" name="attr_STR" value="8" title="Strength Score @{STR}" /></td>
 					<td><input type="number" name="attr_STR_max" value="[[floor(@{STR}/2-5)]]" disabled="true" title="Strength Modifier @{STR|max}" /></td>
-					<td><button type="roll" name="roll_STRCheck" value="&{template:skill} {{name=Strength}} {{skill=[[1d20+@{STR|max}[STR]+@{CT}[CT]]]}}" title="Roll Strength %{STRCheck}"></button></td>
+					<td><button type="roll" name="roll_STRCheck" value="&{template:skill} {{name=Strength}} {{skill=[[1d20+@{STR|max}[STR]+@{CT}[CT]]]}}" title="Roll Strength %{STRCheck}" style="margin:0px"></button></td>
 				</tr>
 				<tr>
 					<td class="col1"><span data-i18n="dex">DEX</span><br><div class="small"><span data-i18n="dexterity">Dexterity</span></div></td>
 					<td><input type="number" name="attr_DEX" value="8" title="Dexterity Score @{DEX}" /></td>
 					<td><input type="number" name="attr_DEX_max" value="[[floor(@{DEX}/2-5)]]" disabled="true" title="Dexterity Modifier @{DEX|max}" /></td>
-					<td><button type="roll" name="roll_DEXCheck" value="&{template:skill} {{name=Dexterity}} {{skill=[[1d20+@{Dex|max}[DEX]+@{CT}[CT]]]}}" title="Roll Dexterity  %{DEXCheck}"></button></td>
+					<td><button type="roll" name="roll_DEXCheck" value="&{template:skill} {{name=Dexterity}} {{skill=[[1d20+@{Dex|max}[DEX]+@{CT}[CT]]]}}" title="Roll Dexterity  %{DEXCheck}" style="margin:0px"></button></td>
 				</tr>
 				<tr>
 					<td class="col1"><span data-i18n="con">CON</span><br><div class="small"><span data-i18n="constitution">Constitution</span></div></td>
 					<td><input type="number" name="attr_CON" value="8" title="Constitution Score @{CON}" /></td>
 					<td><input type="number" name="attr_CON_max" value="[[floor(@{CON}/2-5)]]" disabled="true" title="Constitution Modifier @{CON|max}" /></td>
-					<td><button type="roll" name="roll_CONCheck" value="&{template:skill} {{name=Constitution}} {{skill=[[ 1d20+@{Con|max}[CON]+@{CT}[CT]]]}}" title="Roll Constitution %{CONCheck}"></button></td>
+					<td><button type="roll" name="roll_CONCheck" value="&{template:skill} {{name=Constitution}} {{skill=[[ 1d20+@{Con|max}[CON]+@{CT}[CT]]]}}" title="Roll Constitution %{CONCheck}" style="margin:0px"></button></td>
 				</tr>
 				<tr>
 					<td class="col1"><span data-i18n="int">INT</span><br><div class="small"><span data-i18n="intelligence">Intelligence</span></div></td>
 					<td><input type="number" name="attr_INT" value="8" title="Intelligence Score @{INT}" /></td>
 					<td><input type="number" name="attr_INT_max" value="[[floor(@{INT}/2-5)]]" disabled="true" title="Intelligence Modifier @{INT|max}}" /></td>
-					<td><button type="roll" name="roll_INTCheck" value="&{template:skill} {{name=Intelligence}} {{skill=[[ 1d20+@{INT|max}[INT]+@{CT}[CT]]]}}" title="Roll Intelligence %{INTCheck}"></button></td>
+					<td><button type="roll" name="roll_INTCheck" value="&{template:skill} {{name=Intelligence}} {{skill=[[ 1d20+@{INT|max}[INT]+@{CT}[CT]]]}}" title="Roll Intelligence %{INTCheck}" style="margin:0px"></button></td>
 				</tr>
 				<tr>
 					<td class="col1"><span data-i18n="wis">WIS</span><br><div class="small"><span data-i18n="wisdom">Wisdom</span></div></td>
 					<td><input type="number" name="attr_WIS" value="8" title="Wisdom Score" /></td>
 					<td><input type="number" name="attr_WIS_max" value="[[floor(@{WIS}/2-5)]]" disabled="true" title="Wisdom Modifier" /></td>
-					<td><button type="roll" name="roll_WISCheck" value="&{template:skill} {{name=Wisdom}} {{skill=[[ 1d20+@{WIS|max}[WIS]+@{CT}[CT]]]}}" title="Roll Wisdom %{WISCheck}"></button></td>
+					<td><button type="roll" name="roll_WISCheck" value="&{template:skill} {{name=Wisdom}} {{skill=[[ 1d20+@{WIS|max}[WIS]+@{CT}[CT]]]}}" title="Roll Wisdom %{WISCheck}" style="margin:0px"></button></td>
 				</tr>
 				<tr>
 					<td class="col1"><span data-i18n="cha">CHA</span><br><div class="small"><span data-i18n="charisma">Charisma</span></div></td>
 					<td><input type="number" name="attr_CHA" value="8" title="Charisma Score @{CHA}" /></td>
 					<td><input type="number" name="attr_CHA_max" value="[[floor(@{CHA}/2-5)]]" disabled="true" title="Charisma Modifier @{CHA|max}" /></td>
-					<td><button type="roll" name="roll_CHACheck" value="&{template:skill} {{name=Charisma}} {{skill=[[ 1d20+@{CHA|max}[CHA]+@{CT}[CT]]]}}" title="Roll Charisma %{CHACheck}"></button></td>
+					<td><button type="roll" name="roll_CHACheck" value="&{template:skill} {{name=Charisma}} {{skill=[[ 1d20+@{CHA|max}[CHA]+@{CT}[CT]]]}}" title="Roll Charisma %{CHACheck}" style="margin:0px"></button></td>
 				</tr>
 			</table>		
 		</div>
-		<div class="col">
+		<div class="col" style="margin-right:45px;">
 			<table>		
 				<tr>	<td colspan="4"><div class="textHead"><span data-i18n="hit-points">Hit Points</span></div> </td>
 						<td></td>
 						<td width="15px" rowspan="7"></td>
-						<td></td>
+						<td>&nbsp;&nbsp;</td>
 						<td><div class="textHead"><span data-i18n="condition">Condition</span></div></td>	</tr>
 				<tr><th>Current</th>		<th></th>	<th>Total</th> <th>Bonus</th>
 					<td></td>
-					<td></td>
+					<td>&nbsp;&nbsp;</td>
 					<!-- rowspan placholder -->
 					<td rowspan="5" style="text-align:left">		
 						<input type="radio" value="0" name="attr_CT" checked="true" /> <span data-i18n="ct_normal">Normal</span><br />
@@ -116,7 +116,7 @@
 					<td><input type="number" name="attr_HP_Bonus" value="0" title="Bonus HP @{HP|Bonus}" /></td>
 					<td></td>
 				</tr>
-				<tr>	<td colspan="4"><div class="textHead"><span data-i18n="second-wind">Second Wind</span></div> </td>			</tr>
+				<tr>	<td colspan="4"><div class="textHead" style="margin-top:2px"><span data-i18n="second-wind">Second Wind</span></div> </td>			</tr>
 				<tr><th></th>		<th></th>	<th>Current</th> <th>Total</th>
 				<tr>
 						<input type="hidden" name="attr_hidden_second_wind" value="1" />
@@ -125,7 +125,7 @@
 						<td><input type="number" name=attr_Second_Wind_Count" value="1" title="Remaining second wind"></td>
 						<td><input type="number" name=attr_Second_Wind_Max" value="1" title="Maximum second wind"></td>
 				</tr>
-				<tr>	<td colspan="4"><div class="textHead"><span data-i18n="threshold">Threshold</span></div> </td>			</tr>
+				<tr>	<td colspan="4"><div class="textHead" style="margin-top:2px"><span data-i18n="threshold">Threshold</span></div> </td>			</tr>
 				<tr>	<th><span data-i18n="total">Total</span></th>	<th></th>	<th><span data-i18n="defense">Defense</span></th> 	<th><span data-i18n="misc">Misc</span></th>		</tr>
 				<tr>	
 					<td><input type="number" name="attr_DT" value="@{DamageThresholdDefense}+@{DamageThresholdSize}[Size]+@{DamageThresholdMisc}[Misc]"  disabled="true" title="Damage Threshold @{DT}" /></td>
@@ -157,10 +157,10 @@
 		</div>
 		
 		<div class="col">				
-			<table class="spacing">
+			<table class="spacing" style="margin-top:-1px;">
 				<tr>			
-					<td colspan="4"><div class="textHead"><span data-i18n="force_points">Force Points</span></div></td>			
-					<td colspan="2"><div class="textHead"><span data-i18n="destiny_points">Destiny Pts</span></div></td>
+					<td colspan="4"><div class="textHead" style="padding:1px 0px"><span data-i18n="force_points">Force Points</span></div></td>			
+					<td colspan="2"><div class="textHead" style="padding:1px 0px"><span data-i18n="destiny_points">Destiny Pts</span></div></td>
 				</tr>
 				<tr>
 					<td colspan="4"><input type="number" name="attr_FP" value="5" title="Current Force Points @{FP}" />  
@@ -169,9 +169,9 @@
 					<td colspan="2"><input type="number" name="attr_DP" value="0" title="Destiny Points" /></td>						
 				</tr>
 				<tr>						
-					<td colspan="2"><div class="textHead"><span data-i18n="bab">BAB</span></div></td>
-					<td colspan="2"><div class="textHead"><span><span data-i18n="speed">Speed</span></span><input type="checkbox" class="sect-show skillsHideCheckbox" title="Show/Hide Other Speed Notes" name="attr_SpeedExtra-show" value="1" style="width: 38px; margin-left: -41px;"/>	</span></div></td>	
-					<td colspan="2"><div class="textHead"><span data-i18n="dark_side_pts">Dark Side Pts</span></div></td>		
+					<td colspan="2"><div class="textHead" style="padding:1px 0px"><span data-i18n="bab">BAB</span></div></td>
+					<td colspan="2"><div class="textHead" style="padding:1px 0px"><span><span data-i18n="speed">Speed</span></span><input type="checkbox" class="sect-show skillsHideCheckbox" title="Show/Hide Other Speed Notes" name="attr_SpeedExtra-show" value="1" style="width: 38px; margin-left: -41px;"/>	</span></div></td>	
+					<td colspan="2"><div class="textHead" style="padding:1px 0px"><span data-i18n="dark_side_pts">Dark Side Pts</span></div></td>		
 				</tr>
 				<tr>	
 					<td colspan="2"><input type="number" name="attr_BAB" value="0" title="Base Attack Bonus @{BAB}" /></td>
@@ -1870,9 +1870,10 @@
 		</div>
 		<div class="col">
 			<table>		
-				<tr>	<td colspan="3"><div class="textHead"><span data-i18n="hit-points">Hit Points</span></div> </td>	<td colspan="3"></td>	<td><div class="textHead">Condition</div></td>	</tr>
+				<tr>	<td colspan="3"><div class="textHead"><span data-i18n="hit-points">Hit Points</span></div> </td>	<td colspan="4"></td>	<td><div class="textHead">Condition</div></td>	</tr>
 				<tr><th>Current</th>		<th></th>	<th><span data-i18n="total">Total</span></th>	
 					<td colspan="3"></td>
+					<td>&nbsp;&nbsp;</td>
 					<td rowspan="4" style="text-align:left">		
 						<input type="radio" value="0" name="attr_NPC-CT" checked="true" /> <span data-i18n="ct_normal">Normal</span><br />
 						<input type="radio" value="-1" name="attr_NPC-CT" /> -1<br />
@@ -1915,8 +1916,8 @@
 		<div class="col">				
 			<table>
 				<tr>			
-					<td colspan="4"><div class="textHead"><span data-i18n="force_points">Force Points</span></div></td>			
-					<td colspan="2"><div class="textHead"><span data-i18n="destiny_points">Destiny Pts</span></div></td>
+					<td colspan="4"style="padding:0px 2px 0px 0px"><div class="textHead"><span data-i18n="force_points">Force Points</span></div></td>			
+					<td colspan="2"style="padding:0px 0px 0px 3px"><div class="textHead"><span data-i18n="destiny_points">Destiny Pts</span></div></td>
 				</tr>
 				<tr>
 					<td colspan="4"><input type="number" name="attr_FP" value="5" title="Current Force Points" />  
@@ -1925,9 +1926,9 @@
 					<td colspan="2"><input type="number" name="attr_DP" value="0" title="Destiny Points" /></td>						
 				</tr>
 				<tr>						
-					<td colspan="2"><div class="textHead"><span data-i18n="bab">BAB</span></div></td>
-					<td colspan="2"><div class="textHead"><span><span data-i18n="speed">Speed</span></span><input type="checkbox" class="sect-show skillsHideCheckbox" title="Show/Hide Other Speed Notes" name="attr_SpeedExtra-show" value="1" style="width: 38px; margin-left: -41px;"/>	</span></div></td>
-					<td colspan="2"><div class="textHead"><span data-i18n="dark_side_pts">Dark Side Pts</span></div></td>		
+					<td colspan="2" style="padding:0px 3px 0px 0px"><div class="textHead"><span data-i18n="bab">BAB</span></div></td>
+					<td colspan="2" style="padding:0px 2px"><div class="textHead"><span><span data-i18n="speed">Speed</span></span><input type="checkbox" class="sect-show skillsHideCheckbox" title="Show/Hide Other Speed Notes" name="attr_SpeedExtra-show" value="1" style="width: 38px; margin-left: -41px;"/>	</span></div></td>
+					<td colspan="2" style="padding:0px 0px 0px 3px"><div class="textHead"><span data-i18n="dark_side_pts">Dark Side Pts</span></div></td>		
 				</tr>
 				<tr>	
 					<td colspan="2"><input type="number" name="attr_BAB" value="0" title="Base Attack Bonus" /></td>
@@ -1949,7 +1950,7 @@
 				<label data-i18n="perception">Perception </label>		
 			<br />
 			<button type="roll" name="roll_NPC-InitiativeTurn" value="&{template:skill} {{name=Rolling for Turn Order}} {{skill=[[1d20+@{Initiative}+@{InitiativeDecimal}[Initiative Decimal]+?{Other Modifiers|0}[Other] &{tracker}]]}}" title="Roll Initiative to Turn Order window %{InitiativeTurn}" ></button>		
-				<label data-i18n="initiative">Initiative</label>	 <span class="small" style="margin-left:10px;"><input type="checkbox" value="[[0.01 * (@{Initiative})]]" name="attr_InitiativeDecimal" title="Add Initiative Modifier to roll as a decimal for easier sorting @{InitiativeDecimal}" checked /><span data-i18n="init_decimal" class="sheet-not-sheet-show">Initiative as Decimal</span>
+				<label data-i18n="initiative">Initiative</label>	 <span class="small" style="margin-left:10px;"><input type="checkbox" value="[[0.01 * (@{Initiative})]]" name="attr_InitiativeDecimal" title="Add Initiative Modifier to roll as a decimal for easier sorting @{InitiativeDecimal}" checked /><span data-i18n="init_decimal" class="sheet-not-sheet-show">Initiative as Decimal</span></span>
 			<table>
 				<tr>
 					<td colspan="6"><div class="textHead"><span data-i18n="grapple">Grapple</span></div></td>
@@ -2857,8 +2858,8 @@
 <br />
 <!-- start help section --> 
 <div> 
-For Help, please see the wiki page. <input type="text" disabled="true" name="attr_vehicle-EquipmentLocation" style="width:30em" title="Wiki URL" value="https://wiki.roll20.net/Star_Wars_Saga_Edition_Character_Sheet"/> <br/>
-<b>Last updated</b> 20 April 2023
+For Help, please see the wiki page. <input type="text" disabled="true" name="wiki_URL" style="width:30em" title="Wiki URL" value="https://wiki.roll20.net/Star_Wars_Saga_Edition_Character_Sheet"/> <br/>
+<b>Last updated</b> 22 April 2023
 </div>
 <!-- Why the hell is the wiki URL in an input named "vehicle-EquipmentLocation"? -->
 <!-- start roll templates -->