Charts improvements