fixed broken links in templates

and avoided some unpleasant redirects