diff --git a/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift b/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
index b249d89f..3d0b69a5 100644
--- a/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/DigitEntryField.swift
@@ -207,7 +207,7 @@ import UIKit
         
         let digitBox = DigitBox()
         digitBox.isAccessibilityElement = true
-        MVMCoreUICommonViewsUtility.addDismissToolbar(digitBox.digitField, delegate: self)
+        digitBox.digitField.inputAccessoryView = MVMCoreUICommonViewsUtility.getToolbarWithDoneButton(delegate: self)
         digitBox.digitField.delegate = self
         digitBox.digitBoxDelegate = self
         return digitBox
@@ -329,18 +329,12 @@ import UIKit
     }
     
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
-        
-        
+    
         guard let model = model as? DigitEntryFieldModel else { return }
         
         numberOfDigits = model.digits
-        
         setAsSecureTextEntry(model.secureEntry)
         
-        for digitBox in digitBoxes {
-            digitBox.digitField.inputAccessoryView = MVMCoreUICommonViewsUtility.getToolbarWithDoneButton(delegate: delegateObject?.observingTextFieldDelegate ?? self)
-        }
-        
         super.set(with: model, delegateObject, additionalData)
     }
 }
diff --git a/MVMCoreUI/Atoms/TextFields/EntryField.swift b/MVMCoreUI/Atoms/TextFields/EntryField.swift
index 43a15a3b..cafa91be 100644
--- a/MVMCoreUI/Atoms/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/EntryField.swift
@@ -117,7 +117,7 @@ import UIKit
             feedbackLabel.text = newFeedback
             feedbackLabel.accessibilityElementsHidden = feedbackLabel.text?.isEmpty ?? true
             entryFieldContainer.refreshUI()
-            delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
+//            delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
         }
     }
     
diff --git a/MVMCoreUI/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
index 33f75604..c97412a8 100644
--- a/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/TextEntryField.swift
@@ -49,6 +49,10 @@ import UIKit
     
     /// Validate when user resigns editing. Default: true
     public var validateWhenDoneEditing: Bool = true
+    
+    public var textEntryFieldModel: TextEntryFieldModel? {
+        return model as? TextEntryFieldModel
+    }
 
     //--------------------------------------------------
     // MARK: - Computed Properties
@@ -87,7 +91,7 @@ import UIKit
         get { return textField.text }
         set {
             textField.text = newValue
-            (model as? TextEntryFieldModel)?.text = newValue
+            textEntryFieldModel?.text = newValue
         }
     }
     
@@ -167,7 +171,8 @@ import UIKit
             textField.heightAnchor.constraint(equalToConstant: 24),
             textField.topAnchor.constraint(equalTo: container.topAnchor, constant: 12),
             textField.leadingAnchor.constraint(equalTo: container.leadingAnchor, constant: 16),
-            container.bottomAnchor.constraint(equalTo: textField.bottomAnchor, constant: 12)])
+            container.bottomAnchor.constraint(equalTo: textField.bottomAnchor, constant: 12)
+        ])
         
         textFieldTrailingConstraint = container.trailingAnchor.constraint(equalTo: textField.trailingAnchor, constant: 16)
         textFieldTrailingConstraint?.isActive = true
@@ -366,7 +371,6 @@ extension TextEntryField {
             defaultValidationBlock()
         }
         
-        
         uiTextFieldDelegate = delegateObject.uiTextFieldDelegate
         observingTextFieldDelegate = delegateObject.observingTextFieldDelegate
         MVMCoreUICommonViewsUtility.addDismissToolbar(textField, delegate: uiTextFieldDelegate)
diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
index 70c84d40..3ee452b0 100644
--- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
+++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility+Extension.swift
@@ -9,12 +9,15 @@
 import Foundation
 
 public extension MVMCoreUICommonViewsUtility {
+    
     static func getToolbarWithDoneButton(delegate: ObservingTextFieldDelegate) -> UIToolbar {
+        
         let toolbar = self.makeEmptyToolbar()
         let space = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
         let button = UIBarButtonItem(barButtonSystemItem: .done, target: delegate, action: #selector(ObservingTextFieldDelegate.dismissFieldInput(sender:)))
         button.tintColor = .black
         toolbar.setItems([space, button], animated: false)
+        
         return toolbar
     }
 }