Tinkered with header bar to make it cleaner in all contexts.