SWC-799: fix header in all cases
Merge pull request #531 from jay-hodgson/release-9

SWC-799: fix header UI