Pagination added and formatting changed