diff --git a/VDSSample.xcodeproj/project.pbxproj b/VDSSample.xcodeproj/project.pbxproj
index 7b82798..0a5e1ce 100644
--- a/VDSSample.xcodeproj/project.pbxproj
+++ b/VDSSample.xcodeproj/project.pbxproj
@@ -35,8 +35,10 @@
 		180636CB2C29B12B00C92D86 /* InputStepperViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 180636CA2C29B12B00C92D86 /* InputStepperViewController.swift */; };
 		1808BEBE2BA4479500129230 /* CarouselScrollbarViewConttroller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1808BEBD2BA4479500129230 /* CarouselScrollbarViewConttroller.swift */; };
 		1832AC5B2BA1347B008AE476 /* BreadcrumbsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1832AC5A2BA1347B008AE476 /* BreadcrumbsViewController.swift */; };
+		183B16F52C80B27C00BA6A10 /* FootnoteGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 183B16F42C80B27C00BA6A10 /* FootnoteGroupViewController.swift */; };
 		184023492C61E9E700A412C8 /* PriceLockupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 184023482C61E9E700A412C8 /* PriceLockupViewController.swift */; };
 		186D13CD2BBA990800986B53 /* DropdownSelectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 186D13CC2BBA990800986B53 /* DropdownSelectViewController.swift */; };
+		18926F5F2C76185A00C55BF6 /* FootnoteItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18926F5E2C76185A00C55BF6 /* FootnoteItemViewController.swift */; };
 		18A3F1302BD9332500498E4A /* CalendarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18A3F12F2BD9332500498E4A /* CalendarViewController.swift */; };
 		18AE87522C06FDD60075F181 /* CarouselViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18AE87512C06FDD60075F181 /* CarouselViewController.swift */; };
 		18C0F9482C98177F00E1DD71 /* ModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18C0F9472C98177F00E1DD71 /* ModalViewController.swift */; };
@@ -136,8 +138,10 @@
 		180636CA2C29B12B00C92D86 /* InputStepperViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputStepperViewController.swift; sourceTree = "<group>"; };
 		1808BEBD2BA4479500129230 /* CarouselScrollbarViewConttroller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselScrollbarViewConttroller.swift; sourceTree = "<group>"; };
 		1832AC5A2BA1347B008AE476 /* BreadcrumbsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BreadcrumbsViewController.swift; sourceTree = "<group>"; };
+		183B16F42C80B27C00BA6A10 /* FootnoteGroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FootnoteGroupViewController.swift; sourceTree = "<group>"; };
 		184023482C61E9E700A412C8 /* PriceLockupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PriceLockupViewController.swift; sourceTree = "<group>"; };
 		186D13CC2BBA990800986B53 /* DropdownSelectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DropdownSelectViewController.swift; sourceTree = "<group>"; };
+		18926F5E2C76185A00C55BF6 /* FootnoteItemViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FootnoteItemViewController.swift; sourceTree = "<group>"; };
 		18A3F12F2BD9332500498E4A /* CalendarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarViewController.swift; sourceTree = "<group>"; };
 		18AE87512C06FDD60075F181 /* CarouselViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarouselViewController.swift; sourceTree = "<group>"; };
 		18C0F9472C98177F00E1DD71 /* ModalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalViewController.swift; sourceTree = "<group>"; };
@@ -343,9 +347,11 @@
 				EA0D1C2E2A66CFE900E5C127 /* CheckboxViewController.swift */,
 				EA1758452BC8893700A5C0D9 /* DatePickerViewController.swift */,
 				186D13CC2BBA990800986B53 /* DropdownSelectViewController.swift */,
+				18926F5E2C76185A00C55BF6 /* FootnoteItemViewController.swift */,
+				183B16F42C80B27C00BA6A10 /* FootnoteGroupViewController.swift */,
 				EA985C00296CC21C00F2FF2E /* IconViewController.swift */,
-				180636CA2C29B12B00C92D86 /* InputStepperViewController.swift */,
 				EAA5EEAC28EB6924003B3210 /* InputFieldViewController.swift */,
+				180636CA2C29B12B00C92D86 /* InputStepperViewController.swift */,
 				EAB1D2D328AC409F00DAE764 /* LabelViewController.swift */,
 				44604AD829CE1CF900E62B51 /* LineViewController.swift */,
 				EAD0688F2A55FC11002E3A2D /* LoaderViewController.swift */,
@@ -361,8 +367,8 @@
 				EA5F86CD2A1E863F00BC83E4 /* TabsContainerViewController.swift */,
 				EA596AB92A16B2ED00300C4B /* TabsViewController.swift */,
 				EA985C24296E06EA00F2FF2E /* TextAreaViewController.swift */,
-				EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */,
 				EAC9257F29119FC400091998 /* TextLinkViewController.swift */,
+				EA0FC2C02912DC5500DF80B4 /* TextLinkCaretViewController.swift */,
 				EA5E304F294D11540082B959 /* TileContainerViewController.swift */,
 				EA5E305B295111050082B959 /* TileletViewController.swift */,
 				EA5E30542950EA6E0082B959 /* TitleLockupViewController.swift */,
@@ -563,6 +569,7 @@
 				18AE87522C06FDD60075F181 /* CarouselViewController.swift in Sources */,
 				EA596ABA2A16B2ED00300C4B /* TabsViewController.swift in Sources */,
 				EA89204E28B67332006B9984 /* CheckBoxGroupViewController.swift in Sources */,
+				183B16F52C80B27C00BA6A10 /* FootnoteGroupViewController.swift in Sources */,
 				EAA5EEAD28EB6924003B3210 /* InputFieldViewController.swift in Sources */,
 				440B84CC2BD8E98B004A732A /* TableViewController.swift in Sources */,
 				EA985C25296E06EA00F2FF2E /* TextAreaViewController.swift in Sources */,
@@ -571,6 +578,7 @@
 				EA985C20296DECF600F2FF2E /* IconName.swift in Sources */,
 				EA89204928B66CE2006B9984 /* KeyboardFrameChangeListening.swift in Sources */,
 				EA5F86CE2A1E863F00BC83E4 /* TabsContainerViewController.swift in Sources */,
+				18926F5F2C76185A00C55BF6 /* FootnoteItemViewController.swift in Sources */,
 				EA985C01296CC21C00F2FF2E /* IconViewController.swift in Sources */,
 				184023492C61E9E700A412C8 /* PriceLockupViewController.swift in Sources */,
 				EAC9258029119FC400091998 /* TextLinkViewController.swift in Sources */,
diff --git a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
index 399454d..7d8e523 100644
--- a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
+++ b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
@@ -59,7 +59,7 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
@@ -82,13 +82,13 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
         addFormRow(label: "Vertical Padding", view: verticalPaddingTextField)
         addFormRow(label: "Fill Color", view: fillColorPickerSelectorView)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Hide Border", view: hideBorderSwitch)
+        addFormRow(label: "Hide Border", view: hideBorderSwitch, pinTrailing: false)
         addFormRow(label: "Border Light", view: borderColorLightPickerSelectorView)
         addFormRow(label: "Border Dark", view: borderColorDarkPickerSelectorView)
         addFormRow(label: "Size", view: textSizePickerSelectorView)
         addFormRow(label: "Accessiblity Text", view: accessibilityTextField)
         
-        dotForm.addFormRow(label: "Hide Dot", view: hideDotSwitch)
+        dotForm.addFormRow(label: "Hide Dot", view: hideDotSwitch, pinTrailing: false)
         dotForm.addFormRow(label: "Dot Size", view: dotSizeTextField)
         numberedForm.addFormRow(label: "Leading Character", view: leadingCharacterTextField)
         numberedForm.addFormRow(label: "Trailing Text", view: trailingTextField)
