diff --git a/frontend.py b/frontend.py
index 2e7c85d..dde8792 100644
--- a/frontend.py
+++ b/frontend.py
@@ -122,7 +122,7 @@ with st.sidebar:
             cols = st.columns([4, 1])
             with cols[0]:
                 new_name = st.text_input(
-                    f"Group Name {i+1}",
+                    f"Group Name",
                     value=group["name"],
                     key=f"group_name_{i}"
                 )
@@ -135,7 +135,7 @@ with st.sidebar:
                 
                 # Use the multiselect with session state
                 selected_endpoints = st.multiselect(
-                    f"Endpoints {i+1}",
+                    f"Endpoints",
                     options=announcement_system.available_endpoints,
                     default=st.session_state[f"endpoints_{i}"],
                     key=f"endpoints_select_{i}"
@@ -153,7 +153,7 @@ with st.sidebar:
                     st.rerun()
             
             # Initialize session state for this group's languages if not already set
-            if f"languages_{i}" not in st.session_state:
+            if f"languages" not in st.session_state:
                 st.session_state[f"languages_{i}"] = group["languages"]
             
             # Use the multiselect with session state