Update app.py

app.py

@@ -503,537 +503,585 @@ if 'data' in st.session_state:
         )
     
     # EMA with tooltip
-    use_ema = st.sidebar.checkbox(
-        'Exponential Moving Average (EMA)', 
-        value=st.session_state.get('use_ema', False),
-        help="Select to apply Exponential Moving Average (EMA) to the stock price."
-    )
-    ema_period = st.sidebar.number_input(
-        'EMA Period', 
-        min_value=1, 
-        value=st.session_state.get('ema_period', 50), 
-        step=1, 
-        disabled=not use_ema,
-        help="Specify the period (in days) for the EMA."
-    )
-
+    with st.sidebar.expander("Exponential Moving Average (EMA)", expanded=False):
+        use_ema = st.checkbox(
+            'Enable EMA', 
+            value=st.session_state.get('use_ema', False),
+            help="Select to apply Exponential Moving Average (EMA) to the stock price."
+        )
+        ema_period = st.number_input(
+            'EMA Period', 
+            min_value=1, 
+            value=st.session_state.get('ema_period', 50), 
+            step=1, 
+            disabled=not use_ema,
+            help="Specify the period (in days) for the EMA."
+        )
+    
     # WMA with tooltip
-    use_wma = st.sidebar.checkbox(
-        'Weighted Moving Average (WMA)', 
-        value=st.session_state.get('use_wma', False),
-        help="Select to apply Weighted Moving Average (WMA) to the stock price."
-    )
-    wma_period = st.sidebar.number_input(
-        'WMA Period', 
-        min_value=1, 
-        value=st.session_state.get('wma_period', 50), 
-        step=1, 
-        disabled=not use_wma,
-        help="Specify the period (in days) for the WMA."
-    )
-
+    with st.sidebar.expander("Weighted Moving Average (WMA)", expanded=False):
+        use_wma = st.checkbox(
+            'Enable WMA', 
+            value=st.session_state.get('use_wma', False),
+            help="Select to apply Weighted Moving Average (WMA) to the stock price."
+        )
+        wma_period = st.number_input(
+            'WMA Period', 
+            min_value=1, 
+            value=st.session_state.get('wma_period', 50), 
+            step=1, 
+            disabled=not use_wma,
+            help="Specify the period (in days) for the WMA."
+        )
+    
     # DEMA with tooltip
-    use_dema = st.sidebar.checkbox(
-        'Double Exponential Moving Average (DEMA)', 
-        value=st.session_state.get('use_dema', False),
-        help="Select to apply Double Exponential Moving Average (DEMA) to the stock price."
-    )
-    dema_period = st.sidebar.number_input(
-        'DEMA Period', 
-        min_value=1, 
-        value=st.session_state.get('dema_period', 50), 
-        step=1, 
-        disabled=not use_dema,
-        help="Specify the period (in days) for the DEMA."
-    )
-
+    with st.sidebar.expander("Double Exponential Moving Average (DEMA)", expanded=False):
+        use_dema = st.checkbox(
+            'Enable DEMA', 
+            value=st.session_state.get('use_dema', False),
+            help="Select to apply Double Exponential Moving Average (DEMA) to the stock price."
+        )
+        dema_period = st.number_input(
+            'DEMA Period', 
+            min_value=1, 
+            value=st.session_state.get('dema_period', 50), 
+            step=1, 
+            disabled=not use_dema,
+            help="Specify the period (in days) for the DEMA."
+        )
+    
     # TEMA with tooltip
-    use_tema = st.sidebar.checkbox(
-        'Triple Exponential Moving Average (TEMA)', 
-        value=st.session_state.get('use_tema', False),
-        help="Select to apply Triple Exponential Moving Average (TEMA) to the stock price."
-    )
-    tema_period = st.sidebar.number_input(
-        'TEMA Period', 
-        min_value=1, 
-        value=st.session_state.get('tema_period', 50), 
-        step=1, 
-        disabled=not use_tema,
-        help="Specify the period (in days) for the TEMA."
-    )
-
+    with st.sidebar.expander("Triple Exponential Moving Average (TEMA)", expanded=False):
+        use_tema = st.checkbox(
+            'Enable TEMA', 
+            value=st.session_state.get('use_tema', False),
+            help="Select to apply Triple Exponential Moving Average (TEMA) to the stock price."
+        )
+        tema_period = st.number_input(
+            'TEMA Period', 
+            min_value=1, 
+            value=st.session_state.get('tema_period', 50), 
+            step=1, 
+            disabled=not use_tema,
+            help="Specify the period (in days) for the TEMA."
+        )
+    
     # VAMA with tooltip
-    use_vama = st.sidebar.checkbox(
-        'Volume-Adjusted Moving Average (VAMA)', 
-        value=st.session_state.get('use_vama', False),
-        help="Select to apply Volume-Adjusted Moving Average (VAMA) to the stock price."
-    )
-    vama_period = st.sidebar.number_input(
-        'VAMA Period', 
-        min_value=1, 
-        value=st.session_state.get('vama_period', 50), 
-        step=1, 
-        disabled=not use_vama,
-        help="Specify the period (in days) for the VAMA."
-    )
-
+    with st.sidebar.expander("Volume-Adjusted Moving Average (VAMA)", expanded=False):
+        use_vama = st.checkbox(
+            'Enable VAMA', 
+            value=st.session_state.get('use_vama', False),
+            help="Select to apply Volume-Adjusted Moving Average (VAMA) to the stock price."
+        )
+        vama_period = st.number_input(
+            'VAMA Period', 
+            min_value=1, 
+            value=st.session_state.get('vama_period', 50), 
+            step=1, 
+            disabled=not use_vama,
+            help="Specify the period (in days) for the VAMA."
+        )
+    
     # KAMA with tooltip
