Add clickable delete support