Added more data for affinity and tweaked visualization