Closes #28, closes #29. Pagination section aligned with new design