Contact UI fixes