diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 856b15bb..2a45ba3b 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -19,6 +19,7 @@
 		D22D1F47220496A30077CEC0 /* MVMCoreUISwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = D22D1F45220496A30077CEC0 /* MVMCoreUISwitch.m */; };
 		D22D1F562204CE5D0077CEC0 /* MVMCoreUIStackableViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = D22D1F542204CE5D0077CEC0 /* MVMCoreUIStackableViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D22D1F572204CE5D0077CEC0 /* MVMCoreUIStackableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D22D1F552204CE5D0077CEC0 /* MVMCoreUIStackableViewController.m */; };
+		D274CA332236A78900B01B62 /* StandardFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D274CA322236A78900B01B62 /* StandardFooterView.swift */; };
 		D28B4F8A21FF967C00712C7A /* MVMCoreUIObject.h in Headers */ = {isa = PBXBuildFile; fileRef = D28B4F8821FF967C00712C7A /* MVMCoreUIObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D28B4F8B21FF967C00712C7A /* MVMCoreUIObject.m in Sources */ = {isa = PBXBuildFile; fileRef = D28B4F8921FF967C00712C7A /* MVMCoreUIObject.m */; };
 		D29770C821F7C4AE00B2F0D0 /* TopLabelsView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */; };
@@ -174,6 +175,7 @@
 		D22D1F45220496A30077CEC0 /* MVMCoreUISwitch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUISwitch.m; sourceTree = "<group>"; };
 		D22D1F542204CE5D0077CEC0 /* MVMCoreUIStackableViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIStackableViewController.h; sourceTree = "<group>"; };
 		D22D1F552204CE5D0077CEC0 /* MVMCoreUIStackableViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUIStackableViewController.m; sourceTree = "<group>"; };
+		D274CA322236A78900B01B62 /* StandardFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StandardFooterView.swift; sourceTree = "<group>"; };
 		D28B4F8821FF967C00712C7A /* MVMCoreUIObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIObject.h; sourceTree = "<group>"; };
 		D28B4F8921FF967C00712C7A /* MVMCoreUIObject.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUIObject.m; sourceTree = "<group>"; };
 		D29770C621F7C4AE00B2F0D0 /* TopLabelsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopLabelsView.m; sourceTree = "<group>"; };
@@ -424,6 +426,7 @@
 				D2A514662213885800345BFB /* MVMCoreUIHeaderView.swift */,
 				D2A5145C2211D22A00345BFB /* MVMCoreUIMoleculeViewProtocol.h */,
 				D2A5145E2211DDC100345BFB /* MVMCoreUIMoleculeStackView.swift */,
+				D274CA322236A78900B01B62 /* StandardFooterView.swift */,
 			);
 			path = Molecules;
 			sourceTree = "<group>";
@@ -886,6 +889,7 @@
 				D29DF18321E69E54003B2FB9 /* SeparatorView.m in Sources */,
 				D29DF17A21E69E1F003B2FB9 /* MFCustomButton.m in Sources */,
 				D29DF26121E6A985003B2FB9 /* MFLoadImageView.m in Sources */,
+				D274CA332236A78900B01B62 /* StandardFooterView.swift in Sources */,
 				D29DF2BF21E7BEA4003B2FB9 /* MVMCoreUITabBarPageControlViewController.m in Sources */,
 				D29DF28321E7AB24003B2FB9 /* MVMCoreUICommonViewsUtility.m in Sources */,
 				D29DF28A21E7AC2B003B2FB9 /* MFLabel.m in Sources */,
diff --git a/MVMCoreUI/Atoms/Buttons/MFTextButton.h b/MVMCoreUI/Atoms/Buttons/MFTextButton.h
index ef24ea2d..ec37589b 100644
--- a/MVMCoreUI/Atoms/Buttons/MFTextButton.h
+++ b/MVMCoreUI/Atoms/Buttons/MFTextButton.h
@@ -10,7 +10,7 @@
 #import <MVMCoreUI/MFView.h>
 @class MFSizeObject;
 
