Fixed how the active highlight works