diff --git a/Eclipse Phase V2/Eclipse Phase V2.css b/Eclipse Phase V2/Eclipse Phase V2.css
index 9227fd9f51..f8eed280a9 100644
--- a/Eclipse Phase V2/Eclipse Phase V2.css	
+++ b/Eclipse Phase V2/Eclipse Phase V2.css	
@@ -274,6 +274,15 @@ button[type=roll].sheet-apt-check
 {
 	margin:0px;
 	padding:0px;
+	margin-left:-1.7px;
+}
+
+button[type=roll].sheet-apt-check-muse-sav
+{
+	margin:0px;
+	padding:0px;
+	margin-left:-3px;
+	margin-right:0px !important
 }
 
 button[type=roll] input
@@ -309,7 +318,7 @@ button[type=roll] input
 div.sheet-block-title,
 span.sheet-block-title
 {
-	margin-bottom:-2px;
+	margin-bottom:-6px;
 	font-size:18px;
 	text-transform:uppercase;
 	color:rgb(0, 124, 151);
@@ -460,6 +469,7 @@ div.sheet-apt-title
 	text-transform:uppercase !important;
 	font-weight:bold !important;
 	font-size:13px !important;
+	white-space:normal;
 }
 
 input.sheet-apt-title,
@@ -467,6 +477,7 @@ button.sheet-apt-title
 {
 	margin-right:10px !important;
 	text-align:center;
+	margin-left:-0.5px;
 }
 
 .sheet-margin-col
@@ -492,7 +503,7 @@ input.sheet-spe-skills
 
 input.sheet-spe-skills-muse
 {
-	width:380px;
+	width:379px;
 }
 
 div.sheet-name-skills,
