Update app/materials_library.py

app/materials_library.py

@@ -347,10 +347,8 @@ def categorize_thermal_mass(thermal_mass: float) -> str:
 
 def get_stable_button_key(prefix: str, name: str, action: str) -> str:
     """Generate a stable button key based on prefix, name, and action."""
-    # Create a stable hash-based key that won't change across reruns
     import hashlib
     key_string = f"{prefix}_{name}_{action}"
-    # Use first 8 characters of hash for shorter keys
     hash_key = hashlib.md5(key_string.encode()).hexdigest()[:8]
     return f"{prefix}_{action}_{hash_key}"
 
@@ -359,52 +357,72 @@ def display_materials_page():
     Display the material library page.
     This is the main function called by main.py when the Material Library page is selected.
     """
-    # Initialize session state flags
-    if "material_saved" not in st.session_state:
-        st.session_state.material_saved = False
-    if "fenestration_saved" not in st.session_state:
-        st.session_state.fenestration_saved = False
+    # Initialize session state
+    if "rerun_pending" not in st.session_state:
+        st.session_state.rerun_pending = False
+    if "active_tab" not in st.session_state:
+        st.session_state.active_tab = "Materials"
+    if "material_action" not in st.session_state:
+        st.session_state.material_action = {"action": None, "id": None}
+    if "fenestration_action" not in st.session_state:
+        st.session_state.fenestration_action = {"action": None, "id": None}
+    if "rerun_trigger" not in st.session_state:
+        st.session_state.rerun_trigger = None
+
+    # Check for rerun trigger
+    if st.session_state.rerun_pending:
+        st.session_state.rerun_pending = False
+        st.rerun()
+
+    # Apply custom CSS for button styling
+    st.markdown("""
+    <style>
+    .stButton>button {
+        width: 100%;
+        font-size: 12px;
+        padding: 5px;
+        margin: 0;
+    }
+    </style>
+    """, unsafe_allow_html=True)
 
     st.title("Material Library")
     
-    # Display help information in an expandable section
     with st.expander("Help & Information"):
         display_materials_help()
     
-    # Create tabs for materials and fenestrations
     tab1, tab2 = st.tabs(["Materials", "Fenestrations"])
     
-    # Materials tab
     with tab1:
+        if st.session_state.active_tab == "Materials":
+            st.session_state.active_tab = "Materials"
         display_materials_tab()
     
-    # Fenestrations tab
     with tab2:
+        if st.session_state.active_tab == "Fenestrations":
+            st.session_state.active_tab = "Fenestrations"
         display_fenestrations_tab()
     
-    # Navigation buttons
     col1, col2 = st.columns(2)
     
     with col1:
         if st.button("Back to Climate Data", key="back_to_climate"):
             st.session_state.current_page = "Climate Data"
-            st.rerun()
+            st.session_state.rerun_pending = True
     
     with col2:
         if st.button("Continue to Construction", key="continue_to_construction"):
             st.session_state.current_page = "Construction"
-            st.rerun()
+            st.session_state.rerun_pending = True
 
 def display_materials_tab():
     """Display the materials tab content."""
-    # Initialize materials in session state if not present
     initialize_materials()
     
     st.subheader("Materials")
     col1, col2 = st.columns([3, 2])
     
     with col1:
-        # Library Materials
         filter_options = ["All"] + MATERIAL_CATEGORIES
         category = st.selectbox("Filter by Category", filter_options, key="material_filter")
         
@@ -435,29 +453,43 @@ def display_materials_tab():
                     cols[1].write(thermal_mass_category)
                     cols[2].write(f"{u_value:.3f}")
                     
-                    # Use stable keys for buttons
                     preview_key = get_stable_button_key("lib_mat", name, "preview")
                     copy_key = get_stable_button_key("lib_mat", name, "copy")
                     
                     if cols[3].button("Preview", key=preview_key):
-                        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}'")
+                        if st.session_state.rerun_trigger != f"preview_mat_{name}":
+                            st.session_state.rerun_trigger = f"preview_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"],
+                                "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.material_form_state = {
+                                "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"]
+                            }
+                            st.session_state.active_tab = "Materials"
+                            st.session_state.rerun_pending = True
                         
                     if cols[4].button("Copy", key=copy_key):
                         new_name = f"{name}_Project"
@@ -468,11 +500,11 @@ def display_materials_tab():
                         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()
+                        st.session_state.rerun_pending = True
+            
             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():
@@ -501,29 +533,43 @@ def display_materials_tab():
                     cols[1].write(thermal_mass_category)
                     cols[2].write(f"{u_value:.3f}")
                     
-                    # Use stable keys for buttons
                     edit_key = get_stable_button_key("proj_mat", name, "edit")
                     delete_key = get_stable_button_key("proj_mat", name, "delete")
                     
                     if cols[3].button("Edit", key=edit_key):
-                        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}'")
+                        if st.session_state.rerun_trigger != f"edit_mat_{name}":
+                            st.session_state.rerun_trigger = f"edit_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"],
+                                "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.material_form_state = {
+                                "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"]
+                            }
+                            st.session_state.active_tab = "Materials"
+                            st.session_state.rerun_pending = True
                         
                     if cols[4].button("Delete", key=delete_key):
                         is_in_use = check_material_in_use(name)
@@ -533,11 +579,11 @@ def display_materials_tab():
                             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()
+                            st.session_state.rerun_pending = True
+            
             else:
                 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:
@@ -573,18 +619,15 @@ def display_materials_tab():
 
 def display_fenestrations_tab():
     """Display the fenestrations tab content."""
-    # Initialize fenestrations in session state if not present
     initialize_fenestrations()
     
     st.subheader("Fenestrations")
     col1, col2 = st.columns([3, 2])
     
     with col1:
-        # Type filter
         filter_options = ["All"] + FENESTRATION_TYPES
         fen_type = st.selectbox("Filter by Type", filter_options, key="fenestration_filter")
         
-        # Library Fenestrations
         st.subheader("Library Fenestrations")
         with st.container():
             library_fenestrations = st.session_state.project_data["fenestrations"]["library"]
@@ -609,26 +652,37 @@ def display_fenestrations_tab():
                     cols[1].write(fenestration["type"])
                     cols[2].write(f"{fenestration['u_value']:.2f}")
                     
-                    # Use stable keys for buttons
                     preview_key = get_stable_button_key("lib_fen", name, "preview")
                     copy_key = get_stable_button_key("lib_fen", name, "copy")
                     
                     if cols[3].button("Preview", key=preview_key):
-                        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}'")
+                        if st.session_state.rerun_trigger != f"preview_fen_{name}":
+                            st.session_state.rerun_trigger = f"preview_fen_{name}"
+                            st.session_state.fenestration_editor = {
+                                "name": name,
+                                "type": fenestration["type"],
+                                "u_value": fenestration["u_value"],
+                                "shgc": fenestration["shgc"],
+                                "visible_trans": 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.fenestration_form_state = {
+                                "name": name,
+                                "type": fenestration["type"],
+                                "u_value": fenestration["u_value"],
+                                "shgc": fenestration["shgc"],
+                                "visible_trans": fenestration["visible_transmittance"],
+                                "thickness": fenestration["thickness"],
+                                "embodied_carbon": fenestration["embodied_carbon"],
+                                "cost": fenestration["cost"]
+                            }
+                            st.session_state.active_tab = "Fenestrations"
+                            st.session_state.rerun_pending = True
                         
                     if cols[4].button("Copy", key=copy_key):
                         new_name = f"{name}_Project"
@@ -639,11 +693,11 @@ def display_fenestrations_tab():
                         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()
+                        st.session_state.rerun_pending = True
+            
             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():
@@ -669,53 +723,64 @@ def display_fenestrations_tab():
                     cols[1].write(fenestration["type"])
                     cols[2].write(f"{fenestration['u_value']:.2f}")
                     
-                    # Use stable keys for buttons
                     edit_key = get_stable_button_key("proj_fen", name, "edit")
                     delete_key = get_stable_button_key("proj_fen", name, "delete")
                     
                     if cols[3].button("Edit", key=edit_key):
-                        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}'")
+                        if st.session_state.rerun_trigger != f"edit_fen_{name}":
+                            st.session_state.rerun_trigger = f"edit_fen_{name}"
+                            st.session_state.fenestration_editor = {
+                                "name": name,
+                                "type": fenestration["type"],
+                                "u_value": fenestration["u_value"],
+                                "shgc": fenestration["shgc"],
+                                "visible_trans": 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.fenestration_form_state = {
+                                "name": name,
+                                "type": fenestration["type"],
+                                "u_value": fenestration["u_value"],
+                                "shgc": fenestration["shgc"],
+                                "visible_trans": fenestration["visible_transmittance"],
+                                "thickness": fenestration["thickness"],
+                                "embodied_carbon": fenestration["embodied_carbon"],
+                                "cost": fenestration["cost"]
+                            }
+                            st.session_state.active_tab = "Fenestrations"
+                            st.session_state.rerun_pending = True
                         
                     if cols[4].button("Delete", key=delete_key):
                         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.")
+                            st.error(f"Cannot delete fenestration_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()
+                            st.logger.info(f"Deleted fenestration '{name}' from project")
+                            st.session_state.rerun_pending = True
+                            
             else:
                 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():
+            for name, props in sorted(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"],
+                    "VisibleLight Transmittance": props["visible_transmittance"],
                     "Thickness (m)": props["thickness"],
-                    "Embodied Carbon (kg CO₂e/m²)": props["embodied_carbon"],
+                    "Embodied Carbon (kg/m²)": props["embodied_carbon"],
                     "Cost (USD/m²)": props["cost"]
                 })
             df = pd.DataFrame(data)
@@ -737,11 +802,9 @@ def initialize_materials():
             "table": None
         }
     
-    # Initialize library materials if empty
     if not st.session_state.project_data["materials"]["library"]:
         st.session_state.project_data["materials"]["library"] = DEFAULT_MATERIALS.copy()
     
-    # Initialize material editor state
     if "material_editor" not in st.session_state:
         st.session_state.material_editor = {
             "name": "",
@@ -751,7 +814,7 @@ def initialize_materials():
             "specific_heat": 1000.0,
             "default_thickness": 0.05,
             "embodied_carbon": 100.0,
-            "cost": 100.0,
+            "cost": 100.100,
             "absorptivity": 0.60,
             "emissivity": 0.90,
             "colour": "Medium",
@@ -759,6 +822,21 @@ def initialize_materials():
             "original_name": "",
             "is_library": False
         }
+    
+    if "material_form_state" not in st.session_state:
+        st.session_state.material_form_state = {
+            "name": "",
+            "category": MATERIAL_CATEGORIES[0],
+            "thermal_conductivity": 0.5,
+            "density": 1000.0,
+            "specific_heat": 1000.0,
+            "default_thickness": 0.05,
+            "embodied_carbon": "",
+            "cost": "",
+            "absorptivity": 0.6,
+            "emissivity": "",
+            "colour": "Medium"
+        }
 
 def initialize_fenestrations():
     """Initialize fenestrations in session state if not present."""
@@ -769,18 +847,16 @@ def initialize_fenestrations():
             "table": None
         }
     
-    # Initialize library fenestrations if empty
     if not st.session_state.project_data["fenestrations"]["library"]:
         st.session_state.project_data["fenestrations"]["library"] = DEFAULT_FENESTRATIONS.copy()
     
-    # Initialize fenestration editor state
-    if "fenestration_editor" not in st.session_state:
+    if "fenestration_editor_form" not in st.session_state:
         st.session_state.fenestration_editor = {
             "name": "",
             "type": FENESTRATION_TYPES[0],
             "u_value": 2.8,
             "shgc": 0.7,
-            "visible_transmittance": 0.8,
+            "visible_trans": 0.8,
             "thickness": 0.024,
             "embodied_carbon": 900.0,
             "cost": 200.0,
@@ -788,144 +864,144 @@ def initialize_fenestrations():
             "original_name": "",
             "is_library": False
         }
+    
+    if "fenestration_form_state" not in st.session_state:
+        st.session_state.fenestration_form_state = {
+            "name": "",
+            "type": FENESTRATION_TYPES[0],
+            "u_value": 2.8,
+            "shgc": 0.7,
+            "visible_trans": 0.8,
+            "thickness": 0.024,
+            "embodied_carbon": "",
+            "cost": ""
+        }
 
 def display_material_editor():
     """Display the material editor form."""
     with st.form("material_editor_form"):
         editor_state = st.session_state.material_editor
+        form_state = st.session_state.material_form_state
         is_library = editor_state.get("is_library", False)
         
-        # Material name
         name = st.text_input(
             "Material Name",
-            value=editor_state["name"],
+            value=form_state.get("name", editor_state["name"]),
             help="Enter a unique name for the material.",
             disabled=is_library
         )
         
-        # Create two columns for layout
         col1, col2 = st.columns(2)
         
         with col1:
-            # Category
+            category_index = MATERIAL_CATEGORIES.index(form_state.get("category", editor_state["category", MATERIAL_CATEGORIES[0]))
             category = st.selectbox(
                 "Category",
                 MATERIAL_CATEGORIES,
-                index=MATERIAL_CATEGORIES.index(editor_state["category"]) if editor_state["category"] in MATERIAL_CATEGORIES else 0,
+                index=category_index,
                 help="Select the material category.",
                 disabled=is_library
             )
             
-            # Thermal conductivity
             thermal_conductivity = st.number_input(
                 "Thermal Conductivity (W/m·K)",
                 min_value=0.001,
                 max_value=1000.0,
-                value=float(editor_state["thermal_conductivity"]),
+                value=float(form_state.get("thermal_conductivity", editor_state["thermal_conductivity"])),
                 format="%.3f",
                 help="Thermal conductivity in W/m·K. Lower values indicate better insulation.",
                 disabled=is_library
             )
             
-            # Density
             density = st.number_input(
                 "Density (kg/m³)",
                 min_value=1.0,
                 max_value=20000.0,
-                value=float(editor_state["density"]),
+                value=float(form_state.get("density", editor_state["density"])),
                 format="%.1f",
                 help="Material density in kg/m³.",
                 disabled=is_library
             )
         
         with col2:
-            # Specific heat
             specific_heat = st.number_input(
                 "Specific Heat (J/kg·K)",
                 min_value=100.0,
                 max_value=10000.0,
-                value=float(editor_state["specific_heat"]),
+                value=float(form_state.get("specific_heat", editor_state["specific_heat"])),
                 format="%.1f",
                 help="Specific heat capacity in J/kg·K. Higher values indicate better thermal mass.",
                 disabled=is_library
             )
             
-            # Default thickness
             default_thickness = st.number_input(
                 "Thickness (m)",
                 min_value=0.001,
                 max_value=0.5,
-                value=float(editor_state["default_thickness"]),
+                value=float(form_state.get("default_thickness", editor_state["default_thickness"])),
                 format="%.3f",
                 help="Thickness for this material in meters.",
                 disabled=is_library
             )
             
-            # Absorptivity
             absorptivity = st.number_input(
                 "Absorptivity",
                 min_value=0.0,
                 max_value=1.0,
-                value=float(editor_state["absorptivity"]),
+                value=float(form_state.get("absorptivity", 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"]),
+                value=float(form_state.get("emissivity", editor_state["emissivity"])),
                 format="%.2f",
                 help="Ratio of radiation emitted (0-1).",
                 disabled=is_library
             )
         
         with col2:
-            # Colour
+            colour_index = COLOUR_CATEGORIES.index(form_state.get("colour", editor_state["colour"])) if form_state.get("colour", editor_state["colour"]) in COLOUR_CATEGORIES else 0
             colour = st.selectbox(
                 "Colour Category",
                 COLOUR_CATEGORIES,
-                index=COLOUR_CATEGORIES.index(editor_state["colour"]) if editor_state["colour"] in COLOUR_CATEGORIES else 0,
+                index=colour_index,
                 help="Colour category affecting absorptivity.",
                 disabled=is_library
             )
         
-        # Additional properties
         st.subheader("Additional Properties")
         col1, col2 = st.columns(2)
         
         with col1:
-            # Embodied carbon
             embodied_carbon = st.number_input(
                 "Embodied Carbon (kg CO₂e/m³)",
                 min_value=0.0,
                 max_value=10000.0,
-                value=float(editor_state["embodied_carbon"]),
+                value=float(form_state.get("embodied_carbon", editor_state.get("embodied_carbon", ""))),
                 format="%.1f",
                 help="Embodied carbon in kg CO₂e per cubic meter.",
                 disabled=is_library
             )
         
         with col2:
-            # Cost
             cost = st.number_input(
                 "Cost (USD/m³)",
                 min_value=0.0,
                 max_value=10000.0,
-                value=float(editor_state["cost"]),
+                value=float(form_state.get("cost", editor_state.get("cost", ""))),
                 format="%.1f",
                 help="Material cost in USD per cubic meter.",
                 disabled=is_library
             )
         
-        # Form submission buttons
         col1, col2 = st.columns(2)
         
         with col1:
@@ -934,22 +1010,12 @@ def display_material_editor():
         with col2:
             clear_button = st.form_submit_button("Clear Form")
         
-        # Handle form submission
         if submit_button and not is_library:
-            # 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
-            )
-            
-            if validation_errors:
-                for error in validation_errors:
-                    st.error(error)
-            else:
-                # Create material data
-                material_data = {
+            action_id = str(uuid.uuid4())
+            if st.session_state.material_action.get("id") != action_id:
+                st.session_state.material_action = {"action": "save", "id": action_id}
+                st.session_state.material_form_state = {
+                    "name": name,
                     "category": category,
                     "thermal_conductivity": thermal_conductivity,
                     "density": density,
@@ -961,132 +1027,138 @@ def display_material_editor():
                     "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")
+                success, message = 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
+                )
+                if not success:
+                    st.error(message)
                 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 and trigger rerun
-                reset_material_editor()
-                logger.info("Triggering rerun after saving material editor")
-                st.rerun()
+                    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
+                    }
+                    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_material_editor()
+                    st.session_state.rerun_pending = True
         
-        # Handle clear button
         if clear_button:
             reset_material_editor()
-            logger.info("Triggering rerun after clearing material editor")
-            st.rerun()
+            st.session_state.rerun_pending = True
 
 def display_fenestration_editor():
     """Display the fenestration editor form."""
     with st.form("fenestration_editor_form"):
         editor_state = st.session_state.fenestration_editor
+        form_state = st.session_state.fenestration_form_state
         is_library = editor_state.get("is_library", False)
         
-        # Fenestration name
         name = st.text_input(
             "Fenestration Name",
-            value=editor_state["name"],
+            value=form_state.get("name", editor_state["name"]),
             help="Enter a unique name for the fenestration.",
             disabled=is_library
         )
         
-        # Create two columns for layout
         col1, col2 = st.columns(2)
         
         with col1:
-            # Type
+            type_index = FENESTRATION_TYPES.index(form_state.get("type", editor_state["type"])) if form_state.get("type", editor_state["type"]) in FENESTRATION_TYPES else 0
             fenestration_type = st.selectbox(
                 "Type",
                 FENESTRATION_TYPES,
-                index=FENESTRATION_TYPES.index(editor_state["type"]) if editor_state["type"] in FENESTRATION_TYPES else 0,
+                index=type_index,
                 help="Select the fenestration type.",
                 disabled=is_library
             )
             
-            # U-value
             u_value = st.number_input(
                 "U-Value (W/m²·K)",
                 min_value=0.1,
                 max_value=10.0,
-                value=float(editor_state["u_value"]),
+                value=float(form_state.get("u_value", editor_state.get("u_value", ""))),
                 format="%.2f",
-                help="U-value in W/m²·K. Lower values indicate better insulation.",
+                help="U-value in W/m²·K. value",
                 disabled=is_library
             )
             
-            # SHGC
+        with col2:
             shgc = st.number_input(
                 "Solar Heat Gain Coefficient (SHGC)",
                 min_value=0.0,
                 max_value=1.0,
-                value=float(editor_state["shgc"]),
+                value=float(form_state.get("shgc", editor_state.get("shgc", ""))),
                 format="%.2f",
-                help="Solar Heat Gain Coefficient (0-1). Lower values indicate less solar heat transmission.",
+                help="Solar Heat Gain Coefficient (0-1).",
                 disabled=is_library
             )
-        
-        with col2:
-            # Visible transmittance
-            visible_transmittance = st.number_input(
+            
+            visible_trans = st.number_input(
                 "Visible Transmittance",
                 min_value=0.0,
                 max_value=1.0,
-                value=float(editor_state["visible_transmittance"]),
+                value=float(form_state.get("visible_trans", editor_state.get("visible_trans", ""))),
                 format="%.2f",
-                help="Visible Transmittance (0-1). Higher values indicate more visible light transmission.",
+                help="Visible light transmission (0-1).",
                 disabled=is_library
             )
             
-            # Thickness
             thickness = st.number_input(
                 "Thickness (m)",
                 min_value=0.001,
-                max_value=0.1,
-                value=float(editor_state["thickness"]),
+                max_value=0.0.1,
+                value=float(form_state.get("thickness", editor_state.get("thickness", ""))),
                 format="%.3f",
                 help="Thickness in meters.",
                 disabled=is_library
             )
         
-        # Additional properties
         st.subheader("Additional Properties")
+        
         col1, col2 = st.columns(2)
         
         with col1:
-            # Embodied carbon
             embodied_carbon = st.number_input(
                 "Embodied Carbon (kg CO₂e/m²)",
                 min_value=0.0,
                 max_value=5000.0,
-                value=float(editor_state["embodied_carbon"]),
+                value=float(form_state.get("embodied_carbon", editor_state.get("embodied_carbon", ""))),
                 format="%.1f",
-                help="Embodied carbon in kg CO₂e per square meter.",
+                help="Embodied carbon in kg CO₂e/m².",
                 disabled=is_library
             )
         
         with col2:
-            # Cost
             cost = st.number_input(
                 "Cost (USD/m²)",
                 min_value=0.0,
                 max_value=5000.0,
-                value=float(editor_state["cost"]),
+                value=float(form_state.get("cost", editor_state.get("cost", ""))),
                 format="%.1f",
-                help="Fenestration cost in USD per square meter.",
+                help="Fenestration cost in USD/m².",
                 disabled=is_library
             )
         
-        # Form submission buttons
         col1, col2 = st.columns(2)
         
         with col1:
@@ -1095,114 +1167,100 @@ def display_fenestration_editor():
         with col2:
             clear_button = st.form_submit_button("Clear Form")
         
-        # 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"]
-            )
-            
-            if validation_errors:
-                for error in validation_errors:
-                    st.error(error)
-            else:
-                # Create fenestration data
-                fenestration_data = {
+            action_id = str(uuid.uuid4())
+            if st.session_state.fenestration_action.get("id") != action_id:
+                st.session_state.fenestration_action = {"action": "save", "id": action_id}
+                st.session_state.fenestration_form_state = {
+                    "name": name,
                     "type": fenestration_type,
                     "u_value": u_value,
                     "shgc": shgc,
-                    "visible_transmittance": visible_transmittance,
+                    "visible_trans": visible_trans,
                     "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")
+                success, message = validate_fenestration(
+                    name, fenestration_type, u_value, shgc, visible_trans, thickness,
+                    embodied_carbon, cost, editor_state["edit_mode"], editor_state["original_name"]
+                )
+                if not success:
+                    st.error(message)
                 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 and trigger rerun
-                reset_fenestration_editor()
-                logger.info("Triggering rerun after saving fenestration editor")
-                st.rerun()
+                    fenestration_data = {
+                        "type": fenestration_type,
+                        "u_value": u_value,
+                        "shgc": shgc,
+                        "visible_transmittance": visible_trans,
+                        "thickness": thickness,
+                        "embodied_carbon": embodied_carbon,
+                        "cost": cost
+                    }
+                    if editor_state["edit_mode"]:
+                        original_name = editor_state["original_name"]
+                        if original_name != st.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_fenestration_editor()
+                    st.session_state.rerun_pending = True
         
-        # Handle clear button
         if clear_button:
             reset_fenestration_editor()
-            logger.info("Triggering rerun after clearing fenestration editor")
-            st.rerun()
+            st.session_state.rerun_pending = True
 
 def validate_material(
     name: str, category: str, thermal_conductivity: float, density: float,
     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]:
+) -> Tuple[bool, str]:
     """
     Validate material inputs.
