onClick and touchEnd handlers were fighting.

Moved all tap/touch handing to touchEnd. Refactored for
speed for old devices.

Change-Id: I611b4cffa8755cf84d2d5454792faef96bed78ec