diff --git a/ElvUI/Modules/Skins/Blizzard/Friends.lua b/ElvUI/Modules/Skins/Blizzard/Friends.lua
index 25baa75..497c3d2 100644
--- a/ElvUI/Modules/Skins/Blizzard/Friends.lua
+++ b/ElvUI/Modules/Skins/Blizzard/Friends.lua
@@ -242,7 +242,7 @@ local function LoadSkin()
 			for i = 1, GUILDMEMBERS_TO_DISPLAY, 1 do
 				button = _G["GuildFrameButton"..i]
 				_, _, _, level, class, _, _, _, online = GetGuildRosterInfo(button.guildIndex)
-				
+
 				classFileName = localizedTable[class]
 				if classFileName then
 					if online then
@@ -334,8 +334,7 @@ local function LoadSkin()
 	-- Control Frame
 	E:StripTextures(GuildControlPopupFrame)
 	E:CreateBackdrop(GuildControlPopupFrame, "Transparent")
-	E:Point(GuildControlPopupFrame.backdrop, "TOPLEFT", 3, -6)
-	E:Point(GuildControlPopupFrame.backdrop, "BOTTOMRIGHT", -27, 27)
+	E:Point(GuildControlPopupFrame.backdrop, "TOPLEFT", 3, 0)
 
 	S:HandleDropDownBox(GuildControlPopupFrameDropDown, 185)
 	E:Size(GuildControlPopupFrameDropDownButton, 16)
@@ -364,6 +363,9 @@ local function LoadSkin()
 	SkinPlusMinus(GuildControlPopupFrameAddRankButton)
 	SkinPlusMinus(GuildControlPopupFrameRemoveRankButton, true)
 
+	local left, right = select(6, GuildControlPopupFrameEditBox:GetRegions())
+	E:Kill(left) E:Kill(right)
+
 	S:HandleEditBox(GuildControlPopupFrameEditBox)
 	E:Point(GuildControlPopupFrameEditBox.backdrop, "TOPLEFT", 0, -5)
 	E:Point(GuildControlPopupFrameEditBox.backdrop, "BOTTOMRIGHT", 0, 5)
diff --git a/ElvUI/Modules/Skins/Blizzard/Misc.lua b/ElvUI/Modules/Skins/Blizzard/Misc.lua
index e35a01a..4c44a89 100644
--- a/ElvUI/Modules/Skins/Blizzard/Misc.lua
+++ b/ElvUI/Modules/Skins/Blizzard/Misc.lua
@@ -321,14 +321,6 @@ local function LoadSkin()
 		end
 	end
 
-	--[[for i = 1, UIOptionsFrame:GetNumChildren() do
-		local child = select(i, UIOptionsFrame:GetChildren())
-		if child.GetPushedTexture and child:GetPushedTexture() and not child:GetName() then
-			child:SetFrameLevel(UIOptionsFrame:GetFrameLevel() + 2)
-			S:HandleCloseButton(child, UIOptionsFrame.backdrop)
-		end
-	end--]]
-
 	OptionsFrameDefaults:ClearAllPoints()
 	E:Point(OptionsFrameDefaults, "TOPLEFT", OptionsFrame, "BOTTOMLEFT", 15, 36)