More nav edits