Add click handlers
Merge files