Reverting previous changes

Feel free to add the previous changes back in at a later date, if you can verify that all information stays the same.

Perhaps if we only create the headers once, and *every* time it gets updated, you change the html, but before values were being duplicated or lost, and I couldn't figure out where they were lined up.