diff --git a/VDS/BaseClasses/Selector/SelectorGroupBase.swift b/VDS/BaseClasses/Selector/SelectorGroupBase.swift
index 5c6cacef..1543ba8d 100644
--- a/VDS/BaseClasses/Selector/SelectorGroupBase.swift
+++ b/VDS/BaseClasses/Selector/SelectorGroupBase.swift
@@ -106,7 +106,11 @@ open class SelectorGroupBase<SelectorItemType: Control>: Control, SelectorGroup,
         super.setup()
         
         addSubview(mainStackView)
-        mainStackView.pinToSuperView()
+        mainStackView
+            .pinTop()
+            .pinLeading()
+            .pinTrailing()
+            .pinBottom(0, .defaultHigh)
     }
     
     /// Handler for the Group to override on a select event.
diff --git a/VDS/BaseClasses/Selector/SelectorItemBase.swift b/VDS/BaseClasses/Selector/SelectorItemBase.swift
index 1745ae65..9ca86d8c 100644
--- a/VDS/BaseClasses/Selector/SelectorItemBase.swift
+++ b/VDS/BaseClasses/Selector/SelectorItemBase.swift
@@ -178,7 +178,11 @@ open class SelectorItemBase<Selector: SelectorControlable>: Control, Errorable,
         selectorStackView.addArrangedSubview(selectorLabelStackView)
         selectorLabelStackView.addArrangedSubview(label)
         selectorLabelStackView.addArrangedSubview(childLabel)
-        mainStackView.pinToSuperView()
+        mainStackView
+            .pinTop()
+            .pinLeading()
+            .pinTrailing()
+            .pinBottom(0, .defaultHigh)
     }
             
     /// Used to make changes to the View based off a change events or from local properties.
diff --git a/VDS/Components/RadioButton/RadioButtonGroup.swift b/VDS/Components/RadioButton/RadioButtonGroup.swift
index c0d7a433..c33a376e 100644
--- a/VDS/Components/RadioButton/RadioButtonGroup.swift
+++ b/VDS/Components/RadioButton/RadioButtonGroup.swift
@@ -73,18 +73,6 @@ open class RadioButtonGroup: SelectorGroupBase<RadioButtonItem>, SelectorGroupSi
         }
     }
     
-    //--------------------------------------------------
-    // MARK: - Overrides
-    //--------------------------------------------------
-    /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
-    open override func setup() {
-        super.setup()
-        
-        addSubview(mainStackView)
-        
-        mainStackView.pinToSuperView()
-    }
-    
     public override func didSelect(_ selectedControl: RadioButtonItem) {
         if let selectedItem {
             updateToggle(selectedItem)