diff --git a/client-solid/src/Components/Comment.tsx b/client-solid/src/Components/Comment.tsx
index 106170c..bdc61c4 100644
--- a/client-solid/src/Components/Comment.tsx
+++ b/client-solid/src/Components/Comment.tsx
@@ -14,11 +14,15 @@ interface CommentProps {
  */
 export function Comment({ comment }: CommentProps): JSXElement {
   return (
-    <div class="flex px-2 min-w-full flex-col rounded-lg border-b-2 border-b-secondary bg-base-300 py-2 text-base-content transition-all hover:bg-base-300 md:px-12">
-      <div class="flex flex-row">
-        <div class="pb-1 text-xs text-gray-500">{comment.created_at}</div>
+    <>
+      <div class="chat chat-start">
+        <time class="text-xs opacity-50">{comment.created_at}</time>
       </div>
-      <div class="text-sm">{comment.content}</div>
-    </div>
+      <div class="chat-bubble">{comment.content}</div>
+      <div class="chat chat-end">
+        <time class="text-xs opacity-50">Reply created_at</time>
+        <div class="chat-bubble">Replies to parent comment if any</div>
+      </div>
+    </>
   );
 }
diff --git a/client-solid/src/Components/CommentSection.tsx b/client-solid/src/Components/CommentSection.tsx
index f9f9fe4..2baf64a 100644
--- a/client-solid/src/Components/CommentSection.tsx
+++ b/client-solid/src/Components/CommentSection.tsx
@@ -13,6 +13,8 @@ export function CommentSection({ postId }: { postId: string }): JSXElement {
   const [comments] = createResource(postId, () => getComments(postId, 10, 0));
 
   return (
-    <For each={comments()!}>{(comment) => <Comment comment={comment} />}</For>
+    <section class="p-5 my-5 bg-base-200 border-b-2 border-b-primary ">
+      <For each={comments()!}>{(comment) => <Comment comment={comment} />}</For>
+    </section>
   );
 }
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..e5763f8
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "FrostByte",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}