[1.0.x] Move column headers to their correct columns

They got shifted by accident in 1023401c

Backport of 58e91e6 from master.