diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index 0993c6ae66..524020fbda 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -47,10 +47,10 @@
                 <div class="statlabel"><label>Agility</label></div>
                 <div class="statlabel"><label>Reaction</label></div>
                 <div class="statlabel"><label>Strength</label></div>
+                <div class="statlabel"><label>Willpower</label></div>
+                <div class="statlabel"><label>Logic</label></div>
                 <div class="statlabel"><label>Charisma</label></div>
                 <div class="statlabel"><label>Intuition</label></div>
-                <div class="statlabel"><label>Logic</label></div>
-                <div class="statlabel"><label>Willpower</label></div>
                 <div class="statlabel">
                     <input class="technomancycheckbox" type="checkbox"  name="attr_istechnomancer" value="1">
                     <label class="labelmage">Magic</label>
@@ -64,10 +64,10 @@
                 <div class="statinputwrapper"><input type="number" class="statinput" name="attr_agi_base" title="Base Attribute unaugmented"></div>
                 <div class="statinputwrapper"><input type="number" class="statinput" name="attr_rea_base" title="Base Attribute unaugmented"></div>
                 <div class="statinputwrapper"><input type="number" class="statinput" name="attr_str_base" title="Base Attribute unaugmented"></div>
+                <div class="statinputwrapper"><input type="number" class="statinput" name="attr_wil_base" title="Base Attribute unaugmented"></div>
+                <div class="statinputwrapper"><input type="number" class="statinput" name="attr_log_base" title="Base Attribute unaugmented"></div>
                 <div class="statinputwrapper"><input type="number" class="statinput" name="attr_cha_base" title="Base Attribute unaugmented"></div>
                 <div class="statinputwrapper"><input type="number" class="statinput" name="attr_int_base" title="Base Attribute unaugmented"></div>
-                <div class="statinputwrapper"><input type="number" class="statinput" name="attr_log_base" title="Base Attribute unaugmented"></div>
-                <div class="statinputwrapper"><input type="number" class="statinput" name="attr_wil_base" title="Base Attribute unaugmented"></div>
                 <div class="statinputwrapper"><input type="number" class="statinput" name="attr_mag_base" title="Base Attribute unaugmented"></div>
                 <div class="statinputwrapper"><input type="number" class="statinput" name="attr_edg_total" title="Base Attribute unaugmented"></div>
             </div>
@@ -78,10 +78,10 @@
                     <div class="statinputwrapper"><input type="number" class="statinput" name="attr_agi_aug" value="0" title="Bonuses from Augmentations"></div>
                     <div class="statinputwrapper"><input type="number" class="statinput" name="attr_rea_aug" value="0" title="Bonuses from Augmentations"></div>
                     <div class="statinputwrapper"><input type="number" class="statinput" name="attr_str_aug" value="0" title="Bonuses from Augmentations"></div>
+                    <div class="statinputwrapper"><input type="number" class="statinput" name="attr_wil_aug" value="0" title="Bonuses from Augmentations"></div>
+                    <div class="statinputwrapper"><input type="number" class="statinput" name="attr_log_aug" value="0" title="Bonuses from Augmentations"></div>
                     <div class="statinputwrapper"><input type="number" class="statinput" name="attr_cha_aug" value="0" title="Bonuses from Augmentations"></div>
                     <div class="statinputwrapper"><input type="number" class="statinput" name="attr_int_aug" value="0" title="Bonuses from Augmentations"></div>
-                    <div class="statinputwrapper"><input type="number" class="statinput" name="attr_log_aug" value="0" title="Bonuses from Augmentations"></div>
-                    <div class="statinputwrapper"><input type="number" class="statinput" name="attr_wil_aug" value="0" title="Bonuses from Augmentations"></div>
                     <div class="statinputwrapper"><input type="number" class="statinput" name="attr_mag_aug" value="0" title="Bonuses from Augmentations"></div>
                 </div>
                 <div class="statsubcol">
@@ -90,10 +90,10 @@
                     <div class="statinputwrapper"><input type="number" class="statinput" name="attr_agi_total" value="@{agi_base}+@{agi_aug}" title="Base + Bonus" disabled="true"></div>
                     <div class="statinputwrapper"><input type="number" class="statinput" name="attr_rea_total" value="@{rea_base}+@{rea_aug}" title="Base + Bonus" disabled="true"></div>
                     <div class="statinputwrapper"><input type="number" class="statinput" name="attr_str_total" value="@{str_base}+@{str_aug}" title="Base + Bonus" disabled="true"></div>
