fixed navigation issues
TODO: really stop the game when aborting a game, not only reset it at the next game.