diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..06273c5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.editorconfig
+.vs
+CHANGELOG.md
diff --git a/MoveAny.toc b/MoveAny.toc
index f45883f..f973832 100644
--- a/MoveAny.toc
+++ b/MoveAny.toc
@@ -4,7 +4,7 @@
 ## Interface-Cata: 40400
 ## Interface: 100207, 110000
 
-## Version: 1.6.221
+## Version: 1.6.222
 ## Title: MoveAny by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Move Any Ui or Frame
 ## Author: D4KiR
diff --git a/MoveAny_Cata.toc b/MoveAny_Cata.toc
index fa8a99b..4a8d6ff 100644
--- a/MoveAny_Cata.toc
+++ b/MoveAny_Cata.toc
@@ -1,5 +1,5 @@
 ## Interface: 40400
-## Version: 1.6.221
+## Version: 1.6.222
 ## Title: MoveAny |T135994:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Move Any Ui or Frame
 ## Author: D4KiR
diff --git a/MoveAny_TBC.toc b/MoveAny_TBC.toc
index 8334b46..5213c12 100644
--- a/MoveAny_TBC.toc
+++ b/MoveAny_TBC.toc
@@ -1,5 +1,5 @@
 ## Interface: 20504
-## Version: 1.6.221
+## Version: 1.6.222
 ## Title: MoveAny |T135994:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Move Any Ui or Frame
 ## Author: D4KiR
diff --git a/MoveAny_Vanilla.toc b/MoveAny_Vanilla.toc
index b0d491a..61a7a5f 100644
--- a/MoveAny_Vanilla.toc
+++ b/MoveAny_Vanilla.toc
@@ -1,5 +1,5 @@
 ## Interface: 11502
-## Version: 1.6.221
+## Version: 1.6.222
 ## Title: MoveAny |T135994:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Move Any Ui or Frame
 ## Author: D4KiR
diff --git a/MoveAny_Wrath.toc b/MoveAny_Wrath.toc
index 76acd64..eb45cdd 100644
--- a/MoveAny_Wrath.toc
+++ b/MoveAny_Wrath.toc
@@ -1,5 +1,5 @@
 ## Interface: 30403
-## Version: 1.6.221
+## Version: 1.6.222
 ## Title: MoveAny |T135994:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t 
 ## Notes: Move Any Ui or Frame
 ## Author: D4KiR
diff --git a/libs/db.lua b/libs/db.lua
index 0d2e5a7..cf8c98e 100644
--- a/libs/db.lua
+++ b/libs/db.lua
@@ -347,7 +347,6 @@ function MoveAny:GetElePoint(key)
 		MoveAny:GetTab()["ELES"]["POINTS"][key] = MoveAny:GetTab()["ELES"]["POINTS"][key] or {}
 		local an = MoveAny:GetTab()["ELES"]["POINTS"][key]["AN"]
 		--local pa = MoveAny:GetTab()["ELES"]["POINTS"][key]["PA"]
-		MoveAny:GetTab()["ELES"]["POINTS"][key]["PA"] = nil
 		local re = MoveAny:GetTab()["ELES"]["POINTS"][key]["RE"]
 		local px = MoveAny:GetTab()["ELES"]["POINTS"][key]["PX"]
 		local py = MoveAny:GetTab()["ELES"]["POINTS"][key]["PY"]
@@ -363,11 +362,14 @@ end
 function MoveAny:SetElePoint(key, p1, p2, p3, p4, p5)
 	MoveAny:CheckDB()
 	MoveAny:GetTab()["ELES"]["POINTS"][key] = MoveAny:GetTab()["ELES"]["POINTS"][key] or {}
-	MoveAny:GetTab()["ELES"]["POINTS"][key]["AN"] = p1
-	MoveAny:GetTab()["ELES"]["POINTS"][key]["PA"] = nil
-	MoveAny:GetTab()["ELES"]["POINTS"][key]["RE"] = p3
-	MoveAny:GetTab()["ELES"]["POINTS"][key]["PX"] = p4
-	MoveAny:GetTab()["ELES"]["POINTS"][key]["PY"] = p5
+	if MoveAny:IsEnabled("SAVEFRAMEPOSITION", true) then
+		MoveAny:GetTab()["ELES"]["POINTS"][key]["AN"] = p1
+		MoveAny:GetTab()["ELES"]["POINTS"][key]["PA"] = p2
+		MoveAny:GetTab()["ELES"]["POINTS"][key]["RE"] = p3
+		MoveAny:GetTab()["ELES"]["POINTS"][key]["PX"] = p4
+		MoveAny:GetTab()["ELES"]["POINTS"][key]["PY"] = p5
+	end
+
 	local frame = _G[key]
 	if frame and p1 and p3 then
 		frame:ClearAllPoints()
