pagination and modals needs a tidy