Pagination & small fixes