Adds loading screen and further improvements