Converted NotificationBundle to new form system
Code style...