Revert "moving things around"

This reverts commit 5f822ea5eb81352b22b80aea0a24dca1adcb3ed5.
updates to navigation