Converted touch handlers to gesture recognizers - revised