Refactoring layout and welcome view