Fixed menu highlighting issue