Some changes made here...
Fixed Donut and Vertical Bars

Pending the bug when you have one last level of grouping
less bugs