Cleaned up templated link example and links