Changed Notification to using the eventBus

closes #399