+                    <div class="statinputwrapper"><input type="number" class="statinput" name="attr_wil_total" value="@{wil_base}+@{wil_aug}" title="Base + Bonus" disabled="true"></div>
+                    <div class="statinputwrapper"><input type="number" class="statinput" name="attr_log_total" value="@{log_base}+@{log_aug}" title="Base + Bonus" disabled="true"></div>
                     <div class="statinputwrapper"><input type="number" class="statinput" name="attr_cha_total" value="@{cha_base}+@{cha_aug}" title="Base + Bonus" disabled="true"></div>
                     <div class="statinputwrapper"><input type="number" class="statinput" name="attr_int_total" value="@{int_base}+@{int_aug}" title="Base + Bonus" disabled="true"></div>
-                    <div class="statinputwrapper"><input type="number" class="statinput" name="attr_log_total" value="@{log_base}+@{log_aug}" title="Base + Bonus" disabled="true"></div>
-                    <div class="statinputwrapper"><input type="number" class="statinput" name="attr_wil_total" value="@{wil_base}+@{wil_aug}" title="Base + Bonus" disabled="true"></div>
                     <div class="statinputwrapper"><input type="number" class="statinput" name="attr_mag_total" value="@{mag_base}+@{mag_aug}" title="Base + Bonus" disabled="true"></div>
                 </div>
                 <div class="rollcol">
@@ -111,16 +111,16 @@
                         <button type="action" class="standardroll" name="act_roll" title="Roll Strength" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Strength}}{{val1=Strength}}{{val1_num=[[@{str_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{sustainedspells=[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]}}{{result=[[(@{str_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]-[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
                     </div>
                     <div class="statinputwrapper">
-                        <button type="action" class="standardroll" name="act_roll" title="Roll Charisma" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Charisma}}{{val1=Charisma}}{{val1_num=[[@{cha_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{sustainedspells=[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]}}{{result=[[(@{cha_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]-[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
-                    </div>
-                    <div class="statinputwrapper">
-                        <button type="action" class="standardroll" name="act_roll" title="Roll Intuition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Intuition}}{{val1=Intuition}}{{val1_num=[[@{int_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{sustainedspells=[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]}}{{result=[[(@{int_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]-[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
+                        <button type="action" class="standardroll" name="act_roll" title="Roll Willpower" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Willpower}}{{val1=Willpower}}{{val1_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{sustainedspells=[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]}}{{result=[[(@{wil_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]-[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
                     </div>
                     <div class="statinputwrapper">
                         <button type="action" class="standardroll" name="act_roll" title="Roll Logic" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Logic}}{{val1=Logic}}{{val1_num=[[@{log_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{sustainedspells=[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]}}{{result=[[(@{log_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]-[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
                     </div>
                     <div class="statinputwrapper">
-                        <button type="action" class="standardroll" name="act_roll" title="Roll Willpower" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Willpower}}{{val1=Willpower}}{{val1_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{sustainedspells=[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]}}{{result=[[(@{wil_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]-[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
+                        <button type="action" class="standardroll" name="act_roll" title="Roll Charisma" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Charisma}}{{val1=Charisma}}{{val1_num=[[@{cha_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{sustainedspells=[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]}}{{result=[[(@{cha_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]-[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
+                    </div>
+                    <div class="statinputwrapper">
+                        <button type="action" class="standardroll" name="act_roll" title="Roll Intuition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Intuition}}{{val1=Intuition}}{{val1_num=[[@{int_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{sustainedspells=[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]}}{{result=[[(@{int_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]-[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>
                     </div>
                     <div class="statinputwrapper">
                         <button type="action" class="standardroll" name="act_roll" title="Roll Magic/Res" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Magic/Res}}{{val1=Magic/Res}}{{val1_num=[[@{mag_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{sustainedspells=[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]}}{{result=[[(@{mag_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]-[[?{Apply sustained spells|Yes,1|No,0}*(@{sustainedspells}*2)]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}"></button>