Update pages/6_records.py

pages/6_records.py

@@ -4,6 +4,7 @@ import os, sys, json
 from datetime import date
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from auth_token import logout
+from bg_utils import apply_bg
 
 st.set_page_config(page_title="Records | FitPlan Pro", page_icon="🏆",
                    layout="wide", initial_sidebar_state="collapsed")
@@ -16,109 +17,103 @@ data  = st.session_state.user_data
 
 st.markdown("""
 <style>
-@import url('https://fonts.googleapis.com/css2?family=Bebas+Neue&family=Barlow+Condensed:wght@700;800;900&family=DM+Sans:opsz,wght@9..40,400;9..40,600;9..40,700&display=swap');
-
 [data-testid="stAppViewContainer"]::before{
   content:'';position:fixed;inset:0;z-index:0;
   background:url('https://images.unsplash.com/photo-1584735935682-2f2b69dff9d2?fm=jpg&w=1600&q=80&fit=crop') center center/cover no-repeat;
-  filter:blur(8px) brightness(0.22) saturate(0.50);
-  transform:scale(1.06);
-}
+  filter:blur(8px) brightness(0.25) saturate(0.55);transform:scale(1.06);}
 [data-testid="stAppViewContainer"]{
-  background:linear-gradient(160deg,rgba(3,1,0,0.92) 0%,rgba(4,2,0,0.85) 50%,rgba(3,1,0,0.96) 100%)!important;
-  position:relative;
-}
-[data-testid="stAppViewContainer"]>section>div.block-container{
-  position:relative;z-index:2;max-width:1100px!important;margin:0 auto!important;padding:0 24px 80px!important;
-}
-
+  background:linear-gradient(160deg,rgba(3,1,0,0.90) 0%,rgba(4,2,0,0.82) 50%,rgba(3,1,0,0.94) 100%)!important;position:relative;}
+[data-testid="stAppViewContainer"]>section>div.block-container{position:relative;z-index:2;}
+@import url('https://fonts.googleapis.com/css2?family=Bebas+Neue&family=Barlow+Condensed:wght@700;800;900&family=DM+Sans:opsz,wght@9..40,400;9..40,600;9..40,700&display=swap');
 #MainMenu,footer,header,[data-testid="stToolbar"],[data-testid="stDecoration"],
 [data-testid="stSidebarNav"],[data-testid="collapsedControl"],
 section[data-testid="stSidebar"],button[kind="header"]{display:none!important;}
-
 html,body,.stApp{background:#050202!important;color:#fff!important;font-family:'DM Sans',sans-serif!important;}
+[data-testid="stAppViewContainer"]>section>div.block-container{
+  max-width:1100px!important;margin:0 auto!important;padding:0 24px 80px!important;
+  background:rgba(0,0,0,0.35)!important;border-radius:0!important;}
 
-/* ── ALL INPUTS DARK ── */
-.stNumberInput>div>div>input,.stTextInput>div>div>input,
-.stTextArea>div>div>textarea{
-  background:rgba(8,4,2,0.85)!important;border:1.5px solid rgba(229,9,20,0.40)!important;
-  color:#fff!important;border-radius:12px!important;backdrop-filter:blur(20px)!important;
-  box-shadow:0 2px 10px rgba(0,0,0,0.50)!important;font-family:'DM Sans',sans-serif!important;}
-.stNumberInput>div>div>input:focus,.stTextInput>div>div>input:focus{
-  border-color:rgba(229,9,20,0.80)!important;background:rgba(15,6,3,0.95)!important;}
-.stNumberInput [data-testid="stNumberInputStepUp"],
-.stNumberInput [data-testid="stNumberInputStepDown"]{
-  background:rgba(229,9,20,0.30)!important;border:none!important;color:#fff!important;border-radius:8px!important;}
-
-/* ── SELECTBOX DARK ── */
-[data-baseweb="select"]>div{
-  background:rgba(8,4,2,0.85)!important;border:1.5px solid rgba(229,9,20,0.40)!important;
-  border-radius:12px!important;backdrop-filter:blur(20px)!important;color:#fff!important;}
-[data-baseweb="select"] span,[data-baseweb="select"] div{color:#fff!important;}
-[data-baseweb="popover"] [role="option"]{background:rgba(10,6,4,0.96)!important;color:#fff!important;}
-[data-baseweb="popover"] [role="option"]:hover{background:rgba(229,9,20,0.25)!important;}
-
-/* ── WIDGET LABELS ── */
+/* ── LABELS ── */
 [data-testid="stWidgetLabel"],[data-testid="stWidgetLabel"] p{
-  color:#fff!important;font-size:0.90rem!important;font-weight:700!important;
+  color:#fff!important;font-size:1.00rem!important;font-weight:700!important;
   text-shadow:0 2px 8px rgba(0,0,0,0.99)!important;}
 
 /* ── BUTTONS ── */
-[data-testid="stFormSubmitButton"] button,.stFormSubmitButton>button{
+[data-testid="stFormSubmitButton"] button,.stFormSubmitButton>button,button[kind="secondaryFormSubmit"]{
   background:linear-gradient(135deg,#E50914,#c0000c)!important;border:none!important;
   color:#fff!important;border-radius:10px!important;font-weight:700!important;
   box-shadow:0 4px 20px rgba(229,9,20,0.45)!important;text-transform:uppercase!important;}
-.stButton>button{
-  background:linear-gradient(135deg,rgba(229,9,20,0.85),rgba(160,0,10,0.90))!important;
+.stButton>button{background:linear-gradient(135deg,rgba(229,9,20,0.85),rgba(160,0,10,0.90))!important;
   border:2px solid rgba(229,9,20,0.65)!important;color:#fff!important;border-radius:10px!important;
   font-family:'DM Sans',sans-serif!important;font-size:1.0rem!important;font-weight:700!important;
   box-shadow:0 0 12px rgba(229,9,20,0.30)!important;transition:all 0.20s!important;}
 .stButton>button:hover{transform:translateY(-2px)!important;box-shadow:0 0 24px rgba(229,9,20,0.60)!important;}
 
-/* ── TABS ── */
-.stTabs [data-baseweb="tab-list"]{
-  background:rgba(10,5,3,0.82)!important;border-radius:10px!important;
-  padding:4px!important;border:1px solid rgba(229,9,20,0.18)!important;}
-.stTabs [data-baseweb="tab"]{
-  background:transparent!important;color:rgba(255,255,255,0.90)!important;
-  border-radius:7px!important;font-size:0.95rem!important;font-weight:700!important;
-  border:none!important;padding:9px 16px!important;
-  text-shadow:0 2px 6px rgba(0,0,0,0.95)!important;}
-.stTabs [aria-selected="true"]{
-  background:linear-gradient(135deg,#E50914,#c0000c)!important;
-  color:#fff!important;box-shadow:0 3px 12px rgba(229,9,20,0.40)!important;}
+/* ── FIX: DARK INPUTS — kills white boxes completely ── */
+.stNumberInput>div>div>input,.stTextInput>div>div>input,.stTextArea>div>div>textarea{
+  background:rgba(8,4,2,0.90)!important;border:1.5px solid rgba(229,9,20,0.45)!important;
+  color:#fff!important;border-radius:12px!important;backdrop-filter:blur(28px)!important;
+  box-shadow:0 2px 10px rgba(0,0,0,0.60)!important;font-family:'DM Sans',sans-serif!important;}
+.stNumberInput>div>div>input:focus,.stTextInput>div>div>input:focus{
+  border-color:rgba(229,9,20,0.85)!important;background:rgba(15,5,2,0.96)!important;}
+.stNumberInput [data-testid="stNumberInputStepUp"],
+.stNumberInput [data-testid="stNumberInputStepDown"]{
+  background:rgba(229,9,20,0.28)!important;border:none!important;color:#fff!important;border-radius:8px!important;}
 
-/* ── EXPANDERS DARK ── */
-.stExpander{
-  background:rgba(8,4,2,0.82)!important;border:1.5px solid rgba(229,9,20,0.25)!important;
-  border-radius:14px!important;backdrop-filter:blur(20px)!important;}
-.stExpander details summary{
-  color:#fff!important;font-weight:700!important;font-size:1.00rem!important;
-  text-shadow:0 2px 6px rgba(0,0,0,0.95)!important;}
+/* ── FIX: DARK SELECTBOX ── */
+[data-baseweb="select"]>div{background:rgba(8,4,2,0.90)!important;
+  border:1.5px solid rgba(229,9,20,0.40)!important;border-radius:12px!important;
+  backdrop-filter:blur(28px)!important;color:#fff!important;}
+[data-baseweb="select"] span{color:#fff!important;}
+[data-baseweb="popover"] [role="option"]{background:rgba(10,6,4,0.96)!important;color:#fff!important;}
+[data-baseweb="popover"] [role="option"]:hover{background:rgba(229,9,20,0.25)!important;}
+
+/* ── FIX: TRANSPARENT FORM ── */
+[data-testid="stForm"]{background:transparent!important;border:none!important;}
 
 /* ── NAV BUTTONS ── */
 div[data-testid="stHorizontalBlock"]:first-of-type div[data-testid="stButton"]>button{
   background:rgba(18,4,4,0.82)!important;border:2px solid rgba(229,9,20,0.65)!important;
   color:rgba(255,255,255,0.92)!important;border-radius:9px!important;
-  font-size:0.85rem!important;font-weight:700!important;height:32px!important;
-  min-height:32px!important;white-space:nowrap!important;}
+  font-size:0.85rem!important;font-weight:700!important;padding:5px 8px!important;
+  height:32px!important;min-height:32px!important;white-space:nowrap!important;}
 div[data-testid="stHorizontalBlock"]:first-of-type div[data-testid="stButton"]>button:hover{
   background:rgba(229,9,20,0.28)!important;border-color:rgba(229,9,20,0.85)!important;color:#fff!important;}
 div[data-testid="stHorizontalBlock"]:first-of-type div[data-testid="stButton"]:last-child>button{
-  background:linear-gradient(135deg,#c0000c,#8b0000)!important;}
+  background:linear-gradient(135deg,#c0000c,#8b0000)!important;border-color:rgba(229,9,20,0.80)!important;}
+
+/* ── TABS ── */
+.stTabs [data-baseweb="tab-list"]{background:rgba(8,4,2,0.88)!important;
+  border-radius:10px!important;padding:4px!important;border:1px solid rgba(229,9,20,0.18)!important;}
+.stTabs [data-baseweb="tab"]{background:transparent!important;color:rgba(255,255,255,0.90)!important;
+  border-radius:7px!important;font-size:0.95rem!important;font-weight:700!important;
+  border:none!important;padding:9px 16px!important;text-shadow:0 2px 6px rgba(0,0,0,0.95)!important;}
+.stTabs [aria-selected="true"]{background:linear-gradient(135deg,#E50914,#c0000c)!important;
+  color:#fff!important;box-shadow:0 3px 12px rgba(229,9,20,0.40)!important;}
+
+/* ── EXPANDERS DARK ── */
+.stExpander{background:rgba(8,4,2,0.82)!important;
+  border:1.5px solid rgba(229,9,20,0.22)!important;border-radius:14px!important;}
+.stExpander details summary{color:#fff!important;font-weight:700!important;
+  font-size:1.00rem!important;text-shadow:0 2px 6px rgba(0,0,0,0.95)!important;}
 
-/* ── GLOBAL TEXT ── */
-html,body,.stApp,.stMarkdown,p,div,span,label{text-shadow:0 2px 6px rgba(0,0,0,0.98)!important;}
-.stMarkdown p,.stMarkdown li{color:#fff!important;font-size:1.05rem!important;line-height:1.75!important;}
 .nav-logo{font-family:'Bebas Neue',sans-serif;font-size:1.4rem;letter-spacing:5px;
   color:#E50914;text-shadow:0 0 18px rgba(229,9,20,0.45);line-height:1;}
 
-/* ── WEIGHT LOG INPUT FIX ── */
-[data-testid="stForm"] {background:transparent!important;border:none!important;}
+/* ── GLOBAL VISIBILITY ── */
+html,body,.stApp,.stMarkdown,p,div,span,label{text-shadow:0 2px 6px rgba(0,0,0,0.98)!important;}
+.stCheckbox>label,.stCheckbox>label p{color:#fff!important;font-weight:700!important;font-size:1.05rem!important;}
+.stMarkdown p,.stMarkdown li{color:#fff!important;font-size:1.05rem!important;line-height:1.75!important;}
+.g-panel{background:rgba(8,4,2,0.88)!important;backdrop-filter:blur(32px)!important;}
 </style>
 """, unsafe_allow_html=True)
 
