diff --git a/DCC_Tabbed_Sheet/DCC_Tabbed_Sheet.css b/DCC_Tabbed_Sheet/DCC_Tabbed_Sheet.css
index ee05e4f793..06cc74309b 100644
--- a/DCC_Tabbed_Sheet/DCC_Tabbed_Sheet.css
+++ b/DCC_Tabbed_Sheet/DCC_Tabbed_Sheet.css
@@ -1305,6 +1305,9 @@ div[data-groupname^="repeating_mutations"] .repitem,
 	vertical-align: middle;
 	line-height: 20px;
 	text-align: center;
+    border-radius: 12px;
+    padding-left: 5px;
+    margin-bottom: 5px;
 }
 
 .charsheet .sheet-isBard:checked~ div.sheet-cleric,
diff --git a/DCC_Tabbed_Sheet/DCC_Tabbed_Sheet.html b/DCC_Tabbed_Sheet/DCC_Tabbed_Sheet.html
index dc3b1b104f..512b5f0f57 100644
--- a/DCC_Tabbed_Sheet/DCC_Tabbed_Sheet.html
+++ b/DCC_Tabbed_Sheet/DCC_Tabbed_Sheet.html
@@ -646,6 +646,8 @@
 					<input type="radio" class="isMutant" value="16" name="attr_Class"><label class="sheet-subtab">Mutant</label>
 					<input type="radio" class="isPetrolHead" value="17" name="attr_Class"><label class="sheet-subtab">Petrol Head</label>
 					<input type="radio" class="isTechnologist" value="18" name="attr_Class"><label class="sheet-subtab">Technologist</label>
+
+					<hr/>
 					
 						<!-- Bard -->
 						<div class="sheet-bard">
@@ -5007,7 +5009,7 @@
 					
 					<div class="sheet-row sheet-margin-bottom">
 					
-						<div class="sheet-col-1"><h4 class="sheet-center">Spell Dashboard</h4></div>
+						<div class="sheet-col-1"><h4 class="sheet-center">Spell Slots by Class</h4></div>
 						
 						<div class="sheet-col-1">
 							
@@ -5130,7 +5132,7 @@
 					<div class="sheet-col-1-1 sheet-center">&nbsp;</div>
 					<div class="sheet-col-1-1 sheet-center">&nbsp;</div>
 
-					<div class="sheet-col-1-1 sheet-left sheet-class-label">Caster Type</div>
+					<div class="sheet-col-1-1 sheet-left"><h4 class="sheet-center">Caster Type</div>
 					
 					<div class="sheet-col-1-1 sheet-center">&nbsp;</div>
 
@@ -5169,7 +5171,7 @@
 									<div class="sheet-col-1 sheet-vert-bottom sheet-center sheet-small-label">Level 1</div>
 								</div>
 								
-								<!-- BEGIN spellbook 1 row -->	
+								<!-- BEGIN ARCANE spellbook 1 row -->	
 									<fieldset class="repeating_spellbooklevel1">
 									<div class="sheet-margin-bottom sheet-padr sheet-padl">
 										<div class="sheet-row">
@@ -5202,8 +5204,8 @@
 										<span class="sheet-spacer"></span>
 										<span class="sheet-small-label">Show :</span>
 										<input type="checkbox" name="attr_spelltypeGeneral" class="sheet-spelltypetab sheet-spelltypeGeneral" value="1"/><span class="sheet-spelltypetab sheet-spelltypeGeneral">General</span> 
-										<input type="checkbox" name="attr_spelltypeMercurialMagic" class="sheet-spelltypetab sheet-spelltypeMercurialMagic" value="1"/><span class="sheet-spelltypetab sheet-spelltypeMercurialMagic">Mercurial Magic</span> 
-										<input type="checkbox" name="attr_spelltypeManifest" class="sheet-spelltypetab sheet-spelltypeManifest" value="1"/><span class="sheet-spelltypetab sheet-spelltypeManifest">Manifestation</span> |
+										<input type="checkbox" name="attr_spelltypeMercurialMagic" class="sheet-spelltypetab sheet-spelltypeMercurialMagic" value="1" checked="checked"/><span class="sheet-spelltypetab sheet-spelltypeMercurialMagic">Mercurial Magic</span> 
+										<input type="checkbox" name="attr_spelltypeManifest" class="sheet-spelltypetab sheet-spelltypeManifest" value="1" checked="checked"/><span class="sheet-spelltypetab sheet-spelltypeManifest">Manifestation</span> |
 										<input type="checkbox" name="attr_spelltypeAttack" class="sheet-spelltypetab sheet-spelltypeSpellCheck" value="1"/><span class="sheet-spelltypetab sheet-spelltypeSpellCheck">Spell Check</span> 
 										<input type="checkbox" name="attr_spelltypeDamage" class="sheet-spelltypetab sheet-spelltypeDamage" value="1"/><span class="sheet-spelltypetab sheet-spelltypeDamage">Damage</span> |
 										<input type="checkbox" name="attr_spelltypeMisfire" class="sheet-spelltypetab sheet-spelltypeMisfire" value="1"/><span class="sheet-spelltypetab sheet-spelltypeMisfire">Misfire</span>
