Make more link avenir.

This addresses one of the design issues.