Improving bubble template, adding new bar chart template