Added loading screen
Minor changes