Improve next/prev scroll