Changed sorting to be on headers not buttons as it is less intrusive.