@@ -5273,14 +5275,11 @@
 												<div class="sheet-col-1-5 sheet-offset-1-10 sheet-center">&nbsp;</div>
 												<div class="sheet-col-1-6" title="Pick the class that is using the spell for correct bonus">
 													<select name="attr_SpellUser_bonus">
-														<option value="0">Choose Spellcasting Class...</option>
-														<option value="(@{cleric_spell_bonus} + @{Level})">Cleric</option>
+														<option value="0">Choose Arcane Spellcasting Class...</option>
 														<option value="(@{elf_spell_bonus} + @{Level})">Elf Fighter/Mage</option>
 														<option value="(@{wizard_spell_bonus} + @{Level})">Wizard</option>
 														<option value="(@{bard_spell_bonus} + @{Level})">Bard</option>
 														<option value="(@{gnome_spell_bonus} + @{TrickDie})">Gnome</option>
-														<option value="(@{paladin_spell_bonus} + @{Level})">Paladin</option>
-														<option value="(@{dwarfpriest_spell_bonus} + @{Level})">Dwarf Priest</option>
 														<option value="(@{elfrogue_spell_bonus} + @{Level})">Elf Rogue</option>
 													</select>
 												</div>
@@ -5304,7 +5303,7 @@
 													</select>
 												</div>
 						                        <div class="sheet-col-1-12 sheet-vert-bottom sheet-center">&nbsp;</div>
-												<div class="sheet-col-1-8 sheet-vert-middle sheet-center"><button type="roll" class="sheet-roll" name="roll_Spellcheck" value="@{character_name} gets a Spell Check of [[@{SpellcheckDie} + [[@{SpellUser_bonus}]] + @{SpellCastLuckyRoll} + (?{Amount of Spellburn|0}) [Spellburn]]] for @{spellname}.">Spell Check</button></div>
+												<div class="sheet-col-1-8 sheet-vert-middle sheet-center"><button type="roll" class="sheet-roll" name="roll_Spellcheck" value="@{character_name} gets a Spell Check of [[@{SpellcheckDie} + [[@{SpellUser_bonus}]] + @{SpellCastLuckyRoll} + (?{Amount of Spellburn|0}) [Spellburn]]] - @{ArmorCheck} [Armor Check Penalty] for @{spellname}.">Spell Check</button></div>
 
 												<div class="sheet-col-1-8 sheet-center">
 													<input type="hidden" name="attr_SpellFumbleCheck" value="[[[[@{LCK}]] * (-1)]]" disabled="true"/>
@@ -5499,17 +5498,14 @@
 										<div class="sheet-row">
 											<div class="sheet-col-1-5 sheet-offset-1-10 sheet-center">&nbsp;</div>
 											<div class="sheet-col-1-6" title="Pick the class that is using the spell for correct bonus">
-												<select name="attr_SpellUser_bonus">
-													<option value="0">Choose Spellcasting Class...</option>
-													<option value="(@{cleric_spell_bonus} + @{Level})">Cleric</option>
-													<option value="(@{elf_spell_bonus} + @{Level})">Elf Fighter/Mage</option>
-													<option value="(@{wizard_spell_bonus} + @{Level})">Wizard</option>
-													<option value="(@{bard_spell_bonus} + @{Level})">Bard</option>
-													<option value="(@{gnome_spell_bonus} + @{TrickDie})">Gnome</option>
-													<option value="(@{paladin_spell_bonus} + @{Level})">Paladin</option>
-													<option value="(@{dwarfpriest_spell_bonus} + @{Level})">Dwarf Priest</option>
-													<option value="(@{elfrogue_spell_bonus} + @{Level})">Elf Rogue</option>
-												</select>
+													<select name="attr_SpellUser_bonus">
+														<option value="0">Choose Arcane Spellcasting Class...</option>
+														<option value="(@{elf_spell_bonus} + @{Level})">Elf Fighter/Mage</option>
+														<option value="(@{wizard_spell_bonus} + @{Level})">Wizard</option>
+														<option value="(@{bard_spell_bonus} + @{Level})">Bard</option>
+														<option value="(@{gnome_spell_bonus} + @{TrickDie})">Gnome</option>
+														<option value="(@{elfrogue_spell_bonus} + @{Level})">Elf Rogue</option>
+													</select>
 											</div>
 
 											<div class="sheet-col-1-6 sheet-small-label sheet-center" title="Select the die used for your Spell Check.">
