Add relationship in contact popin & refactor