Enhance menu to show selected element