Put the header items in a more logical order