Merge "Some minor improvements to Contact Editor design"