Slight layout changes because of new header background color
More layout fixes for issue #1780
Merge pull request #1785 from pculture/gh-1779

Gh 1779