Rearranging field order to make entry more natural