wrapping up final changes to nav pull request