Add contact fields & polish UI