Added highlight and select controls