Bugfixes for menu selection
fixed merge conflicts
Merge pull request #18 from 2011dkang1/jason_bugfix

Bugfixes for menu selection