Tidy up and change to start window