Issue #23853: Incorporated widget-refactor logic into ContactWidget