+    Returns (success, message) tuple.
     """
-    errors = []
-    
-    # Validate name
     if not name or name.strip() == "":
-        errors.append("Material name is required.")
+        return False, "Material name is required."
     
-    # Check for name uniqueness
-    if not edit_mode or (edit_mode and name != original_name):
-        if name in st.session_state.project_data["materials"]["project"]:
-            errors.append(f"Material name '{name}' already exists in your project.")
+    if (not edit_mode or name != original_name) and name in st.session_state.project_data["materials"]["project"]:
+        return False, f"Material name '{name}' already exists in project materials."
     
-    # Validate category
-    if category not in MATERIAL_CATEGORIES:
-        errors.append("Please select a valid material category.")
+    if category is not in MATERIAL_CATEGORIES:
+        return False, "Invalid material category."
     
-    # Validate thermal conductivity
     if thermal_conductivity <= 0:
-        errors.append("Thermal conductivity must be greater than zero.")
+        return False, "Thermal conductivity must be greater than zero."
     
-    # Validate density
     if density <= 0:
-        errors.append("Density must be greater than zero.")
+        return False, "Density must be greater than zero."
     
-    # Validate specific heat
     if specific_heat <= 0:
-        errors.append("Specific heat must be greater than zero.")
+        return False, "Specific heat must be greater than zero."
     
-    # Validate default thickness
     if default_thickness <= 0:
-        errors.append("Thickness must be greater than zero.")
+        return False, "Thickness must be greater than zero."
     
-    # Validate embodied carbon
     if embodied_carbon < 0:
-        errors.append("Embodied carbon cannot be negative.")
+        return False, "Embodied carbon cannot be negative."
     
-    # Validate cost
     if cost < 0:
-        errors.append("Cost cannot be negative.")
+        return False, "Cost cannot be negative."
     
-    # Validate absorptivity
     if absorptivity < 0 or absorptivity > 1:
-        errors.append("Absorptivity must be between 0 and 1.")
+        return False, "Absorptivity must be between 0 and 1."
     
-    # Validate emissivity
     if emissivity < 0 or emissivity > 1:
-        errors.append("Emissivity must be between 0 and 1.")
+        return False, "Emissivity must be between 0 and 1."
     
-    # Validate colour
     if colour not in COLOUR_CATEGORIES:
-        errors.append("Please select a valid colour category.")
+        return False, "Invalid colour category."
     
-    # Validate absorptivity based on colour
     colour_ranges = {
         "Light": (0.30, 0.50),
         "Medium": (0.60, 0.70),
@@ -1211,93 +1269,105 @@ def validate_material(
     }
     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 False, f"Absorptivity for {colour} colour must be between {min_abs} and {max_abs}."
     
-    return errors
+    return True, ""
 
 def validate_fenestration(
     name: str, fenestration_type: str, u_value: float, shgc: float,
-    visible_transmittance: float, thickness: float, embodied_carbon: float,
+    visible_trans: float, thickness: float, embodied_carbon: float,
     cost: float, edit_mode: bool, original_name: str
-) -> List[str]:
+) -> Tuple[bool, str]:
     """
     Validate fenestration inputs.
