pagination and modals needs a tidy 2