Added handles highlighting