Updates per Ali's request
Merge pull request #1059 from darkwing/menu-update

Updates per Ali's request