new navigation options based on header-effects
nav updates 7/22
Merge branch 'new-nav'
just to push for jacqui