Refactor bubble chart & pie chart
Merge commit '640883ea581497a9dee2cb2b9bae1ffeddb21965'