Looks like this now:
I've also taken the opportunity for some code restructuring and cleaning inside ContactCard.kt.
ContactCard.kt
Draft since based on !265 (merged).
Closes #424 (closed)