Correcting menu item highlighting