Add rank to tooltip
Change bar data to not be stacked