Pagination now well layed out