Rearrange the row ordering to make more sense.