Fixed links to templates #463
Minor fixes