Worked on new templates and password reset