diff --git a/pyproject.toml b/pyproject.toml
index 133555c..b4424e3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "second-brain-agent"
-version = "0.3.0"
+version = "0.2.1"
 description = "Second Brain AI Agent"
 authors = ["Frederic Lepied <flepied@gmail.com>"]
 license = "GPL 3.0"
diff --git a/screenshot.png b/screenshot.png
index 5bb7d31..1620ab7 100644
Binary files a/screenshot.png and b/screenshot.png differ
diff --git a/second_brain_agent.py b/second_brain_agent.py
index 399902f..500b73b 100644
--- a/second_brain_agent.py
+++ b/second_brain_agent.py
@@ -7,7 +7,7 @@
 import streamlit as st
 from dotenv import load_dotenv
 
-from htmlTemplates import css, user_template
+from htmlTemplates import bot_template, css, user_template
 from lib import Agent
 
 
@@ -15,7 +15,8 @@ def handle_userinput(user_question):
     "Handle the input from the user as a question to the LLM"
     response = st.session_state.agent.html_question(user_question)
     st.write(
-        user_template.replace("{{MSG}}", response),
+        user_template.replace("{{MSG}}", user_question),
+        bot_template.replace("{{MSG}}", response),
         unsafe_allow_html=True,
     )