nav fixes and plugin updates