diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index f85266b7..b4c341b7 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -187,10 +187,10 @@
 		94F6516D2437954100631BF9 /* Tabs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94F6516C2437954100631BF9 /* Tabs.swift */; };
 		AA0A257824766C8A00862F64 /* ListLeftVariableIconWithRightCaretBodyTextModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA0A257724766C8A00862F64 /* ListLeftVariableIconWithRightCaretBodyTextModel.swift */; };
 		AA0A257A24766CA200862F64 /* ListLeftVariableIconWithRightCaretBodyText.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA0A257924766CA200862F64 /* ListLeftVariableIconWithRightCaretBodyText.swift */; };
-		AA104B1A24474A66004D2810 /* HeadersH2Buttons.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA104B1924474A66004D2810 /* HeadersH2Buttons.swift */; };
-		AA104B1C24474A76004D2810 /* HeadersH2ButtonsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA104B1B24474A76004D2810 /* HeadersH2ButtonsModel.swift */; };
 		AA104AC724472DB0004D2810 /* HeadersH1Button.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA104AC624472DB0004D2810 /* HeadersH1Button.swift */; };
 		AA104AC924472DC7004D2810 /* HeadersH1ButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA104AC824472DC7004D2810 /* HeadersH1ButtonModel.swift */; };
+		AA104B1A24474A66004D2810 /* HeadersH2Buttons.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA104B1924474A66004D2810 /* HeadersH2Buttons.swift */; };
+		AA104B1C24474A76004D2810 /* HeadersH2ButtonsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA104B1B24474A76004D2810 /* HeadersH2ButtonsModel.swift */; };
 		AA11A41F23F15D3100D7962F /* ListRightVariablePayments.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA11A41E23F15D3100D7962F /* ListRightVariablePayments.swift */; };
 		AA11A42123F15D7000D7962F /* ListRightVariablePaymentsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA11A42023F15D7000D7962F /* ListRightVariablePaymentsModel.swift */; };
 		AA1EC59724373985003D6F50 /* ListThreeColumnSpeedTestDividerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA1EC59624373985003D6F50 /* ListThreeColumnSpeedTestDividerModel.swift */; };
@@ -634,10 +634,10 @@
 		94F6516C2437954100631BF9 /* Tabs.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tabs.swift; sourceTree = "<group>"; };
 		AA0A257724766C8A00862F64 /* ListLeftVariableIconWithRightCaretBodyTextModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconWithRightCaretBodyTextModel.swift; sourceTree = "<group>"; };
 		AA0A257924766CA200862F64 /* ListLeftVariableIconWithRightCaretBodyText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableIconWithRightCaretBodyText.swift; sourceTree = "<group>"; };
-		AA104B1924474A66004D2810 /* HeadersH2Buttons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2Buttons.swift; sourceTree = "<group>"; };
-		AA104B1B24474A76004D2810 /* HeadersH2ButtonsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2ButtonsModel.swift; sourceTree = "<group>"; };
 		AA104AC624472DB0004D2810 /* HeadersH1Button.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH1Button.swift; sourceTree = "<group>"; };
 		AA104AC824472DC7004D2810 /* HeadersH1ButtonModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH1ButtonModel.swift; sourceTree = "<group>"; };
+		AA104B1924474A66004D2810 /* HeadersH2Buttons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2Buttons.swift; sourceTree = "<group>"; };
+		AA104B1B24474A76004D2810 /* HeadersH2ButtonsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadersH2ButtonsModel.swift; sourceTree = "<group>"; };
 		AA11A41E23F15D3100D7962F /* ListRightVariablePayments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariablePayments.swift; sourceTree = "<group>"; };
 		AA11A42023F15D7000D7962F /* ListRightVariablePaymentsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariablePaymentsModel.swift; sourceTree = "<group>"; };
 		AA1EC59624373985003D6F50 /* ListThreeColumnSpeedTestDividerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListThreeColumnSpeedTestDividerModel.swift; sourceTree = "<group>"; };
@@ -1042,8 +1042,8 @@
 				AA26850B244840AE00CE34CC /* HeadersH2TinyButton.swift */,
 				AA104B1B24474A76004D2810 /* HeadersH2ButtonsModel.swift */,
 				AA104B1924474A66004D2810 /* HeadersH2Buttons.swift */,
