More navmenu standardization