Bug fixes and links for template