navmenu updates, other tweaks