more form template updates