diff --git a/5eShaped/precompiled/components/actionComponents/qtyWeight.html b/5eShaped/precompiled/components/actionComponents/qtyWeight.html
index 4015ae6ba3..0feff5cd58 100644
--- a/5eShaped/precompiled/components/actionComponents/qtyWeight.html
+++ b/5eShaped/precompiled/components/actionComponents/qtyWeight.html
@@ -6,9 +6,4 @@
 <div class="3-rem center edit">
   <input type="number" name="attr_weight" class="no-spin" value="0" step=".001" accept="Weight">
   <div class="small-label center" data-i18n="WEIGHT"></div>
-</div>
-<div class="center edit">=</div>
-<div class="3-rem center">
-  <span name="attr_weight_total" class="pseudo-input center border-bottom"></span>
-  <div class="small-label center" data-i18n="WEIGHT"></div>
 </div>
\ No newline at end of file
diff --git a/5eShaped/precompiled/components/core/armor.html b/5eShaped/precompiled/components/core/armor.html
index bdfd941c80..fba9ad8ec8 100644
--- a/5eShaped/precompiled/components/core/armor.html
+++ b/5eShaped/precompiled/components/core/armor.html
@@ -1,16 +1,17 @@
 <div>
   <div class="shaped-row">
     <div class="col-05"></div>
-    <div class="9-rem wrap-box-label light-label pad-l-sm pad-r-sm" data-i18n="ARMOR"></div>
+    <div class="7-rem wrap-box-label light-label pad-l-sm pad-r-sm" data-i18n="ARMOR"></div>
     <div class="4-rem wrap-box-label light-label center pad-r-sm" data-i18n="USES"></div>
     <div class="2-rem wrap-box-label light-label center" data-i18n="AC"></div>
+    <div class="3-rem wrap-box-label light-label center" data-i18n="WEIGHT"></div>
   </div>
   <fieldset class="repeating_armor">
     <div class="shaped-row compendium-drop-target vert-center">
       <div class="col-05 center">
         <input type="checkbox" name="attr_worn" class="small-checkbox" checked>
       </div>
-      <div class="9-rem pad-l-sm pad-r-sm">
+      <div class="7-rem pad-l-sm pad-r-sm">
         <button type="roll" name="roll_armor" class="presentation wrapper-button" value="@{output_option} &{template:5e-shaped} {{character_name=@{character_name}}} @{show_character_name} {{title=@{name}}} {{armor=1}} {{text_big=AC [[@{ac_base}[ac] + @{ac_bonus}[bonus ac]]]}} {{uses=@{uses}}} {{uses_max=@{uses|max}}}">
           <span name="attr_name"></span>
         </button>
@@ -38,11 +39,15 @@
       <div class="2-rem center pad-r-sm">
         <span name="attr_ac_total"></span>
       </div>
+      <div class="3-rem center pad-r-sm">
+        <span name="attr_weight" class="presentation"></span>
+        <input type="number" name="attr_weight" class="edit no-spin" step=".001" accept="Weight">
+      </div>
     </div>
     <input type="checkbox" name="attr_toggle_details" class="toggle-icon-settings edit"><span class="toggle-icon-settings pictos edit">y</span>
     <div class="details edit mar-t-smd">
       <div class="shaped-row vert-center">
-        <div class="4-rem center">
+        <div class="5-rem center">
           <select name="attr_type" accept="Item Type">
             <option value="Light Armor" data-i18n="LIGHT_ARMOR"></option>
             <option value="Medium Armor" data-i18n="MEDIUM_ARMOR"></option>
@@ -78,10 +83,6 @@
           <input type="checkbox" name="attr_stealth" value="Disadvantage" accept="Stealth">
           <div class="small-label" data-i18n="STEALTH"></div>
         </div>
-        <div class="3-rem center pad-l-smd">
-          <input type="number" name="attr_weight" class="no-spin" step=".001" accept="Weight">
-          <div class="small-label" data-i18n="WEIGHT"></div>
-        </div>
       </div>
       <hr>
     </div>
diff --git a/5eShaped/precompiled/components/core/attacks.html b/5eShaped/precompiled/components/core/attacks.html
index e4d434d90c..2b8d1ee7e2 100644
--- a/5eShaped/precompiled/components/core/attacks.html
+++ b/5eShaped/precompiled/components/core/attacks.html
@@ -1,8 +1,9 @@
 <div class="attacks wrap-box">
   <div class="shaped-row">
