diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemButtonModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemButtonModel.swift
index 9110bfe9..7a81cb5b 100644
--- a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemButtonModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemButtonModel.swift
@@ -32,4 +32,10 @@ public class NavigationItemButtonModel: Codable {
         try container.encode(imageName, forKey: .imageName)
         try container.encodeModel(action, forKey: .action)
     }
+    
+    /// Convenience function that creates a BarButtonItem for the model.
+    public func createNavigationItem(delegateObject: MVMCoreUIDelegateObject? = nil, additionalData: [AnyHashable: Any]? = nil) -> BarButtonItem {
+        let image = UIImage(named: imageName, in: MVMCoreCache.shared()?.bundleToUseForImages(), compatibleWith: nil)
+        return BarButtonItem.create(with: image, actionModel: action, delegateObject: delegateObject, additionalData: additionalData)
+    }
 }
diff --git a/MVMCoreUI/BaseClasses/BarButtonItem.swift b/MVMCoreUI/BaseClasses/BarButtonItem.swift
index 51142a5a..a2a2e9e6 100644
--- a/MVMCoreUI/BaseClasses/BarButtonItem.swift
+++ b/MVMCoreUI/BaseClasses/BarButtonItem.swift
@@ -28,7 +28,7 @@ public typealias BarButtonAction = (BarButtonItem) -> ()
     // MARK: - Initializers
     //--------------------------------------------------
     