@@ -530,7 +541,7 @@ button[type=roll].sheet-skills-btn::before
 
 button.sheet-skills-btn
 {
-	width:130px;
+	width:124px;
 	height:28px;
 	text-align:left;
 	padding-right:0px !important;
@@ -749,6 +760,7 @@ input.sheet-M4Hidden:checked ~ div.sheet-M4Hidden
     line-height: 1.6em;
     font-size: 1.2em;
     font-weight: bold;
+	text-align:center;
 }
 
 .sheet-rolltemplate-EPcombat a[href^="!"], .sheet-rolltemplate-EPcombat a[href^="~"] {
diff --git a/Eclipse Phase V2/Eclipse Phase V2.html b/Eclipse Phase V2/Eclipse Phase V2.html
index 0d5e69bc74..0a03ea09f8 100644
--- a/Eclipse Phase V2/Eclipse Phase V2.html	
+++ b/Eclipse Phase V2/Eclipse Phase V2.html	
@@ -60,8 +60,8 @@
 <div class="sheet-hidden sheet-tab1Show" style="width:820px;">
 	<div style="width:759px;margin:auto;">
 		<div style="width:710px;" class="sheet-first-row">
-			<div style="width:690px;" class="block-title" data-i18n="aptitudes">Aptitudes</div>
-			<div style="width:690px;" class="block">
+			<div style="width:692px;" class="block-title" data-i18n="aptitudes">Aptitudes</div>
+			<div style="width:692px;" class="block">
 				<div style="display:inline-block;">
 					<div class="sheet-line">
 						<input type="checkbox" name="attr_cognition-expand" style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"><span style="float:left;margin-right:0;margin-left:-15px;" class="sheet-option sheet-expand"></span>
@@ -285,26 +285,26 @@
 							</div>
 						</div>
 						<div class="sheet-line">
-							<div style="width:100px;margin-right:10px;" class="sheet-column">
-								<button type="roll" name="roll_initiative" style="width:100px;" class="default-btn center" value="
+							<div style="width:94px;margin-right:10px;" class="sheet-column">
+								<button type="roll" name="roll_initiative" style="width:94px;" class="default-btn center" value="
 								@{gm} &{template:EPdefault} {{name=^{initiative}}} {{subname=^{score}}} {{roll=[[1D6+[[@{initiative}]] ]]}} {{title-roll=^{roll}}}">
 									<div class="apt-title center" data-i18n="initiative">Initiative</div>
 								</button>
 							</div>
-							<div style="width:100px;margin-right:10px;" class="sheet-column">
-								<button type="roll" name="roll_basic-perception" style="width:100px;" class="default-btn center" value="
+							<div style="width:94px;margin-right:10px;" class="sheet-column">
+								<button type="roll" name="roll_basic-perception" style="width:94px;" class="default-btn center" value="
 								@{gm} &{template:EPdefault} {{name=^{basic perception}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{basicPerception}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center" data-i18n="basic perception">Basic Perception</div>
 								</button>
 							</div>
-							<div style="width:100px;margin-right:10px;" class="sheet-column">
-								<button type="roll" name="roll_combat-fray-melee" style="width:100px;" class="default-btn center" value="
+							<div style="width:94px;margin-right:10px;" class="sheet-column">
+								<button type="roll" name="roll_combat-fray-melee" style="width:94px;" class="default-btn center" value="
 								@{gm} &{template:EPdefault} {{name=^{fray vs melee}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{fray}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center" data-i18n="fray vs melee">Fray VS Melee</div>
 								</button>
 							</div>
-							<div style="width:100px;" class="sheet-column">
-								<button type="roll" name="roll_combat-fray-ranged" style="width:100px;" class="default-btn center" value="
+							<div style="width:94px;" class="sheet-column">
+								<button type="roll" name="roll_combat-fray-ranged" style="width:94px;" class="default-btn center" value="
 								@{gm} &{template:EPdefault} {{name=^{fray vs ranged}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{frayRanged}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center" data-i18n="fray vs ranged">Fray VS Ranged</div>
 								</button>
@@ -402,7 +402,7 @@
 					<input type="number" name="attr_total-know" class="center" style="width:65px;border-color:#ccc" value="(@{apt-know}+@{rank-know}+@{temp-know})" disabled />
 					<input type="number" name="attr_rank-know" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-know" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-know" style="width:65px;margin:0px;">
+					<select name="attr_apt-know" style="width:65px;margin:0px;vertical-align:middle;">
 						<option value="@{cognition}" data-i18n="cognition short" selected>COG</option>
 						<option value="@{intuition}" data-i18n="intuition short">INT</option>
 					</select>
@@ -418,7 +418,7 @@
 						<input type="number" name="attr_total-repeating-know" class="center" style="width:65px;border-color:#ccc" value="(@{apt-repeating-know}+@{rank-repeating-know}+@{temp-repeating-know})" disabled />
 						<input type="number" name="attr_rank-repeating-know" class="center" style="width:65px;" value="0" />
 						<input type="number" name="attr_temp-repeating-know" class="center" style="width:65px;" value="0" />
-						<select name="attr_apt-repeating-know" style="width:65px;margin:0px;">
+						<select name="attr_apt-repeating-know" style="width:65px;margin:0px;vertical-align:middle;">
 							<option value="@{cognition}" data-i18n="cognition short" selected>COG</option>
 							<option value="@{intuition}" data-i18n="intuition short">INT</option>
 						</select>
@@ -448,7 +448,7 @@
 					<input type="number" name="attr_total-athletics" class="center" style="width:65px;border-color:#ccc" value="(@{somatics}+@{rank-athletics}+@{temp-athletics})" disabled />
 					<input type="number" name="attr_rank-athletics" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-athletics" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-athletics" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-athletics" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{somatics}" data-i18n="somatics short" selected>SOM</option>
 					</select>
 				</div>
@@ -462,7 +462,7 @@
 					<input type="number" name="attr_total-deceive" class="center" style="width:65px;border-color:#ccc" value="(@{savvy}+@{rank-deceive}+@{temp-deceive})" disabled />
 					<input type="number" name="attr_rank-deceive" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-deceive" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-deceive" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-deceive" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{savvy}" data-i18n="savvy short" selected>SAV</option>
 					</select>
 				</div>
@@ -486,7 +486,7 @@
 						<input type="number" name="attr_total-exotic-skill" class="center" style="width:65px;border-color:#ccc" value="(@{apt-exotic-skill}+@{rank-exotic-skill}+@{temp-exotic-skill})" disabled />
 						<input type="number" name="attr_rank-exotic-skill" class="center" style="width:65px;" value="0" />
 						<input type="number" name="attr_temp-exotic-skill" class="center" style="width:65px;" value="0" />
-						<select name="attr_apt-exotic-skill" style="width:65px;margin:0px;">
+						<select name="attr_apt-exotic-skill" style="width:65px;margin:0px;vertical-align:middle;">
 							<option value="0" selected></option>
 							<option value="@{cognition}" data-i18n="cognition short">COG</option>
 							<option value="@{intuition}" data-i18n="intuition short">INT</option>
@@ -502,13 +502,13 @@
 							@{gm} &{template:EPdefault} {{name=^{exotic skill}}} {{subname=^{score}}} {{subskill=@{spe-repeating-exotic-skill}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-repeating-exotic-skill}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 								<div class="name-skills" data-i18n="exotic skill">Exotic Skill</div>
 							</button>
-							<input type="checkbox" name="attr_apt-exotic-skill" class="carChoice iconNoneShow" value="0"/>
-							<input type="checkbox" name="attr_apt-exotic-skill" class="carChoice iconInsightShow" value="@{cognition}"/>
-							<input type="checkbox" name="attr_apt-exotic-skill" class="carChoice iconInsightShow" value="@{intuition}"/>
-							<input type="checkbox" name="attr_apt-exotic-skill" class="carChoice iconMoxieShow" value="@{savvy}"/>
-							<input type="checkbox" name="attr_apt-exotic-skill" class="carChoice iconMoxieShow" value="@{willpower}"/>
-							<input type="checkbox" name="attr_apt-exotic-skill" class="carChoice iconVigorShow" value="@{reflexes}"/>
-							<input type="checkbox" name="attr_apt-exotic-skill" class="carChoice iconVigorShow" value="@{somatics}"/>
+							<input type="checkbox" name="attr_apt-repeating-exotic-skill" class="carChoice iconNoneShow" value="0"/>
+							<input type="checkbox" name="attr_apt-repeating-exotic-skill" class="carChoice iconInsightShow" value="@{cognition}"/>
+							<input type="checkbox" name="attr_apt-repeating-exotic-skill" class="carChoice iconInsightShow" value="@{intuition}"/>
+							<input type="checkbox" name="attr_apt-repeating-exotic-skill" class="carChoice iconMoxieShow" value="@{savvy}"/>
+							<input type="checkbox" name="attr_apt-repeating-exotic-skill" class="carChoice iconMoxieShow" value="@{willpower}"/>
+							<input type="checkbox" name="attr_apt-repeating-exotic-skill" class="carChoice iconVigorShow" value="@{reflexes}"/>
+							<input type="checkbox" name="attr_apt-repeating-exotic-skill" class="carChoice iconVigorShow" value="@{somatics}"/>
 							<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Eclipse%20Phase%20V2/images/Insight.png" data-i18n-title="insight" title="Insight" class="iconPools-skills iconInsight">
 							<img src="https://www.zupimages.net/up/18/14/qycu.png" data-i18n-title="moxie" title="Moxie" class="iconPools-skills iconMoxie">
 							<img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Eclipse%20Phase%20V2/images/Vigor.png" data-i18n-title="vigor" title="Vigor" class="iconPools-skills iconVigor">
@@ -516,7 +516,7 @@
 							<input type="number" name="attr_total-repeating-exotic-skill" class="center" style="width:65px;border-color:#ccc" value="(@{apt-repeating-exotic-skill}+@{rank-repeating-exotic-skill}+@{temp-repeating-exotic-skill})" disabled />
 							<input type="number" name="attr_rank-repeating-exotic-skill" class="center" style="width:65px;" value="0" />
 							<input type="number" name="attr_temp-repeating-exotic-skill" class="center" style="width:65px;" value="0" />
-							<select name="attr_apt-repeating-exotic-skill" style="width:65px;margin:0px;">
+							<select name="attr_apt-repeating-exotic-skill" style="width:65px;margin:0px;vertical-align:middle;">
 								<option value="0" selected></option>
 								<option value="@{cognition}" data-i18n="cognition short">COG</option>
 								<option value="@{intuition}" data-i18n="intuition short">INT</option>
@@ -538,7 +538,7 @@
 					<input type="number" name="attr_total-fray" class="center" style="width:65px;border-color:#ccc" value="((@{reflexes}*2)+@{rank-fray}+@{temp-fray})" disabled />
 					<input type="number" name="attr_rank-fray" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-fray" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-fray" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-fray" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{reflexes}" data-i18n="reflexes short" selected>REF</option>
 					</select>
 				</div>
@@ -552,7 +552,7 @@
 					<input type="number" name="attr_total-free-fall" class="center" style="width:65px;border-color:#ccc" value="(@{reflexes}+@{rank-free-fall}+@{temp-free-fall})" disabled />
 					<input type="number" name="attr_rank-free-fall" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-free-fall" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-free-fall" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-free-fall" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{reflexes}" data-i18n="reflexes short" selected>REF</option>
 					</select>
 				</div>
@@ -566,7 +566,7 @@
 					<input type="number" name="attr_total-guns" class="center" style="width:65px;border-color:#ccc" value="(@{reflexes}+@{rank-guns}+@{temp-guns})" disabled />
 					<input type="number" name="attr_rank-guns" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-guns" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-guns" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-guns" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{reflexes}" data-i18n="reflexes short" selected>REF</option>
 					</select>
 				</div>
@@ -581,7 +581,7 @@
 						<input type="number" name="attr_total-hardware" class="center" style="width:65px;border-color:#ccc" value="(@{cognition}+@{rank-hardware}+@{temp-hardware})" disabled />
 						<input type="number" name="attr_rank-hardware" class="center" style="width:65px;" value="0" />
 						<input type="number" name="attr_temp-hardware" class="center" style="width:65px;" value="0" />
-						<select name="attr_apt-hardware" style="width:65px;margin:0px;" disabled>
+						<select name="attr_apt-hardware" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 							<option value="@{cognition}" data-i18n="cognition short" selected>COG</option>
 						</select>
 					</div>
@@ -596,7 +596,7 @@
 							<input type="number" name="attr_total-repeating-hardware" class="center" style="width:65px;border-color:#ccc" value="(@{cognition}+@{rank-repeating-hardware}+@{temp-repeating-hardware})" disabled />
 							<input type="number" name="attr_rank-repeating-hardware" class="center" style="width:65px;" value="0" />
 							<input type="number" name="attr_temp-repeating-hardware" class="center" style="width:65px;" value="0" />
-							<select name="attr_apt-repeating-hardware" style="width:65px;margin:0px;" disabled>
+							<select name="attr_apt-repeating-hardware" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 								<option value="@{cognition}" data-i18n="cognition short" selected>COG</option>
 							</select>
 						</div>
@@ -612,7 +612,7 @@
 					<input type="number" name="attr_total-infiltrate" class="center" style="width:65px;border-color:#ccc" value="(@{reflexes}+@{rank-infiltrate}+@{temp-infiltrate})" disabled />
 					<input type="number" name="attr_rank-infiltrate" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-infiltrate" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-infiltrate" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-infiltrate" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{reflexes}" data-i18n="reflexes short" selected>REF</option>
 					</select>
 				</div>
@@ -626,7 +626,7 @@
 					<input type="number" name="attr_total-infosec" class="center" style="width:65px;border-color:#ccc" value="(@{cognition}+@{rank-infosec}+@{temp-infosec})" disabled />
 					<input type="number" name="attr_rank-infosec" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-infosec" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-infosec" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-infosec" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{cognition}" data-i18n="cognition short" selected>COG</option>
 					</select>
 				</div>
@@ -640,7 +640,7 @@
 					<input type="number" name="attr_total-interface" class="center" style="width:65px;border-color:#ccc" value="(@{cognition}+@{rank-interface}+@{temp-interface})" disabled />
 					<input type="number" name="attr_rank-interface" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-interface" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-interface" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-interface" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{cognition}" data-i18n="cognition short" selected>COG</option>
 					</select>
 				</div>
@@ -654,7 +654,7 @@
 					<input type="number" name="attr_total-kinesics" class="center" style="width:65px;border-color:#ccc" value="(@{savvy}+@{rank-kinesics}+@{temp-kinesics})" disabled />
 					<input type="number" name="attr_rank-kinesics" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-kinesics" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-kinesics" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-kinesics" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{savvy}" data-i18n="savvy short" selected>SAV</option>
 					</select>
 				</div>
@@ -669,7 +669,7 @@
 						<input type="number" name="attr_total-medicine" class="center" style="width:65px;border-color:#ccc" value="(@{cognition}+@{rank-medicine}+@{temp-medicine})" disabled />
 						<input type="number" name="attr_rank-medicine" class="center" style="width:65px;" value="0" />
 						<input type="number" name="attr_temp-medicine" class="center" style="width:65px;" value="0" />
-						<select name="attr_apt-medicine" style="width:65px;margin:0px;" disabled>
+						<select name="attr_apt-medicine" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 							<option value="@{cognition}" data-i18n="cognition short" selected>COG</option>
 						</select>
 					</div>
@@ -684,7 +684,7 @@
 							<input type="number" name="attr_total-repeating-medicine" class="center" style="width:65px;border-color:#ccc" value="(@{cognition}+@{rank-repeating-medicine}+@{temp-repeating-medicine})" disabled />
 							<input type="number" name="attr_rank-repeating-medicine" class="center" style="width:65px;" value="0" />
 							<input type="number" name="attr_temp-repeating-medicine" class="center" style="width:65px;" value="0" />
-							<select name="attr_apt-repeating-medicine" style="width:65px;margin:0px;" disabled>
+							<select name="attr_apt-repeating-medicine" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 								<option value="@{cognition}" data-i18n="cognition short" selected>COG</option>
 							</select>
 						</div>
@@ -700,7 +700,7 @@
 					<input type="number" name="attr_total-melee" class="center" style="width:65px;border-color:#ccc" value="(@{somatics}+@{rank-melee}+@{temp-melee})" disabled />
 					<input type="number" name="attr_rank-melee" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-melee" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-melee" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-melee" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{somatics}" data-i18n="somatics short" selected>SOM</option>
 					</select>
 				</div>
@@ -714,7 +714,7 @@
 					<input type="number" name="attr_total-perceive" class="center" style="width:65px;border-color:#ccc" value="((@{intuition}*2)+@{rank-perceive}+@{temp-perceive})" disabled />
 					<input type="number" name="attr_rank-perceive" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-perceive" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-perceive" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-perceive" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{intuition}" data-i18n="intuition short" selected>INT</option>
 					</select>
 				</div>
@@ -728,7 +728,7 @@
 					<input type="number" name="attr_total-persuade" class="center" style="width:65px;border-color:#ccc" value="(@{savvy}+@{rank-persuade}+@{temp-persuade})" disabled />
 					<input type="number" name="attr_rank-persuade" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-persuade" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-persuade" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-persuade" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{savvy}" data-i18n="savvy short" selected>SAV</option>
 					</select>
 				</div>
@@ -743,7 +743,7 @@
 						<input type="number" name="attr_total-pilot" class="center" style="width:65px;border-color:#ccc" value="(@{reflexes}+@{rank-pilot}+@{temp-pilot})" disabled />
 						<input type="number" name="attr_rank-pilot" class="center" style="width:65px;" value="0" />
 						<input type="number" name="attr_temp-pilot" class="center" style="width:65px;" value="0" />
-						<select name="attr_apt-pilot" style="width:65px;margin:0px;" disabled>
+						<select name="attr_apt-pilot" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 							<option value="@{reflexes}" data-i18n="reflexes short" selected>REF</option>
 						</select>
 					</div>
@@ -758,7 +758,7 @@
 							<input type="number" name="attr_total-repeating-pilot" class="center" style="width:65px;border-color:#ccc" value="(@{reflexes}+@{rank-repeating-pilot}+@{temp-repeating-pilot})" disabled />
 							<input type="number" name="attr_rank-repeating-pilot" class="center" style="width:65px;" value="0" />
 							<input type="number" name="attr_temp-repeating-pilot" class="center" style="width:65px;" value="0" />
-							<select name="attr_apt-repeating-pilot" style="width:65px;margin:0px;" disabled>
+							<select name="attr_apt-repeating-pilot" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 								<option value="@{reflexes}" data-i18n="reflexes short" selected>REF</option>
 							</select>
 						</div>
@@ -774,7 +774,7 @@
 					<input type="number" name="attr_total-program" class="center" style="width:65px;border-color:#ccc" value="(@{cognition}+@{rank-program}+@{temp-program})" disabled />
 					<input type="number" name="attr_rank-program" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-program" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-program" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-program" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{cognition}" data-i18n="cognition short" selected>COG</option>
 					</select>
 				</div>
@@ -788,7 +788,7 @@
 					<input type="number" name="attr_total-provoke" class="center" style="width:65px;border-color:#ccc" value="(@{savvy}+@{rank-provoke}+@{temp-provoke})" disabled />
 					<input type="number" name="attr_rank-provoke" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-provoke" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-provoke" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-provoke" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{savvy}" data-i18n="savvy short" selected>SAV</option>
 					</select>
 				</div>
@@ -802,7 +802,7 @@
 					<input type="number" name="attr_total-psi" class="center" style="width:65px;border-color:#ccc" value="(@{willpower}+@{rank-psi}+@{temp-psi})" disabled />
 					<input type="number" name="attr_rank-psi" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-psi" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-psi" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-psi" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{willpower}" data-i18n="willpower short" selected>WIL</option>
 					</select>
 				</div>
@@ -816,7 +816,7 @@
 					<input type="number" name="attr_total-research" class="center" style="width:65px;border-color:#ccc" value="(@{intuition}+@{rank-research}+@{temp-research})" disabled />
 					<input type="number" name="attr_rank-research" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-research" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-research" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-research" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{intuition}" data-i18n="intuition short" selected>INT</option>
 					</select>
 				</div>
@@ -830,7 +830,7 @@
 					<input type="number" name="attr_total-survival" class="center" style="width:65px;border-color:#ccc" value="(@{intuition}+@{rank-survival}+@{temp-survival})" disabled />
 					<input type="number" name="attr_rank-survival" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-survival" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-survival" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-survival" style="width:65px;margin:0px;vertical-align:middle;" disabled>
 						<option value="@{intuition}" data-i18n="intuition short" selected>INT</option>
 					</select>
 				</div>
@@ -893,7 +893,7 @@
 						<fieldset class="repeating_weapon-ranged">
 							<input type="checkbox" name="attr_weapon-ranged-expand" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"><span class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"></span>
 							<div class="sheet-line sheet-expandHide" style="width:330px;">
-								<button type="roll" name="roll_ranged-weapon-btn" style="width:335px;" class="sheet-default-btn" value="
+								<button type="roll" name="roll_ranged-weapon-btn" style="width:327px;" class="sheet-default-btn" value="
 								@{gm} &{template:EPcombat} {{name=@{ranged-weapon-name}}} {{subname=^{score}}} @{weapon-ranged-firing-modes} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-guns}]]-[[@{malus}]]]]}} {{title-range=^{range}}} {{range=@{ranged-weapon-range}}} {{title-damage=^{damage}}} {{damage=[[@{ranged-weapon-dv}]]}} {{title-reload=^{reload}}} {{title-type-reload=^{Semi Auto / Burst Fire / Full Auto short}}} {{reload=@{ranged-weapon-reload}}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}} {{notes=@{ranged-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-ranged_superior-result-dmg)}}">
 									<span style="width:335px;" class="name-skills" name="attr_ranged-weapon-name"></span>
 								</button>
