improved the organization of header options