Fixed double nav-current issue in #1722.
Removed duplicate code for nav-current fix.
Merge pull request #1723 from pjackson28/v3.0

Fixed double nav-current issue in #1722