[UX] address user feedback: per-year template text and column header, more visible "Add resource" button, fixed next-tab navigation on all pages, updated method constraints intro text

app.py

@@ -60,22 +60,33 @@ load_css(css_path)
 
 st.markdown('<h1 class="custom-title">CRRA <span class="crra-hl-toolkit">Toolkit</span>: CDR Portfolio Optimization</h1>', unsafe_allow_html=True)
 
+_NAV_OPTIONS = [
+    "Welcome",
+    "Resource inputs",
+    "Method constraints",
+    "Resource coefficients",
+    "Portfolio generation",
+    "Sensitivity analysis",
+    "Scenario comparison",
+]
+
+_nav_target = st.session_state.pop("_navigate_to", None)
+if _nav_target and _nav_target in _NAV_OPTIONS:
+    st.session_state["_menu_default_idx"] = _NAV_OPTIONS.index(_nav_target)
+    st.session_state["_menu_ver"] = st.session_state.get("_menu_ver", 0) + 1
+    st.session_state["_scroll_ver"] = st.session_state["_menu_ver"]
+
+_menu_default_idx = st.session_state.get("_menu_default_idx", 0)
+_menu_ver = st.session_state.get("_menu_ver", 0)
+
 with st.sidebar:
     selected = option_menu(
         "Navigation",
-        options=[
-            "Welcome",
-            "Resource inputs",
-            "Method constraints",
-            "Resource coefficients",
-            "Portfolio generation",
-            "Sensitivity analysis",
-            "Scenario comparison",
-        ],
+        options=_NAV_OPTIONS,
         icons=["house", "upload", "gear", "sliders", "graph-up-arrow", "card-checklist", "search"],
-        default_index=0,
+        default_index=_menu_default_idx,
         orientation="vertical",
-        key="crra-menu",
+        key=f"crra-menu-{_menu_ver}",
         styles={
             "container":{
                 "border-radius":"0px",
@@ -102,6 +113,9 @@ with st.sidebar:
             },
         }
     )
+    # Track sidebar clicks so the next "Next" button starts from the right index
+    if selected in _NAV_OPTIONS:
+        st.session_state["_menu_default_idx"] = _NAV_OPTIONS.index(selected)
 
 cost_sliders = load_slider_data()
 
@@ -170,6 +184,20 @@ if selected == "Method constraints" and _prev_tab != "Method constraints":
     st.session_state["constraints_just_loaded"] = True
 st.session_state["_active_tab"] = selected
 
+_scroll_ver = st.session_state.pop("_scroll_ver", None)
+if _scroll_ver is not None:
+    st.html(f"""<script>
+(function scroll{_scroll_ver}() {{
+    var doScroll = function() {{
+        try {{ window.parent.scrollTo(0, 0); }} catch(e) {{}}
+        window.scrollTo(0, 0);
+        document.documentElement.scrollTop = 0;
+        document.body.scrollTop = 0;
+    }};
+    setTimeout(doScroll, 80);
+}})();
+</script>""")
+
 if selected == "Welcome":
     tab0_welcome.render_tab()
 elif selected == "Resource inputs":

assets/styles.css

@@ -343,6 +343,54 @@ h1.custom-title {
     color: var(--green-dark);
 }
 
