added loading screen functionality
merged files