Updated template to show this month and this year stats, other minor tweaks