diff --git a/D&D_5e_Shaped/D&D_5e.css b/D&D_5e_Shaped/D&D_5e.css
index e8f2df616a..0348409eb5 100644
--- a/D&D_5e_Shaped/D&D_5e.css
+++ b/D&D_5e_Shaped/D&D_5e.css
@@ -1084,9 +1084,6 @@ div[class^="sheet-classaction-row"] {
   padding: 3px;
   background: rgb(245, 245, 245);
 }
-.sheet-section-actions .sheet-wrap-box {
-  min-height: 70px;
-}
 
 .sheet-action-button-group {
   position: absolute;
@@ -1158,6 +1155,7 @@ input[class*="sheet-action-toggle-regional-effects"]:checked ~ div div[class*="s
 input[class*="sheet-action-toggle-lair-actions"]:checked ~ div div[class*="sheet-action-toggle-lair-actions"],
 input[class*="sheet-action-toggle-legendary-actions"]:checked ~ div div[class*="sheet-action-toggle-legendary-actions"],
 input[class*="sheet-action-toggle-reactions"]:checked ~ div div[class*="sheet-action-toggle-reactions"],
+input[class*="sheet-action-toggle-multiattack"]:checked ~ div div[class*="sheet-action-toggle-multiattack"],
 input[class*="sheet-action-toggle-actions"]:checked ~ div div[class*="sheet-action-toggle-actions"] {
   display: inline-block;
 }
@@ -1274,6 +1272,7 @@ input.sheet-action-toggle-regional-effects:checked ~ span.sheet-action-toggle-re
 input.sheet-action-toggle-lair-actions:checked ~ span.sheet-action-toggle-lair-actions,
 input.sheet-action-toggle-legendary-actions:checked ~ span.sheet-action-toggle-legendary-actions,
 input.sheet-action-toggle-reactions:checked ~ span.sheet-action-toggle-reactions,
+input.sheet-action-toggle-multiattack:checked ~ span.sheet-action-toggle-multiattack,
 input.sheet-action-toggle-actions:checked ~ span.sheet-action-toggle-actions,
 input.sheet-custom-skills-toggle:checked ~ span.sheet-custom-skills-toggle {
   background: #879a6a;
diff --git a/D&D_5e_Shaped/D&D_5e.html b/D&D_5e_Shaped/D&D_5e.html
index 24f9e9a39b..dbf8afeffd 100644
--- a/D&D_5e_Shaped/D&D_5e.html
+++ b/D&D_5e_Shaped/D&D_5e.html
@@ -2,7 +2,7 @@
   <input class="sheet-is-npc" type="checkbox" name="attr_is_npc" value="1">
   <span class="sheet-is-npc-tab"></span>
   <input type="hidden" name="attr_is_pc" value="(1-@{is_npc})">
-  <span class="sheet-last-updated">Sheet version: 21st Apr 2015</span>
+  <span class="sheet-last-updated">Sheet version: 23rd Apr 2015</span>
   <div class="sheet-core-header sheet-pad-b-md">
     <div class="sheet-row">
       <div class="sheet-col-3-10">
@@ -7413,24 +7413,20 @@
 
     <div class="sheet-section-actions sheet-npc-version">
       <h4 class="sheet-center">Attacks <span class="sheet-pictos">D</span></h4>
-      <div class="sheet-col-1 sheet-center">
-        <input class="sheet-center" type="text" name="attr_multiattack">
-        <div class="sheet-small-label">Multiattack</div>
-      </div>
-
-      <span class="spacer"></span>
-
       <input type="checkbox" name="attr_toggle_regional_effects" class="sheet-action-special-actions-tab sheet-action-toggle-regional-effects"><span class="sheet-action-special-actions-tab sheet-action-toggle-regional-effects">Regional Effects</span>
       <input type="checkbox" name="attr_toggle_lair_actions" class="sheet-action-special-actions-tab sheet-action-toggle-lair-actions"><span class="sheet-action-special-actions-tab sheet-action-toggle-lair-actions">Lair Actions</span>
       <input type="checkbox" name="attr_toggle_legendary_actions" class="sheet-action-special-actions-tab sheet-action-toggle-legendary-actions"><span class="sheet-action-special-actions-tab sheet-action-toggle-legendary-actions">Legendary Actions</span>
       <input type="checkbox" name="attr_toggle_reactions" class="sheet-action-special-actions-tab sheet-action-toggle-reactions"><span class="sheet-action-special-actions-tab sheet-action-toggle-reactions">Reactions</span>
+      <input type="checkbox" name="attr_toggle_multiattack" class="sheet-action-special-actions-tab sheet-action-toggle-multiattack"><span class="sheet-action-special-actions-tab sheet-action-toggle-multiattack">Multiattack</span>
       <input type="checkbox" name="attr_toggle_actions" class="sheet-action-special-actions-tab sheet-action-toggle-actions" checked="checked"><span class="sheet-action-special-actions-tab sheet-action-toggle-actions">Actions</span>
 
       <div class="sheet-row sheet-mar-t-md">
         <div class="sheet-col-1 sheet-action-toggle-regional-effects sheet-center sheet-pad-r-md">
-          <div class="sheet-small-note">The mere presence of a legendary creature can have strange and wondrous effects on its environment, as noted in this section. Regional effects end abruptly or dissipate over time when the legendary creature dies.</div>
-          <textarea class="sheet-medium-textarea" name="attr_lair_actions"></textarea>
-          <div class="sheet-wrap-box-title">Regional Effects</div>
+          <div class="sheet-wrap-box sheet-relative sheet-mar-b-md sheet-mar-t-md">
+            <div class="sheet-small-note">The mere presence of a legendary creature can have strange and wondrous effects on its environment, as noted in this section. Regional effects end abruptly or dissipate over time when the legendary creature dies.</div>
+            <textarea class="sheet-medium-textarea" name="attr_lair_actions"></textarea>
+            <div class="sheet-wrap-box-title">Regional Effects</div>
+          </div>
           <hr>
         </div>
       </div>
@@ -7468,7 +7464,6 @@
             <input type="hidden" name="attr_repeating_lair_actions_0_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_lair_actions_0_save_dc}]]}} {{action_save_stat=@{repeating_lair_actions_0_save_stat}}} {{action_save_success=@{repeating_lair_actions_0_save_success}}}">
             <input type="hidden" name="attr_repeating_lair_actions_0_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_lair_actions_0_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_lair_actions_0_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_lair_actions_0_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_lair_actions_0_effect}}}">
-            <input type="hidden" name="attr_repeating_lair_actions_0_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_lair_actions_0_var_recharge" value="{{action_recharge=@{repeating_lair_actions_0_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_lair_actions_0_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_lair_actions_0_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -7484,24 +7479,17 @@
             <input type="checkbox" name="attr_repeating_lair_actions_0_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_lair_actions_0_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_lair_actions_0_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_lair_actions_0_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_lair_actions_0_macro_options" value="@{repeating_lair_actions_0_toggle_emote} @{repeating_lair_actions_0_toggle_attack} @{repeating_lair_actions_0_toggle_attack_adv} @{repeating_lair_actions_0_toggle_crit} @{repeating_lair_actions_0_toggle_details} @{repeating_lair_actions_0_toggle_damage} @{repeating_lair_actions_0_toggle_alt_damage} @{repeating_lair_actions_0_toggle_second_damage} @{repeating_lair_actions_0_toggle_save} @{repeating_lair_actions_0_toggle_save_damage} @{repeating_lair_actions_0_toggle_effects} @{repeating_lair_actions_0_toggle_multiattack} @{repeating_lair_actions_0_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_lair_actions_0_macro_options" value="@{repeating_lair_actions_0_toggle_emote} @{repeating_lair_actions_0_toggle_attack} @{repeating_lair_actions_0_toggle_attack_adv} @{repeating_lair_actions_0_toggle_crit} @{repeating_lair_actions_0_toggle_details} @{repeating_lair_actions_0_toggle_damage} @{repeating_lair_actions_0_toggle_alt_damage} @{repeating_lair_actions_0_toggle_second_damage} @{repeating_lair_actions_0_toggle_save} @{repeating_lair_actions_0_toggle_save_damage} @{repeating_lair_actions_0_toggle_effects} @{repeating_lair_actions_0_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_lair_actions_0_toggle_multiattack" value="@{repeating_lair_actions_0_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_lair_actions_0_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_lair_actions_0_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_lair_actions_0_type} attack}} @{repeating_lair_actions_0_macro_options}">Lair</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_lair_actions_0_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_lair_actions_0_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_lair_actions_0_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_lair_actions_0_type} attack}} @{repeating_lair_actions_0_macro_options}">Lair</button>
