nav edit
merged nav edits