touch handling improvement

changed touch event handling from buttons to touchEvents