Fix and improve goal charts