@@ -929,7 +929,7 @@
 						<fieldset class="repeating_weapon-melee">
 							<input type="checkbox" name="attr_weapon-melee-expand" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"><span class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"></span>
 							<div class="sheet-line sheet-expandHide" style="width:330px;">
-								<button type="roll" name="roll_melee-weapon-btn" style="width:335px;" class="sheet-default-btn" value="
+								<button type="roll" name="roll_melee-weapon-btn" style="width:327px;" class="sheet-default-btn" value="
 								@{gm} &{template:EPcombat} {{name=@{melee-weapon-name}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-melee}]]-[[@{malus}]]]]}} {{subname=^{score}}} {{title-damage=^{damage}}} {{damage=[[@{melee-weapon-dv}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}} {{notes=@{melee-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-melee_superior-result-dmg)}}">
 									<span style="width:335px;" class="name-skills" name="attr_melee-weapon-name"></span>
 								</button>
@@ -963,7 +963,7 @@
 						<fieldset class="repeating_weapon-seeker">
 							<input type="checkbox" name="attr_weapon-ranged-expand" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"><span class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"></span>
 							<div class="sheet-line sheet-expandHide" style="width:330px;">
-								<button type="roll" name="roll_seeker-weapon-btn" style="width:335px;" class="sheet-default-btn" value="
+								<button type="roll" name="roll_seeker-weapon-btn" style="width:327px;" class="sheet-default-btn" value="
 								@{gm} &{template:EPcombat} {{name=@{seeker-weapon-name}}} @{seeker-weapon-skill} {{roll=[[[[1D100-1]]]]}}  {{title-range=^{range}}} {{range=@{seeker-weapon-range}}} {{title-damage=^{damage}}} {{damage=[[@{seeker-weapon-dv}]]}} {{title-reload=^{reload}}} {{title-type-reload=^{Semi Auto / Burst Fire / Full Auto short}}} {{reload=@{seeker-weapon-reload}}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}} {{notes=@{seeker-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-seeker_superior-result-dmg)}}">
 									<span style="width:335px;" class="name-skills" name="attr_seeker-weapon-name"></span>
 								</button>
@@ -1084,14 +1084,14 @@
 					@{gm} &{template:EPdefault} {{name=^{muse}}} {{subname=^{reflexes}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{reflexesMuse}*3]]]]}} {{title-roll=^{roll}}}">
 						<div class="center apt-title" data-i18n="reflexes">Reflexes</div>
 					</button>