-    use_kama = st.sidebar.checkbox(
-        'Kaufman Adaptive Moving Average (KAMA)', 
-        value=st.session_state.get('use_kama', False),
-        help="Select to apply Kaufman Adaptive Moving Average (KAMA) to the stock price."
-    )
-    kama_period = st.sidebar.number_input(
-        'KAMA Period', 
-        min_value=1, 
-        value=st.session_state.get('kama_period', 10), 
-        step=1, 
-        disabled=not use_kama,
-        help="Specify the efficiency ratio period (in days) for the KAMA."
-    )
-    fastest_period = st.sidebar.number_input(
-        'Fastest SC Period', 
-        min_value=1, 
-        value=st.session_state.get('fastest_period', 2), 
-        step=1, 
-        disabled=not use_kama,
-        help="Specify the fastest smoothing constant period."
-    )
-    slowest_period = st.sidebar.number_input(
-        'Slowest SC Period', 
-        min_value=1, 
-        value=st.session_state.get('slowest_period', 30), 
-        step=1, 
-        disabled=not use_kama,
-        help="Specify the slowest smoothing constant period."
-    )
-
+    with st.sidebar.expander("Kaufman Adaptive Moving Average (KAMA)", expanded=False):
+        use_kama = st.checkbox(
+            'Enable KAMA', 
+            value=st.session_state.get('use_kama', False),
+            help="Select to apply Kaufman Adaptive Moving Average (KAMA) to the stock price."
+        )
+        kama_period = st.number_input(
+            'KAMA Period', 
+            min_value=1, 
+            value=st.session_state.get('kama_period', 10), 
+            step=1, 
+            disabled=not use_kama,
+            help="Specify the efficiency ratio period (in days) for the KAMA."
+        )
+        fastest_period = st.number_input(
+            'Fastest SC Period', 
+            min_value=1, 
+            value=st.session_state.get('fastest_period', 2), 
+            step=1, 
+            disabled=not use_kama,
+            help="Specify the fastest smoothing constant period."
+        )
+        slowest_period = st.number_input(
+            'Slowest SC Period', 
+            min_value=1, 
+            value=st.session_state.get('slowest_period', 30), 
+            step=1, 
+            disabled=not use_kama,
+            help="Specify the slowest smoothing constant period."
+        )
+    
     # TMA with tooltip
-    use_tma = st.sidebar.checkbox(
-        'Triangular Moving Average (TMA)', 
-        value=st.session_state.get('use_tma', False),
-        help="Select to apply Triangular Moving Average (TMA) to the stock price."
-    )
-    tma_period = st.sidebar.number_input(
-        'TMA Period', 
-        min_value=1, 
-        value=st.session_state.get('tma_period', 20), 
-        step=1, 
-        disabled=not use_tma,
-        help="Specify the period (in days) for the TMA."
-    )
+    with st.sidebar.expander("Triangular Moving Average (TMA)", expanded=False):
+        use_tma = st.checkbox(
+            'Enable TMA', 
+            value=st.session_state.get('use_tma', False),
+            help="Select to apply Triangular Moving Average (TMA) to the stock price."
+        )
+        tma_period = st.number_input(
+            'TMA Period', 
+            min_value=1, 
+            value=st.session_state.get('tma_period', 20), 
+            step=1, 
+            disabled=not use_tma,
+            help="Specify the period (in days) for the TMA."
+        )
 
     # Hull MA with tooltip
-    use_hull_ma = st.sidebar.checkbox(
-        'Hull Moving Average (HMA)', 
-        value=st.session_state.get('use_hull_ma', False),
-        help="Select to apply Hull Moving Average (HMA) to the stock price."
-    )
-    hull_ma_period = st.sidebar.number_input(
-        'HMA Period', 
-        min_value=1, 
-        value=st.session_state.get('hull_ma_period', 120), 
-        step=1, 
-        disabled=not use_hull_ma,
-        help="Specify the period (in days) for the Hull Moving Average."
-    )
-
+    with st.sidebar.expander("Hull Moving Average (HMA)", expanded=False):
+        use_hull_ma = st.checkbox(
+            'Enable HMA', 
+            value=st.session_state.get('use_hull_ma', False),
+            help="Select to apply Hull Moving Average (HMA) to the stock price."
+        )
+        hull_ma_period = st.number_input(
+            'HMA Period', 
+            min_value=1, 
+            value=st.session_state.get('hull_ma_period', 120), 
+            step=1, 
+            disabled=not use_hull_ma,
+            help="Specify the period (in days) for the Hull Moving Average."
+        )
+    
     # Harmonic MA with tooltip
-    use_harmonic_ma = st.sidebar.checkbox(
-        'Harmonic Moving Average (HMA)', 
-        value=st.session_state.get('use_harmonic_ma', False),
-        help="Select to apply Harmonic Moving Average (HMA) to the stock price."
-    )
-    harmonic_ma_period = st.sidebar.number_input(
-        'HMA Period', 
-        min_value=1, 
-        value=st.session_state.get('harmonic_ma_period', 120), 
-        step=1, 
-        disabled=not use_harmonic_ma,
-        help="Specify the period (in days) for the Harmonic Moving Average."
-    )
-
+    with st.sidebar.expander("Harmonic Moving Average (HMA)", expanded=False):
+        use_harmonic_ma = st.checkbox(
+            'Enable HMA', 
+            value=st.session_state.get('use_harmonic_ma', False),
+            help="Select to apply Harmonic Moving Average (HMA) to the stock price."
+        )
+        harmonic_ma_period = st.number_input(
+            'HMA Period', 
+            min_value=1, 
+            value=st.session_state.get('harmonic_ma_period', 120), 
+            step=1, 
+            disabled=not use_harmonic_ma,
+            help="Specify the period (in days) for the Harmonic Moving Average."
+        )
+    
     # FRAMA with tooltip
