diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 1f3e1d53..e4ac14bf 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -96,8 +96,6 @@
 		D29DF28021E7AA51003B2FB9 /* MVMCoreUIDetailViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = D29DF27F21E7AA50003B2FB9 /* MVMCoreUIDetailViewProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D29DF28321E7AB24003B2FB9 /* MVMCoreUICommonViewsUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = D29DF28121E7AB23003B2FB9 /* MVMCoreUICommonViewsUtility.m */; };
 		D29DF28421E7AB24003B2FB9 /* MVMCoreUICommonViewsUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = D29DF28221E7AB24003B2FB9 /* MVMCoreUICommonViewsUtility.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		D29DF28921E7AC2B003B2FB9 /* MFLabel.h in Headers */ = {isa = PBXBuildFile; fileRef = D29DF28521E7AC2B003B2FB9 /* MFLabel.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		D29DF28A21E7AC2B003B2FB9 /* MFLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = D29DF28621E7AC2B003B2FB9 /* MFLabel.m */; };
 		D29DF28B21E7AC2B003B2FB9 /* ViewConstrainingView.h in Headers */ = {isa = PBXBuildFile; fileRef = D29DF28721E7AC2B003B2FB9 /* ViewConstrainingView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D29DF28C21E7AC2B003B2FB9 /* ViewConstrainingView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29DF28821E7AC2B003B2FB9 /* ViewConstrainingView.m */; };
 		D29DF29521E7ADB8003B2FB9 /* ProgrammaticScrollViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D29DF28D21E7ADB8003B2FB9 /* ProgrammaticScrollViewController.m */; };
@@ -162,6 +160,7 @@
 		DBC4391922442197001AB423 /* DashLine.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC4391722442197001AB423 /* DashLine.swift */; };
 		DBC4391B224421A0001AB423 /* CaretButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC4391A224421A0001AB423 /* CaretButton.swift */; };
 		DBC4392122491730001AB423 /* LabelWithInternalButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC4391C2245232D001AB423 /* LabelWithInternalButton.swift */; };
+		DBEFFA04225A829700230692 /* Label.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB891E822253FA8500022516 /* Label.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -263,8 +262,6 @@
 		D29DF27F21E7AA50003B2FB9 /* MVMCoreUIDetailViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIDetailViewProtocol.h; sourceTree = "<group>"; };
 		D29DF28121E7AB23003B2FB9 /* MVMCoreUICommonViewsUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUICommonViewsUtility.m; sourceTree = "<group>"; };
 		D29DF28221E7AB24003B2FB9 /* MVMCoreUICommonViewsUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVMCoreUICommonViewsUtility.h; sourceTree = "<group>"; };
-		D29DF28521E7AC2B003B2FB9 /* MFLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFLabel.h; sourceTree = "<group>"; };
-		D29DF28621E7AC2B003B2FB9 /* MFLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFLabel.m; sourceTree = "<group>"; };
 		D29DF28721E7AC2B003B2FB9 /* ViewConstrainingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewConstrainingView.h; sourceTree = "<group>"; };
 		D29DF28821E7AC2B003B2FB9 /* ViewConstrainingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewConstrainingView.m; sourceTree = "<group>"; };
 		D29DF28D21E7ADB8003B2FB9 /* ProgrammaticScrollViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProgrammaticScrollViewController.m; sourceTree = "<group>"; };
@@ -319,6 +316,7 @@
 		D2C5001621F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIViewControllerMappingObject.h; sourceTree = "<group>"; };
 		D2C5001721F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUIViewControllerMappingObject.m; sourceTree = "<group>"; };
 		D2E1FADA2260D3D200AEFD8C /* MVMCoreUIDelegateObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUIDelegateObject.swift; sourceTree = "<group>"; };
+		DB891E822253FA8500022516 /* Label.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Label.swift; sourceTree = "<group>"; };
 		DBC4391622442196001AB423 /* CaretView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CaretView.swift; sourceTree = "<group>"; };
 		DBC4391722442197001AB423 /* DashLine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DashLine.swift; sourceTree = "<group>"; };
 		DBC4391A224421A0001AB423 /* CaretButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CaretButton.swift; sourceTree = "<group>"; };
@@ -564,8 +562,6 @@
 				DBC4391722442197001AB423 /* DashLine.swift */,
 				D29DF17E21E69E2E003B2FB9 /* MFView.h */,
 				D29DF17F21E69E2E003B2FB9 /* MFView.m */,
-				D29DF28521E7AC2B003B2FB9 /* MFLabel.h */,
-				D29DF28621E7AC2B003B2FB9 /* MFLabel.m */,
 				D29DF31E21ED0CBA003B2FB9 /* LabelView.h */,
 				D29DF31F21ED0CBA003B2FB9 /* LabelView.m */,
 				D29DF28721E7AC2B003B2FB9 /* ViewConstrainingView.h */,
@@ -590,6 +586,7 @@
 				D22D1F44220496A30077CEC0 /* MVMCoreUISwitch.h */,
 				D22D1F45220496A30077CEC0 /* MVMCoreUISwitch.m */,
 				DBC4391C2245232D001AB423 /* LabelWithInternalButton.swift */,
+				DB891E822253FA8500022516 /* Label.swift */,
 				0198F7A02256A80A0066C936 /* MFRadioButton.h */,
 				0198F7A22256A80A0066C936 /* MFRadioButton.m */,
 			);
@@ -745,7 +742,6 @@
 				D29DF27521E79E81003B2FB9 /* MVMCoreUILoggingHandler.h in Headers */,
 				D29DF28B21E7AC2B003B2FB9 /* ViewConstrainingView.h in Headers */,
 				D29DF2B321E7B76D003B2FB9 /* MFLoadingSpinner.h in Headers */,
-				D29DF28921E7AC2B003B2FB9 /* MFLabel.h in Headers */,
 				D29DF32521ED0DA2003B2FB9 /* TextButtonView.h in Headers */,
 				D29DF25021E6A177003B2FB9 /* MFDigitTextBox.h in Headers */,
 				D29DF2C621E7BF57003B2FB9 /* MFTabBarInteractor.h in Headers */,
@@ -891,6 +887,7 @@
 				D29DF25421E6A177003B2FB9 /* MFMdnTextField.m in Sources */,
 				D282AABA224131D100C46919 /* MFTransparentGIFView.swift in Sources */,
 				D2A514672213885800345BFB /* StandardHeaderView.swift in Sources */,
+				DBEFFA04225A829700230692 /* Label.swift in Sources */,
 				D29DF13021E6851E003B2FB9 /* MVMCoreUITopAlertShortView.m in Sources */,
 				D28B4F8B21FF967C00712C7A /* MVMCoreUIObject.m in Sources */,
 				D29DF26D21E6AA0B003B2FB9 /* FLAnimatedImageView.m in Sources */,
@@ -904,7 +901,6 @@
 				D274CA332236A78900B01B62 /* StandardFooterView.swift in Sources */,
 				D29DF2BF21E7BEA4003B2FB9 /* MVMCoreUITabBarPageControlViewController.m in Sources */,
 				D29DF28321E7AB24003B2FB9 /* MVMCoreUICommonViewsUtility.m in Sources */,
-				D29DF28A21E7AC2B003B2FB9 /* MFLabel.m in Sources */,
 				D206997821FB8A0B00CAE0DE /* MVMCoreUINavigationController.m in Sources */,
 				D29DF27A21E7A533003B2FB9 /* MVMCoreUISession.m in Sources */,
 				01DF55E021F8FAA800CC099B /* MFTextFieldListView.swift in Sources */,
diff --git a/MVMCoreUI/Atoms/Buttons/CaretButton.swift b/MVMCoreUI/Atoms/Buttons/CaretButton.swift
index 0849ed26..5a179c8c 100644
--- a/MVMCoreUI/Atoms/Buttons/CaretButton.swift
+++ b/MVMCoreUI/Atoms/Buttons/CaretButton.swift
@@ -8,13 +8,14 @@
 //
 
 
