Add Simple Donut chart and other tweaks