update templates, add form validation errors