Updated templates

Now all do render the HTML content