-    public static func create(with image: UIImage) -> Self {
+    public static func create(with image: UIImage?) -> Self {
         let actionObject = ActionDelegate()
         let button = self.init(image: image, style: .plain, target: actionObject, action: #selector(actionObject.callActionBlock(_:)))
         button.actionObject = actionObject
@@ -36,21 +36,21 @@ public typealias BarButtonAction = (BarButtonItem) -> ()
     }
     
     /// Creates the item with the passed in action.
-    public static func create(with image: UIImage, actionModel: ActionModelProtocol, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Self {
+    public static func create(with image: UIImage?, actionModel: ActionModelProtocol, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Self {
         let button = create(with: image)
         button.set(with: actionModel, delegateObject: delegateObject, additionalData: additionalData)
         return button
     }
     
     /// Creates the item with the passed in action map.
-    public static func create(with image: UIImage, actionMap: [AnyHashable : Any], delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Self {
+    public static func create(with image: UIImage?, actionMap: [AnyHashable : Any], delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Self {
         let button = create(with: image)
         button.set(with: actionMap, delegateObject: delegateObject, additionalData: additionalData)
         return button
     }
     
     /// Creates the item with the passed in action.
-    public static func create(with image: UIImage, action: @escaping BarButtonAction) -> Self {
+    public static func create(with image: UIImage?, action: @escaping BarButtonAction) -> Self {
         let button = create(with: image)
         button.actionObject?.buttonAction = action
         return button
diff --git a/MVMCoreUI/Containers/NavigationController.swift b/MVMCoreUI/Containers/NavigationController.swift
index 5402cae1..67506221 100644
--- a/MVMCoreUI/Containers/NavigationController.swift
+++ b/MVMCoreUI/Containers/NavigationController.swift
@@ -11,35 +11,60 @@ import UIKit
 @objcMembers open class NavigationController: UINavigationController {
     public var separatorView: Line?
 
+    /// Getter for the main navigation controller
     public static func navigationController() -> Self? {
         return MVMCoreActionUtility.initializerClassCheck(MVMCoreUISession.sharedGlobal()?.navigationController, classToVerify: self) as? Self
     }
     
-    public static func style(_ navigationBar: UINavigationBar) {
+    /// Provides MVM styling to the navigation bar. Returns a reference to the line.
+    public static func style(_ navigationBar: UINavigationBar) -> Line {
         UIColor.mfSetBackgroundColor(forNavigationBar: .white, navigationBar: navigationBar, transparent: false)
         navigationBar.shadowImage = UIImage()
         navigationBar.isOpaque = true
         navigationBar.tintColor = .black
         navigationBar.titleTextAttributes = [NSAttributedString.Key.font: MFStyler.fontBoldBodySmall(false)];
+        return Line(pinTo: navigationBar, edge: .bottom, useMargin: false)
     }
     
+    /// Sets up the application with a navigation controller
     public static func setupNavigationController() -> Self? {
         let navigationController = self.init()
-        style(navigationController.navigationBar)
-        navigationController.separatorView = Line(pinTo: navigationController.navigationBar, edge: .bottom, useMargin: false)
-        navigationController.separatorView?.setStyle(.standard)
+        navigationController.separatorView = style(navigationController.navigationBar)
         MVMCoreUISession.sharedGlobal()?.navigationController = navigationController
         MVMCoreNavigationHandler.shared()?.viewControllerToPresentOn = navigationController
         MVMCoreNavigationHandler.shared()?.navigationController = navigationController
         return navigationController
     }
     
+    /// Sets up the application with a navigation controller as the main container.
     public static func setupNavigationControllerAsMainController() -> Self? {
         guard let navigationController = setupNavigationController() else { return nil }
         MVMCoreUISession.sharedGlobal()?.setup(asStandardLoadViewDelegate: navigationController)
         return navigationController
     }
     
+    /// Convenience function for setting the navigation buttons.
+    public static func setNavigationButtons(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, viewController: UIViewController) {
+        let delegate = (viewController as? MVMCoreViewControllerProtocol)?.delegateObject?() as? MVMCoreUIDelegateObject
+        var items: [UIBarButtonItem] = []
+        if let backButtonModel = navigationItemModel.backButton,
+            navigationController.viewControllers.count > 1 {
+            items.append(backButtonModel.createNavigationItem(delegateObject: delegate, additionalData: nil))
+        }
+        if let itemModels = navigationItemModel.additionalLeftButtons {
+            for item in itemModels {
+                items.append(item.createNavigationItem(delegateObject: delegate, additionalData: nil))
+            }
+            viewController.navigationItem.leftBarButtonItems = items
+        }
+        if let itemModels = navigationItemModel.additionalRightButtons {
+            for item in itemModels {
+                items.append(item.createNavigationItem(delegateObject: delegate, additionalData: nil))
+            }
+            viewController.navigationItem.rightBarButtonItems = items
+        }
+    }
+    
     /// Convenience function for setting navigation bar with model.
     public static func set(navigationController: UINavigationController, navigationItemModel: NavigationItemModelProtocol, viewController: UIViewController) {
         viewController.navigationItem.title = navigationItemModel.title
@@ -60,16 +85,21 @@ import UIKit
             navigationController.separatorView?.isHidden = navigationItemModel.line?.type ?? .standard == .none
         }
         
+        // Let legacy splitview controller handle buttons for now.
+        guard navigationController == MVMCoreUISplitViewController.main()?.splitViewController?.navigationController,
+            navigationController.topViewController == viewController else {
+            // Not the main split view controller, add buttons.
+            setNavigationButtons(navigationController: navigationController, navigationItemModel: navigationItemModel, viewController: viewController)
+            return
+        }
+        
         // Update icons if main navigation controller.
-        if navigationController == MVMCoreUISplitViewController.main()?.navigationController,
-            navigationController.topViewController == viewController {
-            MVMCoreUISession.sharedGlobal()?.splitViewController?.setNavigationIconColor(tint)
+        MVMCoreUISession.sharedGlobal()?.splitViewController?.setNavigationIconColor(tint)
 
-            // Update Panels
-            if let model = navigationItemModel as? PanelNavigationItemModelProtocol {
-                MVMCoreUISplitViewController.main()?.setLeftPanelIsAccessible(model.showLeftPanelButton, for: viewController)
-                MVMCoreUISplitViewController.main()?.setRightPanelIsAccessible(model.showRightPanelButton, for: viewController)
-            }
+        // Update Panels
+        if let model = navigationItemModel as? PanelNavigationItemModelProtocol {
+            MVMCoreUISplitViewController.main()?.setLeftPanelIsAccessible(model.showLeftPanelButton, for: viewController)
+            MVMCoreUISplitViewController.main()?.setRightPanelIsAccessible(model.showRightPanelButton, for: viewController)
         }
     }
 }