Improve origin picker
Add notification service and enable domain update
Fix issue