Make it so you can rematch directly from the results screen and if both players have the stage set to random it rotates stage every game