More template changes.

It's faster to have it straight in the HTML because less HTTP requests are needed.