Fixed minor bugs in links in the templates