Fixed OnTouchListener assignments