Added new template
Refactor to use current_form feature of getForm