Renamed Pagination and working on fixing endless loop