Update app/internal_loads.py

app/internal_loads.py

@@ -3,7 +3,7 @@ BuildSustain - Internal Loads Module
 
 This module handles the internal loads functionality of the BuildSustain application,
 allowing users to define occupancy, lighting, equipment, ventilation, infiltration, and schedules.
-It provides comprehensive load management with the new UI structure matching other modules.
+It provides comprehensive load management with a UI structure matching the Components module.
 
 Developed by: Dr Majed Abuseif, Deakin University
 © 2025
@@ -49,8 +49,11 @@ def display_internal_loads_page():
     with st.expander("Help & Information"):
         display_internal_loads_help()
     
+    # Initialize rerun flags if not present
+    if "module_rerun_flags" not in st.session_state:
+        st.session_state.module_rerun_flags = {}
+    
     # Check if rerun is pending
-    # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
     if st.session_state.module_rerun_flags.get("internal_loads", False):
         st.session_state.module_rerun_flags["internal_loads"] = False
         st.rerun()
@@ -87,7 +90,6 @@ def display_internal_loads_page():
 def initialize_internal_loads():
     """
     Initialize internal loads in session state if not present.
-    [FIX]: Removed redundant initialization as main.py handles this.
     Logging a warning if initialization is needed for debugging.
     """
     if "internal_loads" not in st.session_state.project_data:
@@ -101,16 +103,15 @@ def initialize_internal_loads():
         }
 
 def display_people_tab():
-    """Display the people tab content with two-column layout."""
+    """Display the people tab content with a two-column layout similar to components.py."""
+    # Get people from session state
+    people_groups = st.session_state.project_data["internal_loads"]["people"]
+    
     # Split the display into two columns
     col1, col2 = st.columns([3, 2])
     
     with col1:
         st.subheader("Saved People Groups")
-        
-        # Get people from session state
-        people_groups = st.session_state.project_data["internal_loads"]["people"]
-        
         if people_groups:
             display_people_table(people_groups)
         else:
@@ -119,11 +120,13 @@ def display_people_tab():
     with col2:
         st.subheader("People Group Editor/Creator")
         
-        # Check if we have an editor state for people
+        # Initialize editor and action states
         if "people_editor" not in st.session_state:
             st.session_state.people_editor = {}
+        if "people_action" not in st.session_state:
+            st.session_state.people_action = {"action": None, "id": None}
         
-        # Display the people editor form
+        # Display the editor form
         with st.form("people_editor_form", clear_on_submit=True):
             editor_state = st.session_state.get("people_editor", {})
             is_edit = editor_state.get("is_edit", False)
@@ -195,79 +198,74 @@ def display_people_tab():
             # Submit buttons
             col1, col2 = st.columns(2)
             with col1:
-                submit_label = "Update People Group" if is_edit else "Add People Group"
-                submit = st.form_submit_button(submit_label)
+                submit_label = "Update" if is_edit else "Add"
+                submit = st.form_submit_button(f"{submit_label} People Group")
             
             with col2:
-                cancel = st.form_submit_button("Cancel")
+                refresh = st.form_submit_button("Refresh")
         
         # Handle form submission
         if submit:
             # Validate inputs
             if not name.strip():
                 st.error("Group name is required.")
+                return
+            # Check for unique name
+            existing_names = [group["name"] for group in people_groups if not (is_edit and group["name"] == editor_state.get("name"))]
+            if name.strip() in existing_names:
+                st.error("Group name must be unique.")
+                return
+            
+            # Get activity data
+            activity_data = PEOPLE_ACTIVITY_LEVELS[activity_level]
+            
+            # Create people group data
+            people_data = {
+                "id": str(uuid.uuid4()),
+                "name": name.strip(),
+                "num_people": num_people,
+                "activity_level": activity_level,
+                "activity_data": activity_data,
+                "clo_summer": clo_summer,
+                "clo_winter": clo_winter,
+                "schedule": schedule,
+                "zone": zone,
+                "sensible_heat_per_person": (activity_data["sensible_min_w"] + activity_data["sensible_max_w"]) / 2,
+                "latent_heat_per_person": (activity_data["latent_min_w"] + activity_data["latent_max_w"]) / 2,
+                "total_sensible_heat": num_people * (activity_data["sensible_min_w"] + activity_data["sensible_max_w"]) / 2,
+                "total_latent_heat": num_people * (activity_data["latent_min_w"] + activity_data["latent_max_w"]) / 2
+            }
+            
+            # Handle edit mode
+            if is_edit:
+                index = editor_state.get("index", 0)
+                st.session_state.project_data["internal_loads"]["people"][index] = people_data
+                st.success(f"People group '{name}' updated!")
             else:
-                # Get activity data
-                activity_data = PEOPLE_ACTIVITY_LEVELS[activity_level]
-                
-                # Create people group data
-                people_data = {
-                    "id": str(uuid.uuid4()),
-                    "name": name.strip(),
-                    "num_people": num_people,
-                    "activity_level": activity_level,
-                    "activity_data": activity_data,
-                    "clo_summer": clo_summer,
-                    "clo_winter": clo_winter,
-                    "schedule": schedule,
-                    "zone": zone,
-                    "sensible_heat_per_person": (activity_data["sensible_min_w"] + activity_data["sensible_max_w"]) / 2,
-                    "latent_heat_per_person": (activity_data["latent_min_w"] + activity_data["latent_max_w"]) / 2,
-                    "total_sensible_heat": num_people * (activity_data["sensible_min_w"] + activity_data["sensible_max_w"]) / 2,
-                    "total_latent_heat": num_people * (activity_data["latent_min_w"] + activity_data["latent_max_w"]) / 2
-                }
-                
-                # Check if editing or adding new
-                if is_edit and st.session_state.people_editor.get("edit_id"):
-                    # Update existing people group
-                    edit_id = st.session_state.people_editor["edit_id"]
-                    people_groups = st.session_state.project_data["internal_loads"]["people"]
-                    
-                    for i, group in enumerate(people_groups):
-                        if group.get("id") == edit_id:
-                            people_groups[i] = people_data
-                            break
-                    
-                    st.success(f"People group '{name}' updated successfully!")
-                else:
-                    # Add new people group
-                    st.session_state.project_data["internal_loads"]["people"].append(people_data)
-                    st.success(f"People group '{name}' added successfully!")
-                
-                # Clear editor state
-                st.session_state.people_editor = {}
-                # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
-                st.session_state.module_rerun_flags["internal_loads"] = True
-                st.rerun()
+                st.session_state.project_data["internal_loads"]["people"].append(people_data)
+                st.success(f"People group '{name}' added!")
+            
+            # Clear editor state
+            st.session_state.people_editor = {}
+            st.session_state.people_action = {"action": "save", "id": str(uuid.uuid4())}
+            st.session_state.module_rerun_flags["internal_loads"] = True
         
