fixing menu
Merge branch 'master' into deploy