--- a/CyborgMMO7.lua	Mon Apr 29 17:44:46 2013 +0000
+++ b/CyborgMMO7.lua	Mon Apr 29 17:44:53 2013 +0000
@@ -38,30 +38,24 @@
 local Settings = nil
 
 
-function CyborgMMO_MiniMapButtonReposition(pos)
-	CyborgMMO_MiniMapFrame:SetPoint("TOPLEFT",
-		"Minimap",
-		"TOPLEFT",
-		52 - (80 * cos(pos)),
-		(80 * sin(pos)) - 52)
+function CyborgMMO_MiniMapButtonReposition(angle)
+	local r = 80
+	local dx = r * math.cos(angle)
+	local dy = r * math.sin(angle)
+	CyborgMMO_MiniMapFrame:ClearAllPoints()
+	CyborgMMO_MiniMapFrame:SetPoint("CENTER", "Minimap", "CENTER", dx, dy)
 end
 
 
 function CyborgMMO_MiniMapButtonOnUpdate()
+	local xpos,ypos = GetCursorPosition()
+	local xmap,ymap = Minimap:GetCenter()
 
-	local xpos,ypos = GetCursorPosition()
-	local xmin,ymin = Minimap:GetLeft(), Minimap:GetBottom()
+	xpos = xpos / UIParent:GetScale() - xmap
+	ypos = ypos / UIParent:GetScale() - ymap
 
-	xpos = (xmin)-(xpos / UIParent:GetScale())
-	ypos = (ypos/ UIParent:GetScale())-(ymin)
-
-	local degrees = math.deg(math.atan2(ypos, xpos))
-
-	while degrees < 0 do
-		degrees = degrees + 360
-	end
-
-	CyborgMMO_MiniMapButtonReposition(degrees)
+	local angle = math.atan2(ypos, xpos)
+	CyborgMMO_MiniMapButtonReposition(angle)
 end
 
 function CyborgMMO_MouseModeChange(mode)
@@ -351,7 +345,8 @@
 		CyborgMMO_SetCyborgHeadButton(Settings.CyborgButton)
 
 		local xmin,ymin = Minimap:GetLeft(),Minimap:GetBottom()
-		CyborgMMO_MiniMapButtonReposition(math.deg(math.atan2(ymin, xmin)))
+		local angle = math.rad(150)
+		CyborgMMO_MiniMapButtonReposition(angle)
 	end
 end