diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift
index fb835de..26a1e07 100644
--- a/VDSSample/ViewControllers/ButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift
@@ -13,12 +13,53 @@ import VDSColorTokens
 class ButtonGroupViewController: BaseViewController {
     var collectionView: UICollectionView!
     
+    public enum RowQuantity: String, CaseIterable {
+        case none, one, two, three, four
+        
+        init(quantity: Int){
+            
+            if quantity == 1 {
+                self = .one
+            } else if quantity == 2 {
+                self = .two
+            } else if quantity == 3 {
+                self = .three
+            } else if quantity == 4 {
+                self = .four
+            } else {
+                self = .none
+            }
+            
+        }
+        var intValue: Int {
+            switch self {
+            case .none:
+                return 0
+            case .one:
+                return 1
+            case .two:
+                return 2
+            case .three:
+                return 3
+            case .four:
+                return 4
+            }
+        }
+    }
+    
     lazy var buttonPositionSelectorView = {
         PickerSelectorView<ButtonPosition>(title: "",
                                 picker: self.picker,
                                 items: ButtonPosition.allCases)
     }()
-
+    
+    lazy var rowQuantitySelectorView = {
+        PickerSelectorView<RowQuantity>(title: "",
+                                        picker: self.picker,
+                                        items: RowQuantity.allCases)
+    }()
+    
+    
     var disabledSwitch = Toggle()
     var widthTextField = TextField()
 
@@ -26,6 +67,8 @@ class ButtonGroupViewController: BaseViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        buttonGroup.rowQuantityPhone = 1
+        buttonGroup.rowQuantityTablet = 2
         buttonGroup.buttons = [
             makeButton("Button"),
             makeTextLink("Text Link Button Test Test2"),
@@ -50,6 +93,7 @@ class ButtonGroupViewController: BaseViewController {
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Disabled", view: .makeWrapper(for: disabledSwitch))
         addFormRow(label: "Position", view: buttonPositionSelectorView)
+        addFormRow(label: "Row Quantity", view: rowQuantitySelectorView)
 
        // addFormRow(label: "Width", view: widthTextField)
 
@@ -75,6 +119,7 @@ class ButtonGroupViewController: BaseViewController {
         surfacePickerSelectorView.text = buttonGroup.surface.rawValue
         buttonPositionSelectorView.text = buttonGroup.buttonPosition.rawValue
         disabledSwitch.isOn = buttonGroup.disabled
+        rowQuantitySelectorView.text = RowQuantity(quantity: buttonGroup.rowQuantity).rawValue
         widthTextField.text = ""
     }
       
@@ -88,5 +133,13 @@ class ButtonGroupViewController: BaseViewController {
         buttonPositionSelectorView.onPickerDidSelect = {  [weak self] item in
             self?.buttonGroup.buttonPosition = item
         }
+        
+        rowQuantitySelectorView.onPickerDidSelect = {  [weak self] item in
+            if UIDevice.isIPad {
+                self?.buttonGroup.rowQuantityTablet = item.intValue
+            } else {
+                self?.buttonGroup.rowQuantityPhone = item.intValue
+            }
+        }
     }
 }