Refactored Contact Class

Noticed sorting not giving right contact on click