diff --git a/MVMCoreUI/Actions/ActionCollapseNotificationModel.swift b/MVMCoreUI/Actions/ActionCollapseNotificationModel.swift
index 4dad156b..9a6e6793 100644
--- a/MVMCoreUI/Actions/ActionCollapseNotificationModel.swift
+++ b/MVMCoreUI/Actions/ActionCollapseNotificationModel.swift
@@ -10,7 +10,7 @@ import UIKit
 
 @objcMembers public class ActionCollapseNotificationModel: ActionModelProtocol {
     public static var identifier: String = "collapseNotification"
-    public var actionType: String?
+    public var actionType: String
     public var extraParameters: JSONValueDictionary?
     public var analyticsData: JSONValueDictionary?
     public var title: String?
diff --git a/MVMCoreUI/Actions/ActionOpenPanelModel.swift b/MVMCoreUI/Actions/ActionOpenPanelModel.swift
index ce3977d8..55fd272a 100644
--- a/MVMCoreUI/Actions/ActionOpenPanelModel.swift
+++ b/MVMCoreUI/Actions/ActionOpenPanelModel.swift
@@ -18,7 +18,7 @@ public class ActionOpenPanelModel: ActionModelProtocol {
     }
     
     public static var identifier: String = "openPanel"
-    public var actionType: String?
+    public var actionType: String = ActionOpenPanelModel.identifier
     public var panel: Panel
     public var extraParameters: JSONValueDictionary?
     public var analyticsData: JSONValueDictionary?
diff --git a/MVMCoreUI/Actions/ActionTopAlertModel.swift b/MVMCoreUI/Actions/ActionTopAlertModel.swift
index 6da64912..628633c2 100644
--- a/MVMCoreUI/Actions/ActionTopAlertModel.swift
+++ b/MVMCoreUI/Actions/ActionTopAlertModel.swift
@@ -10,7 +10,7 @@ import Foundation
 
 @objcMembers public class ActionTopAlertModel: ActionModelProtocol {
     public static var identifier: String = "topAlert"
-    public var actionType: String?
+    public var actionType: String = ActionTopAlertModel.identifier
     public var pageType: String
     public var extraParameters: JSONValueDictionary?
     public var analyticsData: JSONValueDictionary?
diff --git a/MVMCoreUI/Atoms/TextFields/TextFieldModel.swift b/MVMCoreUI/Atoms/TextFields/TextFieldModel.swift
index d901d13a..4d6f1fd0 100644
--- a/MVMCoreUI/Atoms/TextFields/TextFieldModel.swift
+++ b/MVMCoreUI/Atoms/TextFields/TextFieldModel.swift
@@ -12,7 +12,7 @@ import UIKit
 
     public static var identifier: String = "textField"
     public var backgroundColor: Color?
-    public var moleculeName: String? = TextFieldModel.identifier
+    public var moleculeName: String = TextFieldModel.identifier
     public var editable: Bool?
     public var disabled: Bool?
     public var errorMsg: String?
diff --git a/MVMCoreUI/Atoms/Views/ImageViewModel.swift b/MVMCoreUI/Atoms/Views/ImageViewModel.swift
index 0f585119..d5ba0a14 100644
--- a/MVMCoreUI/Atoms/Views/ImageViewModel.swift
+++ b/MVMCoreUI/Atoms/Views/ImageViewModel.swift
@@ -11,7 +11,7 @@ import Foundation
 @objcMembers public class ImageViewModel: MoleculeModelProtocol {
     public static var identifier: String = "image"
     public var backgroundColor: Color?
-    public var moleculeName: String? = ImageViewModel.identifier
+    public var moleculeName: String = ImageViewModel.identifier
     public var image: String
     public var accessibilityText: String?
     public var fallbackImage: String?
diff --git a/MVMCoreUI/Atoms/Views/LeftRightLabelModel.swift b/MVMCoreUI/Atoms/Views/LeftRightLabelModel.swift
index 44564c93..07c534f8 100644
--- a/MVMCoreUI/Atoms/Views/LeftRightLabelModel.swift
+++ b/MVMCoreUI/Atoms/Views/LeftRightLabelModel.swift
@@ -14,7 +14,7 @@ import UIKit
     //--------------------------------------------------
 
     public static var identifier: String = "leftRightLabelView"
-    public var moleculeName: String? = LeftRightLabelModel.identifier
+    public var moleculeName: String = LeftRightLabelModel.identifier
     public var backgroundColor: Color?
     public var leftText: LabelModel
     public var rightText: LabelModel?
diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index 80662cad..333df798 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -186,7 +186,7 @@ import UIKit
         navigationItem.accessibilityLabel = navigationItemModel.title
         
         navigationController.setNavigationBarHidden(navigationItemModel.hidden, animated: true)
-        UIColor.setBackgroundColor(forNavigationBar: navigationItemModel.backgroundColor?.uiColor ?? .white, navigationBar: navigationController.navigationBar, transparent: navigationItemModel.transparent)
+        UIColor.setBackgroundColor(navigationItemModel.backgroundColor?.uiColor ?? .white, for: navigationController.navigationBar, isTransparent: navigationItemModel.transparent)
         
         let tint = navigationItemModel.tintColor.uiColor
         navigationController.navigationBar.tintColor = tint
diff --git a/MVMCoreUI/Models/ModelProtocols/MoleculeModelProtocol.swift b/MVMCoreUI/Models/ModelProtocols/MoleculeModelProtocol.swift
index 2928cf2a..913c3bd0 100644
--- a/MVMCoreUI/Models/ModelProtocols/MoleculeModelProtocol.swift
+++ b/MVMCoreUI/Models/ModelProtocols/MoleculeModelProtocol.swift
@@ -2,13 +2,13 @@ import Foundation
 
 
 public protocol MoleculeModelProtocol: ModelProtocol {
-    var moleculeName: String? { get }
+    var moleculeName: String { get }
     var backgroundColor: Color? { get set }
 }
 
 public extension MoleculeModelProtocol {
     
-    var moleculeName: String? {
+    var moleculeName: String {
         get { return Self.identifier }
     }
     
diff --git a/MVMCoreUI/Molecules/Doughnut/DoughnutChartModel.swift b/MVMCoreUI/Molecules/Doughnut/DoughnutChartModel.swift
index 1e5c7dce..ff9b1bf6 100644
--- a/MVMCoreUI/Molecules/Doughnut/DoughnutChartModel.swift
+++ b/MVMCoreUI/Molecules/Doughnut/DoughnutChartModel.swift
@@ -11,7 +11,7 @@ import Foundation
 @objcMembers public class DoughnutChartModel: MoleculeModelProtocol {
     public var backgroundColor: Color?
     public static var identifier: String = "doughnutChart"
-    public var moleculeName: String? = DoughnutChartModel.identifier
+    public var moleculeName: String = DoughnutChartModel.identifier
     public var title: LabelModel?
     public var subtitle: LabelModel?
     public var sections: [DoughnutChartItemModel]
@@ -25,7 +25,7 @@ import Foundation
 @objcMembers public class DoughnutChartItemModel: MoleculeModelProtocol {
     public var backgroundColor: Color?
     public static var identifier: String = "doughnutChartItem"
-    public var moleculeName: String? = DoughnutChartItemModel.identifier
+    public var moleculeName: String = DoughnutChartItemModel.identifier
     public var label: LabelModel
     @Percent public var percent: CGFloat
     public var color: Color
diff --git a/MVMCoreUI/Molecules/HorizontalCombinationViews/ImageHeadlineBodyModel.swift b/MVMCoreUI/Molecules/HorizontalCombinationViews/ImageHeadlineBodyModel.swift
index f34e7b94..4ac675c5 100644
--- a/MVMCoreUI/Molecules/HorizontalCombinationViews/ImageHeadlineBodyModel.swift
+++ b/MVMCoreUI/Molecules/HorizontalCombinationViews/ImageHeadlineBodyModel.swift
@@ -10,7 +10,7 @@ import Foundation
 
 public struct ImageHeadlineBodyModel: MoleculeModelProtocol {
     public static var identifier: String = "imageHeadlineBody"
-    public var moleculeName: String? = ImageHeadlineBodyModel.identifier
+    public var moleculeName: String = ImageHeadlineBodyModel.identifier
     public var backgroundColor: Color?
     public var image: ImageViewModel
     public var headlineBody: HeadlineBodyModel
diff --git a/MVMCoreUI/Molecules/Items/MoleculeCollectionViewCell.swift b/MVMCoreUI/Molecules/Items/MoleculeCollectionViewCell.swift
index 9c63ba64..cf1779be 100644
--- a/MVMCoreUI/Molecules/Items/MoleculeCollectionViewCell.swift
+++ b/MVMCoreUI/Molecules/Items/MoleculeCollectionViewCell.swift
@@ -116,11 +116,10 @@ open class MoleculeCollectionViewCell: UICollectionViewCell, MVMCoreUIMoleculeVi
     
     public class func nameForReuse(_ model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> String? {
         guard let molecule = (model as? CarouselItemModel)?.molecule,
-            let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(molecule) as? ModelMoleculeViewProtocol.Type,
-            let name = moleculeClass.nameForReuse(with: molecule, delegateObject) ?? molecule.moleculeName else {
+            let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(molecule) as? ModelMoleculeViewProtocol.Type else {
             return nil
         }
-        return name
+        return moleculeClass.nameForReuse(with: molecule, delegateObject) ?? molecule.moleculeName
     }
     
     public func updateView(_ size: CGFloat) {
diff --git a/MVMCoreUI/Molecules/Items/StackItemModel.swift b/MVMCoreUI/Molecules/Items/StackItemModel.swift
index 795b2983..12254fb5 100644
--- a/MVMCoreUI/Molecules/Items/StackItemModel.swift
+++ b/MVMCoreUI/Molecules/Items/StackItemModel.swift
@@ -10,7 +10,7 @@ import Foundation
 
 @objcMembers public class StackItemModel: ContainerModel, StackItemModelProtocol, MoleculeModelProtocol {
     public static var identifier: String = "simpleStackItem"
-    public var moleculeName: String? = StackItemModel.identifier
+    public var moleculeName: String = StackItemModel.identifier
     public var backgroundColor: Color?
     public var spacing: CGFloat?
     public var percent: Int?
diff --git a/MVMCoreUI/Molecules/LeftRightViews/ActionDetailWithImageModel.swift b/MVMCoreUI/Molecules/LeftRightViews/ActionDetailWithImageModel.swift
index 9dbf53c0..d617f053 100644
--- a/MVMCoreUI/Molecules/LeftRightViews/ActionDetailWithImageModel.swift
+++ b/MVMCoreUI/Molecules/LeftRightViews/ActionDetailWithImageModel.swift
@@ -10,7 +10,7 @@ import Foundation
 
 public struct ActionDetailWithImageModel: MoleculeModelProtocol {
     public static var identifier: String = "actionDetailWithImage"
-    public var moleculeName: String? = ActionDetailWithImageModel.identifier
+    public var moleculeName: String = ActionDetailWithImageModel.identifier
     public var backgroundColor: Color?
     public var headlineBodyButton: HeadlineBodyButtonModel
     public var image: ImageViewModel
diff --git a/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift b/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift
index aad8ec06..917bf5dc 100644
--- a/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift
+++ b/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyLinkToggleModel.swift
@@ -9,7 +9,7 @@
 import Foundation
 public struct HeadlineBodyLinkToggleModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBodyLinkToggle"
-    public var moleculeName: String? = HeadlineBodyLinkToggleModel.identifier
+    public var moleculeName: String = HeadlineBodyLinkToggleModel.identifier
     public var backgroundColor: Color?
     public var headlineBodyLink: HeadlineBodyLinkModel
     public var toggle: ToggleModel
diff --git a/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyToggleModel.swift b/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyToggleModel.swift
index bb3391a6..800c976b 100644
--- a/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyToggleModel.swift
+++ b/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/HeadlineBodyToggleModel.swift
@@ -11,7 +11,7 @@ import Foundation
 
 open class HeadlineBodyToggleModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBodyToggle"
-    public var moleculeName: String? = HeadlineBodyToggleModel.identifier
+    public var moleculeName: String = HeadlineBodyToggleModel.identifier
     open var backgroundColor: Color?
     open var headlineBody: HeadlineBodyModel
     open var toggle: ToggleModel
diff --git a/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift b/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
index 526ac6b9..16f292ed 100644
--- a/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
+++ b/MVMCoreUI/Molecules/LeftRightViews/ToggleMolecules/LabelToggleModel.swift
@@ -10,7 +10,7 @@ import Foundation
 
 public class LabelToggleModel: MoleculeModelProtocol {
     public static var identifier: String = "labelToggle"
-    public var moleculeName: String? = LabelToggleModel.identifier
+    public var moleculeName: String = LabelToggleModel.identifier
     public var backgroundColor: Color?
     public var label: LabelModel
     public var toggle: ToggleModel
diff --git a/MVMCoreUI/Molecules/ScrollerModel.swift b/MVMCoreUI/Molecules/ScrollerModel.swift
index 91dc2e1c..74256e99 100644
--- a/MVMCoreUI/Molecules/ScrollerModel.swift
+++ b/MVMCoreUI/Molecules/ScrollerModel.swift
@@ -10,6 +10,6 @@ import UIKit
 
 public class ScrollerModel: MoleculeContainerModel, MoleculeModelProtocol {
     public static var identifier: String = "scroller"
-    public var moleculeName: String? = ScrollerModel.identifier
+    public var moleculeName: String = ScrollerModel.identifier
     public var backgroundColor: Color?
 }
diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift
index e277f5de..0f158c2c 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLinkModel.swift
@@ -14,7 +14,7 @@ public class EyebrowHeadlineBodyLinkModel: MoleculeModelProtocol {
     //--------------------------------------------------
     
     public static var identifier: String = "eyebrowHeadlineBodyLink"
-    public var moleculeName: String? = EyebrowHeadlineBodyLinkModel.identifier
+    public var moleculeName: String = EyebrowHeadlineBodyLinkModel.identifier
     public var backgroundColor: Color?
     public var eyebrow: LabelModel?
     public var headline: LabelModel?
diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyButtonModel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyButtonModel.swift
index ec97fda0..439e3aec 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyButtonModel.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyButtonModel.swift
@@ -10,7 +10,7 @@ import Foundation
 
 public struct HeadlineBodyButtonModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBodyButton"
-    public var moleculeName: String? = HeadlineBodyButtonModel.identifier
+    public var moleculeName: String = HeadlineBodyButtonModel.identifier
     public var backgroundColor: Color?
 
     public var headlineBody: HeadlineBodyModel
diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift
index 27f0d670..4ef4018b 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyLinkModel.swift
@@ -10,7 +10,7 @@ import Foundation
 
 public struct HeadlineBodyLinkModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBodyLink"
-    public var moleculeName: String? = HeadlineBodyLinkModel.identifier
+    public var moleculeName: String = HeadlineBodyLinkModel.identifier
     public var headlineBody: HeadlineBodyModel
     public var link: LinkModel
     public var backgroundColor: Color?
diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift
index 0ec98c65..e715b61e 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift
@@ -10,7 +10,7 @@ import Foundation
 
 @objcMembers open class HeadlineBodyModel: MoleculeModelProtocol {
     public static var identifier: String = "headlineBody"
-    public var moleculeName: String? = HeadlineBodyModel.identifier
+    public var moleculeName: String = HeadlineBodyModel.identifier
     public var headline: LabelModel?
     public var body: LabelModel?
     public var style: String?
diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeStack.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeStack.swift
index 48f39fa0..56cc0447 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeStack.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/Lists/StringAndMoleculeStack/StringAndMoleculeStack.swift
@@ -14,8 +14,7 @@ open class StringAndMoleculeStack: MoleculeStackView {
         guard let model = stackModel else { return }
         for stackItemModel in model.molecules {
             guard let stringAndMoleculeModel = stackItemModel.molecule as? StringAndMoleculeModel,
-                let moleculeName = stringAndMoleculeModel.molecule.moleculeName,
-                let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forName: moleculeName) as? (UIView & ModelMoleculeViewProtocol) else {
+                let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forName: stringAndMoleculeModel.molecule.moleculeName) as? (UIView & ModelMoleculeViewProtocol) else {
                 // Throw error
                 return
             }
diff --git a/MVMCoreUI/Organisms/Carousel.swift b/MVMCoreUI/Organisms/Carousel.swift
index ba675adf..b4fa5c24 100644
--- a/MVMCoreUI/Organisms/Carousel.swift
+++ b/MVMCoreUI/Organisms/Carousel.swift
@@ -158,11 +158,10 @@ open class Carousel: View {
     // MARK: - Convenience
     /// Returns the (identifier, class) of the molecule for the given map.
     func getMoleculeInfo(with molecule: MoleculeModelProtocol, delegateObject: MVMCoreUIDelegateObject?) -> (identifier: String, class: AnyClass, molecule: MoleculeModelProtocol)? {
-        guard let className = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(molecule) ,
-            let moleculeName = (className as? ModelMoleculeViewProtocol.Type)?.nameForReuse(with: molecule, delegateObject) ?? molecule.moleculeName else {
+        guard let className = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(molecule) else {
             return nil
         }
-        return (moleculeName, className, molecule)
+        return ((className as? ModelMoleculeViewProtocol.Type)?.nameForReuse(with: molecule, delegateObject) ?? molecule.moleculeName, className, molecule)
     }
     
     /// Sets the alignment from the string.
diff --git a/MVMCoreUI/Organisms/Stack.swift b/MVMCoreUI/Organisms/Stack.swift
index 8fa220ec..8e6df863 100644
--- a/MVMCoreUI/Organisms/Stack.swift
+++ b/MVMCoreUI/Organisms/Stack.swift
@@ -162,13 +162,11 @@ open class Stack<T>: Container where T: (StackModelProtocol & MoleculeModelProto
         }
         var name = "stack<"
         for case let item in model.molecules {
-            if let moleculeName = item.moleculeName {
-                if let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping[moleculeName] as? ModelMoleculeViewProtocol.Type,
-                    let nameForReuse = moleculeClass.nameForReuse(with: item, delegateObject) {
-                    name.append(nameForReuse + ",")
-                } else {
-                    name.append(moleculeName + ",")
-                }
+            if let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping[item.moleculeName] as? ModelMoleculeViewProtocol.Type,
+                let nameForReuse = moleculeClass.nameForReuse(with: item, delegateObject) {
+                name.append(nameForReuse + ",")
+            } else {
+                name.append(item.moleculeName + ",")
             }
         }
         name.append(">")
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject+ModelExtension.swift b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject+ModelExtension.swift
index 8eb0c34d..a7054d4e 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject+ModelExtension.swift
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject+ModelExtension.swift
@@ -16,10 +16,7 @@ public extension MVMCoreUIMoleculeMappingObject {
     }
 
     func getMoleculeClass(_ model: MoleculeModelProtocol) -> AnyClass? {
-        if let moleculeName = model.moleculeName {
-            return moleculeMapping.object(forKey: moleculeName) as? AnyClass
-        }
-        return nil
+        return moleculeMapping.object(forKey: model.moleculeName) as? AnyClass
     }
 
     func createMolecule(_ model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> (UIView & MVMCoreUIMoleculeViewProtocol)? {
@@ -27,8 +24,7 @@ public extension MVMCoreUIMoleculeMappingObject {
     }
 
     func createMolecule(_ model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ constrainIfNeeded: Bool) -> (UIView & MVMCoreUIMoleculeViewProtocol)? {
-        guard let moleculeName = model.moleculeName,
-            let molecule = createMolecule(forName: moleculeName) else {
+        guard let molecule = createMolecule(forName: model.moleculeName) else {
             return nil
         }
 
diff --git a/MVMCoreUI/Templates/ModalMoleculeListTemplate.swift b/MVMCoreUI/Templates/ModalMoleculeListTemplate.swift
index 65ec0931..7c62faab 100644
--- a/MVMCoreUI/Templates/ModalMoleculeListTemplate.swift
+++ b/MVMCoreUI/Templates/ModalMoleculeListTemplate.swift
@@ -13,9 +13,9 @@ open class ModalMoleculeListTemplate: MoleculeListTemplate {
     public var closeButton: MFCustomButton?
         
     override open func handleNewData() {
-        super.newDataBuildScreen()
+        super.handleNewData()
         closeButton = MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: { [weak self] _ in
-            self?.dismiss()
+            MVMCoreNavigationHandler.shared()?.removeCurrentViewController()
         }, verticalCentered: false)
     }
 }
diff --git a/MVMCoreUI/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Templates/MoleculeListTemplate.swift
index bca29172..9503a4c6 100644
--- a/MVMCoreUI/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Templates/MoleculeListTemplate.swift
@@ -215,10 +215,8 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
     func getMoleculeInfo(with listItem: (ListItemModelProtocol & MoleculeModelProtocol)?) -> (identifier: String, class: AnyClass, molecule: ListItemModelProtocol & MoleculeModelProtocol)? {
         
         guard let listItem = listItem,
-            let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(listItem),
-            let moleculeName = (moleculeClass as? ModelMoleculeViewProtocol.Type)?.nameForReuse(with: listItem, delegateObject() as? MVMCoreUIDelegateObject) ?? listItem.moleculeName
-            else { return nil }
-        
+            let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(listItem) else { return nil }
+        let moleculeName = (moleculeClass as? ModelMoleculeViewProtocol.Type)?.nameForReuse(with: listItem, delegateObject() as? MVMCoreUIDelegateObject) ?? listItem.moleculeName
         return (moleculeName, moleculeClass, listItem)
     }