--- a/Options.lua	Mon Feb 12 19:34:09 2018 -0800
+++ b/Options.lua	Tue Jul 17 09:57:39 2018 -0700
@@ -29,7 +29,7 @@
 	end
 end
 
-local function onCheckClick(widget)
+local function onCheckClick(widget)	
 	local setting = widget:GetUserData("setting")
 	local val = widget:GetChecked()
 	
@@ -56,11 +56,11 @@
 	container:AddChild(chk)
 	
 	local desc = AceGUI:Create("AmrUiLabel")
+	container:AddChild(desc)
 	desc:SetWidth(800)
 	desc:SetText(description)
 	desc:SetFont(Amr.CreateFont("Italic", 12, Amr.Colors.TextTan))
 	desc:SetPoint("TOPLEFT", chk.frame, "BOTTOMLEFT", 24, -3)
-	container:AddChild(desc)
 	
 	return chk, desc
 end
@@ -77,18 +77,18 @@
 	container:AddChild(txt)
 	
 	local lbl = AceGUI:Create("AmrUiLabel")
+	container:AddChild(lbl)
 	lbl:SetWidth(600)
 	lbl:SetText(text)
 	lbl:SetFont(Amr.CreateFont("Regular", 14, Amr.Colors.Text))
 	lbl:SetPoint("LEFT", txt.frame, "RIGHT", 6, 0)
-	container:AddChild(lbl)
 	
 	local desc = AceGUI:Create("AmrUiLabel")
+	container:AddChild(desc)
 	desc:SetWidth(800)
 	desc:SetText(description)
 	desc:SetFont(Amr.CreateFont("Italic", 12, Amr.Colors.TextTan))
 	desc:SetPoint("TOPLEFT", lbl.frame, "BOTTOMLEFT", 0, -4)
-	container:AddChild(desc)
 	
 	return txt, desc
 end
@@ -97,11 +97,11 @@
 function Amr:RenderTabOptions(container)
 
 	local header = AceGUI:Create("AmrUiLabel")
+	container:AddChild(header)
 	header:SetWidth(600)
 	header:SetText(L.OptionsHeaderGeneral)
 	header:SetFont(Amr.CreateFont("Bold", 24, Amr.Colors.TextHeaderActive))
 	header:SetPoint("TOPLEFT", container.content, "TOPLEFT", 12, -40)
-	container:AddChild(header)
 
 	local desc, desc2
 	
@@ -126,6 +126,10 @@
 
 function Amr:ReleaseTabOptions()
 	_chkMinimap = nil
+	_chkAutoGear = nil
+	_chkAh = nil
+	_chkEm = nil
+	_txtScale = nil
 end
 
 function Amr:RefreshOptionsUi()