Completed first version collection View with some changes