diff --git a/HealBot_Options_Buffs.xml b/HealBot_Options_Buffs.xml
index 4d5d3d7..ecdbb7b 100644
--- a/HealBot_Options_Buffs.xml
+++ b/HealBot_Options_Buffs.xml
@@ -89,11 +89,10 @@
           <OnLoad>HealBot_Options_Buff_OnLoad(this)</OnLoad>
         </Scripts>
       </Frame>
-      <CheckButton name="HealBot_Options_Buff1Self" inherits="OptionsCheckButtonTemplate" id="1">
-        <Size><AbsDimension x="80" y="20"/></Size>
+      <CheckButton name="HealBot_Options_Buff1Self" inherits="UICheckButtonTemplate" id="1">
         <Anchors>
           <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff1" relativePoint="TOPLEFT">
-            <Offset><AbsDimension x="100" y="18"/></Offset>
+            <Offset><AbsDimension x="145" y="8"/></Offset>
           </Anchor>
         </Anchors>
         <Scripts>
@@ -127,11 +126,10 @@
           <OnLoad>HealBot_Options_Buff_OnLoad(this)</OnLoad>
         </Scripts>
       </Frame>
-      <CheckButton name="HealBot_Options_Buff2Self" inherits="OptionsCheckButtonTemplate" id="2">
-        <Size><AbsDimension x="80" y="20"/></Size>
+      <CheckButton name="HealBot_Options_Buff2Self" inherits="UICheckButtonTemplate" id="2">
         <Anchors>
           <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff2" relativePoint="TOPLEFT">
-            <Offset><AbsDimension x="100" y="18"/></Offset>
+            <Offset><AbsDimension x="145" y="8"/></Offset>
           </Anchor>
         </Anchors>
         <Scripts>
@@ -165,11 +163,10 @@
           <OnLoad>HealBot_Options_Buff_OnLoad(this)</OnLoad>
         </Scripts>
       </Frame>
-      <CheckButton name="HealBot_Options_Buff3Self" inherits="OptionsCheckButtonTemplate" id="3">
-        <Size><AbsDimension x="80" y="20"/></Size>
+      <CheckButton name="HealBot_Options_Buff3Self" inherits="UICheckButtonTemplate" id="3">
         <Anchors>
           <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff3" relativePoint="TOPLEFT">
-            <Offset><AbsDimension x="100" y="18"/></Offset>
+            <Offset><AbsDimension x="145" y="8"/></Offset>
           </Anchor>
         </Anchors>
         <Scripts>
@@ -203,11 +200,10 @@
           <OnLoad>HealBot_Options_Buff_OnLoad(this)</OnLoad>
         </Scripts>
       </Frame>
-      <CheckButton name="HealBot_Options_Buff4Self" inherits="OptionsCheckButtonTemplate" id="4">
-        <Size><AbsDimension x="80" y="20"/></Size>
+      <CheckButton name="HealBot_Options_Buff4Self" inherits="UICheckButtonTemplate" id="4">
         <Anchors>
           <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff4" relativePoint="TOPLEFT">
-            <Offset><AbsDimension x="100" y="18"/></Offset>
+            <Offset><AbsDimension x="145" y="8"/></Offset>
           </Anchor>
         </Anchors>
         <Scripts>
@@ -242,11 +238,10 @@
           <OnLoad>HealBot_Options_Buff_OnLoad(this)</OnLoad>
         </Scripts>
       </Frame>
-      <CheckButton name="HealBot_Options_Buff5Self" inherits="OptionsCheckButtonTemplate" id="5">
-        <Size><AbsDimension x="80" y="20"/></Size>
+      <CheckButton name="HealBot_Options_Buff5Self" inherits="UICheckButtonTemplate" id="5">
         <Anchors>
           <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff5" relativePoint="TOPLEFT">
-            <Offset><AbsDimension x="100" y="18"/></Offset>
+            <Offset><AbsDimension x="145" y="8"/></Offset>
           </Anchor>
         </Anchors>
         <Scripts>
@@ -280,11 +275,10 @@
           <OnLoad>HealBot_Options_Buff_OnLoad(this)</OnLoad>
         </Scripts>
       </Frame>