-        if cancel:
+        elif refresh:
             # Clear editor state
             st.session_state.people_editor = {}
-            # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+            st.session_state.people_action = {"action": "refresh", "id": str(uuid.uuid4())}
             st.session_state.module_rerun_flags["internal_loads"] = True
-            st.rerun()
 
 def display_lighting_tab():
-    """Display the lighting tab content with two-column layout."""
+    """Display the lighting tab content with a two-column layout similar to components.py."""
+    # Get lighting from session state
+    lighting_systems = st.session_state.project_data["internal_loads"]["lighting"]
+    
     # Split the display into two columns
     col1, col2 = st.columns([3, 2])
     
     with col1:
         st.subheader("Saved Lighting Systems")
-        
-        # Get lighting from session state
-        lighting_systems = st.session_state.project_data["internal_loads"]["lighting"]
-        
         if lighting_systems:
             display_lighting_table(lighting_systems)
         else:
@@ -276,15 +274,17 @@ def display_lighting_tab():
     with col2:
         st.subheader("Lighting System Editor/Creator")
         
-        # Check if we have an editor state for lighting
+        # Initialize editor and action states
         if "lighting_editor" not in st.session_state:
             st.session_state.lighting_editor = {}
+        if "lighting_action" not in st.session_state:
+            st.session_state.lighting_action = {"action": None, "id": None}
         
         # Get building type for default values
         building_type = st.session_state.project_data["building_info"].get("building_type")
         default_lighting_density = DEFAULT_BUILDING_INTERNALS.get(building_type, DEFAULT_BUILDING_INTERNALS["Other"])["lighting_density"]
         
-        # Display the lighting editor form
+        # Display the editor form
         with st.form("lighting_editor_form", clear_on_submit=True):
             editor_state = st.session_state.get("lighting_editor", {})
             is_edit = editor_state.get("is_edit", False)
@@ -297,7 +297,6 @@ def display_lighting_tab():
             )
             
             # Area
-            # [FIX]: Corrected session state reference from st.session_state.building_info to st.session_state.project_data["building_info"]
             area = st.number_input(
                 "Area (m²)",
                 min_value=1.0,
@@ -341,10 +340,6 @@ def display_lighting_tab():
                     help="Fraction of heat released as convection."
                 )
             
-            # Validate fractions
-            if abs(radiative_fraction + convective_fraction - 1.0) > 0.01:
-                st.warning("Radiative and convective fractions should sum to 1.0")
-            
             # Schedule selection
             available_schedules = list(st.session_state.project_data["internal_loads"]["schedules"].keys())
             schedule = st.selectbox(
@@ -364,74 +359,70 @@ def display_lighting_tab():
             # Submit buttons
             col1, col2 = st.columns(2)
             with col1:
-                submit_label = "Update Lighting System" if is_edit else "Add Lighting System"
-                submit = st.form_submit_button(submit_label)
+                submit_label = "Update" if is_edit else "Add"
+                submit = st.form_submit_button(f"{submit_label} Lighting System")
             
             with col2:
-                cancel = st.form_submit_button("Cancel")
+                refresh = st.form_submit_button("Refresh")
         
         # Handle form submission
         if submit:
             # Validate inputs
             if not name.strip():
                 st.error("System name is required.")
-            elif abs(radiative_fraction + convective_fraction - 1.0) > 0.01:
+                return
+            if abs(radiative_fraction + convective_fraction - 1.0) > 0.01:
                 st.error("Radiative and convective fractions must sum to 1.0")
+                return
+            # Check for unique name
+            existing_names = [system["name"] for system in lighting_systems if not (is_edit and system["name"] == editor_state.get("name"))]
+            if name.strip() in existing_names:
+                st.error("System name must be unique.")
+                return
+            
+            # Create lighting system data
+            lighting_data = {
+                "id": str(uuid.uuid4()),
+                "name": name.strip(),
+                "area": area,
+                "lpd": lpd,
+                "total_power": area * lpd,
+                "radiative_fraction": radiative_fraction,
+                "convective_fraction": convective_fraction,
+                "schedule": schedule,
+                "zone": zone
+            }
+            
+            # Handle edit mode
+            if is_edit:
+                index = editor_state.get("index", 0)
+                st.session_state.project_data["internal_loads"]["lighting"][index] = lighting_data
+                st.success(f"Lighting system '{name}' updated!")
             else:
-                # Create lighting system data
-                lighting_data = {
-                    "id": str(uuid.uuid4()),
-                    "name": name.strip(),
-                    "area": area,
-                    "lpd": lpd,
-                    "total_power": area * lpd,
-                    "radiative_fraction": radiative_fraction,
-                    "convective_fraction": convective_fraction,
-                    "schedule": schedule,
-                    "zone": zone
-                }
-                
-                # Check if editing or adding new
-                if is_edit and st.session_state.lighting_editor.get("edit_id"):
-                    # Update existing lighting system
-                    edit_id = st.session_state.lighting_editor["edit_id"]
-                    lighting_systems = st.session_state.project_data["internal_loads"]["lighting"]
-                    
-                    for i, system in enumerate(lighting_systems):
-                        if system.get("id") == edit_id:
-                            lighting_systems[i] = lighting_data
-                            break
-                    
-                    st.success(f"Lighting system '{name}' updated successfully!")
-                else:
-                    # Add new lighting system
-                    st.session_state.project_data["internal_loads"]["lighting"].append(lighting_data)
-                    st.success(f"Lighting system '{name}' added successfully!")
-                
-                # Clear editor state
-                st.session_state.lighting_editor = {}
-                # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
-                st.session_state.module_rerun_flags["internal_loads"] = True
-                st.rerun()
+                st.session_state.project_data["internal_loads"]["lighting"].append(lighting_data)
+                st.success(f"Lighting system '{name}' added!")
+            
+            # Clear editor state
+            st.session_state.lighting_editor = {}
+            st.session_state.lighting_action = {"action": "save", "id": str(uuid.uuid4())}
+            st.session_state.module_rerun_flags["internal_loads"] = True
         
-        if cancel:
+        elif refresh:
             # Clear editor state
             st.session_state.lighting_editor = {}
-            # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+            st.session_state.lighting_action = {"action": "refresh", "id": str(uuid.uuid4())}
             st.session_state.module_rerun_flags["internal_loads"] = True
-            st.rerun()
 
 def display_equipment_tab():
-    """Display the equipment tab content with two-column layout."""
+    """Display the equipment tab content with a two-column layout similar to components.py."""
+    # Get equipment from session state
+    equipment_systems = st.session_state.project_data["internal_loads"]["equipment"]
+    
     # Split the display into two columns
     col1, col2 = st.columns([3, 2])
     
     with col1:
         st.subheader("Saved Equipment")
-        
-        # Get equipment from session state
-        equipment_systems = st.session_state.project_data["internal_loads"]["equipment"]
-        
         if equipment_systems:
             display_equipment_table(equipment_systems)
         else:
@@ -440,15 +431,17 @@ def display_equipment_tab():
     with col2:
         st.subheader("Equipment Editor/Creator")
         
-        # Check if we have an editor state for equipment
+        # Initialize editor and action states
         if "equipment_editor" not in st.session_state:
             st.session_state.equipment_editor = {}
+        if "equipment_action" not in st.session_state:
+            st.session_state.equipment_action = {"action": None, "id": None}
         
         # Get building type for default values
         building_type = st.session_state.project_data["building_info"].get("building_type")
         default_equipment_data = DEFAULT_BUILDING_INTERNALS.get(building_type, DEFAULT_BUILDING_INTERNALS["Other"])["equipment_heat_gains"]
         
-        # Display the equipment editor form
+        # Display the editor form
         with st.form("equipment_editor_form", clear_on_submit=True):
             editor_state = st.session_state.get("equipment_editor", {})
             is_edit = editor_state.get("is_edit", False)
@@ -461,7 +454,6 @@ def display_equipment_tab():
             )
             
             # Area