-    use_frama = st.sidebar.checkbox(
-        'Fractal Adaptive Moving Average (FRAMA)', 
-        value=st.session_state.get('use_frama', False),
-        help="Select to apply Fractal Adaptive Moving Average (FRAMA) to the stock price."
-    )
-    frama_batch = st.sidebar.number_input(
-        'FRAMA Batch Size', 
-        min_value=1, 
-        value=st.session_state.get('frama_batch', 10), 
-        step=1, 
-        disabled=not use_frama,
-        help="Specify the batch size for FRAMA calculation."
-    )
-
+    with st.sidebar.expander("Fractal Adaptive Moving Average (FRAMA)", expanded=False):
+        use_frama = st.checkbox(
+            'Enable FRAMA', 
+            value=st.session_state.get('use_frama', False),
+            help="Select to apply Fractal Adaptive Moving Average (FRAMA) to the stock price."
+        )
+        frama_batch = st.number_input(
+            'FRAMA Batch Size', 
+            min_value=1, 
+            value=st.session_state.get('frama_batch', 10), 
+            step=1, 
+            disabled=not use_frama,
+            help="Specify the batch size for FRAMA calculation."
+        )
+    
     # ZLEMA with tooltip
-    use_zlema = st.sidebar.checkbox(
-        'Zero Lag Exponential Moving Average (ZLEMA)', 
-        value=st.session_state.get('use_zlema', False),
-        help="Select to apply Zero Lag Exponential Moving Average (ZLEMA) to the stock price."
-    )
-    zlema_period = st.sidebar.number_input(
-        'ZLEMA Period', 
-        min_value=1, 
-        value=st.session_state.get('zlema_period', 28), 
-        step=1, 
-        disabled=not use_zlema,
-        help="Specify the period (in days) for the ZLEMA."
-    )
-
+    with st.sidebar.expander("Zero Lag Exponential Moving Average (ZLEMA)", expanded=False):
+        use_zlema = st.checkbox(
+            'Enable ZLEMA', 
+            value=st.session_state.get('use_zlema', False),
+            help="Select to apply Zero Lag Exponential Moving Average (ZLEMA) to the stock price."
+        )
+        zlema_period = st.number_input(
+            'ZLEMA Period', 
+            min_value=1, 
+            value=st.session_state.get('zlema_period', 28), 
+            step=1, 
+            disabled=not use_zlema,
+            help="Specify the period (in days) for the ZLEMA."
+        )
+    
     # VIDYA with tooltip
-    use_vidya = st.sidebar.checkbox(
-        'Variable Index Dynamic Average (VIDYA)', 
-        value=st.session_state.get('use_vidya', False),
-        help="Select to apply Variable Index Dynamic Average (VIDYA) to the stock price."
-    )
-    vidya_period = st.sidebar.number_input(
-        'VIDYA Period', 
-        min_value=1, 
-        value=st.session_state.get('vidya_period', 14), 
-        step=1, 
-        disabled=not use_vidya,
-        help="Specify the period (in days) for the VIDYA."
-    )
-
+    with st.sidebar.expander("Variable Index Dynamic Average (VIDYA)", expanded=False):
+        use_vidya = st.checkbox(
+            'Enable VIDYA', 
+            value=st.session_state.get('use_vidya', False),
+            help="Select to apply Variable Index Dynamic Average (VIDYA) to the stock price."
+        )
+        vidya_period = st.number_input(
+            'VIDYA Period', 
+            min_value=1, 
+            value=st.session_state.get('vidya_period', 14), 
+            step=1, 
+            disabled=not use_vidya,
+            help="Specify the period (in days) for the VIDYA."
+        )
+    
     # ALMA with tooltip
-    use_alma = st.sidebar.checkbox(
-        'Arnaud Legoux Moving Average (ALMA)', 
-        value=st.session_state.get('use_alma', False),
-        help="Select to apply Arnaud Legoux Moving Average (ALMA) to the stock price."
-    )
-    alma_period = st.sidebar.number_input(
-        'ALMA Period', 
-        min_value=1, 
-        value=st.session_state.get('alma_period', 36), 
-        step=1, 
-        disabled=not use_alma,
-        help="Specify the period (in days) for the ALMA."
-    )
-    alma_offset = st.sidebar.number_input(
-        'ALMA Offset', 
-        min_value=0.0, 
-        max_value=1.0, 
-        value=st.session_state.get('alma_offset', 0.85), 
-        step=0.01, 
-        disabled=not use_alma,
-        help="Specify the offset for the ALMA (0 to 1)."
-    )
-    alma_sigma = st.sidebar.number_input(
-        'ALMA Sigma', 
-        min_value=1, 
-        value=st.session_state.get('alma_sigma', 6), 
-        step=1, 
-        disabled=not use_alma,
-        help="Specify the sigma for the ALMA."
-    )
-
+    with st.sidebar.expander("Arnaud Legoux Moving Average (ALMA)", expanded=False):
+        use_alma = st.checkbox(
+            'Enable ALMA', 
+            value=st.session_state.get('use_alma', False),
+            help="Select to apply Arnaud Legoux Moving Average (ALMA) to the stock price."
+        )
+        alma_period = st.number_input(
+            'ALMA Period', 
+            min_value=1, 
+            value=st.session_state.get('alma_period', 36), 
+            step=1, 
+            disabled=not use_alma,
+            help="Specify the period (in days) for the ALMA."
+        )
+        alma_offset = st.number_input(
+            'ALMA Offset', 
+            min_value=0.0, 
+            max_value=1.0, 
+            value=st.session_state.get('alma_offset', 0.85), 
+            step=0.01, 
+            disabled=not use_alma,
+            help="Specify the offset for the ALMA (0 to 1)."
+        )
+        alma_sigma = st.number_input(
+            'ALMA Sigma', 
+            min_value=1, 
+            value=st.session_state.get('alma_sigma', 6), 
+            step=1, 
+            disabled=not use_alma,
+            help="Specify the sigma for the ALMA."
+        )
+    
     # MAMA and FAMA with tooltip
