Changed the way the column headers are generated.