Solve problem with header
Merge branch 'hotfix/menu-header' into develop

* hotfix/menu-header:
  Solve problem with header