new nav

this will take 2 commits to complete since i need to merge as well