[noticket] Update ordering of the groups on add_form