Update app.py

app.py

@@ -3,29 +3,20 @@ import math
 import re
 import sqlite3
 import json
-import urllib.parse
 from datetime import datetime
 from pathlib import Path
 
 import gradio as gr
 
-# ============================================================
-# FORCE DELETE OLD DATABASE (fix schema issues)
-# ============================================================
-
-DB_PATH = os.environ.get("DATABASE_PATH", "/data/howmuchfeed.db")
-if os.path.exists(DB_PATH):
-    try:
-        os.remove(DB_PATH)
-        print(f"✅ Deleted old database: {DB_PATH}")
-    except Exception as e:
-        print(f"⚠️ Could not delete database: {e}")
 
 # ============================================================
 # APP CONFIG
 # ============================================================
 
-APP_NAME = "🐔 How Much Feed?"
+APP_NAME = "🐔 PoultryFeedCalc"
+DB_PATH = os.environ.get("DATABASE_PATH", "/data/poultryfeedcalc.db")
+
+# Admin password - set this in Hugging Face Secrets
 ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "admin123")
 
 # Create directory if it doesn't exist
@@ -35,82 +26,6 @@ if db_dir and not os.path.exists(db_dir):
 
 STARTER_END_DAY = 21
 
-
-# ============================================================
-# DATABASE INITIALIZATION - CLEAN SCHEMA
-# ============================================================
-
-def init_db():
-    """Initialize database with correct schema."""
-    conn = sqlite3.connect(DB_PATH)
-    cur = conn.cursor()
-
-    cur.execute("""
-        CREATE TABLE IF NOT EXISTS leads (
-            id INTEGER PRIMARY KEY AUTOINCREMENT,
-            email TEXT UNIQUE,
-            country TEXT,
-            currency TEXT,
-            breed TEXT,
-            created_at TEXT
-        )
-    """)
-
-    cur.execute("""
-        CREATE TABLE IF NOT EXISTS farmer_questions (
-            id INTEGER PRIMARY KEY AUTOINCREMENT,
-            email TEXT,
-            question TEXT,
-            breed TEXT,
-            created_at TEXT
-        )
-    """)
-
-    cur.execute("""
-        CREATE TABLE IF NOT EXISTS calculations (
-            id INTEGER PRIMARY KEY AUTOINCREMENT,
-            email TEXT,
-            country TEXT,
-            currency TEXT,
-            breed TEXT,
-            birds INTEGER,
-            weeks INTEGER,
-            days INTEGER,
-            total_days INTEGER,
-            bag_size REAL,
-            price_per_bag REAL,
-            total_feed_kg REAL,
-            starter_kg REAL,
-            finisher_kg REAL,
-            starter_bags REAL,
-            finisher_bags REAL,
-            exact_bags REAL,
-            rounded_bags INTEGER,
-            total_cost REAL,
-            created_at TEXT
-        )
-    """)
-
-    cur.execute("""
-        CREATE TABLE IF NOT EXISTS analytics (
-            id INTEGER PRIMARY KEY AUTOINCREMENT,
-            visit_date TEXT,
-            ip TEXT,
-            country TEXT,
-            breed TEXT,
-            action TEXT,
-            created_at TEXT
-        )
-    """)
-
-    conn.commit()
-    conn.close()
-    print(f"✅ Database created at: {DB_PATH}")
-
-
-init_db()
-
-
 # ============================================================
 # GOOGLE SHEETS INTEGRATION
 # ============================================================
@@ -125,7 +40,7 @@ def init_google_sheets():
         sheet_id = os.environ.get("GOOGLE_SHEETS_ID")
         
         if not creds_json or not sheet_id:
-            print("⚠️ Google Sheets not configured.")
+            print("⚠️ Google Sheets not configured. Using local database only.")
             return None, None
         
         creds_dict = json.loads(creds_json)
@@ -141,7 +56,7 @@ def init_google_sheets():
             sheet = client.open_by_key(sheet_id)
             print(f"✅ Google Sheets connected: {sheet.title}")
         except:
-            sheet = client.create("How Much Feed Calculator Leads")
+            sheet = client.create("Poultry Feed Calculator Leads")
             print(f"✅ New Google Sheet created")
         
         return client, sheet
@@ -151,6 +66,7 @@ def init_google_sheets():
         return None, None
 
 
+# Initialize Google Sheets
 gs_client, gs_sheet = init_google_sheets()
 
 
@@ -178,6 +94,7 @@ def sync_to_google_sheets(email, country, currency, breed, action="lead"):
             worksheet.append_row(headers)
         
         worksheet.append_row(row_data)
+        print(f"✅ Synced to Google Sheets: {email}")
         return True
         
     except Exception as e:
@@ -186,25 +103,58 @@ def sync_to_google_sheets(email, country, currency, breed, action="lead"):
 
 
 # ============================================================
-# BREED DATA
+# VERIFIED BREED DATA - From Official PDFs
 # ============================================================
 
+# Body Weight (kg) at key days - As-Hatched Performance
 BREED_WEIGHT_DATA = {
-    "Ross 308": {0: 0.044, 7: 0.213, 14: 0.533, 21: 1.012, 28: 1.616, 35: 2.296, 42: 2.998, 49: 3.681, 56: 4.318},
-    "Cobb 500": {0: 0.042, 7: 0.177, 14: 0.459, 21: 0.891, 28: 1.436, 35: 2.067, 42: 2.732, 49: 3.369, 56: 3.958},
-    "Arbor Acres": {0: 0.044, 7: 0.209, 14: 0.527, 21: 1.006, 28: 1.611, 35: 2.287, 42: 2.964, 49: 3.662, 56: 4.318}
+    "Ross 308": {
+        0: 0.044, 7: 0.213, 14: 0.533, 21: 1.012,
+        28: 1.616, 35: 2.296, 42: 2.998, 49: 3.681, 56: 4.318,
+    },
+    "Cobb 500": {
+        0: 0.042, 7: 0.177, 14: 0.459, 21: 0.891,
+        28: 1.436, 35: 2.067, 42: 2.732, 49: 3.369, 56: 3.958,
+    },
+    "Arbor Acres": {
+        0: 0.044, 7: 0.209, 14: 0.527, 21: 1.006,
+        28: 1.611, 35: 2.287, 42: 2.964, 49: 3.662, 56: 4.318,
+    }
 }
 
+# Cumulative Feed (kg) at key days - As-Hatched Performance
 BREED_FEED_DATA = {
-    "Ross 308": {0: 0.000, 7: 0.166, 14: 0.535, 21: 1.155, 28: 2.051, 35: 3.211, 42: 4.586, 49: 6.115, 56: 7.733},
-    "Cobb 500": {0: 0.000, 7: 0.150, 14: 0.465, 21: 1.053, 28: 1.963, 35: 3.216, 42: 4.659, 49: 6.185, 56: 7.772},
-    "Arbor Acres": {0: 0.000, 7: 0.207, 14: 0.638, 21: 1.163, 28: 2.069, 35: 3.237, 42: 4.625, 49: 6.111, 56: 7.647}
+    "Ross 308": {
+        0: 0.000, 7: 0.166, 14: 0.535, 21: 1.155,
+        28: 2.051, 35: 3.211, 42: 4.586, 49: 6.115, 56: 7.733,
+    },
+    "Cobb 500": {
+        0: 0.000, 7: 0.150, 14: 0.465, 21: 1.053,
+        28: 1.963, 35: 3.216, 42: 4.659, 49: 6.185, 56: 7.772,
+    },
+    "Arbor Acres": {
+        0: 0.000, 7: 0.207, 14: 0.638, 21: 1.163,
+        28: 2.069, 35: 3.237, 42: 4.625, 49: 6.111, 56: 7.647,
+    }
 }
 
