Fix menu highlighting