Improve display of contact

Fixes #2350