Bugs fixed for dragging and swiping