Fix active navbar highlighting