diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..932245d6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+# IDEs
+.idea
+nbproject
+.project
\ No newline at end of file
diff --git a/modules/gui.lua b/modules/gui.lua
index a6373d42..05b4147b 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -200,7 +200,7 @@ pfUI:RegisterModule("gui", function ()
   pfUI.gui.unlockFrames:ClearAllPoints()
   pfUI.gui.unlockFrames:SetWidth(80)
   pfUI.gui.unlockFrames:SetHeight(20)
-  pfUI.gui.unlockFrames:SetPoint("BOTTOMLEFT", 0, 0)
+  pfUI.gui.unlockFrames:SetPoint("BOTTOMLEFT", 0, 20)
   pfUI.gui.unlockFrames:SetBackdrop(pfUI.backdrop)
   pfUI.gui.unlockFrames.text = pfUI.gui.unlockFrames:CreateFontString("Status", "LOW", "GameFontNormal")
   pfUI.gui.unlockFrames.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", 9, "OUTLINE")
@@ -213,6 +213,24 @@ pfUI:RegisterModule("gui", function ()
       pfUI.gui.UnlockFrames()
     end)
 
+  -- Hide GUI
+  pfUI.gui.hideGUI = CreateFrame("Button", nil, pfUI.gui)
+  pfUI.gui.hideGUI:ClearAllPoints()
+  pfUI.gui.hideGUI:SetWidth(80)
+  pfUI.gui.hideGUI:SetHeight(20)
+  pfUI.gui.hideGUI:SetPoint("BOTTOMLEFT", 0, 0)
+  pfUI.gui.hideGUI:SetBackdrop(pfUI.backdrop)
+  pfUI.gui.hideGUI.text = pfUI.gui.hideGUI:CreateFontString("Status", "LOW", "GameFontNormal")
+  pfUI.gui.hideGUI.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", 9, "OUTLINE")
+  pfUI.gui.hideGUI.text:ClearAllPoints()
+  pfUI.gui.hideGUI.text:SetAllPoints(pfUI.gui.hideGUI)
+  pfUI.gui.hideGUI.text:SetPoint("CENTER", 0, 0)
+  pfUI.gui.hideGUI.text:SetFontObject(GameFontWhite)
+  pfUI.gui.hideGUI.text:SetText("Close")
+  pfUI.gui.hideGUI:SetScript("OnClick", function()
+    pfUI.gui:Hide()
+  end)
+
   -- Switch to default View: global
   pfUI.gui.SwitchTab(pfUI.gui.global)
 end)
diff --git a/modules/target.lua b/modules/target.lua
index 2379d3d1..d7f77df4 100644
--- a/modules/target.lua
+++ b/modules/target.lua
@@ -1,7 +1,12 @@
 pfUI:RegisterModule("target", function ()
+    -- Hide Blizzard target frame and unregister all events to prevent it from popping up again
   TargetFrame:Hide()
   TargetFrame:UnregisterAllEvents()
 
+  -- Hide Blizzard combo point frame and unregister all events to prevent it from popping up again
+  ComboFrame:Hide()
+  ComboFrame:UnregisterAllEvents()
+
   pfUI.uf.target = CreateFrame("Button",nil,UIParent)
   pfUI.uf.target:Hide()
   pfUI.uf.target:RegisterEvent("PLAYER_TARGET_CHANGED")