Header component updates
Merge pull request #1956 from flukeout/develop

Header component updates