fix menu
Merge branch 'dev' into production

* dev:
  fix menu