Form Notifications improvements