-      <CheckButton name="HealBot_Options_Buff6Self" inherits="OptionsCheckButtonTemplate" id="6">
-        <Size><AbsDimension x="80" y="20"/></Size>
+      <CheckButton name="HealBot_Options_Buff6Self" inherits="UICheckButtonTemplate" id="6">
         <Anchors>
           <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff6" relativePoint="TOPLEFT">
-            <Offset><AbsDimension x="100" y="18"/></Offset>
+            <Offset><AbsDimension x="145" y="8"/></Offset>
           </Anchor>
         </Anchors>
         <Scripts>
@@ -318,11 +312,10 @@
           <OnLoad>HealBot_Options_Buff_OnLoad(this)</OnLoad>
         </Scripts>
       </Frame>
-      <CheckButton name="HealBot_Options_Buff7Self" inherits="OptionsCheckButtonTemplate" id="7">
-        <Size><AbsDimension x="80" y="20"/></Size>
+      <CheckButton name="HealBot_Options_Buff7Self" inherits="UICheckButtonTemplate" id="7">
         <Anchors>
           <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff7" relativePoint="TOPLEFT">
-            <Offset><AbsDimension x="100" y="18"/></Offset>
+            <Offset><AbsDimension x="145" y="8"/></Offset>
           </Anchor>
         </Anchors>
         <Scripts>
@@ -356,11 +349,10 @@
           <OnLoad>HealBot_Options_Buff_OnLoad(this)</OnLoad>
         </Scripts>
       </Frame>
-      <CheckButton name="HealBot_Options_Buff8Self" inherits="OptionsCheckButtonTemplate" id="8">
-        <Size><AbsDimension x="80" y="20"/></Size>
+      <CheckButton name="HealBot_Options_Buff8Self" inherits="UICheckButtonTemplate" id="8">
         <Anchors>
           <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Buff8" relativePoint="TOPLEFT">
-            <Offset><AbsDimension x="100" y="18"/></Offset>
+            <Offset><AbsDimension x="145" y="8"/></Offset>
           </Anchor>
         </Anchors>
         <Scripts>
diff --git a/HealBot_Options_General.xml b/HealBot_Options_General.xml
index 38f5ba8..e86fe73 100644
--- a/HealBot_Options_General.xml
+++ b/HealBot_Options_General.xml
@@ -128,7 +128,7 @@
             <Anchors>
               <Anchor point="TOPLEFT">
                 <Offset>
-                  <AbsDimension x="60" y="-30" /> 
+                  <AbsDimension x="0" y="-30" /> 
                 </Offset>
               </Anchor>
             </Anchors>
@@ -197,7 +197,7 @@
         <Anchors>
           <Anchor point="TOPLEFT" relativeTo="HealBot_Options_GenFrame" relativePoint="BOTTOMLEFT">
             <Offset>
-              <AbsDimension x="60" y="-10" /> 
+              <AbsDimension x="0" y="-10" /> 
             </Offset>
           </Anchor>
         </Anchors>
diff --git a/HealBot_Options_Integrations.xml b/HealBot_Options_Integrations.xml
index df1ce3b..bec1dde 100644
--- a/HealBot_Options_Integrations.xml
+++ b/HealBot_Options_Integrations.xml
@@ -8,7 +8,7 @@
         <Anchors>
           <Anchor point="TOPLEFT">
             <Offset>
-              <AbsDimension x="90" y="-30"/>
+              <AbsDimension x="100" y="-35"/>
             </Offset>
           </Anchor>
         </Anchors>
@@ -27,7 +27,7 @@
         <Anchors>
           <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Integrations_UnitXP" relativePoint="BOTTOMLEFT">
             <Offset>
-              <AbsDimension x="0" y="-4"/>
+              <AbsDimension x="0" y="-6"/>
             </Offset>
           </Anchor>
         </Anchors>
@@ -44,9 +44,9 @@
 
       <CheckButton name="HealBot_Options_Integrations_SuperWoW" inherits="OptionsCheckButtonTemplate">
         <Anchors>
-          <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Integrations_NampowerInfo" relativePoint="BOTTOMLEFT">
+          <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Integrations_Nampower" relativePoint="BOTTOMLEFT">
             <Offset>
