Initial load sceen refactoring