-open class CaretButton: MFCustomButton {
+open class CaretButton: MFCustomButton, MVMCoreUIMoleculeViewProtocol {
     //------------------------------------------------------
     // MARK: - Constants
     //------------------------------------------------------
     
-    private let CaretViewHeight: Float = 10.8
-    private let CaretViewWidth: Float = 6.6
+    private let CARET_VIEW_HEIGHT: Float = 10.5
+    private let CARET_VIEW_WIDTH: Float = 6.5
+
     
     //------------------------------------------------------
     // MARK: - Properties
@@ -25,17 +26,11 @@ open class CaretButton: MFCustomButton {
     @objc public var rightViewWidth: NSNumber?
     
     @objc public var enabledColor: UIColor = .black {
-        didSet {
-            setTitleColor(enabledColor, for: .normal)
-            changeCaretColor()
-        }
+        didSet { changeCaretColor() }
     }
     
     @objc public var disabledColor: UIColor = .mfSilver() {
-        didSet {
-            setTitleColor(disabledColor, for: .disabled)
-            changeCaretColor()
-        }
+        didSet { changeCaretColor() }
     }
     
     private var caretSpacingConstraint: NSLayoutConstraint?
@@ -61,9 +56,11 @@ open class CaretButton: MFCustomButton {
     //------------------------------------------------------
     
     private func changeCaretColor() {
-        
+        setTitleColor(enabledColor, for: .normal)
+        setTitleColor(disabledColor, for: .disabled)
+
         if let rightCaretView = rightView as? CaretView {
-            rightCaretView.tintColor = isEnabled ? enabledColor : disabledColor
+            rightCaretView.setLineColor(isEnabled ? enabledColor : disabledColor)
         }
     }
     
@@ -71,8 +68,8 @@ open class CaretButton: MFCustomButton {
         
         rightView?.removeFromSuperview()
         
-        let width = CGFloat(rightViewWidth?.floatValue ?? CaretViewWidth)
-        let height = CGFloat(rightViewHeight?.floatValue ?? CaretViewHeight)
+        let width = CGFloat(rightViewWidth?.floatValue ?? CARET_VIEW_WIDTH)
+        let height = CGFloat(rightViewHeight?.floatValue ?? CARET_VIEW_HEIGHT)
         
         let edgeInsets: UIEdgeInsets = contentEdgeInsets
         contentEdgeInsets = UIEdgeInsets(top: edgeInsets.top, left: edgeInsets.left, bottom: edgeInsets.bottom, right: 4 + width)
@@ -113,7 +110,7 @@ open class CaretButton: MFCustomButton {
         setTitleColor(disabledColor, for: .disabled)
     }
     
-    open func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+    @objc public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
         setWithActionMap(json, delegateObject: delegateObject, additionalData: additionalData)
         
         guard let dictionary = json else { return }
diff --git a/MVMCoreUI/Atoms/TextFields/MFTextField.h b/MVMCoreUI/Atoms/TextFields/MFTextField.h
index 81b4059f..27dd8414 100644
--- a/MVMCoreUI/Atoms/TextFields/MFTextField.h
+++ b/MVMCoreUI/Atoms/TextFields/MFTextField.h
@@ -11,7 +11,7 @@
 
 @class PrimaryButton;
 @class MFTextField;
-@class MFLabel;
+@class Label;
 
 @protocol MFTextFieldDelegate <NSObject>
 
@@ -34,7 +34,7 @@
 
 @property (nullable, weak, nonatomic) IBOutlet UIView *textFieldContainerView;
 @property (nullable, weak, nonatomic) IBOutlet UITextField *textField;
-@property (nullable, weak, nonatomic) IBOutlet MFLabel *formLabel;
+@property (nullable, weak, nonatomic) IBOutlet Label *formLabel;
 @property (nullable, weak, nonatomic) IBOutlet UIView *separatorView;//make it public so outsider class can know the posistion of it.
 
 @property (nullable, weak, nonatomic) IBOutlet NSLayoutConstraint *heightConstraint;
diff --git a/MVMCoreUI/Atoms/TextFields/MFTextField.m b/MVMCoreUI/Atoms/TextFields/MFTextField.m
index 822fdc83..33224f8a 100644
--- a/MVMCoreUI/Atoms/TextFields/MFTextField.m
+++ b/MVMCoreUI/Atoms/TextFields/MFTextField.m
@@ -7,12 +7,10 @@
 //
 
 #import "MFTextField.h"
-#import <MVMCoreUI/MVMCoreUI-Swift.h>
 #import "MFTextFieldSubclassExtension.h"
 #import "MFStyler.h"
 #import "UIColor+MFConvenience.h"
 #import "MVMCoreUICommonViewsUtility.h"
-#import "MFLabel.h"
 #import "MVMCoreUIUtility.h"
 #import "MVMCoreUIConstants.h"
 #import <MVMCoreUI/MVMCoreUI-Swift.h>
@@ -116,7 +114,7 @@
 + (nullable instancetype)mfTextFieldWithMap:(nullable NSDictionary *)map bothDelegates:(nullable id<UITextFieldDelegate, MFTextFieldDelegate>)delegate {
     MFTextField *textField = [self mfTextField];
     textField.translatesAutoresizingMaskIntoConstraints = NO;
-    [textField setWithJSON:map delegateObject:[MVMCoreUIDelegateObject createWithDelegateForAll:delegate] additionalData:nil];
+    [textField setWithMap:map bothDelegates:delegate];
     return textField;
 }
 
diff --git a/MVMCoreUI/Atoms/TextFields/MFTextField.xib b/MVMCoreUI/Atoms/TextFields/MFTextField.xib
index b60f1ff3..e839533f 100644
--- a/MVMCoreUI/Atoms/TextFields/MFTextField.xib
+++ b/MVMCoreUI/Atoms/TextFields/MFTextField.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -98,7 +98,7 @@
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8zH-YN-qag" customClass="MFLabel">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8zH-YN-qag" customClass="Label" customModule="MVMCoreUI" customModuleProvider="target">
                     <rect key="frame" x="0.0" y="0.0" width="320" height="36"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <nil key="textColor"/>
diff --git a/MVMCoreUI/Atoms/Views/CaretView.swift b/MVMCoreUI/Atoms/Views/CaretView.swift
index eb3a4c4b..51ab783a 100644
--- a/MVMCoreUI/Atoms/Views/CaretView.swift
+++ b/MVMCoreUI/Atoms/Views/CaretView.swift
@@ -21,7 +21,7 @@ open class CaretView: MFView {
     //------------------------------------------------------
     
     @objc public init() {
-        super.init(frame: CGRect.zero)
+        super.init(frame: .zero)
     }
     
     @objc public override init(frame: CGRect) {
@@ -98,25 +98,25 @@ open class CaretView: MFView {
     open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
         super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         // Configure class properties with JSON values
-        guard let jsonDictionary = json else { return }
+        guard let dictionary = json else { return }
         
-        if let backgroundColorHex = jsonDictionary[KeyBackgroundColor] as? String {
+        if let backgroundColorHex = dictionary[KeyBackgroundColor] as? String {
             backgroundColor = UIColor.mfGet(forHex: backgroundColorHex)
         }
         
-        if let strokeColorHex = jsonDictionary["strokeColor"] as? String {
+        if let strokeColorHex = dictionary["strokeColor"] as? String {
             strokeColor = UIColor.mfGet(forHex: strokeColorHex)
         }
         
-        if let isHiddenValue = jsonDictionary[KeyIsHidden] as? Bool {
+        if let isHiddenValue = dictionary[KeyIsHidden] as? Bool {
             isHidden = isHiddenValue
         }
  
-        if let isOpaqueValue = jsonDictionary[KeyIsOpaque] as? Bool {
+        if let isOpaqueValue = dictionary[KeyIsOpaque] as? Bool {
             isOpaque = isOpaqueValue
         }
         
-        if let lineWidthValue = jsonDictionary["lineWidth"] as? CGFloat {
+        if let lineWidthValue = dictionary["lineWidth"] as? CGFloat {
             lineWidth = lineWidthValue
         }
     }
diff --git a/MVMCoreUI/Atoms/Views/Label.swift b/MVMCoreUI/Atoms/Views/Label.swift
new file mode 100644
index 00000000..8ca484e3
--- /dev/null
+++ b/MVMCoreUI/Atoms/Views/Label.swift
@@ -0,0 +1,308 @@
+//
+//  Label.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 3/22/17.
+//  Converted by Christiano, Kevin on 4/2/19.
+//  Copyright © 2019 Verizon Wireless. All rights reserved.
+//
+
+import MVMCore
+
+
+@objc open class Label: UILabel, MVMCoreViewProtocol, MVMCoreUIMoleculeViewProtocol {
+    //------------------------------------------------------
+    // MARK: - Properties
+    //------------------------------------------------------
+    
+    // Set this property if you want updateView to update the font based on this standard and the size passed in.
+    @objc public var standardFontSize: CGFloat = 0.0
+    
+    // Set this to use a custom sizing object during updateView instead of the standard.
+    @objc public var sizeObject: MFSizeObject?
+    
+    @objc public var scaleSize: NSNumber?
+    
+    // Used for scaling the font in updateView.
+    private var originalAttributedString: NSAttributedString?
+    
+    @objc public var hasText: Bool {
+        guard let text = text, let attributedText = attributedText else { return false }
+        return !text.isEmpty || !attributedText.string.isEmpty
+    }
+    
+    //------------------------------------------------------
+    // MARK: - Initialization
+    //------------------------------------------------------
+    
+    @objc public func setupView() {
+        
+        backgroundColor = .clear
+        numberOfLines = 0
+        lineBreakMode = .byWordWrapping
+        translatesAutoresizingMaskIntoConstraints = false
+    }
+    
+    @objc public init() {
+        super.init(frame: .zero)
+        setupView()
+    }
+    
+    @objc required public init?(coder: NSCoder) {
+        super.init(coder: coder)
+        setupView()
+    }
+    
+    @objc override public init(frame: CGRect) {
+        super.init(frame: frame)
+        setupView()
+    }
+    
+    @objc convenience public init(standardFontSize size: CGFloat) {
+        self.init()
+        standardFontSize = size
+    }
+    
+    //------------------------------------------------------
+    // MARK: - Functions
+    //------------------------------------------------------
+    
+    @objc public static func commonLabelH1(_ scale: Bool) -> Label {
+        let label = Label.label()
+        label.styleH1(scale)
+        return label
+    }
+    
+    @objc public static func commonLabelH2(_ scale: Bool) -> Label {
+        let label = Label.label()
+        label.styleH2(scale)
+        return label
+    }
+    
+    @objc public static func commonLabelH3(_ scale: Bool) -> Label {
+        let label = Label.label()
+        label.styleH3(scale)
+        return label
+    }
+    
+    @objc public static func commonLabelH32(_ scale: Bool) -> Label {
+        let label = Label.label()
+        label.styleH32(scale)
+        return label
+    }
+    
+    @objc public static func commonLabelB1(_ scale: Bool) -> Label {
+        let label = Label.label()
+        label.styleB1(scale)
+        return label
+    }
+    
+    @objc public static func commonLabelB2(_ scale: Bool) -> Label {
+        let label = Label.label()
+        label.styleB2(scale)
+        return label
+    }
+    
+    @objc public static func commonLabelB3(_ scale: Bool) -> Label {
+        let label = Label.label()
+        label.styleB3(scale)
+        return label
+    }
+    
+    @objc public static func commonLabelB20(_ scale: Bool) -> Label {
+        let label = Label.label()
+        label.styleB20(scale)
+        return label
+    }
+    
+    @objc open class func label() -> Label {
+        return Label(frame: .zero)
+    }
+    
+    //------------------------------------------------------
+    // MARK: - Functions
+    //------------------------------------------------------
+    
+    @objc public static func setLabel(_ label: UILabel?, withHTML html: String?) {
+        
+        guard let data = html?.data(using: .utf8) else { return }
+        
+        do {
+            label?.attributedText = try NSAttributedString(data: data,
+                                                           options: [NSAttributedString.DocumentReadingOptionKey.documentType: NSAttributedString.DocumentType.html,
+                                                                     NSAttributedString.DocumentReadingOptionKey.characterEncoding: String.Encoding.utf8.rawValue],
+                                                           documentAttributes: nil)
+        } catch {
+            if let coreErrorObject = MVMCoreErrorObject.createErrorObject(for: error, location: "LabelHTMLParse") {
+                MVMCoreUILoggingHandler.shared()?.addError(toLog: coreErrorObject)
+            }
+        }
+    }
+    
+    @objc public static func setUILabel(_ label: UILabel?, withJSON json: [AnyHashable: Any]?, delegate: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        
+        guard let label = label else { return }
+        
+        label.text = json?.optionalStringForKey(KeyText)
+
+        setLabel(label, withHTML: json?.optionalStringForKey("html"))
+        
+        if let textColorHex = json?.optionalStringForKey(KeyTextColor), !textColorHex.isEmpty {
+            label.textColor = UIColor.mfGet(forHex: textColorHex)
+        }
+        
+        if let backgroundColorHex = json?.optionalStringForKey(KeyBackgroundColor), !backgroundColorHex.isEmpty {
+            label.backgroundColor = UIColor.mfGet(forHex: backgroundColorHex)
+        }
+        
+        label.accessibilityLabel = json?.optionalStringForKey("accessibilityText")
+        
+        let fontSize = json?["fontSize"] as? CGFloat
+        
+        if let fontName = json?.optionalStringForKey("fontName") {
+            label.font = MFFonts.mfFont(withName: fontName, size: fontSize ?? label.font.pointSize)
+        } else if let fontSize = fontSize {
+            label.font = label.font.withSize(fontSize)
+        }
+        
+        if let attributes = json?.arrayForKey("attributes"), let labelText = label.text {
+            let attributedString = NSMutableAttributedString(string: labelText, attributes: [NSAttributedString.Key.font: label.font as UIFont,
+                                                                                             NSAttributedString.Key.foregroundColor: label.textColor as UIColor])
+            for case let attribute as [String: Any] in attributes {
+
+                guard let attributeType = attribute.optionalStringForKey(KeyType),
+                    let location = attribute["location"] as? Int,
+                    let length = attribute["length"] as? Int
+                    else { continue }
+
+                let range = NSRange(location: location, length: length)
+
+                switch attributeType {
+                case "underline":
+                    attributedString.addAttribute(.underlineStyle, value: NSUnderlineStyle.single.rawValue, range: range)
+
+                case "strikethrough":
+                    attributedString.addAttribute(.strikethroughStyle, value: NSUnderlineStyle.thick.rawValue, range: range)
+
+                case "color":
+                    if let colorHex = attribute.optionalStringForKey(KeyTextColor), !colorHex.isEmpty {
+                        attributedString.removeAttribute(.foregroundColor, range: range)
+                        attributedString.addAttribute(.foregroundColor, value: UIColor.mfGet(forHex: colorHex), range: range)
+                    }
+                case "font":
+                    let fontSize = attribute["size"] as? CGFloat
+                    var font: UIFont?
+
+                    if let fontName = attribute.optionalStringForKey("name") {
+                        font = MFFonts.mfFont(withName: fontName, size: fontSize ?? label.font.pointSize)
+                    } else if let fontSize = fontSize {
+                        font = label.font.withSize(fontSize)
+                    }
+
+                    if let font = font {
+                        attributedString.removeAttribute(.font, range: range)
+                        attributedString.addAttribute(.font, value: font, range: range)
+                    }
+                default:
+                    continue
+                }
+            }
+            label.attributedText = attributedString
+        }
+    }
+    
+    //------------------------------------------------------
+    // MARK: - Methods
+    //------------------------------------------------------
+    
+    @objc public func styleH1(_ scale: Bool) {
+        MFStyler.styleLabelH1(self, genericScaling: false)
+        setScale(scale)
+    }
+    
+    @objc public func styleH2(_ scale: Bool) {
+        MFStyler.styleLabelH2(self, genericScaling: false)
+        setScale(scale)
+    }
+    
+    @objc public func styleH3(_ scale: Bool) {
+        MFStyler.styleLabelH3(self, genericScaling: false)
+        setScale(scale)
+    }
+    
+    @objc public func styleH32(_ scale: Bool) {
+        MFStyler.styleLabelH32(self, genericScaling: false)
+        setScale(scale)
+    }
+    
+    @objc public func styleB1(_ scale: Bool) {
+        MFStyler.styleLabelB1(self, genericScaling: false)
+        setScale(scale)
+    }
+    
+    @objc public func styleB2(_ scale: Bool) {
+        MFStyler.styleLabelB2(self, genericScaling: false)
+        setScale(scale)
+    }
+    
+    @objc public func styleB3(_ scale: Bool) {
+        MFStyler.styleLabelB3(self, genericScaling: false)
+        setScale(scale)
+    }
+    
+    @objc public func styleB20(_ scale: Bool) {
+        MFStyler.styleLabelB20(self, genericScaling: false)
+        setScale(scale)
+    }
+    
+    @objc public func updateView(_ size: CGFloat) {
+        scaleSize = size as NSNumber
+        
+        if let originalAttributedString = originalAttributedString {
+            let attributedString = NSMutableAttributedString(attributedString: originalAttributedString)
+            attributedString.removeAttribute(.font, range: NSRange(location: 0, length: attributedString.length))
+            originalAttributedString.enumerateAttribute(.font, in: NSRange(location: 0, length: originalAttributedString.length), options: [], using: { value, range, stop in
+                // Loop the original attributed string, resize the fonts.
+                if let fontObj = value as? UIFont, let stylerSize = MFStyler.sizeObjectGeneric(forCurrentDevice: fontObj.pointSize)?.getValueBased(onSize: size) {
+                    attributedString.addAttribute(.font, value: fontObj.withSize(stylerSize) as Any, range: range)
+                }
+            })
+            attributedText = attributedString
+            
+        } else if !MVMCoreGetterUtility.fequal(a: Float(standardFontSize), b: 0.0), let sizeObject: MFSizeObject = self.sizeObject ?? MFStyler.sizeObjectGeneric(forCurrentDevice: standardFontSize) {
+            self.font = self.font.withSize(sizeObject.getValueBased(onSize: size))
+        }
+    }
+    
+    @objc public func setFont(_ font: UIFont, scale: Bool) {
+        self.font = font
+        setScale(scale)
+    }
+    
+    @objc public func setScale(_ scale: Bool) {
+        if scale {
+            standardFontSize = font.pointSize
+            if let floatScale = scaleSize?.floatValue {
+                updateView(CGFloat(floatScale))
+            } else {
+                updateView(MVMCoreUISplitViewController.getApplicationViewWidth())
+            }
+        } else {
+            standardFontSize = 0
+        }
+    }
+    
+    //------------------------------------------------------
+    // MARK: - Atomization
+    //------------------------------------------------------
+    
+    @objc public func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: DelegateObject?, additionalData: [AnyHashable: Any]?) {
+        Label.setUILabel(self, withJSON: json, delegate: delegateObject, additionalData: additionalData)
+        
+        originalAttributedString = attributedText
+    }
+}
+
+extension Label {
+
+}
diff --git a/MVMCoreUI/Atoms/Views/LabelView.h b/MVMCoreUI/Atoms/Views/LabelView.h
index 6e20d0b6..a6b1948c 100644
--- a/MVMCoreUI/Atoms/Views/LabelView.h
+++ b/MVMCoreUI/Atoms/Views/LabelView.h
@@ -8,12 +8,12 @@
 
 #import <UIKit/UIKit.h>
 #import <MVMCoreUI/ViewConstrainingView.h>
-#import <MVMCoreUI/MFLabel.h>
+@class Label;
 
 @interface LabelView : ViewConstrainingView
 
 // Customize the label.
-@property (nullable, weak, nonatomic) MFLabel *label;
+@property (nullable, weak, nonatomic) Label *label;
 
 // Change the alignment of the label
 - (void)alignLeft;
diff --git a/MVMCoreUI/Atoms/Views/LabelView.m b/MVMCoreUI/Atoms/Views/LabelView.m
index 15915cec..56091d24 100644
--- a/MVMCoreUI/Atoms/Views/LabelView.m
+++ b/MVMCoreUI/Atoms/Views/LabelView.m
@@ -8,6 +8,7 @@
 
 #import <MVMCoreUI/LabelView.h>
 #import "MFStyler.h"
+#import <MVMCoreUI/MVMCoreUI-Swift.h>
 @interface LabelView ()
 
 // Change to customize.
@@ -32,7 +33,7 @@
     if (!self.label) {
         self.backgroundColor = [UIColor clearColor];
         
-        MFLabel *label = [MFLabel commonLabelB2:YES];
+        Label *label = [Label commonLabelB2:YES];
         [self addSubview:label];
         self.label = label;
         
diff --git a/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift b/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
index 60121c3a..ca314365 100644
--- a/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
+++ b/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
@@ -10,9 +10,9 @@
 import MVMCore
 
 public typealias ActionBlock = () -> Void
-private typealias ActionableStringTuple = (front: String?, middle: String?, end: String?)
-public typealias ActionObjectDelegate = (NSObjectProtocol & MVMCoreActionDelegateProtocol)
-public typealias ButtonObjectDelegate = (NSObjectProtocol & ButtonDelegateProtocol)
+private typealias ActionableStringTuple = (front: String?, action: String?, end: String?)
+public typealias ActionObjectDelegate = NSObjectProtocol & MVMCoreActionDelegateProtocol
+public typealias ButtonObjectDelegate = NSObjectProtocol & ButtonDelegateProtocol
 public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProtocol & MVMCoreLoadDelegateProtocol & MVMCorePresentationDelegateProtocol & NSObjectProtocol
 
 
@@ -22,11 +22,11 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
     //------------------------------------------------------
     
     public var actionBlock: ActionBlock?
-    public weak var label: MFLabel?
+    public weak var label: Label?
     
     public var attributedText: NSAttributedString? {
         willSet(newAttributedText) {
-            if let newAttribText = newAttributedText, !newAttribText.string.isEmpty {
+            if let newAttribText = newAttributedText {
                 
                 let mutableAttributedText = NSMutableAttributedString(attributedString: newAttribText)
                 let paragraphStyle = NSMutableParagraphStyle()
@@ -62,6 +62,10 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
         }
     }
     
+    private var actionRange: NSRange {
+        return NSRange(location: frontText?.count ?? 0, length: actionText?.count ?? 0)
+    }
+    
     public var makeWholeViewClickable = false
     
     override open var isEnabled: Bool {
@@ -74,9 +78,16 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
     public var actionText: String?
     public var backText: String?
     
-    private var text: String? {
-        willSet(newText) {
-            attributedText = NSAttributedString(string: newText ?? "")
+    private var internalText: String = ""
+    
+    public var text: String? {
+        get {
+            return internalText
+        }
+        set {
+            guard let text = newValue else { return }
+            internalText = text
+            attributedText = NSAttributedString(string: text)
             setAlternateNormalTextAttributes([NSAttributedString.Key.font: normalTextFont as Any])
             setAlternateActionTextAttributes([NSAttributedString.Key.font: actionTextFont as Any])
             setAlternateNormalTextAttributes([NSAttributedString.Key.foregroundColor: normalTextColor as Any])
@@ -89,7 +100,7 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
     //------------------------------------------------------
     
     public init() {
-        super.init(frame: CGRect.zero)
+        super.init(frame: .zero)
         setup()
     }
     
@@ -103,15 +114,9 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
         setup()
     }
     
-    public init(frontText: String?, actionText: String?, backText: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
-        super.init(frame: CGRect.zero)
-        
-        setFrontText(frontText, actionText: actionText, actionMap: actionMap, backText: backText, additionalData: additionalData, delegate: delegate, buttonDelegate: buttonDelegate)
-    }
-    
     // MARK: - legacy
     public init(frontText: String?, actionText: String?, backText: String?, actionBlock block: ActionBlock?) {
-        super.init(frame: CGRect.zero)
+        super.init(frame: .zero)
         
         self.frontText = frontText
         self.actionText = actionText
@@ -121,42 +126,46 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
         setup()
     }
     
-    public convenience init(actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
+    public convenience init(actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
+        self.init(frontText: actionMap?.optionalStringForKey(KeyTitlePrefix),
+                  actionText: actionMap?.optionalStringForKey(KeyTitle),
+                  backText: actionMap?.optionalStringForKey(KeyTitlePostfix),
+                  actionMap: actionMap, additionalData: additionalData,
+                  delegateObject: delegateObject)
+    }
+    
+    public convenience init(frontText: String?, backText: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
+        self.init(frontText: frontText,
+                  actionText: actionMap?.optionalStringForKey(KeyTitle),
+                  backText: backText,
+                  actionMap: actionMap,
+                  additionalData: additionalData,
+                  delegateObject: delegateObject)
+    }
+    
+    public init(frontText: String?, actionText: String?, backText: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
+        super.init(frame: CGRect.zero)
         
-        self.init(frontText: actionMap?.optionalStringForKey(KeyTitlePrefix), actionText: actionMap?.optionalStringForKey(KeyTitle), backText: actionMap?.optionalStringForKey(KeyTitlePostfix), actionMap: actionMap, additionalData: additionalData, actionDelegate: delegate, buttonDelegate: buttonDelegate)
-    }
-    
-    public convenience init(frontText: String?, backText: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
-        
-        self.init(frontText: frontText, actionText: actionMap?.optionalStringForKey(KeyTitle), backText: backText, actionMap: actionMap, additionalData: additionalData, actionDelegate: delegate, buttonDelegate: buttonDelegate)
-    }
-    
-    public convenience init(frontText: String?, actionText: String?, backText: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
-        self.init(frontText: frontText, actionText: actionText, backText: backText, actionMap: actionMap, additionalData: additionalData, actionDelegate: delegate, buttonDelegate: nil)
-    }
-    
-    public convenience init(actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
-        self.init(frontText: actionMap?.optionalStringForKey(KeyTitlePrefix), actionText: actionMap?.optionalStringForKey(KeyTitle), backText: actionMap?.optionalStringForKey(KeyTitlePostfix), actionMap: actionMap, additionalData: additionalData, actionDelegate: delegate)
-    }
-    
-    public convenience init(frontText: String?, backText: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
-        self.init(frontText: frontText, actionText: actionMap?.optionalStringForKey(KeyTitle), backText: backText, actionMap: actionMap, additionalData: additionalData, actionDelegate: delegate)
+        setFrontText(frontText, actionText: actionText, actionMap: actionMap, backText: backText, additionalData: additionalData, delegateObject: delegateObject)
     }
     
     // Convenience Initializer which assumes that the clickable text will be embedded in curly braces {}.
-    public convenience init(clickableTextEmbeddedInCurlyBraces fullText: String?, actionMapForClickableText actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
-        self.init(text: fullText, startTag: "{", endTag: "}", actionMap: actionMap, additionalData: additionalData, actionDelegate: delegate)
+    public convenience init(clickableTextEmbeddedInCurlyBraces fullText: String?, actionMapForClickableText actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
+        self.init(text: fullText,
+                  startTag: "{",
+                  endTag: "}",
+                  actionMap: actionMap,
+                  additionalData: additionalData,
+                  delegateObject: delegateObject)
     }
     
-    public init(text fullText: String?, startTag: String?, endTag: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
+    public init(text fullText: String?, startTag: String?, endTag: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
         super.init(frame: CGRect.zero)
         
         setText(fullText, startTag: startTag, endTag: endTag)
         
-        weak var weakDelegate: ActionObjectDelegate? = delegate
-        
         actionBlock = {
-            MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegate: weakDelegate as? CoreObjectActionLoadPresentDelegate)
+            MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
         }
     }
     
@@ -167,7 +176,7 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
     private func setup() {
         
         if self.label == nil {
-            let label = MFLabel(frame: CGRect.zero)
+            let label = Label(frame: CGRect.zero)
             
             backgroundColor = .clear
             label.isUserInteractionEnabled = false
@@ -186,13 +195,11 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
         self.label?.attributedText = attributedText
         self.label?.accessibilityTraits = .button
     }
-    
-    private func
-        setActionMap(_ actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
+
+    @objc public func setActionMap(_ actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
         
         weak var weakSelf: LabelWithInternalButton? = self
-        weak var weakDelegate: ActionObjectDelegate? = delegate
-        weak var weakButtonDelegate: ButtonObjectDelegate? = buttonDelegate
+        weak var weakButtonDelegate: ButtonDelegateProtocol? = (delegateObject as? MVMCoreUIDelegateObject)?.buttonDelegate
         
         actionBlock = {
             var performAction = true
@@ -201,8 +208,8 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
                 performAction = wButtonDelegate.button?(wSelf, shouldPerformActionWithMap: actionMap, additionalData: additionalData) ?? false
             }
             
-            if let wDelegate = weakDelegate as? CoreObjectActionLoadPresentDelegate, performAction {
-                MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegate: wDelegate)
+            if performAction {
+                MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
             }
         }
     }
@@ -211,26 +218,22 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
     // MARK: - Methods
     //------------------------------------------------------
     
-    @objc public func setFrontText(_ frontText: String?, actionMap: [AnyHashable: Any]?, backText: String?, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
-        setFrontText(frontText, actionText: actionMap?.optionalStringForKey(KeyTitle), actionMap: actionMap, backText: backText, additionalData: additionalData, delegate: delegate, buttonDelegate: buttonDelegate)
-    }
-    
-    @objc public func setFrontText(_ frontText: String?, actionText: String?, actionMap: [AnyHashable: Any]?, backText: String?, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
+    @objc public func setFrontText(_ frontText: String?, actionText: String?, actionMap: [AnyHashable: Any]?, backText: String?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
         
         self.frontText = frontText
-        setActionMap(actionMap, additionalData: additionalData, actionDelegate: delegate, buttonDelegate: buttonDelegate)
+        setActionMap(actionMap, additionalData: additionalData, delegateObject: delegateObject)
         self.actionText = actionText
         self.backText = backText
         text = getTextFromStringComponents()
         setup()
     }
     
-    @objc public func setFrontAttributedText(_ frontAttributedText: NSAttributedString?, actionMap: [AnyHashable: Any]?, backAttributedText backText: NSAttributedString?, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
+    @objc public func setFrontText(_ frontText: String?, actionMap: [AnyHashable: Any]?, backText: String?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
         
-        setFrontAttributedText(frontAttributedText, actionMap: actionMap, backAttributedText: backText, addNewLine: false, additionalData: additionalData, delegate: delegate, buttonDelegate: buttonDelegate)
+        setFrontText(frontText, actionText: actionMap?.optionalStringForKey(KeyTitle), actionMap: actionMap, backText: backText, additionalData: additionalData, delegateObject: delegateObject)
     }
     
-    private func setFrontAttributedText(_ frontAttributedText: NSAttributedString?, actionMap: [AnyHashable: Any]?, backAttributedText: NSAttributedString?, addNewLine: Bool, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
+    @objc public func setFrontAttributedText(_ frontAttributedText: NSAttributedString?, actionMap: [AnyHashable: Any]?, backAttributedText: NSAttributedString?, addNewLine: Bool, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
         
         let mutableAttributedString = NSMutableAttributedString()
         
@@ -248,7 +251,7 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
             
             let actionStringOnLine = actionString + (addNewLine ? "\n" : " ")
             actionText = actionStringOnLine
-            setActionMap(actionMap, additionalData: additionalData, actionDelegate: delegate, buttonDelegate: buttonDelegate)
+            setActionMap(actionMap, additionalData: additionalData, delegateObject: delegateObject)
             mutableAttributedString.append(MFStyler.styleGetAttributedString(actionStringOnLine, font: b2Font, color: .black))
             
         } else {
@@ -297,7 +300,7 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
         
         let location: CGPoint? = touches?.first?.location(in: label)
         let actionString = actionText
-        let index: Int = getActionRange().location
+        let index: Int = actionRange.location
         let rangeArray = getRangeArrayOfWords(in: actionString, withInitalIndex: index)
         let rectArray = getRectArray(fromRangeArray: rangeArray)
         var result = false
@@ -335,11 +338,6 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
         return "\(frontText ?? "")\(actionText ?? "")\(backText ?? "")"
     }
     
-    private func getActionRange() -> NSRange {
-        
-        return NSRange(location: frontText?.count ?? 0, length: actionText?.count ?? 0)
-    }
-    
     private func getRangeArrayOfWords(in string: String?, withInitalIndex index: Int) -> [Any]? {
         
         var index = index
@@ -383,22 +381,29 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
         
         let actionableTuple: ActionableStringTuple = rangeOfText(text, startTag: startTag, endTag: endTag)
         
-        if let front = actionableTuple.front, let middle = actionableTuple.middle, let end = actionableTuple.end {
+        if let text = text,
+            let leftTag = startTag,
+            text.contains(leftTag),
+            let rightTag = endTag,
+            text.contains(rightTag),
+            let front = actionableTuple.front,
+            let middle = actionableTuple.action,
+            let end = actionableTuple.end {
+            
             frontText = front.trimmingCharacters(in: .whitespaces)
             actionText = middle.trimmingCharacters(in: .whitespaces)
             backText = end.trimmingCharacters(in: .whitespaces)
-            self.text = getTextFromStringComponents()
         } else {
             frontText = text
-            self.text = text
         }
         
+        self.text = getTextFromStringComponents()
         setup()
     }
     
     private func rangeOfText(_ text: String?, startTag: String?, endTag: String?) -> ActionableStringTuple {
         
-        var actionableTuple: ActionableStringTuple = (front: nil, middle: nil, end: nil)
+        var actionableTuple: ActionableStringTuple = (front: nil, action: nil, end: nil)
         
         guard let text = text else { return actionableTuple }
         
@@ -409,46 +414,31 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
             
             if let rightTag = endTag, text.contains(rightTag) {
                 let secondHalf = firstHalf[1].components(separatedBy: rightTag)
-                actionableTuple.middle = secondHalf[0]
+                actionableTuple.action = secondHalf[0]
                 actionableTuple.end = secondHalf[1]
             }
         }
- 
+        
         return actionableTuple
     }
     
-    @objc public func setActionMap(_ actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
-        
-        setActionMap(actionMap, additionalData: additionalData, actionDelegate: delegate, buttonDelegate: nil)
-    }
-    
     // Reset the text and action map
-    @objc public func setTextWithClickableTextEmbeddedInCurlyBraces(_ text: String?, textAttributes attributes: [AnyHashable: Any]?, actionMapForClickableText actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
+    @objc public func setTextWithClickableTextEmbeddedInCurlyBraces(_ text: String?, textAttributes attributes: [AnyHashable: Any]?, actionMapForClickableText actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
         
         attributedText = NSAttributedString(string: text ?? "", attributes: attributes as? [NSAttributedString.Key: Any])
-        setActionMap(actionMap, additionalData: additionalData, actionDelegate: delegate)
+        setActionMap(actionMap, additionalData: additionalData, delegateObject: delegateObject)
     }
     
-    @objc public func setWithText(_ fullText: String?, startTag: String?, endTag: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
+    @objc public func setWithText(_ fullText: String?, startTag: String?, endTag: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
         
         setText(fullText, startTag: startTag, endTag: endTag)
-        setActionMap(actionMap, additionalData: additionalData, actionDelegate: delegate)
-    }
-    
-    @objc public func setFrontText(_ frontText: String?, actionMap: [AnyHashable: Any]?, backText: String?, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?) {
-        
-        setFrontText(frontText, actionMap: actionMap, backText: backText, additionalData: additionalData, delegate: delegate, buttonDelegate: nil)
+        setActionMap(actionMap, additionalData: additionalData, delegateObject: delegateObject)
     }
     
     // Reset the front text, back text, action map
-    @objc public func setFrontAttributedText(_ frontAttributedText: NSAttributedString?, actionMap: [AnyHashable: Any]?, backAttributedText: NSAttributedString?, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?) {
+    @objc public func setFrontAttributedText(_ frontAttributedText: NSAttributedString?, actionMap: [AnyHashable: Any]?, backAttributedText: NSAttributedString?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
         
-        setFrontAttributedText(frontAttributedText, actionMap: actionMap, backAttributedText: backAttributedText, addNewLine: false, additionalData: additionalData, delegate: delegate)
-    }
-    
-    @objc public func setFrontAttributedText(_ frontAttributedText: NSAttributedString?, actionMap: [AnyHashable: Any]?, backAttributedText: NSAttributedString?, addNewLine: Bool, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?) {
-        
-        setFrontAttributedText(frontAttributedText, actionMap: actionMap, backAttributedText: backAttributedText, addNewLine: addNewLine, additionalData: additionalData, delegate: delegate, buttonDelegate: nil)
+        setFrontAttributedText(frontAttributedText, actionMap: actionMap, backAttributedText: backAttributedText, addNewLine: false, additionalData: additionalData, delegateObject: delegateObject)
     }
     
     @objc public func setAlignment(_ textAlignment: NSTextAlignment) {
@@ -462,7 +452,7 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
         let attributedString = NSMutableAttributedString(attributedString: thisAttributedText)
         
         if !attributedString.string.isEmpty {
-            attributedString.addAttributes(theseAttributes, range: getActionRange())
+            attributedString.addAttributes(theseAttributes, range: actionRange)
         }
         attributedText = attributedString
     }
@@ -500,16 +490,14 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
     }
     
     /// Used to just reset the texts and actions if already initialized
-    @objc public func reset(withActionMap actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?) {
+    @objc public func reset(withActionMap actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
         
         frontText = actionMap?.optionalStringForKey(KeyTitlePrefix)
         actionText = actionMap?.optionalStringForKey(KeyTitle)
         backText = actionMap?.optionalStringForKey(KeyTitlePostfix)
         
-        weak var weakDelegate: ActionObjectDelegate? = delegate
-        
         actionBlock = {
-            MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegate: weakDelegate as? CoreObjectActionLoadPresentDelegate)
+            MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
         }
         
         text = getTextFromStringComponents()
@@ -544,13 +532,203 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
         
         return UIAccessibilityCustomAction()
     }
-}
-
-extension LabelWithInternalButton: MVMCoreUIMoleculeViewProtocol {
+    
     //------------------------------------------------------
-    // MARK: - Atomization
+    // MARK: - Legacy for Delegate Change
     //------------------------------------------------------
     
+    @available(*, deprecated)
+    public init(frontText: String?, actionText: String?, backText: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
+        super.init(frame: CGRect.zero)
+        
+        setFrontText(frontText, actionText: actionText, actionMap: actionMap, backText: backText, additionalData: additionalData, delegate: delegate, buttonDelegate: buttonDelegate)
+    }
+    
+    @available(*, deprecated)
+    public convenience init(actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
+        
+        self.init(frontText: actionMap?.optionalStringForKey(KeyTitlePrefix), actionText: actionMap?.optionalStringForKey(KeyTitle), backText: actionMap?.optionalStringForKey(KeyTitlePostfix), actionMap: actionMap, additionalData: additionalData, actionDelegate: delegate, buttonDelegate: buttonDelegate)
+    }
+    
+    @available(*, deprecated)
+    public convenience init(frontText: String?, backText: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
+        
+        self.init(frontText: frontText, actionText: actionMap?.optionalStringForKey(KeyTitle), backText: backText, actionMap: actionMap, additionalData: additionalData, actionDelegate: delegate, buttonDelegate: buttonDelegate)
+    }
+    
+    @available(*, deprecated)
+    public convenience init(frontText: String?, actionText: String?, backText: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
+        self.init(frontText: frontText, actionText: actionText, backText: backText, actionMap: actionMap, additionalData: additionalData, actionDelegate: delegate, buttonDelegate: nil)
+    }
+    
+    @available(*, deprecated)
+    public convenience init(actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
+        self.init(frontText: actionMap?.optionalStringForKey(KeyTitlePrefix), actionText: actionMap?.optionalStringForKey(KeyTitle), backText: actionMap?.optionalStringForKey(KeyTitlePostfix), actionMap: actionMap, additionalData: additionalData, actionDelegate: delegate)
+    }
+    
+    @available(*, deprecated)
+    public convenience init(frontText: String?, backText: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
+        self.init(frontText: frontText, actionText: actionMap?.optionalStringForKey(KeyTitle), backText: backText, actionMap: actionMap, additionalData: additionalData, actionDelegate: delegate)
+    }
+    
+    // Convenience Initializer which assumes that the clickable text will be embedded in curly braces {}.
+    @available(*, deprecated)
+    public convenience init(clickableTextEmbeddedInCurlyBraces fullText: String?, actionMapForClickableText actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
+        self.init(text: fullText, startTag: "{", endTag: "}", actionMap: actionMap, additionalData: additionalData, actionDelegate: delegate)
+    }
+    
+    @available(*, deprecated)
+    public init(text fullText: String?, startTag: String?, endTag: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
+        super.init(frame: CGRect.zero)
+        
+        setText(fullText, startTag: startTag, endTag: endTag)
+        
+        weak var weakDelegate: ActionObjectDelegate? = delegate
+        
+        actionBlock = {
+            MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegate: weakDelegate as? CoreObjectActionLoadPresentDelegate)
+        }
+    }
+    
+    @available(*, deprecated)
+    private func setActionMap(_ actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
+        
+        weak var weakSelf: LabelWithInternalButton? = self
+        weak var weakDelegate: ActionObjectDelegate? = delegate
+        weak var weakButtonDelegate: ButtonObjectDelegate? = buttonDelegate
+        
+        actionBlock = {
+            var performAction = true
+            
+            if let wSelf = weakSelf, let wButtonDelegate = weakButtonDelegate, wButtonDelegate.responds(to: #selector(ButtonObjectDelegate.button(_:shouldPerformActionWithMap:additionalData:))) {
+                performAction = wButtonDelegate.button?(wSelf, shouldPerformActionWithMap: actionMap, additionalData: additionalData) ?? false
+            }
+            
+            if let wDelegate = weakDelegate as? CoreObjectActionLoadPresentDelegate, performAction {
+                MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegate: wDelegate)
+            }
+        }
+    }
+    
+    @available(*, deprecated)
+    @objc public func setFrontText(_ frontText: String?, actionMap: [AnyHashable: Any]?, backText: String?, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
+        setFrontText(frontText, actionText: actionMap?.optionalStringForKey(KeyTitle), actionMap: actionMap, backText: backText, additionalData: additionalData, delegate: delegate, buttonDelegate: buttonDelegate)
+    }
+    
+    @available(*, deprecated)
+    @objc public func setFrontText(_ frontText: String?, actionText: String?, actionMap: [AnyHashable: Any]?, backText: String?, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
+        
+        self.frontText = frontText
+        setActionMap(actionMap, additionalData: additionalData, actionDelegate: delegate, buttonDelegate: buttonDelegate)
+        self.actionText = actionText
+        self.backText = backText
+        text = getTextFromStringComponents()
+        setup()
+    }
+    
+    @available(*, deprecated)
+    @objc public func setFrontAttributedText(_ frontAttributedText: NSAttributedString?, actionMap: [AnyHashable: Any]?, backAttributedText backText: NSAttributedString?, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
+        
+        setFrontAttributedText(frontAttributedText, actionMap: actionMap, backAttributedText: backText, addNewLine: false, additionalData: additionalData, delegate: delegate, buttonDelegate: buttonDelegate)
+    }
+    
+    @available(*, deprecated)
+    private func setFrontAttributedText(_ frontAttributedText: NSAttributedString?, actionMap: [AnyHashable: Any]?, backAttributedText: NSAttributedString?, addNewLine: Bool, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?, buttonDelegate: ButtonObjectDelegate?) {
+        
+        let mutableAttributedString = NSMutableAttributedString()
+        
+        if let frontAttributedText = frontAttributedText {
+            mutableAttributedString.append(frontAttributedText)
+            // Need to do this to fix the range issue
+            frontText = frontAttributedText.string
+        }
+        
+        if let b2Font = MFStyler.fontB2(),
+            let actions = actionMap,
+            actions.keys.count > 0,
+            let actionString = actions.optionalStringForKey(KeyTitle),
+            !actionString.isEmpty {
+            
+            let actionStringOnLine = actionString + (addNewLine ? "\n" : " ")
+            actionText = actionStringOnLine
+            setActionMap(actionMap, additionalData: additionalData, actionDelegate: delegate, buttonDelegate: buttonDelegate)
+            mutableAttributedString.append(MFStyler.styleGetAttributedString(actionStringOnLine, font: b2Font, color: .black))
+            
+        } else {
+            actionText = nil
+            actionBlock = nil
+        }
+        
+        if let backAttributedText = backAttributedText {
+            mutableAttributedString.append(backAttributedText)
+        }
+        
+        attributedText = mutableAttributedString
+        // Added this line for underlining
+        setAlternateActionTextAttributes([NSAttributedString.Key.underlineStyle: NSNumber(value: NSUnderlineStyle.single.rawValue)])
+    }
+    
+    @available(*, deprecated)
+    @objc public func setActionMap(_ actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
+        
+        setActionMap(actionMap, additionalData: additionalData, actionDelegate: delegate, buttonDelegate: nil)
+    }
+    
+    // Reset the text and action map
+    @available(*, deprecated)
+    @objc public func setTextWithClickableTextEmbeddedInCurlyBraces(_ text: String?, textAttributes attributes: [AnyHashable: Any]?, actionMapForClickableText actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
+        
+        attributedText = NSAttributedString(string: text ?? "", attributes: attributes as? [NSAttributedString.Key: Any])
+        setActionMap(actionMap, additionalData: additionalData, actionDelegate: delegate)
+    }
+    
+    @available(*, deprecated)
+    @objc public func setWithText(_ fullText: String?, startTag: String?, endTag: String?, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, actionDelegate delegate: ActionObjectDelegate?) {
+        
+        setText(fullText, startTag: startTag, endTag: endTag)
+        setActionMap(actionMap, additionalData: additionalData, actionDelegate: delegate)
+    }
+    
+    @available(*, deprecated)
+    @objc public func setFrontText(_ frontText: String?, actionMap: [AnyHashable: Any]?, backText: String?, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?) {
+        
+        setFrontText(frontText, actionMap: actionMap, backText: backText, additionalData: additionalData, delegate: delegate, buttonDelegate: nil)
+    }
+    
+    // Reset the front text, back text, action map
+    @available(*, deprecated)
+    @objc public func setFrontAttributedText(_ frontAttributedText: NSAttributedString?, actionMap: [AnyHashable: Any]?, backAttributedText: NSAttributedString?, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?) {
+        
+        setFrontAttributedText(frontAttributedText, actionMap: actionMap, backAttributedText: backAttributedText, addNewLine: false, additionalData: additionalData, delegate: delegate)
+    }
+    
+    @available(*, deprecated)
+    @objc public func setFrontAttributedText(_ frontAttributedText: NSAttributedString?, actionMap: [AnyHashable: Any]?, backAttributedText: NSAttributedString?, addNewLine: Bool, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?) {
+        
+        setFrontAttributedText(frontAttributedText, actionMap: actionMap, backAttributedText: backAttributedText, addNewLine: addNewLine, additionalData: additionalData, delegate: delegate, buttonDelegate: nil)
+    }
+    
+    /// Used to just reset the texts and actions if already initialized
+    @available(*, deprecated)
+    @objc public func reset(withActionMap actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegate: ActionObjectDelegate?) {
+        
+        frontText = actionMap?.optionalStringForKey(KeyTitlePrefix)
+        actionText = actionMap?.optionalStringForKey(KeyTitle)
+        backText = actionMap?.optionalStringForKey(KeyTitlePostfix)
+        
+        weak var weakDelegate: ActionObjectDelegate? = delegate
+        
+        actionBlock = {
+            MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegate: weakDelegate as? CoreObjectActionLoadPresentDelegate)
+        }
+        
+        text = getTextFromStringComponents()
+        setup()
+    }
+}
+
+// MARK: - Atomization
+extension LabelWithInternalButton: MVMCoreUIMoleculeViewProtocol {
     // Default values for view.
     @objc open func setAsMolecule() {
         
diff --git a/MVMCoreUI/Atoms/Views/MFLabel.h b/MVMCoreUI/Atoms/Views/MFLabel.h
deleted file mode 100644
index 7dc4fd8d..00000000
--- a/MVMCoreUI/Atoms/Views/MFLabel.h
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-//  MFLabel.h
-//  mobilefirst
-//
-//  Created by Scott Pfeil on 3/22/17.
-//  Copyright © 2017 Verizon Wireless. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import <MVMCoreUI/MFView.h>
-@class MFSizeObject;
-@class DelegateObject;
-
-@interface MFLabel : UILabel <MVMCoreViewProtocol, MVMCoreUIMoleculeViewProtocol>
-
-- (nullable instancetype)initWithStandardFontSize:(CGFloat)size;
-
-// Set this property if you want updateView to update the font based on this standard and the size passed in.
-@property (nonatomic) CGFloat standardFontSize;
-
-// Set this to use a custom sizing object during updateView instead of the standard.
-@property (nonatomic, strong, nullable) MFSizeObject *sizeObject;
-
-// Set the font and set to scale
-- (void)setFont:(nonnull UIFont *)font scale:(BOOL)scale;
-
-// Convenience checker for text or attributed text.
-- (BOOL)hasText;
-
-#pragma mark - 2.0
-//75Bd 40pt
-+ (nonnull MFLabel *)commonLabelH1:(BOOL)scale;
-//75Bd 25pt
-+ (nonnull MFLabel *)commonLabelH2:(BOOL)scale;
-//75Bd 18pt
-+ (nonnull MFLabel *)commonLabelH3:(BOOL)scale;
-//75Bd 32pt
-+ (nonnull MFLabel *)commonLabelH32:(BOOL)scale;
-//75Bd 13pt
-+ (nonnull MFLabel *)commonLabelB1:(BOOL)scale;
-//55Rg 13pt
-+ (nonnull MFLabel *)commonLabelB2:(BOOL)scale;
-//55Rg 11pt gray
-+ (nonnull MFLabel *)commonLabelB3:(BOOL)scale;
-//55Rg 20pt
-+ (nonnull MFLabel *)commonLabelB20:(BOOL)scale;
-
-// Getters
-+ (nonnull MFLabel *)label NS_SWIFT_NAME(commonLabel());
-
-// Setters
-+ (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html;
-+ (void)setUILabel:(nullable UILabel *)label withJSON:(nullable NSDictionary *)json delegateObject:(nullable DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData;
-
-- (void)styleH1:(BOOL)scale;
-- (void)styleH2:(BOOL)scale;
-- (void)styleH3:(BOOL)scale;
-- (void)styleH32:(BOOL)scale;
-- (void)styleB1:(BOOL)scale;
-- (void)styleB2:(BOOL)scale;
-- (void)styleB3:(BOOL)scale;
-- (void)styleB20:(BOOL)scale;
-
-@end
diff --git a/MVMCoreUI/Atoms/Views/MFLabel.m b/MVMCoreUI/Atoms/Views/MFLabel.m
deleted file mode 100644
index 5fb19037..00000000
--- a/MVMCoreUI/Atoms/Views/MFLabel.m
+++ /dev/null
@@ -1,291 +0,0 @@
-//
-//  MFLabel.m
-//  mobilefirst
-//
-//  Created by Scott Pfeil on 3/22/17.
-//  Copyright © 2017 Verizon Wireless. All rights reserved.
-//
-
-#import "MFLabel.h"
-#import <MVMCoreUI/MFStyler.h>
-#import <MVMCoreUI/MFSizeObject.h>
-#import <MVMCoreUI/MVMCoreUIConstants.h>
-#import "UIColor+MFConvenience.h"
-#import "MFFonts.h"
-#import "MVMCoreUISplitViewController.h"
-#import "MVMCoreUILoggingHandler.h"
-@import MVMCore.MVMCoreGetterUtility;
-@import MVMCore.NSDictionary_MFConvenience;
-@import MVMCore.MVMCoreJSONConstants;
-
-@interface MFLabel ()
-
-@property (strong, nonatomic) NSNumber *scaleSize;
-
-// Used for scaling the font in updateView.
-@property (strong, nonatomic) NSAttributedString *originalAttributedString;
-
-@end
-
-@implementation MFLabel
-
-- (void)setupView {
-    self.backgroundColor = [UIColor clearColor];
-    self.numberOfLines = 0;
-    self.lineBreakMode = NSLineBreakByWordWrapping;
-    self.translatesAutoresizingMaskIntoConstraints = NO;
-}
-
-- (instancetype)init {
-    if (self = [super init]) {
-        [self setupView];
-    }
-    return self;
-}
-
-- (instancetype)initWithCoder:(NSCoder *)coder {
-    self = [super initWithCoder:coder];
-    if (self) {
-        [self setupView];
-    }
-    return self;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        [self setupView];
-    }
-    return self;
-}
-
-- (instancetype)initWithStandardFontSize:(CGFloat)size {
-    if ([self init]) {
-        self.standardFontSize = size;
-    }
-    return self;
-}
-
-- (void)updateView:(CGFloat)size {
-    self.scaleSize = @(size);
-    if (self.originalAttributedString) {
-        NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithAttributedString:self.originalAttributedString];
-        [attributedString removeAttribute:NSFontAttributeName range:NSMakeRange(0, attributedString.length)];
-        [self.originalAttributedString enumerateAttribute:NSFontAttributeName inRange:NSMakeRange(0, self.originalAttributedString.length) options:0 usingBlock:^(UIFont *value, NSRange range, BOOL * _Nonnull stop) {
-            // Loop the original attributed string, resize the fonts.
-            UIFont *font = [value fontWithSize:[[MFStyler sizeObjectGenericForCurrentDevice:value.pointSize] getValueBasedOnSize:size]];
-            [attributedString addAttribute:NSFontAttributeName value:font range:range];
-        }];
-        self.attributedText = attributedString;
-    } else if (!fequal(self.standardFontSize, 0)) {
-        MFSizeObject *sizeObject = self.sizeObject;
-        if (!sizeObject) {
-           sizeObject = [MFStyler sizeObjectGenericForCurrentDevice:self.standardFontSize];
-        }
-        self.font = [self.font fontWithSize:[sizeObject getValueBasedOnSize:size]];
-    }
-}
-
-- (void)setFont:(nonnull UIFont *)font scale:(BOOL)scale {
-    self.font = font;
-    [self setScale:scale];
-}
-
-- (void)setScale:(BOOL)scale {
-    if (scale) {
-        self.standardFontSize = self.font.pointSize;
-        [self updateView:(self.scaleSize ? self.scaleSize.floatValue : [MVMCoreUISplitViewController getApplicationViewWidth])];
-    } else {
-        self.standardFontSize = 0;
-    }
-}
-
-- (BOOL)hasText {
-    return self.text.length > 0 || self.attributedText.length > 0;
-}
-
-#pragma mark - 2.0
-
-+ (nonnull MFLabel *)commonLabelH1:(BOOL)scale {
-    MFLabel *label = [MFLabel label];
-    [label styleH1:scale];
-    return label;
-}
-
-+ (nonnull MFLabel *)commonLabelH2:(BOOL)scale {
-    MFLabel *label = [MFLabel label];
-    [label styleH2:scale];
-    return label;
-}
-
-+ (nonnull MFLabel *)commonLabelH3:(BOOL)scale {
-    MFLabel *label = [MFLabel label];
-    [label styleH3:scale];
-    return label;
-}
-+ (nonnull MFLabel *)commonLabelH32:(BOOL)scale {
-    MFLabel *label = [MFLabel label];
-    [label styleH32:scale];
-    return label;
-}
-
-+ (nonnull MFLabel *)commonLabelB1:(BOOL)scale {
-    MFLabel *label = [MFLabel label];
-    [label styleB1:scale];
-    return label;
-}
-
-+ (nonnull MFLabel *)commonLabelB2:(BOOL)scale {
-    MFLabel *label = [MFLabel label];
-    [label styleB2:scale];
-    return label;
-}
-
-+ (nonnull MFLabel *)commonLabelB3:(BOOL)scale {
-    MFLabel *label = [MFLabel label];
-    [label styleB3:scale];
-    return label;
-}
-
-+ (nonnull MFLabel *)commonLabelB20:(BOOL)scale {
-    MFLabel *label = [MFLabel label];
-    [label styleB20:scale];
-    return label;
-}
-
-+ (nonnull MFLabel *)label {
-    return [[MFLabel alloc] initWithFrame:CGRectZero];
-}
-
-#pragma mark - Setters
-
-+ (void)setLabel:(nullable UILabel *)label withHTML:(nullable NSString *)html {
-    NSData *data = [html dataUsingEncoding:kCFStringEncodingUTF8];
-    if (data) {
-        NSError *error = nil;
-        label.attributedText = [[NSAttributedString alloc] initWithData:data options:@{NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType} documentAttributes:nil error:&error];
-        if (error) {
-            [[MVMCoreUILoggingHandler sharedLoggingHandler] addErrorToLog:[MVMCoreErrorObject createErrorObjectForNSError:error location:@"LabelHTMLParse"]];
-        }
-    }
-}
-
-+ (void)setUILabel:(nullable UILabel *)label withJSON:(nullable NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(nullable NSDictionary *)additionalData {
-    if (label) {
-        label.text = [json string:KeyText];
-        [self setLabel:label withHTML:[json string:@"html"]];
-        NSString *textColor = [json string:KeyTextColor];
-        if (textColor) {
-            label.textColor = [UIColor mfGetColorForHex:textColor];
-        }
-        NSString *backgroundColor = [json string:KeyBackgroundColor];
-        if (backgroundColor) {
-            label.backgroundColor = [UIColor mfGetColorForHex:backgroundColor];
-        }
-        NSString *accessibilityText = [json string:@"accessibilityText"];
-        if (accessibilityText) {
-            label.accessibilityLabel = accessibilityText;
-        }
-        NSString *fontName = [json string:@"fontName"];
-        NSNumber *fontSize = [json optionalNumberForKey:@"fontSize"];
-        if (fontName) {
-            label.font = [MFFonts mfFontWithName:fontName size:fontSize ? fontSize.doubleValue : label.font.pointSize];
-        } else if (fontSize) {
-            label.font = [label.font fontWithSize:fontSize.doubleValue];
-        }
-        
-        NSArray *attributes = [json array:@"attributes"];
-        if (attributes) {
-            NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:label.text attributes:@{NSFontAttributeName:label.font,NSForegroundColorAttributeName:label.textColor}];
-            for (NSDictionary *attribute in attributes) {
-                NSNumber *location = [attribute optionalNumberForKey:@"location"];
-                NSNumber *length = [attribute optionalNumberForKey:@"length"];
-                if (location && length) {
-                    NSRange range = NSMakeRange(location.unsignedIntegerValue, length.unsignedIntegerValue);
-                    NSString *type = [attribute string:KeyType];
-                    if ([type isEqualToString:@"underline"]) {
-                        [attributedString addAttribute:NSUnderlineStyleAttributeName value:@(NSUnderlineStyleSingle) range:range];
-                    } else if ([type isEqualToString:@"strikethrough"]) {
-                        [attributedString addAttribute:NSStrikethroughStyleAttributeName value:@(NSUnderlineStyleThick) range:range];
-                    } else if ([type isEqualToString:@"color"]) {
-                        NSString *color = [attribute string:KeyTextColor];
-                        if (color) {
-                            [attributedString addAttribute:NSForegroundColorAttributeName value:[UIColor mfGetColorForHex:color] range:range];
-                        }
-                    } else if ([type isEqualToString:@"font"]) {
-                        NSString *fontName = [attribute string:@"name"];
-                        NSNumber *fontSize = [attribute optionalNumberForKey:@"size"];
-                        UIFont *font = nil;
-                        if (fontName) {
-                           font = [MFFonts mfFontWithName:fontName size:fontSize ? fontSize.doubleValue : label.font.pointSize];
-                        } else if (fontSize) {
-                            font = [label.font fontWithSize:fontSize.doubleValue];
-                        }
-                        if (font) {
-                            [attributedString addAttribute:NSFontAttributeName value:font range:range];
-                        }
-                    }
-                }
-            }
-            label.attributedText = attributedString;
-        }
-    }
-}
-
-- (void)setWithJSON:(NSDictionary *)json delegateObject:(DelegateObject *)delegateObject additionalData:(NSDictionary *)additionalData {
-    [MFLabel setUILabel:self withJSON:json delegateObject:delegateObject additionalData:additionalData];
-    self.originalAttributedString = self.attributedText;
-}
-
-- (void)styleH1:(BOOL)scale {
-    [MFStyler styleLabelH1:self genericScaling:NO];
-    [self setScale:scale];
-}
-
-- (void)styleH2:(BOOL)scale {
-    [MFStyler styleLabelH2:self genericScaling:NO];
-    [self setScale:scale];
-}
-
-- (void)styleH3:(BOOL)scale {
-    [MFStyler styleLabelH3:self genericScaling:NO];
-    [self setScale:scale];
-}
-
-- (void)styleH32:(BOOL)scale {
-    [MFStyler styleLabelH32:self genericScaling:NO];
-    [self setScale:scale];
-}
-
-- (void)styleB1:(BOOL)scale {
-    [MFStyler styleLabelB1:self genericScaling:NO];
-    [self setScale:scale];
-}
-
-- (void)styleB2:(BOOL)scale {
-    [MFStyler styleLabelB2:self genericScaling:NO];
-    [self setScale:scale];
-}
-
-- (void)styleB3:(BOOL)scale {
-    [MFStyler styleLabelB3:self genericScaling:NO];
-    [self setScale:scale];
-}
-
-- (void)styleB20:(BOOL)scale {
-    [MFStyler styleLabelB20:self genericScaling:NO];
-    [self setScale:scale];
-}
-
-- (void)setAccessibilityTraits:(UIAccessibilityTraits)accessibilityTraits {
-    
-    if (accessibilityTraits& UIAccessibilityTraitHeader) {
-        UIAccessibilityTraits noHeaderTraits =  accessibilityTraits - UIAccessibilityTraitHeader;
-        [super setAccessibilityTraits:noHeaderTraits];
-    } else {
-        [super setAccessibilityTraits:accessibilityTraits];
-    }
-    
-}
-
-@end
diff --git a/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.h b/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.h
index 853293c7..fc76ed71 100644
--- a/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.h
+++ b/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.h
@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 #import <MVMCoreUI/MFView.h>
 #import <MVMCoreUI/MVMCoreUICheckMarkView.h>
-#import <MVMCoreUI/MFLabel.h>
+@class Label;
 @class MFSizeObject;
 
 @interface MVMCoreUICheckBox : UIControl <MVMCoreViewProtocol>
@@ -23,7 +23,7 @@
 @property (nullable, strong, nonatomic) UIColor *unCheckedColor;
 
 // Label to the right of the check box.
-@property (nullable, weak, nonatomic) MFLabel *descriptionLabel;
+@property (nullable, weak, nonatomic) Label *descriptionLabel;
 
 // Setter for the descriptionLabel.text. Also sets the accessibility text.
 @property (nullable, strong, nonatomic) NSString *descriptionText;
diff --git a/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m b/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m
index 00415b71..9d3b80a9 100644
--- a/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m
+++ b/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m
@@ -18,7 +18,6 @@
 #import "MFStyler.h"
 #import <MVMCoreUI/MVMCoreUI-Swift.h>
 
-
 static const CGFloat FaultTolerance = 20.f;
 static const CGFloat CheckBoxHeightWidth = 18.0;
 
@@ -227,7 +226,7 @@ static const CGFloat CheckBoxHeightWidth = 18.0;
 	
 	//label
 	if (!self.descriptionLabel) {
-		MFLabel *descriptionLabel = [MFLabel commonLabelB2:YES];
+		Label *descriptionLabel = [Label commonLabelB2:YES];
 		[containterView addSubview:descriptionLabel];
         [NSLayoutConstraint constraintPinSubview:descriptionLabel pinCenterX:NO pinCenterY:YES];
         [NSLayoutConstraint constraintPinSubview:descriptionLabel pinTop:NO pinBottom:NO pinLeft:NO pinRight:YES];
diff --git a/MVMCoreUI/BaseControllers/MFScrollingViewController.m b/MVMCoreUI/BaseControllers/MFScrollingViewController.m
index f6e2c4d3..5486b54a 100644
--- a/MVMCoreUI/BaseControllers/MFScrollingViewController.m
+++ b/MVMCoreUI/BaseControllers/MFScrollingViewController.m
@@ -93,7 +93,7 @@ static NSTimeInterval const HandScrollAnimationTiming = 7.f;
     
     BOOL automaticInset = NO;
     if (@available(iOS 11.0, *)) {
-        automaticInset = self.scrollView.contentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentAutomatic;
+        automaticInset = self.navigationController && self.scrollView.contentInsetAdjustmentBehavior == UIScrollViewContentInsetAdjustmentAutomatic;
     }
     
     // Takes into account the navigation bar.
diff --git a/MVMCoreUI/BaseControllers/MFViewController.m b/MVMCoreUI/BaseControllers/MFViewController.m
index c378391a..0c3b3f3d 100644
--- a/MVMCoreUI/BaseControllers/MFViewController.m
+++ b/MVMCoreUI/BaseControllers/MFViewController.m
@@ -308,6 +308,8 @@
                                     || self.manager
                                     || self.loadObject.requestParameters.tabWasPressed);
         }
+    } else {
+        [[MVMCoreUISession sharedGlobal].splitViewController.parentViewController setNeedsStatusBarAppearanceUpdate];
     }
 }
 
@@ -498,6 +500,15 @@
     }
 }
 
+//this method is needed for getting status bar style from present viewcotnroller
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    if ([self respondsToSelector:@selector(defaultStatusBarStyle)]) {
+        return [self defaultStatusBarStyle];
+    } else {
+        return UIStatusBarStyleDefault;
+    }
+}
+
 - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
     
     [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h b/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h
index 0c5a865d..acb56ad1 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUIDetailViewProtocol.h
@@ -30,6 +30,10 @@ NS_ASSUME_NONNULL_BEGIN
 // View Controller can override this method and do custom action instead of opening the left panel
 - (BOOL)isOverridingLeftButton;
 
+//return desired status bar style based on different View Controller 
+- (UIStatusBarStyle)defaultStatusBarStyle;
+- (nullable UIColor *)defaultStatusBarBackgroundColor;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h
index 2ef7fa25..0d4c9ea4 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.h
@@ -105,6 +105,10 @@ typedef NS_ENUM(NSInteger, MFNumberOfDrawers) {
 + (CGFloat)getApplicationViewWidth;
 + (CGFloat)getApplicationViewMaxSize;
 
+// return subviewcontrollers' prefer status bar style
+- (UIStatusBarStyle)getDefaultStatusBarStyle;
+- (nullable UIColor *)getDefaultStatusBarBackgroundColor;
+
 #pragma mark - Main Subclassables
 
 // Can subclass to set threshold for when the drawers are permanently extended. Default is 1000 for the left panel and 2000 for both.
diff --git a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
index d70bdb6e..bdfd6ecd 100644
--- a/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
+++ b/MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
@@ -877,7 +877,33 @@ CGFloat const PanelAnimationDuration = 0.2;
 }
 
 - (UIStatusBarStyle)preferredStatusBarStyle {
-    return self.topAlertView.statusBarStyle;
+    if (self.topAlertView.topAlertObject) {
+        return self.topAlertView.statusBarStyle;
+    } else {
+        UIStatusBarStyle style = [self getDefaultStatusBarStyle];
+        [self.topAlertView resetDefaultBackgroundColor:[self getDefaultStatusBarBackgroundColor] basedOnStatusBarStyle:style];
+        return style;
+    }
+}
+
+- (UIStatusBarStyle)getDefaultStatusBarStyle {
+    UIViewController *viewController = [self getCurrentDetailViewController];
+    if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)]
+        && [viewController respondsToSelector:@selector(defaultStatusBarStyle)]
+        && [((UIViewController <MVMCoreUIDetailViewProtocol> *)viewController) defaultStatusBarStyle]) {
+        return [((UIViewController <MVMCoreUIDetailViewProtocol> *)viewController) defaultStatusBarStyle];
+    }
+    return UIStatusBarStyleDefault;
+}
+
+- (UIColor *)getDefaultStatusBarBackgroundColor {
+    UIViewController *viewController = [self getCurrentDetailViewController];
+    if ([viewController conformsToProtocol:@protocol(MVMCoreUIDetailViewProtocol)]
+        && [viewController respondsToSelector:@selector(defaultStatusBarBackgroundColor)]
+        && [((UIViewController <MVMCoreUIDetailViewProtocol> *)viewController) defaultStatusBarBackgroundColor]) {
+        return [((UIViewController <MVMCoreUIDetailViewProtocol> *)viewController) defaultStatusBarBackgroundColor];
+    }
+    return nil;
 }
 
 #pragma mark - Getters
diff --git a/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.h b/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.h
index 7d15d543..720f0097 100644
--- a/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.h
+++ b/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.h
@@ -10,7 +10,6 @@
 #import <MVMCoreUI/StackableViewController.h>
 #import <MVMCoreUI/ViewConstrainingView.h>
 #import <MVMCoreUI/TopLabelsView.h>
-
 @class LabelView;
 @class PrimaryButton;
 
@@ -24,6 +23,7 @@
 @property (nullable, weak, nonatomic) UIView *viewInScroll;
 @property (nullable, weak, nonatomic) UIView *viewOutOfScroll;
 @property (nullable, strong, nonatomic) UIView *safeAreaView;
+@property (nullable, weak, nonatomic) ViewConstrainingView *bottomAccessoryView;
 
 // Set to overwrite which view is the top edge and/or bottom edge of the between view. must be added to the ui and constrained before buildViewsBetweenLabelsAndButtons.
 // Use these to create views that are pinned near the labels or buttons and are separate from any centered content. Add and set in buildInAdditionalViewsBeforeCenteredContent.
diff --git a/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m b/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m
index 149b399c..0fcc51a2 100644
--- a/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m
+++ b/MVMCoreUI/LegacyControllers/TopLabelsAndBottomButtonsViewController.m
@@ -30,7 +30,6 @@
 @property (nullable, weak, nonatomic) NSArray *middleViews;
 
 @property (nullable, weak, nonatomic) UIView *betweenView;
-@property (nullable, weak, nonatomic) ViewConstrainingView *bottomAccessoryView;
 
 // Adds the button view to the screen. Out of the scroll or in.
 - (void)addViewOutsideOfScrollView:(UIView *)bottomView;
diff --git a/MVMCoreUI/MVMCoreUI.h b/MVMCoreUI/MVMCoreUI.h
index 10fe0a36..8b4e24bd 100644
--- a/MVMCoreUI/MVMCoreUI.h
+++ b/MVMCoreUI/MVMCoreUI.h
@@ -72,8 +72,6 @@ FOUNDATION_EXPORT const unsigned char MVMCoreUIVersionString[];
 
 #pragma mark - Atoms
 #pragma mark Views
-#import <MVMCoreUI/MFView.h>
-#import <MVMCoreUI/MFLabel.h>
 #import <MVMCoreUI/ViewConstrainingView.h>
 #import <MVMCoreUI/MFLoadingSpinner.h>
 #import <MVMCoreUI/MFTextView.h>
diff --git a/MVMCoreUI/Molecules/ButtonView.swift b/MVMCoreUI/Molecules/ButtonView.swift
index 8958887c..c23f1aa9 100644
--- a/MVMCoreUI/Molecules/ButtonView.swift
+++ b/MVMCoreUI/Molecules/ButtonView.swift
@@ -110,6 +110,14 @@ import UIKit
         rightPin?.isActive = true
     }
     
+     open func alignFill() {
+        alignCenterPin?.isActive = false
+        alignCenterLeftPin?.isActive = false
+        alignCenterRightPin?.isActive = false
+        leftPin?.isActive = true
+        rightPin?.isActive = true
+    }
+
     open override func setLeftPinConstant(_ constant: CGFloat) {
         super.setLeftPinConstant(constant)
         alignCenterLeftPin?.constant = constant
diff --git a/MVMCoreUI/Molecules/StandardHeaderView.swift b/MVMCoreUI/Molecules/StandardHeaderView.swift
index 488e31c1..58aa727c 100644
--- a/MVMCoreUI/Molecules/StandardHeaderView.swift
+++ b/MVMCoreUI/Molecules/StandardHeaderView.swift
@@ -9,8 +9,8 @@
 import UIKit
 
 public class StandardHeaderView: ViewConstrainingView {
-    let headlineLabel = MFLabel.commonLabelH2(true)
-    let messageLabel = MFLabel.commonLabelB2(true)
+    let headlineLabel = Label.commonLabelH2(true)
+    let messageLabel = Label.commonLabelB2(true)
     var separatorView: SeparatorView?
     var spaceBetweenLabels: NSLayoutConstraint?
     var leftConstraintTitle: NSLayoutConstraint?
@@ -75,10 +75,10 @@ public class StandardHeaderView: ViewConstrainingView {
     }
     
     public func setSpacing() {
-        if headlineLabel.hasText() && messageLabel.hasText() {
+        if headlineLabel.hasText && messageLabel.hasText {
             spaceBetweenLabels?.constant = PaddingTwo
             show()
-        } else if headlineLabel.hasText() || messageLabel.hasText() {
+        } else if headlineLabel.hasText || messageLabel.hasText {
             spaceBetweenLabels?.constant = 0
             show()
         } else {
diff --git a/MVMCoreUI/Molecules/TopLabelsView.h b/MVMCoreUI/Molecules/TopLabelsView.h
index e4e6494a..1fe1bdb2 100644
--- a/MVMCoreUI/Molecules/TopLabelsView.h
+++ b/MVMCoreUI/Molecules/TopLabelsView.h
@@ -7,17 +7,16 @@
 //
 
 #import <UIKit/UIKit.h>
-
 #import <MVMCoreUI/MFView.h>
-#import <MVMCoreUI/MFLabel.h>
+@class Label;
 #import <MVMCoreUI/SeparatorView.h>
 
 @class TopLabelsAndBottomButtonsTableViewController;
 
 @interface TopLabelsView : MFView 
 
-@property (nullable, weak, nonatomic) MFLabel *headlineLabel;
-@property (nullable, weak, nonatomic) MFLabel *messageLabel;
+@property (nullable, weak, nonatomic) Label *headlineLabel;
+@property (nullable, weak, nonatomic) Label *messageLabel;
 
 @property (nullable, strong, nonatomic) NSLayoutConstraint *topLabelConstraint;
 @property (nullable, weak, nonatomic) NSLayoutConstraint *spaceBetweenLabels;
diff --git a/MVMCoreUI/Molecules/TopLabelsView.m b/MVMCoreUI/Molecules/TopLabelsView.m
index 08bd4007..6e690b51 100644
--- a/MVMCoreUI/Molecules/TopLabelsView.m
+++ b/MVMCoreUI/Molecules/TopLabelsView.m
@@ -14,6 +14,7 @@
 #import <MVMCoreUI/MFStyler.h>
 #import <MVMCore/MVMCoreConstants.h>
 #import <MVMCoreUI/NSLayoutConstraint+MFConvenience.h>
+#import <MVMCoreUI/MVMCoreUI-Swift.h>
 
 @interface TopLabelsView ()
 
@@ -54,12 +55,12 @@
     self.clipsToBounds = YES;
 
     [self.headlineLabel removeFromSuperview];
-    MFLabel *headlineLabel = [MFLabel commonLabelH2:YES];
+    Label *headlineLabel = [Label commonLabelH2:YES];
     [self addSubview:headlineLabel];
     self.headlineLabel = headlineLabel;
     
     [self.messageLabel removeFromSuperview];
-    MFLabel *messageLabel = [MFLabel commonLabelB2:YES];
+    Label *messageLabel = [Label commonLabelB2:YES];
     [self addSubview:messageLabel];
     self.messageLabel = messageLabel;
     
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
index 381ae559..bb78e975 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
@@ -22,7 +22,7 @@
     static NSMutableDictionary <NSString *, Class>*mapping;
     dispatch_once(&onceToken, ^{
         mapping = [@{
-                     @"label": LabelView.class,
+                     @"label": Label.class,
                      @"separator": SeparatorView.class,
                      @"button": ButtonView.class,
                      @"textButton": MFTextButton.class,
diff --git a/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.h b/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.h
index 46d56cb6..5f49eb13 100644
--- a/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.h
+++ b/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.h
@@ -41,6 +41,9 @@
 - (void)expandStatusBarView;
 - (void)collapseStatusBarView;
 
+/// reset status bar background color, when backgroundColor is nil corresponding background color will be set based on style
+- (void)resetDefaultBackgroundColor:(nullable UIColor *)backgroundColor basedOnStatusBarStyle:(UIStatusBarStyle)style;
+
 // Can be subclassed for custom views.
 - (nonnull MVMCoreUITopAlertBaseView *)topAlertViewForTopAlertObject:(nullable MVMCoreTopAlertObject *)topAlertObject animationDelegate:(nonnull id <MVMCoreTopAlertAnimationDelegateProtocol>)animationDelegate statusBarColor:(UIColor *_Nullable *_Nullable)statusBarColor;
 
diff --git a/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m b/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m
index 735f28d9..b65f7423 100644
--- a/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m
+++ b/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m
@@ -189,7 +189,6 @@ NSString * const MFAccTopAlertClosed = @"Top alert notification is closed.";
                 [weakSelf.superview layoutIfNeeded];
             } completion:^(BOOL finished) {
                 [weakSelf.animationDelegate topAlertViewFinishAnimation];
-                [weakSelf setStatusBarColor:[UIColor whiteColor] statusBarStyle:UIStatusBarStyleDefault];
                 UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, nil);
 
                 UIView *view = weakSelf.currentAlert;
@@ -204,6 +203,9 @@ NSString * const MFAccTopAlertClosed = @"Top alert notification is closed.";
                     [operation markAsFinished];
                     completionHandler(finished);
                     weakSelf.topAlertObject = nil;
+                    [MVMCoreDispatchUtility performBlockOnMainThread:^{
+                        [weakSelf setStatusBarColor:[UIColor whiteColor] statusBarStyle:UIStatusBarStyleDefault];
+                    }];
                 }];
             }];
         }];
@@ -242,4 +244,18 @@ NSString * const MFAccTopAlertClosed = @"Top alert notification is closed.";
     }];
 }
 
+- (void)resetDefaultBackgroundColor:(UIColor *)backgroundColor basedOnStatusBarStyle:(UIStatusBarStyle)style {
+    if (!self.topAlertObject) {
+        UIColor *defaultStatusBarBackgroundColor = backgroundColor;
+        if (!defaultStatusBarBackgroundColor) {
+            defaultStatusBarBackgroundColor = style == UIStatusBarStyleDefault ? [UIColor whiteColor] : [UIColor blackColor];
+        }
+        
+        //color doesn't match the current default value
+        if (!CGColorEqualToColor(defaultStatusBarBackgroundColor.CGColor, self.statusBarView.backgroundColor.CGColor)) {
+            self.statusBarView.backgroundColor = defaultStatusBarBackgroundColor;
+        }
+    }
+}
+
 @end