Refactored menu item composition.