Merge "Yangman - redesign menu items"