diff --git a/Star Wars Saga Edition/StarWarsSagaEdition.html b/Star Wars Saga Edition/StarWarsSagaEdition.html
index 2087e6eedd..666e19f6ac 100644
--- a/Star Wars Saga Edition/StarWarsSagaEdition.html	
+++ b/Star Wars Saga Edition/StarWarsSagaEdition.html	
@@ -26,7 +26,7 @@
 				<input type="checkbox" value="1" name="attr_SR-Show" title="Show/Hide Shield Rating" />&nbsp;<span class="not-show">Shield Rating</span><br/>
 				<input type="checkbox" value="1" name="attr_immune-Show" title="Show/Hide Immunities" />&nbsp;<span class="not-show">Immunities</span><br/>
 				<!--The line below should be included if the number of settings in the left and right sheet-table-data are different.-->
-<!--				<span>&nbsp;</span>--> 
+			<!--	<span>&nbsp;</span>	-->
 				</div>
 				</div>
 			</div>
@@ -34,6 +34,7 @@
 				<div class="sheet-col">
 					<div class="sheet-textHead" >PC Sheet</div>
 					<div class="rule-sections">
+						<input type="checkbox" value="1" name="attr_armor-show" title="Show/Hide Armor Section" />&nbsp;<span class="not-show">Armor</span><br/>
 						<input type="checkbox" value="[[@{CT}*-1]][CT Ignore]" name="attr_CTIgnoreDT"  title="Does Damage Threshold ignore penalty from the Condition Track? @{CTIgnoreDT}" />&nbsp;<span data-i18n="ignore_ct" class="not-show">Damage Threshold ignores CT</span><br/>
 						<input type="checkbox" value="1" name="attr_show-nonheroic-level" value="1" title="Show nonheroic levels? @{show-nonheroic-level}" />&nbsp;<span class="not-show">Show nonheroic levels</span><br/>
 						<input type="checkbox" value="1" name="attr_show-CustomPCSkills" title="Show the option to add new skills" />&nbsp;<span class="not-show">Custom skills</span><br/>
@@ -93,6 +94,11 @@
 			</div>
 		</div>
 	</div>
+<!-- start help section --> 
+<div> 
+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><span data-i18n="last_updated">Last updated</span>:</b> 19 October 2023
+</div>
 </div>
 
 <div class="sheet-tab-content tab1">
@@ -292,7 +298,7 @@
 					</div>
 				</tr>			
 			</div>
-			<div class="sheet-table left">			
+			<div class="sheet-table left" style="border-spacing: 2px;">			
 				<div class="sheet-table-row">
 					<span class="sheet-table-data">	
 						<button type="roll" name="roll_PerceptionCheck" value="@{PerceptionFormula|max}" title="Roll Perception  %{PerceptionCheck} "></button>
@@ -360,7 +366,8 @@
 						<th></th>
 						<th><span data-i18n="total">Total</span></th>
 						<th></th>
-						<th style="min-width:50px">	<span><span data-i18n="level">Level</span> /<br /><span data-i18n="armor">Armor</span></span>	</th>
+						<th style="min-width:50px">	<span>Level / Armor</span>	</th>
+					<!--	<th style="min-width:50px">	<span><span data-i18n="level">Level</span> /<br /><span data-i18n="armor">Armor</span></span>	</th> -->
 						<th><span data-i18n="class">Class</span></th>					
 						<th><span data-i18n="mod">Mod</span></th>
 						<th><span data-i18n="misc">Misc</span></th>
@@ -437,24 +444,24 @@
 			<br />			
 			<input type="checkbox" class="sect-show sheet-hidden" value="1" name="attr_armor-show" /> 		
 			<table class="sheet-spacing sect sheet-table2col">
-				<tr colspan="7">	<div class="sheet-textHead2Col">Armor&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" class="sect-show showhidetoggle" title="Show/Hide Armor Section" name="attr_armor-show" value="1" /><span/></div></tr>
+				<tr colspan="7">	<div class="sheet-textHead2Col sect">Armor&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" class="sect-show showhidetoggle" title="Hide Armor Section. To show this section again, check the Armor box on the Settings tab." name="attr_armor-show" value="1" /><span/></div></tr>
 				<tr>	
