Feature/headerbar

minor changes