-    <div class="col-35 wrap-box-label light-label pad-r-sm" data-i18n="ATTACK"></div>
-    <div class="col-08 wrap-box-label light-label center pad-r-sm" data-i18n="ATK"></div>
-    <div class="col-57 wrap-box-label light-label" data-i18n="DAMAGE"></div>
+    <div class="5-rem wrap-box-label light-label pad-r-sm" data-i18n="ATTACK"></div>
+    <div class="1-5-rem wrap-box-label light-label center pad-r-sm" data-i18n="ATK"></div>
+    <div class="7-rem wrap-box-label light-label" data-i18n="DAMAGE"></div>
+    <div class="3-rem wrap-box-label light-label" data-i18n="WEIGHT"></div>
   </div>
   <fieldset class="repeating_attack">
     <div class="attack compendium-drop-target relative mar-b-sm">
@@ -13,21 +14,24 @@
       <button type="roll" name="roll_attack"
               value="@{output_option} &{template:5e-shaped} {{character_name=@{character_name}}} @{show_character_name} {{title=@{name}}} {{action=1}} {{reach=@{reach}}} {{range=@{range}}} @{roll_toggle} @{ammo_toggle} @{saving_throw_toggle} @{damage_toggle} @{second_damage_toggle} {{uses=@{uses}}} {{uses_max=@{uses|max}}} @{attacher_attack} @{hide_gm_info} @{extras_toggle}">
         <div class="shaped-row vert-center">
-          <div class="col-35 pad-r-sm">
+          <div class="5-rem pad-r-sm">
             <input type="text" name="attr_name" readonly>
           </div>
-          <div class="col-08 pad-r-sm">
+          <div class="1-5-rem pad-r-sm">
             <input type="text" name="attr_to_hit" class="center" readonly>
           </div>
-          <div class="col-57">
+          <div class="7-rem pad-r-sm">
             <input type="text" name="attr_damage_string" readonly>
           </div>
+          <div class="3-rem">
+            <input type="text" name="attr_weight_total" readonly>
+          </div>
         </div>
       </button>
       <input type="checkbox" name="attr_toggle_details" class="toggle-icon-settings edit" checked><span class="toggle-icon-settings pictos edit">y</span>
       <div class="details edit">
         <div class="shaped-row">
-          <div class="4rem center">
+          <div class="4-rem center">
             <input type="text" name="attr_name" class="center" data-i18n-placeholder="NAME" accept="Name">
             <div class="small-label" data-i18n="NAME"></div>
           </div>
diff --git a/5eShaped/precompiled/components/core/equipmentItems.html b/5eShaped/precompiled/components/core/equipmentItems.html
index 027eb2c6f8..7864135d87 100644
--- a/5eShaped/precompiled/components/core/equipmentItems.html
+++ b/5eShaped/precompiled/components/core/equipmentItems.html
@@ -1,12 +1,13 @@
 <div class="mar-t-md">
   <div class="shaped-row vert-center">
     <div class="col-05"></div>
-    <div class="9-rem shaped-row vert-center pad-l-sm pad-r-sm">
+    <div class="7-rem shaped-row vert-center pad-l-sm pad-r-sm">
       <div data-i18n="EQUIPMENT" class="wrap-box-label light-label mar-r-md"></div>
       <input type="checkbox" name="attr_equipment_show_only_quick_items" class="toggle-equipment-only-quick-items" value="1"><span class="toggle-equipment-only-quick-items button" data-i18n="QUICK"></span>
     </div>
     <div class="4-rem wrap-box-label light-label center pad-r-sm" data-i18n="USES"></div>
     <div class="2-rem wrap-box-label light-label center" data-i18n="QTY"></div>
+    <div class="3-rem wrap-box-label light-label center" data-i18n="WEIGHT"></div>
   </div>
   <input type="hidden" name="attr_equipment_show_only_quick_items" class="toggle-equipment-only-quick-items">
   <fieldset class="repeating_equipment">
@@ -15,7 +16,7 @@
       <div class="col-05 center">
         <input type="checkbox" name="attr_carried" class="small-checkbox" checked>
       </div>
-      <div class="9-rem pad-l-sm pad-r-sm">
+      <div class="7-rem pad-l-sm pad-r-sm">
         <button type="roll" name="roll_equipment" class="presentation" value="@{output_option} &{template:5e-shaped} {{character_name=@{character_name}}} @{show_character_name} {{title=@{name}}} {{equipment=1}} {{text=@{content}}} {{uses=@{uses}}} {{uses_max=@{uses|max}}}">
           <span name="attr_name"></span>
         </button>
@@ -35,9 +36,12 @@
           </div>
         </div>
       </div>
-      <div class="2-rem">
+      <div class="2-rem pad-r-sm">
         <input type="number" name="attr_qty" class="no-spin no-border" value="1" min="0" step="1">
       </div>
+      <div class="3-rem center">
+        <span name="attr_weight_total"></span>
+      </div>
     </div>
     <input type="checkbox" name="attr_toggle_details" class="toggle-icon-settings edit"><span class="toggle-icon-settings pictos edit">y</span>
     <div class="details edit mar-t-smd">