fix loading screen & spinner
Merge pull request #1837 from bechi/feature/loading-screen

fix loading screen & spinner