reorder fields to closer match mockups from implementation team