Feature/headerbar

Fixed headerbar