Moved some things around in templates.