-# ── NAV ──────────────────────────────────────────────────────────────────────
+apply_bg(
+    "https://images.unsplash.com/photo-1584735935682-2f2b69dff9d2?fm=jpg&w=1600&q=80&fit=crop",
+    overlay="rgba(8,5,3,0.78)"
+)
+
+# ── NAV ───────────────────────────────────────────────────────────────────────
 st.markdown("<div style='background:rgba(5,2,1,0.97);backdrop-filter:blur(20px);"
             "border-bottom:1.5px solid rgba(229,9,20,0.22);padding:5px 0;margin-bottom:16px'>",
             unsafe_allow_html=True)
@@ -152,7 +147,7 @@ with _n[7]:
         st.switch_page("app.py")
 st.markdown("</div>", unsafe_allow_html=True)
 
-# ── HERO ─────────────────────────────────────────────────────────────────────
+# ── HERO ──────────────────────────────────────────────────────────────────────
 st.markdown("""
 <div style='background:linear-gradient(135deg,rgba(251,191,36,0.15),rgba(217,149,0,0.08) 40%,rgba(6,4,1,0.70));
   border:1px solid rgba(251,191,36,0.30);border-radius:18px;padding:28px 36px;margin-bottom:24px;
@@ -162,7 +157,7 @@ st.markdown("""
   <div style='font-family:Bebas Neue,sans-serif;font-size:2.4rem;font-weight:900;
     text-transform:uppercase;color:#fff;line-height:1;margin-bottom:6px'>
     Personal <span style='color:#fbbf24'>Records</span></div>
-  <div style='font-size:1.00rem;color:rgba(255,255,255,0.80)'>
+  <div style='font-size:1.00rem;color:rgba(255,255,255,0.70)'>
     Track your PRs, body measurements, and progress over time</div>
 </div>
 """, unsafe_allow_html=True)
@@ -170,232 +165,9 @@ st.markdown("""
 tab1, tab2, tab3, tab4 = st.tabs(["🏆 Personal Records","📏 Body Measurements","📐 1RM Calculator","🎖️ Achievements"])
 
 # ══════════════════════════════════════════════════════════════════════════════
-# TAB 1: PERSONAL RECORDS + WEIGHT LOG CHART (FIXED)
+# TAB 1: PERSONAL RECORDS
 # ══════════════════════════════════════════════════════════════════════════════
 with tab1:
-    # ── Weight Log ───────────────────────────────────────────────────────────
-    st.markdown(
-        "<div style='font-size:0.75rem;font-weight:700;letter-spacing:3px;text-transform:uppercase;"
-        "color:rgba(229,9,20,0.85);margin-bottom:10px;display:flex;align-items:center;gap:8px'>"
-        "<span style='width:16px;height:1.5px;background:#E50914;display:block'></span>"
-        "⚖️ Weight Log</div>",
-        unsafe_allow_html=True
-    )
-
-    if "weight_log" not in st.session_state:
-        st.session_state.weight_log = []
-    if not st.session_state.get("_wl_loaded"):
-        try:
-            from utils.db import get_weight_log as _gwl
-            _wl = _gwl(uname)
-            if _wl: st.session_state.weight_log = _wl
-        except Exception: pass
-        st.session_state._wl_loaded = True
-
-    weight_log = st.session_state.weight_log
-
-    wl_col1, wl_col2 = st.columns([1, 2])
-    with wl_col1:
-        with st.form("weight_log_form"):
-            st.markdown(
-                "<div style='font-size:0.80rem;font-weight:700;letter-spacing:2px;"
-                "text-transform:uppercase;color:rgba(255,255,255,0.70);margin-bottom:6px'>"
-                "Today's weight (kg)</div>",
-                unsafe_allow_html=True
-            )
-            wl_val = st.number_input("Weight (kg)", min_value=20.0, max_value=300.0,
-                                      value=float(data.get("weight", 70)),
-                                      step=0.1, label_visibility="collapsed", key="wl_input")
-            if st.form_submit_button("📈 Log Weight", use_container_width=True):
-                entry = {"date": date.today().isoformat(), "weight": wl_val}
-                # Avoid duplicate same-day entries — update if exists
-                existing_dates = [e["date"] for e in weight_log]
-                if entry["date"] in existing_dates:
-                    for e in weight_log:
-                        if e["date"] == entry["date"]:
-                            e["weight"] = wl_val
-                else:
-                    weight_log.append(entry)
-                weight_log.sort(key=lambda x: x["date"])
-                st.session_state.weight_log = weight_log
-                try:
-                    from utils.db import save_weight_log as _swl
-                    _swl(uname, weight_log)
-                except Exception: pass
-                st.success("Weight logged: " + str(wl_val) + " kg")
-                st.rerun()
-
-        # Stats
-        if weight_log:
-            start_w = weight_log[0]["weight"]
-            curr_w  = weight_log[-1]["weight"]
-            delta_w = round(curr_w - start_w, 1)
-            d_col   = "#22c55e" if delta_w <= 0 else "#ef4444"
-            d_sym   = "▼" if delta_w <= 0 else "▲"
-            st.markdown(
-                f"<div style='background:rgba(8,4,2,0.85);border:1.5px solid rgba(229,9,20,0.30);"
-                f"border-radius:14px;padding:14px 18px;margin-top:10px'>"
-                f"<div style='display:grid;grid-template-columns:1fr 1fr;gap:10px'>"
-                f"<div style='text-align:center'>"
-                f"<div style='font-size:0.65rem;letter-spacing:2px;text-transform:uppercase;"
-                f"color:rgba(255,255,255,0.50)'>Start</div>"
-                f"<div style='font-family:Bebas Neue,sans-serif;font-size:1.6rem;color:#fff'>{start_w}kg</div>"
-                f"</div>"
-                f"<div style='text-align:center'>"
-                f"<div style='font-size:0.65rem;letter-spacing:2px;text-transform:uppercase;"
-                f"color:rgba(255,255,255,0.50)'>Current</div>"
-                f"<div style='font-family:Bebas Neue,sans-serif;font-size:1.6rem;color:#fff'>{curr_w}kg</div>"
-                f"</div>"
-                f"</div>"
-                f"<div style='text-align:center;margin-top:10px;padding-top:10px;"
-                f"border-top:1px solid rgba(255,255,255,0.08)'>"
-                f"<div style='font-size:0.65rem;letter-spacing:2px;text-transform:uppercase;"
-                f"color:rgba(255,255,255,0.50)'>Total Change</div>"
-                f"<div style='font-family:Bebas Neue,sans-serif;font-size:2rem;color:{d_col}'>"
-                f"{d_sym} {abs(delta_w)}kg</div>"
-                f"<div style='font-size:0.70rem;color:rgba(255,255,255,0.45);margin-top:2px'>"
-                f"{len(weight_log)} entries logged</div>"
-                f"</div></div>",
-                unsafe_allow_html=True
-            )
-
-    with wl_col2:
-        if len(weight_log) >= 2:
-            vals  = [e["weight"] for e in weight_log[-20:]]
-            dates = [e["date"][5:] for e in weight_log[-20:]]  # MM-DD
-            N     = len(vals)
-            mn    = min(vals) - 1
-            mx    = max(vals) + 1
-            W, H  = 400, 160
-            pad_l, pad_r, pad_t, pad_b = 40, 10, 15, 30
-
-            def _px(i, v):
-                x = pad_l + i * ((W - pad_l - pad_r) / max(N-1, 1))
-                y = pad_t + ((mx - v) / (mx - mn)) * (H - pad_t - pad_b)
-                return round(x, 1), round(y, 1)
-
-            # Grid lines
-            grid_lines = ""
-            for gi in range(4):
-                gy = pad_t + gi * ((H - pad_t - pad_b) / 3)
-                gv = round(mx - gi * ((mx - mn) / 3), 1)
-                grid_lines += (
-                    f"<line x1='{pad_l}' y1='{round(gy,1)}' x2='{W-pad_r}' y2='{round(gy,1)}' "
-                    f"stroke='rgba(255,255,255,0.06)' stroke-width='1'/>"
-                    f"<text x='{pad_l-4}' y='{round(gy+4,1)}' fill='rgba(255,255,255,0.40)' "
-                    f"font-size='8' text-anchor='end'>{gv}</text>"
-                )
-
-            # Area fill
-            area_pts = " ".join(f"{_px(i,v)[0]},{_px(i,v)[1]}" for i,v in enumerate(vals))
-            first_x, first_y = _px(0, vals[0])
-            last_x,  last_y  = _px(N-1, vals[-1])
-            area_path = (
-                f"M {first_x},{H-pad_b} "
-                f"L {area_pts.split()[0].split(',')[0]},{area_pts.split()[0].split(',')[1]} "
-            )
-            for pt in area_pts.split():
-                area_path += f"L {pt} "
-            area_path += f"L {last_x},{H-pad_b} Z"
-
-            # Line
-            line_pts = " ".join(f"{_px(i,v)[0]},{_px(i,v)[1]}" for i,v in enumerate(vals))
-
-            # Dots + labels for first, last, min, max
-            min_i = vals.index(min(vals))
-            max_i = vals.index(max(vals))
-            dots_html = ""
-            for i, v in enumerate(vals):
-                x, y = _px(i, v)
-                is_special = i in [0, N-1, min_i, max_i]
-                r     = 5 if is_special else 3
-                color = "#22c55e" if v == min(vals) else ("#ef4444" if v == max(vals) else "#E50914")
-                dots_html += f"<circle cx='{x}' cy='{y}' r='{r}' fill='{color}' stroke='rgba(0,0,0,0.5)' stroke-width='1.5'/>"
-                if is_special:
-                    label_y = y - 8 if y > 30 else y + 16
-                    dots_html += (
-                        f"<text x='{x}' y='{label_y}' fill='#fff' font-size='8' "
-                        f"text-anchor='middle' font-weight='bold'>{v}kg</text>"
-                    )
-
-            # Date labels
-            date_labels = ""
-            step = max(1, N // 4)
-            for i in range(0, N, step):
-                x, _ = _px(i, vals[i])
-                date_labels += (
-                    f"<text x='{x}' y='{H-4}' fill='rgba(255,255,255,0.45)' "
-                    f"font-size='7' text-anchor='middle'>{dates[i]}</text>"
-                )
-
-            # Trend line
-            avg_x = sum(range(N)) / N
-            avg_y = sum(vals) / N
-            num   = sum((i - avg_x) * (vals[i] - avg_y) for i in range(N))
-            den   = sum((i - avg_x)**2 for i in range(N)) or 1
-            slope = num / den
-            t_x1, t_y1 = _px(0, vals[0] + 0 * slope - slope * 0)
-            t_yn1 = avg_y + slope * (0 - avg_x)
-            t_yN1 = avg_y + slope * (N-1 - avg_x)
-            tx1, ty1 = _px(0, t_yn1)
-            txN, tyN = _px(N-1, t_yN1)
-            trend_color = "#22c55e" if slope <= 0 else "#ef4444"
-
-            st.markdown(
-                f"<div style='background:rgba(8,4,2,0.88);border:1.5px solid rgba(229,9,20,0.28);"
-                f"border-radius:16px;padding:16px 20px;backdrop-filter:blur(20px)'>"
-                f"<div style='font-size:0.75rem;font-weight:700;letter-spacing:2px;text-transform:uppercase;"
-                f"color:rgba(229,9,20,0.85);margin-bottom:12px'>📈 Weight Progress — Last {N} Entries</div>"
-                f"<svg viewBox='0 0 {W} {H}' style='width:100%;height:{H}px'>"
-                f"{grid_lines}"
-                f"<defs><linearGradient id='wGrad' x1='0' y1='0' x2='0' y2='1'>"
-                f"<stop offset='0%' stop-color='#E50914' stop-opacity='0.35'/>"
-                f"<stop offset='100%' stop-color='#E50914' stop-opacity='0.02'/>"
-                f"</linearGradient></defs>"
-                f"<path d='{area_path}' fill='url(#wGrad)'/>"
-                f"<polyline points='{line_pts}' fill='none' stroke='#E50914' stroke-width='2.5' "
-                f"stroke-linecap='round' stroke-linejoin='round'/>"
-                f"<line x1='{tx1}' y1='{ty1}' x2='{txN}' y2='{tyN}' "
-                f"stroke='{trend_color}' stroke-width='1.5' stroke-dasharray='4,3' opacity='0.7'/>"
-                f"{dots_html}"
-                f"{date_labels}"
-                f"</svg>"
-                f"<div style='display:flex;gap:16px;margin-top:8px;font-size:0.72rem;"
-                f"color:rgba(255,255,255,0.50)'>"
-                f"<span style='display:flex;align-items:center;gap:4px'>"
-                f"<span style='width:12px;height:2px;background:#E50914;display:block'></span>Weight</span>"
-                f"<span style='display:flex;align-items:center;gap:4px'>"
-                f"<span style='width:12px;height:1px;background:{trend_color};display:block;border-top:1px dashed {trend_color}'></span>Trend</span>"
-                f"<span style='color:#22c55e'>● Low</span>"
-                f"<span style='color:#ef4444'>● High</span>"
-                f"</div></div>",
-                unsafe_allow_html=True
-            )
-        elif len(weight_log) == 1:
-            st.markdown(
-                "<div style='background:rgba(8,4,2,0.82);border:1.5px solid rgba(229,9,20,0.22);"
-                "border-radius:14px;padding:24px;text-align:center;color:rgba(255,255,255,0.60);font-size:0.90rem'>"
-                "Log at least 2 entries to see your weight chart 📈</div>",
-                unsafe_allow_html=True
-            )
-        else:
-            st.markdown(
-                "<div style='background:rgba(8,4,2,0.82);border:1.5px solid rgba(229,9,20,0.22);"
-                "border-radius:14px;padding:40px;text-align:center'>"
-                "<div style='font-size:2.5rem;margin-bottom:10px'>⚖️</div>"
-                "<div style='font-size:0.90rem;color:rgba(255,255,255,0.60)'>No weight entries yet.<br>Log your first one!</div>"
-                "</div>",
-                unsafe_allow_html=True
-            )
-
-    st.markdown("<div style='height:20px'></div>", unsafe_allow_html=True)
-    st.markdown(
-        "<div style='height:1px;background:linear-gradient(90deg,transparent,rgba(229,9,20,0.35),transparent);"
-        "margin:8px 0 20px'></div>",
-        unsafe_allow_html=True
-    )
-
-    # ── Personal Records ─────────────────────────────────────────────────────
     PRESET_EXERCISES = ["Bench Press","Squat","Deadlift","Overhead Press","Pull-ups",
         "Push-ups","Barbell Row","Dumbbell Curl","Tricep Dip","Leg Press",
         "Lat Pulldown","Cable Row","Plank (seconds)","Running 1km (seconds)","Custom"]
@@ -417,9 +189,8 @@ with tab1:
         "<div style='font-size:0.75rem;font-weight:700;letter-spacing:3px;text-transform:uppercase;"
         "color:rgba(229,9,20,0.85);margin-bottom:10px;display:flex;align-items:center;gap:8px'>"
         "<span style='width:16px;height:1.5px;background:#E50914;display:block'></span>"
-        "🏅 Log New PR</div>",
-        unsafe_allow_html=True
-    )
+        "Log New PR</div>", unsafe_allow_html=True)
+
     with st.form("pr_form"):
         fc1,fc2,fc3,fc4 = st.columns([3,2,2,1])
         with fc1: ex_choice  = st.selectbox("Exercise", PRESET_EXERCISES, key="pr_ex")
