diff --git a/Pathfinder-Neceros/pathfinder-neceros.html b/Pathfinder-Neceros/pathfinder-neceros.html
index 4081cd98fb..f6bd492a32 100644
--- a/Pathfinder-Neceros/pathfinder-neceros.html
+++ b/Pathfinder-Neceros/pathfinder-neceros.html
@@ -72,7 +72,7 @@
 	<br/>
 	<div class="sheet-table">
 		<div class="sheet-table-row">
-			<div class="sheet-table-data-center">
+			<div class="sheet-table-data-center" style="vertical-align:top;">
 				<div class="sheet-table">
 					<span class="sheet-table-name">Ability Scores</span>
 					<div class="sheet-table-row">
@@ -232,7 +232,7 @@
 	<br>
 	<div class="sheet-table">
 		<div class="sheet-table-row">
-			<div class="sheet-table-data-center">
+			<div class="sheet-table-data-center" style="vertical-align:top;">
 				<div class="sheet-table">
 					<span class="sheet-table-name">Health and Wounds</span>
 					<div class="sheet-table-row">
@@ -326,8 +326,8 @@
 	</div>
 	<br>
 	<div class="sheet-table">
-		<div class="sheet-table-row">
-			<div class="sheet-table-data-center">
+		<div class="sheet-table-row" style="vertical-align:top;">
+			<div class="sheet-table-data-center" style="vertical-align:top;">
 				<div class="sheet-table">
 					<span class="sheet-table-name">Saving Throws</span>
 					<div class="sheet-table-row">
@@ -604,10 +604,10 @@
 					</div>
 				</div>		
 			</div>
-			<div class="sheet-table-data-center">
+			<div class="sheet-table-data-center" style="vertical-align:top;">
 				&nbsp;
 			</div>
-			<div class="sheet-table-data-center">
+			<div class="sheet-table-data-center" style="vertical-align:top;">
 				<div class="sheet-table">
 				<span class="sheet-table-name">Skills</span>
 				<div class="sheet-table-row">
@@ -1057,13 +1057,7 @@
 			<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_weapon_X_weight" type="number" name="attr_weight" value="0"></span>
 			<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_weapon_X_ammo" type="number" name="attr_ammo" value="0"></span>
 			<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_weapon_X_notes" type="text" name="attr_notes"></span>
-			<span class="sheet-table-data-center" style="width:5%;"><button class="tokenaction" title="AttackRoll" type="roll" name="roll_AttackRoll" value="@{character_name} is attacking with: @{name}
-				&#x00A;Attack Result: [[1d20 + @{attack-type} + @{attack}]]
-				&#x00A;Damage Result: [[@{damage} + @{damage-ability}]]
-				&#x00A;Crit: @{crit}
-				&#x00A;Type: @{type}
-				&#x00A;Notes: @{notes}
-				&#x00A;Attack notes: @{attack-notes}"></button></span>
+			<span class="sheet-table-data-center" style="width:5%;"><button class="tokenaction" title="AttackRoll" type="roll" name="roll_AttackRoll" value="@{character_name} is attacking with: @{name}&#x00A;Attack Result: [[1d20 + @{attack-type} + @{attack}]]&#x00A;Damage Result: [[@{damage} + @{damage-ability}]]&#x00A;Crit: @{crit}&#x00A;Type: @{type}&#x00A;Notes: @{notes}&#x00A;Attack notes: @{attack-notes}"></button></span>
 		</fieldset>
 	</div>
 	<br>
@@ -1747,19 +1741,18 @@
 		</div>
 		<div class="sheet-table">
 			<div class="sheet-table-row">
+				<span class="sheet-table-header" style="text-align:left;"></span>
 				<span class="sheet-table-header" style="text-align:left;"></span>
 				<span class="sheet-table-header" style="text-align:left;">Total</span>
 				<span class="sheet-table-header" style="text-align:left;">Misc</span>
 				<span class="sheet-table-header" style="text-align:left;"></span>
 				<span class="sheet-table-header" style="text-align:left;"></span>
