diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj
index 3102bd5..3728a4c 100644
--- a/VDSSample.xcodeproj/project.pbxproj
+++ b/VDSSample.xcodeproj/project.pbxproj
@@ -290,6 +290,7 @@
 				EAA5EEAC28EB6924003B3210 /* InputFieldViewController.swift */,
 				EAC9257F29119FC400091998 /* TextLinkViewController.swift */,
 				EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */,
+				445BA07929C088470036A7C5 /* NotificationViewController.swift */,
 				EA89201828B56DF5006B9984 /* RadioBoxGroupViewController.swift */,
 				EAF7F11928A14A0E00B287F5 /* RadioButtonViewController.swift */,
 				EA84F76128BE4AE500D67ABC /* RadioSwatchGroupViewController.swift */,
@@ -299,7 +300,6 @@
 				EA5E305B295111050082B959 /* TileletViewController.swift */,
 				EA5E30542950EA6E0082B959 /* TitleLockupViewController.swift */,
 				EA3C3BB328996775000CA526 /* ToggleViewController.swift */,
-				445BA07929C088470036A7C5 /* NotificationViewController.swift */,
 			);
 			path = ViewControllers;
 			sourceTree = "<group>";
diff --git a/VDSSample/Classes/Helper.swift b/VDSSample/Classes/Helper.swift
index 8a140f9..ae446bd 100644
--- a/VDSSample/Classes/Helper.swift
+++ b/VDSSample/Classes/Helper.swift
@@ -26,7 +26,7 @@ extension UIView {
 
 extension ButtonBase {
     func labelPublisher(_ label: UILabel){
-        publisher(for: .touchUpInside)
+        onClickSubscriber = publisher(for: .touchUpInside)
             .sink { control in
                 let newText = "\(control.text!) clicked - "
                 if let labelText = label.text {
@@ -38,7 +38,7 @@ extension ButtonBase {
                     label.text = "\(newText)1"
                 }
                 print("clicked me")
-            }.store(in: &subscribers)
+            }
     }
 }
 
diff --git a/VDSSample/ViewControllers/MenuViewController.swift b/VDSSample/ViewControllers/MenuViewController.swift
index f3daed8..80c7169 100644
--- a/VDSSample/ViewControllers/MenuViewController.swift
+++ b/VDSSample/ViewControllers/MenuViewController.swift
@@ -79,6 +79,7 @@ class MenuViewController: UITableViewController {
         MenuComponent(title: "Icon", completed: true, viewController: IconViewController.self),
         MenuComponent(title: "InputField", completed: false, viewController: InputFieldViewController.self),
         MenuComponent(title: "Label", completed: true, viewController: LabelViewController.self),
+        MenuComponent(title: "Notification", completed: false, viewController: NotificationViewController.self),
         MenuComponent(title: "RadioBoxGroup", completed: true, viewController: RadioBoxGroupViewController.self),
         MenuComponent(title: "RadioButtonGroup", completed: true, viewController: RadioButtonViewController.self),
         MenuComponent(title: "RadioSwatchGroup", completed: true, viewController: RadioSwatchGroupViewController.self),
@@ -88,8 +89,7 @@ class MenuViewController: UITableViewController {
         MenuComponent(title: "TileContainer", completed: true, viewController: TileContainerViewController.self),
         MenuComponent(title: "Tilelet", completed: false, viewController: TileletViewController.self),
         MenuComponent(title: "TitleLockup", completed: true, viewController: TitleLockupViewController.self),
-        MenuComponent(title: "Toggle", completed: true, viewController: ToggleViewController.self),
-        MenuComponent(title: "Notification", completed: false, viewController: NotificationViewController.self)
+        MenuComponent(title: "Toggle", completed: true, viewController: ToggleViewController.self)
     ]
     
     override func numberOfSections(in tableView: UITableView) -> Int {
diff --git a/VDSSample/ViewControllers/NotificationViewController.swift b/VDSSample/ViewControllers/NotificationViewController.swift
index 550d7b4..3103e66 100644
--- a/VDSSample/ViewControllers/NotificationViewController.swift
+++ b/VDSSample/ViewControllers/NotificationViewController.swift
@@ -21,18 +21,14 @@ class NotificationViewController: BaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        notificationView.titleLabel.text = "Good morning"
-        notificationView.subTitleLabel.text = "SecondLabel information"
-        
-        let firstButton = Button()
-        firstButton.use = .secondary
-        firstButton.size = .small
-        
-        let secondButton = Button()
-        secondButton.use = .primary
-        secondButton.size = .small
-        
-        notificationView.buttonsView.buttons = [firstButton,secondButton]
+        notificationView.titleText = "Good morning"
+        notificationView.subTitleText = "SecondLabel information"
+        notificationView.primaryButtonModel = .init(text: "First", onClick: { button in
+            print("\(button.text!) button click")
+        })
+        notificationView.secondaryButtonModel = .init(text: "Second", onClick: { button in
+            print("\(button.text!) button click")
+        })
         addContentTopView(view: notificationView)
         
         setupForm()