style tweaks
Refactor login