Updated interface, benchmark option added (**MUST EDIT OTHER FILES FOR FULL CHANGES TO TAKE EFFECT**)

Updated interface and added benchmark option - must update passing of variables in other arguments in other python files for this change to take full effect

app.py

@@ -57,23 +57,50 @@ def get_choices():
         An object of choices and an object of combined dataframes.
     """
     choices = {}
+    tab1, tab2, tab3, tab4, tab5 = st.tabs(["Tickers", "Quantity", "Benchmark","Risk Free Return","Risk Aversion"])
 
-    tickers = st.sidebar.text_input('Enter 4 stock symbols.', 'GOOG,A,AA,AMD')
 
-    # Set the weights
-    weights_str = st.sidebar.text_input('Enter The Investment Quantities', '50,30,25,25')
-    # Set Initial Investment
-    investment = st.sidebar.number_input('Enter The Initial Investment', min_value=5000, max_value=25000, value=5000)
 
-    ### koi
-    rf = st.sidebar.number_input('Enter The Current Rate of Risk Free Return', min_value=0.001, max_value=1.00, value=0.041)
+    with tab1:
+
+        tickers = st.text_input('Enter stock tickers.', 'GOOG,A,AVOG,AMD')
+
+    with tab2:
+        # Set the weights
+        weights_str = st.text_input('Enter the investment quantities', '50,30,25,25')
+
+    with tab3:
+        benchmark = st.selectbox(
+            'Select your ideal benchmark of return',
+            ('SP500', 'AOK', 'IXIC'))
+        if benchmark == 'IXIC':
+            st.warning("You have selected a volatile benchmark.")
+        elif benchmark == 'SP500':
+            st.success('You have selected a balanced benchmark')
+        elif benchmark == 'AOK':
+            st.success('You have selected a conservative benchmark')
+
+    with tab4:
+        ### koi
+        rf = st.number_input('Enter current rate of risk free return', min_value=0.001, max_value=1.00, value=0.041)
+
+
     #A_coef_map = 
-    A_coef = st.sidebar.slider('Enter The Coefficient of Risk Aversion', min_value=5, max_value=35, value=30, step=5)
-    st.sidebar.write('Selected: '+ str(A_coef) + ', this coefficient indicates ' + risk_str(A_coef) )
-    ### 
+    with tab5:
+        A_coef = st.slider('Enter The Coefficient of Risk Aversion', min_value=5, max_value=35, value=30, step=5)
+
+        if A_coef > 20:
+            st.success("You have selected a "+ risk_str(A_coef) +" investing style")
+            investing_style = 'Conservative'
+        elif A_coef >10 and A_coef <= 20:
+            st.success("You have selected a "+risk_str(A_coef) +" investing style")
+            investing_style = 'Balanced'
+        elif A_coef <= 10:
+            st.warning("You have selected a "+ risk_str(A_coef) +" investing style")
+            investing_style = 'Risky'
 
     # Every form must have a submit button.
-    submitted = st.sidebar.button("Submit")
+    submitted = st.button("Calculate")
 
     symbols = []
     reset = False
@@ -85,6 +112,9 @@ def get_choices():
     #    reset = st.sidebar.button("RESET APP")
 
     if submitted:
+        with st.spinner('Running the calculations...'):
+            time.sleep(8)
+            st.success('Done!')
         # convert  strings to lists
         tickers_list = tickers.split(",")
         weights_list = weights_str.split(",")
@@ -99,9 +129,9 @@ def get_choices():
 
         if reset:
         #    # Clears all singleton caches:
-            tickers = st.sidebar.selectbox('Enter 11 stock symbols.', ('GOOG','D','AAP','BLK'))
+            #tickers = st.sidebar.selectbox('Enter 11 stock symbols.', ('GOOG','D','AAP','BLK'))
         #    crypto_symbols = st.sidebar.text_input('Enter 2 crypto symbols only as below', 'BTC-USD,ETH-USD')
-            weights_str = st.sidebar.text_input('Enter The Investment Weights', '0.3,0.3 ,0.3')
+            #weights_str = st.sidebar.text_input('Enter The Investment Weights', '0.3,0.3 ,0.3')
 
             st.experimental_singleton.clear()
 
@@ -112,7 +142,8 @@ def get_choices():
 
                 'symbols': symbols,
                 'weights': weights,
-                'investment': investment,
+                'benchmark': benchmark,
+                'investing_style': investing_style,
                 'risk-free-rate': rf,
                 'A-coef': A_coef