Making some mods to improve how the nav items are coded.