Fix templating
Fix html tags (thanks to fkrauthan)