further headerbar rework