Added pie chart
Removed ExpandablePieChart
Added the some small fixes