Simplify contact related UI & logic