diff --git a/MVMCoreUI/Atoms/Views/Checkbox.swift b/MVMCoreUI/Atoms/Views/Checkbox.swift
index 27576bc8..a206953a 100644
--- a/MVMCoreUI/Atoms/Views/Checkbox.swift
+++ b/MVMCoreUI/Atoms/Views/Checkbox.swift
@@ -140,7 +140,6 @@ import MVMCore
         accessibilityTraits = .button
         accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "checkbox_action_hint")
         updateAccessibilityLabel()
-        setupView()
     }
     
     /// There is currently no intention on using xib files.
@@ -355,13 +354,6 @@ import MVMCore
          sendActions(for: .touchUpInside)
     }
     
-    override open func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
-        
-        let faultTolerance: CGFloat = 20.0
-        let area = bounds.insetBy(dx: -faultTolerance, dy: -faultTolerance)
-        return area.contains(point)
-    }
-    
     override open func accessibilityActivate() -> Bool {
         sendActions(for: .touchUpInside)
         return true
diff --git a/MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift b/MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift
index 0cbfee07..404764fe 100644
--- a/MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift
+++ b/MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift
@@ -30,8 +30,7 @@
     //--------------------------------------------------
     // MARK: - Constraints
     //--------------------------------------------------
-    
-    public var checkboxHeightConstraint: NSLayoutConstraint?
+
     public var checkboxTopConstraint: NSLayoutConstraint?
     public var checkboxBottomConstraint: NSLayoutConstraint?
     public var checkboxCenterYConstraint: NSLayoutConstraint?
diff --git a/MVMCoreUI/BaseClasses/Control.swift b/MVMCoreUI/BaseClasses/Control.swift
index 79db2c6d..5774ff5a 100644
--- a/MVMCoreUI/BaseClasses/Control.swift
+++ b/MVMCoreUI/BaseClasses/Control.swift
@@ -33,7 +33,7 @@ import UIKit
     
     public required init?(coder: NSCoder) {
         super.init(coder: coder)
-        initialSetup()
+        fatalError("Control does not support xib.")
     }
     
     //--------------------------------------------------
@@ -41,18 +41,31 @@ import UIKit
     //--------------------------------------------------
     
     public func initialSetup() {
+        
         if !initialSetupPerformed {
             initialSetupPerformed = true
             setupView()
         }
     }
+    
+    //--------------------------------------------------
+    // MARK: - UITouch
+    //--------------------------------------------------
+    
+    override open func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
+        
+        // If the control is smaller than 44pt by width or height, this will compensate.
+        let faultToleranceX: CGFloat = max((MinimumTappableArea - bounds.size.width) / 2.0, 0)
+        let faultToleranceY: CGFloat = max((MinimumTappableArea - bounds.size.height) / 2.0, 0)
+        let area = bounds.insetBy(dx: -faultToleranceX, dy: -faultToleranceY)
+        return area.contains(point)
+    }
 }
 
 // MARK: - MVMCoreViewProtocol
 extension Control: MVMCoreViewProtocol {
     
-    public func updateView(_ size: CGFloat) {
-    }
+    public func updateView(_ size: CGFloat) {}
     
     /// Will be called only once.
     public func setupView() {
@@ -63,7 +76,7 @@ extension Control: MVMCoreViewProtocol {
 
 // MARK: - MVMCoreUIMoleculeViewProtocol
 extension Control: MVMCoreUIMoleculeViewProtocol {
-     public func setWithJSON(_ json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) {
+     public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
        self.json = json
        
        if let backgroundColorString = json?.optionalStringForKey(KeyBackgroundColor) {
diff --git a/MVMCoreUI/Utility/MVMCoreUIConstants.h b/MVMCoreUI/Utility/MVMCoreUIConstants.h
index 778ede4f..e5587745 100644
--- a/MVMCoreUI/Utility/MVMCoreUIConstants.h
+++ b/MVMCoreUI/Utility/MVMCoreUIConstants.h
@@ -77,3 +77,7 @@ typedef NS_ENUM(NSInteger, CoreUIErrorCode) {
     ErrorCodeModuleMolecule = 100,
     ErrorCodeListMolecule = 101
 };
+
+#pragma mark - Apple Design Guidelines
+
+extern CGFloat const MinimumTappableArea;
diff --git a/MVMCoreUI/Utility/MVMCoreUIConstants.m b/MVMCoreUI/Utility/MVMCoreUIConstants.m
index 26636266..6211cfee 100644
--- a/MVMCoreUI/Utility/MVMCoreUIConstants.m
+++ b/MVMCoreUI/Utility/MVMCoreUIConstants.m
@@ -69,3 +69,7 @@ BOOL DisableAnimations = NO;
 // Hand Scroll Key
 NSString * const KeyHandScrollAnimation = @"handScrollAnimation";
 NSString * const KeyHandScroll = @"hand_scroll";
+
+#pragma mark - Apple Design Guidelines
+
+CGFloat const MinimumTappableArea = 44.0f;