diff --git a/D&D_5e_Shaped/D&D_5e.css b/D&D_5e_Shaped/D&D_5e.css
index 5d1dee04c5..0c0b6cbe19 100644
--- a/D&D_5e_Shaped/D&D_5e.css
+++ b/D&D_5e_Shaped/D&D_5e.css
@@ -496,6 +496,13 @@ input[type=number].sheet-no-spin {
   border-bottom-right-radius: 5px;
 }
 
+.sheet-bold,
+.sheet-save-total,
+.sheet-check-total,
+.sheet-skill-total {
+  font-weight: bold;
+}
+
 .sheet-shield input[type=number],
 .sheet-initiative input[type=number].sheet-initiative-total,
 .sheet-speed input,
@@ -528,6 +535,11 @@ input[type=number].sheet-no-spin {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
 }
+.sheet-col-speed-wrapper {
+  width: 130%;
+  margin-left: -30%;
+}
+
 .sheet-speed .sheet-wrap-box-title {
   font-size: 75%;
 }
@@ -621,7 +633,7 @@ input[type=number].sheet-initiative-bonus {
 }
 .sheet-checkbox-label [type="checkbox"] + span {
   display: inline-block;
-  padding: 4px 2px;
+  padding: 2px;
   text-align: center;
   font-weight: bold;
   border-radius: 4px;
@@ -3926,6 +3938,10 @@ select {
 .sheet-rolltemplate-5eDefault .sheet-col-19 {
   width: 19%;
 }
+.sheet-col-23,
+.sheet-rolltemplate-5eDefault .sheet-col-23 {
+  width: 23%;
+}
 .sheet-col-26,
 .sheet-rolltemplate-5eDefault .sheet-col-26 {
   width: 26%;
diff --git a/D&D_5e_Shaped/D&D_5e.html b/D&D_5e_Shaped/D&D_5e.html
index f0dcc03d7e..8492712dc7 100644
--- a/D&D_5e_Shaped/D&D_5e.html
+++ b/D&D_5e_Shaped/D&D_5e.html
@@ -80,21 +80,7 @@
                 <span class="sheet-german">P Wahr</span>
               </div>
             </div>
-            <div class="sheet-col-1-8 sheet-vert-middle sheet-pad-r-sm">
-              <input class="sheet-center" type="text" name="attr_darkvision">
-              <div class="sheet-wrap-box-label sheet-center">
-                <span class="sheet-english">Darkvision</span>
-                <span class="sheet-german">Dunkelsicht</span>
-              </div>
-            </div>
-            <div class="sheet-col-6-17 sheet-vert-middle sheet-pc-version-inline-block sheet-pad-r-sm">
-              <input type="text" name="attr_background_name">
-              <div class="sheet-wrap-box-label">
-                <span class="sheet-english">Background</span>
-                <span class="sheet-german">Hintergrund</span>
-              </div>
-            </div>
-            <div class="sheet-col-1-8 sheet-vert-middle sheet-relative sheet-npc-version-inline-block sheet-pad-r-sm">
+            <div class="sheet-col-1-8 sheet-vert-middle sheet-relative sheet-pad-r-sm">
               <label class="sheet-checkbox-label-sm sheet-absolute">
                 <input type="checkbox" name="attr_blindsight_blind_beyond"><span class="sheet-english">blind beyond</span><span class="sheet-german">blind nach</span>
               </label>
@@ -104,6 +90,20 @@
                 <span class="sheet-german">Blindsicht</span>
               </div>
             </div>
+            <div class="sheet-col-1-8 sheet-vert-middle sheet-pad-r-sm">
+              <input class="sheet-center" type="text" name="attr_darkvision">
+              <div class="sheet-wrap-box-label sheet-center">
+                <span class="sheet-english">Darkvision</span>
+                <span class="sheet-german">Dunkelsicht</span>
+              </div>
+            </div>
+            <div class="sheet-col-23 sheet-vert-middle sheet-pc-version-inline-block sheet-pad-r-sm">
+              <input type="text" name="attr_background_name">
+              <div class="sheet-wrap-box-label">
+                <span class="sheet-english">Background</span>
+                <span class="sheet-german">Hintergrund</span>
+              </div>
+            </div>
             <div class="sheet-col-1-8 sheet-vert-middle sheet-npc-version-inline-block sheet-pad-l-sm">
               <input class="sheet-center" type="text" name="attr_tremorsense">
               <div class="sheet-wrap-box-label sheet-center sheet-header-label-sm">
@@ -275,7 +275,7 @@
                 <input class="sheet-center sheet-no-spin" type="number" name="attr_strength_save_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_strength_save_mod" value="@{strength_mod} + @{strength_save_prof} + @{strength_save_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-save-total" type="number" name="attr_strength_save_mod" value="@{strength_mod} + @{strength_save_prof} + @{strength_save_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col sheet-center sheet-vert-middle">
                 <button type="roll" name="roll_Strength_Save" value="@{output_option} &{template:5eDefault} {{save=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=Strength}} {{subheader=Saving Throw}} {{rollname=Result}} {{roll=[[ d20 + @{strength_save_mod} + (@{global_saving_bonus}) ]]}} {{rolladv=[[ d20 + @{strength_save_mod} + (@{global_saving_bonus}) ]]}} @{classactionstrengthsave}">
@@ -331,7 +331,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_basic_strength_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_basic_strength_check_mod" value="@{strength_mod} + @{basic_strength_bonus} + @{jack_of_all_trades}" disabled="disabled">
+                <input class="sheet-no-spin sheet-check-total" type="number" name="attr_basic_strength_check_mod" value="@{strength_mod} + @{basic_strength_bonus} + @{jack_of_all_trades}" disabled="disabled">
               </div>
             </div>
             <div class="sheet-row">
@@ -342,7 +342,7 @@
                 <input class="sheet-center sheet-no-spin" type="number" name="attr_dexterity_save_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_dexterity_save_mod" value="@{dexterity_mod} + @{dexterity_save_prof} + @{dexterity_save_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-save-total" type="number" name="attr_dexterity_save_mod" value="@{dexterity_mod} + @{dexterity_save_prof} + @{dexterity_save_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col sheet-center sheet-vert-middle">
                 <button type="roll" name="roll_Dexterity_Save" value="@{output_option} &{template:5eDefault} {{save=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=Dexterity}} {{subheader=Saving Throw}} {{rollname=Result}} {{roll=[[ d20 + @{dexterity_save_mod} + (@{global_saving_bonus}) ]]}} {{rolladv=[[ d20 + @{dexterity_save_mod} + (@{global_saving_bonus}) ]]}} @{classactiondexteritysave}">
@@ -406,7 +406,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_basic_dexterity_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_basic_dexterity_check_mod" value="@{dexterity_mod} + @{basic_dexterity_bonus} + @{jack_of_all_trades}" disabled="disabled">
+                <input class="sheet-no-spin sheet-check-total" type="number" name="attr_basic_dexterity_check_mod" value="@{dexterity_mod} + @{basic_dexterity_bonus} + @{jack_of_all_trades}" disabled="disabled">
               </div>
             </div>
             <div class="sheet-row">
@@ -417,7 +417,7 @@
                 <input class="sheet-center sheet-no-spin" type="number" name="attr_constitution_save_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_constitution_save_mod" value="@{constitution_mod} + @{constitution_save_prof} + @{constitution_save_bonus}" disabled="disabled"></div>
+                <input class="sheet-no-spin sheet-save-total" type="number" name="attr_constitution_save_mod" value="@{constitution_mod} + @{constitution_save_prof} + @{constitution_save_bonus}" disabled="disabled"></div>
               <div class="sheet-col sheet-center sheet-vert-middle">
                 <button type="roll" name="roll_Constitution_Save" value="@{output_option} &{template:5eDefault} {{save=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=Constitution}} {{subheader=Saving Throw}} {{rollname=Result}} {{roll=[[ d20 + @{constitution_save_mod} + (@{global_saving_bonus}) ]]}} {{rolladv=[[ d20 + @{constitution_save_mod} + (@{global_saving_bonus}) ]]}} @{classactionconstitutionsave}">
                   <span class="sheet-pictos sheet-vert-top">k</span>
@@ -468,7 +468,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_basic_constitution_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_basic_constitution_check_mod" value="@{constitution_mod} + @{basic_constitution_bonus} + @{jack_of_all_trades}" disabled="disabled">
+                <input class="sheet-no-spin sheet-check-total" type="number" name="attr_basic_constitution_check_mod" value="@{constitution_mod} + @{basic_constitution_bonus} + @{jack_of_all_trades}" disabled="disabled">
               </div>
             </div>
             <div class="sheet-row">
@@ -479,7 +479,7 @@
                 <input class="sheet-center sheet-no-spin" type="number" name="attr_intelligence_save_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_intelligence_save_mod" value="@{intelligence_mod} + @{intelligence_save_prof} + @{intelligence_save_bonus}" disabled="disabled"></div>
+                <input class="sheet-no-spin sheet-save-total" type="number" name="attr_intelligence_save_mod" value="@{intelligence_mod} + @{intelligence_save_prof} + @{intelligence_save_bonus}" disabled="disabled"></div>
               <div class="sheet-col sheet-center sheet-vert-middle">
                 <button type="roll" name="roll_Intelligence_Save" value="@{output_option} &{template:5eDefault} {{save=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=Intelligence}} {{subheader=Saving Throw}} {{rollname=Result}} {{roll=[[ d20 + @{intelligence_save_mod} + (@{global_saving_bonus}) ]]}} {{rolladv=[[ d20 + @{intelligence_save_mod} + (@{global_saving_bonus}) ]]}} @{classactionintelligencesave}">
                   <span class="sheet-pictos sheet-vert-top">k</span>
@@ -534,7 +534,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_basic_intelligence_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_basic_intelligence_check_mod" value="@{intelligence_mod} + @{basic_intelligence_bonus} + @{jack_of_all_trades}" disabled="disabled">
+                <input class="sheet-no-spin sheet-check-total" type="number" name="attr_basic_intelligence_check_mod" value="@{intelligence_mod} + @{basic_intelligence_bonus} + @{jack_of_all_trades}" disabled="disabled">
               </div>
             </div>
             <div class="sheet-row">
@@ -545,7 +545,7 @@
                 <input class="sheet-center sheet-no-spin" type="number" name="attr_wisdom_save_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_wisdom_save_mod" value="@{wisdom_mod} + @{wisdom_save_prof} + @{wisdom_save_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-save-total" type="number" name="attr_wisdom_save_mod" value="@{wisdom_mod} + @{wisdom_save_prof} + @{wisdom_save_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col sheet-center sheet-vert-middle">
                 <button type="roll" name="roll_Wisdom_Save" value="@{output_option} &{template:5eDefault} {{save=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=Wisdom}} {{subheader=Saving Throw}} {{rollname=Result}} {{roll=[[ d20 + @{wisdom_save_mod} + (@{global_saving_bonus}) ]]}} {{rolladv=[[ d20 + @{wisdom_save_mod} + (@{global_saving_bonus}) ]]}} @{classactionwisdomsave}">
@@ -585,7 +585,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_basic_wisdom_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_basic_wisdom_check_mod" value="@{wisdom_mod} + @{basic_wisdom_bonus} + @{jack_of_all_trades}" disabled="disabled">
+                <input class="sheet-no-spin sheet-check-total" type="number" name="attr_basic_wisdom_check_mod" value="@{wisdom_mod} + @{basic_wisdom_bonus} + @{jack_of_all_trades}" disabled="disabled">
               </div>
             </div>
             <div class="sheet-row">
@@ -596,7 +596,7 @@
                 <input class="sheet-center sheet-no-spin" type="number" name="attr_charisma_save_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_charisma_save_mod" value="@{charisma_mod} + @{charisma_save_prof} + @{charisma_save_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-save-total" type="number" name="attr_charisma_save_mod" value="@{charisma_mod} + @{charisma_save_prof} + @{charisma_save_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col sheet-center sheet-vert-middle">
                 <button type="roll" name="roll_Charisma_Save" value="@{output_option} &{template:5eDefault} {{save=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=Charisma}} {{subheader=Saving Throw}} {{rollname=Result}} {{roll=[[ d20 + @{charisma_save_mod} + (@{global_saving_bonus}) ]]}} {{rolladv=[[ d20 + @{charisma_save_mod} + (@{global_saving_bonus}) ]]}} @{classactioncharismasave}">
@@ -633,7 +633,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_basic_charisma_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_basic_charisma_check_mod" value="@{charisma_mod} + @{basic_charisma_bonus} + @{jack_of_all_trades}" disabled="disabled">
+                <input class="sheet-no-spin sheet-check-total" type="number" name="attr_basic_charisma_check_mod" value="@{charisma_mod} + @{basic_charisma_bonus} + @{jack_of_all_trades}" disabled="disabled">
               </div>
             </div>
             <div class="sheet-row">
@@ -666,7 +666,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_acrobatics_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_acrobatics" value="@{acrobatics_prof_exp} + @{acrobatics_attribute} + @{acrobatics_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_acrobatics" value="@{acrobatics_prof_exp} + @{acrobatics_attribute} + @{acrobatics_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -714,7 +714,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_animalhandling_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_animalhandling" value="@{animalhandling_prof_exp} + @{animalhandling_attribute} + @{animalhandling_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_animalhandling" value="@{animalhandling_prof_exp} + @{animalhandling_attribute} + @{animalhandling_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -762,7 +762,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_arcana_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_arcana" value="@{arcana_prof_exp} + @{arcana_attribute} + @{arcana_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_arcana" value="@{arcana_prof_exp} + @{arcana_attribute} + @{arcana_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -810,7 +810,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_athletics_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_athletics" value="@{athletics_prof_exp} + @{athletics_attribute} + @{athletics_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_athletics" value="@{athletics_prof_exp} + @{athletics_attribute} + @{athletics_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -872,7 +872,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_deception_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_deception" value="@{deception_prof_exp} + @{deception_attribute} + @{deception_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_deception" value="@{deception_prof_exp} + @{deception_attribute} + @{deception_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -920,7 +920,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_history_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_history" value="@{history_prof_exp} + @{history_attribute} + @{history_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_history" value="@{history_prof_exp} + @{history_attribute} + @{history_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -967,7 +967,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_insight_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_insight" value="@{insight_prof_exp} + @{insight_attribute} + @{insight_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_insight" value="@{insight_prof_exp} + @{insight_attribute} + @{insight_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -1015,7 +1015,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_intimidation_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_intimidation" value="@{intimidation_prof_exp} + @{intimidation_attribute} + @{intimidation_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_intimidation" value="@{intimidation_prof_exp} + @{intimidation_attribute} + @{intimidation_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -1063,7 +1063,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_investigation_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_investigation" value="@{investigation_prof_exp} + @{investigation_attribute} + @{investigation_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_investigation" value="@{investigation_prof_exp} + @{investigation_attribute} + @{investigation_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -1111,7 +1111,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_medicine_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_medicine" value="@{medicine_prof_exp} + @{medicine_attribute} + @{medicine_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_medicine" value="@{medicine_prof_exp} + @{medicine_attribute} + @{medicine_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -1159,7 +1159,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_nature_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_nature" value="@{nature_prof_exp} + @{nature_attribute} + @{nature_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_nature" value="@{nature_prof_exp} + @{nature_attribute} + @{nature_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -1207,7 +1207,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_perception_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_perception" value="@{perception_prof_exp} + @{perception_attribute} + @{perception_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_perception" value="@{perception_prof_exp} + @{perception_attribute} + @{perception_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -1255,7 +1255,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_performance_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_performance" value="@{performance_prof_exp} + @{performance_attribute} + @{performance_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_performance" value="@{performance_prof_exp} + @{performance_attribute} + @{performance_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -1303,7 +1303,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_persuasion_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_persuasion" value="@{persuasion_prof_exp} + @{persuasion_attribute} + @{persuasion_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_persuasion" value="@{persuasion_prof_exp} + @{persuasion_attribute} + @{persuasion_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -1351,7 +1351,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_religion_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_religion" value="@{religion_prof_exp} + @{religion_attribute} + @{religion_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_religion" value="@{religion_prof_exp} + @{religion_attribute} + @{religion_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -1399,7 +1399,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_sleightofhand_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_sleightofhand" value="@{sleightofhand_prof_exp} + @{sleightofhand_attribute} + @{sleightofhand_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_sleightofhand" value="@{sleightofhand_prof_exp} + @{sleightofhand_attribute} + @{sleightofhand_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -1447,7 +1447,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_stealth_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_stealth" value="@{stealth_prof_exp} + @{stealth_attribute} + @{stealth_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_stealth" value="@{stealth_prof_exp} + @{stealth_attribute} + @{stealth_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -1495,7 +1495,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_survival_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_survival" value="@{survival_prof_exp} + @{survival_attribute} + @{survival_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_survival" value="@{survival_prof_exp} + @{survival_attribute} + @{survival_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
                 <div class="sheet-tooltip sheet-inline">
@@ -1547,7 +1547,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_custom_skill_1_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_custom_skill_1" value="@{custom_skill_1_prof_exp} + @{custom_skill_1_attribute} + @{custom_skill_1_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_custom_skill_1" value="@{custom_skill_1_prof_exp} + @{custom_skill_1_attribute} + @{custom_skill_1_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm">
                 <div class="sheet-row">
@@ -1590,7 +1590,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_custom_skill_2_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_custom_skill_2" value="@{custom_skill_2_prof_exp} + @{custom_skill_2_attribute} + @{custom_skill_2_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_custom_skill_2" value="@{custom_skill_2_prof_exp} + @{custom_skill_2_attribute} + @{custom_skill_2_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm">
                 <div class="sheet-row">
@@ -1633,7 +1633,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_custom_skill_3_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_custom_skill_3" value="@{custom_skill_3_prof_exp} + @{custom_skill_3_attribute} + @{custom_skill_3_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_custom_skill_3" value="@{custom_skill_3_prof_exp} + @{custom_skill_3_attribute} + @{custom_skill_3_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm">
                 <div class="sheet-row">
@@ -1676,7 +1676,7 @@
                 <input class="sheet-no-spin" type="number" name="attr_custom_skill_4_bonus" value="0" step="1">
               </div>
               <div class="sheet-col-1-9 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_custom_skill_4" value="@{custom_skill_4_prof_exp} + @{custom_skill_4_attribute} + @{custom_skill_4_bonus}" disabled="disabled">
+                <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_custom_skill_4" value="@{custom_skill_4_prof_exp} + @{custom_skill_4_attribute} + @{custom_skill_4_bonus}" disabled="disabled">
               </div>
               <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm">
                 <div class="sheet-row">
@@ -1769,15 +1769,6 @@
               <div class="sheet-wrap-box-title">Initiative</div>
             </div>
           </div>
-          <div class="sheet-col-3-10 sheet-center sheet-pad-l-md">
-            <div class="sheet-wrap-box sheet-speed">
-              <input class="sheet-center sheet-mar-t-lg" type="text" name="attr_speed">
-              <div class="sheet-wrap-box-title">
-                <span class="sheet-english">Speed</span>
-                <span class="sheet-german">Gesch</span>
-              </div>
-            </div>
-          </div>
         </div>
         <div class="sheet-row sheet-mar-b-sm">
           <div class="sheet-col-1">
@@ -1830,15 +1821,13 @@
                 </div>
               </div>
               <div class="sheet-row sheet-sub-header">
-                <div class="sheet-col-1-4 sheet-center sheet-small-label sheet-sub-header sheet-pad-r-sm">
+                <div class="sheet-col-1-3 sheet-center sheet-small-label sheet-sub-header sheet-pad-r-sm">
                   <span class="sheet-english">Current</span>
                   <span class="sheet-german">Aktuell</span>
                 </div>
-                <div class="sheet-col-1-4 sheet-center sheet-small-label sheet-sub-header">
-                  <span>
-                    <span class="sheet-english">Max</span>
-                    <span class="sheet-german">Max</span>
-                  </span>
+                <div class="sheet-col-1-3 sheet-center sheet-small-label sheet-sub-header">
+                  <span class="sheet-english">Max</span>
+                  <span class="sheet-german">Max</span>
                 </div>
                 <div class="sheet-col-3-10 sheet-center sheet-small-label sheet-sub-header">
                   <span class="sheet-english">Hit Die</span>
@@ -1846,10 +1835,10 @@
                 </div>
               </div>
               <div class="sheet-row sheet-npc-version">
-                <div class="sheet-col-1-4 sheet-vert-middle sheet-pad-r-sm">
+                <div class="sheet-col-1-3 sheet-vert-middle sheet-pad-r-sm">
                   <input type="number" name="attr_hd_d4" min="0" step="1">
                 </div>
-                <div class="sheet-col-1-4 sheet-vert-middle">
+                <div class="sheet-col-1-3 sheet-vert-middle">
                   <input type="number" name="attr_hd_d4_max">
                 </div>
                 <div class="sheet-col-3-10 sheet-center sheet-hd-row sheet-vert-middle">
@@ -2018,6 +2007,55 @@
         </div>
       </div>
       <div class="sheet-col-17 sheet-pad-l-sm sheet-pad-r-sm">
+        <div class="sheet-row sheet-mar-b-md">
+          <div class="sheet-col-speed-wrapper">
+            <div class="sheet-wrap-box sheet-speed">
+              <div class="sheet-row">
+                <div class="sheet-col-1-5 sheet-center sheet-mar-t-lg sheet-pad-r-md">
+                  <input class="sheet-center" type="text" name="attr_speed">
+                  <div class="sheet-wrap-box-title">
+                    <span class="sheet-english">Speed</span>
+                    <span class="sheet-german">Gesch</span>
+                  </div>
+                </div>
+                <div class="sheet-col-1-5 sheet-center sheet-mar-t-lg">
+                  <input class="sheet-center" type="text" name="attr_speed_burrow">
+                  <div class="sheet-wrap-box-title">
+                    <span class="sheet-english">Burrow</span>
+                    <span class="sheet-german">Graben</span>
+                  </div>
+                </div>
+                <div class="sheet-col-1-5 sheet-center sheet-mar-t-lg sheet-pad-l-md">
+                  <input class="sheet-center" type="text" name="attr_speed_climb">
+                  <div class="sheet-wrap-box-title">
+                    <span class="sheet-english">Climb</span>
+                    <span class="sheet-german">Klettern</span>
+                  </div>
+                </div>
+                <div class="sheet-col-1-5 sheet-center sheet-pad-l-md">
+                  <label class="sheet-checkbox-label-sm">
+                    <input type="checkbox" name="attr_speed_fly_hover"><span class="sheet-inline-block">
+                      <span class="sheet-english">Hover</span>
+                      <span class="sheet-german">Schweben</span>
+                    </span>
+                  </label>
+                  <input class="sheet-center" type="text" name="attr_speed_fly">
+                  <div class="sheet-wrap-box-title">
+                    <span class="sheet-english">Fly</span>
+                    <span class="sheet-german">Fliegen</span>
+                  </div>
+                </div>
+                <div class="sheet-col-1-5 sheet-center sheet-mar-t-lg sheet-pad-l-md">
+                  <input class="sheet-center" type="text" name="attr_speed_swim">
+                  <div class="sheet-wrap-box-title">
+                    <span class="sheet-english">Swim</span>
+                    <span class="sheet-german">Schwimmen</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
         <div class="sheet-row sheet-pc-version sheet-inspiration sheet-mar-b-md">
           <div class="sheet-col-1">
             <div class="sheet-wrap-box" title="Inspiration">
@@ -2038,7 +2076,7 @@
           <div class="sheet-col-1">
             <div class="sheet-wrap-box sheet-relative">
               <div class="sheet-col-1-5 sheet-vert-middle">
-                <input type="number" name="attr_exhaustion_level" min="0" max="6">
+                <input class="sheet-no-spin sheet-bold" type="number" name="attr_exhaustion_level" min="0" max="6">
               </div>
               <span class="sheet-wrap-box-title">
                 <span class="sheet-english">Exhaustion Level</span>
@@ -2112,52 +2150,11 @@
             </div>
           </div>
         </div>
-        <div class="sheet-row sheet-npc-version sheet-mar-b-md">
-          <div class="sheet-col-1">
-            <div class="sheet-wrap-box sheet-speed">
-              <div class="sheet-row">
-                <div class="sheet-col-1-4 sheet-center sheet-mar-t-lg">
-                  <input class="sheet-center" type="text" name="attr_speed_burrow">
-                  <div class="sheet-wrap-box-title">
-                    <span class="sheet-english">Burrow</span>
-                    <span class="sheet-german">Graben</span>
-                  </div>
-                </div>
-                <div class="sheet-col-1-4 sheet-center sheet-mar-t-lg sheet-pad-l-md">
-                  <input class="sheet-center" type="text" name="attr_speed_climb">
-                  <div class="sheet-wrap-box-title">
-                    <span class="sheet-english">Climb</span>
-                    <span class="sheet-german">Klettern</span>
-                  </div>
-                </div>
-                <div class="sheet-col-1-4 sheet-center sheet-pad-l-md">
-                  <label class="sheet-checkbox-label-sm">
-                    <input type="checkbox" name="attr_speed_fly_hover">
-                      <span class="sheet-english">Hover</span>
-                      <span class="sheet-german">Schweben</span>
-                  </label>
-                  <input class="sheet-center" type="text" name="attr_speed_fly">
-                  <div class="sheet-wrap-box-title">
-                    <span class="sheet-english">Fly</span>
-                    <span class="sheet-german">Fliegen</span>
-                  </div>
-                </div>
-                <div class="sheet-col-1-4 sheet-center sheet-mar-t-lg sheet-pad-l-md">
-                  <input class="sheet-center" type="text" name="attr_speed_swim">
-                  <div class="sheet-wrap-box-title">
-                    <span class="sheet-english">Swim</span>
-                    <span class="sheet-german">Schwimmen</span>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
         <div class="sheet-row sheet-proficiency-bonus sheet-mar-b-md">
           <div class="sheet-col-1">
             <div class="sheet-wrap-box" title="This is a bonus for you being proficient in a given task. This bonus automatically increases as you level up and is used automatically in various rolls">
               <div class="sheet-col-1-5 sheet-vert-middle">
-                <input class="sheet-no-spin" type="number" name="attr_PB" value="[[(2 + floor(abs((@{level}-1)/4)))]]" disabled="disabled">
+                <input class="sheet-no-spin sheet-bold" type="number" name="attr_PB" value="[[(2 + floor(abs((@{level}-1)/4)))]]" disabled="disabled">
                 <input type="hidden" name="attr_exp" value="[[(2*@{PB})]]" disabled="disabled">
                 <input type="hidden" name="attr_h_PB" value="[[floor(@{PB}/2)]]" disabled="disabled">
               </div>
diff --git a/D&D_5e_Shaped/precompiled/pages/core.html b/D&D_5e_Shaped/precompiled/pages/core.html
index 3d4c75652c..25786e1d06 100644
--- a/D&D_5e_Shaped/precompiled/pages/core.html
+++ b/D&D_5e_Shaped/precompiled/pages/core.html
@@ -73,7 +73,7 @@
               <input class="sheet-center sheet-no-spin" type="number" name="attr_strength_save_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_strength_save_mod" value="@{strength_mod} + @{strength_save_prof} + @{strength_save_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-save-total" type="number" name="attr_strength_save_mod" value="@{strength_mod} + @{strength_save_prof} + @{strength_save_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col sheet-center sheet-vert-middle">
               <button type="roll" name="roll_Strength_Save" value="@{output_option} &{template:5eDefault} {{save=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=Strength}} {{subheader=Saving Throw}} {{rollname=Result}} {{roll=[[ d20 + @{strength_save_mod} + (@{global_saving_bonus}) ]]}} {{rolladv=[[ d20 + @{strength_save_mod} + (@{global_saving_bonus}) ]]}} @{classactionstrengthsave}">
@@ -129,7 +129,7 @@
               <input class="sheet-no-spin" type="number" name="attr_basic_strength_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_basic_strength_check_mod" value="@{strength_mod} + @{basic_strength_bonus} + @{jack_of_all_trades}" disabled="disabled">
+              <input class="sheet-no-spin sheet-check-total" type="number" name="attr_basic_strength_check_mod" value="@{strength_mod} + @{basic_strength_bonus} + @{jack_of_all_trades}" disabled="disabled">
             </div>
           </div>
           <div class="sheet-row">
@@ -140,7 +140,7 @@
               <input class="sheet-center sheet-no-spin" type="number" name="attr_dexterity_save_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_dexterity_save_mod" value="@{dexterity_mod} + @{dexterity_save_prof} + @{dexterity_save_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-save-total" type="number" name="attr_dexterity_save_mod" value="@{dexterity_mod} + @{dexterity_save_prof} + @{dexterity_save_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col sheet-center sheet-vert-middle">
               <button type="roll" name="roll_Dexterity_Save" value="@{output_option} &{template:5eDefault} {{save=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=Dexterity}} {{subheader=Saving Throw}} {{rollname=Result}} {{roll=[[ d20 + @{dexterity_save_mod} + (@{global_saving_bonus}) ]]}} {{rolladv=[[ d20 + @{dexterity_save_mod} + (@{global_saving_bonus}) ]]}} @{classactiondexteritysave}">
@@ -204,7 +204,7 @@
               <input class="sheet-no-spin" type="number" name="attr_basic_dexterity_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_basic_dexterity_check_mod" value="@{dexterity_mod} + @{basic_dexterity_bonus} + @{jack_of_all_trades}" disabled="disabled">
+              <input class="sheet-no-spin sheet-check-total" type="number" name="attr_basic_dexterity_check_mod" value="@{dexterity_mod} + @{basic_dexterity_bonus} + @{jack_of_all_trades}" disabled="disabled">
             </div>
           </div>
           <div class="sheet-row">
@@ -215,7 +215,7 @@
               <input class="sheet-center sheet-no-spin" type="number" name="attr_constitution_save_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_constitution_save_mod" value="@{constitution_mod} + @{constitution_save_prof} + @{constitution_save_bonus}" disabled="disabled"></div>
+              <input class="sheet-no-spin sheet-save-total" type="number" name="attr_constitution_save_mod" value="@{constitution_mod} + @{constitution_save_prof} + @{constitution_save_bonus}" disabled="disabled"></div>
             <div class="sheet-col sheet-center sheet-vert-middle">
               <button type="roll" name="roll_Constitution_Save" value="@{output_option} &{template:5eDefault} {{save=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=Constitution}} {{subheader=Saving Throw}} {{rollname=Result}} {{roll=[[ d20 + @{constitution_save_mod} + (@{global_saving_bonus}) ]]}} {{rolladv=[[ d20 + @{constitution_save_mod} + (@{global_saving_bonus}) ]]}} @{classactionconstitutionsave}">
                 <span class="sheet-pictos sheet-vert-top">k</span>
@@ -266,7 +266,7 @@
               <input class="sheet-no-spin" type="number" name="attr_basic_constitution_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_basic_constitution_check_mod" value="@{constitution_mod} + @{basic_constitution_bonus} + @{jack_of_all_trades}" disabled="disabled">
+              <input class="sheet-no-spin sheet-check-total" type="number" name="attr_basic_constitution_check_mod" value="@{constitution_mod} + @{basic_constitution_bonus} + @{jack_of_all_trades}" disabled="disabled">
             </div>
           </div>
           <div class="sheet-row">
@@ -277,7 +277,7 @@
               <input class="sheet-center sheet-no-spin" type="number" name="attr_intelligence_save_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_intelligence_save_mod" value="@{intelligence_mod} + @{intelligence_save_prof} + @{intelligence_save_bonus}" disabled="disabled"></div>
+              <input class="sheet-no-spin sheet-save-total" type="number" name="attr_intelligence_save_mod" value="@{intelligence_mod} + @{intelligence_save_prof} + @{intelligence_save_bonus}" disabled="disabled"></div>
             <div class="sheet-col sheet-center sheet-vert-middle">
               <button type="roll" name="roll_Intelligence_Save" value="@{output_option} &{template:5eDefault} {{save=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=Intelligence}} {{subheader=Saving Throw}} {{rollname=Result}} {{roll=[[ d20 + @{intelligence_save_mod} + (@{global_saving_bonus}) ]]}} {{rolladv=[[ d20 + @{intelligence_save_mod} + (@{global_saving_bonus}) ]]}} @{classactionintelligencesave}">
                 <span class="sheet-pictos sheet-vert-top">k</span>
@@ -332,7 +332,7 @@
               <input class="sheet-no-spin" type="number" name="attr_basic_intelligence_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_basic_intelligence_check_mod" value="@{intelligence_mod} + @{basic_intelligence_bonus} + @{jack_of_all_trades}" disabled="disabled">
+              <input class="sheet-no-spin sheet-check-total" type="number" name="attr_basic_intelligence_check_mod" value="@{intelligence_mod} + @{basic_intelligence_bonus} + @{jack_of_all_trades}" disabled="disabled">
             </div>
           </div>
           <div class="sheet-row">
@@ -343,7 +343,7 @@
               <input class="sheet-center sheet-no-spin" type="number" name="attr_wisdom_save_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_wisdom_save_mod" value="@{wisdom_mod} + @{wisdom_save_prof} + @{wisdom_save_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-save-total" type="number" name="attr_wisdom_save_mod" value="@{wisdom_mod} + @{wisdom_save_prof} + @{wisdom_save_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col sheet-center sheet-vert-middle">
               <button type="roll" name="roll_Wisdom_Save" value="@{output_option} &{template:5eDefault} {{save=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=Wisdom}} {{subheader=Saving Throw}} {{rollname=Result}} {{roll=[[ d20 + @{wisdom_save_mod} + (@{global_saving_bonus}) ]]}} {{rolladv=[[ d20 + @{wisdom_save_mod} + (@{global_saving_bonus}) ]]}} @{classactionwisdomsave}">
@@ -383,7 +383,7 @@
               <input class="sheet-no-spin" type="number" name="attr_basic_wisdom_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_basic_wisdom_check_mod" value="@{wisdom_mod} + @{basic_wisdom_bonus} + @{jack_of_all_trades}" disabled="disabled">
+              <input class="sheet-no-spin sheet-check-total" type="number" name="attr_basic_wisdom_check_mod" value="@{wisdom_mod} + @{basic_wisdom_bonus} + @{jack_of_all_trades}" disabled="disabled">
             </div>
           </div>
           <div class="sheet-row">
@@ -394,7 +394,7 @@
               <input class="sheet-center sheet-no-spin" type="number" name="attr_charisma_save_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_charisma_save_mod" value="@{charisma_mod} + @{charisma_save_prof} + @{charisma_save_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-save-total" type="number" name="attr_charisma_save_mod" value="@{charisma_mod} + @{charisma_save_prof} + @{charisma_save_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col sheet-center sheet-vert-middle">
               <button type="roll" name="roll_Charisma_Save" value="@{output_option} &{template:5eDefault} {{save=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=Charisma}} {{subheader=Saving Throw}} {{rollname=Result}} {{roll=[[ d20 + @{charisma_save_mod} + (@{global_saving_bonus}) ]]}} {{rolladv=[[ d20 + @{charisma_save_mod} + (@{global_saving_bonus}) ]]}} @{classactioncharismasave}">
@@ -431,7 +431,7 @@
               <input class="sheet-no-spin" type="number" name="attr_basic_charisma_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-8 sheet-center sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_basic_charisma_check_mod" value="@{charisma_mod} + @{basic_charisma_bonus} + @{jack_of_all_trades}" disabled="disabled">
+              <input class="sheet-no-spin sheet-check-total" type="number" name="attr_basic_charisma_check_mod" value="@{charisma_mod} + @{basic_charisma_bonus} + @{jack_of_all_trades}" disabled="disabled">
             </div>
           </div>
           <div class="sheet-row">
@@ -464,7 +464,7 @@
               <input class="sheet-no-spin" type="number" name="attr_acrobatics_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_acrobatics" value="@{acrobatics_prof_exp} + @{acrobatics_attribute} + @{acrobatics_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_acrobatics" value="@{acrobatics_prof_exp} + @{acrobatics_attribute} + @{acrobatics_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -512,7 +512,7 @@
               <input class="sheet-no-spin" type="number" name="attr_animalhandling_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_animalhandling" value="@{animalhandling_prof_exp} + @{animalhandling_attribute} + @{animalhandling_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_animalhandling" value="@{animalhandling_prof_exp} + @{animalhandling_attribute} + @{animalhandling_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -560,7 +560,7 @@
               <input class="sheet-no-spin" type="number" name="attr_arcana_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_arcana" value="@{arcana_prof_exp} + @{arcana_attribute} + @{arcana_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_arcana" value="@{arcana_prof_exp} + @{arcana_attribute} + @{arcana_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -608,7 +608,7 @@
               <input class="sheet-no-spin" type="number" name="attr_athletics_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_athletics" value="@{athletics_prof_exp} + @{athletics_attribute} + @{athletics_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_athletics" value="@{athletics_prof_exp} + @{athletics_attribute} + @{athletics_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -670,7 +670,7 @@
               <input class="sheet-no-spin" type="number" name="attr_deception_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_deception" value="@{deception_prof_exp} + @{deception_attribute} + @{deception_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_deception" value="@{deception_prof_exp} + @{deception_attribute} + @{deception_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -718,7 +718,7 @@
               <input class="sheet-no-spin" type="number" name="attr_history_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_history" value="@{history_prof_exp} + @{history_attribute} + @{history_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_history" value="@{history_prof_exp} + @{history_attribute} + @{history_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -765,7 +765,7 @@
               <input class="sheet-no-spin" type="number" name="attr_insight_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_insight" value="@{insight_prof_exp} + @{insight_attribute} + @{insight_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_insight" value="@{insight_prof_exp} + @{insight_attribute} + @{insight_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -813,7 +813,7 @@
               <input class="sheet-no-spin" type="number" name="attr_intimidation_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_intimidation" value="@{intimidation_prof_exp} + @{intimidation_attribute} + @{intimidation_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_intimidation" value="@{intimidation_prof_exp} + @{intimidation_attribute} + @{intimidation_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -861,7 +861,7 @@
               <input class="sheet-no-spin" type="number" name="attr_investigation_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_investigation" value="@{investigation_prof_exp} + @{investigation_attribute} + @{investigation_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_investigation" value="@{investigation_prof_exp} + @{investigation_attribute} + @{investigation_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -909,7 +909,7 @@
               <input class="sheet-no-spin" type="number" name="attr_medicine_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_medicine" value="@{medicine_prof_exp} + @{medicine_attribute} + @{medicine_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_medicine" value="@{medicine_prof_exp} + @{medicine_attribute} + @{medicine_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -957,7 +957,7 @@
               <input class="sheet-no-spin" type="number" name="attr_nature_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_nature" value="@{nature_prof_exp} + @{nature_attribute} + @{nature_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_nature" value="@{nature_prof_exp} + @{nature_attribute} + @{nature_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -1005,7 +1005,7 @@
               <input class="sheet-no-spin" type="number" name="attr_perception_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_perception" value="@{perception_prof_exp} + @{perception_attribute} + @{perception_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_perception" value="@{perception_prof_exp} + @{perception_attribute} + @{perception_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -1053,7 +1053,7 @@
               <input class="sheet-no-spin" type="number" name="attr_performance_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_performance" value="@{performance_prof_exp} + @{performance_attribute} + @{performance_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_performance" value="@{performance_prof_exp} + @{performance_attribute} + @{performance_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -1101,7 +1101,7 @@
               <input class="sheet-no-spin" type="number" name="attr_persuasion_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_persuasion" value="@{persuasion_prof_exp} + @{persuasion_attribute} + @{persuasion_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_persuasion" value="@{persuasion_prof_exp} + @{persuasion_attribute} + @{persuasion_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -1149,7 +1149,7 @@
               <input class="sheet-no-spin" type="number" name="attr_religion_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_religion" value="@{religion_prof_exp} + @{religion_attribute} + @{religion_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_religion" value="@{religion_prof_exp} + @{religion_attribute} + @{religion_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -1197,7 +1197,7 @@
               <input class="sheet-no-spin" type="number" name="attr_sleightofhand_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_sleightofhand" value="@{sleightofhand_prof_exp} + @{sleightofhand_attribute} + @{sleightofhand_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_sleightofhand" value="@{sleightofhand_prof_exp} + @{sleightofhand_attribute} + @{sleightofhand_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -1245,7 +1245,7 @@
               <input class="sheet-no-spin" type="number" name="attr_stealth_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_stealth" value="@{stealth_prof_exp} + @{stealth_attribute} + @{stealth_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_stealth" value="@{stealth_prof_exp} + @{stealth_attribute} + @{stealth_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -1293,7 +1293,7 @@
               <input class="sheet-no-spin" type="number" name="attr_survival_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_survival" value="@{survival_prof_exp} + @{survival_attribute} + @{survival_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_survival" value="@{survival_prof_exp} + @{survival_attribute} + @{survival_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm sheet-relative">
               <div class="sheet-tooltip sheet-inline">
@@ -1345,7 +1345,7 @@
               <input class="sheet-no-spin" type="number" name="attr_custom_skill_1_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_custom_skill_1" value="@{custom_skill_1_prof_exp} + @{custom_skill_1_attribute} + @{custom_skill_1_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_custom_skill_1" value="@{custom_skill_1_prof_exp} + @{custom_skill_1_attribute} + @{custom_skill_1_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm">
               <div class="sheet-row">
@@ -1388,7 +1388,7 @@
               <input class="sheet-no-spin" type="number" name="attr_custom_skill_2_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_custom_skill_2" value="@{custom_skill_2_prof_exp} + @{custom_skill_2_attribute} + @{custom_skill_2_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_custom_skill_2" value="@{custom_skill_2_prof_exp} + @{custom_skill_2_attribute} + @{custom_skill_2_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm">
               <div class="sheet-row">
@@ -1431,7 +1431,7 @@
               <input class="sheet-no-spin" type="number" name="attr_custom_skill_3_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_custom_skill_3" value="@{custom_skill_3_prof_exp} + @{custom_skill_3_attribute} + @{custom_skill_3_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_custom_skill_3" value="@{custom_skill_3_prof_exp} + @{custom_skill_3_attribute} + @{custom_skill_3_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm">
               <div class="sheet-row">
@@ -1474,7 +1474,7 @@
               <input class="sheet-no-spin" type="number" name="attr_custom_skill_4_bonus" value="0" step="1">
             </div>
             <div class="sheet-col-1-9 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_custom_skill_4" value="@{custom_skill_4_prof_exp} + @{custom_skill_4_attribute} + @{custom_skill_4_bonus}" disabled="disabled">
+              <input class="sheet-no-spin sheet-skill-total" type="number" name="attr_custom_skill_4" value="@{custom_skill_4_prof_exp} + @{custom_skill_4_attribute} + @{custom_skill_4_bonus}" disabled="disabled">
             </div>
             <div class="sheet-col-8-15 sheet-vert-middle sheet-pad-l-sm">
               <div class="sheet-row">
@@ -1567,15 +1567,6 @@
             <div class="sheet-wrap-box-title">Initiative</div>
           </div>
         </div>
-        <div class="sheet-col-3-10 sheet-center sheet-pad-l-md">
-          <div class="sheet-wrap-box sheet-speed">
-            <input class="sheet-center sheet-mar-t-lg" type="text" name="attr_speed">
-            <div class="sheet-wrap-box-title">
-              <span class="sheet-english">Speed</span>
-              <span class="sheet-german">Gesch</span>
-            </div>
-          </div>
-        </div>
       </div>
       <div class="sheet-row sheet-mar-b-sm">
         <div class="sheet-col-1">
@@ -1628,15 +1619,13 @@
               </div>
             </div>
             <div class="sheet-row sheet-sub-header">
-              <div class="sheet-col-1-4 sheet-center sheet-small-label sheet-sub-header sheet-pad-r-sm">
+              <div class="sheet-col-1-3 sheet-center sheet-small-label sheet-sub-header sheet-pad-r-sm">
                 <span class="sheet-english">Current</span>
                 <span class="sheet-german">Aktuell</span>
               </div>
-              <div class="sheet-col-1-4 sheet-center sheet-small-label sheet-sub-header">
-                <span>
-                  <span class="sheet-english">Max</span>
-                  <span class="sheet-german">Max</span>
-                </span>
+              <div class="sheet-col-1-3 sheet-center sheet-small-label sheet-sub-header">
+                <span class="sheet-english">Max</span>
+                <span class="sheet-german">Max</span>
               </div>
               <div class="sheet-col-3-10 sheet-center sheet-small-label sheet-sub-header">
                 <span class="sheet-english">Hit Die</span>
@@ -1644,10 +1633,10 @@
               </div>
             </div>
             <div class="sheet-row sheet-npc-version">
-              <div class="sheet-col-1-4 sheet-vert-middle sheet-pad-r-sm">
+              <div class="sheet-col-1-3 sheet-vert-middle sheet-pad-r-sm">
                 <input type="number" name="attr_hd_d4" min="0" step="1">
               </div>
-              <div class="sheet-col-1-4 sheet-vert-middle">
+              <div class="sheet-col-1-3 sheet-vert-middle">
                 <input type="number" name="attr_hd_d4_max">
               </div>
               <div class="sheet-col-3-10 sheet-center sheet-hd-row sheet-vert-middle">
@@ -1816,6 +1805,55 @@
       </div>
     </div>
     <div class="sheet-col-17 sheet-pad-l-sm sheet-pad-r-sm">
+      <div class="sheet-row sheet-mar-b-md">
+        <div class="sheet-col-speed-wrapper">
+          <div class="sheet-wrap-box sheet-speed">
+            <div class="sheet-row">
+              <div class="sheet-col-1-5 sheet-center sheet-mar-t-lg sheet-pad-r-md">
+                <input class="sheet-center" type="text" name="attr_speed">
+                <div class="sheet-wrap-box-title">
+                  <span class="sheet-english">Speed</span>
+                  <span class="sheet-german">Gesch</span>
+                </div>
+              </div>
+              <div class="sheet-col-1-5 sheet-center sheet-mar-t-lg">
+                <input class="sheet-center" type="text" name="attr_speed_burrow">
+                <div class="sheet-wrap-box-title">
+                  <span class="sheet-english">Burrow</span>
+                  <span class="sheet-german">Graben</span>
+                </div>
+              </div>
+              <div class="sheet-col-1-5 sheet-center sheet-mar-t-lg sheet-pad-l-md">
+                <input class="sheet-center" type="text" name="attr_speed_climb">
+                <div class="sheet-wrap-box-title">
+                  <span class="sheet-english">Climb</span>
+                  <span class="sheet-german">Klettern</span>
+                </div>
+              </div>
+              <div class="sheet-col-1-5 sheet-center sheet-pad-l-md">
+                <label class="sheet-checkbox-label-sm">
+                  <input type="checkbox" name="attr_speed_fly_hover"><span class="sheet-inline-block">
+                    <span class="sheet-english">Hover</span>
+                    <span class="sheet-german">Schweben</span>
+                  </span>
+                </label>
+                <input class="sheet-center" type="text" name="attr_speed_fly">
+                <div class="sheet-wrap-box-title">
+                  <span class="sheet-english">Fly</span>
+                  <span class="sheet-german">Fliegen</span>
+                </div>
+              </div>
+              <div class="sheet-col-1-5 sheet-center sheet-mar-t-lg sheet-pad-l-md">
+                <input class="sheet-center" type="text" name="attr_speed_swim">
+                <div class="sheet-wrap-box-title">
+                  <span class="sheet-english">Swim</span>
+                  <span class="sheet-german">Schwimmen</span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
       <div class="sheet-row sheet-pc-version sheet-inspiration sheet-mar-b-md">
         <div class="sheet-col-1">
           <div class="sheet-wrap-box" title="Inspiration">
@@ -1836,7 +1874,7 @@
         <div class="sheet-col-1">
           <div class="sheet-wrap-box sheet-relative">
             <div class="sheet-col-1-5 sheet-vert-middle">
-              <input type="number" name="attr_exhaustion_level" min="0" max="6">
+              <input class="sheet-no-spin sheet-bold" type="number" name="attr_exhaustion_level" min="0" max="6">
             </div>
             <span class="sheet-wrap-box-title">
               <span class="sheet-english">Exhaustion Level</span>
@@ -1910,52 +1948,11 @@
           </div>
         </div>
       </div>
-      <div class="sheet-row sheet-npc-version sheet-mar-b-md">
-        <div class="sheet-col-1">
-          <div class="sheet-wrap-box sheet-speed">
-            <div class="sheet-row">
-              <div class="sheet-col-1-4 sheet-center sheet-mar-t-lg">
-                <input class="sheet-center" type="text" name="attr_speed_burrow">
-                <div class="sheet-wrap-box-title">
-                  <span class="sheet-english">Burrow</span>
-                  <span class="sheet-german">Graben</span>
-                </div>
-              </div>
-              <div class="sheet-col-1-4 sheet-center sheet-mar-t-lg sheet-pad-l-md">
-                <input class="sheet-center" type="text" name="attr_speed_climb">
-                <div class="sheet-wrap-box-title">
-                  <span class="sheet-english">Climb</span>
-                  <span class="sheet-german">Klettern</span>
-                </div>
-              </div>
-              <div class="sheet-col-1-4 sheet-center sheet-pad-l-md">
-                <label class="sheet-checkbox-label-sm">
-                  <input type="checkbox" name="attr_speed_fly_hover">
-                    <span class="sheet-english">Hover</span>
-                    <span class="sheet-german">Schweben</span>
-                </label>
-                <input class="sheet-center" type="text" name="attr_speed_fly">
-                <div class="sheet-wrap-box-title">
-                  <span class="sheet-english">Fly</span>
-                  <span class="sheet-german">Fliegen</span>
-                </div>
-              </div>
-              <div class="sheet-col-1-4 sheet-center sheet-mar-t-lg sheet-pad-l-md">
-                <input class="sheet-center" type="text" name="attr_speed_swim">
-                <div class="sheet-wrap-box-title">
-                  <span class="sheet-english">Swim</span>
-                  <span class="sheet-german">Schwimmen</span>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
       <div class="sheet-row sheet-proficiency-bonus sheet-mar-b-md">
         <div class="sheet-col-1">
           <div class="sheet-wrap-box" title="This is a bonus for you being proficient in a given task. This bonus automatically increases as you level up and is used automatically in various rolls">
             <div class="sheet-col-1-5 sheet-vert-middle">
-              <input class="sheet-no-spin" type="number" name="attr_PB" value="[[(2 + floor(abs((@{level}-1)/4)))]]" disabled="disabled">
+              <input class="sheet-no-spin sheet-bold" type="number" name="attr_PB" value="[[(2 + floor(abs((@{level}-1)/4)))]]" disabled="disabled">
               <input type="hidden" name="attr_exp" value="[[(2*@{PB})]]" disabled="disabled">
               <input type="hidden" name="attr_h_PB" value="[[floor(@{PB}/2)]]" disabled="disabled">
             </div>
diff --git a/D&D_5e_Shaped/precompiled/pages/header.html b/D&D_5e_Shaped/precompiled/pages/header.html
index 5a66e1e916..e8c7dfb441 100644
--- a/D&D_5e_Shaped/precompiled/pages/header.html
+++ b/D&D_5e_Shaped/precompiled/pages/header.html
@@ -74,21 +74,7 @@
               <span class="sheet-german">P Wahr</span>
             </div>
           </div>
-          <div class="sheet-col-1-8 sheet-vert-middle sheet-pad-r-sm">
-            <input class="sheet-center" type="text" name="attr_darkvision">
-            <div class="sheet-wrap-box-label sheet-center">
-              <span class="sheet-english">Darkvision</span>
-              <span class="sheet-german">Dunkelsicht</span>
-            </div>
-          </div>
-          <div class="sheet-col-6-17 sheet-vert-middle sheet-pc-version-inline-block sheet-pad-r-sm">
-            <input type="text" name="attr_background_name">
-            <div class="sheet-wrap-box-label">
-              <span class="sheet-english">Background</span>
-              <span class="sheet-german">Hintergrund</span>
-            </div>
-          </div>
-          <div class="sheet-col-1-8 sheet-vert-middle sheet-relative sheet-npc-version-inline-block sheet-pad-r-sm">
+          <div class="sheet-col-1-8 sheet-vert-middle sheet-relative sheet-pad-r-sm">
             <label class="sheet-checkbox-label-sm sheet-absolute">
               <input type="checkbox" name="attr_blindsight_blind_beyond"><span class="sheet-english">blind beyond</span><span class="sheet-german">blind nach</span>
             </label>
@@ -98,6 +84,20 @@
               <span class="sheet-german">Blindsicht</span>
             </div>
           </div>
+          <div class="sheet-col-1-8 sheet-vert-middle sheet-pad-r-sm">
+            <input class="sheet-center" type="text" name="attr_darkvision">
+            <div class="sheet-wrap-box-label sheet-center">
+              <span class="sheet-english">Darkvision</span>
+              <span class="sheet-german">Dunkelsicht</span>
+            </div>
+          </div>
+          <div class="sheet-col-23 sheet-vert-middle sheet-pc-version-inline-block sheet-pad-r-sm">
+            <input type="text" name="attr_background_name">
+            <div class="sheet-wrap-box-label">
+              <span class="sheet-english">Background</span>
+              <span class="sheet-german">Hintergrund</span>
+            </div>
+          </div>
           <div class="sheet-col-1-8 sheet-vert-middle sheet-npc-version-inline-block sheet-pad-l-sm">
             <input class="sheet-center" type="text" name="attr_tremorsense">
             <div class="sheet-wrap-box-label sheet-center sheet-header-label-sm">