-    """
-    errors = []
-    
-    # Validate name
+    Returns (success, message) tuple."""
     if not name or name.strip() == "":
-        errors.append("Fenestration name is required.")
+        return False, "Fenestration name is required."
     
-    # Check for name uniqueness
-    if not edit_mode or (edit_mode and name != original_name):
-        if name in st.session_state.project_data["fenestrations"]["project"]:
-            errors.append(f"Fenestration name '{name}' already exists in your project.")
+    if (not edit_mode or name != original_name) and name in st.session_state.project_data["fenestrations"]["project"]:
+        return False, f"Fenestration name '{name}' already exists in project."
     
-    # Validate type
     if fenestration_type not in FENESTRATION_TYPES:
-        errors.append("Please select a valid fenestration type.")
+        return False, "Invalid fenestration type."
     
-    # Validate u_value
     if u_value <= 0:
-        errors.append("U-value must be greater than zero.")
+        return False, "U-value must be greater than zero."
     
-    # Validate shgc
     if shgc < 0 or shgc > 1:
-        errors.append("SHGC must be between 0 and 1.")
+        return False, "SHGC must be between 0 and 1."
     
-    # Validate visible transmittance
-    if visible_transmittance < 0 or visible_transmittance > 1:
-        errors.append("Visible transmittance must be between 0 and 1.")
+    if visible_trans < 0 or visible_trans > 1:
+        return False, "Visible transmittance must be between 0 and 1."
     