@@ -5531,7 +5527,7 @@
 												</select>
 											</div>
 					                        <div class="sheet-col-1-12 sheet-vert-bottom sheet-center">&nbsp;</div>
-											<div class="sheet-col-1-8 sheet-vert-middle sheet-center"><button type="roll" class="sheet-roll" name="roll_Spellcheck" value="@{character_name} gets a Spell Check of [[@{SpellcheckDie} + [[@{SpellUser_bonus}]] + @{SpellCastLuckyRoll} + (?{Amount of Spellburn|0}) [Spellburn]]] for @{spellname}.">Spell Check</button></div>
+											<div class="sheet-col-1-8 sheet-vert-middle sheet-center"><button type="roll" class="sheet-roll" name="roll_Spellcheck" value="@{character_name} gets a Spell Check of [[@{SpellcheckDie} + [[@{SpellUser_bonus}]] + @{SpellCastLuckyRoll} + (?{Amount of Spellburn|0}) [Spellburn]]] - @{ArmorCheck} [Armor Check Penalty] for @{spellname}.">Spell Check</button></div>
 
 											<div class="sheet-col-1-8 sheet-center">
 												<input type="hidden" name="attr_SpellFumbleCheck" value="[[[[@{LCK}]] * (-1)]]" disabled="true"/>
@@ -5729,14 +5725,11 @@
 											<div class="sheet-col-1-5 sheet-offset-1-10 sheet-center">&nbsp;</div>
 											<div class="sheet-col-1-6" title="Pick the class that is using the spell for correct bonus">
 												<select name="attr_SpellUser_bonus">
-													<option value="0">Choose Spellcasting Class...</option>
-													<option value="(@{cleric_spell_bonus} + @{Level})">Cleric</option>
+													<option value="0">Choose Arcane Spellcasting Class...</option>
 													<option value="(@{elf_spell_bonus} + @{Level})">Elf Fighter/Mage</option>
 													<option value="(@{wizard_spell_bonus} + @{Level})">Wizard</option>
 													<option value="(@{bard_spell_bonus} + @{Level})">Bard</option>
 													<option value="(@{gnome_spell_bonus} + @{TrickDie})">Gnome</option>
-													<option value="(@{paladin_spell_bonus} + @{Level})">Paladin</option>
-													<option value="(@{dwarfpriest_spell_bonus} + @{Level})">Dwarf Priest</option>
 													<option value="(@{elfrogue_spell_bonus} + @{Level})">Elf Rogue</option>
 												</select>
 											</div>
@@ -5760,7 +5753,7 @@
 												</select>
 											</div>
 					                        <div class="sheet-col-1-12 sheet-vert-bottom sheet-center">&nbsp;</div>
-											<div class="sheet-col-1-8 sheet-vert-middle sheet-center"><button type="roll" class="sheet-roll" name="roll_Spellcheck" value="@{character_name} gets a Spell Check of [[@{SpellcheckDie} + [[@{SpellUser_bonus}]] + @{SpellCastLuckyRoll} + (?{Amount of Spellburn|0}) [Spellburn]]] for @{spellname}.">Spell Check</button></div>
+											<div class="sheet-col-1-8 sheet-vert-middle sheet-center"><button type="roll" class="sheet-roll" name="roll_Spellcheck" value="@{character_name} gets a Spell Check of [[@{SpellcheckDie} + [[@{SpellUser_bonus}]] + @{SpellCastLuckyRoll} + (?{Amount of Spellburn|0}) [Spellburn]]] - @{ArmorCheck} [Armor Check Penalty] for @{spellname}.">Spell Check</button></div>
 
 											<div class="sheet-col-1-8 sheet-center">
 												<input type="hidden" name="attr_SpellFumbleCheck" value="[[[[@{LCK}]] * (-1)]]" disabled="true"/>
@@ -5957,14 +5950,11 @@
 											<div class="sheet-col-1-5 sheet-offset-1-10 sheet-center">&nbsp;</div>
 											<div class="sheet-col-1-6" title="Pick the class that is using the spell for correct bonus">
 												<select name="attr_SpellUser_bonus">
-													<option value="0">Choose Spellcasting Class...</option>
-													<option value="(@{cleric_spell_bonus} + @{Level})">Cleric</option>
+													<option value="0">Choose Arcane Spellcasting Class...</option>
 													<option value="(@{elf_spell_bonus} + @{Level})">Elf Fighter/Mage</option>
 													<option value="(@{wizard_spell_bonus} + @{Level})">Wizard</option>
 													<option value="(@{bard_spell_bonus} + @{Level})">Bard</option>
 													<option value="(@{gnome_spell_bonus} + @{TrickDie})">Gnome</option>
