Handled issue with button triggering clickHandler