Add/replace dataset by samples on investigation table

It seems to me that we are moving from dataset-centric view to sample-centric views. In the investigations table, which should play a central role in the data portal there is no notion of sample:

I think that Datasets and Files should be replaced by Samples (which when mouse is over it shows the stats of datasets, datafiles).