Refactored menuitem to menu