LIB001-939: Making pagination more obvious