Improve navmenu for use in roles. May need to make further improvements later, but the navmenu now works for all the cases in the core modules.