Reordered fields on enrollment and edit forms