-            # [FIX]: Corrected session state reference from st.session_state.building_info to st.session_state.project_data["building_info"]
             area = st.number_input(
                 "Area (m²)",
                 min_value=1.0,
@@ -519,10 +511,6 @@ def display_equipment_tab():
                     help="Fraction of sensible heat released as convection."
                 )
             
-            # Validate fractions
-            if abs(radiative_fraction + convective_fraction - 1.0) > 0.01:
-                st.warning("Radiative and convective fractions should sum to 1.0")
-            
             # Schedule selection
             available_schedules = list(st.session_state.project_data["internal_loads"]["schedules"].keys())
             schedule = st.selectbox(
@@ -542,76 +530,72 @@ def display_equipment_tab():
             # Submit buttons
             col1, col2 = st.columns(2)
             with col1:
-                submit_label = "Update Equipment" if is_edit else "Add Equipment"
-                submit = st.form_submit_button(submit_label)
+                submit_label = "Update" if is_edit else "Add"
+                submit = st.form_submit_button(f"{submit_label} Equipment")
             
             with col2:
-                cancel = st.form_submit_button("Cancel")
+                refresh = st.form_submit_button("Refresh")
         
         # Handle form submission
         if submit:
             # Validate inputs
             if not name.strip():
                 st.error("Equipment name is required.")
-            elif abs(radiative_fraction + convective_fraction - 1.0) > 0.01:
+                return
+            if abs(radiative_fraction + convective_fraction - 1.0) > 0.01:
                 st.error("Radiative and convective fractions must sum to 1.0")
+                return
+            # Check for unique name
+            existing_names = [system["name"] for system in equipment_systems if not (is_edit and system["name"] == editor_state.get("name"))]
+            if name.strip() in existing_names:
+                st.error("Equipment name must be unique.")
+                return
+            
+            # Create equipment data
+            equipment_data = {
+                "id": str(uuid.uuid4()),
+                "name": name.strip(),
+                "area": area,
+                "sensible_gain": sensible_gain,
+                "latent_gain": latent_gain,
+                "total_sensible_power": area * sensible_gain,
+                "total_latent_power": area * latent_gain,
+                "radiative_fraction": radiative_fraction,
+                "convective_fraction": convective_fraction,
+                "schedule": schedule,
+                "zone": zone
+            }
+            
+            # Handle edit mode
+            if is_edit:
+                index = editor_state.get("index", 0)
+                st.session_state.project_data["internal_loads"]["equipment"][index] = equipment_data
+                st.success(f"Equipment '{name}' updated!")
             else:
-                # Create equipment data
-                equipment_data = {
-                    "id": str(uuid.uuid4()),
-                    "name": name.strip(),
-                    "area": area,
-                    "sensible_gain": sensible_gain,
-                    "latent_gain": latent_gain,
-                    "total_sensible_power": area * sensible_gain,
-                    "total_latent_power": area * latent_gain,
-                    "radiative_fraction": radiative_fraction,
-                    "convective_fraction": convective_fraction,
-                    "schedule": schedule,
-                    "zone": zone
-                }
-                
-                # Check if editing or adding new
-                if is_edit and st.session_state.equipment_editor.get("edit_id"):
-                    # Update existing equipment
-                    edit_id = st.session_state.equipment_editor["edit_id"]
-                    equipment_systems = st.session_state.project_data["internal_loads"]["equipment"]
-                    
-                    for i, system in enumerate(equipment_systems):
-                        if system.get("id") == edit_id:
-                            equipment_systems[i] = equipment_data
-                            break
-                    
-                    st.success(f"Equipment '{name}' updated successfully!")
-                else:
-                    # Add new equipment
-                    st.session_state.project_data["internal_loads"]["equipment"].append(equipment_data)
-                    st.success(f"Equipment '{name}' added successfully!")
-                
-                # Clear editor state
-                st.session_state.equipment_editor = {}
-                # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
-                st.session_state.module_rerun_flags["internal_loads"] = True
-                st.rerun()
+                st.session_state.project_data["internal_loads"]["equipment"].append(equipment_data)
+                st.success(f"Equipment '{name}' added!")
+            
+            # Clear editor state
+            st.session_state.equipment_editor = {}
+            st.session_state.equipment_action = {"action": "save", "id": str(uuid.uuid4())}
+            st.session_state.module_rerun_flags["internal_loads"] = True
         
-        if cancel:
+        elif refresh:
             # Clear editor state
             st.session_state.equipment_editor = {}
-            # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+            st.session_state.equipment_action = {"action": "refresh", "id": str(uuid.uuid4())}
             st.session_state.module_rerun_flags["internal_loads"] = True
-            st.rerun()
 
 def display_ventilation_infiltration_tab():
-    """Display the ventilation and infiltration tab content with two-column layout."""
+    """Display the ventilation/infiltration tab content with a two-column layout similar to components.py."""
+    # Get ventilation/infiltration from session state
+    vent_inf_systems = st.session_state.project_data["internal_loads"]["ventilation_infiltration"]
+    
     # Split the display into two columns
     col1, col2 = st.columns([3, 2])
     
     with col1:
         st.subheader("Saved Ventilation & Infiltration")
-        
-        # Get ventilation/infiltration from session state
-        vent_inf_systems = st.session_state.project_data["internal_loads"]["ventilation_infiltration"]
-        
         if vent_inf_systems:
             display_ventilation_infiltration_table(vent_inf_systems)
         else:
@@ -620,15 +604,17 @@ def display_ventilation_infiltration_tab():
     with col2:
         st.subheader("Ventilation/Infiltration Editor/Creator")
         
-        # Check if we have an editor state for ventilation/infiltration
+        # Initialize editor and action states
         if "vent_inf_editor" not in st.session_state:
             st.session_state.vent_inf_editor = {}
+        if "vent_inf_action" not in st.session_state:
+            st.session_state.vent_inf_action = {"action": None, "id": None}
         
         # Get building type for default values
         building_type = st.session_state.project_data["building_info"].get("building_type")
         default_building_data = DEFAULT_BUILDING_INTERNALS.get(building_type, DEFAULT_BUILDING_INTERNALS["Other"])
         
-        # Display the ventilation/infiltration editor form
+        # Display the editor form
         with st.form("vent_inf_editor_form", clear_on_submit=True):
             editor_state = st.session_state.get("vent_inf_editor", {})
             is_edit = editor_state.get("is_edit", False)
@@ -649,7 +635,6 @@ def display_ventilation_infiltration_tab():
             )
             
             # Area