@@ -444,8 +215,8 @@ with tab1:
         st.markdown(
             "<div style='text-align:center;padding:40px;background:rgba(8,4,2,0.70);"
             "border:1px solid rgba(229,9,20,0.15);border-radius:14px;margin-top:12px'>"
-            "<div style='font-size:2.5rem;margin-bottom:10px'>🏆</div>"
-            "<div style='font-size:1rem;color:rgba(255,255,255,0.60)'>No PRs yet. Log your first one above!</div>"
+            "<div style='font-size:2.5rem;margin-bottom:10px'>&#127942;</div>"
+            "<div style='font-size:1rem;color:rgba(255,255,255,0.70)'>No PRs yet. Log your first one above!</div>"
             "</div>", unsafe_allow_html=True)
     else:
         for ex_name, ex_records in records.items():
@@ -458,33 +229,34 @@ with tab1:
                     dates = [r["date"][-5:] for r in ex_records[-10:]]
                     mn, mx = min(vals)-1, max(vals)+1
                     N = len(vals)
-                    pts  = " ".join(str(round(i*(180/max(N-1,1)),1)) + "," + str(round(((mx-v)/(mx-mn))*60,1)) for i,v in enumerate(vals))
+                    pts  = " ".join(str(int(i*(180/max(N-1,1)))) + "," + str(int(((mx-v)/(mx-mn))*60)) for i,v in enumerate(vals))
                     dots = "".join(
-                        '<circle cx="' + str(round(i*(180/max(N-1,1)),1)) + '" cy="' + str(round(((mx-v)/(mx-mn))*60,1)) + '" r="4" fill="#E50914" stroke="rgba(0,0,0,0.5)" stroke-width="1.5"/>'
+                        '<circle cx="' + str(int(i*(180/max(N-1,1)))) + '" cy="' + str(int(((mx-v)/(mx-mn))*60)) +
+                        '" r="4" fill="#E50914" stroke="rgba(0,0,0,0.5)" stroke-width="1.5"/>'
                         for i,v in enumerate(vals))
                     st.markdown(
-                        "<div style='background:rgba(8,4,2,0.80);border:1px solid rgba(229,9,20,0.20);"
+                        "<div style='background:rgba(8,4,2,0.80);border:1px solid rgba(229,9,20,0.22);"
                         "border-radius:12px;padding:14px 16px;margin-bottom:10px'>"
                         "<svg viewBox='0 0 200 80' style='width:100%;height:80px'>"
                         "<polyline points='" + pts + "' fill='none' stroke='#E50914' stroke-width='2' stroke-linecap='round'/>"
                         + dots +
-                        "<text x='0' y='77' fill='rgba(255,255,255,0.60)' font-size='7'>" + dates[0] + "</text>"
-                        "<text x='200' y='77' fill='rgba(255,255,255,0.60)' font-size='7' text-anchor='end'>" + dates[-1] + "</text>"
+                        "<text x='0' y='77' fill='rgba(255,255,255,0.55)' font-size='7'>" + dates[0] + "</text>"
+                        "<text x='200' y='77' fill='rgba(255,255,255,0.55)' font-size='7' text-anchor='end'>" + dates[-1] + "</text>"
                         "</svg></div>", unsafe_allow_html=True)
                 for r in reversed(ex_records[-5:]):
                     is_best = r["value"] == best["value"]
