Refactor wait screens and player start functions