-            # [FIX]: Corrected session state reference from st.session_state.building_info to st.session_state.project_data["building_info"]
             area = st.number_input(
                 "Area (m²)",
                 min_value=1.0,
@@ -669,8 +654,7 @@ def display_ventilation_infiltration_tab():
                     format="%.2f",
                     help="Ventilation rate in liters per second per square meter."
                 )
-                
-                air_change_rate = 0.0  # Not used for ventilation
+                air_change_rate = 0.0
             else:
                 # Air change rate for infiltration
                 air_change_rate = st.number_input(
@@ -681,8 +665,7 @@ def display_ventilation_infiltration_tab():
                     format="%.2f",
                     help="Air change rate in air changes per hour."
                 )
-                
-                ventilation_rate = 0.0  # Not used for infiltration
+                ventilation_rate = 0.0
             
             # Schedule selection
             available_schedules = list(st.session_state.project_data["internal_loads"]["schedules"].keys())
@@ -703,59 +686,55 @@ def display_ventilation_infiltration_tab():
             # Submit buttons
             col1, col2 = st.columns(2)
             with col1:
-                submit_label = "Update System" if is_edit else "Add System"
-                submit = st.form_submit_button(submit_label)
+                submit_label = "Update" if is_edit else "Add"
+                submit = st.form_submit_button(f"{submit_label} System")
             
             with col2:
-                cancel = st.form_submit_button("Cancel")
+                refresh = st.form_submit_button("Refresh")
         
         # Handle form submission
         if submit:
             # Validate inputs
             if not name.strip():
                 st.error("System name is required.")
+                return
+            # Check for unique name
+            existing_names = [system["name"] for system in vent_inf_systems if not (is_edit and system["name"] == editor_state.get("name"))]
+            if name.strip() in existing_names:
+                st.error("System name must be unique.")
+                return
+            
+            # Create ventilation/infiltration data
+            vent_inf_data = {
+                "id": str(uuid.uuid4()),
+                "name": name.strip(),
+                "system_type": system_type,
+                "area": area,
+                "ventilation_rate": ventilation_rate,
+                "air_change_rate": air_change_rate,
+                "schedule": schedule,
+                "zone": zone
+            }
+            
+            # Handle edit mode
+            if is_edit:
+                index = editor_state.get("index", 0)
+                st.session_state.project_data["internal_loads"]["ventilation_infiltration"][index] = vent_inf_data
+                st.success(f"{system_type} system '{name}' updated!")
             else:
-                # Create ventilation/infiltration data
-                vent_inf_data = {
-                    "id": str(uuid.uuid4()),
-                    "name": name.strip(),
-                    "system_type": system_type,
-                    "area": area,
-                    "ventilation_rate": ventilation_rate,
-                    "air_change_rate": air_change_rate,
-                    "schedule": schedule,
-                    "zone": zone
-                }
-                
-                # Check if editing or adding new
-                if is_edit and st.session_state.vent_inf_editor.get("edit_id"):
-                    # Update existing system
-                    edit_id = st.session_state.vent_inf_editor["edit_id"]
-                    vent_inf_systems = st.session_state.project_data["internal_loads"]["ventilation_infiltration"]
-                    
-                    for i, system in enumerate(vent_inf_systems):
-                        if system.get("id") == edit_id:
-                            vent_inf_systems[i] = vent_inf_data
-                            break
-                    
-                    st.success(f"{system_type} system '{name}' updated successfully!")
-                else:
-                    # Add new system
-                    st.session_state.project_data["internal_loads"]["ventilation_infiltration"].append(vent_inf_data)
-                    st.success(f"{system_type} system '{name}' added successfully!")
-                
-                # Clear editor state
-                st.session_state.vent_inf_editor = {}
-                # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
-                st.session_state.module_rerun_flags["internal_loads"] = True
-                st.rerun()
+                st.session_state.project_data["internal_loads"]["ventilation_infiltration"].append(vent_inf_data)
+                st.success(f"{system_type} system '{name}' added!")
+            
+            # Clear editor state
+            st.session_state.vent_inf_editor = {}
+            st.session_state.vent_inf_action = {"action": "save", "id": str(uuid.uuid4())}
+            st.session_state.module_rerun_flags["internal_loads"] = True
         
-        if cancel:
+        elif refresh:
             # Clear editor state
             st.session_state.vent_inf_editor = {}
-            # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
+            st.session_state.vent_inf_action = {"action": "refresh", "id": str(uuid.uuid4())}
             st.session_state.module_rerun_flags["internal_loads"] = True
-            st.rerun()
 
 def display_schedules_tab():
     import streamlit as st
@@ -782,7 +761,7 @@ def display_schedules_tab():
     editor_state = st.session_state.schedule_editor
     schedules = st.session_state.project_data["internal_loads"]["schedules"]
 
