Simplifying templates

Started using long forgotten $this->assets array :)
Add HTML coverage reported