merged pages and renamed signup and game pages