Updated menus

Made some changes to the way the menu behaves.
Merge pull request #19 from mattgriffin/menu-updates

Updated menus