changed MenuItem and MenuItemBase