Vellum Cleanup

some changes to formdesigner template in hq related to recent vellum cleanup

Related PR:
https://github.com/dimagi/Vellum/pull/80
https://github.com/dimagi/hqstyle-src/pull/42