Clean up
Removed bounce effect in pie chart
Merge with master