cleanup modules
Add paging to collection view
Fix last page numbering