Simplify part of contact view
First stab at #63