-@interface MFTextButton : MFCustomButton <MVMCoreViewProtocol>
+@interface MFTextButton : MFCustomButton <MVMCoreViewProtocol, MVMCoreUIMoleculeViewProtocol>
 
 @property (nonnull, strong, nonatomic) MFSizeObject *sizeObject;
 
diff --git a/MVMCoreUI/Atoms/Buttons/MFTextButton.m b/MVMCoreUI/Atoms/Buttons/MFTextButton.m
index f9423c30..ff4c372c 100644
--- a/MVMCoreUI/Atoms/Buttons/MFTextButton.m
+++ b/MVMCoreUI/Atoms/Buttons/MFTextButton.m
@@ -11,8 +11,10 @@
 #import <MVMCoreUI/MFSizeObject.h>
 #import "UIColor+MFConvenience.h"
 #import "MVMCoreUISplitViewController.h"
+#import "MVMCoreUIConstants.h"
 @import MVMCore.MVMCoreDispatchUtility;
 @import MVMCore.MVMCoreGetterUtility;
+@import MVMCore.NSDictionary_MFConvenience;
 
 @interface MFTextButton ()
 
@@ -124,4 +126,19 @@
     return theButton;
 }
 
+#pragma mark - MVMCoreUIMoleculeViewProtocol
+
+- (void)setWithJSON:(NSDictionary *)json delegate:(NSObject *)delegate additionalData:(NSDictionary *)additionalData {
+    NSString *color = [json string:KeyTextColor];
+    if (color) {
+        [self setTitleColor:[UIColor mfGetColorForHex:color] forState:UIControlStateNormal];
+    }
+    [self setWithActionMap:json actionDelegate:([delegate conformsToProtocol:@protocol(MVMCoreActionDelegateProtocol)] ? (NSObject <MVMCoreActionDelegateProtocol>*)delegate : nil) additionalData:additionalData buttonDelegate:([delegate conformsToProtocol:@protocol(ButtonDelegateProtocol)] ? (id <ButtonDelegateProtocol>)delegate : nil)];
+    if ([self titleForState:UIControlStateNormal].length == 0) {
+        self.heightConstraint.constant = 0;
+    } else {
+        self.heightConstraint.constant = self.sizeObject.standardSize;
+    }
+}
+
 @end
diff --git a/MVMCoreUI/Atoms/Views/LabelView.h b/MVMCoreUI/Atoms/Views/LabelView.h
index 6e20d0b6..b5c259e3 100644
--- a/MVMCoreUI/Atoms/Views/LabelView.h
+++ b/MVMCoreUI/Atoms/Views/LabelView.h
@@ -10,7 +10,7 @@
 #import <MVMCoreUI/ViewConstrainingView.h>
 #import <MVMCoreUI/MFLabel.h>
 
-@interface LabelView : ViewConstrainingView
+@interface LabelView : ViewConstrainingView <MVMCoreUIMoleculeViewProtocol>
 
 // Customize the label.
 @property (nullable, weak, nonatomic) MFLabel *label;
diff --git a/MVMCoreUI/Atoms/Views/LabelView.m b/MVMCoreUI/Atoms/Views/LabelView.m
index 6136e897..f1d7b2f0 100644
--- a/MVMCoreUI/Atoms/Views/LabelView.m
+++ b/MVMCoreUI/Atoms/Views/LabelView.m
@@ -72,6 +72,11 @@
     }
 }
 
