leads_product and notification_settings refactored