diff --git a/frontend-next/src/app/app/page.js b/frontend-next/src/app/app/page.js
index 0dce553..551b869 100644
--- a/frontend-next/src/app/app/page.js
+++ b/frontend-next/src/app/app/page.js
@@ -177,6 +177,7 @@ function Home() {
           user: user.username,
           isSystem: true,
           timestamp: new Date().getTime(),
+          uid: user.uid
         };
         set(
           ref(
@@ -229,6 +230,7 @@ function Home() {
             user: user.username,
             isSystem: true,
             timestamp: new Date().getTime(),
+            uid: user.uid
           };
           set(
             ref(
diff --git a/frontend-next/src/app/user/[stub]/page.js b/frontend-next/src/app/user/[stub]/page.js
index d80baf3..cba01db 100644
--- a/frontend-next/src/app/user/[stub]/page.js
+++ b/frontend-next/src/app/user/[stub]/page.js
@@ -167,7 +167,7 @@ function Home({ params }) {
                 )}
               </div>
               <div className="col-span-2 ">
-                <div className="grid grid-cols-3 p-2  ">
+                <div className="grid grid-flow-col-dense auto-cols-auto pl-5">
                   {userRoomsArray}
                 </div>
               </div>
diff --git a/frontend-next/src/components/app/datatypes.js b/frontend-next/src/components/app/datatypes.js
index 0aa682a..1b71047 100644
--- a/frontend-next/src/components/app/datatypes.js
+++ b/frontend-next/src/components/app/datatypes.js
@@ -42,7 +42,7 @@ export function Chat({ chatObj }) {
       <div className="width-[100%] bg-white rounded-lg mt-1 text-left p-1 grid grid-cols-2 mr-2">
         <div>
           <span style={{ color: userColors[generateColor(chatObj.user)] }}>
-            {chatObj.user}
+          <a href={chatObj.uid && ("/user/"+chatObj.uid)} className="hover:font-bold cursor-pointer" target="_blank">{chatObj.user}</a>
           </span>
           : {chatObj.body}
         </div>
@@ -70,7 +70,7 @@ return (
     <div className="width-[100%] bg-white rounded-lg mt-1 text-left p-1 grid grid-cols-2 mr-2">
     <div className="text-[#d1d1d1]">
         <span style={{ color: userColors[generateColor(chatObj.user)] }}>
-        {chatObj.user}
+        <a href={chatObj.uid && ("/user/"+chatObj.uid)} className="hover:font-bold cursor-pointer" target="_blank">{chatObj.user}</a>
         </span>{" "}
         has {chatObj.body} the room.
     </div>
@@ -149,8 +149,8 @@ export function Interest({interest}) {
 
 export function ProfileRoom({room}) {
   return (
-    <div>
-      <div className="rounded-lg p-2 shadow-xl bg-white h-[250px] w-[350px] m-2 grow-0">
+    <div className="gap-x-5">
+      <div className="rounded-lg p-2 shadow-xl bg-white h-[250px] w-[350px] grow-0">
         <div className="relative z-1 h-[235px] opacity-50">
           <Geo loc={{"latitude": room.latitude, "longitude": room.longitude}} zoom={12} locMarker={false}/>
         </div>
diff --git a/frontend-next/src/components/app/header.js b/frontend-next/src/components/app/header.js
index 4675d97..5a8cd1f 100644
--- a/frontend-next/src/components/app/header.js
+++ b/frontend-next/src/components/app/header.js
@@ -16,6 +16,7 @@ import { Popover } from '@headlessui/react'
           user: user.username,
           isSystem: true,
           timestamp: new Date().getTime(),
+          uid: user.uid
         };
         set(
           ref(
diff --git a/frontend-next/src/components/app/main_tab/chat.js b/frontend-next/src/components/app/main_tab/chat.js
index abbc543..dfdc5d3 100644
--- a/frontend-next/src/components/app/main_tab/chat.js
+++ b/frontend-next/src/components/app/main_tab/chat.js
@@ -51,6 +51,7 @@ export function MainTabChatRoom({ roomObj, user }) {
           var payload = {
             body: data.message,
             user: user.username,
+            uid: user.uid,
             isSystem: false,
             timestamp: new Date().getTime(),
           };