Fix deprecation warnings and reorder Strategy cards

- Move Break Even + Margin above Revenue + Cost with spacing
- Remove deprecated use_column_width from all plotly_chart calls
- Fix deprecated use_column_width on sidebar image
- Remove emoji from Portfolio Parameters header

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

app.py

@@ -101,7 +101,7 @@ selected_product = st.sidebar.selectbox(
 config = products[selected_product]
 
 if "image_url" in products[selected_product].get("product", {}):
-    st.sidebar.image(products[selected_product]["product"]["image_url"], use_column_width=True)
+    st.sidebar.image(products[selected_product]["product"]["image_url"], width=None)
 
 st.sidebar.markdown("---")
 st.sidebar.header("View")
@@ -162,7 +162,7 @@ if "strategy_customer_base" not in st.session_state:
 
 # Render sidebar based on selected view
 if selected_view == "Strategy":
-    st.sidebar.header("💼 Portfolio Parameters")
+    st.sidebar.header("Portfolio Parameters")
     st.sidebar.caption("Adjust to see impact on profitability")
 
     st.sidebar.slider(
@@ -376,11 +376,34 @@ if selected_view == "Strategy":
     )
 
     # ============================================================
-    # TIER 1: Revenue + Blended Cost (per product & portfolio)
+    # TIER 1: Break Even + Operating Margin
+    # ============================================================
+    be_display = f"{breakeven_month}" if breakeven_month else "> 120"
+
+    t1_left, t1_right = st.columns(2)
+    with t1_left:
+        st.markdown(f"""
+        <div style="text-align: center; padding: 1.5rem; background: {COLORS['surface']}; border-radius: 10px; border: 1px solid {COLORS['border']};">
+            <p style="color: {COLORS['text_muted']}; margin: 0 0 0.3rem 0; font-size: 0.95rem; font-weight: 700;">Break Even Period</p>
+            <p style="color: {COLORS['primary']}; margin: 0; font-size: 2.2rem; font-weight: 700;">{be_display} <span style="font-size: 1rem; font-weight: 400; color: {COLORS['text_subtle']};">months</span></p>
+        </div>
+        """, unsafe_allow_html=True)
+    with t1_right:
+        st.markdown(f"""
+        <div style="text-align: center; padding: 1.5rem; background: {COLORS['surface']}; border-radius: 10px; border: 1px solid {COLORS['border']};">
+            <p style="color: {COLORS['text_muted']}; margin: 0 0 0.3rem 0; font-size: 0.95rem; font-weight: 700;">Operating Margin</p>
+            <p style="color: {COLORS['primary']}; margin: 0; font-size: 2.2rem; font-weight: 700;">{operating_margin_strat:.0f}%</p>
+        </div>
+        """, unsafe_allow_html=True)
+
+    st.markdown('<div style="margin-top: 1.5rem;"></div>', unsafe_allow_html=True)
+
+    # ============================================================
+    # TIER 2: Revenue + Blended Cost (per product & portfolio)
     # ============================================================
     blended_cost_portfolio = portfolio_size * blended_cost_per_product
 
-    # Row 1: Revenue
+    # Row: Revenue
     r1_left, r1_right = st.columns(2)
     with r1_left:
         st.markdown(f"""
@@ -399,7 +422,7 @@ if selected_view == "Strategy":
 
     st.markdown('<div style="margin-top: 0.75rem;"></div>', unsafe_allow_html=True)
 
-    # Row 2: Blended Cost
+    # Row: Blended Cost
     r2_left, r2_right = st.columns(2)
     with r2_left:
         st.markdown(f"""
@@ -418,29 +441,6 @@ if selected_view == "Strategy":
 
     st.markdown(f'<p style="text-align: center; color: {COLORS["text_muted"]}; font-size: 0.95rem; margin-top: 1rem;">Assuming {lease_term_months}-month cycle length.</p>', unsafe_allow_html=True)
 
-    # ============================================================
-    # TIER 2: Break Even + Operating Margin
-    # ============================================================
-    be_display = f"{breakeven_month}" if breakeven_month else "> 120"
-
-    st.markdown('<div style="margin-top: 0.75rem;"></div>', unsafe_allow_html=True)
-
-    t2_left, t2_right = st.columns(2)
-    with t2_left:
-        st.markdown(f"""
-        <div style="text-align: center; padding: 1.5rem; background: {COLORS['surface']}; border-radius: 10px; border: 1px solid {COLORS['border']};">
-            <p style="color: {COLORS['text_muted']}; margin: 0 0 0.3rem 0; font-size: 0.95rem; font-weight: 700;">Break Even Period</p>
-            <p style="color: {COLORS['primary']}; margin: 0; font-size: 2.2rem; font-weight: 700;">{be_display} <span style="font-size: 1rem; font-weight: 400; color: {COLORS['text_subtle']};">months</span></p>
-        </div>
-        """, unsafe_allow_html=True)
-    with t2_right:
-        st.markdown(f"""
-        <div style="text-align: center; padding: 1.5rem; background: {COLORS['surface']}; border-radius: 10px; border: 1px solid {COLORS['border']};">
-            <p style="color: {COLORS['text_muted']}; margin: 0 0 0.3rem 0; font-size: 0.95rem; font-weight: 700;">Operating Margin</p>
-            <p style="color: {COLORS['primary']}; margin: 0; font-size: 2.2rem; font-weight: 700;">{operating_margin_strat:.0f}%</p>
-        </div>
-        """, unsafe_allow_html=True)
-
     st.markdown("---")
 
     # ============================================================
@@ -490,7 +490,7 @@ if selected_view == "Strategy":
             xaxis_title="Months", yaxis_title="Cumulative Profit (NOK)",
             showlegend=False, yaxis=dict(separatethousands=True),
         )
-        st.plotly_chart(fig_be, use_column_width=True)
+        st.plotly_chart(fig_be)
 
     st.markdown("---")
 
@@ -543,7 +543,7 @@ if selected_view == "Strategy":
         yaxis_title="NOK", showlegend=False,
         yaxis=dict(separatethousands=True),
     )