+# Breed descriptions and availability
 BREED_INFO = {
-    "Ross 308": {"description": "Big chest, thick legs, very fast growth.", "available_at": "Agrited, Sayed, Valentine", "color": "#16a34a"},
-    "Cobb 500": {"description": "Good early growth, strong legs, solid feed conversion.", "available_at": "Chikun, Zartech", "color": "#2563eb"},
-    "Arbor Acres": {"description": "Balanced growth, hardy and adaptable.", "available_at": "Supreme, CHI, GS, Vertex, Fidan, Cascada, Orobor, Sunchi, Farm Support, Ajila", "color": "#d97706"}
+    "Ross 308": {
+        "description": "Big chest, thick legs, very fast growth. Excellent for meat production.",
+        "available_at": "Agrited, Sayed, Valentine",
+        "color": "#16a34a"
+    },
+    "Cobb 500": {
+        "description": "Good early growth, strong legs, solid feed conversion.",
+        "available_at": "Chikun, Zartech",
+        "color": "#2563eb"
+    },
+    "Arbor Acres": {
+        "description": "Balanced growth, hardy and adaptable. Great survival rate.",
+        "available_at": "Supreme, CHI, GS, Vertex, Fidan, Cascada, Orobor, Sunchi, Farm Support, Ajila",
+        "color": "#d97706"
+    }
 }
 
 
@@ -217,27 +167,82 @@ def get_breed_feed_data(breed):
 
 
 def interpolate_weight(day, breed):
-    data = get_breed_weight_data(breed)
-    if day <= 0: return data[0]
-    if day >= 56: return data[56]
-    keys = sorted(data.keys())
+    """Interpolate body weight between known checkpoints."""
+    weight_data = get_breed_weight_data(breed)
+
+    if day <= 0:
+        return weight_data[0]
+    if day >= 56:
+        return weight_data[56]
+
+    keys = sorted(weight_data.keys())
     for i in range(len(keys) - 1):
         if keys[i] <= day <= keys[i + 1]:
             ratio = (day - keys[i]) / (keys[i + 1] - keys[i])
-            return data[keys[i]] + (data[keys[i + 1]] - data[keys[i]]) * ratio
-    return data[56]
+            return weight_data[keys[i]] + (weight_data[keys[i + 1]] - weight_data[keys[i]]) * ratio
+
+    return weight_data[56]
 
 
 def interpolate_feed(day, breed):
-    data = get_breed_feed_data(breed)
-    if day <= 0: return 0.0
-    if day >= 56: return data[56]
-    keys = sorted(data.keys())
+    """Interpolate cumulative feed between known checkpoints."""
+    feed_data = get_breed_feed_data(breed)
+
+    if day <= 0:
+        return 0.0
+    if day >= 56:
+        return feed_data[56]
+
+    keys = sorted(feed_data.keys())
     for i in range(len(keys) - 1):
         if keys[i] <= day <= keys[i + 1]:
             ratio = (day - keys[i]) / (keys[i + 1] - keys[i])
-            return data[keys[i]] + (data[keys[i + 1]] - data[keys[i]]) * ratio
-    return data[56]
+            return feed_data[keys[i]] + (feed_data[keys[i + 1]] - feed_data[keys[i]]) * ratio
+
+    return feed_data[56]
+
+
+# ============================================================
+# BENCHMARK TABLE GENERATOR
+# ============================================================
+
+def get_benchmark_table(breed):
+    """Generate benchmark table for the selected breed."""
+    weight_data = get_breed_weight_data(breed)
+    feed_data = get_breed_feed_data(breed)
+
+    days = [7, 14, 21, 28, 35, 42, 49, 56]
+
+    table_data = []
+    for day in days:
+        weight = weight_data.get(day, 0)
+        feed = feed_data.get(day, 0)
+        fcr = feed / weight if weight > 0 else 0
+        table_data.append([day, f"{weight:.3f}", f"{feed:.3f}", f"{fcr:.3f}"])
+
+    return table_data, days
+
+
+def get_breed_comparison_table():
+    """Generate comparison table for all three breeds."""
+    breeds = ["Ross 308", "Cobb 500", "Arbor Acres"]
+    days = [7, 14, 21, 28, 35, 42, 49, 56]
+
+    table_data = []
+    for day in days:
+        row = [day]
+        for breed in breeds:
+            weight_data = get_breed_weight_data(breed)
+            feed_data = get_breed_feed_data(breed)
+            weight = weight_data.get(day, 0)
+            feed = feed_data.get(day, 0)
+            fcr = feed / weight if weight > 0 else 0
+            row.append(f"{weight:.3f}")
+            row.append(f"{feed:.3f}")
+            row.append(f"{fcr:.3f}")
+        table_data.append(row)
+
+    return table_data, breeds, days
 
 
 # ============================================================