-    use_mama_fama = st.sidebar.checkbox(
-        'MESA Adaptive Moving Average (MAMA) & FAMA', 
-        value=st.session_state.get('use_mama_fama', False),
-        help="Select to apply MESA Adaptive Moving Average (MAMA) and Following Adaptive Moving Average (FAMA) to the stock price."
-    )
-    mama_fast_limit = st.sidebar.number_input(
-        'MAMA Fast Limit', 
-        min_value=0.0, 
-        max_value=1.0, 
-        value=st.session_state.get('mama_fast_limit', 0.5), 
-        step=0.01, 
-        disabled=not use_mama_fama,
-        help="Specify the fast limit for MAMA (0 to 1)."
-    )
-    mama_slow_limit = st.sidebar.number_input(
-        'MAMA Slow Limit', 
-        min_value=0.0, 
-        max_value=1.0, 
-        value=st.session_state.get('mama_slow_limit', 0.05), 
-        step=0.01, 
-        disabled=not use_mama_fama,
-        help="Specify the slow limit for MAMA (0 to 1)."
-    )
+    with st.sidebar.expander("MESA Adaptive Moving Average (MAMA) & FAMA", expanded=False):
+        use_mama_fama = st.checkbox(
+            'Enable MAMA & FAMA', 
+            value=st.session_state.get('use_mama_fama', False),
+            help="Select to apply MESA Adaptive Moving Average (MAMA) and Following Adaptive Moving Average (FAMA) to the stock price."
+        )
+        mama_fast_limit = st.number_input(
+            'MAMA Fast Limit', 
+            min_value=0.0, 
+            max_value=1.0, 
+            value=st.session_state.get('mama_fast_limit', 0.5), 
+            step=0.01, 
+            disabled=not use_mama_fama,
+            help="Specify the fast limit for MAMA (0 to 1)."
+        )
+        mama_slow_limit = st.number_input(
+            'MAMA Slow Limit', 
+            min_value=0.0, 
+            max_value=1.0, 
+            value=st.session_state.get('mama_slow_limit', 0.05), 
+            step=0.01, 
+            disabled=not use_mama_fama,
+            help="Specify the slow limit for MAMA (0 to 1)."
+        )
 
     # APMA with tooltip
-    use_apma = st.sidebar.checkbox(
-        'Adaptive Period Moving Average (APMA)', 
-        value=st.session_state.get('use_apma', False),
-        help="Select to apply Adaptive Period Moving Average (APMA) to the stock price."
-    )
-    apma_min_period = st.sidebar.number_input(
-        'APMA Min Period', 
-        min_value=1, 
-        value=st.session_state.get('apma_min_period', 5), 
-        step=1, 
-        disabled=not use_apma,
-        help="Specify the minimum period for the APMA."
-    )
-    apma_max_period = st.sidebar.number_input(
-        'APMA Max Period', 
-        min_value=1, 
-        value=st.session_state.get('apma_max_period', 30), 
-        step=1, 
-        disabled=not use_apma,
-        help="Specify the maximum period for the APMA."
-    )
-
+    with st.sidebar.expander("Adaptive Period Moving Average (APMA)", expanded=False):
+        use_apma = st.checkbox(
+            'Enable APMA', 
+            value=st.session_state.get('use_apma', False),
+            help="Select to apply Adaptive Period Moving Average (APMA) to the stock price."
+        )
+        apma_min_period = st.number_input(
+            'APMA Min Period', 
+            min_value=1, 
+            value=st.session_state.get('apma_min_period', 5), 
+            step=1, 
+            disabled=not use_apma,
+            help="Specify the minimum period for the APMA."
+        )
+        apma_max_period = st.number_input(
+            'APMA Max Period', 
+            min_value=1, 
+            value=st.session_state.get('apma_max_period', 30), 
+            step=1, 
+            disabled=not use_apma,
+            help="Specify the maximum period for the APMA."
+        )
+    
     # Rainbow EMA with tooltip