-					<button type="roll" name="roll_apt-sav-muse" style="width:100px;" class="apt-title apt-check" value="
+					<button type="roll" name="roll_apt-sav-muse" style="width:100px;" class="apt-title apt-check apt-check-muse-sav" value="
 					@{gm} &{template:EPdefault} {{name=^{muse}}} {{subname=^{savvy}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{savvyMuse}*3]]]]}} {{title-roll=^{roll}}}">
 						<div class="center apt-title" data-i18n="savvy">Savvy</div>
 					</button>
 				</div>
 				<div class="sheet-line center">
-					<input type="number" name="attr_somaticsMuse" class="sheet-lower-input apt-title" style="width:100px;" value="5" min="5">
-					<input type="number" name="attr_willpowerMuse" class="sheet-lower-input apt-title" style="width:100px;" value="5" min="5">
+					<input type="number" name="attr_somaticsMuse" class="sheet-lower-input apt-title" style="width:100px;margin-left: -2px;" value="5" min="5">
+					<input type="number" name="attr_willpowerMuse" class="sheet-lower-input apt-title" style="width:100px;margin-left: -2px;" value="5" min="5">
 				</div>
 				<div class="sheet-line center">
 					<button type="roll" name="roll_apt-som-muse" style="width:100px;" class="apt-title apt-check" value="
@@ -1127,7 +1127,7 @@
 					<input type="number" name="attr_total-muse-know" class="center" style="width:65px;border-color:#ccc" value="(@{apt-muse-know}+@{rank-muse-know}+@{temp-muse-know})" disabled />
 					<input type="number" name="attr_rank-muse-know" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-know" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-know" style="width:65px;margin:0px;">
+					<select name="attr_apt-muse-know" style="width:65px;margin:0px;vertical-align:middle">
 						<option value="@{cognitionMuse}" data-i18n="cognition short" selected>COG</option>
 						<option value="@{intuitionMuse}" data-i18n="intuition short">INT</option>
 					</select>
@@ -1142,7 +1142,7 @@
 						<input type="number" name="attr_total-muse-know-repeat" class="center" style="width:65px;border-color:#ccc" value="(@{apt-muse-know-repeat}+@{temp-muse-know-repeat}+@{rank-muse-know-repeat})" disabled />
 						<input type="number" name="attr_rank-muse-know-repeat" class="center" style="width:65px;" value="0" />
 						<input type="number" name="attr_temp-muse-know-repeat" class="center" style="width:65px;" value="0" />
-						<select name="attr_apt-muse-know-repeat" style="width:65px;margin:0px;">
+						<select name="attr_apt-muse-know-repeat" style="width:65px;margin:0px;vertical-align:middle">
 							<option value="@{cognitionMuse}" data-i18n="cognition short" selected>COG</option>
 							<option value="@{intuitionMuse}" data-i18n="intuition short">INT</option>
 						</select>
@@ -1171,7 +1171,7 @@
 					<input type="number" name="attr_total-muse-athletics" class="center" style="width:65px;border-color:#ccc" value="(@{somaticsMuse}+@{rank-muse-athletics}+@{temp-muse-athletics})" disabled />
 					<input type="number" name="attr_rank-muse-athletics" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-athletics" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-athletics" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-athletics" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{somaticsMuse}" data-i18n="somatics short" selected>SOM</option>
 					</select>
 				</div>
@@ -1184,7 +1184,7 @@
 					<input type="number" name="attr_total-muse-deceive" class="center" style="width:65px;border-color:#ccc" value="(@{savvyMuse}+@{rank-muse-deceive}+@{temp-muse-deceive})" disabled />
 					<input type="number" name="attr_rank-muse-deceive" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-deceive" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-deceive" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-deceive" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{savvyMuse}" data-i18n="savvy short" selected>SAV</option>
 					</select>
 				</div>
@@ -1198,7 +1198,7 @@
 						<input type="number" name="attr_total-muse-exotic-skill" class="center" style="width:65px;border-color:#ccc" value="(@{apt-muse-exotic-skill}+@{rank-muse-exotic-skill}+@{temp-muse-exotic-skill})" disabled />
 						<input type="number" name="attr_rank-muse-exotic-skill" class="center" style="width:65px;" value="0" />
 						<input type="number" name="attr_temp-muse-exotic-skill" class="center" style="width:65px;" value="0" />
-						<select name="attr_apt-muse-exotic-skill" style="width:65px;margin:0px;">
+						<select name="attr_apt-muse-exotic-skill" style="width:65px;margin:0px;vertical-align:middle">
 							<option value="0" selected></option>
 							<option value="@{cognitionMuse}" data-i18n="cognition short">COG</option>
 							<option value="@{intuitionMuse}" data-i18n="intuition short">INT</option>
@@ -1218,7 +1218,7 @@
 							<input type="number" name="attr_total-muse-exotic-skill-repeat" class="center" style="width:65px;border-color:#ccc" value="(@{apt-muse-exotic-skill-repeat}+@{rank-muse-exotic-skill-repeat}+@{temp-muse-exotic-skill-repeat})" disabled />
 							<input type="number" name="attr_rank-muse-exotic-skill-repeat" class="center" style="width:65px;" value="0" />
 							<input type="number" name="attr_temp-muse-exotic-skill-repeat" class="center" style="width:65px;" value="0" />
