Added toggle live highlighting