Bug fix
Add welcomePage
refactor code
refactor view