diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift
index a0de9d1f..2e098ad9 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift
@@ -249,6 +249,10 @@ import UIKit
     //--------------------------------------------------
     // MARK: - Methods
     //--------------------------------------------------
+    public override func showErrorView(_ show: Bool) {
+        //do nothing since you should show the error view
+        //within a digitEntryField
+    }
     
     @objc public func setAsSecureTextEntry(_ secureEntry: Bool) {
         
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift
index 02fa342e..75d2c887 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift	
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/ItemDropdownEntryFieldModel.swift	
@@ -58,6 +58,6 @@
         try super.encode(to: encoder)
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(options, forKey: .options)
-        try container.encodeIfPresent(options, forKey: .selectedIndex)
+        try container.encodeIfPresent(selectedIndex, forKey: .selectedIndex)
     }
 }
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift
index 4b84e8a1..c583638c 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift
@@ -286,6 +286,7 @@ import UIKit
         entryFieldContainer.disableAllBorders = false
         feedbackLabel.text = nil
         entryFieldContainer.reset()
+        entryFieldModel?.updateUI = nil
     }
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
index 89e17169..d081b717 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
@@ -84,7 +84,7 @@ import UIKit
                 textField.accessibilityValue = nil
             }
             
-            if textField.isSecureTextEntry {
+            if !textField.isSecureTextEntry {
                 showErrorView(error)
             }
             
@@ -294,8 +294,7 @@ import UIKit
         resignFirstResponder()
     }
     
-    private func showErrorView(_ show: Bool) {
-        
+    open func showErrorView(_ show: Bool) {
         if show {
             entryFieldContainer.addSubview(errorImage)
             
diff --git a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
index adf11109..d594dead 100644
--- a/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
+++ b/MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
@@ -223,7 +223,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
     }
     
     /// Handles when the controller has committed to be changed.
-    private func commitTo(controller: UIViewController) {
+    open func commitTo(controller: UIViewController) {
         guard let index = index,
               index != tabs.selectedIndex else { return }
         viewController = controller