+                </div>
               </div>
             </div>
 
@@ -7634,7 +7622,6 @@
             <input type="hidden" name="attr_repeating_lair_actions_1_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_lair_actions_1_save_dc}]]}} {{action_save_stat=@{repeating_lair_actions_1_save_stat}}} {{action_save_success=@{repeating_lair_actions_1_save_success}}}">
             <input type="hidden" name="attr_repeating_lair_actions_1_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_lair_actions_1_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_lair_actions_1_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_lair_actions_1_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_lair_actions_1_effect}}}">
-            <input type="hidden" name="attr_repeating_lair_actions_1_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_lair_actions_1_var_recharge" value="{{action_recharge=@{repeating_lair_actions_1_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_lair_actions_1_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_lair_actions_1_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -7650,24 +7637,17 @@
             <input type="checkbox" name="attr_repeating_lair_actions_1_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_lair_actions_1_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_lair_actions_1_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_lair_actions_1_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_lair_actions_1_macro_options" value="@{repeating_lair_actions_1_toggle_emote} @{repeating_lair_actions_1_toggle_attack} @{repeating_lair_actions_1_toggle_attack_adv} @{repeating_lair_actions_1_toggle_crit} @{repeating_lair_actions_1_toggle_details} @{repeating_lair_actions_1_toggle_damage} @{repeating_lair_actions_1_toggle_alt_damage} @{repeating_lair_actions_1_toggle_second_damage} @{repeating_lair_actions_1_toggle_save} @{repeating_lair_actions_1_toggle_save_damage} @{repeating_lair_actions_1_toggle_effects} @{repeating_lair_actions_1_toggle_multiattack} @{repeating_lair_actions_1_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_lair_actions_1_macro_options" value="@{repeating_lair_actions_1_toggle_emote} @{repeating_lair_actions_1_toggle_attack} @{repeating_lair_actions_1_toggle_attack_adv} @{repeating_lair_actions_1_toggle_crit} @{repeating_lair_actions_1_toggle_details} @{repeating_lair_actions_1_toggle_damage} @{repeating_lair_actions_1_toggle_alt_damage} @{repeating_lair_actions_1_toggle_second_damage} @{repeating_lair_actions_1_toggle_save} @{repeating_lair_actions_1_toggle_save_damage} @{repeating_lair_actions_1_toggle_effects} @{repeating_lair_actions_1_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_lair_actions_1_toggle_multiattack" value="@{repeating_lair_actions_1_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_lair_actions_1_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_lair_actions_1_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_lair_actions_1_type} attack}} @{repeating_lair_actions_1_macro_options}">Lair</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_lair_actions_1_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_lair_actions_1_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_lair_actions_1_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_lair_actions_1_type} attack}} @{repeating_lair_actions_1_macro_options}">Lair</button>
+                </div>
               </div>
             </div>
 
@@ -7800,7 +7780,6 @@
             <input type="hidden" name="attr_repeating_lair_actions_2_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_lair_actions_2_save_dc}]]}} {{action_save_stat=@{repeating_lair_actions_2_save_stat}}} {{action_save_success=@{repeating_lair_actions_2_save_success}}}">
             <input type="hidden" name="attr_repeating_lair_actions_2_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_lair_actions_2_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_lair_actions_2_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_lair_actions_2_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_lair_actions_2_effect}}}">
-            <input type="hidden" name="attr_repeating_lair_actions_2_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_lair_actions_2_var_recharge" value="{{action_recharge=@{repeating_lair_actions_2_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_lair_actions_2_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_lair_actions_2_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -7816,24 +7795,17 @@
             <input type="checkbox" name="attr_repeating_lair_actions_2_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_lair_actions_2_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_lair_actions_2_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_lair_actions_2_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_lair_actions_2_macro_options" value="@{repeating_lair_actions_2_toggle_emote} @{repeating_lair_actions_2_toggle_attack} @{repeating_lair_actions_2_toggle_attack_adv} @{repeating_lair_actions_2_toggle_crit} @{repeating_lair_actions_2_toggle_details} @{repeating_lair_actions_2_toggle_damage} @{repeating_lair_actions_2_toggle_alt_damage} @{repeating_lair_actions_2_toggle_second_damage} @{repeating_lair_actions_2_toggle_save} @{repeating_lair_actions_2_toggle_save_damage} @{repeating_lair_actions_2_toggle_effects} @{repeating_lair_actions_2_toggle_multiattack} @{repeating_lair_actions_2_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_lair_actions_2_macro_options" value="@{repeating_lair_actions_2_toggle_emote} @{repeating_lair_actions_2_toggle_attack} @{repeating_lair_actions_2_toggle_attack_adv} @{repeating_lair_actions_2_toggle_crit} @{repeating_lair_actions_2_toggle_details} @{repeating_lair_actions_2_toggle_damage} @{repeating_lair_actions_2_toggle_alt_damage} @{repeating_lair_actions_2_toggle_second_damage} @{repeating_lair_actions_2_toggle_save} @{repeating_lair_actions_2_toggle_save_damage} @{repeating_lair_actions_2_toggle_effects} @{repeating_lair_actions_2_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_lair_actions_2_toggle_multiattack" value="@{repeating_lair_actions_2_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_lair_actions_2_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_lair_actions_2_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_lair_actions_2_type} attack}} @{repeating_lair_actions_2_macro_options}">Lair</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_lair_actions_2_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_lair_actions_2_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_lair_actions_2_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_lair_actions_2_type} attack}} @{repeating_lair_actions_2_macro_options}">Lair</button>
+                </div>
               </div>
             </div>
 
@@ -7966,7 +7938,6 @@
             <input type="hidden" name="attr_repeating_lair_actions_3_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_lair_actions_3_save_dc}]]}} {{action_save_stat=@{repeating_lair_actions_3_save_stat}}} {{action_save_success=@{repeating_lair_actions_3_save_success}}}">
             <input type="hidden" name="attr_repeating_lair_actions_3_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_lair_actions_3_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_lair_actions_3_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_lair_actions_3_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_lair_actions_3_effect}}}">
-            <input type="hidden" name="attr_repeating_lair_actions_3_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_lair_actions_3_var_recharge" value="{{action_recharge=@{repeating_lair_actions_3_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_lair_actions_3_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_lair_actions_3_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -7982,24 +7953,17 @@
             <input type="checkbox" name="attr_repeating_lair_actions_3_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_lair_actions_3_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_lair_actions_3_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_lair_actions_3_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_lair_actions_3_macro_options" value="@{repeating_lair_actions_3_toggle_emote} @{repeating_lair_actions_3_toggle_attack} @{repeating_lair_actions_3_toggle_attack_adv} @{repeating_lair_actions_3_toggle_crit} @{repeating_lair_actions_3_toggle_details} @{repeating_lair_actions_3_toggle_damage} @{repeating_lair_actions_3_toggle_alt_damage} @{repeating_lair_actions_3_toggle_second_damage} @{repeating_lair_actions_3_toggle_save} @{repeating_lair_actions_3_toggle_save_damage} @{repeating_lair_actions_3_toggle_effects} @{repeating_lair_actions_3_toggle_multiattack} @{repeating_lair_actions_3_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_lair_actions_3_macro_options" value="@{repeating_lair_actions_3_toggle_emote} @{repeating_lair_actions_3_toggle_attack} @{repeating_lair_actions_3_toggle_attack_adv} @{repeating_lair_actions_3_toggle_crit} @{repeating_lair_actions_3_toggle_details} @{repeating_lair_actions_3_toggle_damage} @{repeating_lair_actions_3_toggle_alt_damage} @{repeating_lair_actions_3_toggle_second_damage} @{repeating_lair_actions_3_toggle_save} @{repeating_lair_actions_3_toggle_save_damage} @{repeating_lair_actions_3_toggle_effects} @{repeating_lair_actions_3_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_lair_actions_3_toggle_multiattack" value="@{repeating_lair_actions_3_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_lair_actions_3_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_lair_actions_3_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_lair_actions_3_type} attack}} @{repeating_lair_actions_3_macro_options}">Lair</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_lair_actions_3_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_lair_actions_3_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_lair_actions_3_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_lair_actions_3_type} attack}} @{repeating_lair_actions_3_macro_options}">Lair</button>