-              <AbsDimension x="-20" y="-12"/>
+              <AbsDimension x="0" y="-60"/>
             </Offset>
           </Anchor>
         </Anchors>
@@ -65,7 +65,7 @@
         <Anchors>
           <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Integrations_SuperWoW" relativePoint="BOTTOMLEFT">
             <Offset>
-              <AbsDimension x="0" y="-4"/>
+              <AbsDimension x="0" y="-6"/>
             </Offset>
           </Anchor>
         </Anchors>
@@ -84,7 +84,7 @@
         <Anchors>
           <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Integrations_ClassicAPI" relativePoint="BOTTOMLEFT">
             <Offset>
-              <AbsDimension x="0" y="-4"/>
+              <AbsDimension x="0" y="-6"/>
             </Offset>
           </Anchor>
         </Anchors>
@@ -97,33 +97,35 @@
           </OnClick>
         </Scripts>
       </CheckButton>
+      <Frame setAllPoints="true">
+        <Layers>
+          <Layer level="ARTWORK">
+            <FontString name="HealBot_Options_Integrations_NampowerInfo" inherits="GameFontHighlightSmall" justifyH="LEFT" justifyV="TOP" text="Note: For the 1-click Shapeshift auto-unshift to work smoothly, you must ENABLE 'Retry server rejected spells' in Nampower ENABLE Queue Instant Cast Spells and Queue Cast Time Spells.">
+              <Size x="340" y="48"/>
+              <Anchors>
+                <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Integrations_Nampower" relativePoint="BOTTOMLEFT">
+                  <Offset>
+                    <AbsDimension x="20" y="-4"/>
+                  </Offset>
+                </Anchor>
+              </Anchors>
+              <Color r="0.7" g="0.7" b="0.7"/>
+            </FontString>
+            <FontString name="HealBot_Options_Integrations_HoTInfo" inherits="GameFontHighlightSmall" justifyH="LEFT" justifyV="TOP" text="Note: HoT Timers require Nampower to be enabled and active to provide accurate aura times.">
+              <Size x="340" y="30"/>
+              <Anchors>
+                <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Integrations_ShowHoTTimers" relativePoint="BOTTOMLEFT">
+                  <Offset>
+                    <AbsDimension x="20" y="-4"/>
+                  </Offset>
+                </Anchor>
+              </Anchors>
+              <Color r="0.7" g="0.7" b="0.7"/>
+            </FontString>
+          </Layer>
+        </Layers>
+      </Frame>
     </Frames>
-    <Layers>
-      <Layer level="ARTWORK">
-        <FontString name="HealBot_Options_Integrations_NampowerInfo" inherits="GameFontHighlightSmall" justifyH="LEFT" justifyV="TOP" text="Note: For the 1-click Shapeshift auto-unshift to work smoothly, you must ENABLE 'Retry server rejected spells' in Nampower ENABLE Queue Instant Cast Spells and Queue Cast Time Spells.">
-          <Size x="340" y="30"/>
-          <Anchors>
-            <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Integrations_Nampower" relativePoint="BOTTOMLEFT">
-              <Offset>
-                <AbsDimension x="20" y="-2"/>
-              </Offset>
-            </Anchor>
-          </Anchors>
-          <Color r="0.7" g="0.7" b="0.7"/>
-        </FontString>
-        <FontString name="HealBot_Options_Integrations_HoTInfo" inherits="GameFontHighlightSmall" justifyH="LEFT" justifyV="TOP" text="Note: HoT Timers require Nampower to be enabled and active to provide accurate aura times.">
-          <Size x="340" y="30"/>
-          <Anchors>
-            <Anchor point="TOPLEFT" relativeTo="HealBot_Options_Integrations_ShowHoTTimers" relativePoint="BOTTOMLEFT">
-              <Offset>
-                <AbsDimension x="20" y="-2"/>
-              </Offset>
-            </Anchor>
-          </Anchors>
-          <Color r="0.7" g="0.7" b="0.7"/>
-        </FontString>
-      </Layer>
-    </Layers>
     <Scripts>
       <OnShow>
         HealBot_Options_Integrations_OnShow(this);