Refactor drag & click gestures.