DNM: More navs

I'm still working on this