Re-order the fields in a more logical manner.