diff --git a/packages/fakeyou.com/src/v2/view/_common/comments/CommentList.tsx b/packages/fakeyou.com/src/v2/view/_common/comments/CommentList.tsx
index a9faec1024..4835507c51 100644
--- a/packages/fakeyou.com/src/v2/view/_common/comments/CommentList.tsx
+++ b/packages/fakeyou.com/src/v2/view/_common/comments/CommentList.tsx
@@ -31,8 +31,8 @@ function CommentList(props: Props) {
     getComments();
   }, [getComments]);
 
-  // NB: It's more convenient to show recent data first
-  var reversedComments = comments.slice().reverse();
+  // NB: It's more convenient to show recent data first {.reverse()}
+  var reversedComments = comments.slice();
 
   const now = new Date();
 
@@ -47,16 +47,23 @@ function CommentList(props: Props) {
     rows.push(
       <tr key={comment.token}>
         <td>
-          {/* It's okay to set "dangerous" html here as the server safely created it. */}
-          <div
-            className="mt-3 text-center text-lg-start"
-            dangerouslySetInnerHTML={{
-              __html: comment.comment_rendered_html || "",
-            }}
-          />
+          <div className="py-2">
+            <div>
+              <span className="fw-medium text-white">
+                {comment.user_display_name}
+              </span>
+              <span className="px-2">·</span>
+              <span className="opacity-75">{relativeCreateTime}</span>
+            </div>
+            {/* It's okay to set "dangerous" html here as the server safely created it. */}
+            <div
+              className="mt-1 text-center text-lg-start"
+              dangerouslySetInnerHTML={{
+                __html: comment.comment_rendered_html || "",
+              }}
+            />
+          </div>
         </td>
-        <td>{relativeCreateTime}</td>
-        <td>{comment.user_display_name} link</td>
       </tr>
     );
   });
diff --git a/packages/fakeyou.com/src/v2/view/_common/comments/CreateCommentComponent.tsx b/packages/fakeyou.com/src/v2/view/_common/comments/CreateCommentComponent.tsx
index 7ab7c51221..4a496f26b4 100644
--- a/packages/fakeyou.com/src/v2/view/_common/comments/CreateCommentComponent.tsx
+++ b/packages/fakeyou.com/src/v2/view/_common/comments/CreateCommentComponent.tsx
@@ -1,13 +1,15 @@
-import React, { useState, useCallback } from "react";
+import React, { useState, useEffect, useCallback } from "react";
 import {
   CreateComment,
   CreateCommentIsOk,
 } from "@storyteller/components/src/api/comments/CreateComment";
 import { v4 as uuidv4 } from "uuid";
+import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper";
 
 interface Props {
   entity_type: string;
   entity_token: string;
+  sessionWrapper: SessionWrapper;
 }
 
 /**
@@ -23,6 +25,7 @@ function CreateCommentComponent(props: Props) {
   const [uuidIdempotencyToken, setUuidIdempotencyToken] = useState<string>(
     uuidv4()
   );
+  const [buttonVisible, setButtonVisible] = useState(false);
 
   const postComment = useCallback(async () => {
     const request = {
@@ -43,17 +46,18 @@ function CreateCommentComponent(props: Props) {
     commentMarkdown,
   ]);
 
-  const handleCommentChange = (ev: React.FormEvent<HTMLTextAreaElement>) => {
+  const handleCommentChange = (ev: React.ChangeEvent<HTMLTextAreaElement>) => {
     ev.preventDefault();
     const textValue = (ev.target as HTMLTextAreaElement).value.trim();
     if (textValue !== commentMarkdown) {
       setUuidIdempotencyToken(uuidv4()); // Regenerate on any change.
     }
     setCommentMarkdown(textValue);
+    setButtonVisible(textValue.length > 0);
     return false;
   };
 
-  const handleFormSubmit = (ev: React.FormEvent<HTMLFormElement>) => {
+  const handleFormSubmit = (ev: React.ChangeEvent<HTMLFormElement>) => {
     ev.preventDefault();
 
     if (commentMarkdown.trim() === "") {
@@ -64,8 +68,33 @@ function CreateCommentComponent(props: Props) {
     return false;
   };
 
-  return (
-    <div>
+  const handleKeyDown = (event: React.KeyboardEvent<HTMLTextAreaElement>) => {
+    if (event.key === "Enter") {
+      event.preventDefault();
+    }
+  };
+
+  let commentButton = <></>;
+  if (buttonVisible) {
+    commentButton = (
+      <button type="submit" className="btn btn-primary">
+        Post Comment
+      </button>
+    );
+  }
+
+  let createCommentComponent = (
+    <textarea
+      placeholder="You need to be logged in to comment."
+      className="form-control textarea-comment"
+      rows={1}
+      disabled
+    >
+      {commentMarkdown}
+    </textarea>
+  );
+  if (props.sessionWrapper.isLoggedIn()) {
+    createCommentComponent = (
       <form onSubmit={handleFormSubmit}>
         <div className="d-flex gap-3">
           <div className="form-group flex-grow-1">
@@ -74,17 +103,18 @@ function CreateCommentComponent(props: Props) {
               className="form-control textarea-comment"
               rows={1}
               onChange={handleCommentChange}
+              onKeyDown={handleKeyDown}
             >
               {commentMarkdown}
             </textarea>
           </div>
-          <button type="submit" className="btn btn-primary">
-            Submit Comment
-          </button>
+          {commentButton}
         </div>
       </form>
-    </div>
-  );
+    );
+  }
+
+  return <div>{createCommentComponent}</div>;
 }
 
 export { CreateCommentComponent };
diff --git a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/ProfilePage.tsx b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/ProfilePage.tsx
index 626f6bceaf..467069d144 100644
--- a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/ProfilePage.tsx
+++ b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/ProfilePage.tsx
@@ -51,7 +51,7 @@ interface Props {
 //   navigator.clipboard.writeText(username);
 // }
 
-function ProfilePage(props: Props) {
+function ProfilePage(this: any, props: Props) {
   const { username }: { username: string } = useParams();
 
   const [userData, setUserData] = useState<User | undefined>(undefined);
@@ -536,14 +536,17 @@ function ProfilePage(props: Props) {
               role="tabpanel"
               aria-labelledby="comments-tab"
             >
-              <CreateCommentComponent
-                entity_type="user"
-                entity_token={userData?.user_token}
-              />
-              <CommentList
-                entity_type="user"
-                entity_token={userData?.user_token}
-              />
+              <div className="d-flex flex-column gap-3">
+                <CreateCommentComponent
+                  entity_type="user"
+                  entity_token={userData?.user_token}
+                  sessionWrapper={props.sessionWrapper}
+                />
+                <CommentList
+                  entity_type="user"
+                  entity_token={userData?.user_token}
+                />
+              </div>
             </div>
           </div>
         </div>