fixing contacts UI and logic