diff --git a/VDSSample/ViewControllers/ButtonIconViewController.swift b/VDSSample/ViewControllers/ButtonIconViewController.swift
index 29e9460..d7246ac 100644
--- a/VDSSample/ViewControllers/ButtonIconViewController.swift
+++ b/VDSSample/ViewControllers/ButtonIconViewController.swift
@@ -63,7 +63,7 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
     lazy var badgeIndicatorExpandDirectionPickerSelectorView = {
         PickerSelectorView(title: "right",
                            picker: self.picker,
-                           items: ButtonIcon.ExpandDirection.allCases)
+                           items: ButtonIcon.BadgeIndicatorModel.ExpandDirection.allCases)
     }()
     
     override func viewDidLoad() {
@@ -73,6 +73,8 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
         setupModel()
     }
     
+    var badgeIndicatorFormStackView = FormSection().with { $0.isHidden = true }
+    
     override func setupForm(){
         super.setupForm()
         addFormRow(label: "Disabled", view: disabledSwitch)
@@ -83,34 +85,27 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
         addFormRow(label: "Floating", view: floating)
         addFormRow(label: "Hide Border", view: hideBorder)
         addFormRow(label: "Fit To Icon", view: fitToIcon)
-//        addFormRow(label: "Custom Size", view: customSizeField)
         addFormRow(label: "Name", view: namePickerSelectorView)
         addFormRow(label: "Selected Icon Name", view: selectedIconNamePickerSelectorView)
         addFormRow(label: "Selectable", view: selectableSwitch)
         addFormRow(label: "X Offset", view: centerX)
         addFormRow(label: "Y Offset", view: centerY)
+        
+        //badgeIndicator section
         addFormRow(label: "Show Badge Indicator", view: badgeIndicatorSwitch)
-        addFormRow(label: "Expand Direction", view: badgeIndicatorExpandDirectionPickerSelectorView)
-        addFormRow(label: "Badge Variants", view: variantOneSwitch)
+        badgeIndicatorFormStackView.addFormRow(label: "Expand Direction", view: badgeIndicatorExpandDirectionPickerSelectorView)
+        badgeIndicatorFormStackView.addFormRow(label: "Badge Variants", view: variantOneSwitch)
+        append(section: badgeIndicatorFormStackView)
 
         variantOneSwitch.onChange = { [weak self] sender in
-            guard let self else { return }
-            if sender.isOn {
-                if badgeIndicatorSwitch.isOn {
-                    component.badgeIndicatorModel = ButtonIcon.BadgeIndicatorModel(kind: BadgeIndicator.Kind.simple, size: BadgeIndicator.Size.small)
-                } else {
-                    component.badgeIndicatorModel = nil
-                }
-            } else  {
-                component.badgeIndicatorModel = ButtonIcon.BadgeIndicatorModel(kind: BadgeIndicator.Kind.numbered, size: BadgeIndicator.Size.small, maximumDigits: BadgeIndicator.MaximumDigits.two, number: 999, trailingText: "New")
-            }
+            self?.setBadgeIndicatorModel()
         }
         
         badgeIndicatorSwitch.onChange =  { [weak self] sender in
             guard let self else { return }
             self.component.showBadgeIndicator = sender.isOn
+            self.badgeIndicatorFormStackView.isHidden = !sender.isOn
             self.setBadgeIndicatorModel()
-            self.component.badgeIndicator.isHidden = !sender.isOn
             variantOneSwitch.isOn = false
         }
         
@@ -154,15 +149,6 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
             }.store(in: &subscribers)
     }
     
-    //sub models
-    func setBadgeIndicatorModel() {
-        if badgeIndicatorSwitch.isOn {
-            component.badgeIndicatorModel = ButtonIcon.BadgeIndicatorModel(kind: BadgeIndicator.Kind.numbered, size: BadgeIndicator.Size.small, maximumDigits: BadgeIndicator.MaximumDigits.two, number: 999)
-        } else {
-            component.badgeIndicatorModel = nil
-        }
-    }
-    
     func setupModel() {
         let name = Icon.Name.addToFavorite
         
@@ -174,7 +160,7 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
         sizePickerSelectorView.text = component.size.rawValue
         namePickerSelectorView.text = name.rawValue
         disabledSwitch.isOn = !component.isEnabled
-        badgeIndicatorExpandDirectionPickerSelectorView.text = component.expandDirection.rawValue
+        badgeIndicatorExpandDirectionPickerSelectorView.text = ButtonIcon.BadgeIndicatorModel.ExpandDirection.right.rawValue
     }
     
     func updateOffset() {
@@ -191,12 +177,12 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
     
     
     func setupPicker(){
-
+        
         surfacePickerSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.component.surface = item
             self?.contentTopView.backgroundColor = item.color
         }
-
+        
         surfaceTypePickerSelectorView.onPickerDidSelect = { [weak self] item in
             self?.component.surfaceType = item
         }
@@ -213,13 +199,25 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
         namePickerSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.component.iconName = item
         }
-
+        
         selectedIconNamePickerSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.component.selectedIconName = item
         }
         
         badgeIndicatorExpandDirectionPickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            self?.component.expandDirection = item
+            self?.setBadgeIndicatorModel()
+        }
+    }
+    
+    func setBadgeIndicatorModel() {
+        if variantOneSwitch.isOn {
+            if badgeIndicatorSwitch.isOn {
+                component.badgeIndicatorModel = ButtonIcon.BadgeIndicatorModel(kind: BadgeIndicator.Kind.simple, size: BadgeIndicator.Size.small)
+            } else {
+                component.badgeIndicatorModel = nil
+            }
+        } else  {
+            component.badgeIndicatorModel = ButtonIcon.BadgeIndicatorModel(kind: BadgeIndicator.Kind.numbered, expandDirection: badgeIndicatorExpandDirectionPickerSelectorView.selectedItem, size: BadgeIndicator.Size.small, maximumDigits: BadgeIndicator.MaximumDigits.two, number: 999)
         }
     }
 }