Fixes 278, first point.
Revert "Fixes 278, first point."

This reverts commit 9be7ebc27ab96f5cfabbc82695337069bdb6cb44.
Fixes 278, first point.
Redesign of contact editing.
Redesign of contact editing.