Updated the Welcome screen and updated for login screen