navigation highlight, fix names