Updated collection view controller

Closes #54
Refactor the table view data source, removing cell block