Fix broken forms markup
Develop the form, incl. ajax functionality