Improved: Links from template