Improve simple next/prev navigation

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>