diff --git a/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift b/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift
index bb1745a3..4cab6cd7 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift
@@ -38,7 +38,7 @@ public typealias ActionBlock = () -> ()
     }
     
     public var getRange: NSRange {
-        return NSRange(location: 0, length: text?.count ?? 0)
+        NSRange(location: 0, length: text?.count ?? 0)
     }
     
     //------------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift
index d111d1c5..703793f3 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBody.swift
@@ -19,19 +19,15 @@ open class HeadlineBody: View {
     // MARK: - Constraints
     //--------------------------------------------------
     
-    var spaceBetweenLabelsConstant = PaddingOne
+    var spaceBetweenLabelsConstant = Padding.One
     var spaceBetweenLabels: NSLayoutConstraint?
-    var leftConstraintTitle: NSLayoutConstraint?
-    var rightConstraintTitle: NSLayoutConstraint?
-    var leftConstraintMessage: NSLayoutConstraint?
-    var rightConstraintMessage: NSLayoutConstraint?
     
     //--------------------------------------------------
     // MARK: - Methods
     //--------------------------------------------------
     
     func hasText() -> Bool {
-        return headlineLabel.hasText || messageLabel.hasText
+        headlineLabel.hasText || messageLabel.hasText
     }
     
     // MARK: - Styling
@@ -57,13 +53,13 @@ open class HeadlineBody: View {
     func styleLandingPageHeader() {
         headlineLabel.setFontStyle(.Title2XLarge)
         messageLabel.setFontStyle(.RegularBodySmall)
-        spaceBetweenLabelsConstant = PaddingTwo
+        spaceBetweenLabelsConstant = Padding.Two
     }
     
     func stylePageHeader() {
         headlineLabel.setFontStyle(.BoldTitleLarge)
         messageLabel.setFontStyle(.RegularBodySmall)
-        spaceBetweenLabelsConstant = PaddingOne
+        spaceBetweenLabelsConstant = Padding.One
     }
     
     func styleListItem() {
@@ -86,48 +82,41 @@ open class HeadlineBody: View {
         super.setupView()
         
         backgroundColor = .clear
-        clipsToBounds = true
+        isAccessibilityElement = false
+        shouldGroupAccessibilityChildren = true
+        accessibilityElements = [headlineLabel, messageLabel]
         
-        let view = MVMCoreUICommonViewsUtility.commonView()
-        addSubview(view)
-        NSLayoutConstraint.constraintPinSubview(toSuperview: view)
-        
-        view.isAccessibilityElement = false
-        view.shouldGroupAccessibilityChildren = true
-        view.accessibilityElements = [headlineLabel, messageLabel]
-        
-        view.addSubview(headlineLabel)
-        view.addSubview(messageLabel)
+        addSubview(headlineLabel)
+        addSubview(messageLabel)
         
+        headlineLabel.setContentCompressionResistancePriority(.required, for: .vertical)
         headlineLabel.setContentHuggingPriority(.required, for: .vertical)
+        messageLabel.setContentCompressionResistancePriority(.required, for: .vertical)
         messageLabel.setContentHuggingPriority(.required, for: .vertical)
-        view.setContentHuggingPriority(.required, for: .vertical)
         
-        headlineLabel.topAnchor.constraint(equalTo: view.topAnchor).isActive = true
+        headlineLabel.topAnchor.constraint(equalTo: topAnchor).isActive = true
         
         spaceBetweenLabels = messageLabel.topAnchor.constraint(equalTo: headlineLabel.bottomAnchor, constant: spaceBetweenLabelsConstant)
         spaceBetweenLabels?.isActive = true
         
-        leftConstraintTitle = headlineLabel.leftAnchor.constraint(equalTo: view.leftAnchor)
-        leftConstraintTitle?.isActive = true
-        
-        rightConstraintTitle = view.rightAnchor.constraint(equalTo: headlineLabel.rightAnchor)
-        rightConstraintTitle?.isActive = true
-        
-        leftConstraintMessage = messageLabel.leftAnchor.constraint(equalTo: view.leftAnchor)
-        leftConstraintMessage?.isActive = true
-        
-        rightConstraintMessage = view.rightAnchor.constraint(equalTo: messageLabel.rightAnchor)
-        rightConstraintMessage?.isActive = true
-        
-        view.bottomAnchor.constraint(equalTo: messageLabel.bottomAnchor).isActive = true
+        NSLayoutConstraint.activate([
+            headlineLabel.leadingAnchor.constraint(equalTo: leadingAnchor),
+            trailingAnchor.constraint(equalTo: headlineLabel.trailingAnchor),
+            messageLabel.leadingAnchor.constraint(equalTo: leadingAnchor),
+            trailingAnchor.constraint(equalTo: messageLabel.trailingAnchor),
+            bottomAnchor.constraint(equalTo: messageLabel.bottomAnchor)
+        ])
     }
     
     open override func updateView(_ size: CGFloat) {
         super.updateView(size)
+        setSpacing()
         headlineLabel.updateView(size)
         messageLabel.updateView(size)
-        setSpacing()
+        
+        // Provide the label additional size information to help calculate its intrinsic height.
+        let padding = MFStyler.defaultHorizontalPadding(forSize: size) * 2
+        messageLabel.preferredMaxLayoutWidth = size - padding
     }
     
     //--------------------------------------------------
@@ -146,19 +135,18 @@ open class HeadlineBody: View {
     // MARK: - MoleculeViewProtocol
     //--------------------------------------------------
     
-    public override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
-        return 58
-    }
+    public override class func estimatedHeight(with model: MoleculeModelProtocol,
+                                               _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { 58 }
     
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
         super.set(with: model, delegateObject, additionalData)
         
-        guard let headlineBodyModel = model as? HeadlineBodyModel else { return }
+        guard let model = model as? HeadlineBodyModel else { return }
         
-        style(with: headlineBodyModel.style)
+        style(with: model.style)
         
-        headlineLabel.setOptional(with: headlineBodyModel.headline, delegateObject, additionalData)
-        messageLabel.setOptional(with: headlineBodyModel.body, delegateObject, additionalData)
+        headlineLabel.setOptional(with: model.headline, delegateObject, additionalData)
+        messageLabel.setOptional(with: model.body, delegateObject, additionalData)
     }
     
     open override func reset() {