diff --git a/application/frontend/src/pages/chatbot/chatbot.scss b/application/frontend/src/pages/chatbot/chatbot.scss
index 616ea00a..70e49cd9 100644
--- a/application/frontend/src/pages/chatbot/chatbot.scss
+++ b/application/frontend/src/pages/chatbot/chatbot.scss
@@ -4,9 +4,11 @@
 
 .chat-container {
   margin: 3rem auto;
+  margin-top: 1.5rem;
   max-width: 960px;
   display: flex;
   flex-direction: column;
+  position: relative;
 }
 .chat-container.chat-active {
   height: calc(100vh - 179px);
@@ -50,14 +52,35 @@
    Header
    ========================= */
 
-h1.ui.header {
-  margin-bottom: 1rem !important;
+/* =========================
+   Chatbot title
+   ========================= */
+
+h1.ui.header.chatbot-title {
+  font-weight: 600;
+  line-height: 1.25;
+
+  /* Fluid scaling */
+  font-size: clamp(1.4rem, 3vw, 2.2rem);
+
+  /* Desktop spacing */
   margin-top: 2rem;
+  margin-bottom: 1rem !important;
 }
 
+/* Tablet & below */
 @media (max-width: 768px) {
-  h1.ui.header {
-    margin-top: 1.5rem;
+  h1.ui.header.chatbot-title {
+    margin-top: 2.75rem; 
+    margin-bottom: 0.75rem !important;
+    font-size: clamp(1.35rem, 4vw, 1.8rem);
+  }
+}
+
+/* Very small phones */
+@media (max-width: 360px) {
+  h1.ui.header.chatbot-title {
+    margin-top: 3rem; /* extra breathing room */
   }
 }
 
@@ -222,14 +245,18 @@ h1.ui.header {
   bottom: 0;
   z-index: 5;
 
-  margin-top: 1.5rem;
-  background-color: #d3ead4;
-  padding: 1rem;
+  margin-top: 1rem;
+  background-color: #daebdb;
+  // background: transparent;
+  border: 1px solid rgb(190, 214, 232);
+  padding: 0.75rem;
   border-radius: 12px;
   box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
 }
 
 .chat-input .ui.input input {
+  height: 40px;
+  line-height: 40px;
   border-radius: 10px !important;
 }
 
@@ -275,6 +302,104 @@ h1.ui.header {
   animation-delay: 0.4s;
 }
 
+/* =========================
+   Page layout overrides
+   ========================= */
+
+.chatbot-layout {
+  min-height: 100vh;
+}
+
+@media (max-width: 768px) {
+  .chatbot-layout {
+    min-height: auto;
+    padding-top: 2rem;
+  }
+}
+
+@media (max-width: 768px) {
+  .chatbot-layout.ui.grid {
+    align-items: flex-start !important;
+  }
+}
+
+/* =========================
+   Scroll to bottom button
+   ========================= */
+
+.scroll-to-bottom {
+  position: absolute;
+  bottom: 160px;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 10;
+  width: 34px;
+  height: 34px;
+  border-radius: 50%;
+  border: none;
+  background: rgb(47, 128, 189);
+  color: #c5f0c9;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+  border: #1976d2;
+  opacity: 1;
+  backdrop-filter: none;
+  transition: transform 0.2s ease;
+  animation: fadeIn 0.15s ease-out;
+}
+
+.scroll-to-bottom:hover {
+  opacity: 1;
+  transform: translateX(-50%) translateY(-2px);
+}
+.scroll-icon {
+  margin: 0 !important;
+  display: flex !important;
+  align-items: center;
+  justify-content: center;
+}
+
+@media (max-width: 768px) {
+  .scroll-to-bottom {
+    bottom: 160px;
+  }
+}
+.chat-surface {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+
+  background: #fcfcfa; // same palette as input
+  backdrop-filter: blur(6px);
+
+  border-radius: 18px;
+  border: 1px solid rgba(0, 0, 0, 0.05);
+
+  box-shadow: 0 12px 40px rgba(0, 0, 0, 0.08), inset 0 1px 0 rgba(255, 255, 255, 0.4);
+
+  padding: 1.25rem;
+}
+.chat-landing-state {
+  text-align: center;
+  margin: auto;
+  padding: 3rem 1rem;
+
+  h2 {
+    font-size: 1.6rem;
+    font-weight: 600;
+    margin-bottom: 0.5rem;
+  }
+
+  p {
+    font-size: 0.95rem;
+    color: #555;
+    max-width: 480px;
+    margin: 0 auto;
+  }
+}
 /* =========================
    Animations
    ========================= */
@@ -302,24 +427,13 @@ h1.ui.header {
     transform: translateY(0);
   }
 }
-
-/* =========================
-   Page layout overrides
-   ========================= */
-
-.chatbot-layout {
-  min-height: 100vh;
-}
-
-@media (max-width: 768px) {
-  .chatbot-layout {
-    min-height: auto;
-    padding-top: 2rem;
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+    transform: translateX(-50%) translateY(6px);
   }
-}
-
-@media (max-width: 768px) {
-  .chatbot-layout.ui.grid {
-    align-items: flex-start !important;
+  to {
+    opacity: 0.85;
+    transform: translateX(-50%) translateY(0);
   }
 }
diff --git a/application/frontend/src/pages/chatbot/chatbot.tsx b/application/frontend/src/pages/chatbot/chatbot.tsx
index 47c79ff7..61a06300 100644
--- a/application/frontend/src/pages/chatbot/chatbot.tsx
+++ b/application/frontend/src/pages/chatbot/chatbot.tsx
@@ -2,7 +2,7 @@ import './chatbot.scss';
 
 import DOMPurify, { sanitize } from 'dompurify';
 import { marked } from 'marked';
-import React, { useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
 import { oneLight } from 'react-syntax-highlighter/dist/esm/styles/prism';
 import { Button, Container, Form, GridRow, Header, Icon } from 'semantic-ui-react';
@@ -35,6 +35,38 @@ export const Chatbot = () => {
   const [chat, setChat] = useState<ChatState>(DEFAULT_CHAT_STATE);
   const [user, setUser] = useState('');
   const hasMessages = chatMessages.length > 0;
+  const messagesEndRef = useRef<HTMLDivElement | null>(null);
+  const messagesContainerRef = useRef<HTMLDivElement | null>(null);
+  const [showScrollToBottom, setShowScrollToBottom] = useState(false);
+  const shouldForceScrollRef = useRef(false);
+  useEffect(() => {
+    const container = messagesContainerRef.current;
+    if (!container) return;
+
+    const handleScroll = () => {
+      const threshold = 64; // px from bottom
+      const isNearBottom = container.scrollHeight - container.scrollTop - container.clientHeight < threshold;
+
+      setShowScrollToBottom(!isNearBottom);
+    };
+
+    container.addEventListener('scroll', handleScroll);
+    return () => container.removeEventListener('scroll', handleScroll);
+  }, []);
+
+  useEffect(() => {
+    const container = messagesContainerRef.current;
+    if (!container) return;
+
+    const threshold = 120;
+    const isNearBottom = container.scrollHeight - container.scrollTop - container.clientHeight < threshold;
+
+    if (shouldForceScrollRef.current || isNearBottom) {
+      container.scrollTop = container.scrollHeight;
+      shouldForceScrollRef.current = false; // reset after use
+    }
+  }, [chatMessages]);
+
   function login() {
     fetch(`${apiUrl}/user`, { method: 'GET' })
       .then((response) => {
@@ -77,8 +109,9 @@ export const Chatbot = () => {
     return res;
   }
 
-  function onSubmit() {
+  async function onSubmit() {
     if (!chat.term.trim()) return;
+    shouldForceScrollRef.current = true;
 
     const currentTerm = chat.term;
     setChat({ ...chat, term: '' });
@@ -98,7 +131,7 @@ export const Chatbot = () => {
     fetch(`${apiUrl}/completion`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ prompt: currentTerm }), // ✅ use captured term
+      body: JSON.stringify({ prompt: currentTerm }),
     })
       .then((response) => response.json())
       .then((data) => {
@@ -144,69 +177,89 @@ export const Chatbot = () => {
     <>
       {user !== '' ? null : login()}
 
-
       <Grid textAlign="center" verticalAlign="middle" className="chatbot-layout">
         <Grid.Column>
-          <Header as="h1">OWASP OpenCRE Chat</Header>
+          <Header as="h1" className="chatbot-title">
+            OWASP OpenCRE Chat
+          </Header>
 
           <Container>
             <div className={`chat-container ${hasMessages ? 'chat-active' : 'chat-landing'}`}>
-              {' '}
-              {error && (
-                <div className="ui negative message">
-                  <div className="header">Document could not be loaded</div>
-                </div>
-              )}
-              <div className="chat-messages">
-                {chatMessages.map((m, idx) => (
-                  <div key={idx} className={`chat-message ${m.role}`}>
-                    <div className="message-card">
-                      <div className="message-header">
-                        <span className="message-role">{m.role}</span>
-                        <span className="message-timestamp">{m.timestamp}</span>
-                      </div>
+              <div className="chat-surface">
+                {' '}
+                {error && (
+                  <div className="ui negative message">
+                    <div className="header">Document could not be loaded</div>
+                  </div>
+                )}
+                <div className="chat-messages" ref={messagesContainerRef}>
+                  {chatMessages.map((m, idx) => (
+                    <div key={idx} className={`chat-message ${m.role}`}>
+                      <div className="message-card">
+                        <div className="message-header">
+                          <span className="message-role">{m.role}</span>
+                          <span className="message-timestamp">{m.timestamp}</span>
+                        </div>
 
-                      <div className="message-body">{processResponse(m.message)}</div>
+                        <div className="message-body">{processResponse(m.message)}</div>
 
-                      {m.data && m.data.length > 0 && (
-                        <div className="references">
-                          <div className="references-title">References</div>
-                          {m.data.map((d, i) => (
-                            <React.Fragment key={i}>{displayDocument(d)}</React.Fragment>
-                          ))}
-                        </div>
-                      )}
+                        {m.data && m.data.length > 0 && (
+                          <div className="references">
+                            <div className="references-title">References</div>
+                            {m.data.map((d, i) => (
+                              <React.Fragment key={i}>{displayDocument(d)}</React.Fragment>
+                            ))}
+                          </div>
+                        )}
 
-                      {!m.accurate && (
-                        <div className="accuracy-warning">
-                          This answer could not be fully verified against OpenCRE sources. Please validate
-                          independently.
-                        </div>
-                      )}
+                        {!m.accurate && (
+                          <div className="accuracy-warning">
+                            This answer could not be fully verified against OpenCRE sources. Please validate
+                            independently.
+                          </div>
+                        )}
+                      </div>
                     </div>
-                  </div>
-                ))}
-                {loading && (
-                  <div className="chat-message assistant">
-                    <div className="message-card typing-indicator">
-                      <span className="dot" />
-                      <span className="dot" />
-                      <span className="dot" />
+                  ))}
+                  {loading && (
+                    <div className="chat-message assistant">
+                      <div className="message-card typing-indicator">
+                        <span className="dot" />
+                        <span className="dot" />
+                        <span className="dot" />
+                      </div>
                     </div>
-                  </div>
+                  )}
+                  <div ref={messagesEndRef} />
+                </div>
+                {showScrollToBottom && (
+                  <button
+                    className="scroll-to-bottom"
+                    onClick={() => {
+                      const container = messagesContainerRef.current;
+                      if (container) {
+                        shouldForceScrollRef.current = true;
+                        container.scrollTop = container.scrollHeight;
+                        setShowScrollToBottom(false);
+                      }
+                    }}
+                    aria-label="Scroll to latest message"
+                  >
+                    <Icon name="arrow down" className="scroll-icon" />
+                  </button>
                 )}
+                <Form className="chat-input" size="large" onSubmit={onSubmit}>
+                  <Form.Input
+                    fluid
+                    value={chat.term}
+                    onChange={(e) => setChat({ ...chat, term: e.target.value })}
+                    placeholder="Type your infosec question here…"
+                  />
+                  <Button primary fluid size="small">
+                    <Icon name="send" /> Ask
+                  </Button>
+                </Form>
               </div>
-              <Form className="chat-input" size="large" onSubmit={onSubmit}>
-                <Form.Input
-                  fluid
-                  value={chat.term}
-                  onChange={(e) => setChat({ ...chat, term: e.target.value })}
-                  placeholder="Type your infosec question here…"
-                />
-                <Button primary fluid size="small">
-                  <Icon name="send" /> Ask
-                </Button>
-              </Form>
             </div>
 
             <div className="chatbot-disclaimer">