Changed URL names so navigation bar highlighting works consistently.