setting up collectin view
merged with master
updated branch