fix overflow for menu
Merge branch 'feature/fix_redesign' into develop

* feature/fix_redesign:
  fix overflow for menu