-				<span class="sheet-table-header" style="text-align:left;"></span>
 			</div>
 			<div class="sheet-table-row">				
+				<span class="sheet-table-data-left" style="width:5%;"><button title="InitiativeRoll" type="roll" name="roll_InitiativeRoll" value="Initiative result: [[1d20 + @{init} &amp;{tracker}]]&#x00A;Initiative bonus: [[@{init}]]"></button></span>
 				<span class="sheet-table-data-left" style="width:5%;"><b>Init</b></span>
 				<span class="sheet-table-data-left" style="width:5%;"><input type="number" title="init" name="attr_init" value="@{DEX-mod} + @{init-misc}" disabled/></span>
 				<span class="sheet-table-data-left" style="width:5%;"><input type="number" title="init-misc" name="attr_init-misc" value="0"/></span>
-				<span class="sheet-table-data-left" style="width:5%;"><button title="InitiativeRoll" type="roll" name="roll_InitiativeRoll" value="Initiative result: [[1d20 + @{init} &amp;{tracker}]]
-					&#x00A;Initiative bonus: [[@{init}]]"></button></span>
 				<span class="sheet-table-data-left" style="width:7%;"><b>Senses </b></span>
 				<span class="sheet-table-data-center"><input type="text" title="npc-senses" name="attr_npc-senses"/></span>
 			</div>
@@ -1822,9 +1815,6 @@
 		</div>
 		<div class="sheet-table">
 			<div class="sheet-table-row">
-				<span class="sheet-table-header" style="text-align:left;"></span>
-				<span class="sheet-table-header" style="text-align:left;">Total</span>
-				<span class="sheet-table-header" style="text-align:left;">Misc</span>
 				<span class="sheet-table-header" style="text-align:left;"></span>
 				<span class="sheet-table-header" style="text-align:left;"></span>
 				<span class="sheet-table-header" style="text-align:left;">Total</span>
@@ -1835,20 +1825,24 @@
 				<span class="sheet-table-header" style="text-align:left;">Misc</span>
 				<span class="sheet-table-header" style="text-align:left;"></span>
 				<span class="sheet-table-header" style="text-align:left;"></span>
+				<span class="sheet-table-header" style="text-align:left;"></span>
+				<span class="sheet-table-header" style="text-align:left;">Total</span>
+				<span class="sheet-table-header" style="text-align:left;">Misc</span>
+				<span class="sheet-table-header" style="text-align:left;"></span>
 			</div>
 			<div class="sheet-table-row">	
+				<span class="sheet-table-data-left"><button title="FortSave" type="roll" name="roll_FortSave" value="Fort save: [[1d20 + @{Fort}]]"></button></span>
 				<span class="sheet-table-data-left" ><b>Fort</b></span>
 				<span class="sheet-table-data-left"><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-left"><input title="Fort-misc" type="number" name="attr_Fort-misc" value="0"></span>
-				<span class="sheet-table-data-left"><button title="FortSave" type="roll" name="roll_FortSave" value="Fort save: [[1d20 + @{Fort}]]"></button></span>
+				<span class="sheet-table-data-left"><button title="RefSave" type="roll" name="roll_RefSave" value="Ref save: [[1d20 + @{Ref}]]"></button></span>
 				<span class="sheet-table-data-left" ><b>Ref</b></span>
 				<span class="sheet-table-data-left"><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-left"><input title="Ref-misc" type="number" name="attr_Ref-misc" value="0"></span>
-				<span class="sheet-table-data-left"><button title="RefSave" type="roll" name="roll_RefSave" value="Ref save: [[1d20 + @{Ref}]]"></button></span>
+				<span class="sheet-table-data-left"><button title="WillSave" type="roll" name="roll_WillSave" value="Will save: [[1d20 + @{Will}]]"></button></span>
 				<span class="sheet-table-data-left" ><b>Will</b></span>
 				<span class="sheet-table-data-left"><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-left"><input title="Will-misc" type="number" name="attr_Will-misc" value="0"></span>