@@ -276,21 +281,25 @@ DEFAULT_PRICES = {
 
 
 def detect_country_from_env():
+    """Best-effort country detection from environment variables."""
     candidates = [
         os.environ.get("COUNTRY_CODE"),
         os.environ.get("CF-IPCOUNTRY"),
         os.environ.get("GEOIP_COUNTRY"),
         os.environ.get("HTTP_CF_IPCOUNTRY"),
     ]
+
     for value in candidates:
         if value:
             value = value.strip().upper()
             if value in CURRENCIES:
                 return value
+
     return None
 
 
 def get_country_info(country_code):
+    """Get currency info for a country code."""
     if country_code in CURRENCIES:
         name, symbol, code = CURRENCIES[country_code]
         return country_code, symbol, code
@@ -304,176 +313,241 @@ def get_default_price(currency_code):
 COUNTRY_LIST = sorted([(code, f"{name} ({symbol})") for code, (name, symbol, curr) in CURRENCIES.items()])
 
 
+# ============================================================
+# DATABASE
+# ============================================================
+
+def init_db():
+    conn = sqlite3.connect(DB_PATH)
+    cur = conn.cursor()
+
+    cur.execute("""
+        CREATE TABLE IF NOT EXISTS leads (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            email TEXT UNIQUE,
+            country TEXT,
+            currency TEXT,
+            breed TEXT,
+            created_at TEXT
+        )
+    """)
+
+    cur.execute("""
+        CREATE TABLE IF NOT EXISTS farmer_questions (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            email TEXT,
+            question TEXT,
+            breed TEXT,
+            created_at TEXT
+        )
+    """)
+
+    cur.execute("""
+        CREATE TABLE IF NOT EXISTS calculations (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            email TEXT,
+            country TEXT,
+            currency TEXT,
+            breed TEXT,
+            birds INTEGER,
+            weeks INTEGER,
+            days INTEGER,
+            total_days INTEGER,
+            bag_size REAL,
+            price_per_bag REAL,
+            total_feed_kg REAL,
+            starter_kg REAL,
+            finisher_kg REAL,
+            starter_bags REAL,
+            finisher_bags REAL,
+            total_bags REAL,
+            rounded_bags INTEGER,
+            total_cost REAL,
+            created_at TEXT
+        )
+    """)
+
+    cur.execute("""
+        CREATE TABLE IF NOT EXISTS analytics (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            visit_date TEXT,
+            ip TEXT,
+            country TEXT,
+            breed TEXT,
+            action TEXT,
+            created_at TEXT
+        )
+    """)
+
+    conn.commit()
+    conn.close()
+    print(f"✅ Database initialized at: {DB_PATH}")
+
+
+init_db()
+
+
 # ============================================================
 # DATABASE HELPERS
 # ============================================================
 
 def valid_email(email):
-    if not email: return False
-    return bool(re.match(r"^[^@\s]+@[^@\s]+\.[^@\s]+$", email.strip()))
+    if not email:
+        return False
+    email = email.strip()
+    pattern = r"^[^@\s]+@[^@\s]+\.[^@\s]+$"
+    return bool(re.match(pattern, email))
 
 
 def save_lead(email, country, currency, breed):
-    if not valid_email(email): return
+    if not valid_email(email):
+        return
+
+    # Save to SQLite
     conn = sqlite3.connect(DB_PATH)
     cur = conn.cursor()
-    cur.execute("INSERT OR IGNORE INTO leads (email, country, currency, breed, created_at) VALUES (?, ?, ?, ?, ?)",
-                (email.strip().lower(), country, currency, breed, datetime.now().isoformat()))
+    cur.execute("""
+        INSERT OR IGNORE INTO leads (email, country, currency, breed, created_at)
+        VALUES (?, ?, ?, ?, ?)
+    """, (email.strip().lower(), country, currency, breed, datetime.utcnow().isoformat()))
     conn.commit()
     conn.close()
+
+    # Sync to Google Sheets
     try:
         sync_to_google_sheets(email, country, currency, breed, "lead")
-    except: pass
+    except Exception as e:
+        print(f"Google Sheets sync error: {e}")
 
 
 def save_question(email, question, breed):
-    if not question or not question.strip(): return
+    if not question or not question.strip():
+        return
+
+    # Save to SQLite
     conn = sqlite3.connect(DB_PATH)
     cur = conn.cursor()
-    cur.execute("INSERT INTO farmer_questions (email, question, breed, created_at) VALUES (?, ?, ?, ?)",
-                (email.strip().lower() if email else "", question.strip(), breed, datetime.now().isoformat()))
+    cur.execute("""
+        INSERT INTO farmer_questions (email, question, breed, created_at)
+        VALUES (?, ?, ?, ?)
+    """, (email.strip().lower() if email else "", question.strip(), breed, datetime.utcnow().isoformat()))
     conn.commit()
     conn.close()
 
+    # Sync to Google Sheets
+    try:
+        sync_to_google_sheets(email, question, breed, "question")
+    except Exception as e:
+        print(f"Google Sheets sync error: {e}")
+
 
 def save_calculation(email, country, currency, breed, birds, weeks, days, total_days,
                      bag_size, price_per_bag, total_feed_kg, starter_kg, finisher_kg,
-                     starter_bags, finisher_bags, exact_bags, rounded_bags, total_cost):
+                     starter_bags, finisher_bags, total_bags, rounded_bags, total_cost):
     conn = sqlite3.connect(DB_PATH)
     cur = conn.cursor()
+
     cur.execute("""
         INSERT INTO calculations (
             email, country, currency, breed, birds, weeks, days, total_days,
             bag_size, price_per_bag, total_feed_kg, starter_kg, finisher_kg,
-            starter_bags, finisher_bags, exact_bags, rounded_bags, total_cost, created_at
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            starter_bags, finisher_bags, total_bags, rounded_bags, total_cost, created_at
+        )
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     """, (email.strip().lower() if email else "", country, currency, breed, birds, weeks, days, total_days,
           bag_size, price_per_bag, total_feed_kg, starter_kg, finisher_kg,
-          starter_bags, finisher_bags, exact_bags, rounded_bags, total_cost,
-          datetime.now().isoformat()))
+          starter_bags, finisher_bags, total_bags, rounded_bags, total_cost,
+          datetime.utcnow().isoformat()))
+
     conn.commit()
     conn.close()
 
 
 def track_visit(request: gr.Request):
+    """Track page visit."""
     try:
         client_ip = request.client.host if request and hasattr(request, 'client') else "unknown"
+        
         conn = sqlite3.connect(DB_PATH)
         cur = conn.cursor()
-        cur.execute("INSERT INTO analytics (visit_date, ip, country, action, created_at) VALUES (?, ?, ?, ?, ?)",
-                    (datetime.now().strftime("%Y-%m-%d"), client_ip, detect_country_from_env() or "NG",
-                     "page_visit", datetime.now().isoformat()))
+        
+        cur.execute("""
+            INSERT INTO analytics (visit_date, ip, country, action, created_at)
+            VALUES (?, ?, ?, ?, ?)
+        """, (
+            datetime.now().strftime("%Y-%m-%d"),
+            client_ip,
+            detect_country_from_env() or "NG",
+            "page_visit",
+            datetime.now().isoformat()
+        ))
+        
         conn.commit()
         conn.close()
         return True
-    except: return False
+    except Exception as e:
+        print(f"Analytics error: {e}")
+        return False
 
 
 def track_calculation(breed, birds, days):
+    """Track when a calculation is performed."""
     try:
         conn = sqlite3.connect(DB_PATH)
         cur = conn.cursor()
-        cur.execute("INSERT INTO analytics (visit_date, country, breed, action, created_at) VALUES (?, ?, ?, ?, ?)",
-                    (datetime.now().strftime("%Y-%m-%d"), detect_country_from_env() or "NG",
-                     breed, f"calculation_{birds}_{days}", datetime.now().isoformat()))
+        
+        cur.execute("""
+            INSERT INTO analytics (visit_date, country, breed, action, created_at)
+            VALUES (?, ?, ?, ?, ?)
+        """, (
+            datetime.now().strftime("%Y-%m-%d"),
+            detect_country_from_env() or "NG",
+            breed,
+            f"calculation_{birds}_{days}",
+            datetime.now().isoformat()
+        ))
+        
         conn.commit()
         conn.close()
         return True
-    except: return False
+    except:
+        return False
 
 
 def get_analytics_summary():
+    """Get analytics summary."""
     conn = sqlite3.connect(DB_PATH)
     cur = conn.cursor()
+    
     cur.execute("SELECT COUNT(*) FROM analytics WHERE action = 'page_visit'")
     total_visits = cur.fetchone()[0] or 0
