refactor click rebinding