diff --git a/D&D_5e_Reshaped/precompiled/components/core/equipment.html b/D&D_5e_Reshaped/precompiled/components/core/equipment.html
index a42d9079b0..ef4908a76b 100644
--- a/D&D_5e_Reshaped/precompiled/components/core/equipment.html
+++ b/D&D_5e_Reshaped/precompiled/components/core/equipment.html
@@ -7,21 +7,20 @@
       <div>
         <div class="shaped-row">
           <div class="col-06"></div>
-          <div class="col-53 wrap-box-label light-label pad-l-sm pad-r-sm">{{'ARMOR' | translate}}</div>
-          <div class="col-22 wrap-box-label light-label center pad-r-sm">{{'USES' | translate}}</div>
+          <div class="col-57 wrap-box-label light-label pad-l-sm pad-r-sm">{{'ARMOR' | translate}}</div>
+          <div class="col-25 wrap-box-label light-label center pad-r-sm">{{'USES' | translate}}</div>
           <div class="col-12 wrap-box-label light-label center">{{'AC' | translate}}</div>
         </div>
         <fieldset class="repeating_armor">
-          <input type="checkbox" name="attr_toggle_details" class="toggle-icon-settings hidden">
           <div class="shaped-row compendium-drop-target vert-center">
             <div class="col-06 center">
               <input type="checkbox" name="attr_worn" checked>
             </div>
-            <div class="col-53 pad-l-sm pad-r-sm">
-              <button type="roll" name="roll_armor" class="wrapper-button" value="@{output_option} &{template:5e-shaped} {{character_name=@{character_name}}} @{show_character_name} {{title=@{name}}} {{subheader=Armor}} {{text_top=AC [[@{ac_base}[ac] + @{ac_bonus}[bonus ac]]]}} {{text=@{type}; Strength @{strength_requirements}; @{stealth}}}">
+            <div class="col-57 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}}} {{subheader=Armor}} {{text_top=AC [[@{ac_base}[ac] + @{ac_bonus}[bonus ac]]]}} {{text=@{type}; Strength @{strength_requirements}; @{stealth}}}">
                 <span name="attr_name"></span>
               </button>
-              <input type="hidden" name="attr_name" accept="Name">
+              <input type="text" name="attr_name" class="edit" accept="Name">
               <input type="hidden" name="attr_type" accept="Item Type">
               <input type="hidden" name="attr_ac_base" accept="AC">
               <input type="hidden" name="attr_ac_bonus">
@@ -30,56 +29,54 @@
               <input type="hidden" name="attr_stealth" accept="Stealth">
               <input type="hidden" name="attr_weight" accept="Weight">
             </div>
-            <div class="col-22 shaped-row flex-end no-wrap pad-r-sm">
-              <input type="checkbox" name="attr_show_uses" class="details show-uses" value="1">
-              <div class="col-47 show-uses pad-r-sm">
-                <input type="number" name="attr_uses" class="no-spin no-border" value="0" min="0" step="1">
-              </div>
-              <div class="center show-uses">/</div>
-              <div class="col-47 show-uses pad-l-sm">
-                <input type="number" name="attr_uses_max" class="no-spin no-border" value="0" min="0" step="1">
+            <div class="col-25 shaped-row flex-end no-wrap pad-r-sm">
+              <div class="shaped-row flex-end no-wrap">
+                <input type="checkbox" name="attr_show_uses" class="edit small-checkbox show-uses" value="1">
+                <div class="col-42 show-uses pad-r-sm">
+                  <input type="number" name="attr_uses" class="no-spin no-border" value="0" min="0" step="1">
+                </div>
+                <div class="show-uses">/</div>
+                <div class="col-42 show-uses pad-l-sm">
+                  <input type="number" name="attr_uses_max" class="no-spin no-border" value="0" min="0" step="1">
+                </div>
               </div>
             </div>
             <div class="col-12 center pad-r-sm">
               <span name="attr_ac_total"></span>
             </div>
           </div>
-          <input type="checkbox" name="attr_toggle_details" class="toggle-icon-settings" checked><span class="toggle-icon-settings pictos">y</span>
-          <div class="details mar-t-sm">
-          </div>
         </fieldset>
       </div>
       <hr>
       <div class="mar-t-md">
         <div class="shaped-row mar-r-md">
           <div class="col-06"></div>
-          <div class="col-53 wrap-box-label light-label pad-l-sm pad-r-sm">{{'EQUIPMENT' | translate}}</div>
-          <div class="col-22 wrap-box-label light-label center pad-r-sm">{{'USES' | translate}}</div>
+          <div class="col-57 wrap-box-label light-label pad-l-sm pad-r-sm">{{'EQUIPMENT' | translate}}</div>
+          <div class="col-25 wrap-box-label light-label center pad-r-sm">{{'USES' | translate}}</div>
           <div class="col-12 wrap-box-label light-label center">{{'QTY' | translate}}</div>
         </div>
         <div class="equipment-wrapper">
           <fieldset class="repeating_equipment">
-            <input type="checkbox" name="attr_toggle_details" class="toggle-icon-settings hidden">
             <div class="shaped-row compendium-drop-target vert-center">
               <div class="col-06 center">
                 <input type="checkbox" name="attr_carried" checked>
               </div>
-              <div class="col-53 pad-l-sm pad-r-sm">
-                <button type="roll" name="roll_equipment" value="@{output_option} &{template:5e-shaped} {{character_name=@{character_name}}} @{show_character_name} {{title=@{name}}} {{subheader=Equipment}} {{text=@{content}}}">
+              <div class="col-57 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}}} {{subheader=Equipment}} {{text=@{content}}}">
                   <span name="attr_name"></span>
                 </button>
-                <input type="hidden" name="attr_name" accept="Name">
+                <input type="text" name="attr_name" class="edit" accept="Name">
                 <input type="hidden" name="attr_content" accept="Content">
                 <input type="hidden" name="attr_weight" accept="Weight">
               </div>
-              <div class="col-22 pad-r-sm">
-                <input type="checkbox" name="attr_show_uses" class="details show-uses" value="1">
-                <div class="shaped-row flex-end show-uses">
-                  <div class="col-47 pad-r-sm">
+              <div class="col-25 pad-r-sm">
+                <div class="shaped-row flex-end no-wrap">
+                  <input type="checkbox" name="attr_show_uses" class="edit small-checkbox show-uses" value="1">
+                  <div class="col-42 show-uses pad-r-sm">
                     <input type="number" name="attr_uses" class="no-spin no-border" value="0" min="0" step="1">
                   </div>
-                  <div class="center">/</div>
-                  <div class="col-47 pad-l-sm">
+                  <div class="show-uses">/</div>
+                  <div class="col-42 show-uses pad-l-sm">
                     <input type="number" name="attr_uses_max" class="no-spin no-border" value="0" min="0" step="1">
                   </div>
                 </div>
@@ -88,10 +85,6 @@
                 <input type="number" name="attr_qty" class="no-spin no-border" value="1" min="0" step="1">
               </div>
             </div>
-            <input type="checkbox" name="attr_toggle_details" class="toggle-icon-settings" checked><span class="toggle-icon-settings pictos">y</span>
-            <div class="details mar-t-sm">
-
-            </div>
           </fieldset>
         </div>
       </div>