diff --git a/appview/pages/templates/timeline/fragments/timeline.html b/appview/pages/templates/timeline/fragments/timeline.html
index 5b46264a..6adb4e10 100644
--- a/appview/pages/templates/timeline/fragments/timeline.html
+++ b/appview/pages/templates/timeline/fragments/timeline.html
@@ -13,7 +13,7 @@
               {{ with $e }}
                 <div class="flex flex-col divide-y divide-gray-200 dark:divide-gray-700 border border-gray-200 dark:border-gray-700 rounded-sm">
                   {{ if .Repo }}
-                    {{ template "timeline/fragments/repoEvent" (list $ .Repo .Source) }}
+                    {{ template "timeline/fragments/repoEvent" (list $ .) }}
                   {{ else if .Star }}
                     {{ template "timeline/fragments/starEvent" (list $ .Star) }}
                   {{ else if .Follow }}
@@ -29,8 +29,9 @@
 
 {{ define "timeline/fragments/repoEvent" }}
   {{ $root := index . 0 }}
-  {{ $repo := index . 1 }}
-  {{ $source := index . 2 }}
+  {{ $event := index . 1 }}
+  {{ $repo := $event.Repo }}
+  {{ $source := $event.Source }}
   {{ $userHandle := resolve $repo.Did }}
     <div class="pl-6 py-2 bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-300 flex flex-wrap items-center gap-2 text-sm">
       {{ template "user/fragments/picHandleLink" $repo.Did }}
@@ -51,7 +52,7 @@
       <span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" $repo.Created }}</span>
     </div>
   {{ with $repo }}
-    {{ template "user/fragments/repoCard" (list $root . true) }}
+    {{ template "user/fragments/repoCard" (list $root . true true (dict "IsStarred" $event.IsStarred "RepoAt" .RepoAt "Stats" (dict "StarCount" $event.StarCount))) }}
   {{ end }}
 {{ end }}
 
diff --git a/appview/pages/templates/user/fragments/repoCard.html b/appview/pages/templates/user/fragments/repoCard.html
index f4683820..fa86460f 100644
--- a/appview/pages/templates/user/fragments/repoCard.html
+++ b/appview/pages/templates/user/fragments/repoCard.html
@@ -2,22 +2,36 @@
   {{ $root := index . 0 }}
   {{ $repo := index . 1 }}
   {{ $fullName := index . 2 }}
+  {{ $starButton := false }}
+  {{ $starData := dict }}
+  {{ if gt (len .) 3 }}
+    {{ $starButton = index . 3 }}
+    {{ if gt (len .) 4 }}
+      {{ $starData = index . 4 }}
+    {{ end }}
+  {{ end }}
 
   {{ with $repo }}
     <div class="py-4 px-6 gap-1 flex flex-col drop-shadow-sm rounded bg-white dark:bg-gray-800 min-h-32">
-      <div class="font-medium dark:text-white flex items-center">
+      <div class="font-medium dark:text-white flex items-center justify-between">
+        <div class="flex items-center">
         {{ if .Source }}
           {{ i "git-fork" "w-4 h-4 mr-1.5 shrink-0" }}
         {{ else }}
           {{ i "book-marked" "w-4 h-4 mr-1.5 shrink-0" }}
         {{ end }}
 
-        {{ $repoOwner := resolve .Did }}
-        {{- if $fullName -}}
-          <a href="/{{ $repoOwner }}/{{ .Name }}" class="truncate">{{ $repoOwner }}/{{ .Name }}</a>
-        {{- else -}}
-          <a href="/{{ $repoOwner }}/{{ .Name }}" class="truncate">{{ .Name }}</a>
-        {{- end -}}
+          {{ $repoOwner := resolve .Did }}
+          {{- if $fullName -}}
+            <a href="/{{ $repoOwner }}/{{ .Name }}" class="truncate">{{ $repoOwner }}/{{ .Name }}</a>
+          {{- else -}}
+            <a href="/{{ $repoOwner }}/{{ .Name }}" class="truncate">{{ .Name }}</a>
+          {{- end -}}
+        </div>
+        
+        {{ if and $starButton $root.LoggedInUser }}
+          {{ template "repo/fragments/repoStar" $starData }}
+        {{ end }}
       </div>
       {{ with .Description }}
         <div class="text-gray-600 dark:text-gray-300 text-sm line-clamp-2">