Comments Improvement + Start of Pagination