Now wrapped lines don't double up, dragged view still incorrect