Change chart format to be more logical but broke radar and stacked chart