Updates to template tags.
Attempting some more changes.