-    st.plotly_chart(fig_rc, use_column_width=True)
+    st.plotly_chart(fig_rc)
 
     mfg_share = s_mfg_cost / reuse_cycles if reuse_cycles > 0 else s_mfg_cost
     st.caption(f"Blended cost breakdown: Mfg share {sfmt(mfg_share)} + logistics {sfmt(logistics_per_cycle)} + repair {sfmt(repair_per_cycle)} = **{sfmt(blended_cost_per_product)} NOK** per product per cycle")
@@ -622,49 +622,13 @@ if selected_view == "Strategy":
                 xaxis_title="Months", yaxis_title="Cumulative Profit (NOK)",
                 showlegend=False, yaxis=dict(separatethousands=True),
             )
-            st.plotly_chart(fig_trajectory, use_column_width=True)
+            st.plotly_chart(fig_trajectory)
 
             final_profit = cumulative_profit[-1]
             st.caption(f"5-year projection with {sfmt(fleet_needed)} unit fleet. Final cumulative profit: **{sfmt(final_profit)} NOK**")
 
         st.markdown("---")
 
-    # ============================================================
-    # Fleet Efficiency: Customers Served vs Products Manufactured
-    # ============================================================
-    st.subheader("Fleet Efficiency: Circular vs Linear")
-
-    cycles_range = list(range(1, reuse_cycles + 1))
-    customers_served = [portfolio_size * c for c in cycles_range]
-    products_manufactured_circular = [portfolio_size] * len(cycles_range)
-    products_manufactured_linear = customers_served  # 1 product per customer
-
-    fig_fleet = go.Figure()
-    fig_fleet.add_trace(go.Scatter(
-        x=cycles_range, y=customers_served, mode="lines+markers",
-        name="Customers Served",
-        line=dict(color=COLORS["primary"], width=3),
-        marker=dict(size=8),
-    ))
-    fig_fleet.add_trace(go.Scatter(
-        x=cycles_range, y=products_manufactured_linear, mode="lines",
-        name="Products Manufactured (Linear)",
-        line=dict(color=COLORS["negative"], width=2, dash="dot"),
-    ))
-    fig_fleet.add_trace(go.Scatter(
-        x=cycles_range, y=products_manufactured_circular, mode="lines",
-        name="Products Manufactured (Circular)",
-        line=dict(color=COLORS["positive"], width=2, dash="dot"),
-    ))
-    fig_fleet.update_layout(
-        xaxis_title="Cycle", yaxis_title="Units",
-        xaxis=dict(dtick=1),
-        yaxis=dict(separatethousands=True, rangemode="tozero"),
-        legend=dict(orientation="h", yanchor="bottom", y=1.02),
-    )
-    st.plotly_chart(fig_fleet, use_column_width=True)
-    savings = customers_served[-1] - portfolio_size
-    st.caption(f"{sfmt(portfolio_size)} products serve **{sfmt(customers_served[-1])} families** over {reuse_cycles} cycles — **{sfmt(savings)} fewer products** manufactured vs linear model.")
 
 # ============================================================
 # VIEW: DESIGN
