Login cleanup

This is what I was able to assemble so far. It's still not perfect but I think a little bit better.