diff --git a/src/components/CodeEditor/index.tsx b/src/components/CodeEditor/index.tsx
index 3e86e979..d48c41e5 100644
--- a/src/components/CodeEditor/index.tsx
+++ b/src/components/CodeEditor/index.tsx
@@ -10,6 +10,8 @@ import { useTranslation } from "react-i18next";
 import { useResponsive, useSize, useTrackedEffect } from "ahooks";
 import moment from "moment";
 import cn from "classnames";
+import { useQuery } from "urql";
+import gql from "graphql-tag";
 
 import Button from "@/components/Button";
 import NoModels from "@/components/NoModels";
@@ -40,8 +42,34 @@ import styles from "./index.module.less";
 import type { MergeStrategy } from "./RegenerateModal";
 import type { FC } from "react";
 
-const resolveSavedBy = (
-  schema: Dataschema | undefined,
+const FirstDataschemaAppearanceDocument = gql`
+  query FirstDataschemaAppearance($branch_id: uuid!, $name: String!) {
+    versions(
+      where: {
+        branch_id: { _eq: $branch_id }
+        dataschemas: { name: { _eq: $name } }
+      }
+      order_by: { created_at: asc }
+      limit: 1
+    ) {
+      dataschemas(where: { name: { _eq: $name } }, limit: 1) {
+        created_at
+        user_id
+        user {
+          display_name
+        }
+      }
+    }
+  }
+`;
+
+type SchemaUserFields = {
+  user_id?: string | null;
+  user?: { display_name?: string | null } | null;
+};
+
+const resolveUserName = (
+  schema: SchemaUserFields | undefined,
   members: Member[] | undefined,
   currentUserId?: string,
   currentUserName?: string | null
@@ -63,6 +91,11 @@ const resolveSavedBy = (
   return "—";
 };
 
+const formatTimestampWithRelative = (timestamp?: string | null): string => {
+  if (!timestamp) return "—";
+  return `${formatTime(timestamp)} (${moment(timestamp).fromNow()})`;
+};
+
 interface CodeEditorProps {
   schemas?: Dataschema[];
   active?: string | null;
@@ -83,6 +116,7 @@ interface CodeEditorProps {
   validationError: string | ConsoleError[];
   cubeRegistry?: CubeRegistry;
   onRefreshRegistry?: () => void;
+  branchId?: string;
   branchName?: string;
   versionNumber?: number;
 }
@@ -108,6 +142,7 @@ const CodeEditor: FC<CodeEditorProps> = ({
   validationError,
   cubeRegistry,
   onRefreshRegistry,
+  branchId,
   branchName,
   versionNumber,
 }) => {
@@ -131,6 +166,17 @@ const CodeEditor: FC<CodeEditorProps> = ({
   const [showRegenerateModal, setShowRegenerateModal] =
     useState<boolean>(false);
   const [showInfoModal, setShowInfoModal] = useState<boolean>(false);
+  const activeFileName = active && active !== "sqlrunner" ? active : null;
+  const [firstAppearance] = useQuery({
+    query: FirstDataschemaAppearanceDocument,
+    variables: {
+      branch_id: branchId || "",
+      name: activeFileName || "",
+    },
+    pause: !showInfoModal || !branchId || !activeFileName,
+  });
+  const firstSchema =
+    firstAppearance.data?.versions?.[0]?.dataschemas?.[0] || undefined;
 
   // Create a default registry if none provided
   const registryRef = useRef<CubeRegistry>(cubeRegistry ?? new CubeRegistry());
@@ -772,9 +818,9 @@ const CodeEditor: FC<CodeEditorProps> = ({
                   {typeof versionNumber === "number" ? versionNumber : "—"}
                 </dd>
 
-                <dt>Saved by</dt>
+                <dt>Last saved by</dt>
                 <dd>
-                  {resolveSavedBy(
+                  {resolveUserName(
                     files[active],
                     teamData?.members,
                     currentUser?.id,
@@ -782,22 +828,28 @@ const CodeEditor: FC<CodeEditorProps> = ({
                   )}
                 </dd>
 
+                <dt>Created by</dt>
+                <dd>
+                  {resolveUserName(
+                    firstSchema || files[active],
+                    teamData?.members,
+                    currentUser?.id,
+                    currentUser?.displayName || currentUser?.email
+                  )}
+                </dd>
+
                 <dt>Datasource</dt>
                 <dd>{files[active].datasource?.name || "—"}</dd>
 
                 <dt>Created at</dt>
                 <dd>
-                  {files[active].created_at
-                    ? formatTime(files[active].created_at)
-                    : "—"}
+                  {formatTimestampWithRelative(
+                    firstSchema?.created_at || files[active].created_at
+                  )}
                 </dd>
 
                 <dt>Updated at</dt>
-                <dd>
-                  {files[active].updated_at
-                    ? formatTime(files[active].updated_at)
-                    : "—"}
-                </dd>
+                <dd>{formatTimestampWithRelative(files[active].updated_at)}</dd>
 
                 <dt>Checksum</dt>
                 <dd className={styles.infoMono}>
diff --git a/src/components/ModelsSidebar/index.module.less b/src/components/ModelsSidebar/index.module.less
index f9b87791..83116ca4 100644
--- a/src/components/ModelsSidebar/index.module.less
+++ b/src/components/ModelsSidebar/index.module.less
@@ -136,7 +136,7 @@
 
 .fileControl {
   padding: 0 !important;
-  color: rgba(#4a7faa, 0.4);
+  color: rgba(#4a7faa, 0.65);
 
   &:hover {
     color: #4a7faa !important;
diff --git a/src/components/ModelsSidebar/index.tsx b/src/components/ModelsSidebar/index.tsx
index c179d814..21a0f50e 100644
--- a/src/components/ModelsSidebar/index.tsx
+++ b/src/components/ModelsSidebar/index.tsx
@@ -206,14 +206,14 @@ const ModelsSidebar: FC<ModelsSidebarProps> = ({
                   )}
                   onClick={() => onSelectFile(f.name)}
                 >
-                  <Row justify={"space-between"} wrap={false}>
-                    <Col className={styles.file} span={18} title={f.name}>
+                  <Row justify={"space-between"} wrap={false} align="middle">
+                    <Col flex="auto" className={styles.file} title={f.name}>
                       {icons[f.name.split(".")[1] as keyof typeof icons]}{" "}
                       <span className={styles.fileNameText}>{f.name}</span>
                     </Col>
 
                     <Col
-                      span={6}
+                      flex="none"
                       style={{ display: "flex", justifyContent: "end" }}
                     >
                       <Space
diff --git a/src/graphql/gql/versions.gql b/src/graphql/gql/versions.gql
index 9adc596c..3bab1fed 100644
--- a/src/graphql/gql/versions.gql
+++ b/src/graphql/gql/versions.gql
@@ -80,3 +80,22 @@ subscription VersionsCount($branch_id: uuid!) {
     }
   }
 }
+
+query FirstDataschemaAppearance($branch_id: uuid!, $name: String!) {
+  versions(
+    where: {
+      branch_id: { _eq: $branch_id }
+      dataschemas: { name: { _eq: $name } }
+    }
+    order_by: { created_at: asc }
+    limit: 1
+  ) {
+    dataschemas(where: { name: { _eq: $name } }, limit: 1) {
+      created_at
+      user_id
+      user {
+        display_name
+      }
+    }
+  }
+}
diff --git a/src/pages/Models/index.tsx b/src/pages/Models/index.tsx
index 3ff85d04..6ae5563f 100644
--- a/src/pages/Models/index.tsx
+++ b/src/pages/Models/index.tsx
@@ -297,6 +297,7 @@ export const Models: React.FC<ModelsProps> = ({
                 cubeRegistry={cubeRegistry}
                 onRefreshRegistry={onRefreshRegistry}
                 branchName={currentBranch?.name}
+                branchId={currentBranch?.id}
                 versionNumber={versionsCount}
               />
             </div>