Unit2: Fixed some issues and handled redirection to welcome page, updated code according to homework help.