-							<select name="attr_apt-muse-exotic-skill-repeat" style="width:65px;margin:0px;">
+							<select name="attr_apt-muse-exotic-skill-repeat" style="width:65px;margin:0px;vertical-align:middle">
 								<option value="0" selected></option>
 								<option value="@{cognitionMuse}" data-i18n="cognition short">COG</option>
 								<option value="@{intuitionMuse}" data-i18n="intuition short">INT</option>
@@ -1239,7 +1239,7 @@
 					<input type="number" name="attr_total-muse-fray" class="center" style="width:65px;border-color:#ccc" value="((@{reflexesMuse}*2)+@{rank-muse-fray}+@{temp-muse-fray})" disabled />
 					<input type="number" name="attr_rank-muse-fray" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-fray" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-fray" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-fray" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{reflexesMuse}" data-i18n="reflexes short" selected>REF</option>
 					</select>
 				</div>
@@ -1252,7 +1252,7 @@
 					<input type="number" name="attr_total-muse-free-fall" class="center" style="width:65px;border-color:#ccc" value="(@{reflexesMuse}+@{rank-muse-free-fall}+@{temp-muse-free-fall})" disabled />
 					<input type="number" name="attr_rank-muse-free-fall" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-free-fall" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-free-fall" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-free-fall" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{reflexesMuse}" data-i18n="reflexes short" selected>REF</option>
 					</select>
 				</div>
@@ -1265,7 +1265,7 @@
 					<input type="number" name="attr_total-muse-guns" class="center" style="width:65px;border-color:#ccc" value="(@{reflexesMuse}+@{rank-muse-guns}+@{temp-muse-guns})" disabled />
 					<input type="number" name="attr_rank-muse-guns" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-guns" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-guns" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-guns" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{reflexesMuse}" data-i18n="reflexes short" selected>REF</option>
 					</select>
 				</div>
@@ -1279,7 +1279,7 @@
 						<input type="number" name="attr_total-muse-hardware" class="center" style="width:65px;border-color:#ccc" value="(@{cognitionMuse}+@{rank-muse-hardware}+@{temp-muse-hardware})" disabled />
 						<input type="number" name="attr_rank-muse-hardware" class="center" style="width:65px;" value="0" />
 						<input type="number" name="attr_temp-muse-hardware" class="center" style="width:65px;" value="0" />
-						<select name="attr_apt-muse-hardware" style="width:65px;margin:0px;" disabled>
+						<select name="attr_apt-muse-hardware" style="width:65px;margin:0px;vertical-align:middle" disabled>
 							<option value="@{cognitionMuse}" data-i18n="cognition short" selected>COG</option>
 						</select>
 					</div>
@@ -1293,7 +1293,7 @@
 							<input type="number" name="attr_total-muse-hardware-repeat" class="center" style="width:65px;border-color:#ccc" value="(@{cognitionMuse}+@{rank-muse-hardware-repeat}+@{temp-muse-hardware-repeat})" disabled />
 							<input type="number" name="attr_rank-muse-hardware-repeat" class="center" style="width:65px;" value="0" />
 							<input type="number" name="attr_temp-muse-hardware-repeat" class="center" style="width:65px;" value="0" />
-							<select name="attr_apt-muse-hardware-repeat" style="width:65px;margin:0px;" disabled>
+							<select name="attr_apt-muse-hardware-repeat" style="width:65px;margin:0px;vertical-align:middle" disabled>
 								<option value="@{cognitionMuse}" data-i18n="cognition short" selected>COG</option>
 							</select>
 						</div>
@@ -1308,7 +1308,7 @@
 					<input type="number" name="attr_total-muse-infiltrate" class="center" style="width:65px;border-color:#ccc" value="(@{reflexesMuse}+@{rank-muse-infiltrate}+@{temp-muse-infiltrate})" disabled />
 					<input type="number" name="attr_rank-muse-infiltrate" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-infiltrate" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-infiltrate" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-infiltrate" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{reflexesMuse}" data-i18n="reflexes short" selected>REF</option>
 					</select>
 				</div>
@@ -1321,7 +1321,7 @@
 					<input type="number" name="attr_total-muse-infosec" class="center" style="width:65px;border-color:#ccc" value="(@{cognitionMuse}+@{rank-muse-infosec}+@{temp-muse-infosec})" disabled />
 					<input type="number" name="attr_rank-muse-infosec" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-infosec" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-infosec" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-infosec" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{cognitionMuse}" data-i18n="cognition short" selected>COG</option>
 					</select>
 				</div>
@@ -1334,7 +1334,7 @@
 					<input type="number" name="attr_total-muse-interface" class="center" style="width:65px;border-color:#ccc" value="(@{cognitionMuse}+@{rank-muse-interface}+@{temp-muse-interface})" disabled />
 					<input type="number" name="attr_rank-muse-interface" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-interface" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-interface" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-interface" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{cognitionMuse}" data-i18n="cognition short" selected>COG</option>
 					</select>
 				</div>
@@ -1347,7 +1347,7 @@
 					<input type="number" name="attr_total-muse-kinesics" class="center" style="width:65px;border-color:#ccc" value="(@{savvyMuse}+@{rank-muse-kinesics}+@{temp-muse-kinesics})" disabled />
 					<input type="number" name="attr_rank-muse-kinesics" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-kinesics" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-kinesics" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-kinesics" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{savvyMuse}" data-i18n="savvy short" selected>SAV</option>
 					</select>
 				</div>
@@ -1361,7 +1361,7 @@
 						<input type="number" name="attr_total-muse-medicine" class="center" style="width:65px;border-color:#ccc" value="(@{cognitionMuse}+@{rank-muse-medicine}+@{temp-muse-medicine})" disabled />
 						<input type="number" name="attr_rank-muse-medicine" class="center" style="width:65px;" value="0" />
 						<input type="number" name="attr_temp-muse-medicine" class="center" style="width:65px;" value="0" />
-						<select name="attr_apt-muse-medicine" style="width:65px;margin:0px;" disabled>
+						<select name="attr_apt-muse-medicine" style="width:65px;margin:0px;vertical-align:middle" disabled>
 							<option value="@{cognitionMuse}" data-i18n="cognition short" selected>COG</option>
 						</select>
 					</div>
@@ -1375,7 +1375,7 @@
 							<input type="number" name="attr_total-muse-medicine-repeat" class="center" style="width:65px;border-color:#ccc" value="(@{cognitionMuse}+@{rank-muse-medicine-repeat}+@{temp-muse-medicine-repeat})" disabled />
 							<input type="number" name="attr_rank-muse-medicine-repeat" class="center" style="width:65px;" value="0" />
 							<input type="number" name="attr_temp-muse-medicine-repeat" class="center" style="width:65px;" value="0" />
-							<select name="attr_apt-muse-medicine-repeat" style="width:65px;margin:0px;" disabled>
+							<select name="attr_apt-muse-medicine-repeat" style="width:65px;margin:0px;vertical-align:middle" disabled>
 								<option value="@{cognitionMuse}" data-i18n="cognition short" selected>COG</option>
 							</select>
 						</div>
@@ -1390,7 +1390,7 @@
 					<input type="number" name="attr_total-muse-melee" class="center" style="width:65px;border-color:#ccc" value="(@{somaticsMuse}+@{rank-muse-melee}+@{temp-muse-melee})" disabled />
 					<input type="number" name="attr_rank-muse-melee" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-melee" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-melee" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-melee" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{somaticsMuse}" data-i18n="somatics short" selected>SOM</option>
 					</select>
 				</div>
@@ -1403,7 +1403,7 @@
 					<input type="number" name="attr_total-muse-perceive" class="center" style="width:65px;border-color:#ccc" value="((@{intuitionMuse}*2)+@{rank-muse-perceive}+@{temp-muse-perceive})" disabled />
 					<input type="number" name="attr_rank-muse-perceive" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-perceive" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-perceive" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-perceive" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{intuitionMuse}" data-i18n="intuition short" selected>INT</option>
 					</select>
 				</div>
