Move the HTML formatting into freemarker
Fully update to freemarker, remove old renderers