BP-13: Adjusting nav
BP-14: Adjusting nav
Merge branch 'Local-dev-BPeterson'