@@ -1416,7 +1416,7 @@
 					<input type="number" name="attr_total-muse-persuade" class="center" style="width:65px;border-color:#ccc" value="(@{savvyMuse}+@{rank-muse-persuade}+@{temp-muse-persuade})" disabled />
 					<input type="number" name="attr_rank-muse-persuade" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-persuade" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-persuade" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-persuade" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{savvyMuse}" data-i18n="savvy short" selected>SAV</option>
 					</select>
 				</div>
@@ -1430,7 +1430,7 @@
 						<input type="number" name="attr_total-muse-pilot" class="center" style="width:65px;border-color:#ccc" value="(@{reflexesMuse}+@{rank-muse-pilot}+@{temp-muse-pilot})" disabled />
 						<input type="number" name="attr_rank-muse-pilot" class="center" style="width:65px;" value="0" />
 						<input type="number" name="attr_temp-muse-pilot" class="center" style="width:65px;" value="0" />
-						<select name="attr_apt-muse-pilot" style="width:65px;margin:0px;" disabled>
+						<select name="attr_apt-muse-pilot" style="width:65px;margin:0px;vertical-align:middle" disabled>
 							<option value="@{reflexesMuse}" data-i18n="reflexes short" selected>REF</option>
 						</select>
 					</div>
@@ -1444,7 +1444,7 @@
 							<input type="number" name="attr_total-muse-pilot-repeat" class="center" style="width:65px;border-color:#ccc" value="(@{reflexesMuse}+@{rank-muse-pilot-repeat}+@{temp-muse-pilot-repeat})" disabled />
 							<input type="number" name="attr_rank-muse-pilot-repeat" class="center" style="width:65px;" value="0" />
 							<input type="number" name="attr_temp-muse-pilot-repeat" class="center" style="width:65px;" value="0" />
-							<select name="attr_apt-muse-pilot-repeat" style="width:65px;margin:0px;" disabled>
+							<select name="attr_apt-muse-pilot-repeat" style="width:65px;margin:0px;vertical-align:middle" disabled>
 								<option value="@{reflexesMuse}" data-i18n="reflexes short" selected>REF</option>
 							</select>
 						</div>
@@ -1459,7 +1459,7 @@
 					<input type="number" name="attr_total-muse-program" class="center" style="width:65px;border-color:#ccc" value="(@{cognitionMuse}+@{rank-muse-program}+@{temp-muse-program})" disabled />
 					<input type="number" name="attr_rank-muse-program" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-program" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-program" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-program" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{cognitionMuse}" data-i18n="cognition short" selected>COG</option>
 					</select>
 				</div>
@@ -1472,7 +1472,7 @@
 					<input type="number" name="attr_total-muse-provoke" class="center" style="width:65px;border-color:#ccc" value="(@{savvyMuse}+@{rank-muse-provoke}+@{temp-muse-provoke})" disabled />
 					<input type="number" name="attr_rank-muse-provoke" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-provoke" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-provoke" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-provoke" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{savvyMuse}" data-i18n="savvy short" selected>SAV</option>
 					</select>
 				</div>
@@ -1485,7 +1485,7 @@
 					<input type="number" name="attr_total-muse-research" class="center" style="width:65px;border-color:#ccc" value="(@{intuitionMuse}+@{rank-muse-research}+@{temp-muse-research})" disabled />
 					<input type="number" name="attr_rank-muse-research" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-research" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-research" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-research" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{intuitionMuse}" data-i18n="intuition short" selected>INT</option>
 					</select>
 				</div>
@@ -1498,7 +1498,7 @@
 					<input type="number" name="attr_total-muse-survival" class="center" style="width:65px;border-color:#ccc" value="(@{intuitionMuse}+@{rank-muse-survival}+@{temp-muse-survival})" disabled />
 					<input type="number" name="attr_rank-muse-survival" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-muse-survival" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-muse-survival" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-muse-survival" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{intuitionMuse}" data-i18n="intuition short" selected>INT</option>
 					</select>
 				</div>
@@ -1645,7 +1645,7 @@
 		<div class="sheet-line" style="margin-bottom:20px;">
 			<div class="sheet-column" style="width:398px;margin-right:20px;">
 				<input type="checkbox" name="attr_biowareM1-hide" class="sheet-option sheet-optionHideMorph" checked><span class="sheet-option"></span><div class="block-title block-title-morph" data-i18n="bioware">Bioware</div>
-				<div class="block">
+				<div class="blockSpe">
 					<div class="hidden">
 						<div class="sheet-line">
 							<fieldset class="repeating_biowareM1">
@@ -1662,7 +1662,7 @@
 			</div>
 			<div class="sheet-column" style="width:398px;">
 				<input type="checkbox" name="attr_cyberwareM1-hide" class="sheet-option sheet-optionHideMorph" checked><span class="sheet-option"></span><div class="block-title block-title-morph" data-i18n="cyberware">Cyberware</div>
-				<div class="block">
+				<div class="blockSpe">
 					<div class="hidden">
 						<div class="sheet-line">
 							<fieldset class="repeating_cyberwareM1">
@@ -2858,7 +2858,7 @@
 			<input type="checkbox" name="attr_morphTab" class="sheet-M3Hidden" value="@{physMalusM3}">
 			<input type="checkbox" name="attr_morphTab" class="sheet-M4Hidden" value="@{physMalusM4}">
 			<div class="sheet-M1Hidden">
-				<div class="block-title block-title-morph" data-i18n="pool">Pool</div>
+				<div class="block-title block-title" data-i18n="pool">Pool</div>
 				<div class="block">
 					<div class="sheet-line">
 						<div style="width:71px;display:inline-block;"></div>
@@ -3244,7 +3244,7 @@
 						</div>
 						<div class="sheet-line">
 							<div style="width:100px;" class="sheet-column">
