Removed location address from contact detail and moved to location. Added ability to select primary address.