Refactor on JS / Refactor on Paginator
Finish JS Refactoring