Attempt to clean up login form
More login tweaks