Loading Screen Updates
(Merge conflicts)