Added proper menu highlighting