-    cur.execute("SELECT COUNT(*) FROM analytics WHERE action = 'page_visit' AND visit_date = ?",
+    
+    cur.execute("SELECT COUNT(*) FROM analytics WHERE action = 'page_visit' AND visit_date = ?", 
                 (datetime.now().strftime("%Y-%m-%d"),))
     today_visits = cur.fetchone()[0] or 0
+    
     cur.execute("SELECT COUNT(*) FROM analytics WHERE action LIKE 'calculation_%'")
     total_calculations = cur.fetchone()[0] or 0
+    
     cur.execute("SELECT COUNT(DISTINCT ip) FROM analytics WHERE action = 'page_visit' AND ip != 'unknown'")
     unique_visitors = cur.fetchone()[0] or 0
+    
     cur.execute("SELECT breed, COUNT(*) FROM analytics WHERE action LIKE 'calculation_%' GROUP BY breed")
     breed_stats = cur.fetchall()
+    
+    # Total leads
     cur.execute("SELECT COUNT(*) FROM leads")
     total_leads = cur.fetchone()[0] or 0
+    
     conn.close()
-    return {"total_visits": total_visits, "today_visits": today_visits, "unique_visitors": unique_visitors,
-            "total_calculations": total_calculations, "total_leads": total_leads, "breed_stats": breed_stats}
-
-
-# ============================================================
-# BENCHMARK TABLE GENERATOR
-# ============================================================
-
-def get_benchmark_table(breed):
-    weight_data = get_breed_weight_data(breed)
-    feed_data = get_breed_feed_data(breed)
-    days = [7, 14, 21, 28, 35, 42, 49, 56]
-    table_data = []
-    for day in days:
-        weight = weight_data.get(day, 0)
-        feed = feed_data.get(day, 0)
-        fcr = feed / weight if weight > 0 else 0
-        table_data.append([day, f"{weight:.3f}", f"{feed:.3f}", f"{fcr:.3f}"])
-    return table_data, days
-
-
-def get_breed_comparison_table():
-    breeds = ["Ross 308", "Cobb 500", "Arbor Acres"]
-    days = [7, 14, 21, 28, 35, 42, 49, 56]
-    table_data = []
-    for day in days:
-        row = [day]
-        for breed in breeds:
-            weight_data = get_breed_weight_data(breed)
-            feed_data = get_breed_feed_data(breed)
-            weight = weight_data.get(day, 0)
-            feed = feed_data.get(day, 0)
-            fcr = feed / weight if weight > 0 else 0
-            row.append(f"{weight:.3f}")
-            row.append(f"{feed:.3f}")
-            row.append(f"{fcr:.3f}")
-        table_data.append(row)
-    return table_data, breeds, days
-
-
-# ============================================================
-# SHARE LINKS GENERATOR
-# ============================================================
-
-def get_share_links(birds, breed, weeks, days, total_days, bag_size, exact_bags, rounded_bags,
-                    starter_bags, finisher_bags, total_cost, price_per_bag,
-                    currency_symbol, expected_weight, flock_weight, app_url="https://howmuchfeed.com"):
-    message = f"""{app_url} - Results
-
->> QUICK ANSWER:
-Exact feed needed: {exact_bags:.1f} bags of {bag_size} kg feed
-Approximately {rounded_bags} bags to purchase (rounded up)
-To raise {birds:,} {breed} broilers to {weeks} weeks{f" + {days} days" if days > 0 else ""} ({total_days} days)
-
->> FEED BREAKDOWN:
-Starter: {starter_bags:.0f} bags
-Finisher: {finisher_bags:.0f} bags
-TOTAL: {rounded_bags} bags
-
->> FEED COST:
-{currency_symbol}{total_cost:,.0f}
-({rounded_bags} bags x {currency_symbol}{price_per_bag:,.0f} per bag)
-
->> EXPECTED PERFORMANCE:
-Body weight per bird: {expected_weight:.3f} kg
-Flock live weight: {flock_weight:,.1f} kg
-
-Calculate your feed needs:
-{app_url}"""
-    encoded = urllib.parse.quote(message)
+    
     return {
-        "whatsapp": f"https://wa.me/?text={encoded}",
-        "email": f"mailto:?subject=How Much Feed? - Results&body={encoded}",
-        "facebook": f"https://www.facebook.com/sharer/sharer.php?u={urllib.parse.quote(app_url)}&quote={urllib.parse.quote(message[:500])}",
-        "twitter": f"https://twitter.com/intent/tweet?text={urllib.parse.quote(message[:280])}",
+        "total_visits": total_visits,
+        "today_visits": today_visits,
+        "unique_visitors": unique_visitors,
+        "total_calculations": total_calculations,
+        "total_leads": total_leads,
+        "breed_stats": breed_stats
     }
 
 
@@ -482,6 +556,7 @@ Calculate your feed needs:
 # ============================================================
 
 def calculate_feed(birds, weeks, days, bag_size, price_per_bag, email, country_code, breed, request: gr.Request):
+    # Validation
     try:
         birds = int(birds)
         weeks = int(weeks)
@@ -491,69 +566,81 @@ def calculate_feed(birds, weeks, days, bag_size, price_per_bag, email, country_c
     except Exception:
         return "⚠️ Please enter valid numbers.", ""
 
-    if birds <= 0: return "⚠️ Number of birds must be greater than zero.", ""
-    if weeks < 0: return "⚠️ Weeks cannot be negative.", ""
-    if days < 0 or days > 6: return "⚠️ Days must be between 0 and 6.", ""
-    if bag_size <= 0: return "⚠️ Feed bag size must be greater than zero.", ""
-    if price_per_bag < 0: return "⚠️ Price per bag cannot be negative.", ""
+    if birds <= 0:
+        return "⚠️ Number of birds must be greater than zero.", ""
+    if weeks < 0:
+        return "⚠️ Weeks cannot be negative.", ""
+    if days < 0 or days > 6:
+        return "⚠️ Days must be between 0 and 6.", ""
+    if bag_size <= 0:
+        return "⚠️ Feed bag size must be greater than zero.", ""
+    if price_per_bag < 0:
+        return "⚠️ Price per bag cannot be negative.", ""
 
     if not valid_email(email):
         return "📧 **Email required**\n\nPlease enter your email address before calculating.", ""
 
+    # Country / Currency
     country_name, symbol, currency_code = get_country_info(country_code)
     currency_symbol = symbol
 
+    # Save lead with breed
     save_lead(email, country_code, currency_code, breed)
+
+    # Track calculation
+    track_calculation(breed, birds, (weeks * 7 + days))
+
+    # Total days
     total_days = (weeks * 7) + days
 
+    # Total feed
     total_feed_per_bird = interpolate_feed(total_days, breed)
     total_feed_kg = birds * total_feed_per_bird
 
+    # Starter / Finisher
     starter_days = min(total_days, STARTER_END_DAY)
     starter_per_bird = interpolate_feed(starter_days, breed)
     starter_kg = birds * starter_per_bird
     finisher_kg = max(total_feed_kg - starter_kg, 0)
 
+    # Bags
     starter_bags = starter_kg / bag_size
     finisher_bags = finisher_kg / bag_size
-    exact_bags = total_feed_kg / bag_size
-    rounded_bags = math.ceil(exact_bags)
+    total_bags = total_feed_kg / bag_size
+    rounded_bags = math.ceil(total_bags)
     total_cost = rounded_bags * price_per_bag
 
+    # Expected performance
     expected_weight = interpolate_weight(total_days, breed)
     flock_weight = expected_weight * birds
 
+    # Save calculation
     save_calculation(email, country_code, currency_code, breed, birds, weeks, days, total_days,
                      bag_size, price_per_bag, total_feed_kg, starter_kg, finisher_kg,
-                     starter_bags, finisher_bags, exact_bags, rounded_bags, total_cost)
+                     starter_bags, finisher_bags, total_bags, rounded_bags, total_cost)
 
+    # Breed info
     breed_info = BREED_INFO.get(breed, BREED_INFO["Ross 308"])
     breed_color = breed_info["color"]
 
-    share_links = get_share_links(
-        birds, breed, weeks, days, total_days, bag_size, exact_bags, rounded_bags,
-        starter_bags, finisher_bags, total_cost, price_per_bag,
-        currency_symbol, expected_weight, flock_weight
-    )
-
+    # Output HTML
     starter_bags_display = f"{starter_bags:.1f}"
     finisher_bags_display = f"{finisher_bags:.1f}"
+
     age_text = f"{weeks} week{'s' if weeks != 1 else ''}"
     if days:
         age_text += f" + {days} day{'s' if days != 1 else ''}"
 
     html = f"""
     <div style="font-size: 17px; line-height: 1.6;">
+
     <div style="background: #f0fdf4; padding: 18px 22px; border-radius: 14px; border-left: 6px solid #22c55e; margin-bottom: 20px;">
-        <div style="font-size: 13px; color: #16a34a; font-weight: 700; text-transform: uppercase; letter-spacing: 0.8px;">Quick Answer</div>
-        <div style="font-size: 22px; font-weight: 700; color: #166534;">
-            Exact feed needed: <span style="font-size: 26px;">{exact_bags:.1f}</span> bags of {bag_size:g} kg feed
-        </div>
-        <div style="font-size: 24px; font-weight: 800; color: #1e40af; margin: 4px 0;">
-            Approximately {rounded_bags} bags to purchase (rounded up)
+        <div style="font-size: 13px; color: #16a34a; font-weight: 700; text-transform: uppercase; letter-spacing: 0.8px;">🎯 Quick Answer</div>
+        <div style="font-size: 28px; font-weight: 800; color: #166534; margin: 6px 0 4px 0;">
+            ⭐ {rounded_bags} bags of {bag_size:g} kg feed is needed
         </div>
         <div style="color: #374151; font-size: 16px;">
-            To raise <strong>{birds:,}</strong> {breed} broilers to <strong>{age_text} ({total_days} days)</strong>
+            To raise <strong>{birds:,} broiler birds for <strong>{age_text} ({total_days} days)</strong>
         </div>
         <div style="margin-top: 8px; font-size: 13px;">
             <span style="background: {breed_color}; color: white; padding: 3px 12px; border-radius: 14px; font-weight: 600;">{breed}</span>
@@ -562,41 +649,41 @@ def calculate_feed(birds, weeks, days, bag_size, price_per_bag, email, country_c
     </div>
 
     <div style="margin-bottom: 16px;">
-        <div style="font-size: 13px; color: #6b7280; font-weight: 700; text-transform: uppercase; letter-spacing: 0.5px;">Feed Breakdown</div>
+        <div style="font-size: 13px; color: #6b7280; font-weight: 700; text-transform: uppercase; letter-spacing: 0.5px;">🌾 Feed Breakdown</div>
         <table style="width: 100%; border-collapse: collapse; margin-top: 6px; font-size: 15px;">
             <tr style="border-bottom: 1px solid #e5e7eb;">
-                <td style="padding: 8px 4px;"><strong>Starter</strong></td>
+                <td style="padding: 8px 4px;"><strong>🌱 Starter</strong></td>
                 <td style="padding: 8px 4px; text-align: right;">{starter_kg:,.1f} kg</td>
                 <td style="padding: 8px 4px; text-align: right; font-weight: 600;">{starter_bags_display} bags</td>
             </tr>
             <tr style="border-bottom: 1px solid #e5e7eb;">
-                <td style="padding: 8px 4px;"><strong>Finisher</strong></td>
+                <td style="padding: 8px 4px;"><strong>🌽 Finisher</strong></td>
                 <td style="padding: 8px 4px; text-align: right;">{finisher_kg:,.1f} kg</td>
                 <td style="padding: 8px 4px; text-align: right; font-weight: 600;">{finisher_bags_display} bags</td>
             </tr>
             <tr>
                 <td style="padding: 8px 4px; font-weight: 700;">TOTAL</td>
                 <td style="padding: 8px 4px; text-align: right; font-weight: 700;">{total_feed_kg:,.1f} kg</td>
-                <td style="padding: 8px 4px; text-align: right; font-weight: 700;">{exact_bags:.1f}</td>
+                <td style="padding: 8px 4px; text-align: right; font-weight: 700;">{total_bags:.1f}</td>
             </tr>
         </table>
     </div>
 
     <div style="margin-bottom: 16px; background: #eff6ff; padding: 14px 18px; border-radius: 10px; border-left: 4px solid #3b82f6;">
-        <div style="font-size: 13px; color: #6b7280; font-weight: 700; text-transform: uppercase; letter-spacing: 0.5px;">Feed Cost</div>
+        <div style="font-size: 13px; color: #6b7280; font-weight: 700; text-transform: uppercase; letter-spacing: 0.5px;">💰 Feed Cost</div>
         <div style="font-size: 30px; font-weight: 800; color: #1e40af;">
             {currency_symbol}{total_cost:,.0f}
         </div>
         <div style="color: #6b7280; font-size: 14px;">
-            Approximately {rounded_bags} bags x {currency_symbol}{price_per_bag:,.0f} per bag
+            {rounded_bags} bags × {currency_symbol}{price_per_bag:,.0f} per bag
         </div>
     </div>
 
     <div style="border-top: 1px solid #e5e7eb; padding-top: 14px;">
-        <div style="font-size: 13px; color: #6b7280; font-weight: 700; text-transform: uppercase; letter-spacing: 0.5px;">Expected Performance</div>
+        <div style="font-size: 13px; color: #6b7280; font-weight: 700; text-transform: uppercase; letter-spacing: 0.5px;">📊 Expected Performance</div>
         <table style="width: 100%; border-collapse: collapse; margin-top: 6px; font-size: 15px;">
             <tr style="border-bottom: 1px solid #e5e7eb;">
-                <td style="padding: 6px 4px;">Body weight per bird</td>
+                <td style="padding: 6px 4px;">Body weight / bird</td>
                 <td style="padding: 6px 4px; text-align: right; font-weight: 600;">{expected_weight:.3f} kg</td>
             </tr>
             <tr>
@@ -606,26 +693,8 @@ def calculate_feed(birds, weeks, days, bag_size, price_per_bag, email, country_c
         </table>
     </div>
 
-    <div style="margin-top: 16px; border-top: 1px solid #e5e7eb; padding-top: 14px;">
-        <div style="font-size: 13px; color: #6b7280; font-weight: 600; margin-bottom: 8px;">Share Results:</div>
-        <div style="display: flex; gap: 10px; flex-wrap: wrap;">
-            <a href="{share_links['whatsapp']}" target="_blank" style="text-decoration: none;">
-                <button style="background: #25D366; color: white; padding: 8px 16px; border: none; border-radius: 8px; cursor: pointer; font-size: 14px; font-weight: 600;">WhatsApp</button>
-            </a>
-            <a href="{share_links['email']}" target="_blank" style="text-decoration: none;">
-                <button style="background: #ea4335; color: white; padding: 8px 16px; border: none; border-radius: 8px; cursor: pointer; font-size: 14px; font-weight: 600;">Email</button>
-            </a>
-            <a href="{share_links['facebook']}" target="_blank" style="text-decoration: none;">
-                <button style="background: #1877f2; color: white; padding: 8px 16px; border: none; border-radius: 8px; cursor: pointer; font-size: 14px; font-weight: 600;">Facebook</button>
-            </a>
-            <a href="{share_links['twitter']}" target="_blank" style="text-decoration: none;">
-                <button style="background: #000000; color: white; padding: 8px 16px; border: none; border-radius: 8px; cursor: pointer; font-size: 14px; font-weight: 600;">Twitter/X</button>
-            </a>
-        </div>
-    </div>
-
     <div style="margin-top: 14px; font-size: 12px; color: #9ca3af; border-top: 1px solid #f3f4f6; padding-top: 10px;">
-        Estimate based on {breed} benchmark. Actual results may vary.
+        ⚠️ Estimate based on {breed} benchmark. Actual results may vary.
     </div>
     </div>
     """
@@ -640,14 +709,77 @@ def calculate_feed(birds, weeks, days, bag_size, price_per_bag, email, country_c
 def answer_farmer_question(question, email, breed):
     if not question or not question.strip():
         return "Please type or speak your question first."
+
     save_question(email or "", question, breed)
-    return f"""
-### Question received
+
+    q = question.lower().strip()
+
+    if "bag" in q and ("feed" in q or "birds" in q):
+        answer = """
+### 🐔 Feed-bag questions
+
+For an exact feed estimate, use the calculator above.
+
+Enter:
+1. Number of birds
+2. Age in weeks + days
+3. Feed bag size
+4. Price per bag
+5. Your email
+6. Breed
+
+The calculator will give you the estimated total bags, starter/finisher breakdown and feed cost.
+"""
+    elif "breed" in q or "ross" in q or "cobb" in q or "arbor" in q:
+        answer = """
+### 🐔 Common Broiler Breeds in Nigeria
+
+| Breed | Characteristics | Available At |
+|-------|-----------------|--------------|
+| **Ross 308** | Big chest, thick legs, very fast growth | Agrited, Sayed, Valentine |
+| **Cobb 500** | Good early growth, strong legs | Chikun, Zartech |
+| **Arbor Acres** | Balanced growth, hardy, adaptable | Supreme, CHI, GS, Vertex, Fidan, Cascada, Orobor, Sunchi, Farm Support, Ajila |
+
+💡 **Tip:** Before buying chicks, ask about the breed and hatchery. Not all broilers are the same!
+"""
+    elif "starter" in q:
+        answer = f"""
+### 🌾 Starter feed
+
+Starter feed is used during the early growth period (Day 0–{STARTER_END_DAY}).
+
+The calculator separates the estimated feed requirement into **Starter** and **Finisher** based on the selected age.
+"""
+    elif "finisher" in q:
+        answer = f"""
+### 🌾 Finisher feed
+
+Finisher feed is used after day {STARTER_END_DAY}.
+
+Your calculator automatically estimates the finisher requirement from the selected number of birds and total age.
+"""
+    elif "cost" in q or "price" in q:
+        answer = """
+### 💰 Feed cost
+
+Enter the current price of one feed bag in the calculator.
+
+The app calculates: **Number of bags × price per bag = estimated feed cost**
+
+The result is for **feed alone**.
+"""
+    else:
+        answer = f"""
+### 💡 Question received
 
 **“{question.strip()}”**
 
 Your question has been saved.
-    """
+
+We can use the questions farmers submit to decide which answers, calculators and features should be added to the app next.
+"""
+
+    return answer
 
 
 # ============================================================
@@ -655,54 +787,67 @@ Your question has been saved.
 # ============================================================
 
 def update_benchmark(breed):
+    """Update the benchmark table when breed changes."""
     table_data, days = get_benchmark_table(breed)
     return table_data
 
 
 def on_country_change_handler(country_selection):
+    """Update price and currency when country changes."""
     if country_selection == "Auto-Detect":
         country_code = detect_country_from_env() or "NG"
     else:
         country_code = country_selection
+
     _, symbol, currency_code = get_country_info(country_code)
     default_price = get_default_price(currency_code)
     return country_code, default_price, symbol
 
 
 # ============================================================
-# ADMIN FUNCTIONS
+# ADMIN FUNCTIONS - FIXED VERSION
 # ============================================================
 
 def show_analytics(password):
+    """Display analytics summary - only with correct password."""
     if password != ADMIN_PASSWORD:
-        return "🔒 Admin Access Required\n\nPlease enter the correct admin password."
+        return """
+        ### 🔒 Admin Access Required
+        
+        Please enter the correct admin password to view analytics.
+        """
+    
     stats = get_analytics_summary()
+    
     breed_stats_html = ""
     for breed, count in stats["breed_stats"]:
         breed_stats_html += f"<li><strong>{breed}</strong>: {count} calculations</li>"
+    
     if not breed_stats_html:
         breed_stats_html = "<li>No calculations yet</li>"
+    
     return f"""
-### How Much Feed? - Analytics
-
-| Metric | Value |
-|--------|-------|
-| **Total Visits** | **{stats['total_visits']:,}** |
-| **Today's Visits** | **{stats['today_visits']}** |
-| **Unique Visitors** | **{stats['unique_visitors']:,}** |
-| **Total Calculations** | **{stats['total_calculations']:,}** |
-| **Total Leads (Emails)** | **{stats['total_leads']:,}** |
-
-### Most Popular Breeds
-
-<ul>{breed_stats_html}</ul>
-
----
-*Last updated: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}*
+    ### 📊 Poultry Feed Calculator - Analytics
+    
+    | Metric | Value |
+    |--------|-------|
+    | **Total Visits** | **{stats['total_visits']:,}** |
+    | **Today's Visits** | **{stats['today_visits']}** |
+    | **Unique Visitors** | **{stats['unique_visitors']:,}** |
+    | **Total Calculations** | **{stats['total_calculations']:,}** |
+    | **Total Leads (Emails)** | **{stats['total_leads']:,}** |
+    
+    ### 🐔 Most Popular Breeds
+    
+    <ul>{breed_stats_html}</ul>
+    
+    ---
+    *Last updated: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}*
     """
 
 
 def admin_login(password):
+    """Check admin password."""
     if password == ADMIN_PASSWORD:
         return show_analytics(password), gr.update(visible=True), gr.update(visible=False)
     else:
@@ -710,25 +855,31 @@ def admin_login(password):
 
 
 def logout_admin():
+    """Logout and hide analytics."""
     return "🔒 Enter password to view analytics.", gr.update(visible=True), gr.update(visible=False)
 
 
 def export_leads_to_csv():
+    """Export all leads to CSV format."""
     conn = sqlite3.connect(DB_PATH)
     cur = conn.cursor()
     cur.execute("SELECT email, country, currency, breed, created_at FROM leads ORDER BY created_at DESC")
     rows = cur.fetchall()
     conn.close()
+
     import csv
     from io import StringIO
+    
     output = StringIO()
     writer = csv.writer(output)
     writer.writerow(["Email", "Country", "Currency", "Breed", "Created At"])
     writer.writerows(rows)
+    
     return output.getvalue()
 
 
 def export_leads_wrapper():
+    """Export leads to CSV file for download."""
     import tempfile
     csv_data = export_leads_to_csv()
     temp = tempfile.NamedTemporaryFile(mode='w', suffix='.csv', delete=False, encoding='utf-8')
@@ -738,21 +889,30 @@ def export_leads_wrapper():
 
 
 def export_calculations_wrapper():
+    """Export calculations to CSV file for download."""
     conn = sqlite3.connect(DB_PATH)
     cur = conn.cursor()
-    cur.execute("SELECT email, breed, birds, total_days, exact_bags, rounded_bags, bag_size, total_cost, created_at FROM calculations ORDER BY created_at DESC")
+    cur.execute("""
+        SELECT email, breed, birds, total_days, rounded_bags, bag_size, total_cost, created_at 
+        FROM calculations 
+        ORDER BY created_at DESC
+    """)
     rows = cur.fetchall()
     conn.close()
+    
     import csv
     import tempfile
+    
     temp = tempfile.NamedTemporaryFile(mode='w', suffix='.csv', delete=False, encoding='utf-8')
     writer = csv.writer(temp)
-    writer.writerow(["Email", "Breed", "Birds", "Total Days", "Exact Bags", "Rounded Bags", "Bag Size (kg)", "Total Cost", "Created At"])
+    writer.writerow(["Email", "Breed", "Birds", "Total Days", "Bags", "Bag Size (kg)", "Total Cost", "Created At"])
     writer.writerows(rows)
     temp.close()
+    
     return temp.name
 
 
+
 # ============================================================
 # CSS
 # ============================================================
@@ -778,125 +938,314 @@ with gr.Blocks(title=APP_NAME) as demo:
 
     gr.HTML("""
     <div class="main-title">
-        <h1>🐔 How Much Feed?</h1>
+        <h1>🐔 PoultryFeedCalc</h1>
         <p>How many bags of feed for broilers for 5, 6, 7, or 8 weeks? Get accurate feed needed and estimated cost for your birds.</p>
     </div>
     """)
 
     with gr.Row(equal_height=True):
+
+        # LEFT COLUMN: INPUTS
         with gr.Column(scale=1, min_width=350):
+
             with gr.Group():
                 gr.Markdown("## 🐔 Breed & Birds")
-                breed = gr.Dropdown(choices=["Ross 308", "Cobb 500", "Arbor Acres"], value="Ross 308", label="Breed")
-                birds = gr.Dropdown(choices=[25, 50, 75, 100, 150, 200, 500, 1000], value=50, label="Number of birds", allow_custom_value=True)
+
+                breed = gr.Dropdown(
+                    choices=["Ross 308", "Cobb 500", "Arbor Acres"],
+                    value="Ross 308",
+                    label="Breed",
+                    info="Select your broiler breed for accurate estimates",
+                )
+
+                birds = gr.Dropdown(
+                    choices=[25, 50, 75, 100, 150, 200, 500, 1000],
+                    value=50,
+                    label="Number of birds",
+                    allow_custom_value=True,
+                )
+
                 gr.Markdown("## 📅 Expected Age of Birds")
+
                 with gr.Row():
-                    weeks = gr.Dropdown(choices=list(range(0, 21)), value=8, label="Weeks")
-                    days = gr.Dropdown(choices=list(range(0, 7)), value=0, label="+ Days")
+                    weeks = gr.Dropdown(
+                        choices=list(range(0, 21)),
+                        value=8,
+                        label="Weeks",
+                    )
+                    days = gr.Dropdown(
+                        choices=list(range(0, 7)),
+                        value=0,
+                        label="+ Days",
+                    )
+
                 gr.Markdown("## 🌾 Feed")
+
                 with gr.Row():
-                    bag_size = gr.Dropdown(choices=[10, 20, 25, 50, 100], value=25, label="Bag size (kg)")
-                    price = gr.Number(value=24000, label="Price per bag", minimum=0)
+                    bag_size = gr.Dropdown(
+                        choices=[10, 20, 25, 50, 100 ],
+                        value=25,
+                        label="Bag size (kg)",
+                    )
+                    price = gr.Number(
+                        value=24000,
+                        label=f"Price per bag ",
+                        minimum=0,
+                    )
+
                 gr.Markdown("## 🌍 Country & Currency")
+
                 detected_country = detect_country_from_env() or "NG"
                 country_choices = ["Auto-Detect"] + [code for code, _ in COUNTRY_LIST]
-                country_dropdown = gr.Dropdown(choices=country_choices, value="Auto-Detect", label="Select your country (Auto-Detect uses your IP)")
+
+                country_dropdown = gr.Dropdown(
+                    choices=country_choices,
+                    value="Auto-Detect",
+                    label="Select your country (Auto-Detect uses your IP)",
+                )
+
                 country_code_state = gr.State(detected_country)
+
             gr.Markdown("## 📧 Your email")
-            email = gr.Textbox(label="", placeholder="farmer@example.com", type="email", elem_classes=["email-box"], info="Required — we'll send you future updates")
-            calculate_btn = gr.Button("🐔 Calculate Feed Requirement", variant="primary", size="lg")
+
+            email = gr.Textbox(
+                label="",
+                placeholder="farmer@example.com",
+                type="email",
+                elem_classes=["email-box"],
+                info="Required — we'll send you future updates",
+            )
+
+            calculate_btn = gr.Button(
+                "🐔 Calculate Feed Requirement",
+                variant="primary",
+                size="lg",
+            )
+
             save_status = gr.Markdown("")
 
+        # RIGHT COLUMN: RESULTS
         with gr.Column(scale=1, min_width=350):
+
             gr.Markdown("## 🎯 Quick Answer")
-            result = gr.HTML(value="""<div style="font-size: 16px; color: #9ca3af; text-align: center; padding: 40px 20px;"><div style="font-size: 48px; margin-bottom: 12px;">🐔</div><div>Select your breed, enter details and click <strong>Calculate</strong></div></div>""", elem_classes=["answer-box"])
+
+            result = gr.HTML(
+                value="""
+                <div style="font-size: 16px; color: #9ca3af; text-align: center; padding: 40px 20px;">
+                    <div style="font-size: 48px; margin-bottom: 12px;">🐔</div>
+                    <div>Select your breed, enter details and click <strong>Calculate</strong></div>
+                    <div style="font-size: 14px; margin-top: 8px;">Your feed estimate will appear here</div>
+                </div>
+                """,
+                elem_classes=["answer-box"],
+            )
+
+    # ============================================================
+    # BENCHMARK SECTION
+    # ============================================================
 
     gr.Markdown("---")
+
     with gr.Tabs():
         with gr.TabItem("📊 Selected Breed Benchmark"):
             gr.Markdown("### 📊 Weekly Benchmark for Selected Breed")
             initial_table, _ = get_benchmark_table("Ross 308")
-            benchmark_table = gr.Dataframe(value=initial_table, headers=["Days", "Body Weight (kg)", "Cumulative Feed (kg)", "FCR"], interactive=False, wrap=True)
+
+            benchmark_table = gr.Dataframe(
+                value=initial_table,
+                headers=["Days", "Body Weight (kg)", "Cumulative Feed (kg)", "FCR"],
+                interactive=False,
+                wrap=True,
+            )
+
         with gr.TabItem("📈 Breed Comparison"):
             gr.Markdown("### 📊 Breed Comparison (As-Hatched Performance)")
             comp_data, breeds_list, days_list = get_breed_comparison_table()
+
             headers = ["Days"]
             for b in breeds_list:
                 headers.append(f"{b} Weight (kg)")
                 headers.append(f"{b} Feed (kg)")
                 headers.append(f"{b} FCR")
-            comparison_table = gr.Dataframe(value=comp_data, headers=headers, interactive=False, wrap=True)
+
+            comparison_table = gr.Dataframe(
+                value=comp_data,
+                headers=headers,
+                interactive=False,
+                wrap=True,
+            )
+
+          # ============================================================
+        # ADMIN-ONLY ANALYTICS TAB
+        # ============================================================
+        
         with gr.TabItem("🔒 Admin"):
             gr.Markdown("### 🔒 Admin Dashboard")
+            
             with gr.Group(elem_classes="admin-login"):
                 gr.Markdown("Enter admin password to view analytics and download data.")
+                
                 with gr.Row():
-                    admin_password_input = gr.Textbox(label="Admin Password", placeholder="Enter password...", type="password", scale=2)
+                    admin_password_input = gr.Textbox(
+                        label="Admin Password",
+                        placeholder="Enter password...",
+                        type="password",
+                        scale=2,
+                    )
                     login_btn = gr.Button("Login", variant="primary", scale=1)
                     logout_btn = gr.Button("Logout", variant="secondary", scale=1)
+            
+            # Analytics output
             admin_output = gr.Markdown("🔒 Enter password to view analytics.")
+            
+            # Export buttons
             with gr.Row():
                 export_leads_btn = gr.Button("📥 Export Leads (CSV)", variant="secondary")
                 export_leads_output = gr.File(label="Download Leads CSV")
+            
             with gr.Row():
                 export_calc_btn = gr.Button("📥 Export Calculations (CSV)", variant="secondary")
                 export_calc_output = gr.File(label="Download Calculations CSV")
-            login_btn.click(fn=admin_login, inputs=[admin_password_input], outputs=[admin_output, admin_password_input, logout_btn])
-            logout_btn.click(fn=logout_admin, inputs=[], outputs=[admin_output, admin_password_input, logout_btn])
-            export_leads_btn.click(fn=export_leads_wrapper, inputs=[], outputs=[export_leads_output])
-            export_calc_btn.click(fn=export_calculations_wrapper, inputs=[], outputs=[export_calc_output])
+            
+            # Login/Logout events
+            login_btn.click(
+                fn=admin_login,
+                inputs=[admin_password_input],
+                outputs=[admin_output, admin_password_input, logout_btn],
+            )
+            
+            logout_btn.click(
+                fn=logout_admin,
+                inputs=[],
+                outputs=[admin_output, admin_password_input, logout_btn],
+            )
+            
+            # Export events
+            export_leads_btn.click(
+                fn=export_leads_wrapper,
+                inputs=[],
+                outputs=[export_leads_output],
+            )
+            
+            export_calc_btn.click(
+                fn=export_calculations_wrapper,
+                inputs=[],
+                outputs=[export_calc_output],
+            )
+            
+    # ============================================================
+    # BREED REFERENCE
+    # ============================================================
 
     gr.Markdown("---")
+
     gr.Markdown("""
     ### 🐔 Common Broiler Breeds in Nigeria
+
     | Breed | Characteristics | Available At |
     |-------|-----------------|--------------|
     | **Ross 308** | Big chest, thick legs, very fast growth | Agrited, Sayed, Valentine |
     | **Cobb 500** | Good early growth, strong legs | Chikun, Zartech |
     | **Arbor Acres** | Balanced growth, hardy, adaptable | Supreme, CHI, GS, Vertex, Fidan, Cascada, Orobor, Sunchi, Farm Support, Ajila |
+
+    💡 **Tip:** Before buying chicks, ask about the breed and hatchery. Not all broilers are the same!
     """)
 
+    # ============================================================
+    # HOW IT WORKS
+    # ============================================================
+
     gr.Markdown("---")
+
     with gr.Row():
         with gr.Column(scale=1):
             gr.Markdown("""
             ### 📌 How it works
+
             - **Weeks + Days** → total days
             - **Starter** → Day 0–21
             - **Finisher** → Day 22+
             - **Bags** → rounded up to next whole bag
             - **Breed-specific benchmarks** used for estimates
+
+            ⚠️ Actual results may vary with management, feed quality, and other conditions.
             """)
+
         with gr.Column(scale=1):
             gr.Markdown("""
             ### 📊 Data Sources
+
             - **Ross 308** — Aviagen (2022)
             - **Cobb 500** — Cobb-Vantress
             - **Arbor Acres** — Aviagen (2022)
+
+            *All data from official breed performance objectives.*
             """)
 
+    # ============================================================
+    # QUESTION SECTION
+    # ============================================================
+
     gr.Markdown("---")
+
     with gr.Row():
         with gr.Column(scale=2):
             gr.Markdown("""
             # ❓ Ask a question
             ### What would you like to know about raising your birds?
             """)
-            question = gr.Textbox(label="", placeholder="e.g. How many bags of feed for 100 broilers for 6 weeks?", lines=3)
+
+            question = gr.Textbox(
+                label="",
+                placeholder="e.g. How many bags of feed for 100 broilers for 6 weeks?",
+                lines=3,
+            )
+
             ask_btn = gr.Button("💬 Get Answer", variant="secondary", size="lg")
             question_answer = gr.Markdown("")
 
-    breed.change(fn=update_benchmark, inputs=[breed], outputs=[benchmark_table])
-    country_dropdown.change(fn=on_country_change_handler, inputs=[country_dropdown], outputs=[country_code_state, price, price])
+    # ============================================================
+    # EVENTS
+    # ============================================================
+
+    # Update benchmark table when breed changes
+    breed.change(
+        fn=update_benchmark,
+        inputs=[breed],
+        outputs=[benchmark_table],
+    )
+
+    # Update price and currency when country changes
+    country_dropdown.change(
+        fn=on_country_change_handler,
+        inputs=[country_dropdown],
+        outputs=[country_code_state, price, price],
+    )
 
+    # Calculate button
     def calculate_wrapper(birds, weeks, days, bag_size, price_per_bag, email, country_code_state, breed, request: gr.Request):
         if not country_code_state:
             country_code_state = "NG"
         return calculate_feed(birds, weeks, days, bag_size, price_per_bag, email, country_code_state, breed, request)
 
-    calculate_btn.click(fn=calculate_wrapper, inputs=[birds, weeks, days, bag_size, price, email, country_code_state, breed], outputs=[result, save_status])
-    ask_btn.click(fn=answer_farmer_question, inputs=[question, email, breed], outputs=[question_answer])
-    demo.load(fn=track_visit, inputs=None, outputs=None)
+    calculate_btn.click(
+        fn=calculate_wrapper,
+        inputs=[birds, weeks, days, bag_size, price, email, country_code_state, breed],
+        outputs=[result, save_status],
+    )
+
+    ask_btn.click(
+        fn=answer_farmer_question,
+        inputs=[question, email, breed],
+        outputs=[question_answer],
+    )
+
+    # Track visits on page load
+    demo.load(
+        fn=track_visit,
+        inputs=None,
+        outputs=None,
+    )
 
 
 # ============================================================