+- (void)setWithJSON:(NSDictionary *)json delegate:(NSObject *)delegate additionalData:(NSDictionary *)additionalData {
+    [super setWithJSON:json delegate:delegate additionalData:additionalData];
+    [self.label setWithJSON:json delegate:delegate additionalData:additionalData];
+}
+
 - (void)alignLeft {
     self.alignCenterPin.active = NO;
     self.alignCenterLeftPin.active = NO;
diff --git a/MVMCoreUI/Atoms/Views/MFView.m b/MVMCoreUI/Atoms/Views/MFView.m
index afe3476a..40df33a2 100644
--- a/MVMCoreUI/Atoms/Views/MFView.m
+++ b/MVMCoreUI/Atoms/Views/MFView.m
@@ -41,6 +41,8 @@
 - (void)updateView:(CGFloat)size {
 }
 
+#pragma mark - MVMCoreUIMoleculeViewProtocol
+
 - (void)setWithJSON:(NSDictionary *)json delegate:(NSObject *)delegate additionalData:(nullable NSDictionary *)additionalData {
 }
 
diff --git a/MVMCoreUI/Atoms/Views/ViewConstrainingView.m b/MVMCoreUI/Atoms/Views/ViewConstrainingView.m
index c8ecd3d6..a88b61c3 100644
--- a/MVMCoreUI/Atoms/Views/ViewConstrainingView.m
+++ b/MVMCoreUI/Atoms/Views/ViewConstrainingView.m
@@ -135,4 +135,10 @@
     }
 }
 
+#pragma mark - MVMCoreUIMoleculeViewProtocol
+
+- (void)setAsMolecule {
+    self.updateViewHorizontalDefaults = YES;
+}
+
 @end
