diff --git a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
index c1fcc75..e3a0cbf 100644
--- a/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
+++ b/VDSSample/ViewControllers/BadgeIndicatorViewController.swift
@@ -67,9 +67,6 @@ class  BadgeIndicatorViewController: BaseViewController<BadgeIndicator> {
     var horizontalPaddingTextField = NumericField()
     var verticalPaddingTextField = NumericField()
     var dotSizeTextField = NumericField()
-
-    override func allTextFields() -> [TextField]? { [textField, heightTextField, widthTextField, horizontalPaddingTextField, verticalPaddingTextField, dotSizeTextField, leadingCharacterTextField] }
-
     
     var numberedForm = FormSection().with { $0.title = "Numbered Kind"}
     var dotForm = FormSection().with { $0.title = "Simple Kind"}
diff --git a/VDSSample/ViewControllers/BadgeViewController.swift b/VDSSample/ViewControllers/BadgeViewController.swift
index e1c55fe..c81d6da 100644
--- a/VDSSample/ViewControllers/BadgeViewController.swift
+++ b/VDSSample/ViewControllers/BadgeViewController.swift
@@ -51,9 +51,7 @@ class  BadgeViewController: BaseViewController<Badge> {
     
     var textField = TextField()
     var maxWidthTextField = NumericField()
-    
-    override func allTextFields() -> [TextField]? { [textField, maxWidthTextField] }
-    
+        
     override func viewDidLoad() {
         super.viewDidLoad()
         addContentTopView(view: .makeWrapper(for: component))
diff --git a/VDSSample/ViewControllers/BaseViewController.swift b/VDSSample/ViewControllers/BaseViewController.swift
index 2702453..d1be863 100644
--- a/VDSSample/ViewControllers/BaseViewController.swift
+++ b/VDSSample/ViewControllers/BaseViewController.swift
@@ -72,7 +72,7 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable {
     }
     
     private let edgeSpacing = 16.0
-
+    
     //--------------------------------------------------
     // MARK: - Combine Properties
     //--------------------------------------------------
@@ -237,14 +237,14 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable {
     func keyboardWillShow(notification: UIKit.Notification) {
         if let keyboardSize = (notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue {
             if let activeTextField, self.view.frame.origin.y == 0, isViewHiddenByKeyboard(view: activeTextField, keyboardFrame: keyboardSize) {
-                self.view.frame.origin.y -= keyboardSize.height
+                view.frame.origin.y -= keyboardSize.height
             }
         }
     }
     
     func keyboardWillHide(notification: UIKit.Notification) {
         if self.view.frame.origin.y != 0 {
-            self.view.frame.origin.y = 0
+            view.frame.origin.y = 0
         }
     }
 
@@ -284,7 +284,7 @@ public class BaseViewController<Component: UIView>: UIViewController, Initable {
     
     open func setup() {
         
-        if let textFields = allTextFields() {
+        if let textFields = allTextFields()?.filter({ $0.isKind(of: TextField.self) == false || $0.isKind(of: NumericField.self) }) {
             for textField in textFields {
                 let keypadToolbar: UIToolbar = UIToolbar()
                 
diff --git a/VDSSample/ViewControllers/ButtonGroupViewController.swift b/VDSSample/ViewControllers/ButtonGroupViewController.swift
index 3d2222b..35f2d39 100644
--- a/VDSSample/ViewControllers/ButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/ButtonGroupViewController.swift
@@ -68,8 +68,6 @@ class ButtonGroupViewController: BaseViewController<ButtonGroup> {
     let largeLabel = Label().with{ $0.text = "Large Button Group"; $0.textStyle = .boldTitleSmall }
     let smallLabel = Label().with{ $0.text = "Small Button Group"; $0.textStyle = .boldTitleSmall }
 
-    override func allTextFields() -> [TextField]? { [widthTextField, percentageTextField] }
-
     override func viewDidLoad() {
         super.viewDidLoad()
         
diff --git a/VDSSample/ViewControllers/ButtonIconViewController.swift b/VDSSample/ViewControllers/ButtonIconViewController.swift
index 48c5f77..37c6d4c 100644
--- a/VDSSample/ViewControllers/ButtonIconViewController.swift
+++ b/VDSSample/ViewControllers/ButtonIconViewController.swift
@@ -43,16 +43,14 @@ class ButtonIconViewController: BaseViewController<ButtonIcon> {
                            items: ButtonIcon.Size.allCases)
     }()
     
-    var customSizeField = TextField()
-    var centerX = TextField()
-    var centerY = TextField()
+    var customSizeField = NumericField()
+    var centerX = NumericField()
+    var centerY = NumericField()
     var fitToIcon = Toggle()
     var floating = Toggle()
     var hideBorder = Toggle()
     var disabledSwitch = Toggle()
 
-    override func allTextFields() -> [TextField]? { [customSizeField, centerX, centerY] }
-
     override func viewDidLoad() {
         super.viewDidLoad()
         addContentTopView(view: .makeWrapper(for: component, edgeSpacing: 16.0), edgeSpacing: 0.0)
diff --git a/VDSSample/ViewControllers/ButtonViewController.swift b/VDSSample/ViewControllers/ButtonViewController.swift
index 07f0b84..b8a99a1 100644
--- a/VDSSample/ViewControllers/ButtonViewController.swift
+++ b/VDSSample/ViewControllers/ButtonViewController.swift
@@ -37,8 +37,6 @@ class ButtonViewController: BaseViewController<Button> {
         setupModel()
     }
     
-    override func allTextFields() -> [TextField]? { [textField, widthTextField] }
-
     override func setupForm(){
         super.setupForm()  
         addFormRow(label: "Button Action", view: label)
diff --git a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
index e987a3f..9224816 100644
--- a/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/CheckBoxGroupViewController.swift
@@ -28,8 +28,6 @@ class  CheckboxGroupViewController: BaseViewController<CheckboxGroup> {
         setupModel()
     }
     
-    override func allTextFields() -> [TextField]? { [labelTextField, childTextField] }
-
     override func setupForm() {
         super.setupForm()
         addFormRow(label: "Disabled", view: disabledSwitch)
diff --git a/VDSSample/ViewControllers/CheckboxItemViewController.swift b/VDSSample/ViewControllers/CheckboxItemViewController.swift
index 9c5433c..b6debe4 100644
--- a/VDSSample/ViewControllers/CheckboxItemViewController.swift
+++ b/VDSSample/ViewControllers/CheckboxItemViewController.swift
@@ -27,8 +27,6 @@ class  CheckboxItemViewController: BaseViewController<CheckboxItem> {
         setupModel()
     }
     
-    override func allTextFields() -> [TextField]? { [labelTextField, childTextField, errorTextField] }
-
     override func setupForm(){
         super.setupForm()  
         addFormRow(label: "Disabled", view: disabledSwitch)
diff --git a/VDSSample/ViewControllers/IconViewController.swift b/VDSSample/ViewControllers/IconViewController.swift
index 6f1fa09..8340b81 100644
--- a/VDSSample/ViewControllers/IconViewController.swift
+++ b/VDSSample/ViewControllers/IconViewController.swift
@@ -31,10 +31,8 @@ class IconViewController: BaseViewController<Icon> {
                            items: Icon.Size.allCases)
     }()
     
-    var customSizeField = TextField()
+    var customSizeField = NumericField()
     
-    override func allTextFields() -> [TextField]? { [customSizeField] }
-
     override func viewDidLoad() {
         super.viewDidLoad()
         addContentTopView(view: .makeWrapper(for: component))
diff --git a/VDSSample/ViewControllers/InputFieldViewController.swift b/VDSSample/ViewControllers/InputFieldViewController.swift
index 1373ad5..847bb89 100644
--- a/VDSSample/ViewControllers/InputFieldViewController.swift
+++ b/VDSSample/ViewControllers/InputFieldViewController.swift
@@ -37,9 +37,7 @@ class  InputFieldViewController: BaseViewController<InputField> {
         setupPicker()
         setupModel()
     }
-    
-    override func allTextFields() -> [TextField]? { [labelTextField, errorTextField, successTextField, helperTextField, widthTextField, tooltipTitleTextField, tooltipContentTextField] }
-    
+        
     override func setupForm(){
         super.setupForm()  
         addFormRow(label: "Disabled", view: disabledSwitch)
diff --git a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
index 01db660..e0c6c2f 100644
--- a/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioBoxGroupViewController.swift
@@ -27,9 +27,7 @@ class  RadioBoxGroupViewController: BaseViewController<RadioBoxGroup>{
         setupPicker()
         setupModel()
     }
-    
-    override func allTextFields() -> [TextField]? { [textField, subTextField, subTextRightField] }
-    
+        
     override func setupForm() {
         super.setupForm()
         addFormRow(label: "Disabled", view: disabledSwitch)
diff --git a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
index d978c35..5437034 100644
--- a/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonGroupViewController.swift
@@ -26,8 +26,6 @@ class  RadioButtonGroupViewController: BaseViewController<RadioButtonGroup> {
         setupModel()
     }
     
-    override func allTextFields() -> [TextField]? { [labelTextField, childTextField] }
-
     override func setupForm() {
         super.setupForm()
         addFormRow(label: "Disabled", view: disabledSwitch)
diff --git a/VDSSample/ViewControllers/RadioButtonItemViewController.swift b/VDSSample/ViewControllers/RadioButtonItemViewController.swift
index 2c9dc20..4b70e85 100644
--- a/VDSSample/ViewControllers/RadioButtonItemViewController.swift
+++ b/VDSSample/ViewControllers/RadioButtonItemViewController.swift
@@ -27,8 +27,6 @@ class  RadioButtonItemViewController: BaseViewController<RadioButtonItem> {
         setupModel()
     }
     
-    override func allTextFields() -> [TextField]? { [labelTextField, childTextField, errorTextField] }
-
     override func setupForm(){
         super.setupForm()
         addFormRow(label: "Disabled", view: disabledSwitch)
diff --git a/VDSSample/ViewControllers/TabsContainerViewController.swift b/VDSSample/ViewControllers/TabsContainerViewController.swift
index 2b8ff36..8cee86d 100644
--- a/VDSSample/ViewControllers/TabsContainerViewController.swift
+++ b/VDSSample/ViewControllers/TabsContainerViewController.swift
@@ -25,9 +25,7 @@ class TabsContainerViewController: BaseViewController<TabsContainer> {
     var verticalOrientationFormStackView = FormSection()
     var horizontalOrientationFormStackView = FormSection()
     var overflowRow: UIView?
-    
-    override func allTextFields() -> [TextField]? { [widthValueTextField, widthPercentageTextField] }
-    
+        
     lazy var orientationPickerSelectorView = {
         PickerSelectorView(title: "",
                            picker: self.picker,
diff --git a/VDSSample/ViewControllers/TextAreaViewController.swift b/VDSSample/ViewControllers/TextAreaViewController.swift
index 2f23afa..c5df727 100644
--- a/VDSSample/ViewControllers/TextAreaViewController.swift
+++ b/VDSSample/ViewControllers/TextAreaViewController.swift
@@ -31,9 +31,7 @@ class  TextAreaViewController: BaseViewController<TextArea> {
         setupPicker()
         setupModel()
     }
-    
-    override func allTextFields() -> [TextField]? { [labelTextField, errorTextField, helperTextField, widthTextField, tooltipTitleTextField, tooltipContentTextField] }
-    
+        
     override func setupForm(){
         super.setupForm()  
         addFormRow(label: "Disabled", view: disabledSwitch)
diff --git a/VDSSample/ViewControllers/TextLinkCaretViewController.swift b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
index 1cb572c..a36780b 100644
--- a/VDSSample/ViewControllers/TextLinkCaretViewController.swift
+++ b/VDSSample/ViewControllers/TextLinkCaretViewController.swift
@@ -30,8 +30,6 @@ class TextLinkCaretViewController: BaseViewController<TextLinkCaret> {
         setupModel()
     }
     
-    override func allTextFields() -> [TextField]? { [textField] }
-
     override func setupForm(){
         super.setupForm()  
         addFormRow(label: "Button Action", view: label)
diff --git a/VDSSample/ViewControllers/TileContainerViewController.swift b/VDSSample/ViewControllers/TileContainerViewController.swift
index f1f34fd..9277cb4 100644
--- a/VDSSample/ViewControllers/TileContainerViewController.swift
+++ b/VDSSample/ViewControllers/TileContainerViewController.swift
@@ -55,7 +55,6 @@ class TileContainerViewController: BaseViewController<TileContainer> {
         setupModel()
     }
     
-    override func allTextFields() -> [TextField]? { [widthTextField, heightTextField] }
     override func setupForm(){
         super.setupForm()  
         formStackView.addArrangedSubview(Label().with {
diff --git a/VDSSample/ViewControllers/TileletViewController.swift b/VDSSample/ViewControllers/TileletViewController.swift
index e7d8b7b..043457b 100644
--- a/VDSSample/ViewControllers/TileletViewController.swift
+++ b/VDSSample/ViewControllers/TileletViewController.swift
@@ -51,9 +51,7 @@ class TileletViewController: BaseViewController<Tilelet> {
         setupPicker()
         setupModel()
     }
-    
-    override func allTextFields() -> [TextField]? { [titleTextField, subTitleTextField, widthTextField, heightTextField, textWidthTextField, textPercentageTextField, badgeTextField] }
-    
+        
     override func setupForm(){
         super.setupForm()  
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
diff --git a/VDSSample/ViewControllers/TitleLockupViewController.swift b/VDSSample/ViewControllers/TitleLockupViewController.swift
index dfd58d6..0162db0 100644
--- a/VDSSample/ViewControllers/TitleLockupViewController.swift
+++ b/VDSSample/ViewControllers/TitleLockupViewController.swift
@@ -50,8 +50,6 @@ class TitleLockupViewController: BaseViewController<TitleLockup> {
         setupModel()
     }
     
-    override func allTextFields() -> [TextField]? { [eyebrowTextField, titleTextField, subTitleTextField] }
-
     override func setupForm(){
         super.setupForm()  
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
diff --git a/VDSSample/ViewControllers/ToggleViewController.swift b/VDSSample/ViewControllers/ToggleViewController.swift
index 5c53379..5737143 100644
--- a/VDSSample/ViewControllers/ToggleViewController.swift
+++ b/VDSSample/ViewControllers/ToggleViewController.swift
@@ -41,8 +41,6 @@ class ToggleViewController: BaseViewController<Toggle> {
         setupPicker()
     }
     
-    override func allTextFields() -> [TextField]? { [onTextField, offTextField] }
-
     override func setupForm() {
         super.setupForm()
         
diff --git a/VDSSample/ViewControllers/TooltipViewController.swift b/VDSSample/ViewControllers/TooltipViewController.swift
index e81ef77..e62e5da 100644
--- a/VDSSample/ViewControllers/TooltipViewController.swift
+++ b/VDSSample/ViewControllers/TooltipViewController.swift
@@ -38,8 +38,6 @@ class  TooltipViewController: BaseViewController<Tooltip> {
         setupModel()
     }
     
-    override func allTextFields() -> [TextField]? { [titleTextField, contentTextField, closeButtonTextField] }
-
     override func setupForm(){
         super.setupForm()
         addFormRow(label: "Disabled", view: disabledSwitch)
diff --git a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
index 0c1cf9c..41ce50f 100644
--- a/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
+++ b/VDSSample/ViewControllers/TrailingTooltipLabelViewController.swift
@@ -46,8 +46,6 @@ class TrailingTooltipLabelViewController: BaseViewController<TrailingTooltipLabe
         setupModel()
     }
     
-    override func allTextFields() -> [TextField]? { [textField, titleTextField, contentTextField, closeButtonTextField] }
-
     override func setupForm(){
         super.setupForm()  
         addFormRow(label: "Disabled", view: disabledSwitch)