Add Pagination and Design