Updated bookmark navigation to wrap around (#233).