Revert f48a3a2..cb80406

This rolls back to commit f48a3a21b4a23e3d348844f6aac637d8c966be5d.
Revert "Revert f48a3a2..cb80406"

This reverts commit 3c694dfab9bea900e465a43e18bbb75390d3bd68.
Working fixed nav