Work on welcome screen and session management