Fixed some menu item bugs.
Merge pull request #13 from snwh/devel

Fixed merge errors.