Update app/materials_library.py

app/materials_library.py

@@ -44,19 +44,22 @@ COLOUR_CATEGORIES = [
     "Reflective"  # Absorptivity: 0.10–0.20 (e.g., polished metals)
 ]
 
-# Default library materials with absorptivity, emissivity, and colour
+# Surface resistances
+R_SI = 0.12  # Internal surface resistance (m²·K/W)
+R_SE = 0.04  # External surface resistance (m²·K/W)
+
+# Default library materials
 DEFAULT_MATERIALS = {
     "Brick": {
         "category": "Structural Materials",
         "thermal_conductivity": 0.72,
         "density": 1920.0,
         "specific_heat": 840.0,
-        "thickness_range": [0.05, 0.3],
         "default_thickness": 0.1,
-        "embodied_carbon": 240.0,  # kg CO2e/m³
-        "cost": 180.0,  # USD/m³
-        "absorptivity": 0.65,  # Medium (reddish-brown brick)
-        "emissivity": 0.90,  # Typical for ceramics
+        "embodied_carbon": 240.0,
+        "cost": 180.0,
+        "absorptivity": 0.65,
+        "emissivity": 0.90,
         "colour": "Medium"
     },
     "Concrete": {
@@ -64,12 +67,11 @@ DEFAULT_MATERIALS = {
         "thermal_conductivity": 1.4,
         "density": 2300.0,
         "specific_heat": 880.0,
-        "thickness_range": [0.05, 0.5],
         "default_thickness": 0.15,
         "embodied_carbon": 320.0,
         "cost": 120.0,
-        "absorptivity": 0.60,  # Medium (grey concrete)
-        "emissivity": 0.88,  # Typical for concrete
+        "absorptivity": 0.60,
+        "emissivity": 0.88,
         "colour": "Medium"
     },
     "Gypsum Board": {
@@ -77,12 +79,11 @@ DEFAULT_MATERIALS = {
         "thermal_conductivity": 0.25,
         "density": 900.0,
         "specific_heat": 1000.0,
-        "thickness_range": [0.01, 0.05],
         "default_thickness": 0.0125,
         "embodied_carbon": 120.0,
         "cost": 90.0,
-        "absorptivity": 0.40,  # Light (white-painted surface)
-        "emissivity": 0.90,  # Typical for painted surfaces
+        "absorptivity": 0.40,
+        "emissivity": 0.90,
         "colour": "Light"
     },
     "Mineral Wool": {
@@ -90,12 +91,11 @@ DEFAULT_MATERIALS = {
         "thermal_conductivity": 0.04,
         "density": 30.0,
         "specific_heat": 840.0,
-        "thickness_range": [0.025, 0.3],
         "default_thickness": 0.1,
         "embodied_carbon": 45.0,
         "cost": 70.0,
-        "absorptivity": 0.50,  # Light (light-colored insulation)
-        "emissivity": 0.95,  # Typical for fibrous materials
+        "absorptivity": 0.50,
+        "emissivity": 0.95,
         "colour": "Light"
     },
     "EPS Insulation": {
@@ -103,12 +103,11 @@ DEFAULT_MATERIALS = {
         "thermal_conductivity": 0.035,
         "density": 25.0,
         "specific_heat": 1400.0,
-        "thickness_range": [0.025, 0.3],
         "default_thickness": 0.1,
         "embodied_carbon": 88.0,
         "cost": 65.0,
-        "absorptivity": 0.40,  # Light (white foam)
-        "emissivity": 0.92,  # Typical for polymers
+        "absorptivity": 0.40,
+        "emissivity": 0.92,
         "colour": "Light"
     },
     "Wood (Pine)": {
@@ -116,12 +115,11 @@ DEFAULT_MATERIALS = {
         "thermal_conductivity": 0.14,
         "density": 550.0,
         "specific_heat": 1600.0,
-        "thickness_range": [0.01, 0.3],
         "default_thickness": 0.05,
         "embodied_carbon": 110.0,
         "cost": 250.0,
-        "absorptivity": 0.65,  # Medium (natural wood)
-        "emissivity": 0.90,  # Typical for wood
+        "absorptivity": 0.65,
+        "emissivity": 0.90,
         "colour": "Medium"
     },
     "Steel": {
@@ -129,12 +127,11 @@ DEFAULT_MATERIALS = {
         "thermal_conductivity": 50.0,
         "density": 7800.0,
         "specific_heat": 450.0,
-        "thickness_range": [0.001, 0.05],
         "default_thickness": 0.005,
         "embodied_carbon": 1750.0,
         "cost": 800.0,
-        "absorptivity": 0.15,  # Reflective (polished steel)
-        "emissivity": 0.20,  # Typical for polished metals
+        "absorptivity": 0.15,
+        "emissivity": 0.20,
         "colour": "Reflective"
     },
     "Aluminum": {
@@ -142,12 +139,11 @@ DEFAULT_MATERIALS = {
         "thermal_conductivity": 230.0,
         "density": 2700.0,
         "specific_heat": 880.0,
-        "thickness_range": [0.001, 0.05],
         "default_thickness": 0.003,
         "embodied_carbon": 8500.0,
         "cost": 1200.0,
-        "absorptivity": 0.10,  # Reflective (polished aluminum)
-        "emissivity": 0.05,  # Typical for polished aluminum
+        "absorptivity": 0.10,
+        "emissivity": 0.05,
         "colour": "Reflective"
     },
     "Glass Fiber Insulation": {
@@ -155,12 +151,11 @@ DEFAULT_MATERIALS = {
         "thermal_conductivity": 0.035,
         "density": 12.0,
         "specific_heat": 840.0,
-        "thickness_range": [0.025, 0.3],
         "default_thickness": 0.1,
         "embodied_carbon": 28.0,
         "cost": 45.0,
-        "absorptivity": 0.50,  # Light (light-colored fibers)
-        "emissivity": 0.95,  # Typical for fibrous materials
+        "absorptivity": 0.50,
+        "emissivity": 0.95,
         "colour": "Light"
     },
     "Ceramic Tile": {
@@ -168,12 +163,11 @@ DEFAULT_MATERIALS = {
         "thermal_conductivity": 1.3,
         "density": 2300.0,
         "specific_heat": 840.0,
-        "thickness_range": [0.005, 0.025],
         "default_thickness": 0.01,
         "embodied_carbon": 650.0,
         "cost": 280.0,
-        "absorptivity": 0.60,  # Medium (neutral-colored tiles)
-        "emissivity": 0.90,  # Typical for ceramics
+        "absorptivity": 0.60,
+        "emissivity": 0.90,
         "colour": "Medium"
     },
     "Carpet": {
@@ -181,12 +175,11 @@ DEFAULT_MATERIALS = {
         "thermal_conductivity": 0.06,
         "density": 200.0,
         "specific_heat": 1300.0,
-        "thickness_range": [0.005, 0.02],
         "default_thickness": 0.01,
         "embodied_carbon": 40.0,
         "cost": 150.0,
-        "absorptivity": 0.70,  # Medium (typical carpet colors)
-        "emissivity": 0.95,  # Typical for fabrics
+        "absorptivity": 0.70,
+        "emissivity": 0.95,
         "colour": "Medium"
     },
     "Plywood": {
@@ -194,12 +187,11 @@ DEFAULT_MATERIALS = {
         "thermal_conductivity": 0.13,
         "density": 560.0,
         "specific_heat": 1400.0,
-        "thickness_range": [0.006, 0.025],
         "default_thickness": 0.012,
         "embodied_carbon": 350.0,
         "cost": 180.0,
-        "absorptivity": 0.65,  # Medium (natural wood)
-        "emissivity": 0.90,  # Typical for wood
+        "absorptivity": 0.65,
+        "emissivity": 0.90,
         "colour": "Medium"
     },
     "Concrete Block": {
@@ -207,12 +199,11 @@ DEFAULT_MATERIALS = {
         "thermal_conductivity": 0.51,
         "density": 1400.0,
         "specific_heat": 1000.0,
-        "thickness_range": [0.1, 0.3],
         "default_thickness": 0.2,
         "embodied_carbon": 260.0,
         "cost": 140.0,
-        "absorptivity": 0.60,  # Medium (grey blocks)
-        "emissivity": 0.88,  # Typical for concrete
+        "absorptivity": 0.60,
+        "emissivity": 0.88,
         "colour": "Medium"
     },
     "Stone (Granite)": {
@@ -220,12 +211,11 @@ DEFAULT_MATERIALS = {
         "thermal_conductivity": 2.8,
         "density": 2600.0,
         "specific_heat": 790.0,
-        "thickness_range": [0.01, 0.1],
         "default_thickness": 0.03,
         "embodied_carbon": 170.0,
         "cost": 450.0,
-        "absorptivity": 0.85,  # Dark (dark stone)
-        "emissivity": 0.90,  # Typical for stone
+        "absorptivity": 0.85,
+        "emissivity": 0.90,
         "colour": "Dark"
     },
     "Polyurethane Insulation": {
@@ -233,17 +223,16 @@ DEFAULT_MATERIALS = {
         "thermal_conductivity": 0.025,
         "density": 30.0,
         "specific_heat": 1400.0,
-        "thickness_range": [0.025, 0.2],
         "default_thickness": 0.075,
         "embodied_carbon": 102.0,
         "cost": 95.0,
-        "absorptivity": 0.40,  # Light (light-colored foam)
-        "emissivity": 0.92,  # Typical for polymers
+        "absorptivity": 0.40,
+        "emissivity": 0.92,
         "colour": "Light"
     }
 }
 
-# Default library fenestrations with absorptivity and emissivity
+# Default library fenestrations
 DEFAULT_FENESTRATIONS = {
     "Single Glazing": {
         "type": "Window",
@@ -251,11 +240,8 @@ DEFAULT_FENESTRATIONS = {
         "shgc": 0.86,
         "visible_transmittance": 0.9,
         "thickness": 0.006,
-        "embodied_carbon": 800.0,  # kg CO2e/m²
-        "cost": 120.0,  # USD/m²
-        "absorptivity": 0.15,  # Reflective (clear glass)
-        "emissivity": 0.84,  # Typical for glass
-        "colour": "Reflective"
+        "embodied_carbon": 800.0,
+        "cost": 120.0
     },
     "Double Glazing (Air)": {
         "type": "Window",
@@ -264,10 +250,7 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.78,
         "thickness": 0.024,
         "embodied_carbon": 950.0,
-        "cost": 180.0,
-        "absorptivity": 0.15,  # Reflective
-        "emissivity": 0.84,
-        "colour": "Reflective"
+        "cost": 180.0
     },
     "Double Glazing (Argon)": {
         "type": "Window",
@@ -276,10 +259,7 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.76,
         "thickness": 0.024,
         "embodied_carbon": 980.0,
-        "cost": 220.0,
-        "absorptivity": 0.15,  # Reflective
-        "emissivity": 0.84,
-        "colour": "Reflective"
+        "cost": 220.0
     },
     "Triple Glazing": {
         "type": "Window",
@@ -288,10 +268,7 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.68,
         "thickness": 0.036,
         "embodied_carbon": 1100.0,
-        "cost": 320.0,
-        "absorptivity": 0.15,  # Reflective
-        "emissivity": 0.84,
-        "colour": "Reflective"
+        "cost": 320.0
     },
     "Low-E Double Glazing": {
         "type": "Window",
@@ -300,10 +277,7 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.74,
         "thickness": 0.024,
         "embodied_carbon": 1050.0,
-        "cost": 250.0,
-        "absorptivity": 0.10,  # Reflective (low-E coating)
-        "emissivity": 0.10,  # Typical for low-E glass
-        "colour": "Reflective"
+        "cost": 250.0
     },
     "Wooden Door": {
         "type": "Door",
@@ -312,10 +286,7 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.0,
         "thickness": 0.04,
         "embodied_carbon": 400.0,
-        "cost": 280.0,
-        "absorptivity": 0.65,  # Medium (natural wood)
-        "emissivity": 0.90,
-        "colour": "Medium"
+        "cost": 280.0
     },
     "Steel Door": {
         "type": "Door",
@@ -324,10 +295,7 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.0,
         "thickness": 0.035,
         "embodied_carbon": 1200.0,
-        "cost": 350.0,
-        "absorptivity": 0.15,  # Reflective (polished steel)
-        "emissivity": 0.20,
-        "colour": "Reflective"
+        "cost": 350.0
     },
     "Glass Door": {
         "type": "Door",
@@ -336,10 +304,7 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.7,
         "thickness": 0.01,
         "embodied_carbon": 900.0,
-        "cost": 420.0,
-        "absorptivity": 0.15,  # Reflective
-        "emissivity": 0.84,
-        "colour": "Reflective"
+        "cost": 420.0
     },
     "Skylight (Double Glazed)": {
         "type": "Skylight",
@@ -348,10 +313,7 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.75,
         "thickness": 0.024,
         "embodied_carbon": 1050.0,
-        "cost": 380.0,
-        "absorptivity": 0.15,  # Reflective
-        "emissivity": 0.84,
-        "colour": "Reflective"
+        "cost": 380.0
     },
     "Skylight (Low-E)": {
         "type": "Skylight",
@@ -360,13 +322,20 @@ DEFAULT_FENESTRATIONS = {
         "visible_transmittance": 0.7,
         "thickness": 0.024,
         "embodied_carbon": 1150.0,
-        "cost": 450.0,
-        "absorptivity": 0.10,  # Reflective (low-E coating)
-        "emissivity": 0.10,
-        "colour": "Reflective"
+        "cost": 450.0
     }
 }
 
+def calculate_u_value(thermal_conductivity: float, thickness: float) -> float:
+    """Calculate U-value for a material."""
+    r_material = thickness / thermal_conductivity if thermal_conductivity > 0 else float('inf')
+    r_total = R_SI + r_material + R_SE
+    return 1 / r_total if r_total > 0 else 0.0
+
+def calculate_thermal_mass(density: float, specific_heat: float, thickness: float) -> float:
+    """Calculate areal thermal mass for a material."""
+    return density * specific_heat * thickness
+
 def display_materials_page():
     """
     Display the material library page.
@@ -411,11 +380,10 @@ def display_materials_tab():
     col1, col2 = st.columns([3, 2])
     
     with col1:
-        # Category filter
+        # Library Materials
         filter_options = ["All"] + MATERIAL_CATEGORIES
         category = st.selectbox("Filter by Category", filter_options, key="material_filter")
         
-        # Library Materials
         st.subheader("Library Materials")
         with st.container():
             library_materials = st.session_state.project_data["materials"]["library"]
@@ -428,7 +396,7 @@ def display_materials_tab():
             if filtered_materials:
                 cols = st.columns([2, 1, 1, 1, 1])
                 cols[0].write("**Name**")
-                cols[1].write("**Thermal Mass (J/kg·K)**")
+                cols[1].write("**Thermal Mass (J/m²·K)**")
                 cols[2].write("**U-Value (W/m²·K)**")
                 cols[3].write("**Preview**")
                 cols[4].write("**Copy**")
@@ -436,92 +404,141 @@ def display_materials_tab():
                 for material in filtered_materials:
                     cols = st.columns([2, 1, 1, 1, 1])
                     name = [k for k, v in library_materials.items() if v == material][0]
-                    u_value = material["thermal_conductivity"] / material["default_thickness"]
+                    thermal_mass = calculate_thermal_mass(material["density"], material["specific_heat"], material["default_thickness"])
+                    u_value = calculate_u_value(material["thermal_conductivity"], material["default_thickness"])
                     cols[0].write(name)
-                    cols[1].write(f"{material['specific_heat']:.1f}")
+                    cols[1].write(f"{thermal_mass:.1f}")
                     cols[2].write(f"{u_value:.3f}")
-                    if cols[3].button("Preview", key=f"preview_lib_mat_{name}"):
-                        st.session_state.material_editor = {
-                            "name": name,
-                            "category": material["category"],
-                            "thermal_conductivity": material["thermal_conductivity"],
-                            "density": material["density"],
-                            "specific_heat": material["specific_heat"],
-                            "thickness_range": material["thickness_range"],
-                            "default_thickness": material["default_thickness"],
-                            "embodied_carbon": material["embodied_carbon"],
-                            "cost": material["cost"],
-                            "absorptivity": material["absorptivity"],
-                            "emissivity": material["emissivity"],
-                            "colour": material["colour"],
-                            "edit_mode": False,
-                            "original_name": name,
-                            "is_library": True
-                        }
-                        st.session_state.active_tab = "Materials"
-                        st.success(f"Previewing material '{name}'")
-                    if cols[4].button("Copy", key=f"copy_lib_mat_{name}"):
-                        new_name = f"{name}_Project"
-                        counter = 1
-                        while new_name in st.session_state.project_data["materials"]["project"] or new_name in library_materials:
-                            new_name = f"{name}_Project_{counter}"
-                            counter += 1
-                        st.session_state.project_data["materials"]["project"][new_name] = material.copy()
-                        st.success(f"Material '{new_name}' copied to project.")
-                        logger.info(f"Copied library material '{name}' as '{new_name}' to project")
-                        st.rerun()
+                    action_id = f"preview_lib_mat_{name}_{uuid.uuid4()}"
+                    if cols[3].button("Preview", key=action_id):
+                        if st.session_state.get("material_action_id") != action_id:
+                            st.session_state.material_action_id = action_id
+                            st.session_state.material_editor = {
+                                "name": name,
+                                "category": material["category"],
+                                "thermal_conductivity": material["thermal_conductivity"],
+                                "density": material["density"],
+                                "specific_heat": material["specific_heat"],
+                                "default_thickness": material["default_thickness"],
+                                "embodied_carbon": material["embodied_carbon"],
+                                "cost": material["cost"],
+                                "absorptivity": material["absorptivity"],
+                                "emissivity": material["emissivity"],
+                                "colour": material["colour"],
+                                "edit_mode": False,
+                                "original_name": name,
+                                "is_library": True
+                            }
+                            st.session_state.active_tab = "Materials"
+                            st.success(f"Previewing material '{name}'")
+                    action_id = f"copy_lib_mat_{name}_{uuid.uuid4()}"
+                    if cols[4].button("Copy", key=action_id):
+                        if st.session_state.get("material_action_id") != action_id:
+                            st.session_state.material_action_id = action_id
+                            new_name = f"{name}_Project"
+                            counter = 1
+                            while new_name in st.session_state.project_data["materials"]["project"] or new_name in library_materials:
+                                new_name = f"{name}_Project_{counter}"
+                                counter += 1
+                            st.session_state.project_data["materials"]["project"][new_name] = material.copy()
+                            st.success(f"Material '{new_name}' copied to project.")
+                            logger.info(f"Copied library material '{name}' as '{new_name}' to project")
+                            st.rerun()
             else:
                 st.info("No materials found in the selected category.")
         
         # Project Materials
+        project_category = st.selectbox("Filter Project by Category", filter_options, key="project_material_filter")
         st.subheader("Project Materials")
         with st.container():
             project_materials = st.session_state.project_data["materials"]["project"]
-            if project_materials:
+            filtered_project_materials = []
+            if project_category == "All":
+                filtered_project_materials = list(project_materials.values())
+            else:
+                filtered_project_materials = [m for m in project_materials.values() if m["category"] == project_category]
+            
+            if filtered_project_materials:
                 cols = st.columns([2, 1, 1, 1, 1])
                 cols[0].write("**Name**")
-                cols[1].write("**Thermal Mass (J/kg·K)**")
+                cols[1].write("**Thermal Mass (J/m²·K)**")
                 cols[2].write("**U-Value (W/m²·K)**")
                 cols[3].write("**Edit**")
                 cols[4].write("**Delete**")
                 
-                for name, material in project_materials.items():
+                for material in filtered_project_materials:
                     cols = st.columns([2, 1, 1, 1, 1])
-                    u_value = material["thermal_conductivity"] / material["default_thickness"]
+                    name = [k for k, v in project_materials.items() if v == material][0]
+                    thermal_mass = calculate_thermal_mass(material["density"], material["specific_heat"], material["default_thickness"])
+                    u_value = calculate_u_value(material["thermal_conductivity"], material["default_thickness"])
                     cols[0].write(name)
-                    cols[1].write(f"{material['specific_heat']:.1f}")
+                    cols[1].write(f"{thermal_mass:.1f}")
                     cols[2].write(f"{u_value:.3f}")
-                    if cols[3].button("Edit", key=f"edit_proj_mat_{name}"):
-                        st.session_state.material_editor = {
-                            "name": name,
-                            "category": material["category"],
-                            "thermal_conductivity": material["thermal_conductivity"],
-                            "density": material["density"],
-                            "specific_heat": material["specific_heat"],
-                            "thickness_range": material["thickness_range"],
-                            "default_thickness": material["default_thickness"],
-                            "embodied_carbon": material["embodied_carbon"],
-                            "cost": material["cost"],
-                            "absorptivity": material["absorptivity"],
-                            "emissivity": material["emissivity"],
-                            "colour": material["colour"],
-                            "edit_mode": True,
-                            "original_name": name,
-                            "is_library": False
-                        }
-                        st.session_state.active_tab = "Materials"
-                        st.success(f"Editing material '{name}'")
-                    if cols[4].button("Delete", key=f"delete_proj_mat_{name}"):
-                        is_in_use = check_material_in_use(name)
-                        if is_in_use:
-                            st.error(f"Cannot delete material '{name}' because it is in use in constructions.")
-                        else:
-                            del st.session_state.project_data["materials"]["project"][name]
-                            st.success(f"Material '{name}' deleted from project.")
-                            logger.info(f"Deleted material '{name}' from project")
-                            st.rerun()
+                    action_id = f"edit_proj_mat_{name}_{uuid.uuid4()}"
+                    if cols[3].button("Edit", key=action_id):
+                        if st.session_state.get("material_action_id") != action_id:
+                            st.session_state.material_action_id = action_id
+                            st.session_state.material_editor = {
+                                "name": name,
+                                "category": material["category"],
+                                "thermal_conductivity": material["thermal_conductivity"],
+                                "density": material["density"],
+                                "specific_heat": material["specific_heat"],
+                                "default_thickness": material["default_thickness"],
+                                "embodied_carbon": material["embodied_carbon"],
+                                "cost": material["cost"],
+                                "absorptivity": material["absorptivity"],
+                                "emissivity": material["emissivity"],
+                                "colour": material["colour"],
+                                "edit_mode": True,
+                                "original_name": name,
+                                "is_library": False
+                            }
+                            st.session_state.active_tab = "Materials"
+                            st.success(f"Editing material '{name}'")
+                    action_id = f"delete_proj_mat_{name}_{uuid.uuid4()}"
+                    if cols[4].button("Delete", key=action_id):
+                        if st.session_state.get("material_action_id") != action_id:
+                            st.session_state.material_action_id = action_id
+                            is_in_use = check_material_in_use(name)
+                            if is_in_use:
+                                st.error(f"Cannot delete material '{name}' because it is in use in constructions.")
+                            else:
+                                del st.session_state.project_data["materials"]["project"][name]
+                                st.success(f"Material '{name}' deleted from project.")
+                                logger.info(f"Deleted material '{name}' from project")
+                                st.rerun()
             else:
-                st.info("No project materials added.")
+                st.info("No project materials in the selected category.")
+        
+        # Comprehensive Materials Table
+        st.subheader("All Project Materials")
+        project_materials = st.session_state.project_data["materials"]["project"]
+        if project_materials:
+            data = []
+            for name, props in project_materials.items():
+                thermal_mass = calculate_thermal_mass(props["density"], props["specific_heat"], props["default_thickness"])
+                u_value = calculate_u_value(props["thermal_conductivity"], props["default_thickness"])
+                data.append({
+                    "Name": name,
+                    "Category": props["category"],
+                    "Thermal Conductivity (W/m·K)": props["thermal_conductivity"],
+                    "Density (kg/m³)": props["density"],
+                    "Specific Heat (J/kg·K)": props["specific_heat"],
+                    "Thickness (m)": props["default_thickness"],
+                    "Embodied Carbon (kg CO₂e/m³)": props["embodied_carbon"],
+                    "Cost (USD/m³)": props["cost"],
+                    "Absorptivity": props["absorptivity"],
+                    "Emissivity": props["emissivity"],
+                    "Colour": props["colour"],
+                    "Thermal Mass (J/m²·K)": thermal_mass,
+                    "U-Value (W/m²·K)": u_value
+                })
+            df = pd.DataFrame(data)
+            st.dataframe(df, use_container_width=True, hide_index=True)
+            st.session_state.project_data["materials"]["table"] = df
+        else:
+            st.info("No project materials to display.")
     
     with col2:
         st.subheader("Material Editor/Creator")
@@ -564,43 +581,53 @@ def display_fenestrations_tab():
                     cols[0].write(name)
                     cols[1].write(fenestration["type"])
                     cols[2].write(f"{fenestration['u_value']:.2f}")
-                    if cols[3].button("Preview", key=f"preview_lib_fen_{name}"):
-                        st.session_state.fenestration_editor = {
-                            "name": name,
-                            "type": fenestration["type"],
-                            "u_value": fenestration["u_value"],
-                            "shgc": fenestration["shgc"],
-                            "visible_transmittance": fenestration["visible_transmittance"],
-                            "thickness": fenestration["thickness"],
-                            "embodied_carbon": fenestration["embodied_carbon"],
-                            "cost": fenestration["cost"],
-                            "absorptivity": fenestration["absorptivity"],
-                            "emissivity": fenestration["emissivity"],
-                            "colour": fenestration["colour"],
-                            "edit_mode": False,
-                            "original_name": name,
-                            "is_library": True
-                        }
-                        st.session_state.active_tab = "Fenestrations"
-                        st.success(f"Previewing fenestration '{name}'")
-                    if cols[4].button("Copy", key=f"copy_lib_fen_{name}"):
-                        new_name = f"{name}_Project"
-                        counter = 1
-                        while new_name in st.session_state.project_data["fenestrations"]["project"] or new_name in library_fenestrations:
-                            new_name = f"{name}_Project_{counter}"
-                            counter += 1
-                        st.session_state.project_data["fenestrations"]["project"][new_name] = fenestration.copy()
-                        st.success(f"Fenestration '{new_name}' copied to project.")
-                        logger.info(f"Copied library fenestration '{name}' as '{new_name}' to project")
-                        st.rerun()
+                    action_id = f"preview_lib_fen_{name}_{uuid.uuid4()}"
+                    if cols[3].button("Preview", key=action_id):
+                        if st.session_state.get("fenestration_action_id") != action_id:
+                            st.session_state.fenestration_action_id = action_id
+                            st.session_state.fenestration_editor = {
+                                "name": name,
+                                "type": fenestration["type"],
+                                "u_value": fenestration["u_value"],
+                                "shgc": fenestration["shgc"],
+                                "visible_transmittance": fenestration["visible_transmittance"],
+                                "thickness": fenestration["thickness"],
+                                "embodied_carbon": fenestration["embodied_carbon"],
+                                "cost": fenestration["cost"],
+                                "edit_mode": False,
+                                "original_name": name,
+                                "is_library": True
+                            }
+                            st.session_state.active_tab = "Fenestrations"
+                            st.success(f"Previewing fenestration '{name}'")
+                    action_id = f"copy_lib_fen_{name}_{uuid.uuid4()}"
+                    if cols[4].button("Copy", key=action_id):
+                        if st.session_state.get("fenestration_action_id") != action_id:
+                            st.session_state.fenestration_action_id = action_id
+                            new_name = f"{name}_Project"
+                            counter = 1
+                            while new_name in st.session_state.project_data["fenestrations"]["project"] or new_name in library_fenestrations:
+                                new_name = f"{name}_Project_{counter}"
+                                counter += 1
+                            st.session_state.project_data["fenestrations"]["project"][new_name] = fenestration.copy()
+                            st.success(f"Fenestration '{new_name}' copied to project.")
+                            logger.info(f"Copied library fenestration '{name}' as '{new_name}' to project")
+                            st.rerun()
             else:
                 st.info("No fenestrations found in the selected type.")
         
         # Project Fenestrations
+        project_fen_type = st.selectbox("Filter Project by Type", filter_options, key="project_fenestration_filter")
         st.subheader("Project Fenestrations")
         with st.container():
             project_fenestrations = st.session_state.project_data["fenestrations"]["project"]
-            if project_fenestrations:
+            filtered_project_fenestrations = []
+            if project_fen_type == "All":
+                filtered_project_fenestrations = list(project_fenestrations.values())
+            else:
+                filtered_project_fenestrations = [f for f in project_fenestrations.values() if f["type"] == project_fen_type]
+            
+            if filtered_project_fenestrations:
                 cols = st.columns([2, 1, 1, 1, 1])
                 cols[0].write("**Name**")
                 cols[1].write("**Type**")
@@ -608,41 +635,67 @@ def display_fenestrations_tab():
                 cols[3].write("**Edit**")
                 cols[4].write("**Delete**")
                 
-                for name, fenestration in project_fenestrations.items():
+                for fenestration in filtered_project_fenestrations:
                     cols = st.columns([2, 1, 1, 1, 1])
+                    name = [k for k, v in project_fenestrations.items() if v == fenestration][0]
                     cols[0].write(name)
                     cols[1].write(fenestration["type"])
                     cols[2].write(f"{fenestration['u_value']:.2f}")
-                    if cols[3].button("Edit", key=f"edit_proj_fen_{name}"):
-                        st.session_state.fenestration_editor = {
-                            "name": name,
-                            "type": fenestration["type"],
-                            "u_value": fenestration["u_value"],
-                            "shgc": fenestration["shgc"],
-                            "visible_transmittance": fenestration["visible_transmittance"],
-                            "thickness": fenestration["thickness"],
-                            "embodied_carbon": fenestration["embodied_carbon"],
-                            "cost": fenestration["cost"],
-                            "absorptivity": fenestration["absorptivity"],
-                            "emissivity": fenestration["emissivity"],
-                            "colour": fenestration["colour"],
-                            "edit_mode": True,
-                            "original_name": name,
-                            "is_library": False
-                        }
-                        st.session_state.active_tab = "Fenestrations"
-                        st.success(f"Editing fenestration '{name}'")
-                    if cols[4].button("Delete", key=f"delete_proj_fen_{name}"):
-                        is_in_use = check_fenestration_in_use(name)
-                        if is_in_use:
-                            st.error(f"Cannot delete fenestration '{name}' because it is in use in components.")
-                        else:
-                            del st.session_state.project_data["fenestrations"]["project"][name]
-                            st.success(f"Fenestration '{name}' deleted from project.")
-                            logger.info(f"Deleted fenestration '{name}' from project")
-                            st.rerun()
+                    action_id = f"edit_proj_fen_{name}_{uuid.uuid4()}"
+                    if cols[3].button("Edit", key=action_id):
+                        if st.session_state.get("fenestration_action_id") != action_id:
+                            st.session_state.fenestration_action_id = action_id
+                            st.session_state.fenestration_editor = {
+                                "name": name,
+                                "type": fenestration["type"],
+                                "u_value": fenestration["u_value"],
+                                "shgc": fenestration["shgc"],
+                                "visible_transmittance": fenestration["visible_transmittance"],
+                                "thickness": fenestration["thickness"],
+                                "embodied_carbon": fenestration["embodied_carbon"],
+                                "cost": fenestration["cost"],
+                                "edit_mode": True,
+                                "original_name": name,
+                                "is_library": False
+                            }
+                            st.session_state.active_tab = "Fenestrations"
+                            st.success(f"Editing fenestration '{name}'")
+                    action_id = f"delete_proj_fen_{name}_{uuid.uuid4()}"
+                    if cols[4].button("Delete", key=action_id):
+                        if st.session_state.get("fenestration_action_id") != action_id:
+                            st.session_state.fenestration_action_id = action_id
+                            is_in_use = check_fenestration_in_use(name)
+                            if is_in_use:
+                                st.error(f"Cannot delete fenestration '{name}' because it is in use in components.")
+                            else:
+                                del st.session_state.project_data["fenestrations"]["project"][name]
+                                st.success(f"Fenestration '{name}' deleted from project.")
+                                logger.info(f"Deleted fenestration '{name}' from project")
+                                st.rerun()
             else:
-                st.info("No project fenestrations added.")
+                st.info("No project fenestrations in the selected type.")
+        
+        # Comprehensive Fenestrations Table
+        st.subheader("All Project Fenestrations")
+        project_fenestrations = st.session_state.project_data["fenestrations"]["project"]
+        if project_fenestrations:
+            data = []
+            for name, props in project_fenestrations.items():
+                data.append({
+                    "Name": name,
+                    "Type": props["type"],
+                    "U-Value (W/m²·K)": props["u_value"],
+                    "SHGC": props["shgc"],
+                    "Visible Transmittance": props["visible_transmittance"],
+                    "Thickness (m)": props["thickness"],
+                    "Embodied Carbon (kg CO₂e/m²)": props["embodied_carbon"],
+                    "Cost (USD/m²)": props["cost"]
+                })
+            df = pd.DataFrame(data)
+            st.dataframe(df, use_container_width=True, hide_index=True)
+            st.session_state.project_data["fenestrations"]["table"] = df
+        else:
+            st.info("No project fenestrations to display.")
     
     with col2:
         st.subheader("Fenestration Editor/Creator")
@@ -653,7 +706,8 @@ def initialize_materials():
     if "materials" not in st.session_state.project_data:
         st.session_state.project_data["materials"] = {
             "library": {},
-            "project": {}
+            "project": {},
+            "table": None
         }
     
     # Initialize library materials if empty
@@ -668,7 +722,6 @@ def initialize_materials():
             "thermal_conductivity": 0.5,
             "density": 1000.0,
             "specific_heat": 1000.0,
-            "thickness_range": [0.01, 0.2],
             "default_thickness": 0.05,
             "embodied_carbon": 100.0,
             "cost": 100.0,
@@ -679,13 +732,16 @@ def initialize_materials():
             "original_name": "",
             "is_library": False
         }
+    if "material_action_id" not in st.session_state:
+        st.session_state.material_action_id = None
 
 def initialize_fenestrations():
     """Initialize fenestrations in session state if not present."""
     if "fenestrations" not in st.session_state.project_data:
         st.session_state.project_data["fenestrations"] = {
             "library": {},
-            "project": {}
+            "project": {},
+            "table": None
         }
     
     # Initialize library fenestrations if empty
@@ -703,13 +759,12 @@ def initialize_fenestrations():
             "thickness": 0.024,
             "embodied_carbon": 900.0,
             "cost": 200.0,
-            "absorptivity": 0.15,
-            "emissivity": 0.84,
-            "colour": "Reflective",
             "edit_mode": False,
             "original_name": "",
             "is_library": False
         }
+    if "fenestration_action_id" not in st.session_state:
+        st.session_state.fenestration_action_id = None
 
 def display_material_editor():
     """Display the material editor form."""
@@ -772,26 +827,50 @@ def display_material_editor():
                 disabled=is_library
             )
             
-            # Thickness range
-            min_thickness, max_thickness = editor_state["thickness_range"]
-            thickness_range = st.slider(
-                "Thickness Range (m)",
+            # Default thickness
+            default_thickness = st.number_input(
+                "Thickness (m)",
                 min_value=0.001,
                 max_value=0.5,
-                value=(float(min_thickness), float(max_thickness)),
+                value=float(editor_state["default_thickness"]),
                 format="%.3f",
-                help="Minimum and maximum thickness range for this material in meters.",
+                help="Thickness for this material in meters.",
                 disabled=is_library
             )
             
-            # Default thickness
-            default_thickness = st.number_input(
-                "Default Thickness (m)",
-                min_value=float(thickness_range[0]),
-                max_value=float(thickness_range[1]),
-                value=min(max(float(editor_state["default_thickness"]), float(thickness_range[0])), float(thickness_range[1])),
-                format="%.3f",
-                help="Default thickness for this material in meters.",
+            # Absorptivity
+            absorptivity = st.number_input(
+                "Absorptivity",
+                min_value=0.0,
+                max_value=1.0,
+                value=float(editor_state["absorptivity"]),
+                format="%.2f",
+                help="Solar radiation absorbed (0-1).",
+                disabled=is_library
+            )
+        
+        # Other properties
+        col1, col2 = st.columns(2)
+        
+        with col1:
+            # Emissivity
+            emissivity = st.number_input(
+                "Emissivity",
+                min_value=0.0,
+                max_value=1.0,
+                value=float(editor_state["emissivity"]),
+                format="%.2f",
+                help="Ratio of radiation emitted (0-1).",
+                disabled=is_library
+            )
+        
+        with col2:
+            # Colour
+            colour = st.selectbox(
+                "Colour Category",
+                COLOUR_CATEGORIES,
+                index=COLOUR_CATEGORIES.index(editor_state["colour"]) if editor_state["colour"] in COLOUR_CATEGORIES else 0,
+                help="Colour category affecting absorptivity.",
                 disabled=is_library
             )
         
@@ -810,17 +889,6 @@ def display_material_editor():
                 help="Embodied carbon in kg CO₂e per cubic meter.",
                 disabled=is_library
             )
-            
-            # Absorptivity
-            absorptivity = st.number_input(
-                "Absorptivity",
-                min_value=0.0,
-                max_value=1.0,
-                value=float(editor_state["absorptivity"]),
-                format="%.2f",
-                help="Solar radiation absorbed (0-1).",
-                disabled=is_library
-            )
         
         with col2:
             # Cost
@@ -833,26 +901,6 @@ def display_material_editor():
                 help="Material cost in USD per cubic meter.",
                 disabled=is_library
             )
-            
-            # Emissivity
-            emissivity = st.number_input(
-                "Emissivity",
-                min_value=0.0,
-                max_value=1.0,
-                value=float(editor_state["emissivity"]),
-                format="%.2f",
-                help="Ratio of radiation emitted (0-1).",
-                disabled=is_library
-            )
-        
-        # Colour
-        colour = st.selectbox(
-            "Colour Category",
-            COLOUR_CATEGORIES,
-            index=COLOUR_CATEGORIES.index(editor_state["colour"]) if editor_state["colour"] in COLOUR_CATEGORIES else 0,
-            help="Colour category affecting absorptivity.",
-            disabled=is_library
-        )
         
         # Form submission buttons
         col1, col2 = st.columns(2)
@@ -865,54 +913,59 @@ def display_material_editor():
     
     # Handle form submission
     if submit_button and not is_library:
-        # Validate inputs
-        validation_errors = validate_material(
-            name, category, thermal_conductivity, density, specific_heat,
-            thickness_range, default_thickness, embodied_carbon, cost,
-            editor_state["edit_mode"], editor_state["original_name"],
-            absorptivity, emissivity, colour
-        )
-        
-        if validation_errors:
-            for error in validation_errors:
-                st.error(error)
-        else:
-            # Create material data
-            material_data = {
-                "category": category,
-                "thermal_conductivity": thermal_conductivity,
-                "density": density,
-                "specific_heat": specific_heat,
-                "thickness_range": list(thickness_range),
-                "default_thickness": default_thickness,
-                "embodied_carbon": embodied_carbon,
-                "cost": cost,
-                "absorptivity": absorptivity,
-                "emissivity": emissivity,
-                "colour": colour
-            }
+        action_id = str(uuid.uuid4())
+        if st.session_state.get("material_action_id") != action_id:
+            st.session_state.material_action_id = action_id
+            # Validate inputs
+            validation_errors = validate_material(
+                name, category, thermal_conductivity, density, specific_heat,
+                default_thickness, embodied_carbon, cost,
+                editor_state["edit_mode"], editor_state["original_name"],
+                absorptivity, emissivity, colour
+            )
             
-            # Handle edit mode
-            if editor_state["edit_mode"]:
-                original_name = editor_state["original_name"]
-                if original_name != name:
-                    del st.session_state.project_data["materials"]["project"][original_name]
-                st.session_state.project_data["materials"]["project"][name] = material_data
-                st.success(f"Material '{name}' updated successfully.")
-                logger.info(f"Updated material '{name}' in project")
+            if validation_errors:
+                for error in validation_errors:
+                    st.error(error)
             else:
-                st.session_state.project_data["materials"]["project"][name] = material_data
-                st.success(f"Material '{name}' added to your project.")
-                logger.info(f"Added new material '{name}' to project")
-            
-            # Reset editor
-            reset_material_editor()
-            st.rerun()
+                # Create material data
+                material_data = {
+                    "category": category,
+                    "thermal_conductivity": thermal_conductivity,
+                    "density": density,
+                    "specific_heat": specific_heat,
+                    "default_thickness": default_thickness,
+                    "embodied_carbon": embodied_carbon,
+                    "cost": cost,
+                    "absorptivity": absorptivity,
+                    "emissivity": emissivity,
+                    "colour": colour
+                }
+                
+                # Handle edit mode
+                if editor_state["edit_mode"]:
+                    original_name = editor_state["original_name"]
+                    if original_name != name:
+                        del st.session_state.project_data["materials"]["project"][original_name]
+                    st.session_state.project_data["materials"]["project"][name] = material_data
+                    st.success(f"Material '{name}' updated successfully.")
+                    logger.info(f"Updated material '{name}' in project")
+                else:
+                    st.session_state.project_data["materials"]["project"][name] = material_data
+                    st.success(f"Material '{name}' added to your project.")
+                    logger.info(f"Added new material '{name}' to project")
+                
+                # Reset editor
+                reset_material_editor()
+                st.rerun()
     
     # Handle clear button
     if clear_button:
-        reset_material_editor()
-        st.rerun()
+        action_id = str(uuid.uuid4())
+        if st.session_state.get("material_action_id") != action_id:
+            st.session_state.material_action_id = action_id
+            reset_material_editor()
+            st.rerun()
 
 def display_fenestration_editor():
     """Display the fenestration editor form."""
@@ -1001,17 +1054,6 @@ def display_fenestration_editor():
                 help="Embodied carbon in kg CO₂e per square meter.",
                 disabled=is_library
             )
-            
-            # Absorptivity
-            absorptivity = st.number_input(
-                "Absorptivity",
-                min_value=0.0,
-                max_value=1.0,
-                value=float(editor_state["absorptivity"]),
-                format="%.2f",
-                help="Solar radiation absorbed (0-1).",
-                disabled=is_library
-            )
         
         with col2:
             # Cost
@@ -1024,26 +1066,6 @@ def display_fenestration_editor():
                 help="Fenestration cost in USD per square meter.",
                 disabled=is_library
             )
-            
-            # Emissivity
-            emissivity = st.number_input(
-                "Emissivity",
-                min_value=0.0,
-                max_value=1.0,
-                value=float(editor_state["emissivity"]),
-                format="%.2f",
-                help="Ratio of radiation emitted (0-1).",
-                disabled=is_library
-            )
-        
-        # Colour
-        colour = st.selectbox(
-            "Colour Category",
-            COLOUR_CATEGORIES,
-            index=COLOUR_CATEGORIES.index(editor_state["colour"]) if editor_state["colour"] in COLOUR_CATEGORIES else 0,
-            help="Colour category affecting absorptivity.",
-            disabled=is_library
-        )
         
         # Form submission buttons
         col1, col2 = st.columns(2)
@@ -1056,57 +1078,59 @@ def display_fenestration_editor():
     
     # Handle form submission
     if submit_button and not is_library:
-        # Validate inputs
-        validation_errors = validate_fenestration(
-            name, fenestration_type, u_value, shgc, visible_transmittance, thickness,
-            embodied_carbon, cost, editor_state["edit_mode"], editor_state["original_name"],
-            absorptivity, emissivity, colour
-        )
-        
-        if validation_errors:
-            for error in validation_errors:
-                st.error(error)
-        else:
-            # Create fenestration data
-            fenestration_data = {
-                "type": fenestration_type,
-                "u_value": u_value,
-                "shgc": shgc,
-                "visible_transmittance": visible_transmittance,
-                "thickness": thickness,
-                "embodied_carbon": embodied_carbon,
-                "cost": cost,
-                "absorptivity": absorptivity,
-                "emissivity": emissivity,
-                "colour": colour
-            }
+        action_id = str(uuid.uuid4())
+        if st.session_state.get("fenestration_action_id") != action_id:
+            st.session_state.fenestration_action_id = action_id
+            # Validate inputs
+            validation_errors = validate_fenestration(
+                name, fenestration_type, u_value, shgc, visible_transmittance, thickness,
+                embodied_carbon, cost, editor_state["edit_mode"], editor_state["original_name"]
+            )
             
-            # Handle edit mode
-            if editor_state["edit_mode"]:
-                original_name = editor_state["original_name"]
-                if original_name != name:
-                    del st.session_state.project_data["fenestrations"]["project"][original_name]
-                st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
-                st.success(f"Fenestration '{name}' updated successfully.")
-                logger.info(f"Updated fenestration '{name}' in project")
+            if validation_errors:
+                for error in validation_errors:
+                    st.error(error)
             else:
-                st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
-                st.success(f"Fenestration '{name}' added to your project.")
-                logger.info(f"Added new fenestration '{name}' to project")
-            
-            # Reset editor
-            reset_fenestration_editor()
-            st.rerun()
+                # Create fenestration data
+                fenestration_data = {
+                    "type": fenestration_type,
+                    "u_value": u_value,
+                    "shgc": shgc,
+                    "visible_transmittance": visible_transmittance,
+                    "thickness": thickness,
+                    "embodied_carbon": embodied_carbon,
+                    "cost": cost
+                }
+                
+                # Handle edit mode
+                if editor_state["edit_mode"]:
+                    original_name = editor_state["original_name"]
+                    if original_name != name:
+                        del st.session_state.project_data["fenestrations"]["project"][original_name]
+                    st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
+                    st.success(f"Fenestration '{name}' updated successfully.")
+                    logger.info(f"Updated fenestration '{name}' in project")
+                else:
+                    st.session_state.project_data["fenestrations"]["project"][name] = fenestration_data
+                    st.success(f"Fenestration '{name}' added to your project.")
+                    logger.info(f"Added new fenestration '{name}' to project")
+                
+                # Reset editor
+                reset_fenestration_editor()
+                st.rerun()
     
     # Handle clear button
     if clear_button:
-        reset_fenestration_editor()
-        st.rerun()
+        action_id = str(uuid.uuid4())
+        if st.session_state.get("fenestration_action_id") != action_id:
+            st.session_state.fenestration_action_id = action_id
+            reset_fenestration_editor()
+            st.rerun()
 
 def validate_material(
     name: str, category: str, thermal_conductivity: float, density: float,
-    specific_heat: float, thickness_range: Tuple[float, float], default_thickness: float,
-    embodied_carbon: float, cost: float, edit_mode: bool, original_name: str,
+    specific_heat: float, default_thickness: float, embodied_carbon: float,
+    cost: float, edit_mode: bool, original_name: str,
     absorptivity: float, emissivity: float, colour: str
 ) -> List[str]:
     """
@@ -1139,15 +1163,9 @@ def validate_material(
     if specific_heat <= 0:
         errors.append("Specific heat must be greater than zero.")
     
-    # Validate thickness range
-    if thickness_range[0] <= 0:
-        errors.append("Minimum thickness must be greater than zero.")
-    if thickness_range[0] >= thickness_range[1]:
-        errors.append("Maximum thickness must be greater than minimum thickness.")
-    
     # Validate default thickness
-    if default_thickness < thickness_range[0] or default_thickness > thickness_range[1]:
-        errors.append("Default thickness must be within the thickness range.")
+    if default_thickness <= 0:
+        errors.append("Thickness must be greater than zero.")
     
     # Validate embodied carbon
     if embodied_carbon < 0:
@@ -1185,8 +1203,7 @@ def validate_material(
 def validate_fenestration(
     name: str, fenestration_type: str, u_value: float, shgc: float,
     visible_transmittance: float, thickness: float, embodied_carbon: float,
-    cost: float, edit_mode: bool, original_name: str,
-    absorptivity: float, emissivity: float, colour: str
+    cost: float, edit_mode: bool, original_name: str
 ) -> List[str]:
     """
     Validate fenestration inputs.
@@ -1230,29 +1247,6 @@ def validate_fenestration(
     if cost < 0:
         errors.append("Cost cannot be negative.")
     
-    # Validate absorptivity
-    if absorptivity < 0 or absorptivity > 1:
-        errors.append("Absorptivity must be between 0 and 1.")
-    
-    # Validate emissivity
-    if emissivity < 0 or emissivity > 1:
-        errors.append("Emissivity must be between 0 and 1.")
-    
-    # Validate colour
-    if colour not in COLOUR_CATEGORIES:
-        errors.append("Please select a valid colour category.")
-    
-    # Validate absorptivity based on colour
-    colour_ranges = {
-        "Light": (0.30, 0.50),
-        "Medium": (0.60, 0.70),
-        "Dark": (0.85, 0.95),
-        "Reflective": (0.10, 0.20)
-    }
-    min_abs, max_abs = colour_ranges[colour]
-    if not (min_abs <= absorptivity <= max_abs):
-        errors.append(f"Absorptivity for {colour} colour must be between {min_abs} and {max_abs}.")
-    
     return errors
 
 def reset_material_editor():
@@ -1263,7 +1257,6 @@ def reset_material_editor():
         "thermal_conductivity": 0.5,
         "density": 1000.0,
         "specific_heat": 1000.0,
-        "thickness_range": [0.01, 0.2],
         "default_thickness": 0.05,
         "embodied_carbon": 100.0,
         "cost": 100.0,
@@ -1274,6 +1267,7 @@ def reset_material_editor():
         "original_name": "",
         "is_library": False
     }
+    st.session_state.material_action_id = None
 
 def reset_fenestration_editor():
     """Reset the fenestration editor to default values."""
@@ -1286,13 +1280,11 @@ def reset_fenestration_editor():
         "thickness": 0.024,
         "embodied_carbon": 900.0,
         "cost": 200.0,
-        "absorptivity": 0.15,
-        "emissivity": 0.84,
-        "colour": "Reflective",
         "edit_mode": False,
         "original_name": "",
         "is_library": False
     }
+    st.session_state.fenestration_action_id = None
 
 def check_material_in_use(material_name: str) -> bool:
     """
@@ -1330,7 +1322,8 @@ def display_materials_help():
     * **Thermal Conductivity (W/m·K)**: Rate of heat transfer through a material. Lower values indicate better insulation.
     * **Density (kg/m³)**: Mass per unit volume.
     * **Specific Heat (J/kg·K)**: Energy required to raise the temperature of 1 kg by 1 K. Higher values indicate better thermal mass.
-    * **U-Value (W/m²·K)**: Overall heat transfer coefficient for fenestrations. Lower values indicate better insulation.
+    * **Thermal Mass (J/m²·K)**: Areal heat capacity (density × specific heat × thickness).
+    * **U-Value (W/m²·K)**: Overall heat transfer coefficient, accounting for material and surface resistances. Lower values indicate better insulation.
     * **SHGC**: Solar Heat Gain Coefficient (0-1). Fraction of incident solar radiation that enters through a fenestration.
     * **Visible Transmittance**: Fraction of visible light that passes through a fenestration.
     * **Embodied Carbon**: Carbon emissions associated with material production, measured in kg CO₂e per unit volume or area.