-													<option value="(@{paladin_spell_bonus} + @{Level})">Paladin</option>
-													<option value="(@{dwarfpriest_spell_bonus} + @{Level})">Dwarf Priest</option>
 													<option value="(@{elfrogue_spell_bonus} + @{Level})">Elf Rogue</option>
 												</select>
 											</div>
@@ -5988,7 +5978,7 @@
 												</select>
 											</div>
 					                        <div class="sheet-col-1-12 sheet-vert-bottom sheet-center">&nbsp;</div>
-											<div class="sheet-col-1-8 sheet-vert-middle sheet-center"><button type="roll" class="sheet-roll" name="roll_Spellcheck" value="@{character_name} gets a Spell Check of [[@{SpellcheckDie} + [[@{SpellUser_bonus}]] + @{SpellCastLuckyRoll} + (?{Amount of Spellburn|0}) [Spellburn]]] for @{spellname}.">Spell Check</button></div>
+											<div class="sheet-col-1-8 sheet-vert-middle sheet-center"><button type="roll" class="sheet-roll" name="roll_Spellcheck" value="@{character_name} gets a Spell Check of [[@{SpellcheckDie} + [[@{SpellUser_bonus}]] + @{SpellCastLuckyRoll} + (?{Amount of Spellburn|0}) [Spellburn]]] - @{ArmorCheck} [Armor Check Penalty] for @{spellname}.">Spell Check</button></div>
 
 											<div class="sheet-col-1-8 sheet-center">
 												<input type="hidden" name="attr_SpellFumbleCheck" value="[[[[@{LCK}]] * (-1)]]" disabled="true"/>
@@ -6187,11 +6177,11 @@
 										<div class="sheet-col-1-5 sheet-offset-1-10 sheet-center">&nbsp;</div>
 										<div class="sheet-col-1-6" title="Pick the class that is using the spell for correct bonus">
 											<select name="attr_SpellUser_bonus">
-												<option value="0">Choose Spellcasting Class...</option>
-												<option value="(@{cleric_spell_bonus} + @{Level})">Cleric</option>
+												<option value="0">Choose Arcane Spellcasting Class...</option>
 												<option value="(@{elf_spell_bonus} + @{Level})">Elf Fighter/Mage</option>
 												<option value="(@{wizard_spell_bonus} + @{Level})">Wizard</option>
-												<option value="(@{dwarfpriest_spell_bonus} + @{Level})">Dwarf Priest</option>
+												<option value="(@{bard_spell_bonus} + @{Level})">Bard</option>
+												<option value="(@{gnome_spell_bonus} + @{TrickDie})">Gnome</option>
 												<option value="(@{elfrogue_spell_bonus} + @{Level})">Elf Rogue</option>
 											</select>
 										</div>
@@ -6215,7 +6205,7 @@
 											</select>
 										</div>
 				                        <div class="sheet-col-1-12 sheet-vert-bottom sheet-center">&nbsp;</div>
-										<div class="sheet-col-1-8 sheet-vert-middle sheet-center"><button type="roll" class="sheet-roll" name="roll_Spellcheck" value="@{character_name} gets a Spell Check of [[@{SpellcheckDie} + [[@{SpellUser_bonus}]] + @{SpellCastLuckyRoll} + (?{Amount of Spellburn|0}) [Spellburn]]] for @{spellname}.">Spell Check</button></div>
+										<div class="sheet-col-1-8 sheet-vert-middle sheet-center"><button type="roll" class="sheet-roll" name="roll_Spellcheck" value="@{character_name} gets a Spell Check of [[@{SpellcheckDie} + [[@{SpellUser_bonus}]] + @{SpellCastLuckyRoll} + (?{Amount of Spellburn|0}) [Spellburn]]] - @{ArmorCheck} [Armor Check Penalty] for @{spellname}.">Spell Check</button></div>
 
 										<div class="sheet-col-1-8 sheet-center">
 											<input type="hidden" name="attr_SpellFumbleCheck" value="[[[[@{LCK}]] * (-1)]]" disabled="true"/>
@@ -6336,7 +6326,7 @@
 									<div class="sheet-col-1 sheet-vert-bottom sheet-center sheet-small-label">Level 1</div>
 								</div>
 								
-								<!-- BEGIN spellbook 1 row -->	
+								<!-- BEGIN DIVINE spellbook 1 row -->	
 									<fieldset class="repeating_Divinespellbooklevel1">
 									<div class="sheet-margin-bottom sheet-padr sheet-padl">
 										<div class="sheet-row">