Tweaks to prev/next navigation