-                    badge   = " 🏆 PR" if is_best else ""
+                    badge   = " &#127942; PR" if is_best else ""
                     color   = "#fbbf24" if is_best else "#fff"
                     st.markdown(
-                        "<div style='display:flex;justify-content:space-between;padding:6px 0;"
+                        "<div style='display:flex;justify-content:space-between;padding:5px 0;"
                         "border-bottom:1px solid rgba(255,255,255,0.06);font-size:0.90rem'>"
-                        "<span style='color:rgba(255,255,255,0.60)'>" + r["date"] + "</span>"
+                        "<span style='color:rgba(255,255,255,0.55)'>" + r["date"] + "</span>"
                         "<span style='color:" + color + ";font-weight:700'>"
                         + str(r["value"]) + " " + r["unit"] + badge + "</span></div>",
                         unsafe_allow_html=True)
 
 # ══════════════════════════════════════════════════════════════════════════════
-# TAB 2: BODY MEASUREMENTS — FIXED dark theme, no white dominance
+# TAB 2: BODY MEASUREMENTS — dark inputs, no white boxes
 # ══════════════════════════════════════════════════════════════════════════════
 with tab2:
     MEASUREMENTS = ["Chest (cm)","Waist (cm)","Hips (cm)","Left Arm (cm)","Right Arm (cm)",
@@ -505,49 +277,23 @@ with tab2:
 
     st.markdown(
         "<div style='font-size:0.75rem;font-weight:700;letter-spacing:3px;text-transform:uppercase;"
-        "color:rgba(229,9,20,0.85);margin-bottom:16px;display:flex;align-items:center;gap:8px'>"
+        "color:rgba(229,9,20,0.85);margin-bottom:12px;display:flex;align-items:center;gap:8px'>"
         "<span style='width:16px;height:1.5px;background:#E50914;display:block'></span>"
-        "📏 Log Today's Measurements (cm)</div>",
-        unsafe_allow_html=True
-    )
-
-    # Custom dark number inputs for measurements
-    st.markdown("""
-    <style>
-    /* Force all number inputs in measurements form to be dark */
-    [data-testid="stForm"] .stNumberInput>div>div>input {
-      background:rgba(8,4,2,0.90)!important;
-      border:1.5px solid rgba(229,9,20,0.45)!important;
-      color:#fff!important;border-radius:12px!important;
-      font-size:1.00rem!important;font-weight:600!important;
-    }
-    [data-testid="stForm"] [data-testid="stWidgetLabel"] p {
-      color:#fff!important;font-size:0.85rem!important;
-      font-weight:700!important;letter-spacing:1.5px!important;
-      text-transform:uppercase!important;
-    }
-    </style>
-    """, unsafe_allow_html=True)
+        "Log Today's Measurements (cm)</div>", unsafe_allow_html=True)
 
