Edited Menu

Changed menu and names