diff --git a/proiect-nutritie-java/src/main/webapp/index.html b/proiect-nutritie-java/src/main/webapp/index.html
index 2e013aa..3e972c8 100644
--- a/proiect-nutritie-java/src/main/webapp/index.html
+++ b/proiect-nutritie-java/src/main/webapp/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <title>NutriAI Elite v26.3</title>
+    <title>NutriAI Elite v20.0</title>
     <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
@@ -11,167 +11,183 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css">
     <style>
         :root { --primary: #3b82f6; --bg: #020617; --sidebar: #0f172a; --card: #1e293b; --accent: #60a5fa; --text: #ffffff; }
+        
+        body.theme-dark { --bg: #020617; --sidebar: #0f172a; --primary: #3b82f6; }
+        body.theme-emerald { --bg: #064e3b; --sidebar: #065f46; --primary: #10b981; }
+        body.theme-midnight { --bg: #1e1b4b; --sidebar: #312e81; --primary: #818cf8; }
+        body.theme-titanium { --bg: #111827; --sidebar: #1f2937; --primary: #94a3b8; --card: #374151; --accent: #f8fafc; }
+
         body { background-color: var(--bg); color: var(--text); font-family: 'Outfit', sans-serif; height: 100dvh; overflow: hidden; transition: 0.3s; }
+        
         .main-wrapper { display: flex; height: 100dvh; flex-direction: row; }
         @media (max-width: 991px) { 
             .main-wrapper { flex-direction: column; overflow-y: auto; height: auto; }
-            .sidebar { width: 360px !important; height: auto !important; border-right: none !important; margin: 0 auto; }
-            .chat-section { height: 700px !important; }
+            .sidebar { width: 100% !important; height: auto !important; border-right: none !important; border-bottom: 1px solid rgba(255,255,255,0.1); }
+            .chat-section { height: 600px !important; }
             body { overflow-y: auto; }
         }
+
         .sidebar { width: 360px; background: var(--sidebar); border-right: 1px solid rgba(255,255,255,0.1); padding: 1.5rem; overflow-y: auto; flex-shrink: 0; }
         .chat-section { flex-grow: 1; display: flex; flex-direction: column; background: rgba(0,0,0,0.2); position: relative; }
+        
         .label-pro { color: var(--accent); font-weight: 800; font-size: 0.75rem; text-transform: uppercase; margin-bottom: 5px; display: block; }
-        .glass-input { background: #fff !important; color: #000 !important; border: 3px solid var(--primary) !important; border-radius: 8px; font-weight: 800 !important; height: 45px; }
-        .stat-panel { background: linear-gradient(145deg, var(--primary), #1e3a8a); border-radius: 15px; padding: 1.5rem; margin: 15px 0; text-align: center; box-shadow: 0 10px 20px rgba(0,0,0,0.3); }
-        .water-hub { background: rgba(59, 130, 246, 0.1); border: 2px solid var(--primary); border-radius: 15px; padding: 15px; margin: 10px 0; text-align: center; }
-        .macro-hub { background: rgba(255,255,255,0.05); border-radius: 20px; padding: 20px; margin-top: 10px; border: 1px solid rgba(255,255,255,0.1); }
-        .chat-container { flex-grow: 1; overflow-y: auto; padding: 1.5rem; display: flex; flex-direction: column; gap: 1rem; }
-        .msg { padding: 1.2rem; border-radius: 1rem; font-size: 1rem; max-width: 90%; color: #fff !important; line-height: 1.5; }
-        .ai { background: var(--card); border-left: 5px solid var(--primary); align-self: flex-start; box-shadow: 0 4px 15px rgba(0,0,0,0.2); }
-        .user { background: var(--primary); align-self: flex-end; box-shadow: 0 4px 15px rgba(59, 130, 246, 0.3); }
-        .top-ctrl { padding: 12px 20px; display: flex; justify-content: flex-end; gap: 10px; background: rgba(0,0,0,0.4); border-bottom: 1px solid rgba(255,255,255,0.1); }
-        .input-area { padding: 20px; background: var(--sidebar); border-top: 1px solid rgba(255,255,255,0.1); display: flex; gap: 12px; }
-        .btn-shop { background: #f59e0b; color: #000; font-weight: 800; border: none; border-radius: 10px; padding: 0 20px; transition: 0.2s; }
-        .btn-reset { background: rgba(239, 68, 68, 0.1); color: #fca5a5; border: 1px solid #ef4444; border-radius: 10px; padding: 12px; font-weight: 700; width: 100%; margin-top: 20px; }
-        table { width: 100%; border-collapse: collapse; margin: 15px 0; background: rgba(0,0,0,0.3); border-radius: 10px; overflow: hidden; }
-        th, td { border: 1px solid rgba(255,255,255,0.1); padding: 12px; text-align: left; }
-        th { background: rgba(59, 130, 246, 0.2); color: var(--accent); font-weight: 800; text-transform: uppercase; font-size: 0.75rem; }
-        .theme-light { --bg: #f8fafc; --sidebar: #ffffff; --card: #f1f5f9; --text: #0f172a; }
-        .theme-light .ai { color: #0f172a !important; }
+        .glass-input { background: #fff !important; color: #000 !important; border: 3px solid var(--primary) !important; border-radius: 12px; font-weight: 800 !important; }
+
+        .stat-panel { background: linear-gradient(145deg, var(--primary), #1e3a8a); border-radius: 20px; padding: 1rem; margin: 10px 0; text-align: center; }
+        .water-hub { background: rgba(59, 130, 246, 0.1); border: 2px solid var(--primary); border-radius: 15px; padding: 12px; margin: 10px 0; text-align: center; }
+        .macro-hub { background: rgba(255,255,255,0.05); border-radius: 20px; padding: 15px; margin-top: 10px; }
+
+        .chat-container { flex-grow: 1; overflow-y: auto; padding: 1.5rem; display: flex; flex-direction: column; }
+        .msg { padding: 1.2rem; border-radius: 1.2rem; margin-bottom: 1rem; font-size: 1rem; max-width: 90%; color: #fff !important; word-wrap: break-word; }
+        .ai { background: var(--card); border-left: 6px solid var(--primary); align-self: flex-start; }
+        .user { background: var(--primary); align-self: flex-end; }
+
+        .top-ctrl { padding: 10px; display: flex; justify-content: flex-end; gap: 8px; background: rgba(0,0,0,0.3); }
+        .input-area { padding: 15px; background: var(--sidebar); border-top: 1px solid rgba(255,255,255,0.1); display: flex; gap: 10px; }
+        
+        .btn-shop { background: #f59e0b; color: #000; font-weight: 800; border: none; border-radius: 12px; padding: 0 15px; white-space: nowrap; }
+        .btn-reset { background: rgba(239, 68, 68, 0.15); color: #fca5a5; border: 1px solid #ef4444; border-radius: 12px; padding: 8px; font-weight: 700; width: 100%; margin-top: 15px; }
+        
+        table { width: 100%; display: block; overflow-x: auto; color: #fff; border-collapse: collapse; margin-top: 10px; }
+        th, td { border: 1px solid rgba(255,255,255,0.2); padding: 8px; text-align: left; }
     </style>
 </head>
-<body id="mainBody" class="theme-dark">
+<body class="theme-dark">
 
 <div class="main-wrapper">
     <div class="sidebar">
-        <h3 class="fw-extrabold mb-4"><i class="fas fa-bolt text-primary"></i> NUTRI ELITE</h3>
-        <div class="row g-3">
-            <div class="col-6"><label class="label-pro" id="txtW">Current (kg)</label><input type="number" id="w" class="form-control glass-input" placeholder="--" oninput="update()"></div>
-            <div class="col-6"><label class="label-pro" id="txtT">Target (kg)</label><input type="number" id="t" class="form-control glass-input" placeholder="--" oninput="update()"></div>
-            <div class="col-6"><label class="label-pro" id="txtH">Height (cm)</label><input type="number" id="h" class="form-control glass-input" placeholder="--" oninput="update()"></div>
+        <h3 class="fw-extrabold mb-3"><i class="fas fa-bolt text-primary"></i> NUTRI ELITE</h3>
+        
+        <div class="row g-2">
+            <div class="col-6"><label class="label-pro" id="txtW">Weight</label><input type="number" id="w" class="form-control glass-input" placeholder="--" oninput="update()"></div>
+            <div class="col-6"><label class="label-pro" id="txtT">Target</label><input type="number" id="t" class="form-control glass-input" placeholder="--" oninput="update()"></div>
+            <div class="col-6"><label class="label-pro" id="txtH">Height</label><input type="number" id="h" class="form-control glass-input" placeholder="--" oninput="update()"></div>
             <div class="col-6"><label class="label-pro">Age</label><input type="number" id="age" class="form-control glass-input" placeholder="--" oninput="update()"></div>
+            
             <div class="col-12">
-                <label class="label-pro">Activity Level</label>
+                <label class="label-pro">Activity</label>
                 <select id="act" class="form-select glass-input" onchange="update()">
                     <option value="" disabled selected>Select activity...</option>
-                    <option value="1.2">Sedentary (Office job)</option>
-                    <option value="1.375">Lightly Active (1-2 days/week)</option>
-                    <option value="1.55">Moderately Active (3-5 days/week)</option>
-                    <option value="1.725">Very Active (6-7 days/week)</option>
-                    <option value="1.9">Extra Active (Athlete)</option>
+                    <option value="1.2">Sedentary</option>
+                    <option value="1.375">Lightly Active</option>
+                    <option value="1.55">Moderately Active</option>
+                    <option value="1.725">Very Active</option>
+                    <option value="1.9">Extra Active</option>
                 </select>
             </div>
             <div class="col-12">
-                <div class="d-flex justify-content-between"><label class="label-pro">Adjustment</label><span id="aggDisp" class="badge bg-primary">0 kcal</span></div>
+                <label class="label-pro d-flex justify-content-between">Adjustment <span id="aggDisp">0 kcal</span></label>
                 <input type="range" id="agg" class="form-range" min="-1000" max="1000" step="50" value="0" oninput="update()">
             </div>
         </div>
-        <div class="stat-panel"><h1 class="fw-bold mb-0" id="kcal">0</h1><p class="text-uppercase fw-bold m-0 opacity-75 small">Target Calories</p></div>
-        <div class="water-hub"><h2 class="fw-bold text-info mb-0" id="h2o">0.0L</h2><span class="label-pro mb-0">Daily Hydration</span></div>
-        <div class="macro-hub"><canvas id="mChart" style="max-height: 140px;"></canvas>
-            <div class="row mt-3 text-center fw-bold small">
+
+        <div class="stat-panel">
+            <h1 class="fw-bold mb-0" id="kcal">0</h1>
+            <p class="text-uppercase fw-bold m-0 opacity-75 small">Target Calories</p>
+        </div>
+
+        <div class="water-hub">
+            <h2 class="fw-bold text-info mb-0" id="h2o">0.0L</h2>
+            <span class="label-pro"><i class="fas fa-droplet me-1"></i> Daily Hydration</span>
+        </div>
+
+        <div class="macro-hub">
+            <canvas id="mChart" style="max-height: 120px;"></canvas>
+            <div class="row mt-2 text-center fw-bold small">
                 <div class="col-4 text-info">P: <span id="pG">0g</span></div>
                 <div class="col-4 text-danger">C: <span id="cG">0g</span></div>
                 <div class="col-4 text-warning">F: <span id="fG">0g</span></div>
             </div>
         </div>
-        <button class="btn-reset" onclick="resetAll()">RESET DASHBOARD</button>
+
+        <button class="btn-reset" onclick="resetAll()"><i class="fas fa-sync me-2"></i> RESET SYSTEM</button>
     </div>
 
     <div class="chat-section">
         <div class="top-ctrl">
-            <button id="btnMetric" class="btn btn-primary btn-sm active px-3" onclick="setUnits('metric')">METRIC</button>
-            <button id="btnImperial" class="btn btn-outline-primary btn-sm px-3" onclick="setUnits('imperial')">IMP</button>
-            <button class="btn btn-dark btn-sm rounded-circle" onclick="toggleTheme()"><i class="fas fa-palette"></i></button>
+            <button id="btnMetric" class="btn btn-primary btn-sm active" onclick="setUnits('metric')">METRIC</button>
+            <button id="btnImperial" class="btn btn-outline-primary btn-sm" onclick="setUnits('imperial')">IMP</button>
+            <div class="dropdown">
+                <button class="btn btn-light btn-sm rounded-pill px-3" data-bs-toggle="dropdown"><i class="fas fa-palette"></i></button>
+                <ul class="dropdown-menu dropdown-menu-end shadow">
+                    <li><a class="dropdown-item" href="#" onclick="setTheme('dark')">Onyx</a></li>
+                    <li><a class="dropdown-item" href="#" onclick="setTheme('emerald')">Emerald</a></li>
+                    <li><a class="dropdown-item" href="#" onclick="setTheme('midnight')">Midnight</a></li>
+                    <li><a class="dropdown-item" href="#" onclick="setTheme('titanium')">Titanium</a></li>
+                </ul>
+            </div>
         </div>
+
         <div id="chat" class="chat-container">
-            <div class="msg ai shadow">System Ready. Biometric Audit Engaged.</div>
+            <div class="msg ai shadow">
+                <h5 class="fw-bold text-primary">System Unified.</h5>
+                Shopping list and Water tracker are back. All fields reset on load.
+            </div>
         </div>
+
         <div class="input-area">
             <div class="input-group input-group-lg flex-grow-1">
-                <input type="text" id="uIn" class="form-control bg-dark text-white border-primary" placeholder="Ask for a meal plan..." onkeydown="if(event.key==='Enter') talk()">
+                <input type="text" id="uIn" class="form-control bg-dark text-white border-primary" placeholder="Type and press ENTER..." onkeydown="if(event.key === 'Enter') talk()">
                 <button class="btn btn-primary" onclick="talk()"><i class="fas fa-paper-plane"></i></button>
             </div>
-            <button class="btn-shop shadow-sm" onclick="talk('GENERATE_SHOPPING_LIST')">
+            <button class="btn-shop shadow-sm" onclick="talk('Generate shopping list for current plan')">
                 <i class="fas fa-shopping-basket me-1"></i> SHOPPING LIST
             </button>
         </div>
     </div>
 </div>
 
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
 <script>
-    let isMetric = true, mChart, conversationHistory = [];
+    let isMetric = true, mChart;
     const API = "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";
 
-    function toggleTheme() {
-        const b = document.getElementById('mainBody');
-        b.classList.toggle('theme-dark');
-        b.classList.toggle('theme-light');
-    }
-
-    function setUnits(mode) {
-        if((mode==='metric' && !isMetric) || (mode==='imperial' && isMetric)) {
-            isMetric = !isMetric;
-            ['w','t'].forEach(id => {
-                let v = document.getElementById(id).value;
-                if(v) document.getElementById(id).value = isMetric ? (v/2.205).toFixed(0) : (v*2.205).toFixed(0);
-            });
-            let h = document.getElementById('h');
-            if(h.value) h.value = isMetric ? (h.value*2.54).toFixed(0) : (h.value/2.54).toFixed(0);
-            document.getElementById('txtW').innerText = isMetric ? "Current (kg)" : "Current (lb)";
-            document.getElementById('txtT').innerText = isMetric ? "Target (kg)" : "Target (lb)";
-            document.getElementById('txtH').innerText = isMetric ? "Height (cm)" : "Height (in)";
-            document.getElementById('btnMetric').className = isMetric ? "btn btn-primary active btn-sm px-3" : "btn btn-outline-primary btn-sm px-3";
-            document.getElementById('btnImperial').className = !isMetric ? "btn btn-primary active btn-sm px-3" : "btn btn-outline-primary btn-sm px-3";
-            update();
-        }
-    }
+    function setTheme(t) { document.body.className = 'theme-' + t; }
 
     function update() {
         const wv = parseFloat(document.getElementById('w').value)||0, hv = parseFloat(document.getElementById('h').value)||0;
         const av = parseFloat(document.getElementById('age').value)||0, act = parseFloat(document.getElementById('act').value)||1;
         const agg = parseInt(document.getElementById('agg').value);
         if(!wv || !hv || !av) return;
+
         const wc = isMetric ? wv : wv/2.205, hc = isMetric ? hv : hv*2.54;
         const bmr = (10 * wc) + (6.25 * hc) - (5 * av) + 5;
         const total = Math.round((bmr * act) + agg);
+        
         document.getElementById('kcal').innerText = total;
-        document.getElementById('h2o').innerText = isMetric ? (wc * 0.035).toFixed(1) + "L" : (wv * 0.6).toFixed(0) + "oz";
+        document.getElementById('h2o').innerText = (wc * 0.035).toFixed(1) + "L";
         document.getElementById('aggDisp').innerText = (agg>0?'+':'')+agg+" kcal";
-        const pG = Math.round((total * 0.35)/4), cG = Math.round((total * 0.35)/4), fG = Math.round((total * 0.3)/9);
+        const pG = Math.round((total * 0.3)/4), cG = Math.round((total * 0.4)/4), fG = Math.round((total * 0.3)/9);
         document.getElementById('pG').innerText = pG+"g"; document.getElementById('cG').innerText = cG+"g"; document.getElementById('fG').innerText = fG+"g";
         if(mChart) { mChart.data.datasets[0].data = [pG*4, cG*4, fG*9]; mChart.update(); }
     }
 
-    function resetAll() { location.reload(); }
+    function resetAll() {
+        ['w','t','h','age','agg'].forEach(id => document.getElementById(id).value = id === 'agg' ? 0 : "");
+        document.getElementById('act').selectedIndex = 0;
+        document.getElementById('kcal').innerText = "0";
+        document.getElementById('h2o').innerText = "0.0L";
+        document.getElementById('chat').innerHTML = `<div class="msg ai shadow">System reset. Ready for new inputs.</div>`;
+        if(mChart) { mChart.data.datasets[0].data = [1,1,1]; mChart.update(); }
+    }
 
     async function talk(custom) {
-        const box = document.getElementById('chat'), input = document.getElementById('uIn'), targetKcal = document.getElementById('kcal').innerText;
-        const text = custom === 'GENERATE_SHOPPING_LIST' ? "Provide a full shopping list for this plan." : (custom || input.value);
-        if(!text) return;
-        if(!custom) { box.innerHTML += `<div class="msg user">${text}</div>`; input.value=""; }
-        const id = 'ai-'+Date.now(); box.innerHTML += `<div id="${id}" class="msg ai shadow">Verifying math...</div>`;
+        const box = document.getElementById('chat'), input = document.getElementById('uIn');
+        const text = custom || input.value; if(!text) return;
+        if(!custom) { box.innerHTML += `<div class="msg user shadow-sm">${text}</div>`; input.value=""; }
+        const id = 'ai-'+Date.now(); box.innerHTML += `<div id="${id}" class="msg ai shadow">Processing...</div>`;
         box.scrollTop = box.scrollHeight;
-
-        const sysPrompt = {role:"system", content: `You are a Math-Strict Clinical Dietitian. TARGET: ${targetKcal} kcal.
-        1. MANDATORY CALORIC DENSITY: 100g RAW Brown Rice = 360 kcal. 100g RAW Oats = 380 kcal.
-        2. NO HALLUCINATIONS: If the current total is below ${targetKcal}, you MUST INCREASE gram weights of ingredients. You are forbidden from inventing 'diet' rice with lower calories.
-        3. VARIETY FREEDOM: Use Salmon, Beef, Steak, Avocado, Nuts, Eggs, and Yogurt. Do not repeat chicken/rice endlessly.
-        4. SPECIFIC REQUESTS: If the user asks for 'High Protein' or specific ingredients, prioritize them while scaling grams to hit exactly ${targetKcal}.
-        5. VERIFICATION: Perform (P*4)+(C*4)+(F*9) for every meal. If it doesn't match the row total, correct it.`};
-        
-        conversationHistory.push({role: "user", content: text});
         try {
             const res = await fetch("https://api.groq.com/openai/v1/chat/completions", {
                 method: "POST", headers: {"Content-Type":"application/json", "Authorization":`Bearer ${API}`},
-                body: JSON.stringify({ model:"llama-3.3-70b-versatile", messages:[sysPrompt, ...conversationHistory], temperature: 0.1 })
+                body: JSON.stringify({ model:"llama-3.3-70b-versatile", messages:[
+                    {role:"system", content:`Pro Nutritionist. Target: ${document.getElementById('kcal').innerText} kcal. Use Markdown tables.`},
+                    {role:"user", content:text}
+                ]})
             });
             const d = await res.json();
-            const aiMsg = d.choices[0].message.content;
-            conversationHistory.push({role: "assistant", content: aiMsg});
-            document.getElementById(id).innerHTML = marked.parse(aiMsg);
-        } catch(e) { document.getElementById(id).innerText = "Error."; }
+            document.getElementById(id).innerHTML = marked.parse(d.choices[0].message.content);
+        } catch(e) { document.getElementById(id).innerText = "Error connecting to coach."; }
         box.scrollTop = box.scrollHeight;
     }
 
@@ -180,6 +196,7 @@
             type: 'doughnut', data: { datasets: [{ data: [1,1,1], backgroundColor: ['#0dcaf0','#dc3545','#ffc107'], borderWeight:0 }] },
             options: { plugins: { legend: { display: false } }, cutout: '75%' }
         });
+        resetAll();
     }
 </script>
 </body>
