Merge pull request #505 from ZappoMan/master

Clean up menus slightly