updates to templates
new form field, more refactoring