Removed Pagination with some refactoring