Cleanup reports, reorder culumn headers