Added menu highlighting fix