-    use_rainbow_ema = st.sidebar.checkbox(
-        'Rainbow Moving Average (EMA)', 
-        value=st.session_state.get('use_rainbow_ema', False),
-        help="Select to apply Rainbow Moving Average (EMA) with multiple lookback periods to the stock price."
-    )
-    rainbow_lookback_periods = st.sidebar.multiselect(
-        'Rainbow Lookback Periods', 
-        options=[2, 4, 8, 16, 32, 64, 128, 192, 320, 512],
-        default=st.session_state.get('rainbow_lookback_periods', [2, 4, 8, 16, 32, 64, 128]),
-        disabled=not use_rainbow_ema,
-        help="Select multiple lookback periods for the Rainbow EMA."
-    )
-
+    with st.sidebar.expander("Rainbow Moving Average (EMA)", expanded=False):
+        use_rainbow_ema = st.checkbox(
+            'Enable Rainbow EMA', 
+            value=st.session_state.get('use_rainbow_ema', False),
+            help="Select to apply Rainbow Moving Average (EMA) with multiple lookback periods to the stock price."
+        )
+        rainbow_lookback_periods = st.multiselect(
+            'Rainbow Lookback Periods', 
+            options=[2, 4, 8, 16, 32, 64, 128, 192, 320, 512],
+            default=st.session_state.get('rainbow_lookback_periods', [2, 4, 8, 16, 32, 64, 128]),
+            disabled=not use_rainbow_ema,
+            help="Select multiple lookback periods for the Rainbow EMA."
+        )
+    
     # Wilders MA with tooltip
-    use_wilders_ma = st.sidebar.checkbox(
-        'Wilders Moving Average (Wilder\'s MA)', 
-        value=st.session_state.get('use_wilders_ma', False),
-        help="Select to apply Wilder's Moving Average to the stock price."
-    )
-    wilders_ma_period = st.sidebar.number_input(
-        'Wilders MA Period', 
-        min_value=1, 
-        value=st.session_state.get('wilders_ma_period', 14), 
-        step=1, 
-        disabled=not use_wilders_ma,
-        help="Specify the period (in days) for Wilder's Moving Average."
-    )
-
+    with st.sidebar.expander("Wilders Moving Average (Wilder's MA)", expanded=False):
+        use_wilders_ma = st.checkbox(
+            'Enable Wilders MA', 
+            value=st.session_state.get('use_wilders_ma', False),
+            help="Select to apply Wilder's Moving Average to the stock price."
+        )
+        wilders_ma_period = st.number_input(
+            'Wilders MA Period', 
+            min_value=1, 
+            value=st.session_state.get('wilders_ma_period', 14), 
+            step=1, 
+            disabled=not use_wilders_ma,
+            help="Specify the period (in days) for Wilder's Moving Average."
+        )
+    
     # SMMA with tooltip
-    use_smma = st.sidebar.checkbox(
-        'Smoothed Moving Average (SMMA)', 
-        value=st.session_state.get('use_smma', False),
-        help="Select to apply Smoothed Moving Average (SMMA) to the stock price."
-    )
-    smma_period = st.sidebar.number_input(
-        'SMMA Period', 
-        min_value=1, 
-        value=st.session_state.get('smma_period', 28), 
-        step=1, 
-        disabled=not use_smma,
-        help="Specify the period (in days) for the SMMA."
-    )
-
+    with st.sidebar.expander("Smoothed Moving Average (SMMA)", expanded=False):
+        use_smma = st.checkbox(
+            'Enable SMMA', 
+            value=st.session_state.get('use_smma', False),
+            help="Select to apply Smoothed Moving Average (SMMA) to the stock price."
+        )
+        smma_period = st.number_input(
+            'SMMA Period', 
+            min_value=1, 
+            value=st.session_state.get('smma_period', 28), 
+            step=1, 
+            disabled=not use_smma,
+            help="Specify the period (in days) for the SMMA."
+        )
+    
     # GMMA with tooltip
-    use_gmma = st.sidebar.checkbox(
-        'Guppy Multiple Moving Average (GMMA)', 
-        value=st.session_state.get('use_gmma', False),
-        help="Select to apply Guppy Multiple Moving Average (GMMA) to the stock price."
-    )
-    gmma_short_periods = st.sidebar.multiselect(
-        'GMMA Short Periods', 
-        options=[3, 5, 8, 10, 12, 15],
-        default=st.session_state.get('gmma_short_periods', [3, 5, 8, 10, 12, 15]),
-        disabled=not use_gmma,
-        help="Select the short-term periods for GMMA."
-    )
-    gmma_long_periods = st.sidebar.multiselect(
-        'GMMA Long Periods', 
-        options=[30, 35, 40, 45, 50, 60],
-        default=st.session_state.get('gmma_long_periods', [30, 35, 40, 45, 50, 60]),
-        disabled=not use_gmma,
-        help="Select the long-term periods for GMMA."
-    )
-
+    with st.sidebar.expander("Guppy Multiple Moving Average (GMMA)", expanded=False):
+        use_gmma = st.checkbox(
+            'Enable GMMA', 
+            value=st.session_state.get('use_gmma', False),
+            help="Select to apply Guppy Multiple Moving Average (GMMA) to the stock price."
+        )
+        gmma_short_periods = st.multiselect(
+            'GMMA Short Periods', 
+            options=[3, 5, 8, 10, 12, 15],
+            default=st.session_state.get('gmma_short_periods', [3, 5, 8, 10, 12, 15]),
+            disabled=not use_gmma,
+            help="Select the short-term periods for GMMA."
+        )
+        gmma_long_periods = st.multiselect(
+            'GMMA Long Periods', 
+            options=[30, 35, 40, 45, 50, 60],
+            default=st.session_state.get('gmma_long_periods', [30, 35, 40, 45, 50, 60]),
+            disabled=not use_gmma,
+            help="Select the long-term periods for GMMA."
+        )
+    
     # LSMA with tooltip
