Extended with new pie chart and color map limits calculations