-				AA104AC624472DB0004D2810 /* HeadersH1Button.swift */,
 				AA104AC824472DC7004D2810 /* HeadersH1ButtonModel.swift */,
+				AA104AC624472DB0004D2810 /* HeadersH1Button.swift */,
 			);
 			path = Headers;
 			sourceTree = "<group>";
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1Button.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1Button.swift
index a7534e1a..eeddf714 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1Button.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1Button.swift
@@ -12,16 +12,27 @@ import Foundation
     //--------------------------------------------------
     // MARK: - Outlets
     //--------------------------------------------------
-    let headlineBody = HeadlineBody(frame: .zero)
-    let button = PillButton(frame: .zero)
-    var stack = Stack<StackModel>(frame: .zero)
+    public let headlineBody = HeadlineBody(frame: .zero)
+    public let buttons = TwoButtonView(frame: .zero)
+    public let stack: Stack<StackModel>
+    
+    //-------------------------------------------------------
+    // MARK: - Initializers
+    //-------------------------------------------------------
+    public override init(frame: CGRect) {
+        stack = Stack<StackModel>.createStack(with: [headlineBody, buttons], spacing: PaddingVerticalWhiteGrayView)
+        super.init(frame: frame)
+    }
+    
+    public required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
     
     //-------------------------------------------------------
     // MARK: - View Lifecycle
     //-------------------------------------------------------
     open override func setupView() {
         super.setupView()
-        stack = Stack<StackModel>.createStack(with: [(view: headlineBody, model: StackItemModel(horizontalAlignment: .leading)), (view: button, model: StackItemModel(spacing: 72, horizontalAlignment: .leading))], axis: .vertical)
         headlineBody.styleLandingPageHeader()
         addMolecule(stack)
         stack.restack()
@@ -34,7 +45,7 @@ import Foundation
         super.set(with: model, delegateObject, additionalData)
         guard let model = model as? HeadersH1ButtonModel else { return }
         headlineBody.set(with: model.headlineBody, delegateObject, additionalData)
-        button.set(with: model.button, delegateObject, additionalData)
+        buttons.set(with: model.buttons, delegateObject, additionalData)
     }
     
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
@@ -44,6 +55,5 @@ import Foundation
     open override func reset() {
         super.reset()
         headlineBody.styleLandingPageHeader()
-        button.reset()
     }
 }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1ButtonModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1ButtonModel.swift
index d008bab2..5df94b85 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1ButtonModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/HeadersH1ButtonModel.swift
@@ -14,24 +14,24 @@ public class HeadersH1ButtonModel: HeaderModel, MoleculeModelProtocol {
     //--------------------------------------------------
     public static var identifier: String = "headerH1Btn"
     public var headlineBody: HeadlineBodyModel
-    public var button: ButtonModel
-
+    public var buttons: TwoButtonViewModel
+    
     //--------------------------------------------------
     // MARK: - Initializer
     //--------------------------------------------------
-    public init(headlineBody: HeadlineBodyModel, button: ButtonModel) {
+    public init(headlineBody: HeadlineBodyModel, buttons: TwoButtonViewModel) {
         self.headlineBody = headlineBody
-        self.button = button
+        self.buttons = buttons
         super.init()
     }
-
+    
     //--------------------------------------------------
     // MARK: - Keys
     //--------------------------------------------------
     private enum CodingKeys: String, CodingKey {
         case moleculeName
         case headlineBody
-        case button
+        case buttons
     }
     
     //--------------------------------------------------
@@ -40,7 +40,7 @@ public class HeadersH1ButtonModel: HeaderModel, MoleculeModelProtocol {
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         headlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .headlineBody)
-        button = try typeContainer.decode(ButtonModel.self, forKey: .button)
+        buttons = try typeContainer.decode(TwoButtonViewModel.self, forKey: .buttons)
         try super.init(from: decoder)
     }
     
@@ -49,6 +49,6 @@ public class HeadersH1ButtonModel: HeaderModel, MoleculeModelProtocol {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(headlineBody, forKey: .headlineBody)
-        try container.encode(button, forKey: .button)
+        try container.encode(buttons, forKey: .buttons)
     }
 }