+                </div>
               </div>
             </div>
 
@@ -8132,7 +8096,6 @@
             <input type="hidden" name="attr_repeating_lair_actions_4_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_lair_actions_4_save_dc}]]}} {{action_save_stat=@{repeating_lair_actions_4_save_stat}}} {{action_save_success=@{repeating_lair_actions_4_save_success}}}">
             <input type="hidden" name="attr_repeating_lair_actions_4_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_lair_actions_4_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_lair_actions_4_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_lair_actions_4_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_lair_actions_4_effect}}}">
-            <input type="hidden" name="attr_repeating_lair_actions_4_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_lair_actions_4_var_recharge" value="{{action_recharge=@{repeating_lair_actions_4_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_lair_actions_4_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_lair_actions_4_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -8148,24 +8111,17 @@
             <input type="checkbox" name="attr_repeating_lair_actions_4_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_lair_actions_4_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_lair_actions_4_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_lair_actions_4_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_lair_actions_4_macro_options" value="@{repeating_lair_actions_4_toggle_emote} @{repeating_lair_actions_4_toggle_attack} @{repeating_lair_actions_4_toggle_attack_adv} @{repeating_lair_actions_4_toggle_crit} @{repeating_lair_actions_4_toggle_details} @{repeating_lair_actions_4_toggle_damage} @{repeating_lair_actions_4_toggle_alt_damage} @{repeating_lair_actions_4_toggle_second_damage} @{repeating_lair_actions_4_toggle_save} @{repeating_lair_actions_4_toggle_save_damage} @{repeating_lair_actions_4_toggle_effects} @{repeating_lair_actions_4_toggle_multiattack} @{repeating_lair_actions_4_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_lair_actions_4_macro_options" value="@{repeating_lair_actions_4_toggle_emote} @{repeating_lair_actions_4_toggle_attack} @{repeating_lair_actions_4_toggle_attack_adv} @{repeating_lair_actions_4_toggle_crit} @{repeating_lair_actions_4_toggle_details} @{repeating_lair_actions_4_toggle_damage} @{repeating_lair_actions_4_toggle_alt_damage} @{repeating_lair_actions_4_toggle_second_damage} @{repeating_lair_actions_4_toggle_save} @{repeating_lair_actions_4_toggle_save_damage} @{repeating_lair_actions_4_toggle_effects} @{repeating_lair_actions_4_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_lair_actions_4_toggle_multiattack" value="@{repeating_lair_actions_4_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_lair_actions_4_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_lair_actions_4_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_lair_actions_4_type} attack}} @{repeating_lair_actions_4_macro_options}">Lair</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_lair_actions_4_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_lair_actions_4_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_lair_actions_4_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_lair_actions_4_type} attack}} @{repeating_lair_actions_4_macro_options}">Lair</button>
+                </div>
               </div>
             </div>
 
@@ -8309,7 +8265,6 @@
             <input type="hidden" name="attr_repeating_legendary_actions_0_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_legendary_actions_0_save_dc}]]}} {{action_save_stat=@{repeating_legendary_actions_0_save_stat}}} {{action_save_success=@{repeating_legendary_actions_0_save_success}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_0_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_legendary_actions_0_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_legendary_actions_0_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_0_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_legendary_actions_0_effect}}}">
-            <input type="hidden" name="attr_repeating_legendary_actions_0_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_0_var_recharge" value="{{action_recharge=@{repeating_legendary_actions_0_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_legendary_actions_0_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_legendary_actions_0_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -8325,24 +8280,17 @@
             <input type="checkbox" name="attr_repeating_legendary_actions_0_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_legendary_actions_0_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_legendary_actions_0_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_legendary_actions_0_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_legendary_actions_0_macro_options" value="@{repeating_legendary_actions_0_toggle_emote} @{repeating_legendary_actions_0_toggle_attack} @{repeating_legendary_actions_0_toggle_attack_adv} @{repeating_legendary_actions_0_toggle_crit} @{repeating_legendary_actions_0_toggle_details} @{repeating_legendary_actions_0_toggle_damage} @{repeating_legendary_actions_0_toggle_alt_damage} @{repeating_legendary_actions_0_toggle_second_damage} @{repeating_legendary_actions_0_toggle_save} @{repeating_legendary_actions_0_toggle_save_damage} @{repeating_legendary_actions_0_toggle_effects} @{repeating_legendary_actions_0_toggle_multiattack} @{repeating_legendary_actions_0_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_legendary_actions_0_macro_options" value="@{repeating_legendary_actions_0_toggle_emote} @{repeating_legendary_actions_0_toggle_attack} @{repeating_legendary_actions_0_toggle_attack_adv} @{repeating_legendary_actions_0_toggle_crit} @{repeating_legendary_actions_0_toggle_details} @{repeating_legendary_actions_0_toggle_damage} @{repeating_legendary_actions_0_toggle_alt_damage} @{repeating_legendary_actions_0_toggle_second_damage} @{repeating_legendary_actions_0_toggle_save} @{repeating_legendary_actions_0_toggle_save_damage} @{repeating_legendary_actions_0_toggle_effects} @{repeating_legendary_actions_0_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_legendary_actions_0_toggle_multiattack" value="@{repeating_legendary_actions_0_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_legendary_actions_0_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_legendary_actions_0_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_legendary_actions_0_type} attack}} @{repeating_legendary_actions_0_macro_options}">Legendary</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_legendary_actions_0_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_legendary_actions_0_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_legendary_actions_0_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_legendary_actions_0_type} attack}} @{repeating_legendary_actions_0_macro_options}">Legendary</button>
+                </div>
               </div>
             </div>
 
@@ -8475,7 +8423,6 @@
             <input type="hidden" name="attr_repeating_legendary_actions_1_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_legendary_actions_1_save_dc}]]}} {{action_save_stat=@{repeating_legendary_actions_1_save_stat}}} {{action_save_success=@{repeating_legendary_actions_1_save_success}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_1_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_legendary_actions_1_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_legendary_actions_1_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_1_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_legendary_actions_1_effect}}}">
-            <input type="hidden" name="attr_repeating_legendary_actions_1_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_1_var_recharge" value="{{action_recharge=@{repeating_legendary_actions_1_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_legendary_actions_1_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_legendary_actions_1_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -8491,24 +8438,17 @@
             <input type="checkbox" name="attr_repeating_legendary_actions_1_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_legendary_actions_1_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_legendary_actions_1_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_legendary_actions_1_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_legendary_actions_1_macro_options" value="@{repeating_legendary_actions_1_toggle_emote} @{repeating_legendary_actions_1_toggle_attack} @{repeating_legendary_actions_1_toggle_attack_adv} @{repeating_legendary_actions_1_toggle_crit} @{repeating_legendary_actions_1_toggle_details} @{repeating_legendary_actions_1_toggle_damage} @{repeating_legendary_actions_1_toggle_alt_damage} @{repeating_legendary_actions_1_toggle_second_damage} @{repeating_legendary_actions_1_toggle_save} @{repeating_legendary_actions_1_toggle_save_damage} @{repeating_legendary_actions_1_toggle_effects} @{repeating_legendary_actions_1_toggle_multiattack} @{repeating_legendary_actions_1_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_legendary_actions_1_macro_options" value="@{repeating_legendary_actions_1_toggle_emote} @{repeating_legendary_actions_1_toggle_attack} @{repeating_legendary_actions_1_toggle_attack_adv} @{repeating_legendary_actions_1_toggle_crit} @{repeating_legendary_actions_1_toggle_details} @{repeating_legendary_actions_1_toggle_damage} @{repeating_legendary_actions_1_toggle_alt_damage} @{repeating_legendary_actions_1_toggle_second_damage} @{repeating_legendary_actions_1_toggle_save} @{repeating_legendary_actions_1_toggle_save_damage} @{repeating_legendary_actions_1_toggle_effects} @{repeating_legendary_actions_1_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_legendary_actions_1_toggle_multiattack" value="@{repeating_legendary_actions_1_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_legendary_actions_1_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_legendary_actions_1_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_legendary_actions_1_type} attack}} @{repeating_legendary_actions_1_macro_options}">Legendary</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_legendary_actions_1_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_legendary_actions_1_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_legendary_actions_1_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_legendary_actions_1_type} attack}} @{repeating_legendary_actions_1_macro_options}">Legendary</button>
