diff --git a/Zafir/zafir.css b/Zafir/zafir.css
index e44061501e..f0cde80a96 100644
--- a/Zafir/zafir.css
+++ b/Zafir/zafir.css
@@ -411,7 +411,7 @@ div.itemcontrol {
   padding: 0px;
   margin: 0px;
   display: inline-block;
-  width: 162px;
+  width: 172px;
   position: relative;
   right: 3px;
   top: 1px;
@@ -522,8 +522,7 @@ div.itemcontrol {
   text-overflow: ellipsis;
 }
 
-.sheet-specialammo {
-  background-color: #AAA;
+.sheet-bottomfilledinset {
   color: white;
   margin-left: -12px;
   padding-left: 12px;
@@ -537,6 +536,10 @@ div.itemcontrol {
   border-bottom-right-radius: 8px;
 }
 
+.sheet-specialammo {
+  background-color: #AAA;
+}
+
 .sheet-eit .sheet-btn,
 .sheet-eit .sheet-attacklabel {
   float:none;
@@ -568,7 +571,7 @@ div.itemcontrol {
 
 .sheet-aaa input[type=text] {
   width: 175px;
-  margin-right: 16px;
+  margin-right: 8px;
 }
 
 .sheet-aaa input[type=number] {
@@ -718,6 +721,37 @@ div.itemcontrol {
   display: none;
 }
 
+/* haha I fuckin hate CSS */
+.sheet-hideifnotzero[value="1"] + div,
+.sheet-hideifnotzero[value="1"] + button,
+.sheet-hideifnotzero[value="1"] + span,
+.sheet-hideifnotzero[value="2"] + div,
+.sheet-hideifnotzero[value="2"] + button,
+.sheet-hideifnotzero[value="2"] + span,
+.sheet-hideifnotzero[value="3"] + div,
+.sheet-hideifnotzero[value="3"] + button,
+.sheet-hideifnotzero[value="3"] + span,
+.sheet-hideifnotzero[value="4"] + div,
+.sheet-hideifnotzero[value="4"] + button,
+.sheet-hideifnotzero[value="4"] + span,
+.sheet-hideifnotzero[value="5"] + div,
+.sheet-hideifnotzero[value="5"] + button,
+.sheet-hideifnotzero[value="5"] + span,
+.sheet-hideifnotzero[value="6"] + div,
+.sheet-hideifnotzero[value="6"] + button,
+.sheet-hideifnotzero[value="6"] + span,
+.sheet-hideifnotzero[value="7"] + div,
+.sheet-hideifnotzero[value="7"] + button,
+.sheet-hideifnotzero[value="7"] + span,
+.sheet-hideifnotzero[value="8"] + div,
+.sheet-hideifnotzero[value="8"] + button,
+.sheet-hideifnotzero[value="8"] + span,
+.sheet-hideifnotzero[value="9"] + div,
+.sheet-hideifnotzero[value="9"] + button,
+.sheet-hideifnotzero[value="9"] + span {
+  display: none;
+}
+
 input[type=checkbox] {
   width: auto;
   float: right;
diff --git a/Zafir/zafir.html b/Zafir/zafir.html
index c4a9992944..92c3ff406e 100644
--- a/Zafir/zafir.html
+++ b/Zafir/zafir.html
@@ -275,7 +275,7 @@
                                         </span>
                                     </span>
                                 </span>
-                                <label style="width:110px;"><span name="attr_aablname" ></span></label>
+                                <label style="width:110px;"><span name="attr_aablname"></span></label>
                                     <label>+<span name="attr_aablatkrollaimdice"></span> <span data-i18n="aim">aim</span>&nbsp;&nbsp;&nbsp;+<span name="attr_aablatkrollcritdice"></span> <span data-i18n="crit">crit</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="tooltip"><span name="attr_aablatkrolldamage"></span> (+<span name="attr_aablatkrollcritdamage" value="0"></span>)<span class="tooltiptext">Damage</span></span></label>
                             </div>
                         </fieldset>
@@ -521,14 +521,23 @@
                                         </div>
                                         <input type="hidden" class="hideifone" name="attr_aabloncooldown" value="0" />
                                         <div>
-                                            <input type="hidden" class="hideifzero" name="attr_aablcooldown" value="0"/>
-                                            <button type="action" name="act_setcooldown" class="btn tooltip">
-                                                Use Ability (<span name="attr_aablcooldown"></span> <span style="font-family:Pictos">t</span>)
-                                            </button>
                                             <input type="hidden" class="hideifzero" name="attr_aablcharges" value="0"/>
-                                            <button type="action" name="act_usecharge" class="btn">
-                                                Use Ability (<span style="font-family:Pictos">}</span> <span name="attr_aablchargesleft"></span>/<span name="attr_aablcharges"></span>)
-                                            </button>
+                                            <span>
+                                                <input type="hidden" class="hideifzero" name="attr_aablcooldown" value="0"/>
+                                                <button type="action" name="act_setcooldown" class="btn tooltip" style="width:12px;padding-left:6px;padding-right:6px;">
+                                                    <span style="font-family:Pictos">t</span>
+                                                    <span class="tooltiptext" style="left:2px;" data-i18n="Cooldown Tooltip"><b>Set Cooldown</b><hr />Put this ability on cooldown</span></button>
+                                                <button type="action" name="act_usecharge" class="btn">
+                                                    Use Ability (<span style="font-family:Pictos">}</span> <span name="attr_aablchargesleft"></span>/<span name="attr_aablcharges"></span>)
+                                                </button>
+                                            </span>
+                                            <input type="hidden" class="hideifnotzero" name="attr_aablcharges" value="0"/>
+                                            <span>
+                                                <input type="hidden" class="hideifzero" name="attr_aablcooldown" value="0"/>
+                                                <button type="action" name="act_setcooldown" class="btn tooltip">
+                                                    Use Ability (<span name="attr_aablcooldown"></span> <span style="font-family:Pictos">t</span>)
+                                                </button>
+                                            </span>
                                         </div>
                                     </div>
                                 </div>
@@ -555,7 +564,7 @@
                             <button class="btn" disabled><span data-i18n="Reload">Reload</span></button>
                             <label style="width:110px"><span name="attr_wpname"></span>:</label><input type="number" name="attr_wpammo" value="0" /><span class="labellike">&nbsp;/&nbsp;</span><span class="labellike" name="attr_wpammo_max"></span><br/>
                             <input type="hidden" class="valuehider" name="attr_specialammo" value=""/>
-                            <div class="specialammo"><span name="attr_specialammo"></span>: <span name="attr_specialammoreloads"></span> <span data-i18n="reloads">reloads</span></div>
+                            <div class="bottomfilledinset specialammo"><span name="attr_specialammo"></span>: <span name="attr_specialammoreloads"></span> <span data-i18n="reloads">reloads</span></div>
                         </div>
                     </div>
                 </div>
@@ -665,10 +674,10 @@
                     </select>
                     <input type="hidden" class="tabstoggle" name="attr_aabltype" value="Standard" />
                     <div class="aablStandard">
-                        <span class="labellike help tooltip" style="right:40px;top:-32px;">&nbsp;<span style="font-family:Pictos">?</span><span class="tooltiptext" data-i18n="Usable Ability Tooltip"><b>Usable Ability</b><hr />This ability appears as an <em>Ability</em> in Usable tab of the Combat panel.</span></span> 
+                        <span class="labellike help tooltip" style="right:32px;top:-32px;">&nbsp;<span style="font-family:Pictos">?</span><span class="tooltiptext" data-i18n="Usable Ability Tooltip"><b>Usable Ability</b><hr />This ability appears as an <em>Ability</em> in Usable tab of the Combat panel.</span></span> 
                     </div>
                     <div class="aablWeapon nowrap">
-                        <span class="labellike help tooltip" style="right:40px;top:-32px;">&nbsp;<span style="font-family:Pictos">?</span><span class="tooltiptext" data-i18n="Weapon Attack Tooltip"><b>Attack</b><hr />This ability appears as a <em>Attack</em> on the Combat panel.</span></span> 
+                        <span class="labellike help tooltip" style="right:32px;top:-32px;">&nbsp;<span style="font-family:Pictos">?</span><span class="tooltiptext" data-i18n="Weapon Attack Tooltip"><b>Attack</b><hr />This ability appears as a <em>Attack</em> on the Combat panel.</span></span> 
                         <label data-i18n="Weapon:">Weapon:</label>
                         <select name="attr_aablatkweap" style="width:211px;margin-right:0;">
                             <option value="Nothing" data-i18n="Does Not Use Weapon">Does Not Use Weapon</option>
@@ -687,14 +696,14 @@
                         </div>
                     </div>
                     <div class="aablArea">
-                        <span class="labellike help tooltip" style="right:40px;top:-32px;">&nbsp;<span style="font-family:Pictos">?</span><span class="tooltiptext" data-i18n="Area Attack Tooltip"><b>Area of Effect</b><hr />This ability appears as an <em>Area of Effect</em> on the Combat panel.</span></span> 
+                        <span class="labellike help tooltip" style="right:32px;top:-32px;">&nbsp;<span style="font-family:Pictos">?</span><span class="tooltiptext" data-i18n="Area Attack Tooltip"><b>Area of Effect</b><hr />This ability appears as an <em>Area of Effect</em> on the Combat panel.</span></span> 
                         <label data-i18n="Damage:">Damage:</label><input style="width:207px;margin-right:0;" type="text" spellcheck="false" name="attr_aablatkdmg" /><br/>
                         <label data-i18n="Crit Dice:">Crit Dice:</label><input type="number" name="attr_aablatkcrit" value="0" />
                         <label style="width:90px;margin-left:13px;" data-i18n="Crit Dmg:">Crit Dmg:</label><input type="number" name="attr_aablatkcritdmg" value="0" />
                         <label data-i18n="Effects:">Effects:</label><input style="width:207px;margin-right:0;" type="text" spellcheck="false" name="attr_aablatkeffects" /><br/>
                     </div>
                     <div class="aablWill wrap">
-                        <span class="labellike help tooltip" style="right:40px;top:-32px;">&nbsp;<span style="font-family:Pictos">?</span><span class="tooltiptext" data-i18n="Will Attack Tooltip"><b>Will Attack</b><hr />This ability appears as a <em>Will Attack</em> on the Combat panel.</span></span> 
+                        <span class="labellike help tooltip" style="right:32px;top:-32px;">&nbsp;<span style="font-family:Pictos">?</span><span class="tooltiptext" data-i18n="Will Attack Tooltip"><b>Will Attack</b><hr />This ability appears as a <em>Will Attack</em> on the Combat panel.</span></span> 
                         <label data-i18n="Crit Dice:">Crit Dice:</label><input type="number" name="attr_aablcritdice" value="0" />
                     </div>
                 </div>