Improve navigation on wrapped lines