rearrange edit fields