Using 'tap' for button click detection
review fixes