diff --git a/MVMCoreUI/Atoms/TextFields/EntryField.swift b/MVMCoreUI/Atoms/TextFields/EntryField.swift
index 86dad0f6..9c344521 100644
--- a/MVMCoreUI/Atoms/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/EntryField.swift
@@ -208,16 +208,12 @@ import UIKit
         feedbackLabelTrailing = layoutMarginsGuide.trailingAnchor.constraint(equalTo: feedbackLabel.trailingAnchor)
         feedbackLabelTrailing?.isActive = true
         layoutMarginsGuide.bottomAnchor.constraint(equalTo: feedbackLabel.bottomAnchor).isActive = true
-        
-        setNeedsDisplay()
-        layoutIfNeeded()
     }
     
     open override func layoutSubviews() {
         super.layoutSubviews()
         
         entryContainer.refreshUI()
-        setNeedsLayout()
     }
     
     /// Method to override.
diff --git a/MVMCoreUI/Containers/views/FormView.swift b/MVMCoreUI/Containers/views/FormView.swift
index 1897766d..058f2a25 100644
--- a/MVMCoreUI/Containers/views/FormView.swift
+++ b/MVMCoreUI/Containers/views/FormView.swift
@@ -68,7 +68,7 @@ import UIKit
         
         if !hideBorder {
             // Brings the other half of the line inside the view to prevent cropping.
-            let origin = frame.origin
+            let origin = bounds.origin
             let size = frame.size
             let insetLean: CGFloat = 0.5
             borderPath.lineWidth = 1
@@ -81,8 +81,6 @@ import UIKit
             borderStrokeColor.setStroke()
             borderPath.stroke()
         }
-        
-        layoutIfNeeded()
     }
     
     override open func setupView() {