Updated View, Pagination not working correctly