Navigation changes

see my comment in the gdoc (https://docs.google.com/a/learningequality.org/document/d/11lEO606CtQZayu9W3s4qtE-qvNIW4iK_MuoBzJ8o-gM/edit#bookmark=id.go1ku8fe0c5s) and let me know here