Moved login to home screen and corrected welcome messages