Contact Homesweethome improvements