diff --git a/2/3/4/5/6/7/ElvUI_Config/ActionBars.lua b/2/3/4/5/6/7/ElvUI_Config/ActionBars.lua
index 3c0c4d4..c73c06c 100644
--- a/2/3/4/5/6/7/ElvUI_Config/ActionBars.lua
+++ b/2/3/4/5/6/7/ElvUI_Config/ActionBars.lua
@@ -25,7 +25,6 @@ local function BuildABConfig()
 		order = 1,
 		type = "group",
 		name = L["General Options"],
-		childGroups = "tab",
 		disabled = function() return not E.private.actionbar.enable end,
 		args = {
 			info = {
@@ -204,7 +203,7 @@ local function BuildABConfig()
 		}
 	}
 	group["microbar"] = {
-		order = 4,
+		order = 7,
 		type = "group",
 		name = L["Micro Bar"],
 		get = function(info) return E.db.actionbar.microbar[ info[getn(info)] ] end,
@@ -279,10 +278,9 @@ end
 local function BuildBarConfig(i)
 	local name = L["Bar "]..i
 	group["bar"..i] = {
-		order = 7 + i,
+		order = 1 + i,
 		name = name,
 		type = "group",
-		guiInline = false,
 		disabled = function() return not E.private.actionbar.enable end,
 		get = function(info) return E.db.actionbar["bar"..i][ info[getn(info)] ] end,
 		set = function(info, value)
@@ -430,7 +428,7 @@ end
 E.Options.args.actionbar = {
 	type = "group",
 	name = L["ActionBars"],
-	childGroups = "tree",
+	childGroups = "tab",
 	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 = {
@@ -446,111 +444,6 @@ E.Options.args.actionbar = {
 			type = "description",
 			name = L["ACTIONBARS_DESC"]
 		},
-		header = {
-			order = 3,
-			type = "header",
-			name = L["Shortcuts"]
-		},
-		spacer1 = {
-			order = 4,
-			type = "description",
-			name = " "
-		},
-		generalShortcut = {
-			order = 5,
-			type = "execute",
-			name = L["General"],
-			--buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "actionbar", "general") end,
-			disabled = function() return not E.private.actionbar.enable end
-		},
-		petBarShortcut = {
-			order = 6,
-			type = "execute",
-			name = L["Pet Bar"],
-			--buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "actionbar", "barPet") end,
-			disabled = function() return not E.private.actionbar.enable end
-		},
-		stanceBarShortcut = {
-			order = 7,
-			type = "execute",
-			name = L["Stance Bar"],
-			--buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "actionbar", "stanceBar") end,
-			disabled = function() return not E.private.actionbar.enable end
-		},
-		spacer2 = {
-			order = 8,
-			type = "description",
-			name = " "
-		},
-		microbarShortcut = {
-			order = 9,
-			type = "execute",
-			name = L["Micro Bar"],
-			-- buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "actionbar", "microbar") end,
-			disabled = function() return not E.private.actionbar.enable end
-		},
-		bar1Shortcut = {
-			order = 10,
-			type = "execute",
-			name = L["Bar "]..1,
-			-- buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "actionbar", "bar1") end,
-			disabled = function() return not E.private.actionbar.enable end
-		},
-		bar2Shortcut = {
-			order = 11,
-			type = "execute",
-			name = L["Bar "]..2,
-			--buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "actionbar", "bar2") end,
-			disabled = function() return not E.private.actionbar.enable end
-		},
-		spacer3 = {
-			order = 12,
-			type = "description",
-			name = " "
-		},
-		bar3Shortcut = {
-			order = 13,
-			type = "execute",
-			name = L["Bar "]..3,
-			--buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "actionbar", "bar3") end,
-			disabled = function() return not E.private.actionbar.enable end
-		},
-		bar4Shortcut = {
-			order = 14,
-			type = "execute",
-			name = L["Bar "]..4,
-			--buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "actionbar", "bar4") end,
-			disabled = function() return not E.private.actionbar.enable end
-		},
-		bar5Shortcut = {
-			order = 15,
-			type = "execute",
-			name = L["Bar "]..5,
-			--buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "actionbar", "bar5") end,
-			disabled = function() return not E.private.actionbar.enable end
-		},
-		spacer4 = {
-			order = 16,
-			type = "description",
-			name = " "
-		},
-		bar6Shortcut = {
-			order = 17,
-			type = "execute",
-			name = L["Bar "]..6,
-			--buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "actionbar", "bar6") end,
-			disabled = function() return not E.private.actionbar.enable end
-		}
 	}
 }
 group = E.Options.args.actionbar.args
