Refactor click binding