A bit of html, jinja2 clean up, more later, my brain is tired