diff --git a/frontend/src/Hero.tsx b/frontend/src/Hero.tsx
index ed2db207..63840b96 100644
--- a/frontend/src/Hero.tsx
+++ b/frontend/src/Hero.tsx
@@ -4,15 +4,15 @@ export default function Hero({ className = '' }: { className?: string }) {
       <p className="mb-10 text-center text-4xl font-semibold">
         DocsGPT <span className="text-3xl">🦖</span>
       </p>
-      <p className="mb-3 text-center text-gray-2000">
+      <p className="mb-3 text-center leading-6 text-black-1000">
         Welcome to DocsGPT, your technical documentation assistant!
       </p>
-      <p className="mb-3 text-center text-gray-2000">
+      <p className="mb-3 text-center leading-6 text-black-1000">
         Enter a query related to the information in the documentation you
         selected to receive and we will provide you with the most relevant
         answers.
       </p>
-      <p className="text-center text-gray-2000">
+      <p className="mb-3 text-center leading-6 text-black-1000">
         Start by entering your query in the input field below and we will do the
         rest!
       </p>
diff --git a/frontend/src/conversation/Conversation.tsx b/frontend/src/conversation/Conversation.tsx
index fffe012d..b6230f19 100644
--- a/frontend/src/conversation/Conversation.tsx
+++ b/frontend/src/conversation/Conversation.tsx
@@ -31,20 +31,24 @@ export default function Conversation() {
 
   return (
     <div className="flex justify-center p-6">
-      <div className="mt-20 flex w-10/12 flex-col transition-all md:w-1/2">
-        {messages.map((message, index) => {
-          return (
-            <ConversationBubble
-              ref={index === messages.length - 1 ? endMessageRef : null}
-              className={`${index === messages.length - 1 ? 'mb-24' : 'mb-7'}`}
-              key={index}
-              message={message.text}
-              type={message.type}
-            ></ConversationBubble>
-          );
-        })}
-        {messages.length === 0 && <Hero className="mt-24 md:mt-52"></Hero>}
-      </div>
+      {messages.length && (
+        <div className="mt-20 flex w-10/12 flex-col transition-all md:w-1/2">
+          {messages.map((message, index) => {
+            return (
+              <ConversationBubble
+                ref={index === messages.length - 1 ? endMessageRef : null}
+                className={`${
+                  index === messages.length - 1 ? 'mb-24' : 'mb-7'
+                }`}
+                key={index}
+                message={message.text}
+                type={message.type}
+              ></ConversationBubble>
+            );
+          })}
+        </div>
+      )}
+      {messages.length === 0 && <Hero className="mt-24 md:mt-52"></Hero>}
       <div className="fixed bottom-6 flex w-10/12 flex-col items-end self-center md:w-[50%]">
         <div className="flex w-full">
           <div
diff --git a/frontend/tailwind.config.cjs b/frontend/tailwind.config.cjs
index edc43a8e..703d3c4f 100644
--- a/frontend/tailwind.config.cjs
+++ b/frontend/tailwind.config.cjs
@@ -9,6 +9,7 @@ module.exports = {
       },
       colors: {
         'eerie-black': '#212121',
+        'black-1000': '#343541',
         jet: '#343541',
         'gray-alpha': 'rgba(0,0,0, .1)',
         'gray-1000': '#F6F6F6',
@@ -17,7 +18,7 @@ module.exports = {
         'red-1000': 'rgb(254, 202, 202)',
         'red-2000': '#F44336',
         'red-3000': '#621B16',
-        'blue-1000': '#7D54D1'
+        'blue-1000': '#7D54D1',
       },
     },
   },