diff --git a/MVMCoreUI/Molecules/RadioButtonLabel.swift b/MVMCoreUI/Molecules/RadioButtonLabel.swift
index 244a4829..5d70b7e4 100644
--- a/MVMCoreUI/Molecules/RadioButtonLabel.swift
+++ b/MVMCoreUI/Molecules/RadioButtonLabel.swift
@@ -37,20 +37,21 @@ import UIKit
         radioButton.leftAnchor.constraint(equalTo: layoutMarginsGuide.leftAnchor, constant: 0).isActive = true
         radioButton.topAnchor.constraint(greaterThanOrEqualTo: layoutMarginsGuide.topAnchor, constant: PaddingOne).isActive = true
         layoutMarginsGuide.bottomAnchor.constraint(greaterThanOrEqualTo: radioButton.bottomAnchor, constant: PaddingOne).isActive = true
-        radioButton.centerYAnchor.constraint(equalTo: centerYAnchor).isActive = true
+        radioButton.centerYAnchor.constraint(equalTo: layoutMarginsGuide.centerYAnchor).isActive = true
 
         if let rightView = createRightView() {
             addSubview(rightView)
             rightView.leftAnchor.constraint(equalTo: radioButton.rightAnchor, constant: PaddingHorizontalBetweenRelatedItems).isActive = true
             rightView.rightAnchor.constraint(equalTo: layoutMarginsGuide.rightAnchor, constant: 0).isActive = true
 
-            var constraint = rightView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor, constant: PaddingOne)
+            var constraint = rightView.topAnchor.constraint(greaterThanOrEqualTo: layoutMarginsGuide.topAnchor, constant: PaddingOne)
             constraint.priority = .defaultHigh
             constraint.isActive = true
 
-            constraint = layoutMarginsGuide.bottomAnchor.constraint(equalTo: rightView.bottomAnchor, constant: PaddingOne)
+            constraint = layoutMarginsGuide.bottomAnchor.constraint(greaterThanOrEqualTo: rightView.bottomAnchor, constant: PaddingOne)
             constraint.priority = .defaultHigh
             constraint.isActive = true
+            layoutMarginsGuide.centerYAnchor.constraint(equalTo: rightView.centerYAnchor).isActive = true
         }
     }
 
@@ -70,4 +71,13 @@ extension RadioButtonLabel {
                           delegateObject: delegateObject,
                           additionalData: additionalData)        
     }
+
+    public override func reset() {
+        radioButton.reset()
+        label.reset()
+    }
+
+    public override class func estimatedHeight(forRow json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat {
+        return 45
+    }
 }