@@ -705,7 +669,7 @@ elif selected_view == "Design":
     )
     fig_grades.update_traces(texttemplate='%{text:.0f}%', textposition='outside')
     fig_grades.update_layout(showlegend=False, yaxis_title="% of Returns")
-    st.plotly_chart(fig_grades, use_column_width=True)
+    st.plotly_chart(fig_grades)
 
     st.info(f"**Design insight:** Reducing repair rate from {grade_b_pct:.0%} to {max(5, grade_b_pct*100-10):.0f}% would save €{(grade_b_pct - max(0.05, grade_b_pct-0.10)) * refurb_b:.0f} per returned product.")
 
@@ -758,7 +722,7 @@ elif selected_view == "Design":
         yaxis_title="Material Composition (%)", yaxis_range=[0, 120],
         legend=dict(orientation="h", yanchor="bottom", y=1.02),
     )
-    st.plotly_chart(fig_materials, use_column_width=True)
+    st.plotly_chart(fig_materials)
 
     final_original = lifecycle_df.iloc[-1]["Original Material %"]
     final_new = lifecycle_df.iloc[-1]["New Parts Added %"]
@@ -805,7 +769,7 @@ elif selected_view == "Logistics":
         )
         fig_grades.update_traces(texttemplate='%{text:.0f}%', textposition='outside')
         fig_grades.update_layout(showlegend=False, yaxis_title="% of Returns")
-        st.plotly_chart(fig_grades, use_column_width=True)
+        st.plotly_chart(fig_grades)
 
     with grade_col2:
         st.subheader("Cost per Cycle")
@@ -827,7 +791,7 @@ elif selected_view == "Logistics":
         fig_cycle.add_trace(go.Bar(name="Logistics", x=df_cycle_costs["Cycle"], y=df_cycle_costs["Logistics"],
                                    marker_color=COLORS["secondary"], text=[f"€{v:.0f}" for v in df_cycle_costs["Logistics"]], textposition="inside"))
         fig_cycle.update_layout(barmode="stack", yaxis_title="Cost (EUR)", legend=dict(orientation="h", yanchor="bottom", y=1.02))
-        st.plotly_chart(fig_cycle, use_column_width=True)
+        st.plotly_chart(fig_cycle)
 
     st.markdown(f"**Key insight:** Cycle 1 costs **€{new_unit_cost:.0f}**. Cycles 2+ cost **€{refurb_unit_cost:.0f}** ({(1-refurb_unit_cost/new_unit_cost)*100:.0f}% reduction)")
 
@@ -875,7 +839,7 @@ elif selected_view == "Logistics":
         xaxis_title="",
         legend=dict(orientation="h", yanchor="bottom", y=1.02),
     )
-    st.plotly_chart(fig_products, use_column_width=True)
+    st.plotly_chart(fig_products)
 
     final_in_service = lifecycle_df.iloc[-1]["Products in Service"]
     final_lost = lifecycle_df.iloc[-1]["Products Lost"]
@@ -974,7 +938,7 @@ elif selected_view == "Sourcing":
                 totals={"marker": {"color": COLORS["info"]}},
             ))
             fig_waterfall.update_layout(title=f"Manufacturing Cost: €{mfg_cost:.0f}", yaxis_title="EUR", showlegend=False)
-            st.plotly_chart(fig_waterfall, use_column_width=True)
+            st.plotly_chart(fig_waterfall)
 
         with cost_col2:
             st.subheader("Bill of Materials")
@@ -982,7 +946,7 @@ elif selected_view == "Sourcing":
             st.dataframe(mat_df.style.format({
                 "Weight (kg)": "{:.1f}", "Cost/kg": "€{:.2f}",
                 "Total Cost": "€{:.2f}", "Recycled %": "{:.0f}%",
-            }), use_column_width=True, hide_index=True)
+            }), hide_index=True)
 
         # Summary
         recyclable_weight = sum(m["Weight (kg)"] for m in material_data if m["Recyclable"] == "Yes")
@@ -1092,7 +1056,7 @@ elif selected_view == "Market":
     ))
     fig_customer.update_layout(title="Customer Cost vs Retail Price", xaxis_title="Monthly Lease Price (EUR)",
                                yaxis_title="Total Customer Cost (EUR)")
-    st.plotly_chart(fig_customer, use_column_width=True)
+    st.plotly_chart(fig_customer)
 
     if retail_price > 0 and total_lease_cost < retail_price:
         st.success(f"At €{lease_price}/mo, customers **save €{retail_price - total_lease_cost}** ({(retail_price - total_lease_cost)/retail_price*100:.0f}% less than buying)")