Modified Welcome view and login view