refactoring navigation and fixing issue where only one player would be in a game