diff --git a/Frame.lua b/Frame.lua
index d1b645c..d09d1f6 100644
--- a/Frame.lua
+++ b/Frame.lua
@@ -109,6 +109,10 @@ end
 
 function Gladdy:UpdateFrame()
 
+    if (InCombatLockdown()) then
+        return
+    end
+
     if (not self.frame) then
         self:CreateFrame()
     end
@@ -312,11 +316,17 @@ function Gladdy:CreateButton(i)
     local secure = CreateFrame("Button", "GladdyButton" .. i, button, "SecureActionButtonTemplate, SecureHandlerEnterLeaveTemplate")
     secure:RegisterForClicks("AnyUp")
     secure:RegisterForClicks("AnyDown")
-    --secure:SetAttribute("*type*", "macro")
-    --secure:SetAttribute("*type1", "target")
-    --secure:SetAttribute("*type2", "focus")
+
+    secure:SetAttribute("target", "arena" .. i)
+    secure:SetAttribute("focus", "arena" .. i)
     secure:SetAttribute("unit", "arena" .. i)
-    --secure:SetAttribute("unit", i == 1 and "player" or "focus")
+
+    --[[
+    secure:SetAttribute("target", i == 1 and "player" or "focus")
+    secure:SetAttribute("focus", i == 1 and "player" or "focus")
+    secure:SetAttribute("unit", i == 1 and "player" or "focus")
+    --]]
+
     --secure.texture = secure:CreateTexture(nil, "OVERLAY")
     --secure.texture:SetAllPoints(secure)
     --secure.texture:SetTexture("Interface\\AddOns\\Gladdy\\Images\\Border_rounded_blp")
diff --git a/Modules/Clicks.lua b/Modules/Clicks.lua
index 3551ae5..c729c9e 100644
--- a/Modules/Clicks.lua
+++ b/Modules/Clicks.lua
@@ -224,5 +224,6 @@ function Clicks:GetOptions()
 end
 
 function Clicks:UpdateFrame(unit)
-    Clicks:SetupAttributes(unit)
+    self:SetupAttributes(unit)
+    self:JOINED_ARENA()
 end
\ No newline at end of file
diff --git a/Modules/ExportImport.lua b/Modules/ExportImport.lua
index c20281c..fe0d112 100644
--- a/Modules/ExportImport.lua
+++ b/Modules/ExportImport.lua
@@ -21,8 +21,6 @@ end
 local ExportImport = Gladdy:NewModule("Export Import", nil, {
 })
 
-
-
 local export = AceGUI:Create("Frame")
 export:SetWidth(550)
 export.sizer_se:Hide()