Just a npm install
Fix pagination
Minor fix and clean up