+    st.markdown(
+        "<div style='background:rgba(8,4,2,0.88);border:1.5px solid rgba(229,9,20,0.25);"
+        "border-radius:16px;padding:20px 24px;margin-bottom:12px'>",
+        unsafe_allow_html=True)
     with st.form("meas_form"):
-        st.markdown(
-            "<div style='background:rgba(8,4,2,0.85);border:1.5px solid rgba(229,9,20,0.25);"
-            "border-radius:16px;padding:20px 24px;margin-bottom:12px'>",
-            unsafe_allow_html=True
-        )
         mc1, mc2 = st.columns(2)
         meas_vals = {}
         for i, m in enumerate(MEASUREMENTS[:5]):
-            with mc1:
-                meas_vals[m] = st.number_input(m, min_value=0.0, step=0.5, key="meas_"+str(i))
+            with mc1: meas_vals[m] = st.number_input(m, min_value=0.0, step=0.5, key="meas_"+str(i))
         for i, m in enumerate(MEASUREMENTS[5:]):
-            with mc2:
-                meas_vals[m] = st.number_input(m, min_value=0.0, step=0.5, key="meas_"+str(i+5))
-        st.markdown("</div>", unsafe_allow_html=True)
-
-        if st.form_submit_button("💾 SAVE MEASUREMENTS", use_container_width=True):
-            entry = {"date": date.today().isoformat(),
-                     "measurements": {k: v for k, v in meas_vals.items() if v > 0}}
+            with mc2: meas_vals[m] = st.number_input(m, min_value=0.0, step=0.5, key="meas_"+str(i+5))
+        if st.form_submit_button("💾 Save Measurements", use_container_width=True):
+            entry = {"date":date.today().isoformat(),"measurements":{k:v for k,v in meas_vals.items() if v>0}}
             if entry["measurements"]:
                 meas_list.append(entry)
                 st.session_state.body_measurements = meas_list
@@ -557,119 +303,78 @@ with tab2:
                 except Exception: pass
                 st.success("✅ Measurements saved!")
                 st.rerun()
+    st.markdown("</div>", unsafe_allow_html=True)
 
-    # ── Progress Charts ───────────────────────────────────────────────────────
     if meas_list:
         st.markdown(
             "<div style='font-size:0.75rem;font-weight:700;letter-spacing:3px;text-transform:uppercase;"
             "color:rgba(229,9,20,0.85);margin:20px 0 12px;display:flex;align-items:center;gap:8px'>"
             "<span style='width:16px;height:1.5px;background:#E50914;display:block'></span>"
-            "📊 Progress Charts</div>",
-            unsafe_allow_html=True
-        )
+            "Progress Charts</div>", unsafe_allow_html=True)
         key_measures = ["Chest (cm)","Waist (cm)","Hips (cm)","Left Arm (cm)","Left Thigh (cm)"]
         cols = st.columns(3)
-        chart_count = 0
-        for ci, metric in enumerate(key_measures):
-            vals_m = [(e["date"][5:], e["measurements"].get(metric,0))
-                      for e in meas_list if e["measurements"].get(metric,0) > 0]
+        for ci, metric in enumerate(key_measures[:3]):
+            vals_m = [(e["date"][-5:], e["measurements"].get(metric,0)) for e in meas_list if e["measurements"].get(metric,0)>0]
             if len(vals_m) < 2: continue
-            with cols[chart_count % 3]:
+            with cols[ci % 3]:
                 _dates_m = [v[0] for v in vals_m[-8:]]
                 _vals_m  = [v[1] for v in vals_m[-8:]]
                 mn2, mx2 = min(_vals_m)-1, max(_vals_m)+1
                 N2 = len(_vals_m)
-
-                def _mpx(i, v):
-                    x = 10 + i * (110/max(N2-1,1))
-                    y = 8  + ((mx2-v)/(mx2-mn2)) * 44
-                    return round(x,1), round(y,1)
-
-                pts2  = " ".join(f"{_mpx(i,v)[0]},{_mpx(i,v)[1]}" for i,v in enumerate(_vals_m))
+                pts2  = " ".join(str(int(i*(120/max(N2-1,1)))) + "," + str(int(((mx2-v)/(mx2-mn2))*50)) for i,v in enumerate(_vals_m))
                 dots2 = "".join(
-                    f'<circle cx="{_mpx(i,v)[0]}" cy="{_mpx(i,v)[1]}" r="3.5" '
-                    f'fill="#E50914" stroke="rgba(0,0,0,0.6)" stroke-width="1.5"/>'
+                    '<circle cx="' + str(int(i*(120/max(N2-1,1)))) + '" cy="' + str(int(((mx2-v)/(mx2-mn2))*50)) +
+                    '" r="3" fill="#E50914" stroke="rgba(0,0,0,0.5)" stroke-width="1"/>'
                     for i,v in enumerate(_vals_m))
