more refactoring of headers and css selectors