+/* Fixed "Next tab" navigation button */
+[class*="st-key-btn-nav-next"] {
+    position: fixed;
+    bottom: 1.5rem;
+    right: 2rem;
+    z-index: 999;
+}
+[class*="st-key-btn-nav-next"] button {
+    background: var(--green-dark) !important;
+    color: var(--white) !important;
+    clip-path: none !important;
+    border-radius: 6px !important;
+    border: none !important;
+    box-shadow: 0 2px 10px rgba(0,0,0,0.25) !important;
+    height: auto !important;
+    padding: 0.55rem 1.2rem !important;
+    font-weight: 700 !important;
+    font-size: clamp(12px, 0.8vw, 15px) !important;
+    letter-spacing: 0.06em !important;
+    text-transform: uppercase !important;
+    transition: background 0.2s ease, box-shadow 0.2s ease !important;
+}
+[class*="st-key-btn-nav-next"] button:hover {
+    background: #01740f !important;
+    box-shadow: 0 4px 14px rgba(0,0,0,0.35) !important;
+}
+
+/* Add resource — green-light background */
+[class*="btn-add-resource-"] button {
+    border: none !important;
+    border-radius: 0px;
+    color: var(--green-dark);
+    background: var(--green-light);
+    height: var(--btn-height);
+    padding: var(--btn-padding);
+    clip-path: var(--btn-clip);
+    transition: background 0.25s ease;
+}
+[class*="btn-add-resource-"] button p {
+    font-weight: 700 !important;
+    font-size: var(--btn-fs);
+    letter-spacing: 0.094444em;
+    text-transform: uppercase;
+}
+[class*="btn-add-resource-"] button:hover {
+    background: var(--green);
+}
+
 /* Simple text button */
 [class*="simple-btn-"] button {
     color: var(--red);

data/generate_resource_template.py

@@ -19,7 +19,7 @@ resource_to_unit = {
 # resource_caps
 ws1 = wb.active
 ws1.title = "resource_caps"
-ws1.append(["Resource", "Unit", "Available Amount"])
+ws1.append(["Resource", "Unit (per year)", "Available Amount"])
 ws1["A1"].font = Font(bold=True)
 ws1["B1"].font = Font(bold=True)
 ws1["C1"].font = Font(bold=True)

tabs/tab0_welcome.py

@@ -51,5 +51,8 @@ def render_tab():
 
     <p class="wt-cta"><span class="crra-hl">Let’s get started!</span> Use the side tabs to navigate through the sections.</p>
     </div>
-    <div style="height: 4rem;"></div>
-    """, unsafe_allow_html=True)
+    """, unsafe_allow_html=True)
+
+    if st.button("Resource inputs →", key="btn-nav-next-welcome", type="primary", help="Start by setting the resources available for your CRRA."):
+        st.session_state["_navigate_to"] = "Resource inputs"
+        st.rerun()

tabs/tab1_inputs.py

@@ -443,8 +443,7 @@ def dialog_load_standard_resources():
         None
     """
     st.markdown(
-        '<p class="caption">Upload an Excel file with "Resource" and "Available Amount" '
-        "columns — either the blank template or a previous export of your current values.</p>",
+        '<p class="caption">Upload an Excel file: either the blank template or a previous export of your current values.</p>',
         unsafe_allow_html=True,
     )
 
@@ -468,7 +467,7 @@ def dialog_load_standard_resources():
     ]
     st.dataframe(pd.DataFrame(preview_rows), width='stretch', hide_index=True)
 
-    if st.button("↩️ Import values", type="primary", width='stretch'):
+    if st.button("Import values", type="primary", width='stretch', icon=":material/check:"):
         for r in st.session_state.resource_caps:
             st.session_state.resource_caps[r] = 0.0
             st.session_state[f"cap_{r}"] = 0.0
@@ -487,7 +486,7 @@ def dialog_load_standard_resources():
         for key in ["excel_loaded_file", "scenario_name_suggestion",
                     "scenario_loaded_file", "input_file_name_suggestion", "latest_result"]:
             st.session_state.pop(key, None)
-        st.success("Resource values imported successfully.", icon="✅")
+        st.success("Resource values imported successfully.", icon=":material/check:")
         st.rerun()
 
 
@@ -779,8 +778,10 @@ def render_tab(cost_sliders):
 
     st.markdown('<p class="crra-sub-sub-heading">Import resource values</p>', unsafe_allow_html=True)
     st.markdown(
-        "<p class='caption'>Load standard resource availabilities from an Excel file, "
-        "or download the current values.</p>",
+        "<p class='caption'>You can use the template below to fill in your resource availability values "
+        "for a given year and import them directly into the tool."
+        "<br>"
+        "You can also re-import a file previously downloaded from this section.</p>",
         unsafe_allow_html=True,
     )
     
@@ -797,7 +798,7 @@ def render_tab(cost_sliders):
         if st.button("Load from Excel", type="tertiary", icon=":material/arrow_upload_progress:", key="btn-load-resources"):
             dialog_load_standard_resources()
     if st.session_state.get("resource_last_loaded_file"):
-        st.success(f"Loaded: **{st.session_state['resource_last_loaded_file']}**", icon="✅")
+        st.success(f"Loaded: **{st.session_state['resource_last_loaded_file']}**", icon=":material/check:")
 
     # Standard resource inputs
     st.markdown('<p class="crra-sub-heading">Set available resources for one year</p>', unsafe_allow_html=True)
@@ -841,8 +842,8 @@ def render_tab(cost_sliders):
             _, col_button = st.columns([3,1])
             with col_button:
                 if st.button(
-                    "Add resource", key=f"simple-btn-resource-{group}",
-                    type="tertiary", icon=":material/add:", width='stretch'
+                    "Add resource", key=f"btn-add-resource-{group}",
+                    type="secondary", icon=":material/add:", width='stretch'
                 ):
                     dialog_add_custom_resource(cost_sliders, preset_resources=rlist)
 
@@ -873,4 +874,8 @@ def render_tab(cost_sliders):
 
     panel_custom_resources_controls(cost_sliders)
 
-    render_resource_summary()
+    render_resource_summary()
+
+    if st.button("Method constraints →", key="btn-nav-next-inputs", type="primary", help="Configure which CDR methods are active and set their constraints."):
+        st.session_state["_navigate_to"] = "Method constraints"
+        st.rerun()

tabs/tab2_constraints.py

@@ -548,7 +548,7 @@ def render_tab(cost_sliders):
         """
         <div class="text_with_border">
             <p>
-            This section lets you <strong>control which CDR methods are included in or excluded from the optimization</strong> according to the specific context of the studied country.<br>
+            This section lets you <strong>control which CDR methods are included or excluded from the optimization</strong> according to the specific context of the studied country.<br>
             For example, you can switch off marine CDR methods for those country with no access to the seas. Some countries may also have legal or tacit bans on specific CDR methods.<br><br>
             For the included methods, you can also set a <strong>maximum deployment cap</strong> per method, by <strong>% of its total potential</strong> or by an <strong>absolute value</strong> in {CO2_UNIT}/yr. Use this parameter in situations where the resources are largely available in the country but other parameters will hinder the deployment, for example low maturity CDR methods, slow deployment of CO2 transport infrastructure, documented low adoption rates...
             </p>
@@ -611,4 +611,8 @@ def render_tab(cost_sliders):
                     render_method(m, cols, col_idx, cost_sliders_norm)
                     col_idx += 1
 
-    render_constraints_summary()
+    render_constraints_summary()
+
+    if st.button("Resource coefficients →", key="btn-nav-next-constraints", type="primary", help="Optional: adjust resource efficiency coefficients per method."):
+        st.session_state["_navigate_to"] = "Resource coefficients"
+        st.rerun()

tabs/tab3_coefficients.py

@@ -512,4 +512,9 @@ def render_tab(cost_sliders):
         enabled_methods=enabled_methods,
         custom_resource_names=custom_resource_names,
         custom_resource_to_sub_group=custom_resource_to_sub_group,
-    )
+    )
+
+
+    if st.button("Portfolio generation →", key="btn-nav-next-coefficients", type="primary", help="Run the optimization and generate your CDR portfolio."):
+        st.session_state["_navigate_to"] = "Portfolio generation"
+        st.rerun()

