First cut of updated nav.