Pagination fixed & few refactoring
Bump it