Better drag, and handling click without drag