diff --git a/WebApp/Components/Pages/TeamPages/Assignment.razor b/WebApp/Components/Pages/TeamPages/Assignment.razor
index c55adda..4027efa 100644
--- a/WebApp/Components/Pages/TeamPages/Assignment.razor
+++ b/WebApp/Components/Pages/TeamPages/Assignment.razor
@@ -280,23 +280,8 @@
             <ChildRowContent>
                 <MudTr>
                     <td colspan="2">
-                        @foreach (var student in
-                                  context.Students
-                                      .OrderBy(e =>
-                                          e.EventRankings
-                                              .Find(er => er.EventDefinition == context.Event)?.Rank ?? 10)
-                                      .ThenBy(s => s.Grade + s.TsaYear))
-                        {
-                            var eventRank = 
-                                student.EventRankings
-                                    .Find(e => e.EventDefinition == context.Event)?.Rank;
-                            var color = AppIcons.RankedEventColor(eventRank ?? 0);
-
-                            <MudPaper Class="d-inline-flex pa-2 mx-3 my-1" Style="@($"background:{color};")">
-                                @student.FirstName
-                            </MudPaper>
-                        }
-                        <MudDivider Style="border-width:3px" />
+                        <TeamStudents Team="@context"></TeamStudents>
+                        <MudDivider Style="border-width:3px"/>
                     </td>
                 </MudTr>
             </ChildRowContent>
diff --git a/WebApp/Components/Pages/TeamPages/Edit.razor b/WebApp/Components/Pages/TeamPages/Edit.razor
index efe6e41..5786be1 100644
--- a/WebApp/Components/Pages/TeamPages/Edit.razor
+++ b/WebApp/Components/Pages/TeamPages/Edit.razor
@@ -32,7 +32,6 @@ else
                         }
                     </MudSelect>
                     <MudTextField T="Student" Label="Captain" @bind-Value="Team.Captain" For="@(() => Team.Captain)" Required="false" Clearable="true"></MudTextField>
-                    <MudNumericField T="string?" Label="Number" @bind-Value="Team.Identifier" For="@(() => Team.Identifier)" Required="false" Clearable="true"></MudNumericField>
                     <MudTextField T="string?" Label="Identifier" @bind-Value="Team.Identifier" For="@(() => Team.Identifier)" Required="false" Clearable="true"></MudTextField>
                 </MudPaper>
             </MudItem>
diff --git a/WebApp/Components/Pages/TeamPages/Index.razor b/WebApp/Components/Pages/TeamPages/Index.razor
index 0de411c..5dac594 100644
--- a/WebApp/Components/Pages/TeamPages/Index.razor
+++ b/WebApp/Components/Pages/TeamPages/Index.razor
@@ -28,23 +28,7 @@
         </TemplateColumn>
         <TemplateColumn Title="Students">
             <CellTemplate>
-                @foreach (var student in
-                          context.Item.Students
-                              .OrderBy(e =>
-                                  e.EventRankings
-                                      .Find(er => er.EventDefinition == context.Item.Event)?.Rank ?? 10)
-                              .ThenBy(s => s.Grade + s.TsaYear))
-                {
-                    var eventRank =
-                        student.EventRankings
-                            .Find(e => e.EventDefinition == context.Item.Event)?.Rank;
-                    var color = AppIcons.RankedEventColor(eventRank ?? 0);
-                    var captain = context.Item.Captain != null && context.Item.Captain.Equals(student);
-
-                    <MudPaper Class="d-inline-flex pa-2 mx-2 my-1" Style="@($"background:{color};")">
-                        @student.FirstName @if(captain){<span> *</span>}
-                    </MudPaper>
-                }
+                <TeamStudents Team="@context.Item"></TeamStudents>
             </CellTemplate>
         </TemplateColumn>
         @* <TemplateColumn Title="Grade (TSA Year)" SortBy="e => e.Grade" Sortable="true">
diff --git a/WebApp/Components/Pages/TeamPages/TeamStudents.razor b/WebApp/Components/Pages/TeamPages/TeamStudents.razor
new file mode 100644
index 0000000..ab8fd5b
--- /dev/null
+++ b/WebApp/Components/Pages/TeamPages/TeamStudents.razor
@@ -0,0 +1,27 @@
+@using WebApp.Models
+@foreach (var student in
+          Team.Students
+              .OrderBy(e =>
+                  e.EventRankings
+                      .Find(er => er.EventDefinition == Team.Event)?.Rank ?? 10)
+              .ThenBy(s => s.Grade + s.TsaYear))
+{
+    var eventRank = 
+        student.EventRankings
+            .Find(e => e.EventDefinition == Team.Event)?.Rank;
+    var color = AppIcons.RankedEventColor(eventRank ?? 0);
+    var captain = Team.Captain != null && Team.Captain.Equals(student);
+
+    <MudPaper Class="d-inline-flex pa-2 mx-3 my-1" Style="@($"background:{color};")">
+        @student.FirstName
+        @if (captain)
+        {
+            <span> *</span>
+        }
+    </MudPaper>
+}
+
+@code {
+    [Parameter]
+    public Team Team { get; set; }
+}