-    use_lsma = st.sidebar.checkbox(
-        'Least Squares Moving Average (LSMA)', 
-        value=st.session_state.get('use_lsma', False),
-        help="Select to apply Least Squares Moving Average (LSMA) to the stock price."
-    )
-    lsma_period = st.sidebar.number_input(
-        'LSMA Period', 
-        min_value=1, 
-        value=st.session_state.get('lsma_period', 28), 
-        step=1, 
-        disabled=not use_lsma,
-        help="Specify the period (in days) for the LSMA."
-    )
-
+    with st.sidebar.expander("Least Squares Moving Average (LSMA)", expanded=False):
+        use_lsma = st.checkbox(
+            'Enable LSMA', 
+            value=st.session_state.get('use_lsma', False),
+            help="Select to apply Least Squares Moving Average (LSMA) to the stock price."
+        )
+        lsma_period = st.number_input(
+            'LSMA Period', 
+            min_value=1, 
+            value=st.session_state.get('lsma_period', 28), 
+            step=1, 
+            disabled=not use_lsma,
+            help="Specify the period (in days) for the LSMA."
+        )
+    
     # MMA (Welch's MMA) with tooltip
-    use_mma = st.sidebar.checkbox(
-        'Welch\'s Moving Average (MMA)', 
-        value=st.session_state.get('use_mma', False),
-        help="Select to apply Welch\'s Moving Average (Modified Moving Average) to the stock price."
-    )
-    mma_period = st.sidebar.number_input(
-        'MMA Period', 
-        min_value=1, 
-        value=st.session_state.get('mma_period', 14), 
-        step=1, 
-        disabled=not use_mma,
-        help="Specify the period (in days) for the MMA."
-    )
-
+    with st.sidebar.expander("Welch's Moving Average (MMA)", expanded=False):
+        use_mma = st.checkbox(
+            'Enable MMA', 
+            value=st.session_state.get('use_mma', False),
+            help="Select to apply Welch's Moving Average (Modified Moving Average) to the stock price."
+        )
+        mma_period = st.number_input(
+            'MMA Period', 
+            min_value=1, 
+            value=st.session_state.get('mma_period', 14), 
+            step=1, 
+            disabled=not use_mma,
+            help="Specify the period (in days) for the MMA."
+        )
+    
     # SinWMA with tooltip
-    use_sinwma = st.sidebar.checkbox(
-        'Sin-weighted Moving Average (SinWMA)', 
-        value=st.session_state.get('use_sinwma', False),
-        help="Select to apply Sin-weighted Moving Average (SinWMA) to the stock price."
-    )
-    sinwma_period = st.sidebar.number_input(
-        'SinWMA Period', 
-        min_value=1, 
-        value=st.session_state.get('sinwma_period', 21), 
-        step=1, 
-        disabled=not use_sinwma,
-        help="Specify the period (in days) for the SinWMA."
-    )
-
+    with st.sidebar.expander("Sin-weighted Moving Average (SinWMA)", expanded=False):
+        use_sinwma = st.checkbox(
+            'Enable SinWMA', 
+            value=st.session_state.get('use_sinwma', False),
+            help="Select to apply Sin-weighted Moving Average (SinWMA) to the stock price."
+        )
+        sinwma_period = st.number_input(
+            'SinWMA Period', 
+            min_value=1, 
+            value=st.session_state.get('sinwma_period', 21), 
+            step=1, 
+            disabled=not use_sinwma,
+            help="Specify the period (in days) for the SinWMA."
+        )
+    
     # MedMA with tooltip
-    use_medma = st.sidebar.checkbox(
-        'Median Moving Average (MedMA)', 
-        value=st.session_state.get('use_medma', False),
-        help="Select to apply Median Moving Average (MedMA) to the stock price."
-    )
-    medma_period = st.sidebar.number_input(
-        'MedMA Period', 
-        min_value=1, 
-        value=st.session_state.get('medma_period', 20), 
-        step=1, 
-        disabled=not use_medma,
-        help="Specify the period (in days) for the MedMA."
-    )
-
+    with st.sidebar.expander("Median Moving Average (MedMA)", expanded=False):
+        use_medma = st.checkbox(
+            'Enable MedMA', 
+            value=st.session_state.get('use_medma', False),
+            help="Select to apply Median Moving Average (MedMA) to the stock price."
+        )
+        medma_period = st.number_input(
+            'MedMA Period', 
+            min_value=1, 
+            value=st.session_state.get('medma_period', 20), 
+            step=1, 
+            disabled=not use_medma,
+            help="Specify the period (in days) for the MedMA."
+        )
+    
     # GMA with tooltip
-    use_gma = st.sidebar.checkbox(
-        'Geometric Moving Average (GMA)', 
-        value=st.session_state.get('use_gma', False),
-        help="Select to apply Geometric Moving Average (GMA) to the stock price."
-    )
-    gma_period = st.sidebar.number_input(
-        'GMA Period', 
-        min_value=1, 
-        value=st.session_state.get('gma_period', 20), 
-        step=1, 
-        disabled=not use_gma,
-        help="Specify the period (in days) for the GMA."
-    )
-
+    with st.sidebar.expander("Geometric Moving Average (GMA)", expanded=False):
+        use_gma = st.checkbox(
+            'Enable GMA', 
+            value=st.session_state.get('use_gma', False),
+            help="Select to apply Geometric Moving Average (GMA) to the stock price."
+        )
+        gma_period = st.number_input(
+            'GMA Period', 
+            min_value=1, 
+            value=st.session_state.get('gma_period', 20), 
+            step=1, 
+            disabled=not use_gma,
+            help="Specify the period (in days) for the GMA."
+        )
+    
     # eVWMA with tooltip
