diff --git a/Strike!/strike.html b/Strike!/strike.html
index dfce01e56a..e956f11d47 100644
--- a/Strike!/strike.html
+++ b/Strike!/strike.html
@@ -175,6 +175,7 @@
             <h3>Role Powers & Boosts</h3>
         </div>
         <div class='tableHeader combatTableRow'>
+            <div class='combatTableHeader' style='width: 30px'></div>
             <div class='combatTableHeader' style='width: 50px'>Lvl</div>
             <div class='combatTableHeader' style='width: 125px'>Name</div>
             <div class='combatTableHeader' style='width: 75px'>Type</div>
@@ -182,10 +183,16 @@
             <div class='combatTableHeader' style='width: 75px'>Action</div>
             <div class='combatTableHeader' style='width: 100px'>Range</div>
             <div class='combatTableHeader' style='width: 50px'>D</div>
-            <div class='combatTableHeader' style='width: 200px'>E</div>
+            <div class='combatTableHeader' style='width: 175px'>E</div>
         </div>
         <fieldset class="repeating_roles">
             <div class='sheet-WCrolesRow'>
+                <div class='combatTableCell'>
+                    <!--<button title="%{BM-check}" style='width: 25px' type="roll" value="&{template:defualt} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=Basic melee}} {{Attack result=[[1d6]]}}" name="roll_BM-check"></button>-->
+                    <!--<button title="%{BM-check}" style='width:25px' type="roll" value="&{template:default} {{name=@{repeating_compss_#_roleName}}} {{Range=Melee or Ranged 5}} {{attack=[[1d6]]}} {{Trigger=An enemy is Bloodied.}} {{Target=The triggering enemy.}} {{damage=4}} {{effect=Target makes a saving throw. If it fails, it is Taken Out. If it succeeds, it is Blinded until the end of its next turn.}}"></button>-->
+                    <button type="roll" value="&{template:default} {{name=@{roleName}}} {{range=@{roleRange}}} {{attack=[[1d6]]}} {{Type=@{roleType}}} {{Usage=@{roleUsage}}} {{Damage=@{roleD}}} {{Effect=@{roleE}}}"></button>
+                    <!--<textarea title="@{repeating_power_X_macro-text}" class="sheet-macro-text" name="attr_macro-text" placeholder="Macro">&{template:default} {{name=@{roleName}}} {{range=@{roleRange}}} {{attack=[[1d6]]}} {{Type=@{roleType}}} {{Usage=@{roleUsage}}} {{Damage=@{roleD}}} {{Effect=@{roleE}}}</textarea>-->
+                </div>
                 <div class='combatTableCell'>
                     <input class="sheet-roleName" style='width: 50px' type="number" name="attr_roleLvl" title="@{repeating_compss_#_roleLvl}" placeholder="Lvl"/>
                 </div>
@@ -205,10 +212,10 @@
                     <input class="sheet-roleRange" style='width: 100px' type="text" name="attr_roleRange" title="@{repeating_compss_#_roleRange}" placeholder="Range"/>
                 </div>
                 <div class='combatTableCell'>
-                    <input class="sheet-roleD" style='width: 50px' type="text" name="attr_roleD" title="@{repeating_compss_#_roleDt}" placeholder="D"/>
+                    <input class="sheet-roleD" style='width: 50px' type="text" name="attr_roleD" title="@{repeating_compss_#_roleD}" placeholder="D"/>
                 </div>
                 <div class='combatTableCell'>
-                    <input class="sheet-roleE" style='width: 200px' type="text" name="attr_roleE" title="@{repeating_compss_#_roleE}" placeholder="E"/>
+                    <input class="sheet-roleE" style='width: 175px' type="text" name="attr_roleE" title="@{repeating_compss_#_roleE}" placeholder="E"/>
                 </div>
 			</div>
 		</fieldset>
@@ -220,6 +227,7 @@
             <h3>Class Powers & Features (or Stances, Trick Arrows, etc)</h3>
         </div>
         <div class='tableHeader combatTableRow'>
+            <div class='combatTableHeader' style='width: 30px'></div>
             <div class='combatTableHeader' style='width: 50px'>Lvl</div>
             <div class='combatTableHeader' style='width: 125px'>Name</div>
             <div class='combatTableHeader' style='width: 75px'>Type</div>
@@ -227,10 +235,13 @@
             <div class='combatTableHeader' style='width: 75px'>Action</div>
             <div class='combatTableHeader' style='width: 100px'>Range</div>
             <div class='combatTableHeader' style='width: 50px'>D</div>
-            <div class='combatTableHeader' style='width: 200px'>E</div>
+            <div class='combatTableHeader' style='width: 170px'>E</div>
         </div>
         <fieldset class="repeating_class">
             <div class='sheet-WCclassRow'>
+                <div class='combatTableCell'>
+                    <button type="roll" value="&{template:default} {{name=@{className}}} {{range=@{classRange}}} {{attack=[[1d6]]}} {{Type=@{classType}}} {{Usage=@{classUsage}}} {{Damage=@{classD}}} {{Effect=@{classE}}}"></button>
+                </div>
                 <div class='combatTableCell'>
                     <input class="sheet-className" style='width: 50px' type="number" name="attr_classLvl" title="@{repeating_compss_#_classLvl}" placeholder="Lvl"/>
                 </div>
@@ -253,7 +264,7 @@
                     <input class="sheet-classD" style='width: 50px' type="text" name="attr_classD" title="@{repeating_compss_#_classDt}" placeholder="D"/>
                 </div>
                 <div class='combatTableCell'>
-                    <input class="sheet-classE" style='width: 200px' type="text" name="attr_classE" title="@{repeating_compss_#_classE}" placeholder="E"/>
+                    <input class="sheet-classE" style='width: 175px' type="text" name="attr_classE" title="@{repeating_compss_#_classE}" placeholder="E"/>
                 </div>
 			</div>
 		</fieldset>