Fix bug in Splash Scene and Refactor