+                </div>
               </div>
             </div>
 
@@ -8641,7 +8581,6 @@
             <input type="hidden" name="attr_repeating_legendary_actions_2_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_legendary_actions_2_save_dc}]]}} {{action_save_stat=@{repeating_legendary_actions_2_save_stat}}} {{action_save_success=@{repeating_legendary_actions_2_save_success}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_2_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_legendary_actions_2_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_legendary_actions_2_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_2_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_legendary_actions_2_effect}}}">
-            <input type="hidden" name="attr_repeating_legendary_actions_2_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_2_var_recharge" value="{{action_recharge=@{repeating_legendary_actions_2_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_legendary_actions_2_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_legendary_actions_2_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -8657,24 +8596,17 @@
             <input type="checkbox" name="attr_repeating_legendary_actions_2_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_legendary_actions_2_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_legendary_actions_2_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_legendary_actions_2_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_legendary_actions_2_macro_options" value="@{repeating_legendary_actions_2_toggle_emote} @{repeating_legendary_actions_2_toggle_attack} @{repeating_legendary_actions_2_toggle_attack_adv} @{repeating_legendary_actions_2_toggle_crit} @{repeating_legendary_actions_2_toggle_details} @{repeating_legendary_actions_2_toggle_damage} @{repeating_legendary_actions_2_toggle_alt_damage} @{repeating_legendary_actions_2_toggle_second_damage} @{repeating_legendary_actions_2_toggle_save} @{repeating_legendary_actions_2_toggle_save_damage} @{repeating_legendary_actions_2_toggle_effects} @{repeating_legendary_actions_2_toggle_multiattack} @{repeating_legendary_actions_2_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_legendary_actions_2_macro_options" value="@{repeating_legendary_actions_2_toggle_emote} @{repeating_legendary_actions_2_toggle_attack} @{repeating_legendary_actions_2_toggle_attack_adv} @{repeating_legendary_actions_2_toggle_crit} @{repeating_legendary_actions_2_toggle_details} @{repeating_legendary_actions_2_toggle_damage} @{repeating_legendary_actions_2_toggle_alt_damage} @{repeating_legendary_actions_2_toggle_second_damage} @{repeating_legendary_actions_2_toggle_save} @{repeating_legendary_actions_2_toggle_save_damage} @{repeating_legendary_actions_2_toggle_effects} @{repeating_legendary_actions_2_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_legendary_actions_2_toggle_multiattack" value="@{repeating_legendary_actions_2_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_legendary_actions_2_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_legendary_actions_2_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_legendary_actions_2_type} attack}} @{repeating_legendary_actions_2_macro_options}">Legendary</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_legendary_actions_2_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_legendary_actions_2_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_legendary_actions_2_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_legendary_actions_2_type} attack}} @{repeating_legendary_actions_2_macro_options}">Legendary</button>
+                </div>
               </div>
             </div>
 
@@ -8807,7 +8739,6 @@
             <input type="hidden" name="attr_repeating_legendary_actions_3_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_legendary_actions_3_save_dc}]]}} {{action_save_stat=@{repeating_legendary_actions_3_save_stat}}} {{action_save_success=@{repeating_legendary_actions_3_save_success}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_3_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_legendary_actions_3_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_legendary_actions_3_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_3_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_legendary_actions_3_effect}}}">
-            <input type="hidden" name="attr_repeating_legendary_actions_3_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_3_var_recharge" value="{{action_recharge=@{repeating_legendary_actions_3_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_legendary_actions_3_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_legendary_actions_3_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -8823,24 +8754,17 @@
             <input type="checkbox" name="attr_repeating_legendary_actions_3_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_legendary_actions_3_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_legendary_actions_3_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_legendary_actions_3_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_legendary_actions_3_macro_options" value="@{repeating_legendary_actions_3_toggle_emote} @{repeating_legendary_actions_3_toggle_attack} @{repeating_legendary_actions_3_toggle_attack_adv} @{repeating_legendary_actions_3_toggle_crit} @{repeating_legendary_actions_3_toggle_details} @{repeating_legendary_actions_3_toggle_damage} @{repeating_legendary_actions_3_toggle_alt_damage} @{repeating_legendary_actions_3_toggle_second_damage} @{repeating_legendary_actions_3_toggle_save} @{repeating_legendary_actions_3_toggle_save_damage} @{repeating_legendary_actions_3_toggle_effects} @{repeating_legendary_actions_3_toggle_multiattack} @{repeating_legendary_actions_3_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_legendary_actions_3_macro_options" value="@{repeating_legendary_actions_3_toggle_emote} @{repeating_legendary_actions_3_toggle_attack} @{repeating_legendary_actions_3_toggle_attack_adv} @{repeating_legendary_actions_3_toggle_crit} @{repeating_legendary_actions_3_toggle_details} @{repeating_legendary_actions_3_toggle_damage} @{repeating_legendary_actions_3_toggle_alt_damage} @{repeating_legendary_actions_3_toggle_second_damage} @{repeating_legendary_actions_3_toggle_save} @{repeating_legendary_actions_3_toggle_save_damage} @{repeating_legendary_actions_3_toggle_effects} @{repeating_legendary_actions_3_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_legendary_actions_3_toggle_multiattack" value="@{repeating_legendary_actions_3_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_legendary_actions_3_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_legendary_actions_3_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_legendary_actions_3_type} attack}} @{repeating_legendary_actions_3_macro_options}">Legendary</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_legendary_actions_3_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_legendary_actions_3_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_legendary_actions_3_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_legendary_actions_3_type} attack}} @{repeating_legendary_actions_3_macro_options}">Legendary</button>
+                </div>
               </div>
             </div>
 
@@ -8973,7 +8897,6 @@
             <input type="hidden" name="attr_repeating_legendary_actions_4_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_legendary_actions_4_save_dc}]]}} {{action_save_stat=@{repeating_legendary_actions_4_save_stat}}} {{action_save_success=@{repeating_legendary_actions_4_save_success}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_4_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_legendary_actions_4_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_legendary_actions_4_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_4_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_legendary_actions_4_effect}}}">
-            <input type="hidden" name="attr_repeating_legendary_actions_4_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_legendary_actions_4_var_recharge" value="{{action_recharge=@{repeating_legendary_actions_4_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_legendary_actions_4_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_legendary_actions_4_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -8989,24 +8912,17 @@
             <input type="checkbox" name="attr_repeating_legendary_actions_4_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_legendary_actions_4_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_legendary_actions_4_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_legendary_actions_4_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_legendary_actions_4_macro_options" value="@{repeating_legendary_actions_4_toggle_emote} @{repeating_legendary_actions_4_toggle_attack} @{repeating_legendary_actions_4_toggle_attack_adv} @{repeating_legendary_actions_4_toggle_crit} @{repeating_legendary_actions_4_toggle_details} @{repeating_legendary_actions_4_toggle_damage} @{repeating_legendary_actions_4_toggle_alt_damage} @{repeating_legendary_actions_4_toggle_second_damage} @{repeating_legendary_actions_4_toggle_save} @{repeating_legendary_actions_4_toggle_save_damage} @{repeating_legendary_actions_4_toggle_effects} @{repeating_legendary_actions_4_toggle_multiattack} @{repeating_legendary_actions_4_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_legendary_actions_4_macro_options" value="@{repeating_legendary_actions_4_toggle_emote} @{repeating_legendary_actions_4_toggle_attack} @{repeating_legendary_actions_4_toggle_attack_adv} @{repeating_legendary_actions_4_toggle_crit} @{repeating_legendary_actions_4_toggle_details} @{repeating_legendary_actions_4_toggle_damage} @{repeating_legendary_actions_4_toggle_alt_damage} @{repeating_legendary_actions_4_toggle_second_damage} @{repeating_legendary_actions_4_toggle_save} @{repeating_legendary_actions_4_toggle_save_damage} @{repeating_legendary_actions_4_toggle_effects} @{repeating_legendary_actions_4_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_legendary_actions_4_toggle_multiattack" value="@{repeating_legendary_actions_4_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_legendary_actions_4_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_legendary_actions_4_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_legendary_actions_4_type} attack}} @{repeating_legendary_actions_4_macro_options}">Legendary</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_legendary_actions_4_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_legendary_actions_4_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_legendary_actions_4_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_legendary_actions_4_type} attack}} @{repeating_legendary_actions_4_macro_options}">Legendary</button>
