diff --git a/Core/Theme.lua b/Core/Theme.lua
index 1511c2b..3d14b9b 100644
--- a/Core/Theme.lua
+++ b/Core/Theme.lua
@@ -704,8 +704,11 @@ function Theme:ApplyFramePadding()
 
     -- BankFrame adjustments (similar structure)
     local bankFrameElements = {
-        { name = "Guda_BankFrame_Title",       pfui = { "TOP", nil, "TOP", 0, -8 },        default = { "TOP", nil, "TOP", 0, -12 } },
-        { name = "Guda_BankFrame_CloseButton", pfui = { "TOPRIGHT", nil, "TOPRIGHT", -5, -5 }, default = { "TOPRIGHT", nil, "TOPRIGHT", -13, -10 } },
+        { name = "Guda_BankFrame_Title",          pfui = { "TOP", nil, "TOP", 0, -8 },            default = { "TOP", nil, "TOP", 0, -12 } },
+        { name = "Guda_BankFrame_CloseButton",  pfui = { "TOPRIGHT", nil, "TOPRIGHT", -5, -5 }, default = { "TOPRIGHT", nil, "TOPRIGHT", -13, -10 } },
+        { name = "Guda_BankFrame_BlizzardUIButton", pfui = { "TOPLEFT", nil, "TOPLEFT", 10, -8 }, default = { "TOPLEFT", nil, "TOPLEFT", 23, -15 } },
+        { name = "Guda_BankFrame_SearchBar",    pfui = { "TOP", nil, "TOP", 0, -28 },       default = { "TOP", nil, "TOP", 0, -40 } },
+        { name = "Guda_BankFrame_Toolbar",      pfui = { "BOTTOMLEFT", nil, "BOTTOMLEFT", 5, 5 }, default = { "BOTTOMLEFT", nil, "BOTTOMLEFT", 15, 5 } },
     }
     for _, elem in ipairs(bankFrameElements) do
         local frame = getglobal(elem.name)
diff --git a/UI/BagFrame.lua b/UI/BagFrame.lua
index dd56b3f..e9b063b 100644
--- a/UI/BagFrame.lua
+++ b/UI/BagFrame.lua
@@ -144,6 +144,9 @@ end
 
 -- OnLoad
 function Guda_BagFrame_OnLoad(self)
+    -- Prevent frame from being dragged off screen
+    self:SetClampedToScreen(true)
+
     -- Set up initial backdrop
     addon:ApplyBackdrop(self, "DEFAULT_FRAME")
 
diff --git a/UI/BankFrame.lua b/UI/BankFrame.lua
index ece4b25..3c189b8 100644
--- a/UI/BankFrame.lua
+++ b/UI/BankFrame.lua
@@ -127,6 +127,8 @@ end
 
 -- OnLoad
 function Guda_BankFrame_OnLoad(self)
+    self:SetClampedToScreen(true)
+
     -- Set up initial backdrop
     addon:ApplyBackdrop(self, "DEFAULT_FRAME")
 
diff --git a/UI/MailboxFrame.lua b/UI/MailboxFrame.lua
index 6ad6bff..fe0e874 100644
--- a/UI/MailboxFrame.lua
+++ b/UI/MailboxFrame.lua
@@ -17,6 +17,8 @@ local mailboxClickCatcher = nil
 
 -- OnLoad
 function Guda_MailboxFrame_OnLoad(self)
+    self:SetClampedToScreen(true)
+
     -- Apply border visibility setting
     if MailboxFrame.UpdateBorderVisibility then
         MailboxFrame:UpdateBorderVisibility()
diff --git a/UI/SettingsPopup.lua b/UI/SettingsPopup.lua
index 14b14b8..9374ff0 100644
--- a/UI/SettingsPopup.lua
+++ b/UI/SettingsPopup.lua
@@ -33,6 +33,8 @@ end
 
 -- OnLoad
 function Guda_SettingsPopup_OnLoad(self)
+    self:SetClampedToScreen(true)
+
     -- Set up initial backdrop
     Guda:ApplyBackdrop(self, "DEFAULT_FRAME")