More fixes to header-bar