Fix up nav bar so it highlights properly