diff --git a/5eShaped/precompiled/components/npc/savingThrows.html b/5eShaped/precompiled/components/npc/savingThrows.html
index feaedd637b..1c9854fb16 100644
--- a/5eShaped/precompiled/components/npc/savingThrows.html
+++ b/5eShaped/precompiled/components/npc/savingThrows.html
@@ -2,8 +2,8 @@
 
 <div class="saving-throws shaped-row flex-end">
   <span class="heading" data-i18n="SAVING_THROWS"></span>
-  <span class="default-saving-throw">
-    <span class="pad-l-sm"></span>
+  <span class="pad-l-sm"></span>
+  <div class="shaped-row default-saving-throw">
     <span class="edit">
       <input type="checkbox" name="attr_strength_save_prof" value="@{PB}">
     </span>
@@ -15,6 +15,8 @@
       <span name="attr_strength_saving_throw_mod_with_sign" class="inline-block center"></span>
     </button>
     <span class="pad-r-sm">,</span>
+  </div>
+  <div class="shaped-row default-saving-throw">
     <span class="edit border-left pad-l-sm">
       <input type="checkbox" name="attr_dexterity_save_prof" value="@{PB}">
     </span>
@@ -37,6 +39,8 @@
       <span name="attr_constitution_saving_throw_mod_with_sign" class="inline-block center"></span>
     </button>
     <span class="pad-r-sm">,</span>
+  </div>
+  <div class="shaped-row default-saving-throw">
     <span class="edit border-left pad-l-sm">
       <input type="checkbox" name="attr_intelligence_save_prof" value="@{PB}">
     </span>
@@ -59,6 +63,8 @@
       <span name="attr_wisdom_saving_throw_mod_with_sign" class="inline-block center"></span>
     </button>
     <span class="pad-r-sm">,</span>
+  </div>
+  <div class="shaped-row default-saving-throw">
     <span class="edit border-left pad-l-sm">
       <input type="checkbox" name="attr_charisma_save_prof" value="@{PB}">
     </span>
@@ -69,8 +75,8 @@
       <span data-i18n="CHA"></span>
       <span name="attr_charisma_saving_throw_mod_with_sign" class="inline-block center"></span>
     </button>
-  </span>
-  <span class="custom-saving-throw">
+  </div>
+  <div class="shaped-row custom-saving-throw">
     <span class="edit">
       <input type="checkbox" name="attr_fortitude_save_prof" value="@{PB}">
     </span>
@@ -81,8 +87,8 @@
       <span data-i18n="FORT"></span>
       <span name="attr_fortitude_saving_throw_mod_with_sign" class="inline-block center"></span>
     </button>
-  </span>
-  <span class="custom-saving-throw">
+  </div>
+  <div class="shaped-row custom-saving-throw">
     <span class="pad-r-sm">,</span>
     <span class="edit border-left pad-l-sm">
       <input type="checkbox" name="attr_reflex_save_prof" value="@{PB}">
@@ -94,8 +100,8 @@
       <span data-i18n="REF"></span>
       <span name="attr_reflex_saving_throw_mod_with_sign" class="inline-block center"></span>
     </button>
-  </span>
-  <span class="custom-saving-throw">
+  </div>
+  <div class="shaped-row custom-saving-throw">
     <span class="pad-r-sm">,</span>
     <span class="edit border-left pad-l-sm">
       <input type="checkbox" name="attr_will_save_prof" value="@{PB}">
@@ -107,5 +113,5 @@
       <span data-i18n="WILL"></span>
       <span name="attr_will_saving_throw_mod_with_sign" class="inline-block center"></span>
     </button>
-  </span>
+  </div>
 </div>
\ No newline at end of file