Refactor filter options in app.py: rename 'Filter Options' to 'Macro Filter Options' and streamline the filter form by consolidating stack selection logic, enhancing user experience and clarity in filtering functionalities.

app.py

@@ -839,23 +839,27 @@ with tab2:
 
         col1, col2 = st.columns([2, 8])
         with col1:
-            with st.expander('Filter Options'):
+            with st.expander('Macro Filter Options'):
                 with st.form(key='filter_form'):
                     max_dupes = st.number_input("Max acceptable dupes?", value=1000, min_value=1, step=1)
                     min_salary = st.number_input("Min acceptable salary?", value=1000, min_value=1000, step=100)
                     max_salary = st.number_input("Max acceptable salary?", value=60000, min_value=1000, step=100)
                     max_finish_percentile = st.number_input("Max acceptable finish percentile?", value=.50, min_value=0.005, step=.001)
                     min_lineup_edge = st.number_input("Min acceptable Lineup Edge?", value=-.5, min_value=-1.00, step=.001)
+                    if stack_dict is not None:
+                        stack_toggle = st.selectbox("Include specific stacks?", options=['All Stacks', 'Specific Stacks'], index=0)
+                        stack_selections = st.multiselect("If Specific Stacks, Which to include?", options=sorted(list(set(stack_dict.values()))), default=[])
+                        stack_remove = st.multiselect("If Specific Stacks, Which to remove?", options=sorted(list(set(stack_dict.values()))), default=[])
+                    
+                    submitted = st.form_submit_button("Submit")
+            with st.expander('Micro Filter Options'):
+                with st.form(key='filter_form'):
                     player_names = set()
                     for col in st.session_state['portfolio'].columns:
                         if col not in excluded_cols:
                             player_names.update(st.session_state['portfolio'][col].unique())
                     player_lock = st.multiselect("Lock players?", options=sorted(list(player_names)), default=[])
                     player_remove = st.multiselect("Remove players?", options=sorted(list(player_names)), default=[])
-                    if stack_dict is not None:
-                        stack_toggle = st.selectbox("Include specific stacks?", options=['All Stacks', 'Specific Stacks'], index=0)
-                        stack_selections = st.multiselect("If Specific Stacks, Which to include?", options=sorted(list(set(stack_dict.values()))), default=[])
-                        stack_remove = st.multiselect("If Specific Stacks, Which to remove?", options=sorted(list(set(stack_dict.values()))), default=[])
                     
                     submitted = st.form_submit_button("Submit")
             with st.expander('Trimming Options'):