diff --git a/D&D_5e_Reshaped/precompiled/components/spells/spell.html b/D&D_5e_Reshaped/precompiled/components/spells/spell.html
index e27e7a368c..b42fa450e5 100644
--- a/D&D_5e_Reshaped/precompiled/components/spells/spell.html
+++ b/D&D_5e_Reshaped/precompiled/components/spells/spell.html
@@ -29,23 +29,27 @@
     <input type="hidden" name="attr_add_casting_modifier" accept="Add Casting Modifier">
     <input type="hidden" name="attr_type" accept="Spell Attack">
 
-    <button type="roll" name="roll_spell"
-            value="@{output_option}   &{template:5e-shaped}   {{character_name=@{character_name}}}   @{show_character_name}   {{title=@{name}}}   {{spell=1}}   @{attacher_spell}   {{friendly_level=@{friendly_level}}}   {{school=@{school}}}   {{casting_time=@{casting_time}}}   {{range=@{range}}}   {{components=@{components}}}   {{materials=@{materials}}}   {{concentration=@{concentration_text}}}   {{duration=@{duration}}}   {{target=@{target}}}   @{content_toggle}   @{roll_toggle}   @{saving_throw_toggle}   @{damage_toggle}   @{second_damage_toggle}   @{heal_toggle}   @{higher_level_toggle}   @{hide_gm_info}   @{extras_toggle}">
       <div class="shaped-row vert-center">
-        <div class="col-47 pad-r-sm">
-          <input type="text" name="attr_name" readonly>
+        <div class="col-80">
+          <button type="roll" name="roll_spell"
+                  value="@{output_option}   &{template:5e-shaped}   {{character_name=@{character_name}}}   @{show_character_name}   {{title=@{name}}}   {{spell=1}}   @{attacher_spell}   {{friendly_level=@{friendly_level}}}   {{school=@{school}}}   {{casting_time=@{casting_time}}}   {{range=@{range}}}   {{components=@{components}}}   {{materials=@{materials}}}   {{concentration=@{concentration_text}}}   {{duration=@{duration}}}   {{target=@{target}}}   @{content_toggle}   @{roll_toggle}   @{saving_throw_toggle}   @{damage_toggle}   @{second_damage_toggle}   @{heal_toggle}   @{higher_level_toggle}   @{hide_gm_info}   @{extras_toggle}">
+            <div class="shaped-row">
+              <div class="col-56 pad-r-sm">
+                <input type="text" name="attr_name" readonly>
+              </div>
+              <div class="col-13 pad-r-sm">
+                <input type="text" name="attr_spell_level" class="center" readonly>
+              </div>
+              <div class="col-31 pad-r-sm">
+                <input type="text" name="attr_casting_time" readonly>
+              </div>
+            </div>
+          </button>
         </div>
-        <div class="col-10 pad-r-sm">
-          <input type="text" name="attr_spell_level" class="center" readonly>
-        </div>
-        <div class="col-28 pad-r-sm">
-          <input type="text" name="attr_casting_time" readonly>
-        </div>
-        <div class="col-10">
-          <input type="text" name="attr_concentration" readonly>
+        <div class="col-20">
+          <input type="checkbox" name="attr_is_prepared" class="toggle-spells-prepared"><span class="toggle-spells-prepared">{{'PREPARED' | translate}}</span>
         </div>
       </div>
-    </button>
     <input type="checkbox" name="attr_toggle_details" class="toggle-icon-settings edit" checked><span class="toggle-icon-settings pictos edit">y</span>
 
     <div class="details edit">
@@ -154,9 +158,6 @@
         <div class="mar-l-lg">
           <input type="checkbox" name="attr_ritual" class="toggle-spells-ritual" value="Yes" accept="Ritual"><span class="toggle-spells-ritual">{{'RITUAL' | translate}}</span>
         </div>
-        <div class="mar-l-lg">
-          <input type="checkbox" name="attr_is_prepared" class="toggle-spells-prepared"><span class="toggle-spells-prepared">{{'PREPARED' | translate}}</span>
-        </div>
       </div>
 
       <div class="shaped-row vert-center">
diff --git a/D&D_5e_Reshaped/precompiled/components/spells/spells.html b/D&D_5e_Reshaped/precompiled/components/spells/spells.html
index 80bc551331..e95280628b 100644
--- a/D&D_5e_Reshaped/precompiled/components/spells/spells.html
+++ b/D&D_5e_Reshaped/precompiled/components/spells/spells.html
@@ -22,18 +22,18 @@
         <div class="shaped-row">
           <div class="col-50 pad-r-sm">
             <div class="shaped-row">
-              <div class="col-47 wrap-box-label light-label pad-r-sm">{{'SPELL' | translate}}</div>
+              <div class="col-45 wrap-box-label light-label pad-r-sm">{{'SPELL' | translate}}</div>
               <div class="col-10 wrap-box-label light-label center pad-r-sm">{{'LEVEL' | translate}}</div>
-              <div class="col-28 wrap-box-label light-label pad-r-sm">{{'CASTING_TIME' | translate}}</div>
-              <div class="col-15 wrap-box-label light-label">{{'CONC' | translate}}</div>
+              <div class="col-25 wrap-box-label light-label pad-r-sm">{{'CASTING_TIME' | translate}}</div>
+              <div class="col-20 wrap-box-label light-label">{{'PREPARED' | translate}}</div>
             </div>
           </div>
           <div class="col-50 pad-l-sm">
             <div class="shaped-row">
-              <div class="col-47 wrap-box-label light-label pad-r-sm">{{'SPELL' | translate}}</div>
+              <div class="col-45 wrap-box-label light-label pad-r-sm">{{'SPELL' | translate}}</div>
               <div class="col-10 wrap-box-label light-label center pad-r-sm">{{'LEVEL' | translate}}</div>
-              <div class="col-28 wrap-box-label light-label pad-r-sm">{{'CASTING_TIME' | translate}}</div>
-              <div class="col-15 wrap-box-label light-label">{{'CONC' | translate}}</div>
+              <div class="col-25 wrap-box-label light-label pad-r-sm">{{'CASTING_TIME' | translate}}</div>
+              <div class="col-20 wrap-box-label light-label">{{'PREPARED' | translate}}</div>
             </div>
           </div>
         </div>