added conditionals for header display