+                </div>
               </div>
             </div>
 
@@ -9114,14 +9030,38 @@
           <hr>
         </div>
       </div>
-      <div class="sheet-row sheet-center">
+      <div class="sheet-row sheet-center sheet-mar-t-md">
         <div class="sheet-col-1-2 sheet-center sheet-action-toggle-reactions sheet-vert-bottom sheet-mar-t-md">
-          <textarea class="sheet-medium-textarea" name="attr_reactions"></textarea>
-          <div class="sheet-wrap-box-title">Reactions</div>
+          <div class="sheet-wrap-box sheet-relative sheet-mar-b-md sheet-mar-t-md">
+            <textarea class="sheet-medium-textarea" name="attr_reactions"></textarea>
+            <div class="sheet-wrap-box-title">Reactions</div>
+          </div>
           <hr>
         </div>
       </div>
 
+      <div class="sheet-row sheet-mar-t-md">
+        <div class="sheet-col-1 sheet-center sheet-action-toggle-multiattack">
+          <div class="sheet-wrap-box sheet-relative sheet-mar-b-md sheet-mar-t-md">
+            <div class="sheet-row">
+              <div class="sheet-col-2-5 sheet-center sheet-pad-r-sm">
+                <textarea class="sheet-small-textarea" name="attr_multiattack"></textarea>
+                <div class="sheet-small-label">Multiattack Text</div>
+              </div>
+              <div class="sheet-col-1-2 sheet-center sheet-pad-l-sm">
+                <textarea class="sheet-small-textarea" name="attr_multiattack_script"></textarea>
+                <div class="sheet-small-label">Multiattack Script</div>
+              </div>
+              <div class="sheet-col-1-10 sheet-center sheet-pad-l-sm">
+                <button type="roll" class="sheet-roll" name="roll_multiattack" value="@{multiattack}
+              @{multiattack_script}">Multiattack</button>
+              </div>
+            </div>
+            <div class="sheet-wrap-box-title sheet-center">Multiattack</div>
+          </div>
+        </div>
+      </div>
+
       <div class="sheet-row sheet-mar-t-md">
         <div class="sheet-col-1 sheet-action-toggle-actions">
           <div class="sheet-wrap-box sheet-relative sheet-mar-b-md sheet-mar-t-md">
@@ -9151,7 +9091,6 @@
             <input type="hidden" name="attr_repeating_actions_0_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_actions_0_save_dc}]]}} {{action_save_stat=@{repeating_actions_0_save_stat}}} {{action_save_success=@{repeating_actions_0_save_success}}}">
             <input type="hidden" name="attr_repeating_actions_0_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_actions_0_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_actions_0_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_actions_0_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_actions_0_effect}}}">
-            <input type="hidden" name="attr_repeating_actions_0_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_actions_0_var_recharge" value="{{action_recharge=@{repeating_actions_0_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_actions_0_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_actions_0_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -9167,24 +9106,17 @@
             <input type="checkbox" name="attr_repeating_actions_0_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_actions_0_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_actions_0_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_actions_0_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_actions_0_macro_options" value="@{repeating_actions_0_toggle_emote} @{repeating_actions_0_toggle_attack} @{repeating_actions_0_toggle_attack_adv} @{repeating_actions_0_toggle_crit} @{repeating_actions_0_toggle_details} @{repeating_actions_0_toggle_damage} @{repeating_actions_0_toggle_alt_damage} @{repeating_actions_0_toggle_second_damage} @{repeating_actions_0_toggle_save} @{repeating_actions_0_toggle_save_damage} @{repeating_actions_0_toggle_effects} @{repeating_actions_0_toggle_multiattack} @{repeating_actions_0_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_actions_0_macro_options" value="@{repeating_actions_0_toggle_emote} @{repeating_actions_0_toggle_attack} @{repeating_actions_0_toggle_attack_adv} @{repeating_actions_0_toggle_crit} @{repeating_actions_0_toggle_details} @{repeating_actions_0_toggle_damage} @{repeating_actions_0_toggle_alt_damage} @{repeating_actions_0_toggle_second_damage} @{repeating_actions_0_toggle_save} @{repeating_actions_0_toggle_save_damage} @{repeating_actions_0_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_actions_0_toggle_multiattack" value="@{repeating_actions_0_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_0_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_0_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_0_type} attack}} @{repeating_actions_0_macro_options}">Action</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_actions_0_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_0_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_0_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_0_type} attack}} @{repeating_actions_0_macro_options}">Action</button>
+                </div>
               </div>
             </div>
 
@@ -9317,7 +9249,6 @@
             <input type="hidden" name="attr_repeating_actions_1_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_actions_1_save_dc}]]}} {{action_save_stat=@{repeating_actions_1_save_stat}}} {{action_save_success=@{repeating_actions_1_save_success}}}">
             <input type="hidden" name="attr_repeating_actions_1_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_actions_1_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_actions_1_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_actions_1_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_actions_1_effect}}}">
-            <input type="hidden" name="attr_repeating_actions_1_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_actions_1_var_recharge" value="{{action_recharge=@{repeating_actions_1_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_actions_1_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_actions_1_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -9333,24 +9264,17 @@
             <input type="checkbox" name="attr_repeating_actions_1_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_actions_1_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_actions_1_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_actions_1_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_actions_1_macro_options" value="@{repeating_actions_1_toggle_emote} @{repeating_actions_1_toggle_attack} @{repeating_actions_1_toggle_attack_adv} @{repeating_actions_1_toggle_crit} @{repeating_actions_1_toggle_details} @{repeating_actions_1_toggle_damage} @{repeating_actions_1_toggle_alt_damage} @{repeating_actions_1_toggle_second_damage} @{repeating_actions_1_toggle_save} @{repeating_actions_1_toggle_save_damage} @{repeating_actions_1_toggle_effects} @{repeating_actions_1_toggle_multiattack} @{repeating_actions_1_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_actions_1_macro_options" value="@{repeating_actions_1_toggle_emote} @{repeating_actions_1_toggle_attack} @{repeating_actions_1_toggle_attack_adv} @{repeating_actions_1_toggle_crit} @{repeating_actions_1_toggle_details} @{repeating_actions_1_toggle_damage} @{repeating_actions_1_toggle_alt_damage} @{repeating_actions_1_toggle_second_damage} @{repeating_actions_1_toggle_save} @{repeating_actions_1_toggle_save_damage} @{repeating_actions_1_toggle_effects} @{repeating_actions_1_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_actions_1_toggle_multiattack" value="@{repeating_actions_1_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_1_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_1_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_1_type} attack}} @{repeating_actions_1_macro_options}">Action</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_actions_1_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_1_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_1_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_1_type} attack}} @{repeating_actions_1_macro_options}">Action</button>
+                </div>
               </div>
             </div>
 
@@ -9483,7 +9407,6 @@
             <input type="hidden" name="attr_repeating_actions_2_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_actions_2_save_dc}]]}} {{action_save_stat=@{repeating_actions_2_save_stat}}} {{action_save_success=@{repeating_actions_2_save_success}}}">
             <input type="hidden" name="attr_repeating_actions_2_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_actions_2_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_actions_2_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_actions_2_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_actions_2_effect}}}">
