Fix for issue #5: menu highlighting