Fix new loading screen (TODO: clean up StartState a bit)