even more nav edits