Improves Pagination and Adds Edit Link