Revert "removed the button override on-click handler"

This reverts commit e9c335cfaeaaf86cea28e1fabbe466db13c07ab6.