Refactored MenuItem into its own file