Pagination + More Bug fixing