-            <input type="hidden" name="attr_repeating_actions_2_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_actions_2_var_recharge" value="{{action_recharge=@{repeating_actions_2_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_actions_2_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_actions_2_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -9499,24 +9422,17 @@
             <input type="checkbox" name="attr_repeating_actions_2_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_actions_2_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_actions_2_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_actions_2_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_actions_2_macro_options" value="@{repeating_actions_2_toggle_emote} @{repeating_actions_2_toggle_attack} @{repeating_actions_2_toggle_attack_adv} @{repeating_actions_2_toggle_crit} @{repeating_actions_2_toggle_details} @{repeating_actions_2_toggle_damage} @{repeating_actions_2_toggle_alt_damage} @{repeating_actions_2_toggle_second_damage} @{repeating_actions_2_toggle_save} @{repeating_actions_2_toggle_save_damage} @{repeating_actions_2_toggle_effects} @{repeating_actions_2_toggle_multiattack} @{repeating_actions_2_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_actions_2_macro_options" value="@{repeating_actions_2_toggle_emote} @{repeating_actions_2_toggle_attack} @{repeating_actions_2_toggle_attack_adv} @{repeating_actions_2_toggle_crit} @{repeating_actions_2_toggle_details} @{repeating_actions_2_toggle_damage} @{repeating_actions_2_toggle_alt_damage} @{repeating_actions_2_toggle_second_damage} @{repeating_actions_2_toggle_save} @{repeating_actions_2_toggle_save_damage} @{repeating_actions_2_toggle_effects} @{repeating_actions_2_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_actions_2_toggle_multiattack" value="@{repeating_actions_2_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_2_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_2_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_2_type} attack}} @{repeating_actions_2_macro_options}">Action</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_actions_2_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_2_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_2_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_2_type} attack}} @{repeating_actions_2_macro_options}">Action</button>
+                </div>
               </div>
             </div>
 
@@ -9649,7 +9565,6 @@
             <input type="hidden" name="attr_repeating_actions_3_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_actions_3_save_dc}]]}} {{action_save_stat=@{repeating_actions_3_save_stat}}} {{action_save_success=@{repeating_actions_3_save_success}}}">
             <input type="hidden" name="attr_repeating_actions_3_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_actions_3_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_actions_3_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_actions_3_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_actions_3_effect}}}">
-            <input type="hidden" name="attr_repeating_actions_3_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_actions_3_var_recharge" value="{{action_recharge=@{repeating_actions_3_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_actions_3_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_actions_3_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -9665,24 +9580,17 @@
             <input type="checkbox" name="attr_repeating_actions_3_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_actions_3_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_actions_3_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_actions_3_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_actions_3_macro_options" value="@{repeating_actions_3_toggle_emote} @{repeating_actions_3_toggle_attack} @{repeating_actions_3_toggle_attack_adv} @{repeating_actions_3_toggle_crit} @{repeating_actions_3_toggle_details} @{repeating_actions_3_toggle_damage} @{repeating_actions_3_toggle_alt_damage} @{repeating_actions_3_toggle_second_damage} @{repeating_actions_3_toggle_save} @{repeating_actions_3_toggle_save_damage} @{repeating_actions_3_toggle_effects} @{repeating_actions_3_toggle_multiattack} @{repeating_actions_3_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_actions_3_macro_options" value="@{repeating_actions_3_toggle_emote} @{repeating_actions_3_toggle_attack} @{repeating_actions_3_toggle_attack_adv} @{repeating_actions_3_toggle_crit} @{repeating_actions_3_toggle_details} @{repeating_actions_3_toggle_damage} @{repeating_actions_3_toggle_alt_damage} @{repeating_actions_3_toggle_second_damage} @{repeating_actions_3_toggle_save} @{repeating_actions_3_toggle_save_damage} @{repeating_actions_3_toggle_effects} @{repeating_actions_3_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_actions_3_toggle_multiattack" value="@{repeating_actions_3_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_3_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_3_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_3_type} attack}} @{repeating_actions_3_macro_options}">Action</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_actions_3_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_3_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_3_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_3_type} attack}} @{repeating_actions_3_macro_options}">Action</button>
+                </div>
               </div>
             </div>
 
@@ -9815,7 +9723,6 @@
             <input type="hidden" name="attr_repeating_actions_4_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_actions_4_save_dc}]]}} {{action_save_stat=@{repeating_actions_4_save_stat}}} {{action_save_success=@{repeating_actions_4_save_success}}}">
             <input type="hidden" name="attr_repeating_actions_4_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_actions_4_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_actions_4_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_actions_4_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_actions_4_effect}}}">
-            <input type="hidden" name="attr_repeating_actions_4_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_actions_4_var_recharge" value="{{action_recharge=@{repeating_actions_4_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_actions_4_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_actions_4_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -9831,24 +9738,17 @@
             <input type="checkbox" name="attr_repeating_actions_4_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_actions_4_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_actions_4_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_actions_4_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_actions_4_macro_options" value="@{repeating_actions_4_toggle_emote} @{repeating_actions_4_toggle_attack} @{repeating_actions_4_toggle_attack_adv} @{repeating_actions_4_toggle_crit} @{repeating_actions_4_toggle_details} @{repeating_actions_4_toggle_damage} @{repeating_actions_4_toggle_alt_damage} @{repeating_actions_4_toggle_second_damage} @{repeating_actions_4_toggle_save} @{repeating_actions_4_toggle_save_damage} @{repeating_actions_4_toggle_effects} @{repeating_actions_4_toggle_multiattack} @{repeating_actions_4_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_actions_4_macro_options" value="@{repeating_actions_4_toggle_emote} @{repeating_actions_4_toggle_attack} @{repeating_actions_4_toggle_attack_adv} @{repeating_actions_4_toggle_crit} @{repeating_actions_4_toggle_details} @{repeating_actions_4_toggle_damage} @{repeating_actions_4_toggle_alt_damage} @{repeating_actions_4_toggle_second_damage} @{repeating_actions_4_toggle_save} @{repeating_actions_4_toggle_save_damage} @{repeating_actions_4_toggle_effects} @{repeating_actions_4_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_actions_4_toggle_multiattack" value="@{repeating_actions_4_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_4_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_4_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_4_type} attack}} @{repeating_actions_4_macro_options}">Action</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_actions_4_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_4_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_4_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_4_type} attack}} @{repeating_actions_4_macro_options}">Action</button>
+                </div>
               </div>
             </div>
 
@@ -9981,7 +9881,6 @@
             <input type="hidden" name="attr_repeating_actions_5_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_actions_5_save_dc}]]}} {{action_save_stat=@{repeating_actions_5_save_stat}}} {{action_save_success=@{repeating_actions_5_save_success}}}">
             <input type="hidden" name="attr_repeating_actions_5_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_actions_5_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_actions_5_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_actions_5_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_actions_5_effect}}}">
-            <input type="hidden" name="attr_repeating_actions_5_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_actions_5_var_recharge" value="{{action_recharge=@{repeating_actions_5_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_actions_5_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_actions_5_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -9997,24 +9896,17 @@
             <input type="checkbox" name="attr_repeating_actions_5_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_actions_5_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_actions_5_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_actions_5_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_actions_5_macro_options" value="@{repeating_actions_5_toggle_emote} @{repeating_actions_5_toggle_attack} @{repeating_actions_5_toggle_attack_adv} @{repeating_actions_5_toggle_crit} @{repeating_actions_5_toggle_details} @{repeating_actions_5_toggle_damage} @{repeating_actions_5_toggle_alt_damage} @{repeating_actions_5_toggle_second_damage} @{repeating_actions_5_toggle_save} @{repeating_actions_5_toggle_save_damage} @{repeating_actions_5_toggle_effects} @{repeating_actions_5_toggle_multiattack} @{repeating_actions_5_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_actions_5_macro_options" value="@{repeating_actions_5_toggle_emote} @{repeating_actions_5_toggle_attack} @{repeating_actions_5_toggle_attack_adv} @{repeating_actions_5_toggle_crit} @{repeating_actions_5_toggle_details} @{repeating_actions_5_toggle_damage} @{repeating_actions_5_toggle_alt_damage} @{repeating_actions_5_toggle_second_damage} @{repeating_actions_5_toggle_save} @{repeating_actions_5_toggle_save_damage} @{repeating_actions_5_toggle_effects} @{repeating_actions_5_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_actions_5_toggle_multiattack" value="@{repeating_actions_5_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_5_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_5_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_5_type} attack}} @{repeating_actions_5_macro_options}">Action</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_actions_5_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_5_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_5_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_5_type} attack}} @{repeating_actions_5_macro_options}">Action</button>
