Refactor line wrapping
Moving to selected line added