Fix Notifications to match with new w3c recommendations