+                </div>
               </div>
             </div>
 
@@ -10147,7 +10039,6 @@
             <input type="hidden" name="attr_repeating_actions_6_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_actions_6_save_dc}]]}} {{action_save_stat=@{repeating_actions_6_save_stat}}} {{action_save_success=@{repeating_actions_6_save_success}}}">
             <input type="hidden" name="attr_repeating_actions_6_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_actions_6_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_actions_6_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_actions_6_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_actions_6_effect}}}">
-            <input type="hidden" name="attr_repeating_actions_6_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_actions_6_var_recharge" value="{{action_recharge=@{repeating_actions_6_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_actions_6_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_actions_6_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -10163,24 +10054,17 @@
             <input type="checkbox" name="attr_repeating_actions_6_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_actions_6_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_actions_6_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_actions_6_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_actions_6_macro_options" value="@{repeating_actions_6_toggle_emote} @{repeating_actions_6_toggle_attack} @{repeating_actions_6_toggle_attack_adv} @{repeating_actions_6_toggle_crit} @{repeating_actions_6_toggle_details} @{repeating_actions_6_toggle_damage} @{repeating_actions_6_toggle_alt_damage} @{repeating_actions_6_toggle_second_damage} @{repeating_actions_6_toggle_save} @{repeating_actions_6_toggle_save_damage} @{repeating_actions_6_toggle_effects} @{repeating_actions_6_toggle_multiattack} @{repeating_actions_6_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_actions_6_macro_options" value="@{repeating_actions_6_toggle_emote} @{repeating_actions_6_toggle_attack} @{repeating_actions_6_toggle_attack_adv} @{repeating_actions_6_toggle_crit} @{repeating_actions_6_toggle_details} @{repeating_actions_6_toggle_damage} @{repeating_actions_6_toggle_alt_damage} @{repeating_actions_6_toggle_second_damage} @{repeating_actions_6_toggle_save} @{repeating_actions_6_toggle_save_damage} @{repeating_actions_6_toggle_effects} @{repeating_actions_6_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_actions_6_toggle_multiattack" value="@{repeating_actions_6_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_6_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_6_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_6_type} attack}} @{repeating_actions_6_macro_options}">Action</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_actions_6_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_6_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_6_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_6_type} attack}} @{repeating_actions_6_macro_options}">Action</button>
+                </div>
               </div>
             </div>
 
@@ -10313,7 +10197,6 @@
             <input type="hidden" name="attr_repeating_actions_7_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_actions_7_save_dc}]]}} {{action_save_stat=@{repeating_actions_7_save_stat}}} {{action_save_success=@{repeating_actions_7_save_success}}}">
             <input type="hidden" name="attr_repeating_actions_7_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_actions_7_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_actions_7_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_actions_7_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_actions_7_effect}}}">
-            <input type="hidden" name="attr_repeating_actions_7_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_actions_7_var_recharge" value="{{action_recharge=@{repeating_actions_7_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_actions_7_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_actions_7_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -10329,24 +10212,17 @@
             <input type="checkbox" name="attr_repeating_actions_7_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_actions_7_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_actions_7_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_actions_7_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_actions_7_macro_options" value="@{repeating_actions_7_toggle_emote} @{repeating_actions_7_toggle_attack} @{repeating_actions_7_toggle_attack_adv} @{repeating_actions_7_toggle_crit} @{repeating_actions_7_toggle_details} @{repeating_actions_7_toggle_damage} @{repeating_actions_7_toggle_alt_damage} @{repeating_actions_7_toggle_second_damage} @{repeating_actions_7_toggle_save} @{repeating_actions_7_toggle_save_damage} @{repeating_actions_7_toggle_effects} @{repeating_actions_7_toggle_multiattack} @{repeating_actions_7_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_actions_7_macro_options" value="@{repeating_actions_7_toggle_emote} @{repeating_actions_7_toggle_attack} @{repeating_actions_7_toggle_attack_adv} @{repeating_actions_7_toggle_crit} @{repeating_actions_7_toggle_details} @{repeating_actions_7_toggle_damage} @{repeating_actions_7_toggle_alt_damage} @{repeating_actions_7_toggle_second_damage} @{repeating_actions_7_toggle_save} @{repeating_actions_7_toggle_save_damage} @{repeating_actions_7_toggle_effects} @{repeating_actions_7_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_actions_7_toggle_multiattack" value="@{repeating_actions_7_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_7_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_7_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_7_type} attack}} @{repeating_actions_7_macro_options}">Action</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_actions_7_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_7_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_7_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_7_type} attack}} @{repeating_actions_7_macro_options}">Action</button>
+                </div>
               </div>
             </div>
 
@@ -10479,7 +10355,6 @@
             <input type="hidden" name="attr_repeating_actions_8_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_actions_8_save_dc}]]}} {{action_save_stat=@{repeating_actions_8_save_stat}}} {{action_save_success=@{repeating_actions_8_save_success}}}">
             <input type="hidden" name="attr_repeating_actions_8_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_actions_8_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_actions_8_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_actions_8_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_actions_8_effect}}}">
-            <input type="hidden" name="attr_repeating_actions_8_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_actions_8_var_recharge" value="{{action_recharge=@{repeating_actions_8_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_actions_8_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_actions_8_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -10495,24 +10370,17 @@
             <input type="checkbox" name="attr_repeating_actions_8_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_actions_8_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_actions_8_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_actions_8_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_actions_8_macro_options" value="@{repeating_actions_8_toggle_emote} @{repeating_actions_8_toggle_attack} @{repeating_actions_8_toggle_attack_adv} @{repeating_actions_8_toggle_crit} @{repeating_actions_8_toggle_details} @{repeating_actions_8_toggle_damage} @{repeating_actions_8_toggle_alt_damage} @{repeating_actions_8_toggle_second_damage} @{repeating_actions_8_toggle_save} @{repeating_actions_8_toggle_save_damage} @{repeating_actions_8_toggle_effects} @{repeating_actions_8_toggle_multiattack} @{repeating_actions_8_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_actions_8_macro_options" value="@{repeating_actions_8_toggle_emote} @{repeating_actions_8_toggle_attack} @{repeating_actions_8_toggle_attack_adv} @{repeating_actions_8_toggle_crit} @{repeating_actions_8_toggle_details} @{repeating_actions_8_toggle_damage} @{repeating_actions_8_toggle_alt_damage} @{repeating_actions_8_toggle_second_damage} @{repeating_actions_8_toggle_save} @{repeating_actions_8_toggle_save_damage} @{repeating_actions_8_toggle_effects} @{repeating_actions_8_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_actions_8_toggle_multiattack" value="@{repeating_actions_8_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_8_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_8_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_8_type} attack}} @{repeating_actions_8_macro_options}">Action</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_actions_8_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_8_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_8_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_8_type} attack}} @{repeating_actions_8_macro_options}">Action</button>
+                </div>
               </div>
             </div>
 
@@ -10645,7 +10513,6 @@
             <input type="hidden" name="attr_repeating_actions_9_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_actions_9_save_dc}]]}} {{action_save_stat=@{repeating_actions_9_save_stat}}} {{action_save_success=@{repeating_actions_9_save_success}}}">
             <input type="hidden" name="attr_repeating_actions_9_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_actions_9_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_actions_9_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_actions_9_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_actions_9_effect}}}">