-								<button type="roll" name="roll_combat-guns" style="width:100px;" class="default-btn center" value="
+								<button type="roll" name="roll_combat-guns" style="width:93px;" class="default-btn center" value="
 								@{gm} &{template:EPdefault} {{name=^{guns}}} {{subname=^{score}}} {{subskill=@{spe-guns}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-guns}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center"  data-i18n="guns">Guns</div>
 								</button>
@@ -3281,13 +3281,13 @@
 						</div>
 						<div class="sheet-line" style="margin-bottom:10px;">
 							<div style="width:100px;margin-right:10px;" class="sheet-column">
-								<button type="roll" name="roll_initiative" style="width:100px;" class="default-btn center" value="
+								<button type="roll" name="roll_initiative" style="width:93px;" class="default-btn center" value="
 								@{gm} &{template:EPdefault} {{name=^{initiative}}} {{subname=^{score}}} {{roll=[[1D10+[[@{initiative}]] ]]}} {{title-roll=^{roll}}}">
 									<div class="apt-title center" data-i18n="initiative">Initiative</div>
 								</button>
 							</div>
 							<div style="width:100px;margin-right:10px;" class="sheet-column">
-								<button type="roll" name="roll_basic-perception" style="width:100px;" class="default-btn center" value="
+								<button type="roll" name="roll_basic-perception" style="width:93px;" class="default-btn center" value="
 								@{gm} &{template:EPdefault} {{name=^{basic perception}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{basicPerception}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center" data-i18n="basic perception">Basic Perception</div>
 								</button>
@@ -3315,13 +3315,13 @@
 						</div>
 						<div class="sheet-line">
 							<div style="width:100px;margin-right:10px;" class="sheet-column">
-								<button type="roll" name="roll_combat-fray-melee" style="width:100px;" class="default-btn center" value="
+								<button type="roll" name="roll_combat-fray-melee" style="width:93px;" class="default-btn center" value="
 								@{gm} &{template:EPdefault} {{name=^{fray vs melee}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{fray}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center" data-i18n="fray vs melee">Fray VS Melee</div>
 								</button>
 							</div>
 							<div style="width:100px;" class="sheet-column">
-								<button type="roll" name="roll_combat-fray-ranged" style="width:100px;" class="default-btn center" value="
+								<button type="roll" name="roll_combat-fray-ranged" style="width:93px;" class="default-btn center" value="
 								@{gm} &{template:EPdefault} {{name=^{fray vs ranged}}} {{subname=^{score}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{frayRanged}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center" data-i18n="fray vs ranged">Fray VS Ranged</div>
 								</button>
@@ -3337,7 +3337,7 @@
 			<input type="checkbox" name="attr_morphTab" class="sheet-M3Hidden" value="@{physMalusM3}">
 			<input type="checkbox" name="attr_morphTab" class="sheet-M4Hidden" value="@{physMalusM4}">
 			<div class="sheet-column sheet-M1Hidden" style="width:268px;margin-bottom:10px;">
-				<div class="block-title block-title-morph" data-i18n="physique">Physique</div>
+				<div class="block-title block-title" data-i18n="physique">Physique</div>
 				<div class="block">
 					<div class="sheet-line">
 						<input type="number" name="attr_durM1" class="sheet-lower-input apt-title" style="width:66.67px;" data-i18n-title="durability" title="Durability" value="0">
@@ -3477,7 +3477,7 @@
 						</div>
 						<div class="sheet-line">
 							<div style="width:100px;" class="sheet-column">
-								<button type="roll" name="roll_combat-melee" style="width:100px;" class="default-btn center" value="
+								<button type="roll" name="roll_combat-melee" style="width:93px;" class="default-btn center" value="
 								@{gm} &{template:EPdefault} {{name=^{melee}}} {{subname=^{score}}} {{subskill=@{spe-melee}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-melee}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 									<div class="apt-title center"  data-i18n="melee">Melee</div>
 								</button>
@@ -3510,7 +3510,7 @@
 						<fieldset class="repeating_weapon-ranged">
 							<input type="checkbox" name="attr_weapon-ranged-expand" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"><span class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"></span>
 							<div class="sheet-line sheet-expandHide" style="width:330px;">
-								<button type="roll" name="roll_ranged-weapon-btn" style="width:335px;" class="sheet-default-btn" value="
+								<button type="roll" name="roll_ranged-weapon-btn" style="width:327px;" class="sheet-default-btn" value="
 								@{gm} &{template:EPcombat} {{name=@{ranged-weapon-name}}} {{subname=^{score}}} @{weapon-ranged-firing-modes} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-guns}]]-[[@{malus}]]]]}} {{title-range=^{range}}} {{range=@{ranged-weapon-range}}} {{title-damage=^{damage}}} {{damage=[[@{ranged-weapon-dv}]]}} {{title-reload=^{reload}}} {{title-type-reload=^{Semi Auto / Burst Fire / Full Auto short}}} {{reload=@{ranged-weapon-reload}}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}} {{notes=@{ranged-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-ranged_superior-result-dmg)}}">
 									<span style="width:335px;" class="name-skills" name="attr_ranged-weapon-name"></span>
 								</button>
@@ -3546,7 +3546,7 @@
 						<fieldset class="repeating_weapon-melee">
 							<input type="checkbox" name="attr_weapon-melee-expand" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"><span class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"></span>
 							<div class="sheet-line sheet-expandHide" style="width:330px;">
-								<button type="roll" name="roll_melee-weapon-btn" style="width:335px;" class="sheet-default-btn" value="
+								<button type="roll" name="roll_melee-weapon-btn" style="width:327px;" class="sheet-default-btn" value="
 								@{gm} &{template:EPcombat} {{name=@{melee-weapon-name}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-melee}]]-[[@{malus}]]]]}} {{subname=^{score}}} {{title-damage=^{damage}}} {{damage=[[@{melee-weapon-dv}]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}} {{notes=@{melee-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-melee_superior-result-dmg)}}">
 									<span style="width:335px;" class="name-skills" name="attr_melee-weapon-name"></span>
 								</button>
@@ -3579,7 +3579,7 @@
 						<fieldset class="repeating_weapon-seeker">
 							<input type="checkbox" name="attr_weapon-ranged-expand" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"><span class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"></span>
 							<div class="sheet-line sheet-expandHide" style="width:330px;">
-								<button type="roll" name="roll_seeker-weapon-btn" style="width:335px;" class="sheet-default-btn" value="
+								<button type="roll" name="roll_seeker-weapon-btn" style="width:327px;" class="sheet-default-btn" value="
 								@{gm} &{template:EPcombat} {{name=@{seeker-weapon-name}}} @{seeker-weapon-skill} {{roll=[[[[1D100-1]]]]}}  {{title-range=^{range}}} {{range=@{seeker-weapon-range}}} {{title-damage=^{damage}}} {{damage=[[@{seeker-weapon-dv}]]}} {{title-reload=^{reload}}} {{title-type-reload=^{Semi Auto / Burst Fire / Full Auto short}}} {{reload=@{seeker-weapon-reload}}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}} {{notes=@{seeker-weapon-desc}}} {{links=[^{superior result damage}](~repeating_weapon-seeker_superior-result-dmg)}}">
 									<span style="width:335px;" class="name-skills" name="attr_seeker-weapon-name"></span>
 								</button>
@@ -3751,11 +3751,11 @@
 					@{gm} &{template:EPdefault} {{name=^{psi}}} {{subname=^{score}}} {{subskill=@{spe-psi}}} {{roll=[[[[1D100-1]]]]}} {{target=[[[[@{total-psi}]]-[[@{malus}]]]]}} {{title-roll=^{roll}}} {{title-modifiers=^{modifiers}}} {{modifiers=[[[[(0-@{malus})]]]]}}">
 						<div class="name-skills" data-i18n="psi">Psi</div>
 					</button>
-					<input type="text" name="attr_spe-psi" class="sheet-spe-skills" data-i18n-placeholder="specializations" placeholder="Specializations" />
+					<input type="text" name="attr_spe-psi" class="sheet-spe-skills" data-i18n-placeholder="specializations" style="width:376px" placeholder="Specializations" />
 					<input type="number" name="attr_total-psi" class="center" style="width:65px;border-color:#ccc" value="(@{willpower}+@{rank-psi}+@{temp-psi})" disabled />
 					<input type="number" name="attr_rank-psi" class="center" style="width:65px;" value="0" />
 					<input type="number" name="attr_temp-psi" class="center" style="width:65px;" value="0" />
-					<select name="attr_apt-psi" style="width:65px;margin:0px;" disabled>
+					<select name="attr_apt-psi" style="width:65px;margin:0px;vertical-align:middle" disabled>
 						<option value="@{willpower}" data-i18n="willpower short" selected>WIL</option>
 					</select>
 				</div>
@@ -3775,28 +3775,28 @@
 			</div>
 			<div class="hidden" style="width:765px;margin-left:15px;">
 				<fieldset class="repeating_psi-chi-sleights">
-					<input type="checkbox" name="attr_psi-chi-sleight-option" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;" checked /><span  style="float:left;margin-right:0px;margin-left:-21px;" class="sheet-option sheet-expand"></span>
+					<input type="checkbox" name="attr_psi-chi-sleight-option" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;margin-top: 5px;" checked /><span  style="float:left;margin-right:0px;margin-left:-21px;" class="sheet-option sheet-expand"></span>
 					<div class="sheet-line sheet-expandHide" style="width:765px;">