diff --git a/2/3/4/5/6/7/ElvUI_Config/Nameplates.lua b/2/3/4/5/6/7/ElvUI_Config/Nameplates.lua
index 67ca05b..1b917a6 100644
--- a/2/3/4/5/6/7/ElvUI_Config/Nameplates.lua
+++ b/2/3/4/5/6/7/ElvUI_Config/Nameplates.lua
@@ -507,7 +507,7 @@ end
 E.Options.args.nameplate = {
 	type = "group",
 	name = L["NamePlates"],
-	childGroups = "tree",
+	childGroups = "tab",
 	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 = {
@@ -528,107 +528,6 @@ E.Options.args.nameplate = {
 			type = "header",
 			name = L["Shortcuts"]
 		},
-		spacer1 = {
-			order = 4,
-			type = "description",
-			name = " "
-		},
-		generalShortcut = {
-			order = 5,
-			type = "execute",
-			name = L["General"],
-			-- buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "nameplate", "generalGroup", "general") end,
-			disabled = function() return not E.NamePlates end
-		},
-		fontsShortcut = {
-			order = 6,
-			type = "execute",
-			name = L["Fonts"],
-			-- buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "nameplate", "generalGroup", "fontGroup") end,
-			disabled = function() return not E.NamePlates end
-		},
-		threatShortcut = {
-			order = 7,
-			type = "execute",
-			name = L["Threat"],
-			-- buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "nameplate", "generalGroup", "threatGroup") end,
-			--disabled = function() return not E.NamePlates end
-			disabled = true
-		},
-		spacer2 = {
-			order = 8,
-			type = "description",
-			name = " "
-		},
-		castBarShortcut = {
-			order = 9,
-			type = "execute",
-			name = L["Cast Bar"],
-			-- buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "nameplate", "generalGroup", "castGroup") end,
-			disabled = function() return not E.NamePlates end
-		},
-		reactionShortcut = {
-			order = 10,
-			type = "execute",
-			name = L["Reaction Colors"],
-			-- buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "nameplate", "generalGroup", "reactions") end,
-			disabled = function() return not E.NamePlates end
-		},
-		filtersShortcut = {
-			order = 11,
-			type = "execute",
-			name = FILTERS,
-			-- buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "nameplate", "generalGroup", "filters") end,
-			disabled = function() return not E.NamePlates end
-		},
-		spacer3 = {
-			order = 12,
-			type = "description",
-			name = " "
-		},
-		friendlyPlayerShortcut = {
-			order = 13,
-			type = "execute",
-			name = L["Friendly Player Frames"],
-			-- buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "nameplate", "friendlyPlayerGroup"); end,
-			disabled = function() return not E.NamePlates end
-		},
-		enemyPlayerShortcut = {
-			order = 14,
-			type = "execute",
-			name = L["Enemy Player Frames"],
-			-- buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "nameplate", "enemyPlayerGroup"); end,
-			disabled = function() return not E.NamePlates end
-		},
-		friendlyNPCShortcut = {
-			order = 15,
-			type = "execute",
-			name = L["Friendly NPC Frames"],
-			-- buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "nameplate", "friendlyNPCGroup"); end,
-			disabled = function() return not E.NamePlates end
-		},
-		spacer4 = {
-			order = 16,
-			type = "description",
-			name = " "
-		},
-		enemyNPCShortcut = {
-			order = 17,
-			type = "execute",
-			name = L["Enemy NPC Frames"],
-			-- buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "nameplate", "enemyNPCGroup"); end,
-			disabled = function() return not E.NamePlates end
-		},
 		generalGroup = {
 			order = 20,
 			type = "group",
diff --git a/2/3/4/5/6/7/ElvUI_Config/UnitFrames.lua b/2/3/4/5/6/7/ElvUI_Config/UnitFrames.lua
index 03f08ab..b3713a6 100644
--- a/2/3/4/5/6/7/ElvUI_Config/UnitFrames.lua
+++ b/2/3/4/5/6/7/ElvUI_Config/UnitFrames.lua
@@ -1904,7 +1904,7 @@ end
 E.Options.args.unitframe = {
 	type = "group",
 	name = L["UnitFrames"],
-	childGroups = "tree",
+	childGroups = "tab",
 	get = function(info) return E.db.unitframe[ info[getn(info)] ] end,
 	set = function(info, value) E.db.unitframe[ info[getn(info)] ] = value end,
 	args = {
@@ -1930,117 +1930,6 @@ E.Options.args.unitframe = {
 			type = "description",
 			name = " ",
 		},
-		generalShortcut = {
-			order = 4,
-			type = "execute",
-			name = L["General"],
-		--	buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "unitframe", "generalOptionsGroup", "generalGroup") end,
-			disabled = function() return not E.UnitFrames; end,
-		},
-		colorsShortcut = {
-			order = 5,
-			type = "execute",
-			name = L["Colors"],
-		--	buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "unitframe", "generalOptionsGroup", "allColorsGroup") end,
-			disabled = function() return not E.UnitFrames; end,
-		},
-		blizzardShortcut = {
-			order = 6,
-			type = "execute",
-			name = L["Disabled Blizzard Frames"],
-		--	buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "unitframe", "generalOptionsGroup", "disabledBlizzardFrames") end,
-			disabled = function() return not E.UnitFrames; end,
-		},
-		spacer2 = {
-			order = 7,
-			type = "description",
-			name = " ",
-		},
-		playerShortcut = {
-			order = 8,
-			type = "execute",
-			name = L["Player Frame"],
-		--	buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "unitframe", "player") end,
-			disabled = function() return not E.UnitFrames; end,
-		},
-		targetShortcut = {
-			order = 9,
-			type = "execute",
-			name = L["Target Frame"],
-		--	buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "unitframe", "target") end,
-			disabled = function() return not E.UnitFrames; end,
-		},
-		targettargetShortcut = {
-			order = 10,
-			type = "execute",
-			name = L["TargetTarget Frame"],
-		--	buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "unitframe", "targettarget") end,
-			disabled = function() return not E.UnitFrames; end,
-		},
-		spacer3 = {
-			order = 11,
-			type = "description",
-			name = " ",
-		},
-		targettargettargetShortcut = {
-			order = 12,
-			type = "execute",
-			name = L["TargetTargetTarget Frame"],
-		--	buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "unitframe", "targettargettarget") end,
-			disabled = function() return not E.UnitFrames; end,
-		},
-		petShortcut = {
-			order = 13,
-			type = "execute",
-			name = L["Pet Frame"],
-		--	buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "unitframe", "pet") end,
-			disabled = function() return not E.UnitFrames; end,
-		},
-		pettargetShortcut = {
-			order = 14,
-			type = "execute",
-			name = L["PetTarget Frame"],
-		--	buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "unitframe", "pettarget") end,
-			disabled = function() return not E.UnitFrames; end,
-		},
-		spacer5 = {
-			order = 15,
-			type = "description",
-			name = " ",
-		},
-		partyShortcut = {
-			order = 16,
-			type = "execute",
-			name = L["Party Frames"],
-		--	buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "unitframe", "party") end,
-			disabled = function() return not E.UnitFrames; end,
-		},
-		raidShortcut = {
-			order = 17,
-			type = "execute",
-			name = L["Raid Frames"],
-		--	buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "unitframe", "raid") end,
-			disabled = function() return not E.UnitFrames; end,
-		},
-		raidpetShortcut = {
-			order = 19,
-			type = "execute",
-			name = L["Raid Pet Frames"],
-		--	buttonElvUI = true,
-			func = function() ACD:SelectGroup("ElvUI", "unitframe", "raidpet") end,
-			disabled = function() return not E.UnitFrames; end,
-		},
 		generalOptionsGroup = {
 			order = 19,
 			type = "group",