Address few suggestions/bug fixes:

- change form field wrappers from div's to li's
- add conditionals around optional form fields in email template
- small nit fixes