-                delta  = round(_vals_m[-1] - _vals_m[0], 1)
-                dcol   = "#22c55e" if delta <= 0 else "#ef4444"
-                dsym   = "▼" if delta <= 0 else "▲"
-                short  = metric.replace(" (cm)","")
-
+                delta = _vals_m[-1] - _vals_m[0]
+                dcol  = "#22c55e" if delta<=0 else "#ef4444"
+                dsym  = "▼" if delta<=0 else "▲"
                 st.markdown(
-                    f"<div style='background:rgba(8,4,2,0.88);border:1.5px solid rgba(229,9,20,0.22);"
-                    f"border-radius:14px;padding:14px 16px;margin-bottom:10px'>"
-                    f"<div style='font-size:0.70rem;font-weight:700;letter-spacing:2px;text-transform:uppercase;"
-                    f"color:rgba(255,255,255,0.55);margin-bottom:6px'>{short}</div>"
-                    f"<div style='display:flex;align-items:baseline;gap:8px;margin-bottom:8px'>"
-                    f"<span style='font-family:Bebas Neue,sans-serif;font-size:1.8rem;color:#fff'>{_vals_m[-1]}cm</span>"
-                    f"<span style='font-size:0.80rem;color:{dcol};font-weight:700'>{dsym} {abs(delta)}cm</span>"
-                    f"</div>"
-                    f"<svg viewBox='0 0 130 60' style='width:100%;height:60px'>"
-                    f"<polyline points='{pts2}' fill='none' stroke='#E50914' stroke-width='1.8' stroke-linecap='round'/>"
-                    f"{dots2}"
-                    f"<text x='10' y='58' fill='rgba(255,255,255,0.40)' font-size='6'>{_dates_m[0]}</text>"
-                    f"<text x='120' y='58' fill='rgba(255,255,255,0.40)' font-size='6' text-anchor='end'>{_dates_m[-1]}</text>"
-                    f"</svg></div>",
-                    unsafe_allow_html=True
-                )
-                chart_count += 1
+                    "<div style='background:rgba(8,4,2,0.88);border:1.5px solid rgba(229,9,20,0.22);"
+                    "border-radius:12px;padding:12px 14px;margin-bottom:8px'>"
+                    "<div style='font-size:0.70rem;font-weight:700;letter-spacing:2px;text-transform:uppercase;"
+                    "color:rgba(255,255,255,0.50);margin-bottom:4px'>" + metric.replace(" (cm)","") + "</div>"
+                    "<div style='font-size:1.2rem;font-weight:700;color:#fff'>" + str(round(_vals_m[-1],1)) + " cm "
+                    "<span style='font-size:0.85rem;color:" + dcol + "'>" + dsym + " " + str(round(abs(delta),1)) + "</span></div>"
+                    "<svg viewBox='0 0 130 60' style='width:100%;height:60px;margin-top:6px'>"
+                    "<polyline points='" + pts2 + "' fill='none' stroke='#E50914' stroke-width='1.5'/>"
+                    + dots2 +
+                    "<text x='0' y='58' fill='rgba(255,255,255,0.40)' font-size='6'>" + _dates_m[0] + "</text>"
+                    "<text x='120' y='58' fill='rgba(255,255,255,0.40)' font-size='6' text-anchor='end'>" + _dates_m[-1] + "</text>"
+                    "</svg></div>", unsafe_allow_html=True)
     else:
         st.markdown(
             "<div style='text-align:center;padding:40px;background:rgba(8,4,2,0.70);"
             "border:1px solid rgba(229,9,20,0.15);border-radius:14px;margin-top:12px'>"
-            "<div style='font-size:2.5rem;margin-bottom:10px'>📏</div>"
-            "<div style='font-size:1rem;color:rgba(255,255,255,0.60)'>No measurements yet.</div>"
+            "<div style='font-size:2.5rem;margin-bottom:10px'>&#128207;</div>"
+            "<div style='font-size:1rem;color:rgba(255,255,255,0.70)'>No measurements yet.</div>"
             "</div>", unsafe_allow_html=True)
 
 # ══════════════════════════════════════════════════════════════════════════════
-# TAB 3: 1RM CALCULATOR — FIXED formula visibility
+# TAB 3: 1RM CALCULATOR — fixed formula visibility
 # ══════════════════════════════════════════════════════════════════════════════
 with tab3:
     st.markdown(
         "<div style='font-size:0.75rem;font-weight:700;letter-spacing:3px;text-transform:uppercase;"
         "color:rgba(229,9,20,0.85);margin-bottom:16px;display:flex;align-items:center;gap:8px'>"
         "<span style='width:16px;height:1.5px;background:#E50914;display:block'></span>"
-        "💪 One Rep Max Calculator</div>",
-        unsafe_allow_html=True
-    )
+        "One Rep Max Calculator</div>", unsafe_allow_html=True)
 
-    # ── Formula card — FIXED visibility ──────────────────────────────────────
+    # FIX: Formula card — dark background, bright yellow formula text
     st.markdown(
-        "<div style='background:rgba(8,4,2,0.90);border:1.5px solid rgba(251,191,36,0.40);"
-        "border-radius:14px;padding:18px 24px;margin-bottom:20px;backdrop-filter:blur(10px)'>"
-        "<div style='font-size:0.70rem;font-weight:700;letter-spacing:3px;text-transform:uppercase;"
-        "color:rgba(251,191,36,0.80);margin-bottom:10px'>📐 About 1RM</div>"
-        "<div style='font-size:0.90rem;color:rgba(255,255,255,0.85);line-height:1.7;margin-bottom:12px'>"
-        "The <b style='color:#fff'>One Rep Max (1RM)</b> is the maximum weight you can lift for a single repetition. "
-        "We average 3 industry-standard formulas for accuracy.</div>"
-        "<div style='display:flex;flex-wrap:wrap;gap:10px'>"
-        "<div style='background:rgba(229,9,20,0.15);border:1.5px solid rgba(229,9,20,0.40);"
-        "border-radius:10px;padding:10px 16px;flex:1;min-width:180px'>"
-        "<div style='font-size:0.65rem;letter-spacing:2px;text-transform:uppercase;"
-        "color:rgba(251,191,36,0.90);margin-bottom:6px;font-weight:700'>EPLEY FORMULA</div>"
-        "<div style='font-family:monospace;font-size:1.00rem;color:#fbbf24;font-weight:700;"
-        "background:rgba(0,0,0,0.40);padding:6px 10px;border-radius:6px;letter-spacing:1px'>"
-        "1RM = w × (1 + r ÷ 30)</div></div>"
-        "<div style='background:rgba(229,9,20,0.15);border:1.5px solid rgba(229,9,20,0.40);"
-        "border-radius:10px;padding:10px 16px;flex:1;min-width:180px'>"
-        "<div style='font-size:0.65rem;letter-spacing:2px;text-transform:uppercase;"
-        "color:rgba(251,191,36,0.90);margin-bottom:6px;font-weight:700'>BRZYCKI FORMULA</div>"
-        "<div style='font-family:monospace;font-size:1.00rem;color:#fbbf24;font-weight:700;"
-        "background:rgba(0,0,0,0.40);padding:6px 10px;border-radius:6px;letter-spacing:1px'>"
-        "1RM = w × 36 ÷ (37 − r)</div></div>"
-        "<div style='background:rgba(229,9,20,0.15);border:1.5px solid rgba(229,9,20,0.40);"
-        "border-radius:10px;padding:10px 16px;flex:1;min-width:180px'>"
-        "<div style='font-size:0.65rem;letter-spacing:2px;text-transform:uppercase;"
-        "color:rgba(251,191,36,0.90);margin-bottom:6px;font-weight:700'>LANDER FORMULA</div>"
-        "<div style='font-family:monospace;font-size:1.00rem;color:#fbbf24;font-weight:700;"
-        "background:rgba(0,0,0,0.40);padding:6px 10px;border-radius:6px;letter-spacing:1px'>"
-        "1RM = 100w ÷ (101.3 − 2.67r)</div></div>"
+        "<div style='background:rgba(8,4,2,0.92);border:1.5px solid rgba(251,191,36,0.42);"
+        "border-radius:14px;padding:18px 24px;margin-bottom:20px'>"
+        "<div style='font-size:0.65rem;font-weight:700;letter-spacing:3px;text-transform:uppercase;"
+        "color:rgba(251,191,36,0.85);margin-bottom:10px'>📐 Epley Formula</div>"
+        "<div style='background:rgba(0,0,0,0.55);border-radius:10px;padding:12px 18px;margin-bottom:10px'>"
+        "<span style='font-family:monospace;font-size:1.15rem;font-weight:700;"
+        "color:#fbbf24;letter-spacing:1px'>1RM = weight × (1 + reps ÷ 30)</span>"
         "</div>"
-        "<div style='margin-top:10px;font-size:0.75rem;color:rgba(255,255,255,0.40)'>"
-        "w = weight lifted (kg) · r = reps performed · result averaged across all 3 formulas</div>"
+        "<div style='font-size:0.88rem;color:rgba(255,255,255,0.65);line-height:1.6'>"
+        "The <b style='color:#fff'>1RM</b> is the maximum weight you can lift for one rep. "
+        "We average <b style='color:#E50914'>3 formulas</b> (Epley, Brzycki, Lander) for accuracy.</div>"
         "</div>",
-        unsafe_allow_html=True
-    )
+        unsafe_allow_html=True)
 
     orm_exercises = ["Bench Press","Squat","Deadlift","Overhead Press","Barbell Row",
                      "Pull-ups","Dumbbell Press","Leg Press","Romanian Deadlift","Cable Row","Custom"]
