Reorganize to use template_pack in form rendering