-            <input type="hidden" name="attr_repeating_actions_9_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_actions_9_var_recharge" value="{{action_recharge=@{repeating_actions_9_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_actions_9_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_actions_9_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -10661,24 +10528,17 @@
             <input type="checkbox" name="attr_repeating_actions_9_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_actions_9_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_actions_9_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_actions_9_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_actions_9_macro_options" value="@{repeating_actions_9_toggle_emote} @{repeating_actions_9_toggle_attack} @{repeating_actions_9_toggle_attack_adv} @{repeating_actions_9_toggle_crit} @{repeating_actions_9_toggle_details} @{repeating_actions_9_toggle_damage} @{repeating_actions_9_toggle_alt_damage} @{repeating_actions_9_toggle_second_damage} @{repeating_actions_9_toggle_save} @{repeating_actions_9_toggle_save_damage} @{repeating_actions_9_toggle_effects} @{repeating_actions_9_toggle_multiattack} @{repeating_actions_9_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_actions_9_macro_options" value="@{repeating_actions_9_toggle_emote} @{repeating_actions_9_toggle_attack} @{repeating_actions_9_toggle_attack_adv} @{repeating_actions_9_toggle_crit} @{repeating_actions_9_toggle_details} @{repeating_actions_9_toggle_damage} @{repeating_actions_9_toggle_alt_damage} @{repeating_actions_9_toggle_second_damage} @{repeating_actions_9_toggle_save} @{repeating_actions_9_toggle_save_damage} @{repeating_actions_9_toggle_effects} @{repeating_actions_9_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_actions_9_toggle_multiattack" value="@{repeating_actions_9_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_9_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_9_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_9_type} attack}} @{repeating_actions_9_macro_options}">Action</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_actions_9_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_9_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_9_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_9_type} attack}} @{repeating_actions_9_macro_options}">Action</button>
+                </div>
               </div>
             </div>
 
@@ -10811,7 +10671,6 @@
             <input type="hidden" name="attr_repeating_actions_10_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_actions_10_save_dc}]]}} {{action_save_stat=@{repeating_actions_10_save_stat}}} {{action_save_success=@{repeating_actions_10_save_success}}}">
             <input type="hidden" name="attr_repeating_actions_10_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_actions_10_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_actions_10_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_actions_10_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_actions_10_effect}}}">
-            <input type="hidden" name="attr_repeating_actions_10_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_actions_10_var_recharge" value="{{action_recharge=@{repeating_actions_10_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_actions_10_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_actions_10_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -10827,24 +10686,17 @@
             <input type="checkbox" name="attr_repeating_actions_10_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_actions_10_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_actions_10_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_actions_10_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_actions_10_macro_options" value="@{repeating_actions_10_toggle_emote} @{repeating_actions_10_toggle_attack} @{repeating_actions_10_toggle_attack_adv} @{repeating_actions_10_toggle_crit} @{repeating_actions_10_toggle_details} @{repeating_actions_10_toggle_damage} @{repeating_actions_10_toggle_alt_damage} @{repeating_actions_10_toggle_second_damage} @{repeating_actions_10_toggle_save} @{repeating_actions_10_toggle_save_damage} @{repeating_actions_10_toggle_effects} @{repeating_actions_10_toggle_multiattack} @{repeating_actions_10_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_actions_10_macro_options" value="@{repeating_actions_10_toggle_emote} @{repeating_actions_10_toggle_attack} @{repeating_actions_10_toggle_attack_adv} @{repeating_actions_10_toggle_crit} @{repeating_actions_10_toggle_details} @{repeating_actions_10_toggle_damage} @{repeating_actions_10_toggle_alt_damage} @{repeating_actions_10_toggle_second_damage} @{repeating_actions_10_toggle_save} @{repeating_actions_10_toggle_save_damage} @{repeating_actions_10_toggle_effects} @{repeating_actions_10_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_actions_10_toggle_multiattack" value="@{repeating_actions_10_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_10_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_10_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_10_type} attack}} @{repeating_actions_10_macro_options}">Action</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_actions_10_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_10_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_10_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_10_type} attack}} @{repeating_actions_10_macro_options}">Action</button>
+                </div>
               </div>
             </div>
 
@@ -10977,7 +10829,6 @@
             <input type="hidden" name="attr_repeating_actions_11_var_save" value="{{action_show_save_throw=1}} {{action_save_dc=[[@{repeating_actions_11_save_dc}]]}} {{action_save_stat=@{repeating_actions_11_save_stat}}} {{action_save_success=@{repeating_actions_11_save_success}}}">
             <input type="hidden" name="attr_repeating_actions_11_var_save_damage" value="{{action_show_save_damage=1}} {{action_save_damage=[[@{repeating_actions_11_save_dmg} + (@{global_melee_damage_bonus}) + 0d0]]}} {{action_save_damage_type=@{repeating_actions_11_save_dmg_type}}}">
             <input type="hidden" name="attr_repeating_actions_11_var_effects" value="{{action_show_effects=1}} {{action_effects=@{repeating_actions_11_effect}}}">
-            <input type="hidden" name="attr_repeating_actions_11_var_multiattack" value="{{action_multiattack=@{multiattack}}}">
             <input type="hidden" name="attr_repeating_actions_11_var_recharge" value="{{action_recharge=@{repeating_actions_11_recharge}}}">
 
             <input type="checkbox" name="attr_repeating_actions_11_toggle_emote" class="sheet-action-tab sheet-action-toggle-emote" value="@{repeating_actions_11_var_emote}"><span class="sheet-action-tab sheet-action-toggle-emote">Emote</span>
@@ -10993,24 +10844,17 @@
             <input type="checkbox" name="attr_repeating_actions_11_toggle_effects" class="sheet-action-tab sheet-action-toggle-effects" value="@{repeating_actions_11_var_effects}"><span class="sheet-action-tab sheet-action-toggle-effects">Effects</span>
             <input type="checkbox" name="attr_repeating_actions_11_toggle_recharge" class="sheet-action-tab sheet-action-toggle-recharge" value="@{repeating_actions_11_var_recharge}"><span class="sheet-action-tab sheet-action-toggle-recharge">Recharge</span>
 
-            <input type="hidden" name="attr_repeating_actions_11_macro_options" value="@{repeating_actions_11_toggle_emote} @{repeating_actions_11_toggle_attack} @{repeating_actions_11_toggle_attack_adv} @{repeating_actions_11_toggle_crit} @{repeating_actions_11_toggle_details} @{repeating_actions_11_toggle_damage} @{repeating_actions_11_toggle_alt_damage} @{repeating_actions_11_toggle_second_damage} @{repeating_actions_11_toggle_save} @{repeating_actions_11_toggle_save_damage} @{repeating_actions_11_toggle_effects} @{repeating_actions_11_toggle_multiattack} @{repeating_actions_11_toggle_recharge}">
+            <input type="hidden" name="attr_repeating_actions_11_macro_options" value="@{repeating_actions_11_toggle_emote} @{repeating_actions_11_toggle_attack} @{repeating_actions_11_toggle_attack_adv} @{repeating_actions_11_toggle_crit} @{repeating_actions_11_toggle_details} @{repeating_actions_11_toggle_damage} @{repeating_actions_11_toggle_alt_damage} @{repeating_actions_11_toggle_second_damage} @{repeating_actions_11_toggle_save} @{repeating_actions_11_toggle_save_damage} @{repeating_actions_11_toggle_effects} @{repeating_actions_11_toggle_recharge}">
 
             <div class="sheet-action-button-group sheet-right">
               <div class="sheet-row">
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <label class="sheet-checkbox-label-md">
-                    <input type="checkbox" name="attr_repeating_actions_11_toggle_multiattack" value="@{repeating_actions_11_var_multiattack}"><span>Multiattack</span>
-                  </label>
-                </div>
-                <div class="sheet-col sheet-center sheet-vert-middle">
-                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_11_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_11_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_11_type} attack}} @{repeating_actions_11_macro_options}">Action</button>
-                </div>
-              </div>
-              <div class="sheet-row sheet-mar-t-sm">
                 <div class="sheet-col-1-3 sheet-action-toggle-recharge sheet-center sheet-pad-r-md">
                   <input class="sheet-center" type="text" name="attr_repeating_actions_11_recharge">
                   <div class="sheet-small-label">Recharge</div>
                 </div>
+                <div class="sheet-col sheet-center sheet-vert-middle">
+                  <button type="roll" class="sheet-roll" name="roll_repeating_actions_11_action" value="@{output_option} &{template:5eDefault} {{action=1}} {{title=@{repeating_actions_11_name}}} {{subheader=@{character_name}}} {{subheaderright=@{repeating_actions_11_type} attack}} @{repeating_actions_11_macro_options}">Action</button>
+                </div>
               </div>
             </div>