Revert "More nav link fixes"

This reverts commit 1d10afe5280f47498e082c49a70c9d3f991dbf97.