Added Tin's changes

Tin improved the controls by using a different class to handle single
tap detection.