@@ -82,11 +82,11 @@ function PVPHelperFrame_OnEvent(self, ev
 		StaticPopup_Hide("BFMGR_EJECT_PENDING");
 		PVP_UpdateStatus();
 	elseif ( event == "WARGAME_REQUESTED" ) then
-		local challengerName, bgName, timeout = ...;
-		PVPFramePopup_SetupPopUp(event, challengerName, bgName, timeout);
+		local challengerName, bgName, timeout, tournamentRules = ...;
+		PVPFramePopup_SetupPopUp(event, challengerName, bgName, timeout, tournamentRules);
 	elseif ( event == "BATTLEFIELDS_SHOW" ) then
-		if ( not PVPUIFrame) then
-			PVP_LoadUI();
+		if ( not PVPUIFrame ) then
+			PVEFrame_ShowFrame("PVPUIFrame");
 			PVPQueueFrame_OnEvent(PVPQueueFrame, event, ...);
 		end
 	end
@@ -143,7 +143,7 @@ function PVPFramePopup_OnUpdate(self, el
 end
 
 
-function PVPFramePopup_SetupPopUp(event, challengerName, bgName, timeout)
+function PVPFramePopup_SetupPopUp(event, challengerName, bgName, timeout, tournamentRules)
 	PVPFramePopup.title:SetFormattedText(WARGAME_CHALLENGED, challengerName, bgName);
 	PVPFramePopup.type = event;
 	PVPFramePopup.timeout = timeout  - 3;  -- add a 3 second buffer
@@ -386,13 +386,15 @@ function PVPReadyDialog_Display(self, in
 		self.roleLabel:Hide();
 		self.roleIcon:Hide();
 	end
-
+	
 	local showTitle = true;
+	self.leaveButton:Show()
 	if ( queueType == "BATTLEGROUND" ) then
 		if ( isRated ) then
 			self.background:SetTexCoord(0, 1, 0, 102/128);
 			self.background:SetTexture("Interface\\PVPFrame\\PvpBg-AlteracValley-ToastBG");
 			self.label:SetText(RATED_BATTLEGROUND_IS_READY);
+			self.leaveButton:Hide();
 		else
 			self.background:SetTexCoord(0, 1, 0, 1);
 			self.background:SetTexture("Interface\\LFGFrame\\UI-PVP-BACKGROUND-"..(factionGroup or "Alliance"));
@@ -403,6 +405,7 @@ function PVPReadyDialog_Display(self, in
 		self.background:SetTexture("Interface\\PVPFrame\\PvpBg-NagrandArena-ToastBG");
 		showTitle = false;
 		self.label:SetText(ARENA_IS_READY);
+		self.leaveButton:Hide();
 	elseif ( queueType == "WARGAME" ) then
 		self.background:SetTexCoord(0, 1, 0, 102/128);
 		self.background:SetTexture("Interface\\PVPFrame\\PvpBg-AlteracValley-ToastBG");
@@ -410,6 +413,13 @@ function PVPReadyDialog_Display(self, in
 	else
 		self.label:SetText(BATTLEGROUND_IS_READY);
 	end
+	
+	self.enterButton:ClearAllPoints();
+	if (self.leaveButton:IsShown()) then
+		self.enterButton:SetPoint("BOTTOMRIGHT", self, "BOTTOM", -7, 25)
+	else
+		self.enterButton:SetPoint("BOTTOM", self, "BOTTOM", 0, 25)
+	end
 
 	if ( showTitle ) then
 		self.instanceInfo:Show();