chaned the way loading screen will be viewed
Merge branch 'Hubert' into module-instances
Merge branch 'module-instances' into Hubert