Form class

* Migrated forms to new template api