setup collection view
merged with development