refactored and extended menuItems