Adapted the templates to the new static tag