diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift
index 670fef9..a580d31 100644
--- a/VDSSample/ViewControllers/ButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift
@@ -13,24 +13,16 @@ import VDSColorTokens
 class ButtonGroupViewController: BaseViewController {
     var collectionView: UICollectionView!
     
-    lazy var usePickerSelectorView = {
-        PickerSelectorView<Use>(title: "",
-                                 picker: self.picker,
-                                 items: [.primary, .secondary])
-    }()
-    
-    lazy var buttonSizePickerSelectorView = {
-        PickerSelectorView(title: "",
-                            picker: self.picker,
-                            items: ButtonSize.allCases)
+    lazy var buttonPositionSelectorView = {
+        PickerSelectorView<ButtonPosition>(title: "",
+                                picker: self.picker,
+                                items: ButtonPosition.allCases)
     }()
 
     var disabledSwitch = UISwitch()
-    var textField = TextField()
     var widthTextField = TextField()
 
     let buttonGroup = ButtonGroup()
-    
     let button = Button()
     
     override func viewDidLoad() {
@@ -51,11 +43,10 @@ class ButtonGroupViewController: BaseViewController {
     
     func setupForm(){
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Use", view: usePickerSelectorView)
         addFormRow(label: "Disabled", view: disabledSwitch)
-        addFormRow(label: "Label", view: textField)
-        addFormRow(label: "Width", view: widthTextField)
-        addFormRow(label: "Size", view: buttonSizePickerSelectorView)
+        addFormRow(label: "Position", view: buttonPositionSelectorView)
+
+       // addFormRow(label: "Width", view: widthTextField)
 
 
         disabledSwitch
@@ -64,19 +55,13 @@ class ButtonGroupViewController: BaseViewController {
                 self?.buttonGroup.disabled = sender.isOn
             }.store(in: &subscribers)
 
-        textField
-            .textPublisher
-            .sink { [weak self] text in
-                self?.button.text = text
-            }.store(in: &subscribers)
-        
-        widthTextField
-            .textPublisher
-            .sink { [weak self] text in
-                if let n = NumberFormatter().number(from: text) {
-                    self?.button.width = CGFloat(truncating: n)
-                }
-            }.store(in: &subscribers)
+//        widthTextField
+//            .textPublisher
+//            .sink { [weak self] text in
+//                if let n = NumberFormatter().number(from: text) {
+//                    self?.buttonGroup.width = CGFloat(truncating: n)
+//                }
+//            }.store(in: &subscribers)
 
     }
     
@@ -97,11 +82,9 @@ class ButtonGroupViewController: BaseViewController {
         
         //setup UI
         surfacePickerSelectorView.text = buttonGroup.surface.rawValue
+        buttonPositionSelectorView.text = buttonGroup.buttonPosition.rawValue
         disabledSwitch.isOn = buttonGroup.disabled
-        textField.text = button.text
-        usePickerSelectorView.text = button.use.rawValue
         widthTextField.text = ""
-        buttonSizePickerSelectorView.text = ButtonSize.large.rawValue
     }
       
     func setupPicker(){
@@ -111,13 +94,8 @@ class ButtonGroupViewController: BaseViewController {
             self?.contentTopView.backgroundColor = item.color
         }
         
-        usePickerSelectorView.onPickerDidSelect = {  [weak self] item in
-            self?.button.use = item
-            self?.button.backgroundColor = item.color
-        }
-        
-        buttonSizePickerSelectorView.onPickerDidSelect = { [weak self] item in
-            self?.button.size = item
+        buttonPositionSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.buttonGroup.buttonPosition = item
         }
     }
 }