-					<th width="50%" colspan="3">Armor Worn <input type="checkbox" value="1" name="attr_ArmorWornCheck" title="Armor equiped @{ArmorWornCheck}" /></th>		
-					<th class="sheet-small">Ref Def<br />Bonus</th>		
-					<th class="sheet-small">Fort Def<br />Bonus</th>		
-					<th class="sheet-small">Max Dex<br />Bonus</th>		
-					<th>Speed</th>		</tr>
+					<th width="50%" colspan="3" class="sheet-small">Armor Worn <input type="checkbox" value="1" name="attr_ArmorWornCheck" title="Armor equiped @{ArmorWornCheck}" /></th>		
+					<th class="sheet-small">Ref Def Bonus</th>		
+					<th class="sheet-small">Fort Def Bonus</th>		
+					<th class="sheet-small">Max Dex Bonus</th>		
+					<th class="sheet-small">Speed</th>		</tr>
 				<tr>
-					<td colspan="3"><input type="text" name="attr_ArmorWorn" style="width:100%" title="Armor Name @{ArmorWorn}" /></td>
+					<td colspan="3"><input type="text" name="attr_ArmorWorn" style="width:100%" title="Armor Name @{ArmorWorn}" placeholder="Armor name" /></td>
 					<td><input type="number" name="attr_ArmorRef" value="0" title="Armor Reflex Defense Bonus @{ArmorRef}" /></td>
 					<td><input type="number" name="attr_ArmorFort" value="0" title="Armor Fortitude Defense Bonus @{ArmorFort}" /></td>
 					<td><input type="number" name="attr_ArmorDex" value="0" title="Armor Max DEX @{ArmorDex}" /></td>
 					<td><input type="number" name="attr_Speed_max" value="0" title="Armor Max Speed @{Speed|max}" /></td>
 				</tr>
 				<tr>
-					<th class="sheet-small">Proficiency<br /><input type="checkbox" value="1" name="attr_ArmorProf" title="Proficient in armor worn @{ArmorProf}" /></th>
-					<th class="sheet-small">Armor Def.<br /><input type="checkbox" value="1" name="attr_ArmorDefense" title="Armor Specialist: Armor Defense @{ArmorDefense}" /></th>				
-					<th class="sheet-small">Improved<br />Armor Def.<br /><input type="checkbox" value="1" name="attr_ImpArmorDefense" title="Armor Specialist: Improved Armor Defense @{ImpArmorDefense}" /></th>
+					<th class="sheet-small"><br/>Proficiency<br /><input type="checkbox" value="1" name="attr_ArmorProf" title="Proficient in armor worn @{ArmorProf}" /></th>
+					<th class="sheet-small">Armored Defense<br /><input type="checkbox" value="1" name="attr_ArmorDefense" title="Armor Specialist: Armor Defense @{ArmorDefense}" /></th>				
+					<th class="sheet-small">Improved Armored Def.<br /><input type="checkbox" value="1" name="attr_ImpArmorDefense" title="Armor Specialist: Improved Armor Defense @{ImpArmorDefense}" /></th>
 					<th class="sheet-small" colspan="2">Armor Type<br/>
 						<select name="attr_ArmorType" style="width:90px" title="Armor Type @{ArmorType}">
 							  <option value="Light">Light</option>
@@ -476,7 +483,7 @@
 					<td colspan="7"><textarea type="text" name="attr_ArmorNotes" class="atkNotes" title="Armor Notes @{ArmorNotes}" placeholder="Armor Notes"></textarea></td>
 				</tr>
 			</table>
-			<br />			
+			<br class="sect" />			
 			<div class="sheet-textHead2Col" data-i18n="attacks">Attacks</div>
 				<fieldset class="repeating_attack">	
 				<div class="sheet-table">	
@@ -579,7 +586,7 @@
 								<span class="sheet-table-data" style="min-width:110px" data-i18n="critical_info">	<b>Critical Info</b>	</span>
 								<span class="sheet-table-data">	<span class="sheet-small" data-i18n="range"><b>Range</b></span> 	<input type="number" name="attr_WeaponCrit" placeholder="Crit" value="20" title="Weapon Critical Starting Range ie.20 @{repeating_attack_X_WeaponCrit}" />	</span>
 								<span class="sheet-table-data">		<span class="sheet-small" data-i18n="multiplier"><b>Multiplier</b></span>	 <input type="number" name="attr_WeaponCrit_max" value="2" title="Weapon Crit Damage Multiplier @{repeating_attack_X_WeaponCrit|max}" />		</span>
-								<span class="sheet-table-data">	<b>Template <br/>Formula</b>	 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" class="sect-show showhidetoggle" title="Show/Hide Attack Template Formula" name="attr_AttackFormula-show" value="1" /><span/>	</span>
+								<span class="sheet-table-data">	<b>Template Formula</b>	<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" class="sect-show showhidetoggle" title="Show/Hide Attack Template Formula" name="attr_AttackFormula-show" value="1" /><span/>	</span>
 							</div>
 						</div>	</span>
 					</div>
