Changed order of some fields and wording on some screens