diff --git a/2/3/4/5/6/7/ElvUI/Modules/Maps/WorldMap.lua b/2/3/4/5/6/7/ElvUI/Modules/Maps/WorldMap.lua
index badbe8f..c84348b 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Maps/WorldMap.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Maps/WorldMap.lua
@@ -88,12 +88,11 @@ function M:Initialize()
 	if E.global.general.smallerWorldMap then
 		BlackoutWorld:SetTexture(nil)
 
-		WorldMapFrame:SetParent(UIParent)
+		WorldMapFrame:SetParent(E.UIParent)
+		WorldMapFrame:SetScale(1)
 		WorldMapFrame:EnableKeyboard(false)
-		HookScript(WorldMapFrame, "OnShow", function()
-			WorldMapFrame:SetScale(E.UIParent:GetScale())
-		end)
 		WorldMapFrame:EnableMouse(false)
+		WorldMapFrame:SetToplevel()
 
 		UIPanelWindows["WorldMapFrame"] = {area = "center", pushable = 0, whileDead = 1}
 
@@ -102,6 +101,8 @@ function M:Initialize()
 				DropDownList1:SetScale(UIParent:GetScale())
 			end
 		end)
+
+		WorldMapTooltip:SetFrameLevel(WorldMapPositioningGuide:GetFrameLevel() + 110)
 	end
 end
 
diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Load_Blizzard.xml b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Load_Blizzard.xml
index 28843ac..fbd7127 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Load_Blizzard.xml
+++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Load_Blizzard.xml
@@ -22,7 +22,7 @@
 	<Script file="Misc.lua"/>
 	<Script file="Petition.lua"/>
 	<Script file="Quest.lua"/>
-	<Script file="QuestTimer.lua"/>
+	<Script file="QuestTimers.lua"/>
 	<Script file="Raid.lua"/>
 	<Script file="SpellBook.lua"/>
 	<Script file="Stable.lua"/>
diff --git a/2/3/4/5/6/7/ElvUI/Settings/Global.lua b/2/3/4/5/6/7/ElvUI/Settings/Global.lua
index 45be566..cddda94 100644
--- a/2/3/4/5/6/7/ElvUI/Settings/Global.lua
+++ b/2/3/4/5/6/7/ElvUI/Settings/Global.lua
@@ -5,6 +5,7 @@ G["general"] = {
 	["autoScale"] = true,
 	["minUiScale"] = 0.64,
 	["eyefinity"] = false,
+	["smallerWorldMap"] = true,
 	["WorldMapCoordinates"] = {
 		["enable"] = true,
 		["position"] = "BOTTOMLEFT",