diff --git a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift
index ff9a6766..f02586e5 100644
--- a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift
+++ b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/Header.swift
@@ -27,7 +27,7 @@ open class HeaderView: Container {
         containerHelper.rightConstraint = margins.rightAnchor.constraint(equalTo: molecule.rightAnchor)
         containerHelper.rightConstraint?.priority = .defaultHigh
         containerHelper.rightConstraint?.isActive = true
-        molecule.widthAnchor.constraint(equalToConstant: 596).isActive = true
+        molecule.widthAnchor.constraint(equalToConstant: HeaderMaxWidth).isActive = true
     }
     
     // MARK: - MVMCoreViewProtocol
diff --git a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/MoleculeHeaderView.swift b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/MoleculeHeaderView.swift
index 1bbb78f9..5f3a0914 100644
--- a/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/MoleculeHeaderView.swift
+++ b/MVMCoreUI/Atomic/Molecules/HeadersAndFooters/MoleculeHeaderView.swift
@@ -31,7 +31,7 @@ public class MoleculeHeaderView: MoleculeContainer {
         containerHelper.rightConstraint = margins.rightAnchor.constraint(equalTo: molecule.rightAnchor)
         containerHelper.rightConstraint?.priority = .defaultHigh
         containerHelper.rightConstraint?.isActive = true
-        molecule.widthAnchor.constraint(lessThanOrEqualToConstant: 596).isActive = true
+        molecule.widthAnchor.constraint(lessThanOrEqualToConstant: HeaderMaxWidth).isActive = true
     }
     
     open override func updateView(_ size: CGFloat) {
diff --git a/MVMCoreUI/Styles/MFStyler+PaddingExtension.swift b/MVMCoreUI/Styles/MFStyler+PaddingExtension.swift
index 37fa4a9f..bb96af26 100644
--- a/MVMCoreUI/Styles/MFStyler+PaddingExtension.swift
+++ b/MVMCoreUI/Styles/MFStyler+PaddingExtension.swift
@@ -10,7 +10,7 @@ import Foundation
 
 @objc public extension MFStyler {
     
-    @objc static func bridgeGetGutterSizeForForApplicationWidth() -> CGFloat {
+    @objc static func bridgeGetGutterSizeForApplicationWidth() -> CGFloat {
         Padding.Component.gutterForApplicationWidth
     }
     
@@ -18,7 +18,7 @@ import Foundation
         Padding.Component.gutterFor(size: size)
     }
     
-    @objc static func bridgeGetColumnSizeForForApplicationWidth() -> CGFloat {
+    @objc static func bridgeGetColumnSizeForApplicationWidth() -> CGFloat {
         Padding.Component.columnFor(size: MVMCoreUISplitViewController.getApplicationViewWidth())
     }
     
diff --git a/MVMCoreUI/Styles/MFStyler.h b/MVMCoreUI/Styles/MFStyler.h
index a3827044..d8676016 100644
--- a/MVMCoreUI/Styles/MFStyler.h
+++ b/MVMCoreUI/Styles/MFStyler.h
@@ -57,6 +57,8 @@ extern CGFloat const HeightTableSeperatorHeight;
 extern CGFloat const MFHeightForSwitch;
 extern CGFloat const MFMFWidthForSwitch;
 
+extern CGFloat const HeaderMaxWidth;
+
 // Color constants
 extern CGFloat const DisableOppacity;
 extern CGFloat const PaymentMethodViewHeightWidthMultiplier;
diff --git a/MVMCoreUI/Styles/MFStyler.m b/MVMCoreUI/Styles/MFStyler.m
index 17b3e7f1..8b9db95f 100644
--- a/MVMCoreUI/Styles/MFStyler.m
+++ b/MVMCoreUI/Styles/MFStyler.m
@@ -46,6 +46,9 @@ CGFloat const HeightTableSeperatorHeight = 1;
 
 CGFloat const MFHeightForSwitch = 22;
 CGFloat const MFWidthForSwitch = 42;
+
+CGFloat const HeaderMaxWidth = 596;
+
 CGFloat const DisableOppacity = 0.5;
 CGFloat const PaymentMethodViewHeightWidthMultiplier = 0.55;
 CGFloat const MinCellHeight = 96;