Code clean up

also minor changes in module:mail, and login form