@@ -1871,25 +1878,26 @@
 	<div class="EquipmentSection"> 	
 		<div class="sheet-textHead" data-i18n="equipment">Equipment</div>
 		<div class="sheet-table">
+			<input type="checkbox" class="sect-show sheet-hidden" value="1" name="attr_armor-show" />
 			<div class="sheet-table-row">
 				<span class="sheet-table-header" style="min-width:175px; width:50%" data-i18n="item_name">Item Name</span>
 				<span class="sheet-table-header" style="width:35px;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-				<span class="sheet-table-header" style="width:40px;" data-i18n="carried">Carry</span>			
-				<span class="sheet-table-header" style="width:45px;" data-i18n="quantity">QTY</span>			
-				<span class="sheet-table-header" style="width:55px;" data-i18n="weight">Weight</span>			
-				<span class="sheet-table-header" style="width:55px;">Total<br/> Weight</span>
-				<span class="sheet-table-header" style="width:55px;">Base<br/>Cost<br/>(Cr)</span>	
-				<span class="sheet-table-header" style="width:55px;">Total<br/>Cost<br/>(Cr)</span>					
+				<span class="sheet-table-header" style="width:40px; float:left"><br/><br/><span style="min-width:35px; display:inline-block;" data-i18n="carried">Carry</span></span>			
+				<span class="sheet-table-header" style="width:45px;"><span style="min-width:40px; display:inline-block;" data-i18n="quantity">QTY</span></span>			
+				<span class="sheet-table-header" style="width:55px;"><span style="min-width:50px; display:inline-block;" data-i18n="weight">Weight</span>	</span>		
+				<span class="sheet-table-header" style="width:55px;"><span style="min-width:50px; display:inline-block;">Total Weight</span></span>
+				<span class="sheet-table-header" style="width:55px;"><span style="min-width:50px; display:inline-block;">Base Cost (Cr)</span>	</span>
+				<span class="sheet-table-header" style="width:55px;"><span style="min-width:50px; display:inline-block;">Total Cost (Cr)</span></span>					
 			</div>			
-			<div class="sheet-table-row">
-				<span class="sheet-table-data">	<input type="text" name="attr_ArmorWorn" placeholder="Armor Name" style="width:100%" title="Armor Name @{ArmorWorn}" />	</span>
+			<div class="sheet-table-row sect">
+				<span class="sheet-table-data" style="width:50%;">	<input type="text" name="attr_ArmorWorn" placeholder="Armor Name" style="width:100%" title="Armor Name @{ArmorWorn}" />	</span>
 				<span class="sheet-table-data">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" class="sect-show showhidetoggle" title="Show/Hide Armor Notes" name="attr_ArmorNotes-show" value="1" /><span/>	</span>			
 				<span class="sheet-table-data center" style="width:40px; float:left">	<input type="checkbox" value="1" name="attr_ArmorCarry" title="Armor Carried? @{ArmorCarry}" />	</span>	
-				<span class="sheet-table-data center">	<div style="width:40px"></div>	</span>
-				<span class="sheet-table-data center">	<input type="text" style="width:50px" name="attr_ArmorWt" value="0" title="Armor Weight @{ArmorWt}" />	</span>
-				<span class="sheet-table-data center">	<div style="width:50px"></div>	</span>	</span>
-				<span class="sheet-table-data center">	<input type="text" style="width:50px" name="attr_ArmorCost" value="0" title="Armor Base Cost @{ArmorCost}" />	</span>
-				<span class="sheet-table-data center">	<input type="text" style="width:50px" name="attr_ArmorTotalCost" value="0" title="Armor Total Cost after Upgrades @{ArmorTotalCost}" />	</span>
+				<span class="sheet-table-data center" style="width:45px">	<div style="width:40px"></div>	</span>
+				<span class="sheet-table-data center" style="width:55px">	<input type="text" style="width:50px" name="attr_ArmorWt" value="0" title="Armor Weight @{ArmorWt}" />	</span>
+				<span class="sheet-table-data center" style="width:55px">	<div style="width:50px"></div>	</span>	</span>
+				<span class="sheet-table-data center" style="width:55px">	<input type="text" style="width:50px" name="attr_ArmorCost" value="0" title="Armor Base Cost @{ArmorCost}" />	</span>
+				<span class="sheet-table-data center" style="width:55px">	<input type="text" style="width:50px" name="attr_ArmorTotalCost" value="0" title="Armor Total Cost after Upgrades @{ArmorTotalCost}" />	</span>
 			</div>
 		</div>		
 		<input type="checkbox" class="sect-show sheet-hidden" value="1" name="attr_ArmorNotes-show" />
