diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css
index d4aa3dc27f..90f228871e 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.css	
@@ -2509,6 +2509,7 @@ input[disabled].sheet-passive-skill-score {
 .sheet-rolltemplate-whfrp2e .sheet-rt-value {
     display:inline-block;
 	box-sizing: border-box;
+	padding-left: 3px
 }
 .sheet-rolltemplate-whfrp2e .sheet-main-content .sheet-row:not(:first-child) {
 	margin-top: 2px;
diff --git a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html
index be005a7cbc..a641fcd8fb 100644
--- a/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
+++ b/Warhammer 4e Character Sheet/Warhammer 4e Character Sheet.html	
@@ -417,42 +417,42 @@
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_AmputationTest" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[0]]}} {{title=^{AMPUTATION}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{amputationroll=true}} {{test=[[@{roll_rule}]]}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]]}kl1]])+@{Endurance}+?{@{translation_modifier}|0}]]}}  {{SLmod=[[?{SL Modifier|0}]]}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_AmputationTest" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{title=^{AMPUTATION}}} {{character_name=@{character_name}}} {{attacktype=^{CRITICAL}}} {{amputationroll=true}} {{test=[[@{roll_rule}]]}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]]}kl1]])+@{Endurance}+?{@{translation_modifier}|0}]]}}  {{SLmod=[[?{SL Modifier|0}]]}}">
 						<span data-i18n="AMPUTATION">Amputation</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Endurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}}  {{target=[[(@{ConditionMod})+@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Endurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}}  {{target=[[(@{ConditionMod})+@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=[[@{Endurance_mod1}]]}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}}">
 						<span data-i18n="ENDURANCE">Endurance</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Intuition" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}}  {{target=[[(@{ConditionMod})+@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=@{Intuition_mod1}}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Intuition" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{INTUITION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}}  {{target=[[(@{ConditionMod})+@{IntuitionChar}+@{IntuitionAdv}+@{IntuitionMisc}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Intuition_modtype1}]]}} {{mod1=[[@{Intuition_mod1}]]}} {{mod2type=[[@{Intuition_modtype2}]]}} {{mod2=@{Intuition_mod2}}} {{mod3type=[[@{Intuition_modtype3}]]}} {{mod3=@{Intuition_mod3}}}">
 						<span style="white-space: pre;" data-i18n="INTUITION">Intuition</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Perception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{target=[[(@{ConditionMod})+@{Perception}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=@{Perception_mod1}}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Perception" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{title=^{PERCEPTION}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{target=[[(@{ConditionMod})+@{Perception}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Perception_modtype1}]]}} {{mod1=[[@{Perception_mod1}]]}} {{mod2type=[[@{Perception_modtype2}]]}} {{mod2=@{Perception_mod2}}} {{mod3type=[[@{Perception_modtype3}]]}} {{mod3=@{Perception_mod3}}}">
 						<span data-i18n="PERCEPTION">Perception</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Cool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{target=[[(@{ConditionMod})+@{CoolChar}+@{CoolAdv}+@{CoolMisc}+(@{Advantage}*10)+?{Modifier (Adv. already added)|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=@{Cool_mod1}}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Cool" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{COOL}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{target=[[(@{ConditionMod})+@{CoolChar}+@{CoolAdv}+@{CoolMisc}+(@{Advantage}*10)+?{Modifier (Adv. already added)|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Cool_modtype1}]]}} {{mod1=[[@{Cool_mod1}]]}} {{mod2type=[[@{Cool_modtype2}]]}} {{mod2=@{Cool_mod2}}} {{mod3type=[[@{Cool_modtype3}]]}} {{mod3=@{Cool_mod3}}}">
 						<span data-i18n="COOL">Cool</span>
 					</button>
 				</div>
 			</div>
 			<div class="sheet-col-1-9 sheet-center">
 				<div class="sheet-col-1 sheet-center">
-					<button type="roll" class="sheet-combat-actions-np" name="roll_Dodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]]}kl1]])+@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}+(@{Advantage}*10)+?{Modifier (Adv. already added)|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=@{Dodge_mod1}}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}}">
+					<button type="roll" class="sheet-combat-actions-np" name="roll_Dodge" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{Modifier (Adv. already added)|0}]]}} {{title=^{DODGE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{advantage=[[@{AdvantageDisplay}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[@{ProneMod}]]}} {{entangled=[[@{EntangledMod}]]}} {{blinded=[[@{BlindedMod}]]}} {{target=[[([[{[[@{ConditionMod}]],[[@{ConditionMoveMod}]],[[@{ConditionSeeMod}]]}kl1]])+@{DodgeChar}+@{DodgeAdv}+@{DodgeMisc}+(@{Advantage}*10)+?{Modifier (Adv. already added)|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Dodge_modtype1}]]}} {{mod1=[[@{Dodge_mod1}]]}} {{mod2type=[[@{Dodge_modtype2}]]}} {{mod2=@{Dodge_mod2}}} {{mod3type=[[@{Dodge_modtype3}]]}} {{mod3=@{Dodge_mod3}}}">
 						<span data-i18n="DODGE">Dodge</span>
 					</button>
 				</div>
@@ -11388,7 +11388,7 @@
 							<input class="sheet-center" type="number" name="attr_Endurance" value="@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}" disabled="true" />
 						</div>
 						<div class="sheet-col-7-100 sheet-center sheet-pad-r-sm sheet-vert-middle">
-							<button type="roll" class="sheet-roll" name="roll_Endurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{unconscious=[[@{UnconsciousMod}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[(@{ConditionMod})+@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}}"></button>
+							<button type="roll" class="sheet-roll" name="roll_Endurance" value="@{Whisper} &{template:whfrp2e} {{modvalue=[[?{@{translation_modifier}|0}]]}} {{fatigued=[[@{FatiguedMod}]]}} {{broken=[[@{BrokenMod}]]}} {{stuned=[[@{StunedMod}]]}} {{poisoned=[[@{PoisonedMod}]]}} {{prone=[[0]]}} {{entangled=[[0]]}} {{blinded=[[0]]}} {{title=^{ENDURANCE}}} {{skill=^{BASIC-SKILL}}} {{character_name=@{character_name}}} {{target=[[(@{ConditionMod})+@{EnduranceChar}+@{EnduranceAdv}+@{EnduranceMisc}+?{@{translation_modifier}|0}]]}} {{skilltest=true}} {{SLmod=[[?{SL Modifier|0}]]}} {{test=[[@{roll_rule}]]}} {{mod1type=[[@{Endurance_modtype1}]]}} {{mod1=@{Endurance_mod1}}} {{mod2type=[[@{Endurance_modtype2}]]}} {{mod2=@{Endurance_mod2}}} {{mod3type=[[@{Endurance_modtype3}]]}} {{mod3=@{Endurance_mod3}}}"></button>
 						</div>
 						
               <label class="sheet-col-1-14 talsetshow-check">
@@ -17932,16 +17932,16 @@
 				</div>
 				<fieldset class="repeating_Talents">
 					<div class="sheet-row">
-						<div class="sheet-col-2-11 sheet-pad-r-sm sheet-vert-top">
+						<div class="sheet-col-2-11 sheet-pad-r-sm sheet-vert-top" style="height: 20px">
 							<input type="text" name="attr_TalentName" />
 						</div>
-						<div class="sheet-col-1-6 sheet-pad-r-sm sheet-vert-top">
+						<div class="sheet-col-1-6 sheet-pad-r-sm sheet-vert-top" style="height: 20px">
 							<input type="text" name="attr_TalentTest" />
 						</div>
-						<div class="sheet-col-3-10 sheet-pad-r-sm sheet-vert-top">
-							<textarea class="sheet-xs-textarea-talents" type="text" name="attr_TalentDesc"></textarea>
+						<div class="sheet-col-3-10 sheet-pad-r-sm sheet-vert-top" style="height: 20px">
+							<textarea class="sheet-xs-textarea-talents" type="text" style="height: 20px" name="attr_TalentDesc"></textarea>
 						</div>
-						<div class="sheet-col-1-13 sheet-center sheet-pad-r-sm sheet-vert-top" style="margin-top:1px">
+						<div class="sheet-col-1-13 sheet-center sheet-pad-r-sm sheet-vert-top">
 							<select class="sheet-select-no-arrow-center" name="attr_TalentChar">
 								<option value="1" data-i18n="NONE">None</option>
 								<option value="@{WeaponSkillBonus}" data-i18n="ABBREVIATE-WEAPON-SKILL">WS</option>
@@ -24392,7 +24392,7 @@
 										{{#spelldescription}}
 										<div class="sheet-row">
 											<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-key-wide" data-i18n="SPELL-DESCRIPTION">Spell Description</div>
-											<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-value" style="padding-left: 5px">{{spelldescription}}</div>
+											<div class="sheet-col-1 sheet-pad-l-md sheet-pad-r-md sheet-rt-value">{{spelldescription}}</div>
 										</div>
 										{{/spelldescription}}