#52 update form, templates and other