tabs/tab4_optimization.py

@@ -1472,4 +1472,9 @@ def render_tab():
         render_export_tab(latest)
 
     with tab_reset:
-        reset_scenario("reset")
+        reset_scenario("reset")
+
+    st.markdown("---")
+    if st.button("Sensitivity analysis →", key="btn-nav-next-optimization", type="primary", help="Explore how resource or method changes affect your portfolio."):
+        st.session_state["_navigate_to"] = "Sensitivity analysis"
+        st.rerun()

tabs/tab5_sensitivity.py

@@ -280,4 +280,8 @@ def render_tab():
         panel_resource_sensitivity(baseline_removed, all_resources, resource_to_unit)
 
     with tab2:
-        panel_method_sensitivity(baseline_removed)
+        panel_method_sensitivity(baseline_removed)
+
+    if st.button("Scenario comparison →", key="btn-nav-next-sensitivity", type="primary", help="Compare multiple saved scenarios side by side."):
+        st.session_state["_navigate_to"] = "Scenario comparison"
+        st.rerun()

tabs/tab6_scenarios.py

@@ -175,7 +175,7 @@ def render_tab():
     panel_load_scenario()
 
     if not st.session_state.scenarios:
-        st.info("No scenarios saved yet. Run an optimization in **Portfolio generation** tab or load a file above.", icon=":material/info:")
+        st.info("No scenarios saved yet. Run an optimization in **Portfolio generation** tab and **save the scenario** or load a file above.", icon=":material/info:")
         return
 
     # Select & manage scenarios

utils/data_utils.py

@@ -392,7 +392,7 @@ def resource_caps_to_excel_bytes(resource_caps: dict) -> bytes:
     rows = [
         {
             "Resource": r,
-            "Unit": resource_to_unit.get(r, ""),
+            "Unit (per year)": resource_to_unit.get(r, ""),
             "Available Amount": float(amount),
         }
         for r, amount in resource_caps.items()