Redesign

we've been indenting templates in case of both HTML element indentation and logical block indentation - it looks like you're only indenting HTML elements here, which I prefer slightly less (a bit harder to follow)

That said, if you've done this consistently, I think we can change the style.