Refactored MenuItems