-						<button type="roll" name="roll_psi-chi-btn" style="width:245px;" class="sheet-skills-btn" value="
+						<button type="roll" name="roll_psi-chi-btn" style="width:237px;" class="sheet-skills-btn" value="
 						@{gm} &{template:EPpsi} {{name=^{psi-chi sleights}}} {{subskill=@{psi-chi-name}}} {{target-infection=[[@{current-infection-rating}+@{psi-chi-strain-mod}]]}} {{roll=[[[[1D100-1]]]]}} {{type=@{psi-chi-type}}} {{range=@{psi-chi-self}}} {{action=@{psi-chi-action}}} {{duration=@{psi-chi-duration}}} {{notes=@{psi-chi-desc}}} {{title-roll=^{infection test}}} {{title-modifiers=^{modifiers}}} {{title-type=^{type}}} {{title-range=^{range}}} {{title-action=^{action}}} {{title-duration=^{duration}}} {{title-infection=^{infection}}} {{strain-title=^{effect}}} {{strain=[[1D6]]}} {{strain_1=^{breaking point}}} {{strain_2=^{physical damage}([[1D6+@{psi-chi-strain-mod}]])}} {{strain_3=@{strain-effet-name-3}}} {{strain_4=@{strain-effet-name-4}}} {{strain_5=@{strain-effet-name-5}}} {{strain_6=@{strain-effet-name-6}}}">
 							<span style="width:210px;" class="name-skills" name="attr_psi-chi-name"></span>
 						</button>
-						<select name="attr_psi-chi-type" style="width:100px;margin:0px;" class="center" disabled>
+						<select name="attr_psi-chi-type" style="width:100px;margin:0px;vertical-align:middle;" class="center" disabled>
 							<option value="^{passive}" data-i18n="passive" selected>Passive</option>
 						</select>
-						<select name="attr_psi-chi-self" style="width:100px;margin:0px;" class="center" disabled>
+						<select name="attr_psi-chi-self" style="width:100px;margin:0px;vertical-align:middle;" class="center" disabled>
 							<option value="^{self}" data-i18n="self" selected>Self</option>
 						</select>
-						<select name="attr_psi-chi-action" style="width:100px;margin:0px;" class="center" disabled>
+						<select name="attr_psi-chi-action" style="width:100px;margin:0px;vertical-align:middle;" class="center" disabled>
 							<option value="^{auto}" data-i18n="auto" selected>Auto</option>
 						</select>
-						<select name="attr_psi-chi-duration" style="width:100px;margin:0px;" class="center" disabled>
+						<select name="attr_psi-chi-duration" style="width:100px;margin:0px;vertical-align:middle;" class="center" disabled>
 							<option value="^{constant}" data-i18n="constant" selected>Constant</option>
 						</select>
 						<input type="number" name="attr_psi-chi-strain-mod" class="sheet-spe-skills sheet-center" style="width:100px" value="0" readonly />
 					</div>
 					<div class="sheet-line sheet-expand" style="width:765px;">
-						<input type="text" name="attr_psi-chi-name" class="sheet-spe-skills" style="width:245px" data-i18n-title="name" title="Name" value="" />
+						<input type="text" name="attr_psi-chi-name" class="sheet-spe-skills" style="width:245px;margin-top: -16px;vertical-align:middle;" data-i18n-title="name" title="Name" value="" />
 						<textarea name="attr_psi-chi-desc" style="width:514px;height:26px;padding:0;margin:0px;" data-i18n-title="description" title="Description"></textarea>
 					</div>
 				</div>
@@ -3816,28 +3816,28 @@
 			</div>
 			<div class="hidden" style="width:765px;margin-left:15px;">
 				<fieldset class="repeating_psi-gamma-sleights">
-					<input type="checkbox" name="attr_psi-gamma-sleight-option" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;"><span  style="float:left;margin-right:0px;margin-left:-21px;" class="sheet-option sheet-expand"></span>
+					<input type="checkbox" name="attr_psi-gamma-sleight-option" class="sheet-option sheet-expand" style="float:left;margin-right:0px;margin-left:-21px;margin-top: 5px;"><span  style="float:left;margin-right:0px;margin-left:-21px;" class="sheet-option sheet-expand"></span>
 					<div class="sheet-line sheet-expandHide" style="width:765px;">
-						<button type="roll" name="roll_psi-gamma-btn" style="width:245px;" class="sheet-skills-btn" value="
+						<button type="roll" name="roll_psi-gamma-btn" style="width:237px;" class="sheet-skills-btn" value="
 						@{gm} &{template:EPpsi} {{name=^{psi-gamma sleights}}} {{subskill=@{psi-gamma-name}}} {{target-infection=[[@{current-infection-rating}+@{psi-gamma-strain-mod}]]}} {{roll=[[[[1D100-1]]]]}} {{type=@{psi-gamma-type}}} {{range=@{psi-gamma-range}}} {{action=@{psi-gamma-action}}} {{duration=@{psi-gamma-duration}}} {{notes=@{psi-gamma-desc}}} {{title-roll=^{infection test}}} {{title-modifiers=^{modifiers}}} {{title-type=^{type}}} {{title-range=^{range}}} {{title-action=^{action}}} {{title-duration=^{duration}}} {{title-infection=^{infection}}}  {{strain-title=^{effect}}} {{strain=[[1D6]]}} {{strain_1=^{breaking point}}} {{strain_2=^{physical damage}([[1D6+@{psi-gamma-strain-mod}]])}} {{strain_3=@{strain-effet-name-3}}} {{strain_4=@{strain-effet-name-4}}} {{strain_5=@{strain-effet-name-5}}} {{strain_6=@{strain-effet-name-6}}}">
 							<span style="width:210px;" class="name-skills" name="attr_psi-gamma-name"></span>
 						</button>
-						<select name="attr_psi-gamma-type" style="width:100px;margin:0px;" class="center">
+						<select name="attr_psi-gamma-type" style="width:100px;margin:0px;vertical-align:middle;" class="center">
 							<option value="^{active}" data-i18n="active" selected>Active</option>
 							<option value="^{passive}" data-i18n="passive">Passive</option>
 						</select>
-						<select name="attr_psi-gamma-range" style="width:100px;margin:0px;" class="center">
+						<select name="attr_psi-gamma-range" style="width:100px;margin:0px;vertical-align:middle;" class="center">
 							<option value="^{self}" data-i18n="self" selected>Self</option>
 							<option value="^{touch}" data-i18n="touch">Touch</option>
 							<option value="^{close}" data-i18n="close">Close</option>
 						</select>
-						<select name="attr_psi-gamma-action" style="width:100px;margin:0px;" class="center">
+						<select name="attr_psi-gamma-action" style="width:100px;margin:0px;vertical-align:middle;" class="center">
 							<option value="^{auto}" data-i18n="auto" selected>Auto</option>
 							<option value="^{quick}" data-i18n="quick">Quick</option>
 							<option value="^{complex}" data-i18n="complex">Complex</option>
 							<option value="^{task}" data-i18n="task">Task</option>
 						</select>
-						<select name="attr_psi-gamma-duration" style="width:100px;margin:0px;" class="center">
+						<select name="attr_psi-gamma-duration" style="width:100px;margin:0px;vertical-align:middle;" class="center">
 							<option value="^{constant}" data-i18n="constant" selected>Constant</option>
 							<option value="^{instant}" data-i18n="instant">Instant</option>
 							<option value="^{sustained}" data-i18n="sustained">Sustained</option>
@@ -3846,7 +3846,7 @@
 						<input type="number" name="attr_psi-gamma-strain-mod" class="sheet-spe-skills sheet-center" style="width:100px" value="0" />
 					</div>
 					<div class="sheet-line sheet-expand" style="width:765px;">
-						<input type="text" name="attr_psi-gamma-name" class="sheet-spe-skills" style="width:245px" data-i18n-title="name" title="Name" value="" />
+						<input type="text" name="attr_psi-gamma-name" class="sheet-spe-skills" style="width:245px;margin-top: -16px;" data-i18n-title="name" title="Name" value="" />
 						<textarea name="attr_psi-gamma-desc" style="width:514px;height:26px;padding:0;margin:0px;" data-i18n-title="description" title="Description"></textarea>
 					</div>
 				</div>