Merge pull request #1 from ubc/master

getting Enej's changes
Menu related changes
Merge pull request #1 from amirent/master

Menu updates