menu fixes
Merge pull request #56 from optopus/fix-menu-helper

menu fixes