-    use_evwma = st.sidebar.checkbox(
-        'Elastic Volume Weighted Moving Average (eVWMA)', 
-        value=st.session_state.get('use_evwma', False),
-        help="Select to apply Elastic Volume Weighted Moving Average (eVWMA) to the stock price."
-    )
-    evwma_period = st.sidebar.number_input(
-        'eVWMA Period', 
-        min_value=1, 
-        value=st.session_state.get('evwma_period', 20), 
-        step=1, 
-        disabled=not use_evwma,
-        help="Specify the period (in days) for the eVWMA."
-    )
+    with st.sidebar.expander("Elastic Volume Weighted Moving Average (eVWMA)", expanded=False):
+        use_evwma = st.checkbox(
+            'Enable eVWMA', 
+            value=st.session_state.get('use_evwma', False),
+            help="Select to apply Elastic Volume Weighted Moving Average (eVWMA) to the stock price."
+        )
+        evwma_period = st.number_input(
+            'eVWMA Period', 
+            min_value=1, 
+            value=st.session_state.get('evwma_period', 20), 
+            step=1, 
+            disabled=not use_evwma,
+            help="Specify the period (in days) for the eVWMA."
+        )
 
     # REMA with tooltip
-    use_rema = st.sidebar.checkbox(
-        'Regularized Exponential Moving Average (REMA)', 
-        value=st.session_state.get('use_rema', False),
-        help="Select to apply Regularized Exponential Moving Average (REMA) to the stock price."
-    )
-    rema_alpha = st.sidebar.number_input(
-        'REMA Alpha', 
-        min_value=0.0, 
-        max_value=1.0, 
-        value=st.session_state.get('rema_alpha', 0.1), 
-        step=0.01, 
-        disabled=not use_rema,
-        help="Specify the alpha value for the REMA (0 to 1)."
-    )
-    rema_lambda = st.sidebar.number_input(
-        'REMA Lambda', 
-        min_value=0.0, 
-        max_value=1.0, 
-        value=st.session_state.get('rema_lambda', 0.1), 
-        step=0.01, 
-        disabled=not use_rema,
-        help="Specify the lambda value for the REMA (0 to 1)."
-    )
-
+    with st.sidebar.expander("Regularized Exponential Moving Average (REMA)", expanded=False):
+        use_rema = st.checkbox(
+            'Enable REMA', 
+            value=st.session_state.get('use_rema', False),
+            help="Select to apply Regularized Exponential Moving Average (REMA) to the stock price."
+        )
+        rema_alpha = st.number_input(
+            'REMA Alpha', 
+            min_value=0.0, 
+            max_value=1.0, 
+            value=st.session_state.get('rema_alpha', 0.1), 
+            step=0.01, 
+            disabled=not use_rema,
+            help="Specify the alpha value for the REMA (0 to 1)."
+        )
+        rema_lambda = st.number_input(
+            'REMA Lambda', 
+            min_value=0.0, 
+            max_value=1.0, 
+            value=st.session_state.get('rema_lambda', 0.1), 
+            step=0.01, 
+            disabled=not use_rema,
+            help="Specify the lambda value for the REMA (0 to 1)."
+        )
+    
     # PWMA with tooltip
-    use_pwma = st.sidebar.checkbox(
-        'Parabolic Weighted Moving Average (PWMA)', 
-        value=st.session_state.get('use_pwma', False),
-        help="Select to apply Parabolic Weighted Moving Average (PWMA) to the stock price."
-    )
-    pwma_period = st.sidebar.number_input(
-        'PWMA Period', 
-        min_value=1, 
-        value=st.session_state.get('pwma_period', 14), 
-        step=1, 
-        disabled=not use_pwma,
-        help="Specify the period (in days) for the PWMA."
-    )
-
+    with st.sidebar.expander("Parabolic Weighted Moving Average (PWMA)", expanded=False):
+        use_pwma = st.checkbox(
+            'Enable PWMA', 
+            value=st.session_state.get('use_pwma', False),
+            help="Select to apply Parabolic Weighted Moving Average (PWMA) to the stock price."
+        )
+        pwma_period = st.number_input(
+            'PWMA Period', 
+            min_value=1, 
+            value=st.session_state.get('pwma_period', 14), 
+            step=1, 
+            disabled=not use_pwma,
+            help="Specify the period (in days) for the PWMA."
+        )
+    
     # JMA with tooltip
-    use_jma = st.sidebar.checkbox(
-        'Jurik Moving Average (JMA)', 
-        value=st.session_state.get('use_jma', False),
-        help="Select to apply Jurik Moving Average (JMA) to the stock price."
-    )
-    jma_period = st.sidebar.number_input(
-        'JMA Period', 
-        min_value=1, 
-        value=st.session_state.get('jma_period', 28), 
-        step=1, 
-        disabled=not use_jma,
-        help="Specify the period (in days) for the JMA."
-    )
-    jma_phase = st.sidebar.number_input(
-        'JMA Phase', 
-        min_value=-100.0, 
-        max_value=100.0, 
-        value=st.session_state.get('jma_phase', 0.0), 
-        step=0.1, 
-        disabled=not use_jma,
-        help="Specify the phase for the JMA (-100 to 100)."
-    )
-
+    with st.sidebar.expander("Jurik Moving Average (JMA)", expanded=False):
+        use_jma = st.checkbox(
+            'Enable JMA', 
+            value=st.session_state.get('use_jma', False),
+            help="Select to apply Jurik Moving Average (JMA) to the stock price."
+        )
+        jma_period = st.number_input(
+            'JMA Period', 
+            min_value=1, 
+            value=st.session_state.get('jma_period', 28), 
+            step=1, 
+            disabled=not use_jma,
+            help="Specify the period (in days) for the JMA."
+        )
+        jma_phase = st.number_input(
+            'JMA Phase', 
+            min_value=-100.0, 
+            max_value=100.0, 
+            value=st.session_state.get('jma_phase', 0.0), 
+            step=0.1, 
+            disabled=not use_jma,
+            help="Specify the phase for the JMA (-100 to 100)."
+        )
+    
     # EPMA with tooltip
