Fixed menu highlighting