Changed menu item names and attributes