diff --git a/ElvUI_Config/ActionBars.lua b/ElvUI_Config/ActionBars.lua
index 67b22fb..dce9670 100644
--- a/ElvUI_Config/ActionBars.lua
+++ b/ElvUI_Config/ActionBars.lua
@@ -692,7 +692,7 @@ end
 E.Options.args.actionbar = {
 	type = "group",
 	name = L["ActionBars"],
-	childGroups = "tab",
+	childGroups = "tree",
 	get = function(info) return E.db.actionbar[ info[getn(info)] ] end,
 	set = function(info, value) E.db.actionbar[ info[getn(info)] ] = value AB:UpdateButtonSettings() end,
 	args = {
diff --git a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
index 4eb8b4f..f3ed7d7 100644
--- a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
+++ b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
@@ -325,7 +325,7 @@ local methods = {
 
 		local button = CreateFrame("Button", strfmt("AceGUI30TreeButton%d", num), self.treeframe)
 		button.obj = self
-		button:SetWidth(175)
+		button:SetWidth(DEFAULT_TREE_WIDTH)
 		button:SetHeight(18)
 
 		local toggle = CreateFrame("Button", "$parentToggle", button)
@@ -499,6 +499,7 @@ local methods = {
 		end
 
 		local buttonnum = 1
+		local treewidth = treeframe:GetWidth()
 		for i = first, last do
 			local line = lines[i]
 			local button = buttons[buttonnum]
@@ -508,19 +509,20 @@ local methods = {
 				buttons[buttonnum] = button
 				button:SetParent(treeframe)
 				button:SetFrameLevel(treeframe:GetFrameLevel()+1)
-				button:ClearAllPoints()
-				if buttonnum == 1 then
-					if self.showscroll then
-						button:SetPoint("TOPRIGHT", -22, -10)
-						button:SetPoint("TOPLEFT", 0, -10)
-					else
-						button:SetPoint("TOPRIGHT", 0, -10)
-						button:SetPoint("TOPLEFT", 0, -10)
-					end
+			end
+
+			button:ClearAllPoints()
+			if buttonnum == 1 then
+				if self.showscroll then
+					button:SetWidth(treewidth - 22)
+					button:SetPoint("TOPRIGHT", -22, -10)
 				else
-					button:SetPoint("TOPRIGHT", buttons[buttonnum-1], "BOTTOMRIGHT",0,0)
-					button:SetPoint("TOPLEFT", buttons[buttonnum-1], "BOTTOMLEFT",0,0)
+					button:SetWidth(treewidth)
+					button:SetPoint("TOPRIGHT", 0, -10)
 				end
+			else
+				button:SetWidth(self.showscroll and (treewidth - 22) or treewidth)
+				button:SetPoint("TOPRIGHT", buttons[buttonnum-1], "BOTTOMRIGHT",0,0)
 			end
 
 			UpdateButton(button, line, status.selected == line.uniquevalue, line.hasChildren, groupstatus[line.uniquevalue] )
@@ -562,11 +564,13 @@ local methods = {
 		if show then
 			self.scrollbar:Show()
 			if self.buttons[1] then
+				self.buttons[1]:SetWidth(self.treeframe:GetWidth() - 22)
 				self.buttons[1]:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",-22,-10)
 			end
 		else
 			self.scrollbar:Hide()
 			if self.buttons[1] then
+				self.buttons[1]:SetWidth(self.treeframe:GetWidth())
 				self.buttons[1]:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",0,-10)
 			end
 		end
diff --git a/ElvUI_Config/Nameplates.lua b/ElvUI_Config/Nameplates.lua
index 04bc4ae..e2c8041 100644
--- a/ElvUI_Config/Nameplates.lua
+++ b/ElvUI_Config/Nameplates.lua
@@ -507,7 +507,7 @@ end
 E.Options.args.nameplate = {
 	type = "group",
 	name = L["NamePlates"],
-	childGroups = "tab",
+	childGroups = "tree",
 	get = function(info) return E.db.nameplates[ info[getn(info)] ] end,
 	set = function(info, value) E.db.nameplates[ info[getn(info)] ] = value; NP:ConfigureAll(); end,
 	args = {
diff --git a/ElvUI_Config/UnitFrames.lua b/ElvUI_Config/UnitFrames.lua
index 060e2f6..b4925fc 100644
--- a/ElvUI_Config/UnitFrames.lua
+++ b/ElvUI_Config/UnitFrames.lua
@@ -1851,7 +1851,7 @@ end
 E.Options.args.unitframe = {
 	type = "group",
 	name = L["UnitFrames"],
-	childGroups = "tab",
+	childGroups = "tree",
 	get = function(info) return E.db.unitframe[ info[getn(info)] ] end,
 	set = function(info, value) E.db.unitframe[ info[getn(info)] ] = value end,
 	args = {