diff --git a/ProjectLighthouse/Pages/Partials/PhotoPartial.cshtml b/ProjectLighthouse/Pages/Partials/PhotoPartial.cshtml
new file mode 100644
index 00000000..33a8fbc1
--- /dev/null
+++ b/ProjectLighthouse/Pages/Partials/PhotoPartial.cshtml
@@ -0,0 +1,22 @@
+@using LBPUnion.ProjectLighthouse.Types
+@model LBPUnion.ProjectLighthouse.Types.Photo
+
+<img src="/gameAssets/@Model.LargeHash" style="width: 100%; height: auto; border-radius: .28571429rem;">
+<br>
+
+<p>
+    <i>
+        Taken by
+        <b>
+            <a href="/user/@Model.Creator?.UserId">@Model.Creator?.Username</a>
+        </b>
+    </i>
+</p>
+
+<p>
+    <b>Photo contains @Model.Subjects.Count @(Model.Subjects.Count == 1 ? "person" : "people"):</b>
+</p>
+@foreach (PhotoSubject subject in Model.Subjects)
+{
+    <a href="/user/@subject.UserId">@subject.User.Username</a>
+}
\ No newline at end of file
diff --git a/ProjectLighthouse/Pages/PhotosPage.cshtml b/ProjectLighthouse/Pages/PhotosPage.cshtml
index 844165ca..e579cbc3 100644
--- a/ProjectLighthouse/Pages/PhotosPage.cshtml
+++ b/ProjectLighthouse/Pages/PhotosPage.cshtml
@@ -12,25 +12,7 @@
 @foreach (Photo photo in Model.Photos)
 {
     <div class="ui segment">
-        <img src="/gameAssets/@photo.LargeHash" style="width: 100%; height: auto; border-radius: .28571429rem;">
-        <br>
-
-        <p>
-            <i>
-                Taken by
-                <b>
-                    <a href="/user/@photo.Creator!.UserId">@photo.Creator.Username</a>
-                </b>
-            </i>
-        </p>
-
-        <p>
-            <b>Photo contains @photo.Subjects.Count @(photo.Subjects.Count == 1 ? "person" : "people"):</b>
-        </p>
-        @foreach (PhotoSubject subject in photo.Subjects)
-        {
-            <a href="/user/@subject.UserId">@subject.User.Username</a>
-        }
+        @await Html.PartialAsync("Partials/PhotoPartial", photo)
     </div>
 }
 
diff --git a/ProjectLighthouse/Pages/UserPage.cshtml b/ProjectLighthouse/Pages/UserPage.cshtml
index d23cc01c..68317395 100644
--- a/ProjectLighthouse/Pages/UserPage.cshtml
+++ b/ProjectLighthouse/Pages/UserPage.cshtml
@@ -6,7 +6,7 @@
 
 @{
     Layout = "Layouts/BaseLayout";
-    Model.Title = "Model.ProfileUser!.Username's user page";
+    Model.Title = Model.ProfileUser!.Username + "'s user page";
     Model.ShowTitleInPage = false;
 }
 
@@ -14,7 +14,7 @@
     <div class="eight wide column">
         <h1>@Model.Title</h1>
         <p>
-            <i>@Model.ProfileUser.Status</i>
+            <i>@Model.ProfileUser!.Status</i>
         </p>
         <div class="statsUnderTitle">
             <i class="pink heart icon" title="Hearts"></i> <span>@Model.ProfileUser.Hearts</span>
@@ -74,16 +74,7 @@
             @foreach (Photo photo in Model.Photos)
             {
                 <div class="eight wide column">
-                    <img src="/gameAssets/@photo.LargeHash" style="width: 100%; height: auto; border-radius: .28571429rem;">
-                    <br>
-
-                    <p>
-                        <b>Photo contains @photo.Subjects.Count @(photo.Subjects.Count == 1 ? "person" : "people"):</b>
-                    </p>
-                    @foreach (PhotoSubject subject in photo.Subjects)
-                    {
-                        <a href="/user/@subject.UserId">@subject.User.Username</a>
-                    }
+                    @await Html.PartialAsync("Partials/PhotoPartial", photo);
                 </div>
             }
         </div>