simplified and fixed bug
Merge branch 'hotfix/donut-total-display'