Updated menus

Made some changes to the way the menu behaves.