Added better handling for client contacts

* Add separate fields to capture address allow multiple)
* Add better display and handling of contact details