More refactoring of welcome screen