Finished combining the data source for colleciton and tableview