-    # Validate thickness
     if thickness <= 0:
-        errors.append("Thickness must be greater than zero.")
-    
-    # Validate embodied carbon
+        return False, "Thickness must be greater than zero."
+        
     if embodied_carbon < 0:
-        errors.append("Embodied carbon cannot be negative.")
+        return False, "Embodied carbon cannot be negative."
     
-    # Validate cost
     if cost < 0:
-        errors.append("Cost cannot be negative.")
+        return False, "Cost cannot be negative."
     
-    return errors
+    return True, ""
 
 def reset_material_editor():
-    """Reset the material editor to default values."""
-    st.session_state.material_editor = {
+    """Reset the material editor and form state."""
+    st.session_state.material_form_state = {
         "name": "",
         "category": MATERIAL_CATEGORIES[0],
         "thermal_conductivity": 0.5,
         "density": 1000.0,
         "specific_heat": 1000.0,
         "default_thickness": 0.05,
-        "embodied_carbon": 100.0,
-        "cost": 100.0,
+        "embodied_carbon": "",
+        "cost": "",
         "absorptivity": 0.60,
-        "emissivity": 0.90,
-        "colour": "Medium",
+        "emissivity": "",
+        "colour": ""
+    }
+    st.session_state.material_editor = {
+        "name": "",
+        "category": MATERIAL_CATEGORIES[0],
+        "thermal_conductivity": "",
+        "density": 0.0,
+        "specific_heat": "",
+        "default_thickness": "",
+        "embodied_carbon": "",
+        "cost": "",
+        "absorptivity": "",
+        "emissivity": "",
+        "colour": "",
         "edit_mode": False,
         "original_name": "",
         "is_library": False
     }
+    st.session_state.material_action = {"action": None, "id": None}
+    st.session_state.rerun_trigger = None
 
 def reset_fenestration_editor():
-    """Reset the fenestration editor to default values."""
-    st.session_state.fenestration_editor = {
+    """Reset the fenestration editor and form state."""
+    st.session_state.fenestration_form_state = {
         "name": "",
         "type": FENESTRATION_TYPES[0],
-        "u_value": 2.8,
-        "shgc": 0.7,
-        "visible_transmittance": 0.8,
-        "thickness": 0.024,
-        "embodied_carbon": 900.0,
-        "cost": 200.0,
-        "edit_mode": False,
-        "original_name": "",
-        "is_library": False
+        "u_value": "",
+        "shgc": "",
+        "visible_trans": "",
+        "thickness": "",
+        "embodied_carbon": "",
+        "cost": ""
     }
+    st.session_state.fenestration_form_state = {
+        "name": "",
+        "type": FENESTRATION_TYPES[0],
+        "u_value": "",
+        "shgc": "",
+        "visible_trans": "",
+        "thickness": "",
+        "embodied_carbon": "",
+        "cost": ""
+    }
+    st.session_state.fenestration_action = {"action": None, "id": None}
+    st.session_state.rerun_trigger = None
 
 def check_material_in_use(material_name: str) -> bool:
     """
@@ -1305,15 +1375,16 @@ def check_material_in_use(material_name: str) -> bool:
     """
     return False
 
-def check_fenestration_in_use(fenestration_name: str) -> bool:
+def check_fenestration_in_use(name: str) -> bool:
     """
-    Check if a fenestration is in use in any components.
+    Check if a fenestration is in use in any components."""
     """
     return False
 
 def display_materials_help():
     """Display help information for the material library page."""
     st.markdown("""
+    """
     ### Material Library Help
     
     This section allows you to manage building materials and fenestrations for your project.
@@ -1322,32 +1393,32 @@ def display_materials_help():
     
     * **Library Materials**: Pre-defined materials with standard thermal properties. Use 'Preview' to view details or 'Copy' to add to your project.
     * **Project Materials**: Materials you've added to your project. Use 'Edit' to modify or 'Delete' to remove.
-    * **Material Editor/Creator**: Create new materials or edit existing project materials. Library materials can only be previewed.
+    * **Material Editor/Creator**: Create new materials or edit existing project materials. Library materials can only be copied.
     
     **Fenestrations Tab:**
     
     * **Library Fenestrations**: Pre-defined windows, doors, and skylights. Use 'Preview' to view details or 'Copy' to add to your project.
     * **Project Fenestrations**: Fenestrations you've added to your project. Use 'Edit' to modify or 'Delete' to remove.
-    * **Fenestration Editor/Creator**: Create new fenestrations or edit existing project fenestrations. Library fenestrations can only be previewed.
+    * **Fenestration Editor/Creator**: Create new fenestrations or edit existing project fenestrations. Library fenestrations can only be copied.
     
     **Key Properties:**
     
     * **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.
+    * **Specific Heat (J/kg·K)**: Energy required to raise the temperature of 1 kg by 1 K.
     * **Thermal Mass**: Areal heat capacity, categorized as Low (<30,000 J/m²·K), Medium (30,000–90,000 J/m²·K), or High (>90,000 J/m²·K).
     * **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.
+    * **SHGC**: Solar absorption 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.
-    * **Cost**: Material cost in USD per unit volume or area.
+    * **Cost**: Material’s cost in USD per unit volume or area.
     * **Absorptivity**: Fraction of solar radiation absorbed (0-1). Depends on colour category.
     * **Emissivity**: Ratio of radiation emitted by the material (0-1).
     * **Colour**: Category affecting absorptivity (Light, Medium, Dark, Reflective).
     
-    **Workflow:**
+    **Workflow**:
     
-    1. Browse the library materials and fenestrations
+    1. Browse library materials and fenestrations
     2. Copy items to your project or create custom ones
     3. Edit properties as needed for your specific project
     4. Continue to the Construction page to create assemblies using these materials