optimizing click events
Merge branch 'develop'