Add click handler stuff