diff --git a/HealBot.lua b/HealBot.lua
index a8bcad5..beecb03 100644
--- a/HealBot.lua
+++ b/HealBot.lua
@@ -748,6 +748,7 @@ function HealBot_OnUpdate(this,arg1)
          if InitSpells>2 then
            local cnt=HealBot_InitSpells();
            InitSpells=0;
+           HealBot_RecalcSpells();
          end
       end
       if Delay_RecalcParty>0 then
diff --git a/HealBot_Options_Skins.xml b/HealBot_Options_Skins.xml
index 66190e5..dc77534 100644
--- a/HealBot_Options_Skins.xml
+++ b/HealBot_Options_Skins.xml
@@ -294,10 +294,13 @@
         </Scripts>
       </Slider> 
       <Slider name="HealBot_Options_BarAlpha" inherits="HealBot_Options_SliderTemplate">
+        <Size>
+		  <AbsDimension x="123" y="17" />
+		</Size>
         <Anchors>
-          <Anchor point="TOPLEFT" relativeTo="HealBot_Options_BarBRSpaceS" relativePoint="TOPLEFT">
+          <Anchor point="TOPLEFT" relativeTo="HealBot_Options_FramePaddingS" relativePoint="TOPLEFT">
             <Offset>
-              <AbsDimension x="10" y="-35" /> 
+              <AbsDimension x="0" y="-35" /> 
             </Offset>
           </Anchor>
         </Anchors>
@@ -308,10 +311,13 @@
       </Slider>
 
       <Slider name="HealBot_Options_BarAlphaInHeal" inherits="HealBot_Options_SliderTemplate">
+        <Size>
+		  <AbsDimension x="123" y="17" />
+		</Size>
         <Anchors>
-          <Anchor point="TOPLEFT" relativeTo="HealBot_Options_BarAlpha" relativePoint="TOPLEFT">
+          <Anchor point="TOPLEFT" relativeTo="HealBot_Options_BarAlpha" relativePoint="TOPRIGHT">
             <Offset>
-              <AbsDimension x="0" y="-30" /> 
+              <AbsDimension x="10" y="0" /> 
             </Offset>
           </Anchor>
         </Anchors>
@@ -321,10 +327,13 @@
         </Scripts>
       </Slider>
       <Slider name="HealBot_Options_BarAlphaDis" inherits="HealBot_Options_SliderTemplate">
+        <Size>
+		  <AbsDimension x="123" y="17" />
+		</Size>
         <Anchors>
-          <Anchor point="TOPLEFT" relativeTo="HealBot_Options_BarAlphaInHeal" relativePoint="TOPLEFT">
+          <Anchor point="TOPLEFT" relativeTo="HealBot_Options_BarAlpha" relativePoint="TOPLEFT">
             <Offset>
-              <AbsDimension x="0" y="-30" /> 
+              <AbsDimension x="0" y="-35" /> 
             </Offset>
           </Anchor>
         </Anchors>
@@ -333,36 +342,37 @@
           <OnValueChanged>HealBot_Options_BarAlphaDis_OnValueChanged(this)</OnValueChanged> 
         </Scripts>
       </Slider>
-      <Slider name="HealBot_Options_FontHeight" inherits="HealBot_Options_SliderTemplate">
-        <Size>
-		  <AbsDimension x="123" y="17" />
-		</Size>        <Anchors>
-          <Anchor point="TOPLEFT" relativeTo="HealBot_Options_BarBRSpaceS" relativePoint="TOPLEFT">
-            <Offset>
-              <AbsDimension x="0" y="-132" /> 
-            </Offset>
-          </Anchor>
-        </Anchors>
-        <Scripts>
-          <OnLoad>HealBot_Options_val_OnLoad(this,HEALBOT_OPTIONS_SKINFHEIGHT,7,18)</OnLoad> 
-          <OnValueChanged>HealBot_Options_FontHeight_OnValueChanged(this)</OnValueChanged> 
-        </Scripts>
-      </Slider>
       <Slider name="HealBot_Options_AbortBarSize" inherits="HealBot_Options_SliderTemplate">
         <Size>
 		  <AbsDimension x="123" y="17" />
 		</Size>
         <Anchors>
-          <Anchor point="TOPLEFT" relativeTo="HealBot_Options_FontHeight" relativePoint="TOPRIGHT">
+          <Anchor point="TOPLEFT" relativeTo="HealBot_Options_BarAlphaDis" relativePoint="TOPRIGHT">
             <Offset>
               <AbsDimension x="10" y="0" /> 
             </Offset>
           </Anchor>
         </Anchors>
         <Scripts>
-          <OnLoad>HealBot_Options_val_OnLoad(this,HEALBOT_OPTIONS_ABORTSIZE,0,15)</OnLoad> 
+          <OnLoad>HealBot_Options_val_OnLoad(this,"Abort size",0,15)</OnLoad> 
           <OnValueChanged>HealBot_Options_AbortBarSize_OnValueChanged(this)</OnValueChanged> 
         </Scripts>
+      </Slider>
+      <Slider name="HealBot_Options_FontHeight" inherits="HealBot_Options_SliderTemplate">
+        <Size>
+		  <AbsDimension x="123" y="17" />
+		</Size>
+        <Anchors>
+          <Anchor point="TOPLEFT" relativeTo="HealBot_Options_BarAlphaDis" relativePoint="TOPLEFT">
+            <Offset>
+              <AbsDimension x="0" y="-35" /> 
+            </Offset>
+          </Anchor>
+        </Anchors>
+        <Scripts>
+          <OnLoad>HealBot_Options_val_OnLoad(this,HEALBOT_OPTIONS_SKINFHEIGHT,7,18)</OnLoad> 
+          <OnValueChanged>HealBot_Options_FontHeight_OnValueChanged(this)</OnValueChanged> 
+        </Scripts>
       </Slider> 
       
    <Button name="HealBot_EnTextColorpickb">
diff --git a/README.md b/README.md
index 7489744..fd6acd3 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,13 @@ Default installation path: `C:\Program Files\World of Warcraft\Interface\AddOns\
 
 ### Change Log
 
+**v1.3**
+* **Monolithic Code Modularization:** Split the massive, single-file options system (`HealBot_Options.xml`/`HealBot_Options.lua`) into 7 dedicated, content-named panel subfiles (`General`, `Spells`, `Healing`, `CDC`, `Skins`, `Buffs`, and `Chat`) to improve codebase modularity and stability.
+* **Scope Resolution Fix:** Promoted `HealBot_Options_ComboButtons_Button` to global scope in the base options file to resolve a `nil` comparison error when loading spell settings.
+* **Core Options Layout Correction:** Relocated the "Defaults" and "Close" buttons back into the parent options frame's container, ensuring they display consistently at the bottom of all configuration tabs.
+* **Skins Grid Alignment:** Fixed layout overlaps on the Skins panel by setting explicit width/height sizes (`123 x 17`) on the opacity sliders and reorganizing all 13 sliders into a clean, uniform 2-column grid.
+* **Startup Refresh Optimization:** Resolved initial loading lag where action bars would be missing by forcing an immediate UI refresh (`HealBot_RecalcSpells()`) once spell data loads.
+
 **v1.2.1**
 * **UI Layout Fixes:** Fixed slider width constraints in the Skin menu causing layout overlaps. Realigned Chat tab buttons to ensure they do not exceed the window bounds. Fixed Color Picker anchors.
 * **Menu Cleanup:** Fixed Options panel checkboxes overlapping due to incorrect vertical spacing offsets.