Pagination

And some minor changes