@@ -447,18 +449,22 @@ end
 function MoveAny:GetEleScale(key)
 	MoveAny:CheckDB()
 	MoveAny:GetTab()["ELES"]["SIZES"][key] = MoveAny:GetTab()["ELES"]["SIZES"][key] or {}
-	local scale = MoveAny:GetTab()["ELES"]["SIZES"][key]["SCALE"]
-	if scale and type(scale) ~= "number" then
-		MoveAny:GetTab()["ELES"]["SIZES"][key]["SCALE"] = tonumber(scale)
-	end
+	if MoveAny:IsEnabled("SAVEFRAMESCALE", true) then
+		local scale = MoveAny:GetTab()["ELES"]["SIZES"][key]["SCALE"]
+		if scale and type(scale) ~= "number" then
+			MoveAny:GetTab()["ELES"]["SIZES"][key]["SCALE"] = tonumber(scale)
+		end
 
-	if scale and tonumber(scale) > 0 then
-		return tonumber(scale)
-	elseif scale then
-		MoveAny:MSG("[GetEleScale] SCALE <= 0, key: " .. tostring(key))
+		if scale and tonumber(scale) > 0 then
+			return tonumber(scale)
+		elseif scale then
+			MoveAny:MSG("[GetEleScale] SCALE <= 0, key: " .. tostring(key))
 
-		return 1
+			return 1
+		end
 	end
+
+	return 1
 end
 
 function MoveAny:SetEleScale(key, scale)
@@ -469,15 +475,17 @@ function MoveAny:SetEleScale(key, scale)
 		return
 	end
 
-	if scale > 0 then
-		MoveAny:GetTab()["ELES"]["SIZES"][key] = MoveAny:GetTab()["ELES"]["SIZES"][key] or {}
-		MoveAny:GetTab()["ELES"]["SIZES"][key]["SCALE"] = scale
-		local frame = _G[key]
-		if frame then
-			frame:SetScale(scale)
+	if MoveAny:IsEnabled("SAVEFRAMESCALE", true) then
+		if scale > 0 then
+			MoveAny:GetTab()["ELES"]["SIZES"][key] = MoveAny:GetTab()["ELES"]["SIZES"][key] or {}
+			MoveAny:GetTab()["ELES"]["SIZES"][key]["SCALE"] = scale
+			local frame = _G[key]
+			if frame then
+				frame:SetScale(scale)
+			end
+		else
+			MoveAny:MSG("[SetEleScale] SCALE <= 0, key: " .. tostring(key))
 		end
-	else
-		MoveAny:MSG("[SetEleScale] SCALE <= 0, key: " .. tostring(key))
 	end
 
 	if key ~= "MALock" then
@@ -488,23 +496,29 @@ end
 function MoveAny:GetFramePoint(key)
 	MoveAny:CheckDB()
 	MoveAny:GetTab()["FRAMES"]["POINTS"][key] = MoveAny:GetTab()["FRAMES"]["POINTS"][key] or {}
-	local an = MoveAny:GetTab()["FRAMES"]["POINTS"][key]["AN"]
-	--local pa = MoveAny:GetTab()["FRAMES"]["POINTS"][key]["PA"]
-	local re = MoveAny:GetTab()["FRAMES"]["POINTS"][key]["RE"]
-	local px = MoveAny:GetTab()["FRAMES"]["POINTS"][key]["PX"]
-	local py = MoveAny:GetTab()["FRAMES"]["POINTS"][key]["PY"]
+	if MoveAny:IsEnabled("SAVEFRAMEPOSITION", true) then
+		local an = MoveAny:GetTab()["FRAMES"]["POINTS"][key]["AN"]
+		--local pa = MoveAny:GetTab()["FRAMES"]["POINTS"][key]["PA"]
+		local re = MoveAny:GetTab()["FRAMES"]["POINTS"][key]["RE"]
+		local px = MoveAny:GetTab()["FRAMES"]["POINTS"][key]["PX"]
+		local py = MoveAny:GetTab()["FRAMES"]["POINTS"][key]["PY"]
 
-	return an, _, re, px, py
+		return an, _, re, px, py
+	end
+
+	return nil, nil, nil, nil, nil
 end
 
 function MoveAny:SetFramePoint(key, p1, p2, p3, p4, p5)
 	MoveAny:CheckDB()
 	MoveAny:GetTab()["FRAMES"]["POINTS"][key] = MoveAny:GetTab()["FRAMES"]["POINTS"][key] or {}
