INTTEMPLATES-18 - Add Back Form Fields to Wizard

* Polishing