diff --git a/Zafir/zafir.css b/Zafir/zafir.css
index e0b2aa32a7..57486e5a0e 100644
--- a/Zafir/zafir.css
+++ b/Zafir/zafir.css
@@ -367,6 +367,11 @@ button.sheet-addbtn {
   margin-left: 0px;
 }
 
+.sheet-enemyattacklist button.sheet-addbtn {
+  float: right;
+  margin-left: 12px;
+}
+
 button.sheet-skillbtn {
   background-color: #EEE;
   border: none;
diff --git a/Zafir/zafir.html b/Zafir/zafir.html
index 3c0bc09b7c..f16e3cdeb2 100644
--- a/Zafir/zafir.html
+++ b/Zafir/zafir.html
@@ -1105,7 +1105,7 @@
     <div class="gmcombat">
         <div class="2colrow">
             <div class="col1 nowrap">
-                <h3 data-i18n="Attack">Attack</h3>
+                <h3 data-i18n="Attacks">Attacks</h3>
                 <label data-i18n="Target Cover:">Target Cover:</label><select name="attr_atkcover">
                     <option value="Full Cover" data-i18n="Full Cover Option">Full Cover (+0)</option>
                     <option value="Half Cover" data-i18n="Half Cover Option">Half Cover (+1 aim)</option>
@@ -1147,7 +1147,7 @@
                 </div>
                 <br />
                 <!-- Grenade Attack -->
-                <h3 data-i18n="Grenade Attack">Grenade Attack</h3>
+                <h3 data-i18n="Grenade Attacks">Grenade Attacks</h3>
                 <label data-i18n="Targets:">Targets:</label><input style="margin-right:8px;" type="number" name="attr_gmgtargets" value="1" min="1" max="5">
                 <label style="width:80px;" data-i18n="Effects:">Effects:</label><input style="width:279px;" type="text" name="attr_gmgeffects" value="">
                 <div class="customattack attack clearfix">
@@ -1159,7 +1159,7 @@
                 <br />
                 <!-- Will Attack -->
                 <div>
-                    <h3 data-i18n="Will Attack">Will Attack</h3>
+                    <h3 data-i18n="Will Attacks">Will Attacks</h3>
                     <label data-i18n="Wounded:">Wounded:</label><select name="attr_willatkwounded">
                         <option value="No" data-i18n="Full Health Option">Target at Full Health (+0)</option>
                         <option value="Yes" data-i18n="Wounded Option">Target Wounded (+1 will)</option>
@@ -1459,50 +1459,84 @@
                         <label style="width:73px;" data-i18n="Dodge:">Dodge:</label><input type="number" name="attr_selectedenemydodge" style="margin-right:10px;" value="0" /><br />
                         <label data-i18n="Unit Notes:">Unit Notes:</label><input type="text" spellcheck="false" name="attr_selectedenemynotes"></input>
                     </div>
-                    <div class="2colrowx nowrap">
-                        <div class="colx nowrap">
+                    <div class="nowrap">
+
+
+
                             <h3 data-i18n="Attacks">Attacks</h3>
                             <div class="enemyattacklist">
+
                                 <input type="hidden" class="valuehider" name="attr_selectedenemyatk0_id" value="">
                                 <div class="enemyattackentry">
                                     <label data-i18n="Name:">Name:</label><input type="text" spellcheck="false" name="attr_selectedenemyatkname" /><br />
                                     <label data-i18n="Aim Dice:">Aim Dice:</label><input type="number" name="attr_selectedenemyatkaim" value="0" />
-                                    <label data-i18n="Crit Dice:" style="margin-left:32px;">Crit Dice:</label><input type="number" name="attr_selectedenemyatkcrit" value="0" /><br />
-                                    <label data-i18n="Damage:">Damage:</label><input style="width:65px;" type="text" spellcheck="false" name="attr_selectedenemyatkdmg" value="0" />
+                                    <label data-i18n="Crit Dice:" style="margin-left:32px;">Crit Dice:</label><input type="number" name="attr_selectedenemyatkcrit" value="0" />
+                                    <label data-i18n="Damage:" style="margin-left:29px;">Damage:</label><input style="width:65px;" type="text" spellcheck="false" name="attr_selectedenemyatkdmg" value="0" />
                                     <label data-i18n="Crit Dmg:" style="margin-left:12px;">Crit Dmg:</label><input type="number" name="attr_selectedenemyatkcritdmg" value="0" /><br />
                                     <label data-i18n="Notes:">Notes:</label><input type="text" spellcheck="false" name="attr_selectedenemyatknotes" />
                                 </div>
+
                                 <input type="hidden" class="valuehider" name="attr_selectedenemyatk1_id" value="">
                                 <div class="enemyattackentry">
                                     <label data-i18n="Name:">Name:</label><input type="text" spellcheck="false" name="attr_selectedenemyatk1name" /><br />
                                     <label data-i18n="Aim Dice:">Aim Dice:</label><input type="number" name="attr_selectedenemyatk1aim" value="0" />
-                                    <label data-i18n="Crit Dice:" style="margin-left:32px;">Crit Dice:</label><input type="number" name="attr_selectedenemyatk1crit" value="0" /><br />
-                                    <label data-i18n="Damage:">Damage:</label><input style="width:65px;" type="text" spellcheck="false" name="attr_selectedenemyatk1dmg" value="0" />
+                                    <label data-i18n="Crit Dice:" style="margin-left:32px;">Crit Dice:</label><input type="number" name="attr_selectedenemyatk1crit" value="0" />
+                                    <label data-i18n="Damage:" style="margin-left:29px;">Damage:</label><input style="width:65px;" type="text" spellcheck="false" name="attr_selectedenemyatk1dmg" value="0" />
                                     <label data-i18n="Crit Dmg:" style="margin-left:12px;">Crit Dmg:</label><input type="number" name="attr_selectedenemyatk1critdmg" value="0" /><br />
                                     <label data-i18n="Notes:">Notes:</label><input type="text" spellcheck="false" name="attr_selectedenemyatk1notes" />
                                 </div>
+
                                 <input type="hidden" class="valuehider" name="attr_selectedenemyatk2_id" value="">
                                 <div class="enemyattackentry">
                                     <label data-i18n="Name:">Name:</label><input type="text" spellcheck="false" name="attr_selectedenemyatk2name" /><br />
                                     <label data-i18n="Aim Dice:">Aim Dice:</label><input type="number" name="attr_selectedenemyatk2aim" value="0" />
-                                    <label data-i18n="Crit Dice:" style="margin-left:32px;">Crit Dice:</label><input type="number" name="attr_selectedenemyatk2crit" value="0" /><br />
-                                    <label data-i18n="Damage:">Damage:</label><input style="width:65px;" type="text" spellcheck="false" name="attr_selectedenemyatk2dmg" value="0" />
+                                    <label data-i18n="Crit Dice:" style="margin-left:32px;">Crit Dice:</label><input type="number" name="attr_selectedenemyatk2crit" value="0" />
+                                    <label data-i18n="Damage:" style="margin-left:29px;">Damage:</label><input style="width:65px;" type="text" spellcheck="false" name="attr_selectedenemyatk2dmg" value="0" />
                                     <label data-i18n="Crit Dmg:" style="margin-left:12px;">Crit Dmg:</label><input type="number" name="attr_selectedenemyatk2critdmg" value="0" /><br />
                                     <label data-i18n="Notes:">Notes:</label><input type="text" spellcheck="false" name="attr_selectedenemyatk2notes" />
                                 </div>
+
+                                <input type="hidden" class="valuehider" name="attr_selectedenemyatk0_id">
+                                <div>
+                                    <button class="removebtn" type="action" name="act_removegmunitatk"><span data-i18n="Remove">Remove</span></button>
+                                </div>
                                 <input type="hidden" class="avaluehider" name="attr_selectedenemyatk2_id">
                                 <div>
                                     <button class="addbtn" type="action" name="act_addgmunitatk"><span data-i18n="Plus Add">+Add</span></button>
                                 </div>
-                                <input type="hidden" class="valuehider" name="attr_selectedenemyatk0_id">
-                                <div>
-                                    <button class="removebtn" type="action" name="act_removegmunitatk"><span data-i18n="Remove">Remove</span></button>
-                                </div>
+                                <div class="clearfix" />
                             </div>
-                            <!--<button class="removebtn" type="action" name="act_cleargmattacks">Clear</button>-->
-                        </div>
-                        <div class="colx nowrap">
-                            <h3 data-i18n="Abilities">Abilities</h3>
+                            <br />
+                            
+                            
+                            <h3 data-i18n="Grenade Attacks">Grenade Attacks</h3>
+                            <div class="enemyattacklist">
+                                <input type="hidden" class="valuehider" name="attr_selectedenemygrenadeatk0_id">
+                                <div>
+                                    <button class="removebtn" type="action" name="act_removegmunitgrenadeatk"><span data-i18n="Remove">Remove</span></button>
+                                </div><input type="hidden" class="avaluehider" name="attr_selectedenemygrenadeatk2_id">
+                                <div>
+                                    <button class="addbtn" type="action" name="act_addgmunitgrenadeatk"><span data-i18n="Plus Add">+Add</span></button>
+                                </div>
+                                <div class="clearfix" />
+                            </div>
+                            <br />
+
+                            <h3 data-i18n="Will Attacks">Will Attacks</h3>
+                            <div class="enemyattacklist">
+                                <input type="hidden" class="valuehider" name="attr_selectedenemywillatk0_id">
+                                <div>
+                                    <button class="removebtn" type="action" name="act_removegmunitwillatk"><span data-i18n="Remove">Remove</span></button>
+                                </div>
+                                <input type="hidden" class="avaluehider" name="attr_selectedenemywillatk2_id">
+                                <div>
+                                    <button class="addbtn" type="action" name="act_addgmunitwillatk"><span data-i18n="Plus Add">+Add</span></button>
+                                </div>
+                                <div class="clearfix" />
+                            </div>
+                            <br />
+
+                            <h3 data-i18n="Usable Abilities">Usable Abilities</h3>
                             <div class="enemyattacklist">
 
                                 <input type="hidden" class="valuehider" name="attr_selectedenemyabl0_id" value="">
@@ -1585,16 +1619,30 @@
                                     <label data-i18n="Effect:">Effect:</label><textarea name="attr_selectedenemyabl4effect"></textarea>
                                 </div>
 
-                                <input type="hidden" class="avaluehider" name="attr_selectedenemyabl4_id">
-                                <div>
-                                    <button class="addbtn" type="action" name="act_addgmunitabl"><span data-i18n="Plus Add">+Add</span></button>
-                                </div>
                                 <input type="hidden" class="valuehider" name="attr_selectedenemyabl0_id">
                                 <div>
                                     <button class="removebtn" type="action" name="act_removegmunitabl"><span data-i18n="Remove">Remove</span></button>
+                                </div><input type="hidden" class="avaluehider" name="attr_selectedenemyabl4_id">
+                                <div>
+                                    <button class="addbtn" type="action" name="act_addgmunitabl"><span data-i18n="Plus Add">+Add</span></button>
                                 </div>
+                                <div class="clearfix" />
                             </div>
-                        </div>
+                            <br />
+
+                            <h3 data-i18n="Usable Items">Usable Items</h3>
+                            <div class="enemyattacklist">
+                                <input type="hidden" class="valuehider" name="attr_selectedenemyitem0_id">
+                                <div>
+                                    <button class="removebtn" type="action" name="act_removegmunititem"><span data-i18n="Remove">Remove</span></button>
+                                </div>
+                                <input type="hidden" class="avaluehider" name="attr_selectedenemyitem2_id">
+                                <div>
+                                    <button class="addbtn" type="action" name="act_addgmunitwillitem"><span data-i18n="Plus Add">+Add</span></button>
+                                </div>
+                                <div class="clearfix" />
+                            </div>
+                            <br />
                     </div>
                 </div>
             </div>