diff --git a/VDSSample/ViewControllers/BadgeViewController.swift b/VDSSample/ViewControllers/BadgeViewController.swift
index a0dd887..3fec5dd 100644
--- a/VDSSample/ViewControllers/BadgeViewController.swift
+++ b/VDSSample/ViewControllers/BadgeViewController.swift
@@ -54,7 +54,7 @@ class  BadgeViewController: BaseViewController<Badge> {
         
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
diff --git a/VDSSample/ViewControllers/BaseViewController.swift b/VDSSample/ViewControllers/BaseViewController.swift
index 3fb217d..7d24751 100644
--- a/VDSSample/ViewControllers/BaseViewController.swift
+++ b/VDSSample/ViewControllers/BaseViewController.swift
@@ -43,7 +43,7 @@ public class FormSection: UIStackView {
     }
     
     @discardableResult
-    open func addFormRow(label: String, tooltip: Tooltip.TooltipModel? = nil, view: UIView) -> UIView {
+    open func addFormRow(label: String, tooltip: Tooltip.TooltipModel? = nil, view: UIView, pinTrailing: Bool = true) -> UIView {
         let formRow = UIStackView().with {
             $0.translatesAutoresizingMaskIntoConstraints = false
             $0.alignment = .fill
@@ -63,7 +63,7 @@ public class FormSection: UIStackView {
         }
         
         formRow.addArrangedSubview(label)
-        formRow.addArrangedSubview(view)
+        formRow.addArrangedSubview(pinTrailing ? view : .makeWrapper(for: view))
 
         addArrangedSubview(formRow)
         return formRow
@@ -311,7 +311,7 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable ,
     }
 
     public func setupForm() {
-        addFormRow(label: "Show Bounds", view: debugViewSwitch)
+        addFormRow(label: "Show Bounds", view: debugViewSwitch, pinTrailing: false)
     }
     
     let actionLabel = Label()
@@ -334,10 +334,16 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable ,
         viewController.didMove(toParent: self)
     }
     
-    open func addContentTopView(view: UIView, edgeSpacing: CGFloat = 16.0) {
+    open func addContentTopView(view: UIView, edgeSpacing: CGFloat = 16.0, pinTrailing: Bool = true) {
         view.translatesAutoresizingMaskIntoConstraints = false
-        contentTopView.addSubview(view)
-        view.pinToSuperView(.uniform(edgeSpacing))
+        if pinTrailing {
+            contentTopView.addSubview(view)
+            view.pinToSuperView(.uniform(edgeSpacing))
+        } else {
+            let wrapper = UIView.makeWrapper(for: view)
+            contentTopView.addSubview(wrapper)
+            wrapper.pinToSuperView(.uniform(edgeSpacing))
+        }
     }
 
     open func append(section: FormSection) {
@@ -345,8 +351,8 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable ,
     }
        
     @discardableResult
-    open func addFormRow(label: String, tooltip: Tooltip.TooltipModel? = nil, view: UIView) -> UIView {
-        return formStackView.addFormRow(label: label,tooltip: tooltip, view: view)
+    open func addFormRow(label: String, tooltip: Tooltip.TooltipModel? = nil, view: UIView, pinTrailing: Bool = true) -> UIView {
+        return formStackView.addFormRow(label: label,tooltip: tooltip, view: view, pinTrailing: pinTrailing)
     }
     
     var activeTextField: UITextField?
diff --git a/VDSSample/ViewControllers/BreadcrumbsViewController.swift b/VDSSample/ViewControllers/BreadcrumbsViewController.swift
index 7c24fe8..e38dbd7 100644
--- a/VDSSample/ViewControllers/BreadcrumbsViewController.swift
+++ b/VDSSample/ViewControllers/BreadcrumbsViewController.swift
@@ -48,8 +48,8 @@ class  BreadcrumbsViewController: BaseViewController<Breadcrumbs> {
     override func setupForm(){
         super.setupForm()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Last Crumb Selected", view: selectedSwitch)
-        addFormRow(label: "No Long Breadcrumbs", view: sampleSwitch)
+        addFormRow(label: "Last Crumb Selected", view: selectedSwitch, pinTrailing: false)
+        addFormRow(label: "No Long Breadcrumbs", view: sampleSwitch, pinTrailing: false)
 
         selectedSwitch.onChange = { [weak self] sender in
             guard let self else { return }
diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift
index ce11410..f4a4ff8 100644
--- a/VDSSample/ViewControllers/ButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift
@@ -111,7 +111,7 @@ class ButtonGroupViewController: BaseViewController<ButtonGroup> {
         super.setupForm()
         addActionRow()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Alignment", view: buttonAlignmentSelectorView)
         addFormRow(label: "Width", view: widthTextField)
         addFormRow(label: "Row Quantity", view: rowQuantitySelectorView)
diff --git a/VDSSample/ViewControllers/ButtonIconViewController.swift b/VDSSample/ViewControllers/ButtonIconViewController.swift
index b037294..23092cd 100644
--- a/VDSSample/ViewControllers/ButtonIconViewController.swift
+++ b/VDSSample/ViewControllers/ButtonIconViewController.swift
@@ -71,7 +71,7 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
@@ -106,24 +106,24 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
     
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Surface Type", view: surfaceTypePickerSelectorView)
         addFormRow(label: "Size", view: sizePickerSelectorView)
         addFormRow(label: "Kind", view: kindPickerSelectorView)
         addFormRow(label: "Selected Light", view: lightColorPicker)
         addFormRow(label: "Selected Dark", view: darkColorPicker)
-        addFormRow(label: "Floating", view: floating)
-        addFormRow(label: "Hide Border", view: hideBorder)
-        addFormRow(label: "Fit To Icon", view: fitToIcon)
+        addFormRow(label: "Floating", view: floating, pinTrailing: false)
+        addFormRow(label: "Hide Border", view: hideBorder, pinTrailing: false)
+        addFormRow(label: "Fit To Icon", view: fitToIcon, pinTrailing: false)
         addFormRow(label: "Name", view: namePickerSelectorView)
         addFormRow(label: "Selected Icon Name", view: selectedIconNamePickerSelectorView)
-        addFormRow(label: "Selectable", view: selectableSwitch)
+        addFormRow(label: "Selectable", view: selectableSwitch, pinTrailing: false)
         addFormRow(label: "X Offset", view: centerX)
         addFormRow(label: "Y Offset", view: centerY)
         
         //badgeIndicator section
-        addFormRow(label: "Show Badge Indicator", view: badgeIndicatorSwitch)
+        addFormRow(label: "Show Badge Indicator", view: badgeIndicatorSwitch, pinTrailing: false)
         badgeIndicatorFormStackView.addFormRow(label: "Expand Direction", view: badgeIndicatorExpandDirectionPickerSelectorView)
         badgeIndicatorFormStackView.addFormRow(label: "Badge Variants", view: variantOneSwitch)
         badgeIndicatorFormStackView.addFormRow(label: "Custom X offset", view: customBadgeIndicatorXField)
diff --git a/VDSSample/ViewControllers/ButtonViewController.swift b/VDSSample/ViewControllers/ButtonViewController.swift
index 8938a84..22d1c4e 100644
--- a/VDSSample/ViewControllers/ButtonViewController.swift
+++ b/VDSSample/ViewControllers/ButtonViewController.swift
@@ -32,7 +32,7 @@ class ButtonViewController: BaseViewController<Button> {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
+        addContentTopView(view: component, pinTrailing: false)
         
         setupPicker()
         setupModel()
@@ -43,7 +43,7 @@ class ButtonViewController: BaseViewController<Button> {
         addFormRow(label: "Action", view: label)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Use", view: usePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Text", view: textField)
         addFormRow(label: "Width", view: widthTextField)
         addFormRow(label: "Percentage (1-100)", view: percentageTextField)
diff --git a/VDSSample/ViewControllers/CalendarViewController.swift b/VDSSample/ViewControllers/CalendarViewController.swift
index c1178e1..846318e 100644
--- a/VDSSample/ViewControllers/CalendarViewController.swift
+++ b/VDSSample/ViewControllers/CalendarViewController.swift
@@ -83,20 +83,20 @@ class CalendarViewController: BaseViewController<CalendarBase> {
         //add form rows
         addFormRow(label: "onChange", view: label)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Hide Container Border", view: containerBorderSwitch)
-        addFormRow(label: "Hide Current Date Indicator", view: hideCurrentDateIndicatorSwitch)
+        addFormRow(label: "Hide Container Border", view: containerBorderSwitch, pinTrailing: false)
+        addFormRow(label: "Hide Current Date Indicator", view: hideCurrentDateIndicatorSwitch, pinTrailing: false)
         addFormRow(label: "Min Date", view: minDatePicker)
         addFormRow(label: "Max Date", view: maxDatePicker)
-        addFormRow(label: "Transparent Background", view: transparentBgSwitch)
+        addFormRow(label: "Transparent Background", view: transparentBgSwitch, pinTrailing: false)
         addFormRow(label: "Active Dates", view: activeDatesField)
         addFormRow(label: "Select ActiveDate", view: activeDatePicker)
-        addFormRow(label: "Clear Active Dates", view: clearActiveDatesSwitch)
+        addFormRow(label: "Clear Active Dates", view: clearActiveDatesSwitch, pinTrailing: false)
         addFormRow(label: "Inactive Dates", view: inactiveDatesField)
         addFormRow(label: "Select InActiveDate", view: inactiveDatePicker)
-        addFormRow(label: "Clear Inactive Dates", view: clearInactiveDatesSwitch)
-        addFormRow(label: "Indicator One", view: indicatorOneSwitch)
-        addFormRow(label: "Indicator Two", view: indicatorTwoSwitch)
-        addFormRow(label: "Indicator Three", view: indicatorThreeSwitch)
+        addFormRow(label: "Clear Inactive Dates", view: clearInactiveDatesSwitch, pinTrailing: false)
+        addFormRow(label: "Indicator One", view: indicatorOneSwitch, pinTrailing: false)
+        addFormRow(label: "Indicator Two", view: indicatorTwoSwitch, pinTrailing: false)
+        addFormRow(label: "Indicator Three", view: indicatorThreeSwitch, pinTrailing: false)
         addFormRow(label: "Legend One", view: legendOneField)
         addFormRow(label: "Legend Two", view: legendTwoField)
         addFormRow(label: "Legend Three", view: legendThreeField)
diff --git a/VDSSample/ViewControllers/CarouselViewController.swift b/VDSSample/ViewControllers/CarouselViewController.swift
index 969c594..89251b3 100644
--- a/VDSSample/ViewControllers/CarouselViewController.swift
+++ b/VDSSample/ViewControllers/CarouselViewController.swift
@@ -80,7 +80,7 @@ class CarouselViewController: BaseViewController<Carousel> {
         addFormRow(label: "Layout", view: layoutPickerSelectorView)
 //        addFormRow(label: "Selected Group Index", view: selectedIndexField)
         addFormRow(label: "Pagination Kind", view: paginationKindPickerSelectorView)
-        addFormRow(label: "Pagination Float", view: paginationFloatingSwitch)
+        addFormRow(label: "Pagination Float", view: paginationFloatingSwitch, pinTrailing: false)
         addFormRow(label: "Pagination Inset", view: paginationInsetField)
         addFormRow(label: "Slot Horizontal Alignment", view: horizAlignmtPickerSelectorView)
         addFormRow(label: "Slot Vertical Alignment", view: vertAlignmtPickerSelectorView)
diff --git a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
index dd7100c..e75a693 100644
--- a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
@@ -31,11 +31,11 @@ class  CheckboxGroupViewController: BaseViewController<CheckboxGroup> {
     override func setupForm(){
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Child Text", view: childTextField)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         
         showErrorSwitch.onChange = { [weak self] sender in
             self?.component.showError = sender.isOn
diff --git a/VDSSample/ViewControllers/CheckboxItemViewController.swift b/VDSSample/ViewControllers/CheckboxItemViewController.swift
index aba9883..2f3a4e3 100644
--- a/VDSSample/ViewControllers/CheckboxItemViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxItemViewController.swift
@@ -30,11 +30,11 @@ class  CheckboxItemViewController: BaseViewController<CheckboxItem> {
     override func setupForm(){
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Child Text", view: childTextField)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         addFormRow(label: "Error Text", view: errorTextField)
         
         showErrorSwitch.onChange = { [weak self] sender in
diff --git a/VDSSample/ViewControllers/CheckboxViewController.swift b/VDSSample/ViewControllers/CheckboxViewController.swift
index 1d28267..4a79d5b 100644
--- a/VDSSample/ViewControllers/CheckboxViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxViewController.swift
@@ -18,7 +18,7 @@ class  CheckboxViewController: BaseViewController<Checkbox> {
     let toggle = UISwitch()
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
@@ -26,9 +26,9 @@ class  CheckboxViewController: BaseViewController<Checkbox> {
     override func setupForm(){
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         addFormRow(label: "Calendar", view: VDS.DatePicker().with {
             $0.calendarModel = .init(minDate: Date().startOfMonth, maxDate: Calendar.current.date(byAdding: .month, value: 2, to: Date())!)
         })
diff --git a/VDSSample/ViewControllers/DatePickerViewController.swift b/VDSSample/ViewControllers/DatePickerViewController.swift
index 3ab8259..66f3591 100644
--- a/VDSSample/ViewControllers/DatePickerViewController.swift
+++ b/VDSSample/ViewControllers/DatePickerViewController.swift
@@ -80,14 +80,14 @@ class DatePickerViewController: BaseViewController<DatePicker> {
     override func setupForm(){
         addFormRow(label: "onChange", view: label)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
-        addFormRow(label: "Read Only", view: readonlySwitch)
-        addFormRow(label: "Required", view: requiredSwitch)
-        addFormRow(label: "Transparent Background", view: transparentBgSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
+        addFormRow(label: "Read Only", view: readonlySwitch, pinTrailing: false)
+        addFormRow(label: "Required", view: requiredSwitch, pinTrailing: false)
+        addFormRow(label: "Transparent Background", view: transparentBgSwitch, pinTrailing: false)
         addFormRow(label: "Date Format", view: dateFormatPickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Helper Text", view: helperTextField)
-        addFormRow(label: "Error", view: .makeWrapper(for: errorSwitch))
+        addFormRow(label: "Error", view: errorSwitch, pinTrailing: false)
         addFormRow(label: "Error Text", view: errorTextField)
         addFormRow(label: "Width", view: widthTextField)
         addFormRow(label: "ToolTip Title", view: tooltipTitleTextField)
@@ -238,19 +238,19 @@ extension DatePickerViewController {
     func getCalendarSection() -> FormSection {
         let section = FormSection()
         section.title = "Calendar Options"
-        section.addFormRow(label: "Hide Container Border", view: containerBorderSwitch)
-        section.addFormRow(label: "Hide Current Date Indicator", view: hideCurrentDateIndicatorSwitch)
+        section.addFormRow(label: "Hide Container Border", view: containerBorderSwitch, pinTrailing: false)
+        section.addFormRow(label: "Hide Current Date Indicator", view: hideCurrentDateIndicatorSwitch, pinTrailing: false)
         section.addFormRow(label: "Min Date", view: minDatePicker)
         section.addFormRow(label: "Max Date", view: maxDatePicker)
         section.addFormRow(label: "Active Dates", view: activeDatesField)
         section.addFormRow(label: "Select ActiveDate", view: activeDatePicker)
-        section.addFormRow(label: "Clear Active Dates", view: clearActiveDatesSwitch)
+        section.addFormRow(label: "Clear Active Dates", view: clearActiveDatesSwitch, pinTrailing: false)
         section.addFormRow(label: "Inactive Dates", view: inactiveDatesField)
         section.addFormRow(label: "Select InActiveDate", view: inactiveDatePicker)
-        section.addFormRow(label: "Clear Inactive Dates", view: clearInactiveDatesSwitch)
-        section.addFormRow(label: "Indicator One", view: indicatorOneSwitch)
-        section.addFormRow(label: "Indicator Two", view: indicatorTwoSwitch)
-        section.addFormRow(label: "Indicator Three", view: indicatorThreeSwitch)
+        section.addFormRow(label: "Clear Inactive Dates", view: clearInactiveDatesSwitch, pinTrailing: false)
+        section.addFormRow(label: "Indicator One", view: indicatorOneSwitch, pinTrailing: false)
+        section.addFormRow(label: "Indicator Two", view: indicatorTwoSwitch, pinTrailing: false)
+        section.addFormRow(label: "Indicator Three", view: indicatorThreeSwitch, pinTrailing: false)
         section.addFormRow(label: "Legend One", view: legendOneField)
         section.addFormRow(label: "Legend Two", view: legendTwoField)
         section.addFormRow(label: "Legend Three", view: legendThreeField)
diff --git a/VDSSample/ViewControllers/DropdownSelectViewController.swift b/VDSSample/ViewControllers/DropdownSelectViewController.swift
index 75077d4..1178e6b 100644
--- a/VDSSample/ViewControllers/DropdownSelectViewController.swift
+++ b/VDSSample/ViewControllers/DropdownSelectViewController.swift
@@ -64,20 +64,20 @@ class DropdownSelectViewController: BaseViewController<DropdownSelect> {
         
     override func setupForm(){
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
-        addFormRow(label: "Read Only", view: readonlySwitch)
-        addFormRow(label: "Required", view: requiredSwitch)
-        addFormRow(label: "Transparent Background", view: transparentBgSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
+        addFormRow(label: "Read Only", view: readonlySwitch, pinTrailing: false)
+        addFormRow(label: "Required", view: requiredSwitch, pinTrailing: false)
+        addFormRow(label: "Transparent Background", view: transparentBgSwitch, pinTrailing: false)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Helper Text Placement", view: helperTextPlacementPickerSelectorView)
         addFormRow(label: "Helper Text", view: helperTextField)
-        addFormRow(label: "Inline Label", view: .makeWrapper(for: inlineLabelSwitch))
-        addFormRow(label: "Error", view: .makeWrapper(for: errorSwitch))
+        addFormRow(label: "Inline Label", view: inlineLabelSwitch, pinTrailing: false)
+        addFormRow(label: "Error", view: errorSwitch, pinTrailing: false)
         addFormRow(label: "Error Text", view: errorTextField)
         addFormRow(label: "Width", view: widthTextField)
         addFormRow(label: "ToolTip Title", view: tooltipTitleTextField)
         addFormRow(label: "ToolTip Content", view: tooltipContentTextField)
-        addFormRow(label: "More Options", view: optionsSwitch)
+        addFormRow(label: "More Options", view: optionsSwitch, pinTrailing: false)
 
         disabledSwitch.onChange = { [weak self] sender in
             self?.component.isEnabled = !sender.isOn
diff --git a/VDSSample/ViewControllers/FootnoteGroupViewController.swift b/VDSSample/ViewControllers/FootnoteGroupViewController.swift
new file mode 100644
index 0000000..65a4cb9
--- /dev/null
+++ b/VDSSample/ViewControllers/FootnoteGroupViewController.swift
@@ -0,0 +1,69 @@
+//
+//  FootnoteGroupViewController.swift
+//  VDSSample
+//
+//  Created by Kanamarlapudi, Vasavi on 29/08/24.
+//
+
+import Foundation
+import UIKit
+import VDS
+
+class FootnoteGroupViewController: BaseViewController<FootnoteGroup> {
+  
+    var widthTextField = NumericField()
+    var percentageTextField = NumericField()
+    var footnotes: [FootnoteItem] = []
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        addContentTopView(view: component, pinTrailing: false)
+        setupPicker()
+        setupModel()
+    }
+    
+    override func setupForm() {
+        super.setupForm()
+        addFormRow(label: "Surface", view: surfacePickerSelectorView)
+        addFormRow(label: "Width", view: widthTextField)
+        addFormRow(label: "Percentage (1-100)", view: percentageTextField)
+        
+        widthTextField
+            .numberPublisher
+            .sink { [weak self] number in
+                if let number {
+                    self?.component.width = .value(number.cgFloatValue)
+                    self?.percentageTextField.text = ""
+                } else {
+                    self?.component.width = nil
+                }
+            }.store(in: &subscribers)
+        
+        percentageTextField
+            .numberPublisher
+            .sink { [weak self] number in
+                if let number, number.intValue > 9 {
+                    self?.component.width = .percentage(number.cgFloatValue)
+                    self?.widthTextField.text = ""
+                } else {
+                    self?.component.width = nil
+                }
+            }.store(in: &subscribers)
+        
+    }
+    
+    func setupModel() {        
+        let toolTipModel = Tooltip.TooltipModel.init(title: "Check your item.", content:"Here is the content for your item.")
+        footnotes.append(.init().with { $0.text = "Offer you best deals on phones, tablets, home, internet and more. Pre order the new version mobiles and get off *T&C apply."; $0.symbolType = "*"; $0.kind = .primary; $0.tooltipModel = toolTipModel})
+        footnotes.append(.init().with { $0.text = "The display has rounded corners. When measured as a standard rectangular shape, the screen is 6.68 inches diagonally. Actual viewable area is less."; $0.symbolType = "**"; $0.kind = .primary})
+        footnotes.append(.init().with { $0.text = "Some features may not be available for all countries or all areas."; $0.symbolType = "1."; $0.kind = .primary})
+        component.footnoteItems = footnotes
+    }
+    
+    func setupPicker() {
+        surfacePickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.surface = item
+            self?.contentTopView.backgroundColor = item.color
+        }
+    }
+}
diff --git a/VDSSample/ViewControllers/FootnoteItemViewController.swift b/VDSSample/ViewControllers/FootnoteItemViewController.swift
new file mode 100644
index 0000000..66eb76b
--- /dev/null
+++ b/VDSSample/ViewControllers/FootnoteItemViewController.swift
@@ -0,0 +1,166 @@
+//
+//  FootnoteViewController.swift
+//  VDSSample
+//
+//  Created by Kanamarlapudi, Vasavi on 21/08/24.
+//
+
+import Foundation
+import UIKit
+import VDS
+
+class FootnoteItemViewController: BaseViewController<FootnoteItem> {
+    
+    internal enum SymbolType: String, DefaultValuing, CaseIterable {
+            case asterisk
+            case doubleAsterisk
+            case character
+            case none
+    
+            public static var defaultValue: Self { .asterisk }
+    
+            /// TextStyle relative to Size.
+            public var text: String {
+                switch self {
+                case .asterisk:
+                    return "*"
+                case .doubleAsterisk:
+                    return  "**"
+                case .character:
+                    return "1."
+                case .none:
+                    return ""
+                }
+            }
+        }
+    
+    lazy var kindPickerSelectorView = {
+        PickerSelectorView(title: "secondary",
+                           picker: self.picker,
+                           items: FootnoteItem.Kind.allCases)
+    }()
+    
+    lazy var symbolTypePickerSelectorView = {
+        PickerSelectorView(title: "asterisk",
+                           picker: self.picker,
+                           items: SymbolType.allCases)
+    }()
+
+    lazy var sizePickerSelectorView = {
+        PickerSelectorView(title: "micro",
+                           picker: self.picker,
+                           items: FootnoteItem.Size.allCases)
+    }()
+
+    var hideSymbolSwitch = Toggle()
+    var footnoteTextField = TextField()
+    var widthTextField = NumericField()
+    var percentageTextField = NumericField()
+    var tooltipTitleTextField = TextField()
+    var tooltipContentTextField = TextField()
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        addContentTopView(view: component, pinTrailing: false)
+        setupPicker()
+        setupModel()
+    }
+    
+    override func setupForm() {
+        super.setupForm()
+        addFormRow(label: "Surface", view: surfacePickerSelectorView)
+        addFormRow(label: "Kind", view: kindPickerSelectorView)
+        addFormRow(label: "Size", view: sizePickerSelectorView)
+        addFormRow(label: "Symbol Type", view: symbolTypePickerSelectorView)
+        addFormRow(label: "Hide Symbol", view: hideSymbolSwitch, pinTrailing: false)
+        addFormRow(label: "Text", view: footnoteTextField)
+        addFormRow(label: "Width", view: widthTextField)
+        addFormRow(label: "Percentage (1-100)", view: percentageTextField)
+        addFormRow(label: "ToolTip Title", view: tooltipTitleTextField)
+        addFormRow(label: "ToolTip Content", view: tooltipContentTextField)
+                
+        hideSymbolSwitch.publisher(for: .valueChanged).sink { [weak self] control in
+            self?.component.hideSymbol = control.isOn
+        }.store(in: &subscribers)
+        
+        footnoteTextField
+            .textPublisher
+            .sink { [weak self] text in
+                self?.component.text = text
+            }.store(in: &subscribers)
+        
+        widthTextField
+            .numberPublisher
+            .sink { [weak self] number in
+                if let number {
+                    self?.component.width = .value(number.cgFloatValue)
+                    self?.percentageTextField.text = ""
+                } else {
+                    self?.component.width = nil
+                }
+            }.store(in: &subscribers)
+        
+        percentageTextField
+            .numberPublisher
+            .sink { [weak self] number in
+                if let number, number.intValue > 9 {
+                    self?.component.width = .percentage(number.cgFloatValue)
+                    self?.widthTextField.text = ""
+                } else {
+                    self?.component.width = nil
+                }
+            }.store(in: &subscribers)
+        
+        tooltipTitleTextField
+            .textPublisher
+            .sink { [weak self] text in
+                self?.updateTooltip()
+            }.store(in: &subscribers)
+
+        tooltipContentTextField
+            .textPublisher
+            .sink { [weak self] text in
+                self?.updateTooltip()
+            }.store(in: &subscribers)
+    }
+    
+    func setupModel() {
+        component.text = "Service is included for free for two years with activation of any iPhone15 model. Connection and response times vary based on location, site conditions, and other factors. See support.apple.com/en-us/HT213885 for more information."
+        component.tooltipModel = nil
+
+        footnoteTextField.text = component.text
+        sizePickerSelectorView.text = component.size.rawValue
+        kindPickerSelectorView.text = component.kind.rawValue
+        symbolTypePickerSelectorView.text = SymbolType.defaultValue.text
+        tooltipTitleTextField.text = component.tooltipModel?.title
+        tooltipContentTextField.text = component.tooltipModel?.content
+    }
+    
+    func setupPicker() {
+        surfacePickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.surface = item
+            self?.contentTopView.backgroundColor = item.color
+        }
+        
+        kindPickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.kind = item
+        }
+        
+        sizePickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.size = item
+        }
+        
+        symbolTypePickerSelectorView.onPickerDidSelect = {  [weak self] item in
+            self?.component.symbolType = item.text
+        }
+    }
+    
+    func updateTooltip() {
+        let title = tooltipTitleTextField.text ?? ""
+        let content = tooltipContentTextField.text ?? ""
+        
+        component.tooltipModel = !title.isEmpty || !content.isEmpty ? .init(title: title,
+                                                                            content: content) : nil
+    }
+    
+}
diff --git a/VDSSample/ViewControllers/IconViewController.swift b/VDSSample/ViewControllers/IconViewController.swift
index 8e3c5cb..56296d5 100644
--- a/VDSSample/ViewControllers/IconViewController.swift
+++ b/VDSSample/ViewControllers/IconViewController.swift
@@ -41,7 +41,7 @@ class IconViewController: BaseViewController<Icon> {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
diff --git a/VDSSample/ViewControllers/InputFieldViewController.swift b/VDSSample/ViewControllers/InputFieldViewController.swift
index 9d0eaee..89af3f5 100644
--- a/VDSSample/ViewControllers/InputFieldViewController.swift
+++ b/VDSSample/ViewControllers/InputFieldViewController.swift
@@ -106,16 +106,16 @@ class  InputFieldViewController: BaseViewController<InputField> {
         }
         
         general.addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        general.addFormRow(label: "Disabled", view: disabledSwitch)
-        general.addFormRow(label: "Read Only", view: readonlySwitch)
-        general.addFormRow(label: "Required", view: requiredSwitch)
-        general.addFormRow(label: "Transparent Background", view: transparentBgSwitch)
+        general.addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
+        general.addFormRow(label: "Read Only", view: readonlySwitch, pinTrailing: false)
+        general.addFormRow(label: "Required", view: requiredSwitch, pinTrailing: false)
+        general.addFormRow(label: "Transparent Background", view: transparentBgSwitch, pinTrailing: false)
         general.addFormRow(label: "Label Text", view: labelTextField)
         general.addFormRow(label: "Helper Text Placement", view: helperTextPlacementPickerSelectorView)
         general.addFormRow(label: "Helper Text", view: helperTextField)
-        general.addFormRow(label: "Error", view: showErrorSwitch)
+        general.addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         general.addFormRow(label: "Error Text", view: errorTextField)
-        general.addFormRow(label: "Success", view: showSuccessSwitch)
+        general.addFormRow(label: "Success", view: showSuccessSwitch, pinTrailing: false)
         general.addFormRow(label: "Success Text", view: successTextField)
         general.addFormRow(label: "Width", view: widthTextField)
         general.addFormRow(label: "ToolTip Title", view: tooltipTitleTextField)
diff --git a/VDSSample/ViewControllers/InputStepperViewController.swift b/VDSSample/ViewControllers/InputStepperViewController.swift
index 559125e..b751e66 100644
--- a/VDSSample/ViewControllers/InputStepperViewController.swift
+++ b/VDSSample/ViewControllers/InputStepperViewController.swift
@@ -62,11 +62,11 @@ class InputStepperViewController: BaseViewController<InputStepper> {
 
         addFormRow(label: "Width Value", view: widthTextField)
         addFormRow(label: "Width Percentage", view: widthPercentageTextField)
-        addFormRow(label: "Disabled", view: disabledSwitch)
-        addFormRow(label: "Read Only", view: readOnlySwitch)
-        addFormRow(label: "Required", view: requiredSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
+        addFormRow(label: "Read Only", view: readOnlySwitch, pinTrailing: false)
+        addFormRow(label: "Required", view: requiredSwitch, pinTrailing: false)
         addFormRow(label: "Label Text", view: labelTextField)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         addFormRow(label: "Error Text", view: errorTextField)
         addFormRow(label: "Helper Text Placement", view: helperTextPlacementPickerSelectorView)
         addFormRow(label: "Helper Text", view: helperTextField)
diff --git a/VDSSample/ViewControllers/LabelViewController.swift b/VDSSample/ViewControllers/LabelViewController.swift
index bdbe875..75f62c2 100644
--- a/VDSSample/ViewControllers/LabelViewController.swift
+++ b/VDSSample/ViewControllers/LabelViewController.swift
@@ -145,8 +145,8 @@ class LabelViewController: BaseViewController<Label> {
         
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Disabled", view: disabledSwitch)
-        addFormRow(label: "Bold", view: boldSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
+        addFormRow(label: "Bold", view: boldSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
 
         //Scaled Fonts implementation
diff --git a/VDSSample/ViewControllers/LoaderViewController.swift b/VDSSample/ViewControllers/LoaderViewController.swift
index 8b8c9f3..c58e051 100644
--- a/VDSSample/ViewControllers/LoaderViewController.swift
+++ b/VDSSample/ViewControllers/LoaderViewController.swift
@@ -23,10 +23,10 @@ class LoaderViewController: BaseViewController<Loader>, LoaderLaunchable {
     override func setupForm() {
         super.setupForm()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Active", view: isActive)
+        addFormRow(label: "Active", view: isActive, pinTrailing: false)
         
         let fullScreen = FormSection().with { $0.title = "LoaderLaunchable (separate from Loader)" }
-        fullScreen.addFormRow(label: "presentLoader", view: isFullscreen)
+        fullScreen.addFormRow(label: "presentLoader", view: isFullscreen, pinTrailing: false)
         append(section: fullScreen)
         
         isActive
diff --git a/VDSSample/ViewControllers/MenuViewController.swift b/VDSSample/ViewControllers/MenuViewController.swift
index 00bf63c..77ab906 100644
--- a/VDSSample/ViewControllers/MenuViewController.swift
+++ b/VDSSample/ViewControllers/MenuViewController.swift
@@ -82,6 +82,8 @@ class MenuViewController: UITableViewController, TooltipLaunchable {
         MenuComponent(title: "CheckboxGroup", completed: true, viewController: CheckboxGroupViewController.self),
         MenuComponent(title: "DatePicker", completed: true, viewController: DatePickerViewController.self),
         MenuComponent(title: "DropdownSelect", completed: true, viewController: DropdownSelectViewController.self),
+        MenuComponent(title: "FootnoteItem", completed: true, viewController: FootnoteItemViewController.self),
+        MenuComponent(title: "FootnoteGroup", completed: true, viewController: FootnoteGroupViewController.self),
         MenuComponent(title: "Icon", completed: true, viewController: IconViewController.self),
         MenuComponent(title: "InputField", completed: true, viewController: InputFieldViewController.self),
         MenuComponent(title: "InputStepper", completed: true, viewController: InputStepperViewController.self),
diff --git a/VDSSample/ViewControllers/NotificationViewController.swift b/VDSSample/ViewControllers/NotificationViewController.swift
index 4f71d7e..8504133 100644
--- a/VDSSample/ViewControllers/NotificationViewController.swift
+++ b/VDSSample/ViewControllers/NotificationViewController.swift
@@ -52,8 +52,8 @@ class NotificationViewController: BaseViewController<VDS.Notification> {
         addFormRow(label: "Style", view: notificationTypePickerSelectorView)
         addFormRow(label: "Title", view: titleTextField)
         addFormRow(label: "SubTitle", view: subTitleTextField)
-        addFormRow(label: "Hide Button Group", view: buttonGroupToggle)
-        addFormRow(label: "Hide Close Button", view: hideCloseButtonToggle)
+        addFormRow(label: "Hide Button Group", view: buttonGroupToggle, pinTrailing: false)
+        addFormRow(label: "Hide Close Button", view: hideCloseButtonToggle, pinTrailing: false)
         addFormRow(label: "Action", view: label)
         addFormRow(label: "First Button Text", view: firstButtonTextField)
         addFormRow(label: "Second Button Text", view: secondButtonTextField)
diff --git a/VDSSample/ViewControllers/PriceLockupViewController.swift b/VDSSample/ViewControllers/PriceLockupViewController.swift
index 880aae9..1a2b59c 100644
--- a/VDSSample/ViewControllers/PriceLockupViewController.swift
+++ b/VDSSample/ViewControllers/PriceLockupViewController.swift
@@ -51,14 +51,14 @@ class PriceLockupViewController: BaseViewController<PriceLockup> {
     override func setupForm() {
         super.setupForm()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Bold", view: boldSwitch)
+        addFormRow(label: "Bold", view: boldSwitch, pinTrailing: false)
         addFormRow(label: "Kind", view: kindPickerSelectorView)
         addFormRow(label: "Size", view: sizePickerSelectorView)
-        addFormRow(label: "Hide Currency", view: hideCurrencySwitch)
+        addFormRow(label: "Hide Currency", view: hideCurrencySwitch, pinTrailing: false)
         addFormRow(label: "Price", view: priceTextField)
         addFormRow(label: "Leading Text", view: leadingTextField)
-        addFormRow(label: "Strikethrough", view: strikethroughSwitch)
-        addFormRow(label: "Uniform Size", view: uniformSizeSwitch)
+        addFormRow(label: "Strikethrough", view: strikethroughSwitch, pinTrailing: false)
+        addFormRow(label: "Uniform Size", view: uniformSizeSwitch, pinTrailing: false)
         addFormRow(label: "Term", view: termPickerSelectorView)
         addFormRow(label: "Trailing Text", view: trailingTextField)
         addFormRow(label: "Superscript", view: superscriptTextField)
diff --git a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
index fc458bf..94c9cfa 100644
--- a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
@@ -31,9 +31,9 @@ class  RadioBoxGroupViewController: BaseViewController<RadioBoxGroup>{
     override func setupForm(){
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Strikethrough", view: strikeThroughSwitch)
+        addFormRow(label: "Strikethrough", view: strikeThroughSwitch, pinTrailing: false)
         addFormRow(label: "Text", view: textField)
         addFormRow(label: "Sub Text", view: subTextField)
         addFormRow(label: "Sub Text Right", view: subTextRightField)
diff --git a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
index 1a9a6d8..67e2d8a 100644
--- a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
@@ -29,11 +29,11 @@ class  RadioButtonGroupViewController: BaseViewController<RadioButtonGroup> {
     override func setupForm(){
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Child Text", view: childTextField)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         
         showErrorSwitch.onChange = { [weak self] sender in
             self?.component.showError = sender.isOn
diff --git a/VDSSample/ViewControllers/RadioButtonItemViewController.swift b/VDSSample/ViewControllers/RadioButtonItemViewController.swift
index db25eca..b84ce1c 100644
--- a/VDSSample/ViewControllers/RadioButtonItemViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonItemViewController.swift
@@ -30,11 +30,11 @@ class  RadioButtonItemViewController: BaseViewController<RadioButtonItem> {
     override func setupForm(){
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Child Text", view: childTextField)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         addFormRow(label: "Error Text", view: errorTextField)
         
         showErrorSwitch.onChange = { [weak self] sender in
diff --git a/VDSSample/ViewControllers/RadioButtonViewController.swift b/VDSSample/ViewControllers/RadioButtonViewController.swift
index 17eb1c9..d8d2193 100644
--- a/VDSSample/ViewControllers/RadioButtonViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonViewController.swift
@@ -18,16 +18,16 @@ class  RadioButtonViewController: BaseViewController<RadioButton> {
     let toggle = UISwitch()
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
     override func setupForm(){
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         
         showErrorSwitch.onChange = { [weak self] sender in
             guard let self else { return }
diff --git a/VDSSample/ViewControllers/TableViewController.swift b/VDSSample/ViewControllers/TableViewController.swift
index f645f00..767a359 100644
--- a/VDSSample/ViewControllers/TableViewController.swift
+++ b/VDSSample/ViewControllers/TableViewController.swift
@@ -59,10 +59,10 @@ class TableViewController: BaseViewController<Table> {
         super.setupForm()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Padding", view: paddingPicker)
-        addFormRow(label: "Striped", view: striped)
+        addFormRow(label: "Striped", view: striped, pinTrailing: false)
         addFormRow(label: "Header line style", view: headerLineStylePicker)
         addFormRow(label: "Row line style", view: rowLineStylePicker)
-        addFormRow(label: "Fill container", view: fillContainer)
+        addFormRow(label: "Fill container", view: fillContainer, pinTrailing: false)
         addFormRow(label: "Custom column size", view: customColumnWidthSize)
         
         fillContainer.isOn = component.fillContainer
diff --git a/VDSSample/ViewControllers/TabsContainerViewController.swift b/VDSSample/ViewControllers/TabsContainerViewController.swift
index 5979508..62bf6a4 100644
--- a/VDSSample/ViewControllers/TabsContainerViewController.swift
+++ b/VDSSample/ViewControllers/TabsContainerViewController.swift
@@ -59,8 +59,8 @@ class TabsContainerViewController: BaseViewController<TabsContainer> {
     
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Large Sample", view: sampleSwitch)
-        addFormRow(label: "Show Borderline", view: borderlineSwitch)
+        addFormRow(label: "Large Sample", view: sampleSwitch, pinTrailing: false)
+        addFormRow(label: "Show Borderline", view: borderlineSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Size", view: sizePickerSelectorView)
         
@@ -72,7 +72,7 @@ class TabsContainerViewController: BaseViewController<TabsContainer> {
         }
         
         //only in horizontal mode
-        horizontalOrientationFormStackView.addFormRow(label: "Fill Container", view: fillContainerSwitch)
+        horizontalOrientationFormStackView.addFormRow(label: "Fill Container", view: fillContainerSwitch, pinTrailing: false)
         horizontalOrientationFormStackView.addFormRow(label: "Indicator Position", view: indicatorPositionPickerSelectorView)
         overflowRow = horizontalOrientationFormStackView.addFormRow(label: "Overflow", view: overflowPickerSelectorView)
         
diff --git a/VDSSample/ViewControllers/TabsViewController.swift b/VDSSample/ViewControllers/TabsViewController.swift
index 70f5226..0b4406b 100644
--- a/VDSSample/ViewControllers/TabsViewController.swift
+++ b/VDSSample/ViewControllers/TabsViewController.swift
@@ -59,8 +59,8 @@ class TabsViewController: BaseViewController<Tabs> {
     
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Large Sample", view: sampleSwitch)
-        addFormRow(label: "Show Borderline", view: borderlineSwitch)
+        addFormRow(label: "Large Sample", view: sampleSwitch, pinTrailing: false)
+        addFormRow(label: "Show Borderline", view: borderlineSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Size", view: sizePickerSelectorView)
         
@@ -69,7 +69,7 @@ class TabsViewController: BaseViewController<Tabs> {
         }
 
         //only in horizontal mode
-        horizontalOrientationFormStackView.addFormRow(label: "Fill Container", view: fillContainerSwitch)
+        horizontalOrientationFormStackView.addFormRow(label: "Fill Container", view: fillContainerSwitch, pinTrailing: false)
         horizontalOrientationFormStackView.addFormRow(label: "Indicator Position", view: indicatorPositionPickerSelectorView)
         //overflowRow = horizontalOrientationFormStackView.addFormRow(label: "Overflow", view: overflowPickerSelectorView)
 
diff --git a/VDSSample/ViewControllers/TextAreaViewController.swift b/VDSSample/ViewControllers/TextAreaViewController.swift
index 0870bad..4ab696d 100644
--- a/VDSSample/ViewControllers/TextAreaViewController.swift
+++ b/VDSSample/ViewControllers/TextAreaViewController.swift
@@ -42,13 +42,13 @@ class  TextAreaViewController: BaseViewController<TextArea> {
     override func setupForm(){
         super.setupForm()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
-        addFormRow(label: "Read Only", view: readOnlySwitch)
-        addFormRow(label: "Required", view: requiredSwitch)
-        addFormRow(label: "Transparent Background", view: transparentBgSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
+        addFormRow(label: "Read Only", view: readOnlySwitch, pinTrailing: false)
+        addFormRow(label: "Required", view: requiredSwitch, pinTrailing: false)
+        addFormRow(label: "Transparent Background", view: transparentBgSwitch, pinTrailing: false)
         addFormRow(label: "Label Text", view: labelTextField)
         addFormRow(label: "Helper Text", view: helperTextField)
-        addFormRow(label: "Error", view: showErrorSwitch)
+        addFormRow(label: "Error", view: showErrorSwitch, pinTrailing: false)
         addFormRow(label: "Error Text", view: errorTextField)
         addFormRow(label: "Width", view: widthTextField)
         addFormRow(label: "ToolTip Title", view: tooltipTitleTextField)
diff --git a/VDSSample/ViewControllers/TextLinkCaretViewController.swift b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
index 759038e..84e12ab 100644
--- a/VDSSample/ViewControllers/TextLinkCaretViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
@@ -34,7 +34,7 @@ class TextLinkCaretViewController: BaseViewController<TextLinkCaret> {
         super.setupForm()  
         addFormRow(label: "Action", view: label)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Label", view: textField)
         addFormRow(label: "Caret Position", view: caretPositionPickerSelectorView)
         
diff --git a/VDSSample/ViewControllers/TextLinkViewController.swift b/VDSSample/ViewControllers/TextLinkViewController.swift
index 5ce652d..37519f4 100644
--- a/VDSSample/ViewControllers/TextLinkViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkViewController.swift
@@ -36,7 +36,7 @@ class TextLinkViewController: BaseViewController<TextLink> {
         super.setupForm()  
         addFormRow(label: "Action", view: label)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Label", view: textField)
         addFormRow(label: "Size", view: buttonSizePickerSelectorView)
         
diff --git a/VDSSample/ViewControllers/TileContainerViewController.swift b/VDSSample/ViewControllers/TileContainerViewController.swift
index 4edbace..d01ff6e 100644
--- a/VDSSample/ViewControllers/TileContainerViewController.swift
+++ b/VDSSample/ViewControllers/TileContainerViewController.swift
@@ -186,7 +186,7 @@ class TileContainerViewController: BaseViewController<TileContainer> {
         component.color = .secondary
         component.accessibilityLabel = "Tile Container"
 
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component, pinTrailing: false)
         component.addContentView(mainView)
         setupPicker()
         setupModel()
@@ -202,12 +202,12 @@ class TileContainerViewController: BaseViewController<TileContainer> {
             $0.text = "For testing max width is limited to 85% of view's width & 65% view's height."
         })
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Is Link", view: isLinkSwitch)
-        addFormRow(label: "Clickable", view: clickableSwitch)
+        addFormRow(label: "Is Link", view: isLinkSwitch, pinTrailing: false)
+        addFormRow(label: "Clickable", view: clickableSwitch, pinTrailing: false)
         addFormRow(label: "Width", view: widthTextField)
         addFormRow(label: "Height", view: heightTextField)
-        addFormRow(label: "Show Border", view: showBorderSwitch)
-        addFormRow(label: "Show Drop Shadow", view: showDropShadowSwitch)
+        addFormRow(label: "Show Border", view: showBorderSwitch, pinTrailing: false)
+        addFormRow(label: "Show Drop Shadow", view: showDropShadowSwitch, pinTrailing: false)
         addFormRow(label: "Background Color", view: backgroundColorPickerSelectorView)
         
         backgroundColorTokenFormStackView.addFormRow(label: "Token", view: backgroundColorTokenColorView)
@@ -224,7 +224,7 @@ class TileContainerViewController: BaseViewController<TileContainer> {
             rowView.alignment = .top
         }
         addFormRow(label: "Aspect Ratio", view: scalingTypePickerSelectorView)
-        addFormRow(label: "Background Image", view: showBackgroundImageSwitch)
+        addFormRow(label: "Background Image", view: showBackgroundImageSwitch, pinTrailing: false)
         addFormRow(label: "Image Fallback Color", view: imageFallbackColorPickerSelectorView)
         addFormRow(label: "Background Effect", view: backgroundEffectSelectorView)
         //Gradient Section
diff --git a/VDSSample/ViewControllers/TileletViewController.swift b/VDSSample/ViewControllers/TileletViewController.swift
index 756ebfe..dce6151 100644
--- a/VDSSample/ViewControllers/TileletViewController.swift
+++ b/VDSSample/ViewControllers/TileletViewController.swift
@@ -317,7 +317,7 @@ class TileletViewController: BaseViewController<Tilelet> {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component))
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
@@ -326,8 +326,8 @@ class TileletViewController: BaseViewController<Tilelet> {
         super.setupForm()
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addActionRow()
-        addFormRow(label: "Is Link", view: isLinkSwitch)
-        addFormRow(label: "Clickable", view: clickableSwitch)
+        addFormRow(label: "Is Link", view: isLinkSwitch, pinTrailing: false)
+        addFormRow(label: "Clickable", view: clickableSwitch, pinTrailing: false)
                 
         addFormRow(label: "Aspect Ratio", view: scalingTypePickerSelectorView)
         addFormRow(label: "Padding", view: paddingPickerSelectorView)
@@ -345,8 +345,8 @@ class TileletViewController: BaseViewController<Tilelet> {
         append(section: backgroundColorFormStackView)
 
         
-        addFormRow(label: "Background Image", view: showBackgroundImageSwitch)
-        addFormRow(label: "Show Drop Shadow", view: showDropShadowSwitch)
+        addFormRow(label: "Background Image", view: showBackgroundImageSwitch, pinTrailing: false)
+        addFormRow(label: "Show Drop Shadow", view: showDropShadowSwitch, pinTrailing: false)
         addFormRow(label: "Image Fallback Color", view: imageFallbackColorPickerSelectorView)
         addFormRow(label: "Background Effect", view: backgroundEffectSelectorView)
         //Gradient Section
@@ -365,7 +365,7 @@ class TileletViewController: BaseViewController<Tilelet> {
         append(section: .init().with({
             $0.title = "Eyebrow"
             $0.addFormRow(label: "Text Style", tooltip: .init(title: "Text Style", content: "Eyebrow and Subtitle will share the same textStyle."), view: otherStandardStylePickerSelectorView)
-            $0.addFormRow(label: "is Bold", view: eyebrowIsBold)
+            $0.addFormRow(label: "is Bold", view: eyebrowIsBold, pinTrailing: false)
             $0.addFormRow(label: "Text", view: eyebrowTextField)
             $0.addFormRow(label: "Color", view: eyebrowColorPickerSelectorView)
         }))
@@ -378,7 +378,7 @@ class TileletViewController: BaseViewController<Tilelet> {
         append(section: .init().with({
             $0.title = "Title"
             $0.addFormRow(label: "Text Style", view: titleStandardStylePickerSelectorView)
-            $0.addFormRow(label: "is Bold", view: titleIsBold)
+            $0.addFormRow(label: "is Bold", view: titleIsBold, pinTrailing: false)
             $0.addFormRow(label: "Text", view: titleTextField)
             $0.addFormRow(label: "Color", view: titleColorPickerSelectorView)
         }))
@@ -399,7 +399,7 @@ class TileletViewController: BaseViewController<Tilelet> {
 
         append(section: .init().with({
             $0.title = "Description Icon "
-            $0.addFormRow(label: "Show", view: showDescriptionIconSwitch)
+            $0.addFormRow(label: "Show", view: showDescriptionIconSwitch, pinTrailing: false)
         }))
         append(section: descriptionIconFormStackView)
         descriptionIconFormStackView.addFormRow(label: "Icon", view: descriptionNamePickerSelectorView)
@@ -414,7 +414,7 @@ class TileletViewController: BaseViewController<Tilelet> {
         
         append(section: .init().with({
             $0.title = "Directional Icon"
-            $0.addFormRow(label: "Show", view: showDirectionalIconSwitch)
+            $0.addFormRow(label: "Show", view: showDirectionalIconSwitch, pinTrailing: false)
         }))
         append(section: directionalIconFormStackView)
         directionalIconFormStackView.addFormRow(label: "Icon", view: directionIconPickerSelectorView)
diff --git a/VDSSample/ViewControllers/TitleLockupViewController.swift b/VDSSample/ViewControllers/TitleLockupViewController.swift
index 16702e4..5a499b5 100644
--- a/VDSSample/ViewControllers/TitleLockupViewController.swift
+++ b/VDSSample/ViewControllers/TitleLockupViewController.swift
@@ -149,7 +149,7 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
         append(section: .init().with({
             $0.title = "\nEyebrow"
             $0.addFormRow(label: "TextStyle (Subtitle)", view: otherStandardStylePickerSelectorView)
-            $0.addFormRow(label: "is Bold", view: eyebrowIsBold)
+            $0.addFormRow(label: "is Bold", view: eyebrowIsBold, pinTrailing: false)
             $0.addFormRow(label: "Text", view: eyebrowTextField)
             $0.addFormRow(label: "Color", view: eyebrowColorPickerSelectorView)
         }))
@@ -162,7 +162,7 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
         append(section: .init().with({
             $0.title = "\nTitle"
             $0.addFormRow(label: "TextStyle", view: titleStandardStylePickerSelectorView)
-            $0.addFormRow(label: "is Bold", view: titleIsBold)
+            $0.addFormRow(label: "is Bold", view: titleIsBold, pinTrailing: false)
             $0.addFormRow(label: "Text", view: titleTextField)
             $0.addFormRow(label: "Color", view: titleColorPickerSelectorView)
         }))
diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift
index e0ff546..defc607 100644
--- a/VDSSample/ViewControllers/ToggleViewController.swift
+++ b/VDSSample/ViewControllers/ToggleViewController.swift
@@ -36,7 +36,7 @@ class ToggleViewController: BaseViewController<Toggle> {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: component.makeWrapper(edgeSpacing: 16.0), edgeSpacing: 0)
+        addContentTopView(view: component, pinTrailing: false)
 
         setupPicker()
     }
@@ -44,12 +44,12 @@ class ToggleViewController: BaseViewController<Toggle> {
     override func setupForm() {
         super.setupForm()
         addActionRow()
-        addFormRow(label: "Show Text", view: showTextSwitch)
+        addFormRow(label: "Show Text", view: showTextSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         
         //add the hidden elements to textFormStackView
-        textFormStackView.addFormRow(label: "Bold", view: boldSwitch)
+        textFormStackView.addFormRow(label: "Bold", view: boldSwitch, pinTrailing: false)
         textFormStackView.addFormRow(label: "Text Size", view: textSizePickerSelectorView)
         textFormStackView.addFormRow(label: "Text Position", view: textPositionPickerSelectorView)
         textFormStackView.addFormRow(label: "On Text", view: onTextField)
diff --git a/VDSSample/ViewControllers/TooltipViewController.swift b/VDSSample/ViewControllers/TooltipViewController.swift
index 1463712..df77805 100644
--- a/VDSSample/ViewControllers/TooltipViewController.swift
+++ b/VDSSample/ViewControllers/TooltipViewController.swift
@@ -32,15 +32,14 @@ class  TooltipViewController: BaseViewController<Tooltip> {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
-        
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
     
     override func setupForm(){
         super.setupForm()
-        addFormRow(label: "Disabled", view: disabledSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Size", view: sizePickerSelectorView)
         addFormRow(label: "FillColor", view: fillColorPickerSelectorView)
diff --git a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
index c61fbdd..a3490e7 100644
--- a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
+++ b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
@@ -40,16 +40,15 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
-
+        addContentTopView(view: component, pinTrailing: false)
         setupPicker()
         setupModel()
     }
     
     override func setupForm(){
         super.setupForm()  
-        addFormRow(label: "Disabled", view: disabledSwitch)
-        addFormRow(label: "Bold", view: boldSwitch)
+        addFormRow(label: "Disabled", view: disabledSwitch, pinTrailing: false)
+        addFormRow(label: "Bold", view: boldSwitch, pinTrailing: false)
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
         addFormRow(label: "Text Alignment", view: textAlignmentPickerSelectorView)
         addFormRow(label: "Font Category", view: fontCategoryPickerSelectorView)