More beautiful, and login works