Prettied up login
Minor modifications before considering simple form switch