Refactor tab1 display options layout and improve UI organization

app.py

@@ -312,74 +312,74 @@ with st.sidebar:
         st.write(f'Total LevX: {levx_sum:.2f}')
 
 with tab1:
-    with st.container():
-        st.info("Advanced view includes all stats and thresholds, simple includes just basic columns for ease of use on mobile")
-    with st.container():
-        # First row - timestamp and reset button
-        col1, col2 = st.columns([3, 1])
-        with col1:
-            st.info(t_stamp)
-        with col2:
-            if st.button("Load/Reset Data", key='reset1'):
-                st.cache_data.clear()
-                dk_raw, fd_raw, dk_raw_sec, fd_raw_sec, roo_raw, timestamp, roo_backlog = load_overall_stats()
-                id_dict = dict(zip(roo_raw.Player, roo_raw.player_ID))
-                dk_lineups = init_DK_lineups()
-                fd_lineups = init_FD_lineups()
-                t_stamp = f"Last Update: " + str(timestamp) + f" CST"
-                for key in st.session_state.keys():
-                    del st.session_state[key]
-
-        with st.expander("Display Options"):
-            col1, col2, col3, col4 = st.columns(4)
+    
+    with st.expander("Display Options"):
+        with st.container():
+            st.info("Advanced view includes all stats and thresholds, simple includes just basic columns for ease of use on mobile")
+        with st.container():
+            # First row - timestamp and reset button
+            col1, col2 = st.columns([3, 1])
             with col1:
-                view_var2 = st.radio("View Type", ('Simple', 'Advanced'), key='view_var2')
+                st.info(t_stamp)
             with col2:
-                site_var2 = st.radio("Site", ('Draftkings', 'Fanduel'), key='site_var2')
-
-                # Process site selection
-                if site_var2 == 'Draftkings':
-                    site_baselines = roo_raw[roo_raw['site'] == 'Draftkings']
-                    site_backlog = roo_backlog[roo_backlog['site'] == 'Draftkings']
-                elif site_var2 == 'Fanduel':
-                    site_baselines = roo_raw[roo_raw['site'] == 'Fanduel']
-                    site_backlog = roo_backlog[roo_backlog['site'] == 'Fanduel']
-            with col3:
-                slate_split = st.radio("Slate Type", ('Main Slate', 'Secondary', 'Backlog'), key='slate_split')
-
-                if slate_split == 'Main Slate':
-                    raw_baselines = site_baselines[site_baselines['slate'] == 'Main Slate']
-                elif slate_split == 'Secondary':
-                    raw_baselines = site_baselines[site_baselines['slate'] == 'Secondary Slate']
-                elif slate_split == 'Backlog':
-                    raw_baselines = site_backlog
-                    # Third row - backlog options
-                    col1, col2 = st.columns(2)
-                    with col1:
-                        view_all = st.checkbox("View all dates?", key='view_all')
-                    with col2:
-                        if not view_all:
-                            date_var2 = st.date_input("Select date", key='date_var2')
-                    
-                    if view_all:
-                        raw_baselines = raw_baselines.sort_values(by=['Median', 'Date'], ascending=[False, False])
-                    else:
-                        raw_baselines = raw_baselines[raw_baselines['Date'] == date_var2.strftime('%m-%d-%Y')]
-                        raw_baselines = raw_baselines.sort_values(by='Median', ascending=False)
-            
-            with col4:
-                split_var2 = st.radio("Slate Range", ('Full Slate Run', 'Specific Games'), key='split_var2')
-                if split_var2 == 'Specific Games':
-                    team_var2 = st.multiselect('Select teams for ROO', options=raw_baselines['Team'].unique(), key='team_var2')
+                if st.button("Load/Reset Data", key='reset1'):
+                    st.cache_data.clear()
+                    dk_raw, fd_raw, dk_raw_sec, fd_raw_sec, roo_raw, timestamp, roo_backlog = load_overall_stats()
+                    id_dict = dict(zip(roo_raw.Player, roo_raw.player_ID))
+                    dk_lineups = init_DK_lineups()
+                    fd_lineups = init_FD_lineups()
+                    t_stamp = f"Last Update: " + str(timestamp) + f" CST"
+                    for key in st.session_state.keys():
+                        del st.session_state[key]
+        col1, col2, col3, col4 = st.columns(4)
+        with col1:
+            view_var2 = st.radio("View Type", ('Simple', 'Advanced'), key='view_var2')
+        with col2:
+            site_var2 = st.radio("Site", ('Draftkings', 'Fanduel'), key='site_var2')
+
+            # Process site selection
+            if site_var2 == 'Draftkings':
+                site_baselines = roo_raw[roo_raw['site'] == 'Draftkings']
+                site_backlog = roo_backlog[roo_backlog['site'] == 'Draftkings']
+            elif site_var2 == 'Fanduel':
+                site_baselines = roo_raw[roo_raw['site'] == 'Fanduel']
+                site_backlog = roo_backlog[roo_backlog['site'] == 'Fanduel']
+        with col3:
+            slate_split = st.radio("Slate Type", ('Main Slate', 'Secondary', 'Backlog'), key='slate_split')
+
+            if slate_split == 'Main Slate':
+                raw_baselines = site_baselines[site_baselines['slate'] == 'Main Slate']
+            elif slate_split == 'Secondary':
+                raw_baselines = site_baselines[site_baselines['slate'] == 'Secondary Slate']
+            elif slate_split == 'Backlog':
+                raw_baselines = site_backlog
+                # Third row - backlog options
+                col1, col2 = st.columns(2)
+                with col1:
+                    view_all = st.checkbox("View all dates?", key='view_all')
+                with col2:
+                    if not view_all:
+                        date_var2 = st.date_input("Select date", key='date_var2')
+                
+                if view_all:
+                    raw_baselines = raw_baselines.sort_values(by=['Median', 'Date'], ascending=[False, False])
                 else:
-                    team_var2 = raw_baselines.Team.values.tolist()
+                    raw_baselines = raw_baselines[raw_baselines['Date'] == date_var2.strftime('%m-%d-%Y')]
+                    raw_baselines = raw_baselines.sort_values(by='Median', ascending=False)
+        
+        with col4:
+            split_var2 = st.radio("Slate Range", ('Full Slate Run', 'Specific Games'), key='split_var2')
+            if split_var2 == 'Specific Games':
+                team_var2 = st.multiselect('Select teams for ROO', options=raw_baselines['Team'].unique(), key='team_var2')
+            else:
+                team_var2 = raw_baselines.Team.values.tolist()
 
-            pos_var2 = st.selectbox('Position Filter', options=['All', 'PG', 'SG', 'SF', 'PF', 'C'], key='pos_var2')
-            col1, col2 = st.columns(2)
-            with col1:
-                low_salary = st.number_input('Enter Lowest Salary', min_value=3000, max_value=15000, value=3000, step=100, key='low_salary')
-            with col2:
-                high_salary = st.number_input('Enter Highest Salary', min_value=3000, max_value=15000, value=15000, step=100, key='high_salary')
+        pos_var2 = st.selectbox('Position Filter', options=['All', 'PG', 'SG', 'SF', 'PF', 'C'], key='pos_var2')
+        col1, col2 = st.columns(2)
+        with col1:
+            low_salary = st.number_input('Enter Lowest Salary', min_value=3000, max_value=15000, value=3000, step=100, key='low_salary')
+        with col2:
+            high_salary = st.number_input('Enter Highest Salary', min_value=3000, max_value=15000, value=15000, step=100, key='high_salary')
     
     display_container_1 = st.empty()
     display_dl_container_1 = st.empty()