Fixed a few bugs with Contacts controller