@@ -679,73 +384,60 @@ with tab3:
     with rc3: orm_weight = st.number_input("Weight (kg)", min_value=1.0, max_value=500.0, value=60.0, step=2.5, key="orm_weight")
     with rc4: orm_reps   = st.number_input("Reps", min_value=1, max_value=30, value=5, step=1, key="orm_reps")
 
-    w, r     = float(orm_weight), int(orm_reps)
-    epley    = w * (1 + r/30)
-    brzycki  = w * (36/(37-r)) if r < 37 else w
-    lander   = (100*w)/(101.3 - 2.67123*r)
-    avg_1rm  = (epley + brzycki + lander) / 3
-    ex_label = orm_custom.strip() if orm_ex=="Custom" and orm_custom.strip() else orm_ex
-
-    pcts = [
-        (100, "1 rep",     "True Max",    "#E50914"),
-        (95,  "1-2 reps",  "Strength Max","#f97316"),
-        (85,  "4-6 reps",  "Strength",    "#fbbf24"),
-        (75,  "8-10 reps", "Hypertrophy", "#22c55e"),
-        (65,  "12-15 reps","Endurance",   "#60a5fa"),
-    ]
-    _rgb_map = {
-        "#E50914":"229,9,20","#f97316":"249,115,22","#fbbf24":"251,191,36",
-        "#22c55e":"34,197,94","#60a5fa":"96,165,250"
-    }
-    pct_parts = []
-    for pct, rng, zone, pc in pcts:
-        _brgb = _rgb_map.get(pc, "229,9,20")
-        _kg   = round(avg_1rm * pct / 100, 1)
-        pct_parts.append(
-            f"<div style='background:rgba(8,4,2,0.85);border:1.5px solid rgba({_brgb},0.35);"
-            f"border-radius:10px;padding:10px 14px;flex:1;min-width:110px;text-align:center'>"
-            f"<div style='font-size:0.65rem;font-weight:700;letter-spacing:2px;text-transform:uppercase;"
-            f"color:{pc};margin-bottom:4px'>{pct}%</div>"
-            f"<div style='font-family:Bebas Neue,sans-serif;font-size:1.4rem;color:#fff'>{_kg}kg</div>"
-            f"<div style='font-size:0.65rem;color:rgba(255,255,255,0.50);margin-top:2px'>{rng}</div>"
-            f"<div style='font-size:0.60rem;color:rgba(255,255,255,0.35)'>{zone}</div></div>"
-        )
-    pct_html = "".join(pct_parts)
+    w, r    = float(orm_weight), int(orm_reps)
+    epley   = w * (1 + r/30)
+    brzycki = w * (36/(37-r)) if r < 37 else w
+    lander  = (100*w)/(101.3 - 2.67123*r)
+    avg_1rm = (epley + brzycki + lander) / 3
+    ex_name = orm_custom.strip() if orm_ex=="Custom" and orm_custom.strip() else orm_ex
+
+    pcts = [(95,"1-2 reps","Strength Max"),(85,"4-6 reps","Strength"),
+            (75,"8-10 reps","Hypertrophy"),(65,"12-15 reps","Endurance")]
+    pct_html = "".join(
+        "<div style='background:rgba(8,4,2,0.88);border:1.5px solid rgba(229,9,20,0.28);"
+        "border-radius:10px;padding:10px 12px;flex:1;min-width:100px;text-align:center'>"
+        "<div style='font-size:0.65rem;font-weight:700;letter-spacing:2px;text-transform:uppercase;"
+        "color:rgba(229,9,20,0.80);margin-bottom:4px'>" + str(pct) + "%</div>"
+        "<div style='font-family:Bebas Neue,sans-serif;font-size:1.4rem;color:#fff'>"
+        + str(round(avg_1rm*pct/100,1)) + "kg</div>"
+        "<div style='font-size:0.65rem;color:rgba(255,255,255,0.50);margin-top:2px'>" + rng + "</div>"
+        "<div style='font-size:0.60rem;color:rgba(255,255,255,0.35)'>" + zone + "</div></div>"
+        for pct, rng, zone in pcts)
 
     st.markdown(
         "<div style='background:linear-gradient(135deg,rgba(229,9,20,0.18),rgba(160,0,10,0.10) 60%,rgba(8,4,2,0.90));"
-        "border:1.5px solid rgba(229,9,20,0.50);border-radius:18px;padding:28px 32px;margin-top:16px;"
+        "border:1.5px solid rgba(229,9,20,0.50);border-radius:16px;padding:24px 28px;margin-top:16px;"
         "position:relative;overflow:hidden'>"
         "<div style='position:absolute;top:0;left:0;right:0;height:2px;"
         "background:linear-gradient(90deg,transparent,#E50914,transparent)'></div>"
         "<div style='font-size:0.70rem;font-weight:700;letter-spacing:3px;text-transform:uppercase;"
-        "color:rgba(229,9,20,0.80);margin-bottom:8px'>💪 " + ex_label + " — Estimated 1RM</div>"
-        "<div style='font-family:Bebas Neue,sans-serif;font-size:5rem;color:#E50914;"
+        "color:rgba(229,9,20,0.80);margin-bottom:8px'>&#128170; " + ex_name + " — Estimated 1RM</div>"
+        "<div style='font-family:Bebas Neue,sans-serif;font-size:4.5rem;color:#E50914;"
         "letter-spacing:2px;line-height:1;margin-bottom:4px'>" + str(round(avg_1rm,1)) +
-        " <span style='font-size:2.2rem;color:rgba(255,255,255,0.80)'>kg</span></div>"
-        "<div style='font-size:0.80rem;color:rgba(255,255,255,0.55);margin-bottom:20px'>"
-        "Average of Epley · Brzycki · Lander &nbsp;|&nbsp; " + str(r) + " reps @ " + str(w) + "kg</div>"
+        " <span style='font-size:2rem;color:rgba(255,255,255,0.80)'>kg</span></div>"
+        "<div style='font-size:0.75rem;color:rgba(255,255,255,0.50);margin-bottom:20px'>"
+        "Average of 3 formulas | " + str(r) + " reps @ " + str(w) + "kg</div>"
         "<div style='display:grid;grid-template-columns:repeat(3,1fr);gap:10px;margin-bottom:20px'>"
         "<div style='background:rgba(255,255,255,0.05);border:1px solid rgba(255,255,255,0.10);"
-        "border-radius:12px;padding:12px;text-align:center'>"
+        "border-radius:10px;padding:10px;text-align:center'>"
         "<div style='font-size:0.60rem;letter-spacing:2px;text-transform:uppercase;"
-        "color:rgba(255,255,255,0.45);margin-bottom:4px'>Epley</div>"
-        "<div style='font-family:Bebas Neue,sans-serif;font-size:1.8rem;color:#fff'>" + str(round(epley,1)) + "kg</div></div>"
+        "color:rgba(255,255,255,0.40);margin-bottom:4px'>EPLEY</div>"
+        "<div style='font-family:Bebas Neue,sans-serif;font-size:1.6rem;color:#fff'>" + str(round(epley,1)) + "kg</div></div>"
         "<div style='background:rgba(255,255,255,0.05);border:1px solid rgba(255,255,255,0.10);"
-        "border-radius:12px;padding:12px;text-align:center'>"
+        "border-radius:10px;padding:10px;text-align:center'>"
         "<div style='font-size:0.60rem;letter-spacing:2px;text-transform:uppercase;"
-        "color:rgba(255,255,255,0.45);margin-bottom:4px'>Brzycki</div>"
-        "<div style='font-family:Bebas Neue,sans-serif;font-size:1.8rem;color:#fff'>" + str(round(brzycki,1)) + "kg</div></div>"
+        "color:rgba(255,255,255,0.40);margin-bottom:4px'>BRZYCKI</div>"
+        "<div style='font-family:Bebas Neue,sans-serif;font-size:1.6rem;color:#fff'>" + str(round(brzycki,1)) + "kg</div></div>"
         "<div style='background:rgba(255,255,255,0.05);border:1px solid rgba(255,255,255,0.10);"
-        "border-radius:12px;padding:12px;text-align:center'>"
+        "border-radius:10px;padding:10px;text-align:center'>"
         "<div style='font-size:0.60rem;letter-spacing:2px;text-transform:uppercase;"
-        "color:rgba(255,255,255,0.45);margin-bottom:4px'>Lander</div>"
-        "<div style='font-family:Bebas Neue,sans-serif;font-size:1.8rem;color:#fff'>" + str(round(lander,1)) + "kg</div></div>"
+        "color:rgba(255,255,255,0.40);margin-bottom:4px'>LANDER</div>"
+        "<div style='font-family:Bebas Neue,sans-serif;font-size:1.6rem;color:#fff'>" + str(round(lander,1)) + "kg</div></div>"
         "</div>"
-        "<div style='font-size:0.75rem;color:rgba(255,255,255,0.50);margin-bottom:10px;letter-spacing:1px;text-transform:uppercase'>Training % Targets</div>"
+        "<div style='font-size:0.70rem;color:rgba(255,255,255,0.45);margin-bottom:10px;"
+        "letter-spacing:1px;text-transform:uppercase'>Training % Targets</div>"
         "<div style='display:flex;gap:8px;flex-wrap:wrap'>" + pct_html + "</div></div>",
-        unsafe_allow_html=True
-    )
+        unsafe_allow_html=True)
 
 # ══════════════════════════════════════════════════════════════════════════════
 # TAB 4: ACHIEVEMENTS
