Move navhighlight from plugins to modules