clean up facet template and accommodate facetted pie charts