Support click
Minor changes
Support click listener