@@ -2212,13 +2220,18 @@
 					</div>
 				</tr>			
 			</div>
-			<button type="roll" name="roll_PerceptionCheck" value="@{PerceptionFormula|max}" title="Roll Perception %{PerceptionCheck}"></button>
-				<label data-i18n="perception">Perception </label>		
-			<br />
-			<input type="checkbox" value="1" name="attr_QuerySkillModifier" checked class="sheet-hidden other-mod-toggle"/>
-			<button type="roll" name="roll_InitiativeTurn" class="other-mod-on" value="&{template:skill} {{name=Rolling for Turn Order}} {{skill=[[1d20+@{Initiative}+@{InitiativeDecimal}[Initiative Decimal]+?{Other Modifiers|0}[Other] &{tracker}]]}} {{notes=@{Initiative|max}}}" title="Roll Initiative to Turn Order window %{InitiativeTurn}" ></button>		
-			<button type="roll" name="roll_InitiativeTurn" class="other-mod-off" value="&{template:skill} {{name=Rolling for Turn Order}} {{skill=[[1d20+@{Initiative}+@{InitiativeDecimal}[Initiative Decimal] &{tracker}]]}} {{notes=@{Initiative|max}}}" title="Roll Initiative to Turn Order window %{InitiativeTurn}" ></button>		
-				<label data-i18n="initiative">Initiative</label>	 <span class="sheet-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 />&nbsp;<span data-i18n="init_decimal" class="not-show">Initiative as Decimal</span></span>
+			<div class="sheet-table" style="border-spacing: 2px;">
+				<div class="sheet-table-row" >
+					<button type="roll" name="roll_PerceptionCheck" value="@{PerceptionFormula|max}" title="Roll Perception %{PerceptionCheck}"></button>
+					<label data-i18n="perception">Perception </label>		
+				</div>
+				<div class="sheet-table-row">
+					<input type="checkbox" value="1" name="attr_QuerySkillModifier" checked class="sheet-hidden other-mod-toggle"/>
+					<button type="roll" name="roll_InitiativeTurn" class="other-mod-on" value="&{template:skill} {{name=Rolling for Turn Order}} {{skill=[[1d20+@{Initiative}+@{InitiativeDecimal}[Initiative Decimal]+?{Other Modifiers|0}[Other] &{tracker}]]}} {{notes=@{Initiative|max}}}" title="Roll Initiative to Turn Order window %{InitiativeTurn}" ></button>		
+					<button type="roll" name="roll_InitiativeTurn" class="other-mod-off" value="&{template:skill} {{name=Rolling for Turn Order}} {{skill=[[1d20+@{Initiative}+@{InitiativeDecimal}[Initiative Decimal] &{tracker}]]}} {{notes=@{Initiative|max}}}" title="Roll Initiative to Turn Order window %{InitiativeTurn}" ></button>		
+					<label data-i18n="initiative">Initiative</label>	 <span class="sheet-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 />&nbsp;<span data-i18n="init_decimal" class="not-show">Initiative as Decimal</span></span>
+				</div>
+			</div>
 			<table>
 				<tr>
 					<td colspan="6"><div class="sheet-textHead"><span data-i18n="grapple">Grapple</span></div></td>
@@ -2285,6 +2298,7 @@
 				</tr>
 			  </tbody>
 			</table>
+			<br/>
 		<div class="sheet-textHead2Col">Attacks</div>
 			<fieldset class="repeating_NPC-attack">	
 				<div class="sheet-table">	
@@ -4256,11 +4270,6 @@
 </div>
 <div class="clear"></div>
 </div> <!-- End Vehicle Sheet -->
-<!-- start help section --> 
-<div> 
-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><span data-i18n="last_updated">Last updated</span>:</b> 1 October 2023
-</div>
 <!-- start roll templates --> 
 <body>
 <rolltemplate class="sheet-rolltemplate-attack">

Armor Worn			Ref Def Bonus	Fort Def Bonus	Max Dex Bonus	Speed
Armor Worn			Ref Def Bonus	Fort Def Bonus	Max Dex Bonus	Speed

Proficiency	Armor Def.	Improved Armor Def.	Proficiency	Armored Defense	Improved Armored Def.	Armor Type