diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/ImageButtonModel.swift b/MVMCoreUI/Atomic/Atoms/Buttons/ImageButtonModel.swift
index a61ec150..5a53e637 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/ImageButtonModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/ImageButtonModel.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWatcherFieldProtocol {
+open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGroupWatcherFieldProtocol, ParentMoleculeModelProtocol {
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
@@ -29,6 +29,14 @@ open class ImageButtonModel: ButtonModelProtocol, MoleculeModelProtocol, FormGro
     
     public var updateUI: ActionBlock?
     
+    public var children: [MoleculeModelProtocol] {
+        [image].compactMap({$0})
+    }
+    
+    public func replaceChildMolecule(with molecule: MoleculeModelProtocol) throws -> Bool {
+        return try replaceChildMolecule(at: &image, with: molecule)
+    }
+    
     public init(image: ImageViewModel?, action: ActionModelProtocol) {
         self.image = image
         self.action = action
diff --git a/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
index 1af1a85a..cc76ef34 100644
--- a/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
@@ -202,7 +202,18 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
     }
     
     open func newData(for molecule: MoleculeModelProtocol) {
-        //TODO: expand for header, navigation, etc
+        
+        //Update the header
+        if updateHeaderFooter(modelView: topView, molecule: molecule) {
+            return
+        }
+        
+        //Update the footer
+        if updateHeaderFooter(modelView: bottomView, molecule: molecule) {
+            return
+        }
+        
+        //TODO: expand for navigation, etc
         guard let moleculesInfo = moleculesInfo else { return }
         
         let indicies = moleculesInfo.indices.filter({ index -> Bool in
@@ -221,6 +232,16 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
             tableView.selectRow(at: selectedIndex, animated: false, scrollPosition: .none)
         }
     }
+    
+    ///Helper functions to update the header/footer view
+    private func updateHeaderFooter(modelView: UIView?, molecule: MoleculeModelProtocol) -> Bool {
+        if let updateView = modelView,
+            let moleculeView = MVMCoreUIUtility.findViews(by: MoleculeViewProtocol.self, views: [updateView]).first(where: { $0.model?.moleculeName == molecule.moleculeName && $0.model?.id == molecule.id }) {
+            updateMoleculeView(moleculeView, from: molecule)
+            return true
+        }
+        return false
+    }
    
     //--------------------------------------------------
     // MARK: - Convenience