diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua
index e665885..17a1138 100644
--- a/AtlasLoot/Core/AtlasLoot.lua
+++ b/AtlasLoot/Core/AtlasLoot.lua
@@ -1149,9 +1149,28 @@ end
 
 --[[
 AtlasLoot_NavButton_OnClick:
-Called when <-, -> or 'Back' are pressed and calls up the appropriate loot page
+Called when <-, -> are pressed and calls up the appropriate loot page
 ]]
 function AtlasLoot_NavButton_OnClick()
+	if AtlasLootItemsFrame.refresh and AtlasLootItemsFrame.refresh[4] then
+		if strsub(this.lootpage, 1, 16) == "SearchResultPage" then
+			AtlasLoot_ShowItemsFrame("SearchResult", this.lootpage, (AL["Search Result: %s"]):format(AtlasLootCharDB.LastSearchedText or ""), AtlasLootItemsFrame.refresh[4]);
+		elseif strsub(this.lootpage, 1, 12) == "WishListPage" then
+			AtlasLoot_ShowItemsFrame("WishList", this.lootpage, AL["Wishlist"], AtlasLootItemsFrame.refresh[4]);
+		else
+			AtlasLoot_ShowItemsFrame(this.lootpage, AtlasLootItemsFrame.refresh[2], "", AtlasLootItemsFrame.refresh[4]);
+		end
+    else
+		--Fallback for if the requested loot page is a menu and does not have a .refresh instance
+		AtlasLoot_ShowItemsFrame(this.lootpage, "", "", AtlasFrame);
+	end
+end
+
+--[[
+AtlasLoot_NavButton_OnClick:
+Called when 'Back'Button is pressed and calls up the appropriate loot page
+]]
+function AtlasLoot_BackButton_OnClick()
 	if AtlasLootItemsFrame.refresh and AtlasLootItemsFrame.refresh[4] then
 		if strsub(this.lootpage, 1, 16) == "SearchResultPage" then
 			AtlasLoot_ShowItemsFrame("SearchResult", this.lootpage, (AL["Search Result: %s"]):format(AtlasLootCharDB.LastSearchedText or ""), AtlasLootItemsFrame.refresh[4]);
diff --git a/AtlasLoot/Core/AtlasLoot.xml b/AtlasLoot/Core/AtlasLoot.xml
index c860487..35b0b41 100644
--- a/AtlasLoot/Core/AtlasLoot.xml
+++ b/AtlasLoot/Core/AtlasLoot.xml
@@ -166,7 +166,7 @@
     <Button name="AtlasLootClassButtonTemplate" inherits="OptionsButtonTemplate" virtual="true" hidden="true">
         <Scripts>
             <OnClick>
-                AtlasLoot_NavButton_OnClick()
+                AtlasLoot_BackButton_OnClick()
             </OnClick>
             <OnShow>
 		        this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
@@ -618,7 +618,7 @@
                 </Anchors>
                 <Scripts>
                     <OnClick>
-                        AtlasLoot_NavButton_OnClick()
+						AtlasLoot_NavButton_OnClick()
                     </OnClick>
                     <OnShow>
 		                this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
diff --git a/AtlasLoot/Locales/constants.en.lua b/AtlasLoot/Locales/constants.en.lua
index 001617a..10f4306 100644
--- a/AtlasLoot/Locales/constants.en.lua
+++ b/AtlasLoot/Locales/constants.en.lua
@@ -42,6 +42,7 @@ if AL then
 	AL["Show Normal Loot"] = true;
 	AL["Show Heroic/Ascended Loot"] = true;
 	AL["Bloodforged"] = true;
+	AL["Factions - Original WoW"] = true;
 	AL["Factions - Classic"] = true;
 	AL["Factions - Burning Crusade"] = true;
 	AL["Factions - Wrath of the Lich King"] = true;