Refactored MenuItem