Revert "Update nav links highlight target" - Lost highlights in nav, get nav links in not main pages

This reverts commit 5949261d7dad8860a7e535e4ae6cb848f3023ed7.