Reorganize the form