-				<span class="sheet-table-data-left"><button title="WillSave" type="roll" name="roll_WillSave" value="Will save: [[1d20 + @{Will}]]"></button></span>
 				<span class="sheet-table-data-left"><input type="text" title="npc-racial-save-mods" name="attr_npc-racial-save-mods" value="Racial save modifiers"></span>
 			</div>
 		</div>
@@ -1919,14 +1913,7 @@
 				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_melee_X_crit" type="text" name="attr_crit" value="20/x2"></span>
 				<span class="sheet-table-data-center" style="width:20%;"><input title="repeating_melee_X_notes" type="text" name="attr_notes"></span>
 				<span class="sheet-table-data-center" style="width:5%;">
-					<button class="tokenaction" title="NPCMeleeRoll" type="roll" name="roll_NPCMeleeRoll" value="@{character_name} is attacking with: @{name}
-					&#x00A;Attack Result: [[1d20 + @{attack}]]
-					&#x00A;VS @{target|character_name}'s AC: @{target|AC}
-					&#x00A;VS @{target|character_name}'s Touch: @{target|Touch}
-					&#x00A;VS @{target|character_name}'s Flat-Footed: @{target|Flat-Footed}
-					&#x00A;Damage Result: [[@{damage}]]
-					&#x00A;Crit: @{crit}
-					&#x00A;Notes: @{notes}"></button>
+					<button class="tokenaction" title="NPCMeleeRoll" type="roll" name="roll_NPCMeleeRoll" value="@{character_name} is attacking with: @{name}&#x00A;Attack Result: [[1d20 + @{attack}]]&#x00A;VS @{target|character_name}'s AC: [[@{target|AC}]]&#x00A;VS @{target|character_name}'s Touch: [[@{target|Touch}]]&#x00A;VS @{target|character_name}'s Flat-Footed: [[@{target|Flat-Footed}]]&#x00A;Damage Result: [[@{damage}]]&#x00A;Crit: @{crit}&#x00A;Notes: @{notes}"></button>
 				</span>
 			</fieldset>
 		</div>
@@ -1951,14 +1938,7 @@
 				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_ranged_X_crit" type="text" name="attr_crit" value="20/x2"></span>
 				<span class="sheet-table-data-center" style="width:20%;"><input title="repeating_ranged_X_notes" type="text" name="attr_notes"></span>
 				<span class="sheet-table-data-center" style="width:5%;">
-					<button class="tokenaction" title="NPCRangedRoll" type="roll" name="roll_NPCRangedRoll" value="@{character_name} is attacking with: @{name}
-					&#x00A;Attack Result: [[1d20 + @{attack}]]
-					&#x00A;VS @{target|character_name}'s AC: @{target|AC}
-					&#x00A;VS @{target|character_name}'s Touch: @{target|Touch}
-					&#x00A;VS @{target|character_name}'s Flat-Footed: @{target|Flat-Footed}
-					&#x00A;Damage Result: [[@{damage}]]
-					&#x00A;Crit: @{crit}
-					&#x00A;Notes: @{notes}"></button>
+					<button class="tokenaction" title="NPCRangedRoll" type="roll" name="roll_NPCRangedRoll" value="@{character_name} is attacking with: @{name}&#x00A;Attack Result: [[1d20 + @{attack}]]&#x00A;VS @{target|character_name}'s AC: [[@{target|AC}]]&#x00A;VS @{target|character_name}'s Touch: [[@{target|Touch}]]&#x00A;VS @{target|character_name}'s Flat-Footed: [[@{target|Flat-Footed}]]&#x00A;Damage Result: [[@{damage}]]&#x00A;Crit: @{crit}&#x00A;Notes: @{notes}"></button>
 				</span>
 			</fieldset>
 		</div>