Changed order of refs
Fixed for build
Fixed link in template
Removed duplicates