diff --git a/Frame.lua b/Frame.lua
index 93c52fa..b32e392 100644
--- a/Frame.lua
+++ b/Frame.lua
@@ -104,7 +104,7 @@ function Gladdy:CreateFrame()
         self.anchor:Hide()
     end
 
-    self.frame:Hide()
+    self.frame:SetAlpha(0)
 end
 
 function Gladdy:UpdateFrame()
@@ -271,7 +271,7 @@ end
 
 function Gladdy:HideFrame()
     if (self.frame) then
-        self.frame:Hide()
+        self.frame:SetAlpha(0)
         self.frame.testing = nil
     end
 end
@@ -297,7 +297,7 @@ function Gladdy:ToggleFrame(i)
         self.curBracket = i
         self:UpdateFrame()
         self:Test()
-        self.frame:Show()
+        self.frame:SetAlpha(1)
     end
 end
 
diff --git a/Gladdy.lua b/Gladdy.lua
index 42ece9d..10facf9 100644
--- a/Gladdy.lua
+++ b/Gladdy.lua
@@ -251,10 +251,13 @@ function Gladdy:OnEnable()
     self:RegisterEvent("UPDATE_BATTLEFIELD_STATUS")
     self:RegisterEvent("PLAYER_ENTERING_WORLD")
 
+    self:CreateFrame()
     for i = 1, 5 do
         self:CreateButton(i)
     end
+    self.curBracket = 5
     self:UpdateFrame()
+    self:Reset()
 
     if (IsAddOnLoaded("Clique")) then
         ClickCastFrames = ClickCastFrames or {}
@@ -425,8 +428,8 @@ function Gladdy:JoinedArena()
         self.curBracket = 2
     end
 
-    self:SendMessage("JOINED_ARENA")
-    self.frame:Show()
+    Gladdy:SendMessage("JOINED_ARENA")
+    self.frame:SetAlpha(1)
     for i=1, self.curBracket do
         self.buttons["arena" .. i]:SetAlpha(1)
     end
diff --git a/Modules/Clicks.lua b/Modules/Clicks.lua
index c7cf671..ae9b9a3 100644
--- a/Modules/Clicks.lua
+++ b/Modules/Clicks.lua
@@ -53,8 +53,8 @@ BINDING_NAME_GLADDYBUTTON3_BUTTON5 = L["Button5 Click Enemy 3"]
 BINDING_NAME_GLADDYBUTTON4_BUTTON5 = L["Button5 Click Enemy 4"]
 BINDING_NAME_GLADDYBUTTON5_BUTTON5 = L["Button5 Click Enemy 5"]
 
-function Clicks:Initialise()
-    self:RegisterMessage("JOINED_ARENA")
+function Clicks:Initialize()
+    --
 end
 
 function Clicks:Reset()
@@ -62,21 +62,14 @@ function Clicks:Reset()
 end
 
 function Clicks:ResetUnit(unit)
-    local button = Gladdy.buttons[unit]
-    if (not button) then
-        return
-    end
-
-    for k, v in pairs(Gladdy.db.attributes) do
-        button.secure:SetAttribute(v.modifier .. "macrotext" .. v.button, "")
-    end
+    --
 end
 
-function Clicks:Test()
-    Clicks:JOINED_ARENA()
+function Clicks:UpdateFrame(unit)
+    self:SetupAttributes(unit)
 end
 
-function Clicks:JOINED_ARENA()
+function Clicks:UpdateFrameOnce()
     for k, v in pairs(Gladdy.buttons) do
         local left = GetBindingKey(("GLADDYBUTTON%d_LEFT"):format(v.id))
         local right = GetBindingKey(("GLADDYBUTTON%d_RIGHT"):format(v.id))
@@ -221,9 +214,4 @@ function Clicks:GetOptions()
         options[tostring(i)] = SetupAttributeOption(i)
     end
     return options
-end
-
-function Clicks:UpdateFrame(unit)
-    self:SetupAttributes(unit)
-    self:JOINED_ARENA()
 end
\ No newline at end of file