Refactored loadingScreen, other fixes