-    # ---------------------- Handle template change ----------------------
+    # Handle template change
     template_options = list(DEFAULT_SCHEDULE_TEMPLATES.keys())
     selected_template = st.selectbox(
         "Select Template",
@@ -799,7 +778,6 @@ def display_schedules_tab():
             tpl = DEFAULT_SCHEDULE_TEMPLATES[selected_template]
             st.session_state.schedule_editor["weekday"] = tpl["weekday"]
             st.session_state.schedule_editor["weekend"] = tpl["weekend"]
-            # Store slider values in session state for preloading
             for hour in range(24):
                 st.session_state[f"weekday_slider_{hour}_value"] = tpl["weekday"][hour]
                 st.session_state[f"weekend_slider_{hour}_value"] = tpl["weekend"][hour]
@@ -810,15 +788,13 @@ def display_schedules_tab():
         st.session_state.module_rerun_flags["internal_loads"] = True
         st.rerun()
 
-    # ---------------------- UI FORM for name/description and actions ----------------------
+    # UI FORM for name/description and actions
     with st.form("schedule_form"):
         name = st.text_input("Schedule Name", value=editor_state.get("name", ""))
         description = st.text_area("Description", value=editor_state.get("description", ""))
 
-        # ---------------------- SLIDERS LAYOUT ----------------------
+        # SLIDERS LAYOUT
         st.markdown("### Schedule Sliders")
-
-        # Table headers
         col_hour, col_wd, col_we = st.columns([0.4, 2.0, 2.0])
         with col_hour:
             st.markdown("<div style='text-align:center; font-weight:bold; font-size:18px;'>Hour</div>", unsafe_allow_html=True)
@@ -842,10 +818,8 @@ def display_schedules_tab():
 
         for hour in range(24):
             col_hour, col_wd, col_we = st.columns([0.4, 2.0, 2.0])
-
             with col_hour:
                 st.markdown(f"<div style='text-align:center; font-size:12px'>{hour:02d}</div>", unsafe_allow_html=True)
-
             with col_wd:
                 val = st.slider(
                     label=f"Weekday {hour:02d}",
@@ -858,7 +832,6 @@ def display_schedules_tab():
                     format=None
                 )
                 weekday_values.append(val)
-
             with col_we:
                 val = st.slider(
                     label=f"Weekend {hour:02d}",
@@ -872,7 +845,7 @@ def display_schedules_tab():
                 )
                 weekend_values.append(val)
 
-        # ---------------------- Action Buttons ----------------------
+        # Action Buttons
         col1, col2, col3 = st.columns(3)
         with col1:
             submit_label = "Update Schedule" if editor_state.get("is_edit") else "Save Schedule"
@@ -882,7 +855,7 @@ def display_schedules_tab():
         with col3:
             delete_submitted = st.form_submit_button("Delete Selected Schedule")
 
-        # ---------------------- Saved Schedules Selector ----------------------
+        # Saved Schedules Selector
         st.markdown("### Saved Schedules")
         saved_schedule = st.selectbox(
             "Select Saved Schedule",
@@ -891,7 +864,7 @@ def display_schedules_tab():
             help="Select a saved schedule to edit or delete."
         )
 
-        # ---------------------- Save logic ----------------------
+        # Save logic
         if submitted:
             action_id = str(uuid.uuid4())
             if st.session_state.schedule_action.get("id") != action_id:
@@ -909,7 +882,6 @@ def display_schedules_tab():
                     if editor_state.get("is_edit") and editor_state.get("original_name") and editor_state.get("original_name") != name:
                         if editor_state["original_name"] in schedules:
                             del schedules[editor_state["original_name"]]
-                    # Reset editor state and slider values
                     st.session_state.schedule_editor = DEFAULT_STATE.copy()
                     for hour in range(24):
                         st.session_state[f"weekday_slider_{hour}_value"] = 0.0
@@ -919,7 +891,7 @@ def display_schedules_tab():
                     st.session_state.module_rerun_flags["internal_loads"] = True
                     st.rerun()
 
-        # ---------------------- Edit logic ----------------------
+        # Edit logic
         if edit_submitted and saved_schedule:
             action_id = str(uuid.uuid4())
             if st.session_state.schedule_action.get("id") != action_id:
@@ -928,7 +900,6 @@ def display_schedules_tab():
                     st.error("Default schedules cannot be edited.")
                 else:
                     schedule_data = schedules[saved_schedule]
-                    # Update editor state
                     st.session_state.schedule_editor = {
                         "is_edit": True,
                         "original_name": saved_schedule,
@@ -938,7 +909,6 @@ def display_schedules_tab():
                         "weekend": schedule_data.get("weekend", [0.0] * 24),
                         "template": "None"
                     }
-                    # Preload slider values
                     for hour in range(24):
                         st.session_state[f"weekday_slider_{hour}_value"] = schedule_data.get("weekday", [0.0] * 24)[hour]
                         st.session_state[f"weekend_slider_{hour}_value"] = schedule_data.get("weekend", [0.0] * 24)[hour]
@@ -946,7 +916,7 @@ def display_schedules_tab():
                     st.session_state.module_rerun_flags["internal_loads"] = True
                     st.rerun()
 
-        # ---------------------- Delete logic ----------------------
+        # Delete logic
         if delete_submitted and saved_schedule:
             action_id = str(uuid.uuid4())
             if st.session_state.schedule_action.get("id") != action_id:
@@ -957,7 +927,6 @@ def display_schedules_tab():
                     st.error(f"Schedule '{saved_schedule}' is in use and cannot be deleted.")
                 else:
                     del schedules[saved_schedule]
-                    # Reset editor state and slider values
                     st.session_state.schedule_editor = DEFAULT_STATE.copy()
                     for hour in range(24):
                         st.session_state[f"weekday_slider_{hour}_value"] = 0.0
@@ -970,7 +939,6 @@ def display_schedules_tab():
 def is_schedule_in_use(schedule_name: str) -> bool:
     """
     Check if a schedule is in use by any people, lighting, equipment, or ventilation/infiltration systems.
-    [FIX]: Added to prevent deletion of schedules that are referenced elsewhere.
     
     Args:
         schedule_name: Name of the schedule to check.
@@ -995,274 +963,197 @@ def is_schedule_in_use(schedule_name: str) -> bool:
 
 def display_people_table(people_groups: List[Dict[str, Any]]):
     """Display people groups in a table format with edit/delete buttons."""
-    if not people_groups:
-        return
-    
-    # Create table data
-    table_data = []
-    for group in people_groups:
-        table_data.append({
-            "Name": group.get("name", "Unknown"),
-            "Number": group.get("num_people", 0),
-            "Activity": group.get("activity_level", "Unknown"),
-            "Sensible (W)": f"{group.get('total_sensible_heat', 0):.1f}",
-            "Latent (W)": f"{group.get('total_latent_heat', 0):.1f}",
-            "Zone": group.get("zone", "Unknown"),
-            "Schedule": group.get("schedule", "Unknown"),
-            "Actions": group.get("id", "")
-        })
+    # Create column headers
+    cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+    cols[0].write("**Name**")
+    cols[1].write("**Number**")
+    cols[2].write("**Sensible (W)**")
+    cols[3].write("**Latent (W)**")
+    cols[4].write("**Zone**")
+    cols[5].write("**Edit**")
+    cols[6].write("**Delete**")
     
-    if table_data:
-        df = pd.DataFrame(table_data)
+    # Display each group
+    for idx, group in enumerate(people_groups):
+        cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+        cols[0].write(group["name"])
+        cols[1].write(str(group.get("num_people", 0)))
+        cols[2].write(f"{group.get('total_sensible_heat', 0):.1f}")
+        cols[3].write(f"{group.get('total_latent_heat', 0):.1f}")
+        cols[4].write(group.get("zone", "Unknown"))
         
-        # Display table
-        st.dataframe(df.drop('Actions', axis=1), use_container_width=True)
+        # Edit button
+        edit_key = f"edit_people_{group['id']}_{idx}"
+        with cols[5].container():
+            if st.button("Edit", key=edit_key):
+                st.session_state.people_editor = {
+                    "index": idx,
+                    "name": group.get("name", ""),
+                    "num_people": group.get("num_people", 10),
+                    "activity_level": group.get("activity_level", list(PEOPLE_ACTIVITY_LEVELS.keys())[0]),
+                    "clo_summer": group.get("clo_summer", 0.5),
+                    "clo_winter": group.get("clo_winter", 1.0),
+                    "schedule": group.get("schedule", "Continuous"),
+                    "zone": group.get("zone", "Whole Building"),
+                    "is_edit": True
+                }
+                st.session_state.people_action = {"action": "edit", "id": str(uuid.uuid4())}
+                st.session_state.module_rerun_flags["internal_loads"] = True
         
-        # Display action buttons
-        st.write("**Actions:**")
-        for i, row in enumerate(table_data):
-            group_id = row["Actions"]
-            group_name = row["Name"]
-            
-            col1, col2, col3 = st.columns([2, 1, 1])
-            
-            with col1:
-                st.write(f"{i+1}. {group_name}")
-            
-            with col2:
-                if st.button("Edit", key=f"edit_people_{group_id}_{i}"):
-                    # Set up editor for editing
-                    group = next((g for g in people_groups if g.get("id") == group_id), None)
-                    if group:
-                        st.session_state.people_editor = {
-                            "is_edit": True,
-                            "edit_id": group_id,
-                            "name": group.get("name", ""),
-                            "num_people": group.get("num_people", 10),
-                            "activity_level": group.get("activity_level", list(PEOPLE_ACTIVITY_LEVELS.keys())[0]),
-                            "clo_summer": group.get("clo_summer", 0.5),
-                            "clo_winter": group.get("clo_winter", 1.0),
-                            "schedule": group.get("schedule", "Continuous"),
-                            "zone": group.get("zone", "Whole Building")
-                        }
-                        # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
-                        st.session_state.module_rerun_flags["internal_loads"] = True
-                        st.rerun()
-            
-            with col3:
-                if st.button("Delete", key=f"delete_people_{group_id}_{i}"):
-                    # Delete people group
-                    st.session_state.project_data["internal_loads"]["people"] = [
-                        g for g in people_groups if g.get("id") != group_id
-                    ]
-                    st.success(f"People group '{group_name}' deleted!")
-                    # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
-                    st.session_state.module_rerun_flags["internal_loads"] = True
-                    st.rerun()
+        # Delete button
+        delete_key = f"delete_people_{group['id']}_{idx}"
+        with cols[6].container():
+            if st.button("Delete", key=delete_key):
+                st.session_state.project_data["internal_loads"]["people"].pop(idx)
+                st.success(f"People group '{group['name']}' deleted!")
+                st.session_state.people_action = {"action": "delete", "id": str(uuid.uuid4())}
+                st.session_state.module_rerun_flags["internal_loads"] = True
 
 def display_lighting_table(lighting_systems: List[Dict[str, Any]]):
     """Display lighting systems in a table format with edit/delete buttons."""
-    if not lighting_systems:
-        return
+    # Create column headers
+    cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+    cols[0].write("**Name**")
+    cols[1].write("**Area (m²)**")
+    cols[2].write("**LPD (W/m²)**")
+    cols[3].write("**Total Power (W)**")
+    cols[4].write("**Zone**")
+    cols[5].write("**Edit**")
+    cols[6].write("**Delete**")
     
-    # Create table data
-    table_data = []
-    for system in lighting_systems:
-        table_data.append({
-            "Name": system.get("name", "Unknown"),
-            "Area (m²)": f"{system.get('area', 0):.1f}",
-            "LPD (W/m²)": f"{system.get('lpd', 0):.2f}",
-            "Total Power (W)": f"{system.get('total_power', 0):.1f}",
-            "Zone": system.get("zone", "Unknown"),
-            "Schedule": system.get("schedule", "Unknown"),
-            "Actions": system.get("id", "")
-        })
-    
-    if table_data:
-        df = pd.DataFrame(table_data)
+    # Display each system
+    for idx, system in enumerate(lighting_systems):
+        cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+        cols[0].write(system["name"])
+        cols[1].write(f"{system.get('area', 0):.1f}")
+        cols[2].write(f"{system.get('lpd', 0):.2f}")
+        cols[3].write(f"{system.get('total_power', 0):.1f}")
+        cols[4].write(system.get("zone", "Unknown"))
         
-        # Display table
-        st.dataframe(df.drop('Actions', axis=1), use_container_width=True)
+        # Edit button
+        edit_key = f"edit_lighting_{system['id']}_{idx}"
+        with cols[5].container():
+            if st.button("Edit", key=edit_key):
+                st.session_state.lighting_editor = {
+                    "index": idx,
+                    "name": system.get("name", ""),
+                    "area": system.get("area", 100.0),
+                    "lpd": system.get("lpd", 12.0),
+                    "radiative_fraction": system.get("radiative_fraction", 0.4),
+                    "convective_fraction": system.get("convective_fraction", 0.6),
+                    "schedule": system.get("schedule", "Continuous"),
+                    "zone": system.get("zone", "Whole Building"),
+                    "is_edit": True
+                }
+                st.session_state.lighting_action = {"action": "edit", "id": str(uuid.uuid4())}
+                st.session_state.module_rerun_flags["internal_loads"] = True
         
-        # Display action buttons
-        st.write("**Actions:**")
-        for i, row in enumerate(table_data):
-            system_id = row["Actions"]
-            system_name = row["Name"]
-            
-            col1, col2, col3 = st.columns([2, 1, 1])
-            
-            with col1:
-                st.write(f"{i+1}. {system_name}")
-            
-            with col2:
-                if st.button("Edit", key=f"edit_lighting_{system_id}_{i}"):
-                    # Set up editor for editing
-                    system = next((s for s in lighting_systems if s.get("id") == system_id), None)
-                    if system:
-                        st.session_state.lighting_editor = {
-                            "is_edit": True,
-                            "edit_id": system_id,
-                            "name": system.get("name", ""),
-                            "area": system.get("area", 100.0),
-                            "lpd": system.get("lpd", 12.0),
-                            "radiative_fraction": system.get("radiative_fraction", 0.4),
-                            "convective_fraction": system.get("convective_fraction", 0.6),
-                            "schedule": system.get("schedule", "Continuous"),
-                            "zone": system.get("zone", "Whole Building")
-                        }
-                        # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
-                        st.session_state.module_rerun_flags["internal_loads"] = True
-                        st.rerun()
-            
-            with col3:
-                if st.button("Delete", key=f"delete_lighting_{system_id}_{i}"):
-                    # Delete lighting system
-                    st.session_state.project_data["internal_loads"]["lighting"] = [
-                        s for s in lighting_systems if s.get("id") != system_id
-                    ]
-                    st.success(f"Lighting system '{system_name}' deleted!")
-                    # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
-                    st.session_state.module_rerun_flags["internal_loads"] = True
-                    st.rerun()
+        # Delete button
+        delete_key = f"delete_lighting_{system['id']}_{idx}"
+        with cols[6].container():
+            if st.button("Delete", key=delete_key):
+                st.session_state.project_data["internal_loads"]["lighting"].pop(idx)
+                st.success(f"Lighting system '{system['name']}' deleted!")
+                st.session_state.lighting_action = {"action": "delete", "id": str(uuid.uuid4())}
+                st.session_state.module_rerun_flags["internal_loads"] = True
 
 def display_equipment_table(equipment_systems: List[Dict[str, Any]]):
     """Display equipment systems in a table format with edit/delete buttons."""
-    if not equipment_systems:
-        return
+    # Create column headers
+    cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+    cols[0].write("**Name**")
+    cols[1].write("**Area (m²)**")
+    cols[2].write("**Sensible (W)**")
+    cols[3].write("**Latent (W)**")
+    cols[4].write("**Zone**")
+    cols[5].write("**Edit**")
+    cols[6].write("**Delete**")
     
-    # Create table data
-    table_data = []
-    for system in equipment_systems:
-        table_data.append({
-            "Name": system.get("name", "Unknown"),
-            "Area (m²)": f"{system.get('area', 0):.1f}",
-            "Sensible (W)": f"{system.get('total_sensible_power', 0):.1f}",
-            "Latent (W)": f"{system.get('total_latent_power', 0):.1f}",
-            "Zone": system.get("zone", "Unknown"),
-            "Schedule": system.get("schedule", "Unknown"),
-            "Actions": system.get("id", "")
-        })
-    
-    if table_data:
-        df = pd.DataFrame(table_data)
+    # Display each system
+    for idx, system in enumerate(equipment_systems):
+        cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+        cols[0].write(system["name"])
+        cols[1].write(f"{system.get('area', 0):.1f}")
+        cols[2].write(f"{system.get('total_sensible_power', 0):.1f}")
+        cols[3].write(f"{system.get('total_latent_power', 0):.1f}")
+        cols[4].write(system.get("zone", "Unknown"))
         
-        # Display table
-        st.dataframe(df.drop('Actions', axis=1), use_container_width=True)
+        # Edit button
+        edit_key = f"edit_equipment_{system['id']}_{idx}"
+        with cols[5].container():
+            if st.button("Edit", key=edit_key):
+                st.session_state.equipment_editor = {
+                    "index": idx,
+                    "name": system.get("name", ""),
+                    "area": system.get("area", 100.0),
+                    "sensible_gain": system.get("sensible_gain", 10.0),
+                    "latent_gain": system.get("latent_gain", 2.0),
+                    "radiative_fraction": system.get("radiative_fraction", 0.5),
+                    "convective_fraction": system.get("convective_fraction", 0.5),
+                    "schedule": system.get("schedule", "Continuous"),
+                    "zone": system.get("zone", "Whole Building"),
+                    "is_edit": True
+                }
+                st.session_state.equipment_action = {"action": "edit", "id": str(uuid.uuid4())}
+                st.session_state.module_rerun_flags["internal_loads"] = True
         
-        # Display action buttons
-        st.write("**Actions:**")
-        for i, row in enumerate(table_data):
-            system_id = row["Actions"]
-            system_name = row["Name"]
-            
-            col1, col2, col3 = st.columns([2, 1, 1])
-            
-            with col1:
-                st.write(f"{i+1}. {system_name}")
-            
-            with col2:
-                if st.button("Edit", key=f"edit_equipment_{system_id}_{i}"):
-                    # Set up editor for editing
-                    system = next((s for s in equipment_systems if s.get("id") == system_id), None)
-                    if system:
-                        st.session_state.equipment_editor = {
-                            "is_edit": True,
-                            "edit_id": system_id,
-                            "name": system.get("name", ""),
-                            "area": system.get("area", 100.0),
-                            "sensible_gain": system.get("sensible_gain", 10.0),
-                            "latent_gain": system.get("latent_gain", 2.0),
-                            "radiative_fraction": system.get("radiative_fraction", 0.5),
-                            "convective_fraction": system.get("convective_fraction", 0.5),
-                            "schedule": system.get("schedule", "Continuous"),
-                            "zone": system.get("zone", "Whole Building")
-                        }
-                        # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
-                        st.session_state.module_rerun_flags["internal_loads"] = True
-                        st.rerun()
-            
-            with col3:
-                if st.button("Delete", key=f"delete_equipment_{system_id}_{i}"):
-                    # Delete equipment system
-                    st.session_state.project_data["internal_loads"]["equipment"] = [
-                        s for s in equipment_systems if s.get("id") != system_id
-                    ]
-                    st.success(f"Equipment '{system_name}' deleted!")
-                    # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
-                    st.session_state.module_rerun_flags["internal_loads"] = True
-                    st.rerun()
+        # Delete button
+        delete_key = f"delete_equipment_{system['id']}_{idx}"
+        with cols[6].container():
+            if st.button("Delete", key=delete_key):
+                st.session_state.project_data["internal_loads"]["equipment"].pop(idx)
+                st.success(f"Equipment '{system['name']}' deleted!")
+                st.session_state.equipment_action = {"action": "delete", "id": str(uuid.uuid4())}
+                st.session_state.module_rerun_flags["internal_loads"] = True
 
 def display_ventilation_infiltration_table(vent_inf_systems: List[Dict[str, Any]]):
     """Display ventilation/infiltration systems in a table format with edit/delete buttons."""
-    if not vent_inf_systems:
-        return
+    # Create column headers
+    cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+    cols[0].write("**Name**")
+    cols[1].write("**Type**")
+    cols[2].write("**Area (m²)**")
+    cols[3].write("**Rate**")
+    cols[4].write("**Zone**")
+    cols[5].write("**Edit**")
+    cols[6].write("**Delete**")
     
-    # Create table data
-    table_data = []
-    for system in vent_inf_systems:
-        if system.get("system_type") == "Ventilation":
-            rate_info = f"{system.get('ventilation_rate', 0):.2f} L/s·m²"
-        else:
-            rate_info = f"{system.get('air_change_rate', 0):.2f} ACH"
+    # Display each system
+    for idx, system in enumerate(vent_inf_systems):
+        cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+        cols[0].write(system["name"])
+        cols[1].write(system.get("system_type", "Unknown"))
+        cols[2].write(f"{system.get('area', 0):.1f}")
+        rate_info = f"{system.get('ventilation_rate', 0):.2f} L/s·m²" if system.get("system_type") == "Ventilation" else f"{system.get('air_change_rate', 0):.2f} ACH"
+        cols[3].write(rate_info)
+        cols[4].write(system.get("zone", "Unknown"))
         
-        table_data.append({
-            "Name": system.get("name", "Unknown"),
-            "Type": system.get("system_type", "Unknown"),
-            "Area (m²)": f"{system.get('area', 0):.1f}",
-            "Rate": rate_info,
-            "Zone": system.get("zone", "Unknown"),
-            "Schedule": system.get("schedule", "Unknown"),
-            "Actions": system.get("id", "")
-        })
-    
-    if table_data:
-        df = pd.DataFrame(table_data)
-        
-        # Display table
-        st.dataframe(df.drop('Actions', axis=1), use_container_width=True)
+        # Edit button
+        edit_key = f"edit_vent_inf_{system['id']}_{idx}"
+        with cols[5].container():
+            if st.button("Edit", key=edit_key):
+                st.session_state.vent_inf_editor = {
+                    "index": idx,
+                    "name": system.get("name", ""),
+                    "system_type": system.get("system_type", "Ventilation"),
+                    "area": system.get("area", 100.0),
+                    "ventilation_rate": system.get("ventilation_rate", 10.0),
+                    "air_change_rate": system.get("air_change_rate", 1.0),
+                    "schedule": system.get("schedule", "Continuous"),
+                    "zone": system.get("zone", "Whole Building"),
+                    "is_edit": True
+                }
+                st.session_state.vent_inf_action = {"action": "edit", "id": str(uuid.uuid4())}
+                st.session_state.module_rerun_flags["internal_loads"] = True
         
-        # Display action buttons
-        st.write("**Actions:**")
-        for i, row in enumerate(table_data):
-            system_id = row["Actions"]
-            system_name = row["Name"]
-            
-            col1, col2, col3 = st.columns([2, 1, 1])
-            
-            with col1:
-                st.write(f"{i+1}. {system_name}")
-            
-            with col2:
-                if st.button("Edit", key=f"edit_vent_inf_{system_id}_{i}"):
-                    # Set up editor for editing
-                    system = next((s for s in vent_inf_systems if s.get("id") == system_id), None)
-                    if system:
-                        st.session_state.vent_inf_editor = {
-                            "is_edit": True,
-                            "edit_id": system_id,
-                            "name": system.get("name", ""),
-                            "system_type": system.get("system_type", "Ventilation"),
-                            "area": system.get("area", 100.0),
-                            "ventilation_rate": system.get("ventilation_rate", 10.0),
-                            "air_change_rate": system.get("air_change_rate", 1.0),
-                            "schedule": system.get("schedule", "Continuous"),
-                            "zone": system.get("zone", "Whole Building")
-                        }
-                        # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
-                        st.session_state.module_rerun_flags["internal_loads"] = True
-                        st.rerun()
-            
-            with col3:
-                if st.button("Delete", key=f"delete_vent_inf_{system_id}_{i}"):
-                    # Delete ventilation/infiltration system
-                    st.session_state.project_data["internal_loads"]["ventilation_infiltration"] = [
-                        s for s in vent_inf_systems if s.get("id") != system_id
-                    ]
-                    st.success(f"{system.get('system_type', 'System')} '{system_name}' deleted!")
-                    # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
-                    st.session_state.module_rerun_flags["internal_loads"] = True
-                    st.rerun()
+        # Delete button
+        delete_key = f"delete_vent_inf_{system['id']}_{idx}"
+        with cols[6].container():
+            if st.button("Delete", key=delete_key):
+                st.session_state.project_data["internal_loads"]["ventilation_infiltration"].pop(idx)
+                st.success(f"{system.get('system_type', 'System')} '{system['name']}' deleted!")
+                st.session_state.vent_inf_action = {"action": "delete", "id": str(uuid.uuid4())}
+                st.session_state.module_rerun_flags["internal_loads"] = True
 
 def display_schedules_table(schedules: Dict[str, Any]):
     """Display schedules in a table format with edit/delete buttons."""
@@ -1301,13 +1192,11 @@ def display_schedules_table(schedules: Dict[str, Any]):
             
             with col2:
                 if st.button("View", key=f"view_schedule_{schedule_name}_{i}"):
-                    # Display schedule chart
                     schedule_data = schedules[schedule_name]
                     display_schedule_chart(schedule_name, schedule_data)
             
             with col3:
                 if st.button("Edit", key=f"edit_schedule_{schedule_name}_{i}"):
-                    # Set up editor for editing
                     schedule_data = schedules[schedule_name]
                     st.session_state.schedule_editor = {
                         "is_edit": True,
@@ -1317,22 +1206,18 @@ def display_schedules_table(schedules: Dict[str, Any]):
                         "weekday": schedule_data.get("weekday", [0.0] * 24),
                         "weekend": schedule_data.get("weekend", [0.0] * 24)
                     }
-                    # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
                     st.session_state.module_rerun_flags["internal_loads"] = True
                     st.rerun()
             
             with col4:
-                # [FIX]: Check if schedule is in use or a default template before allowing deletion
                 if schedule_name not in DEFAULT_SCHEDULE_TEMPLATES:
                     if is_schedule_in_use(schedule_name):
                         st.write("(In Use)")
                     else:
                         if st.button("Delete", key=f"delete_schedule_{schedule_name}_{i}"):
-                            # Delete schedule
                             del schedules[schedule_name]
                             st.success(f"Schedule '{schedule_name}' deleted!")
-                            # [FIX]: Use module_rerun_flags instead of internal_loads_rerun_pending
                             st.session_state.module_rerun_flags["internal_loads"] = True
                             st.rerun()
                 else:
-                    st.write("(Default)")                  
+                    st.write("(Default)")