Fix navbar clicking not landing where you should be

[dongyuzheng]

Clicking takes you slightly higher than where you should be.

[jyang0]

Clicking still takes you to the same place, but the nav header now shows the right text. I think it's probably nicer this way, since the nav header text isn't especially obvious.