Fix some issues with the header bar