Improve headers, visuallly they were confusing