[V2] Use #labelled_form_for instead of #labelled_tabular_form_for

rebased #660.