Change to use Chaplin CollectionView more extensively/correctly