-	MoveAny:GetTab()["FRAMES"]["POINTS"][key]["AN"] = p1
-	MoveAny:GetTab()["FRAMES"]["POINTS"][key]["PA"] = nil
-	MoveAny:GetTab()["FRAMES"]["POINTS"][key]["RE"] = p3
-	MoveAny:GetTab()["FRAMES"]["POINTS"][key]["PX"] = p4
-	MoveAny:GetTab()["FRAMES"]["POINTS"][key]["PY"] = p5
+	if MoveAny:IsEnabled("SAVEFRAMEPOSITION", true) then
+		MoveAny:GetTab()["FRAMES"]["POINTS"][key]["AN"] = p1
+		MoveAny:GetTab()["FRAMES"]["POINTS"][key]["PA"] = p2
+		MoveAny:GetTab()["FRAMES"]["POINTS"][key]["RE"] = p3
+		MoveAny:GetTab()["FRAMES"]["POINTS"][key]["PX"] = p4
+		MoveAny:GetTab()["FRAMES"]["POINTS"][key]["PY"] = p5
+	end
 end
 
 function MoveAny:GetFrameScale(key)
diff --git a/settings.lua b/settings.lua
index 829bc7b..c44c75c 100644
--- a/settings.lua
+++ b/settings.lua
@@ -311,6 +311,7 @@ end
 
 local function AddSlider(x, key, val, func, vmin, vmax, steps, tab)
 	if sls[key] == nil then
+		posy = posy - 10
 		sls[key] = CreateFrame("Slider", "sls[" .. key .. "]", MALock.SC, "OptionsSliderTemplate")
 		sls[key]:SetWidth(MALock.SC:GetWidth() - 30 - x)
 		sls[key]:SetPoint("TOPLEFT", MALock.SC, "TOPLEFT", x + 5, posy)
@@ -351,6 +352,7 @@ local function AddSlider(x, key, val, func, vmin, vmax, steps, tab)
 	sls[key]:ClearAllPoints()
 	if key == "EDITMODE" or strfind(strlower(key), strlower(searchStr)) or strfind(strlower(MoveAny:GT("LID_" .. key)), strlower(searchStr)) then
 		sls[key]:Show()
+		posy = posy - 10
 		sls[key]:SetPoint("TOPLEFT", MALock.SC, "TOPLEFT", x, posy)
 		posy = posy - 30
 	else
@@ -411,8 +413,8 @@ function MoveAny:InitMALock()
 		end
 	)
 
-	MoveAny:SetVersion(AddonName, 135994, "1.6.221")
-	MALock.TitleText:SetText(format("MoveAny |T135994:16:16:0:0|t v|cff3FC7EB%s", "1.6.221"))
+	MoveAny:SetVersion(AddonName, 135994, "1.6.222")
+	MALock.TitleText:SetText(format("MoveAny |T135994:16:16:0:0|t v|cff3FC7EB%s", "1.6.222"))
 	MALock.CloseButton:SetScript(
 		"OnClick",
 		function()
@@ -457,11 +459,11 @@ function MoveAny:InitMALock()
 		AddCheckBox(4, "MOVEFRAMES", true)
 		AddCheckBox(24, "MOVESMALLBAGS", false)
 		AddCheckBox(24, "MOVELOOTFRAME", false)
+		AddSlider(26, "KEYBINDWINDOW", 1, MoveAny.UpdateFrameKeybind, 1, 3, 1, keybinds)
 		AddCheckBox(24, "SAVEFRAMEPOSITION", true)
+		AddCheckBox(40, "FRAMESKEYDRAG", false)
 		AddCheckBox(24, "SAVEFRAMESCALE", true)
-		AddSlider(24, "KEYBINDWINDOW", 1, MoveAny.UpdateFrameKeybind, 1, 3, 1, keybinds)
-		AddCheckBox(24, "FRAMESKEYDRAG", false)
-		AddCheckBox(24, "FRAMESKEYSCALE", false)
+		AddCheckBox(40, "FRAMESKEYSCALE", false)
 		AddCheckBox(24, "FRAMESKEYRESET", false)
 		MoveAny:UpdateFrameKeybindText()
 		AddCategory("BUILTIN")
@@ -1041,7 +1043,7 @@ function MoveAny:ShowProfiles()
 			end
 		)
 
-		MAProfiles.TitleText:SetText(format("MoveAny |T135994:16:16:0:0|t v|cff3FC7EB%s", "1.6.221"))
+		MAProfiles.TitleText:SetText(format("MoveAny |T135994:16:16:0:0|t v|cff3FC7EB%s", "1.6.222"))
 		MAProfiles.CloseButton:SetScript(
 			"OnClick",
 			function()