Split out charts into their own subtemplates
Remove dumb debugging code
Add some space around the charts