@@ -755,9 +447,7 @@ with tab4:
         "<div style='font-size:0.75rem;font-weight:700;letter-spacing:3px;text-transform:uppercase;"
         "color:rgba(229,9,20,0.85);margin-bottom:16px;display:flex;align-items:center;gap:8px'>"
         "<span style='width:16px;height:1.5px;background:#E50914;display:block'></span>"
-        "🎖️ Your Achievement Badges</div>",
-        unsafe_allow_html=True
-    )
+        "Your Achievement Badges</div>", unsafe_allow_html=True)
     try:
         from utils.achievements import compute_stats, get_earned_badges, get_next_badge, render_badges_html, BADGES
         stats  = compute_stats(uname, st.session_state)
@@ -765,14 +455,14 @@ with tab4:
         next_b = get_next_badge(stats)
 
         st.markdown(
-            "<div style='background:rgba(8,4,2,0.85);border:1.5px solid rgba(229,9,20,0.30);"
+            "<div style='background:rgba(8,4,2,0.88);border:1.5px solid rgba(229,9,20,0.28);"
             "border-radius:14px;padding:16px 20px;margin-bottom:20px;"
             "display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap;gap:10px'>"
             "<div><div style='font-family:Bebas Neue,sans-serif;font-size:2.2rem;color:#E50914;line-height:1'>"
             + str(len(earned)) + " / " + str(len(BADGES)) + "</div>"
             "<div style='font-size:0.80rem;color:rgba(255,255,255,0.60);letter-spacing:2px;text-transform:uppercase'>Badges Earned</div></div>"
             "<div style='text-align:right'>"
-            "<div style='font-size:0.75rem;font-weight:600;color:rgba(255,255,255,0.55)'>Completion</div>"
+            "<div style='font-size:0.75rem;color:rgba(255,255,255,0.50)'>Completion</div>"
             "<div style='height:8px;width:200px;background:rgba(255,255,255,0.08);border-radius:4px;overflow:hidden;margin-top:6px'>"
             "<div style='height:100%;width:" + str(int(len(earned)/max(len(BADGES),1)*100)) + "%;background:#E50914;border-radius:4px'></div>"
             "</div></div></div>", unsafe_allow_html=True)
@@ -783,17 +473,17 @@ with tab4:
                 "border-radius:12px;padding:14px 18px;margin-bottom:20px;display:flex;align-items:center;gap:14px'>"
                 "<div style='font-size:2.5rem'>" + next_b["icon"] + "</div>"
                 "<div><div style='font-size:0.65rem;font-weight:700;letter-spacing:2px;text-transform:uppercase;"
-                "color:rgba(251,191,36,0.80);margin-bottom:4px'>🎯 Next Badge to Unlock</div>"
+                "color:rgba(251,191,36,0.80);margin-bottom:4px'>&#127919; Next Badge to Unlock</div>"
                 "<div style='font-size:0.92rem;font-weight:700;color:#fff'>" + next_b["title"] + "</div>"
                 "<div style='font-size:0.75rem;color:rgba(255,255,255,0.60);margin-top:2px'>" + next_b["desc"] + "</div>"
                 "</div></div>", unsafe_allow_html=True)
 
         if earned:
-            st.markdown("<div style='font-size:0.80rem;color:rgba(255,255,255,0.60);margin-bottom:12px'>🏆 Earned Badges</div>", unsafe_allow_html=True)
+            st.markdown("<div style='font-size:0.80rem;color:rgba(255,255,255,0.60);margin-bottom:12px'>&#127942; Earned Badges</div>", unsafe_allow_html=True)
             st.markdown(render_badges_html(earned), unsafe_allow_html=True)
 
         st.markdown("<div style='height:20px'></div>", unsafe_allow_html=True)
-        with st.expander("🔒 Locked Badges — " + str(len(BADGES)-len(earned)) + " remaining", expanded=False):
+        with st.expander("&#128274; Locked Badges — " + str(len(BADGES)-len(earned)) + " remaining", expanded=False):
             earned_ids  = {b["id"] for b in earned}
             locked_html = "<div style='display:flex;flex-wrap:wrap;gap:10px'>"
             for bid, icon, title, desc, _ in BADGES: