rearrange edit form fields