add loading screen
Merge