diff --git a/MVMCoreUI/BaseControllers/ThreeLayerViewController.swift b/MVMCoreUI/BaseControllers/ThreeLayerViewController.swift
index 5d802e7b..6675b766 100644
--- a/MVMCoreUI/BaseControllers/ThreeLayerViewController.swift
+++ b/MVMCoreUI/BaseControllers/ThreeLayerViewController.swift
@@ -181,7 +181,7 @@ extension ThreeLayerViewController {
                 contentView.addSubview(bottomSpacer)
                 bottomSpacer.leftAnchor.constraint(equalTo: contentView.leftAnchor).isActive = true
                 contentView.rightAnchor.constraint(equalTo: bottomSpacer.rightAnchor).isActive = true
-                bottomSpacer.heightAnchor.constraint(greaterThanOrEqualToConstant: PaddingDefaultVerticalSpacing).isActive = true
+                bottomSpacer.heightAnchor.constraint(greaterThanOrEqualToConstant: 0).isActive = true
                 middleView.topAnchor.constraint(equalTo: topView.bottomAnchor, constant: spaceAbove).isActive = true
                 bottomSpacer.topAnchor.constraint(equalTo: middleView.bottomAnchor).isActive = true
                 bottomView.topAnchor.constraint(equalTo: bottomSpacer.bottomAnchor).isActive = true
@@ -191,7 +191,7 @@ extension ThreeLayerViewController {
                 contentView.addSubview(topSpacer)
                 topSpacer.leftAnchor.constraint(equalTo: contentView.leftAnchor).isActive = true
                 contentView.rightAnchor.constraint(equalTo: topSpacer.rightAnchor).isActive = true
-                topSpacer.heightAnchor.constraint(greaterThanOrEqualToConstant: PaddingDefaultVerticalSpacing).isActive = true
+                topSpacer.heightAnchor.constraint(greaterThanOrEqualToConstant: 0).isActive = true
                 topSpacer.topAnchor.constraint(equalTo: topView.bottomAnchor).isActive = true
                 middleView.topAnchor.constraint(equalTo: topSpacer.bottomAnchor).isActive = true
                 bottomView.topAnchor.constraint(equalTo: middleView.bottomAnchor, constant: spaceBelow).isActive = true
@@ -206,7 +206,7 @@ extension ThreeLayerViewController {
                 bottomSpacer.leftAnchor.constraint(equalTo: contentView.leftAnchor).isActive = true
                 contentView.rightAnchor.constraint(equalTo: bottomSpacer.rightAnchor).isActive = true
                 topSpacer.heightAnchor.constraint(equalTo: bottomSpacer.heightAnchor).isActive = true
-                topSpacer.heightAnchor.constraint(greaterThanOrEqualToConstant: PaddingDefaultVerticalSpacing).isActive = true
+                topSpacer.heightAnchor.constraint(greaterThanOrEqualToConstant: 0).isActive = true
                 topSpacer.topAnchor.constraint(equalTo: topView.bottomAnchor).isActive = true
                 middleView.topAnchor.constraint(equalTo: topSpacer.bottomAnchor).isActive = true
                 bottomSpacer.topAnchor.constraint(equalTo: middleView.bottomAnchor).isActive = true
diff --git a/MVMCoreUI/Molecules/MVMCoreUIHeaderView.swift b/MVMCoreUI/Molecules/MVMCoreUIHeaderView.swift
index a1a0ffba..c8ca1b9b 100644
--- a/MVMCoreUI/Molecules/MVMCoreUIHeaderView.swift
+++ b/MVMCoreUI/Molecules/MVMCoreUIHeaderView.swift
@@ -33,7 +33,6 @@ public class MVMCoreUIHeaderView: ViewConstrainingView {
             translatesAutoresizingMaskIntoConstraints = false
             backgroundColor = .clear
             clipsToBounds = true
-            updateViewHorizontalDefaults = true
             
             addSubview(headlineLabel)
             addSubview(messageLabel)
diff --git a/MVMCoreUI/Molecules/MVMCoreUIMoleculeViewProtocol.h b/MVMCoreUI/Molecules/MVMCoreUIMoleculeViewProtocol.h
index cfb28c3f..3dd8de67 100644
--- a/MVMCoreUI/Molecules/MVMCoreUIMoleculeViewProtocol.h
+++ b/MVMCoreUI/Molecules/MVMCoreUIMoleculeViewProtocol.h
@@ -13,6 +13,11 @@
 // Sets up the ui based on the json
 - (void)setWithJSON:(nullable NSDictionary *)json delegate:(nullable NSObject *)delegate additionalData:(nullable NSDictionary *)additionalData;
 
+@optional
+
+// Called after init to provide an early setter for any molecule specific logic
+- (void)setAsMolecule;
+
 @end
 
 
diff --git a/MVMCoreUI/Molecules/PrimaryButtonView.m b/MVMCoreUI/Molecules/PrimaryButtonView.m
index 818f6785..16ce03ed 100644
--- a/MVMCoreUI/Molecules/PrimaryButtonView.m
+++ b/MVMCoreUI/Molecules/PrimaryButtonView.m
@@ -42,7 +42,7 @@
     if (backgroundColorString) {
         self.backgroundColor = [UIColor mfGetColorForHex:backgroundColorString];
     }
-    [self setupWithFirstButtonJSON:[json dict:@"FirstButton"] secondButtonJSON:[json dict:@"SecondButton"] additionalData:nil actionDelegate:([delegate conformsToProtocol:@protocol(MVMCoreActionDelegateProtocol)] ? (NSObject <MVMCoreActionDelegateProtocol>*)delegate : nil) buttonDelegate:([delegate conformsToProtocol:@protocol(ButtonDelegateProtocol)] ? (id <ButtonDelegateProtocol>)delegate : nil)];
+    [self setupWithFirstButtonJSON:[json dict:@"firstButton"] secondButtonJSON:[json dict:@"secondButton"] additionalData:nil actionDelegate:([delegate conformsToProtocol:@protocol(MVMCoreActionDelegateProtocol)] ? (NSObject <MVMCoreActionDelegateProtocol>*)delegate : nil) buttonDelegate:([delegate conformsToProtocol:@protocol(ButtonDelegateProtocol)] ? (id <ButtonDelegateProtocol>)delegate : nil)];
 }
 
 #pragma mark - Inits
@@ -115,7 +115,7 @@
 }
 
 - (void)setupWithFirstButtonJSON:(nullable NSDictionary *)firstButtonJSON secondButtonJSON:(nullable NSDictionary *)secondButtonJSON additionalData:(nullable NSDictionary *)additionalData actionDelegate:(nullable NSObject <MVMCoreActionDelegateProtocol>*)actionDelegate buttonDelegate:(nullable id <ButtonDelegateProtocol>)buttonDelegate {
-    [self setupWithPrimaryButtonMap:firstButtonJSON secondaryButtonMap:secondButtonJSON additionalData:additionalData actionDelegate:actionDelegate buttonDelegate:buttonDelegate legacyJSON:NO];
+    [self setupWithPrimaryButtonMap:secondButtonJSON secondaryButtonMap:firstButtonJSON additionalData:additionalData actionDelegate:actionDelegate buttonDelegate:buttonDelegate legacyJSON:NO];
 }
 
 - (void)setupWithPrimaryButtonMap:(nullable NSDictionary *)primaryButtonMap secondaryButtonMap:(nullable NSDictionary *)secondaryButtonMap actionDelegate:(nullable NSObject <MVMCoreActionDelegateProtocol>*)actionDelegate additionalData:(nullable NSDictionary *)additionalData buttonDelegate:(nullable id <ButtonDelegateProtocol>)buttonDelegate {
diff --git a/MVMCoreUI/Molecules/StandardFooterView.swift b/MVMCoreUI/Molecules/StandardFooterView.swift
new file mode 100644
index 00000000..a0b42bbd
--- /dev/null
+++ b/MVMCoreUI/Molecules/StandardFooterView.swift
@@ -0,0 +1,111 @@
+//
+//  StandardFooterView.swift
+//  MVMCoreUI
+//
+//  Created by Scott Pfeil on 3/11/19.
+//  Copyright © 2019 Verizon Wireless. All rights reserved.
+//
+
+import UIKit
+
+public class StandardFooterView: ViewConstrainingView {
+    let twoButtonView = PrimaryButtonView(frame: .zero)
+    var textButton = MFTextButton(nil, constrainHeight: true, forWidth: MVMCoreUIUtility.getWidth())
+    var spaceBetweenButtons: NSLayoutConstraint?
+    var leftConstraintTwoButton: NSLayoutConstraint?
+    var rightConstraintTwoButton: NSLayoutConstraint?
+    var leftConstraintTextButton: NSLayoutConstraint?
+    var rightConstraintTextButton: NSLayoutConstraint?
+    var centerAlignTextButton: NSLayoutConstraint?
+    private var heightConstraint: NSLayoutConstraint?
+    
+    public override func updateView(_ size: CGFloat) {
+        super.updateView(size)
+        twoButtonView.updateView(size)
+        textButton.updateView(size)
+        setSpacing()
+    }
+    
+    public override func setupView() {
+        super.setupView()
+        if subviews.count == 0 {
+            translatesAutoresizingMaskIntoConstraints = false
+            backgroundColor = .clear
+            clipsToBounds = true
+            
+            addSubview(twoButtonView)
+            addSubview(textButton)
+            
+            topPin = twoButtonView.topAnchor.constraint(equalTo: topAnchor, constant: PaddingDefaultVerticalSpacing)
+            topPin?.isActive = true
+            
+            spaceBetweenButtons = textButton.topAnchor.constraint(equalTo: twoButtonView.bottomAnchor, constant: PaddingTwo)
+            spaceBetweenButtons?.isActive = true
+            
+            leftConstraintTwoButton = twoButtonView.leftAnchor.constraint(equalTo: leftAnchor)
+            leftConstraintTwoButton?.isActive = true
+            
+            rightConstraintTwoButton = rightAnchor.constraint(equalTo: twoButtonView.rightAnchor)
+            rightConstraintTwoButton?.isActive = true
+            
+            leftConstraintTextButton = textButton.leftAnchor.constraint(greaterThanOrEqualTo: leftAnchor)
+            leftConstraintTextButton?.isActive = true
+            
+            rightConstraintTextButton = rightAnchor.constraint(greaterThanOrEqualTo: textButton.rightAnchor)
+            rightConstraintTextButton?.isActive = true
+            
+            centerAlignTextButton = textButton.centerXAnchor.constraint(equalTo: centerXAnchor)
+            centerAlignTextButton?.isActive = true
+            
+            bottomPin = bottomAnchor.constraint(equalTo: textButton.bottomAnchor, constant: PaddingDefaultVerticalSpacing)
+            bottomPin?.isActive = true
+            
+            heightConstraint = heightAnchor.constraint(equalToConstant: 0)
+        }
+    }
+    
+    public func setSpacing() {
+        if twoButtonView.subviews.count > 0 && textButton.title(for: UIControl.State.normal)?.count ?? 0 > 0 {
+            spaceBetweenButtons?.constant = PaddingTwo
+            show()
+        } else if twoButtonView.subviews.count > 0 || textButton.title(for: UIControl.State.normal)?.count ?? 0 > 0 {
+            spaceBetweenButtons?.constant = 0
+            show()
+        } else {
+            hide()
+        }
+    }
+    
+    public override func show() {
+        super.show()
+        heightConstraint?.isActive = false
+        topPin?.isActive = true
+        layoutIfNeeded()
+    }
+    
+    public override func hide() {
+        super.hide()
+        heightConstraint?.isActive = true
+        topPin?.isActive = false
+        layoutIfNeeded()
+    }
+    
+    public override func setLeftPinConstant(_ constant: CGFloat) {
+        leftConstraintTwoButton?.constant = constant
+        leftConstraintTextButton?.constant = constant
+    }
+    
+    public override func setRightPinConstant(_ constant: CGFloat) {
+        rightConstraintTwoButton?.constant = constant
+        rightConstraintTextButton?.constant = constant
+    }
+    
+    public override func setWithJSON(_ json: [AnyHashable : Any]?, delegate: NSObject?, additionalData: [AnyHashable : Any]?) {
+        super.setWithJSON(json, delegate: delegate, additionalData: additionalData)
+        if let colorString = json?.optionalStringForKey(KeyBackgroundColor) {
+            backgroundColor = .mfGet(forHex: colorString)
+        }
+        twoButtonView.setWithJSON(json?.optionalDictionaryForKey("twoButtonView"), delegate: delegate, additionalData: additionalData)
+        textButton.setWithJSON(json?.optionalDictionaryForKey("textButton"), delegate: delegate, additionalData: additionalData)
+    }
+}
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
index a18be0a4..fcd8eb7b 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
@@ -21,9 +21,14 @@
     static NSMutableDictionary <NSString *, Class>*mapping;
     dispatch_once(&onceToken, ^{
         mapping = [@{
+                     @"label": LabelView.class,
+                     @"separator": SeparatorView.class,
+                     @"button": MFCustomButton.class,
+                     @"textButton": MFTextButton.class,
                      @"standardHeader": MVMCoreUIHeaderView.class,
                      @"moleculeStack": MVMCoreUIMoleculeStackView.class,
-                     @"twoButtonView": PrimaryButtonView.class
+                     @"twoButtonView": PrimaryButtonView.class,
+                     @"standardFooter": StandardFooterView.class
                      } mutableCopy];
     });
     return mapping;
@@ -37,7 +42,11 @@
 - (nullable UIView <MVMCoreUIMoleculeViewProtocol>*)getMoleculeForName:(nonnull NSString *)name {
     Class class = [self.moleculeMapping objectForKey:name];
     if (class) {
-        return [[class alloc] init];
+        UIView <MVMCoreUIMoleculeViewProtocol>*view = [[class alloc] init];
+        if ([view respondsToSelector:@selector(setAsMolecule)]) {
+            [view setAsMolecule];
+        }
+        return view;
     }
     return nil;
 }
diff --git a/MVMCoreUI/Utility/MVMCoreUIUtility.m b/MVMCoreUI/Utility/MVMCoreUIUtility.m
index c0135d4f..1afabeab 100644
--- a/MVMCoreUI/Utility/MVMCoreUIUtility.m
+++ b/MVMCoreUI/Utility/MVMCoreUIUtility.m
@@ -9,6 +9,8 @@
 #import "MVMCoreUIUtility.h"
 #import "MVMCoreUIConstants.h"
 #import "MVMCoreUISession.h"
+#import "MVMCoreUINavigationController.h"
+#import "MVMCoreUISplitViewController.h"
 @import MVMCore.MVMCoreNavigationHandler;
 @import MVMCore.MVMCoreGetterUtility;