diff --git a/frontend/src/conversation/ConversationBubble.tsx b/frontend/src/conversation/ConversationBubble.tsx
index 258c0242..8746f5de 100644
--- a/frontend/src/conversation/ConversationBubble.tsx
+++ b/frontend/src/conversation/ConversationBubble.tsx
@@ -11,41 +11,36 @@ const ConversationBubble = forwardRef<
     className?: string;
   }
 >(function ConversationBubble({ message, type, className }, ref) {
-  return (
-    <div
-      ref={ref}
-      className={`flex ${
-        type === 'ANSWER'
-          ? 'self-start '
-          : type === 'ERROR'
-          ? 'self-start'
-          : 'flex-row-reverse self-end '
-      }  ${className}`}
-    >
-      <Avatar
-        className="mt-4 text-2xl"
-        avatar={type === 'QUESTION' ? '🧑‍💻' : '🦖'}
-      ></Avatar>
-      <div
-        className={`${
-          type === 'QUESTION'
-            ? ' mr-2 ml-10 bg-blue-1000 py-5 px-5 text-white'
-            : ' ml-2 mr-10 bg-gray-1000 py-5 px-5'
-        } flex items-center rounded-3xl ${
-          type === 'ERROR'
-            ? 'rounded-lg border border-red-2000 bg-red-1000 p-2 text-red-3000'
-            : ''
-        }`}
-      >
-        {type === 'ERROR' && (
-          <img src={Alert} alt="alert" className="mr-2 inline" />
-        )}
-        <p className="whitespace-pre-wrap break-words">{message}</p>
+  let bubble;
+  if (type === 'QUESTION') {
+    bubble = (
+      <div ref={ref} className={`flex flex-row-reverse self-end ${className}`}>
+        <Avatar className="mt-4 text-2xl" avatar="🧑‍💻"></Avatar>
+        <div className="mr-2 ml-10 flex items-center rounded-3xl bg-blue-1000 py-5 px-5 text-white">
+          <p className="whitespace-pre-wrap break-words">{message}</p>
+        </div>
       </div>
-    </div>
-  );
+    );
+  } else {
+    bubble = (
+      <div ref={ref} className={`flex self-start ${className}`}>
+        <Avatar className="mt-4 text-2xl" avatar="🦖"></Avatar>
+        <div
+          className={`ml-2 mr-10 flex items-center rounded-3xl bg-gray-1000 py-5 px-5 ${
+            type === 'ERROR'
+              ? ' rounded-lg border border-red-2000 bg-red-1000 p-2 text-red-3000'
+              : ''
+          }`}
+        >
+          {type === 'ERROR' && (
+            <img src={Alert} alt="alert" className="mr-2 inline" />
+          )}
+          <p className="whitespace-pre-wrap break-words">{message}</p>
+        </div>
+      </div>
+    );
+  }
+  return bubble;
 });
 
 export default ConversationBubble;
-
-// TODO : split question and answer into two diff JSX