reorder fields to match application