more next prev work
Added next/previous handling