Improve prev/next options