use new url in templates and fix link