Minor fixes in templates

Minor fixes in templates, just like `{{foo}}` to `{{ foo }}`.