fixed menu behavior
fixed menu behavior
CR fixes
Merge pull request #274 from ZappoMan/master

Fixed menu behavior