-    use_epma = st.sidebar.checkbox(
-        'End Point Moving Average (EPMA)', 
-        value=st.session_state.get('use_epma', False),
-        help="Select to apply End Point Moving Average (EPMA) to the stock price."
-    )
-    epma_period = st.sidebar.number_input(
-        'EPMA Period', 
-        min_value=1, 
-        value=st.session_state.get('epma_period', 28), 
-        step=1, 
-        disabled=not use_epma,
-        help="Specify the period (in days) for the EPMA."
-    )
-
+    with st.sidebar.expander("End Point Moving Average (EPMA)", expanded=False):
+        use_epma = st.checkbox(
+            'Enable EPMA', 
+            value=st.session_state.get('use_epma', False),
+            help="Select to apply End Point Moving Average (EPMA) to the stock price."
+        )
+        epma_period = st.number_input(
+            'EPMA Period', 
+            min_value=1, 
+            value=st.session_state.get('epma_period', 28), 
+            step=1, 
+            disabled=not use_epma,
+            help="Specify the period (in days) for the EPMA."
+        )
+    
     # CMA with tooltip
-    use_cma = st.sidebar.checkbox(
-        'Chande Moving Average (CMA)', 
-        value=st.session_state.get('use_cma', False),
-        help="Select to apply Chande Moving Average (CMA) to the stock price."
-    )
-    cma_period = len(data['Close'])
-
+    with st.sidebar.expander("Chande Moving Average (CMA)", expanded=False):
+        use_cma = st.checkbox(
+            'Enable CMA', 
+            value=st.session_state.get('use_cma', False),
+            help="Select to apply Chande Moving Average (CMA) to the stock price."
+        )
+        cma_period = len(data['Close'])  # This does not require user input.
+    
     # McGinley Dynamic with tooltip
-    use_mcginley_dynamic = st.sidebar.checkbox(
-        'McGinley Dynamic', 
-        value=st.session_state.get('use_mcginley_dynamic', False),
-        help="Select to apply McGinley Dynamic to the stock price."
-    )
-    mcginley_dynamic_period = st.sidebar.number_input(
-        'McGinley Dynamic Period', 
-        min_value=1, 
-        value=st.session_state.get('mcginley_dynamic_period', 14), 
-        step=1, 
-        disabled=not use_mcginley_dynamic,
-        help="Specify the period (in days) for the McGinley Dynamic."
-    )
+    with st.sidebar.expander("McGinley Dynamic", expanded=False):
+        use_mcginley_dynamic = st.checkbox(
+            'Enable McGinley Dynamic', 
+            value=st.session_state.get('use_mcginley_dynamic', False),
+            help="Select to apply McGinley Dynamic to the stock price."
+        )
+        mcginley_dynamic_period = st.number_input(
+            'McGinley Dynamic Period', 
+            min_value=1, 
+            value=st.session_state.get('mcginley_dynamic_period', 14), 
+            step=1, 
+            disabled=not use_mcginley_dynamic,
+            help="Specify the period (in days) for the McGinley Dynamic."
+        )
+
+    # Filtered Moving Average (FMA) with tooltip
+    with st.sidebar.expander("Filtered Moving Average (FMA)", expanded=False):
+        use_fma = st.checkbox(
+            'Enable FMA', 
+            value=st.session_state.get('use_fma', False),
+            help="Select to apply Filtered Moving Average (FMA) to the stock price."
+        )
+        fma_period = st.number_input(
+            'FMA Period', 
+            min_value=1, 
+            value=st.session_state.get('fma_period', 14), 
+            step=1, 
+            disabled=not use_fma,
+            help="Specify the period (in days) for the FMA."
+        )    
+
 
     # Anchored Moving Average (AMA) with tooltip
     #use_ama = st.sidebar.checkbox(
@@ -1048,20 +1096,6 @@ if 'data' in st.session_state:
     #    help="Select the anchor date for the AMA."
     #)
 
-    # Filtered Moving Average (FMA) with tooltip
-    use_fma = st.sidebar.checkbox(
-        'Filtered Moving Average (FMA)', 
-        value=st.session_state.get('use_fma', False),
-        help="Select to apply Filtered Moving Average (FMA) to the stock price."
-    )
-    fma_period = st.sidebar.number_input(
-        'FMA Period', 
-        min_value=1, 
-        value=st.session_state.get('fma_period', 14), 
-        step=1, 
-        disabled=not use_fma,
-        help="Specify the period (in days) for the FMA."
-    )
 
     # Grid toggle with tooltip
     show_grid = st.sidebar.checkbox(
@@ -1389,7 +1423,6 @@ st.markdown(
 )
 
 
-
 hide_streamlit_style = """
 <style>
 #MainMenu {visibility: hidden;}