@@ -2,13 +2,16 @@
 -- PVE FRAME
 ---------------------------------------------------------------
 local panels = {
-	[1] = { name = "GroupFinderFrame", addon = nil },
-	[2] = { name = "ChallengesFrame", addon = "Blizzard_ChallengesUI" },
+	{ name = "GroupFinderFrame", addon = nil },
+	{ name = "PVPUIFrame", addon = "Blizzard_PVPUI" },
+	{ name = "ChallengesFrame", addon = "Blizzard_ChallengesUI" },
 }
 
 function PVEFrame_OnLoad(self)
 	RaiseFrameLevel(self.shadows);
-	PanelTemplates_SetNumTabs(self, 2);
+	PanelTemplates_SetNumTabs(self, #panels);
+	
+	self.maxTabWidth = (self:GetWidth() - 19) / #panels;
 end
 
 function PVEFrame_ToggleFrame(sidePanelName, selection)
@@ -19,7 +22,7 @@ function PVEFrame_ToggleFrame(sidePanelN
 	if ( self:IsShown() ) then
 		if ( sidePanelName ) then
 			local sidePanel = _G[sidePanelName];
-			if ( sidePanel and sidePanel:IsShown() and sidePanel:getSelection() == selection ) then
+			if ( sidePanel and sidePanel:IsShown() and  (not sidePanel.getSelection or sidePanel:getSelection() == selection) ) then
 				HideUIPanel(self);
 			else
 				PVEFrame_ShowFrame(sidePanelName, selection);
@@ -68,7 +71,9 @@ function PVEFrame_ShowFrame(sidePanelNam
 		local panel = _G[data.name];
 		if ( index == tabIndex ) then
 			panel:Show();
-			panel:update(selection);			
+			if( panel.update ) then
+				panel:update(selection);
+			end
 		elseif ( panel ) then
 			panel:Hide();
 		end
@@ -99,9 +104,8 @@ end
 
 SCENARIOS_SHOW_LEVEL = 85;
 RAID_FINDER_SHOW_LEVEL = 85;
-FLEX_RAID_SHOW_LEVEL = 90;
 
-local groupFrames = { "LFDParentFrame", "ScenarioFinderFrame", "RaidFinderFrame", "FlexRaidFrame" }
+local groupFrames = { "LFDParentFrame", "ScenarioFinderFrame", "RaidFinderFrame", "LFGListPVEStub" }
 
 function GroupFinderFrame_OnLoad(self)
 	SetPortraitToTexture(self.groupButton1.icon, "Interface\\Icons\\INV_Helmet_08");
@@ -109,7 +113,7 @@ function GroupFinderFrame_OnLoad(self)
 	SetPortraitToTexture(self.groupButton3.icon, "Interface\\LFGFrame\\UI-LFR-PORTRAIT");
 	self.groupButton3.name:SetText(RAID_FINDER_PVEFRAME);
 	SetPortraitToTexture(self.groupButton4.icon, "Interface\\Icons\\Achievement_General_StayClassy");
-	self.groupButton4.name:SetText(FLEX_RAID);
+	self.groupButton4.name:SetText(LFGLIST_NAME);
 	SetPortraitToTexture(self.groupButton2.icon, "Interface\\Icons\\Icon_Scenarios");
 	self.groupButton2.name:SetText(SCENARIOS_PVEFRAME);
 	-- disable
@@ -125,12 +129,9 @@ function GroupFinderFrame_OnLoad(self)
 		GroupFinderFrame:SetScript("OnEvent", GroupFinderFrame_OnEvent);
 		GroupFinderFrame:RegisterEvent("PLAYER_LEVEL_UP");
 	end
-	if ( UnitLevel("player") < FLEX_RAID_SHOW_LEVEL ) then
-		GroupFinderFrameButton_SetEnabled(self.groupButton4, false);
-		self.groupButton4.tooltip = format(FEATURE_BECOMES_AVAILABLE_AT_LEVEL, FLEX_RAID_SHOW_LEVEL);
-		GroupFinderFrame:SetScript("OnEvent", GroupFinderFrame_OnEvent);
-		GroupFinderFrame:RegisterEvent("PLAYER_LEVEL_UP");
-	end
+
+	GroupFinderFrameButton_SetEnabled(self.groupButton4, true);
+
 	-- set up accessors
 	self.getSelection = GroupFinderFrame_GetSelection;
 	self.update = GroupFinderFrame_Update;
@@ -167,13 +168,13 @@ function GroupFinderFrame_OnEvent(self,
 		allAvailable = false;
 	end
 
-	if ( level >= FLEX_RAID_SHOW_LEVEL ) then
+	--[[if ( level >= FLEX_RAID_SHOW_LEVEL ) then
 		GroupFinderFrameButton_SetEnabled(self.groupButton4, true);
 		self.groupButton4.tooltip = nil;
 		RequestLFDPlayerLockInfo();
 	else
 		allAvailable = false;
-	end
+	end--]]
 	
 	if ( allAvailable ) then
 		GroupFinderFrame:SetScript("OnEvent", nil);