assorted updates to nav form