Fix chart titles
Fix data
Fix display (update chart with extrameasures)