Updated form builder with template for hidden fields