Some cleanup and adding UI for contacts.