form fields rearranged