Merge timeseries and entrystats
Put charts in partials