Move column headers to their correct columns

They got shifted by accident in 1023401c