diff --git a/src/views/AddCommentForm.vue b/src/views/AddCommentForm.vue
index 3d2d898..0c72384 100644
--- a/src/views/AddCommentForm.vue
+++ b/src/views/AddCommentForm.vue
@@ -3,12 +3,15 @@ import { useField, useForm } from "vee-validate";
 import { string } from "yup";
 
 import { useCommentStore } from "@/comments";
+import { useUser } from "@/components/user";
 
 const commentStore = useCommentStore();
 
 const props = defineProps<{
   projectUid: string;
 }>();
+
+const { user } = useUser();
 type FormData = {
   comment: string;
 };
@@ -23,8 +26,13 @@ const { handleSubmit } = useForm<FormData>({
 const onSubmit = handleSubmit(
   // Success
   (values: FormData) => {
+    if (!user.value) return;
     // handle form submission here
-    commentStore.addCommentToProject(values.comment, props.projectUid);
+    commentStore.addCommentToProject(
+      values.comment,
+      props.projectUid,
+      user.value.uid,
+    );
   },
   // Failure
   (errors) => {
diff --git a/src/views/Comments.vue b/src/views/Comments.vue
index 9c6b175..3eacea4 100644
--- a/src/views/Comments.vue
+++ b/src/views/Comments.vue
@@ -32,30 +32,32 @@ const activity = computed(() =>
         <div class="w-px bg-gray-200" />
       </div>
 
-      <img
+      <div class="relative mt-3 h-6 w-6 flex-none rounded-full bg-gray-50" />
+      <!-- <img
         :src="comment.person.imageUrl"
         alt=""
         class="relative mt-3 h-6 w-6 flex-none rounded-full bg-gray-50"
-      />
+      /> -->
 
       <div class="flex-auto rounded-md p-3 ring-1 ring-inset ring-gray-200">
         <div class="flex justify-between gap-x-4">
           <div class="py-0.5 text-xs leading-5 text-gray-500">
-            <span class="font-medium text-gray-900">{{
-              comment.person.name
-            }}</span>
+            <span class="font-medium text-gray-900">
+              <!-- {{ comment.person.name}} -->
+              someone
+            </span>
             commented
           </div>
 
           <time
-            :datetime="comment.dateTime"
+            :datetime="comment.timestamp.toString()"
             class="flex-none py-0.5 text-xs leading-5 text-gray-500"
-            >{{ comment.date }}</time
+            >{{ new Date(comment.timestamp).toLocaleString() }}</time
           >
         </div>
 
         <p class="text-sm leading-6 text-gray-500">
-          {{ comment.comment }}
+          {{ comment.textContent }}
         </p>
       </div>
     </li>