Code cleanup and Adding placeholder for PvP page.