Charts: Improve fit and chart state handling, recalculate chart only if neccessary