Finish the loading screen and merge

Merge the project with Nhat's file