converted all form controls to use jinja macros