Fix navigation highlighting