Work on styling of header. Fixes #2110