Pagination added, needs to be fixed