added donut chart to overview
fixed conflicts