Pretty up the templates.

