Fixed issue #33: Password reset
Minor changes to improve layout mainly