Moved the headers around and added padding