diff --git a/WebApp/Components/CrudActions.razor b/WebApp/Components/CrudActions.razor
new file mode 100644
index 0000000..c4f53b5
--- /dev/null
+++ b/WebApp/Components/CrudActions.razor
@@ -0,0 +1,29 @@
+<MudButtonGroup Size="Size.Small">
+    @if (DetailsHref != null)
+    {
+        <MudTooltip Text="Details">
+            <MudIconButton Href="@DetailsHref" Icon="@Icons.Material.Filled.Description">Details</MudIconButton>
+        </MudTooltip>
+    }
+    @if (EditHref != null)
+    {
+        <MudTooltip Text="Edit">
+            <MudIconButton Href="@EditHref" Icon="@Icons.Material.Filled.Edit">Edit</MudIconButton>
+        </MudTooltip>
+    }
+    @if (DeleteOnClick != null)
+    {
+        <MudTooltip Text="Delete">
+            <MudIconButton Icon="@Icons.Material.Outlined.Delete"
+                           Color="Color.Error"
+                           OnClick="() => DeleteOnClick()"/>
+        </MudTooltip>
+    }
+</MudButtonGroup>
+
+@code {
+
+    [Parameter] public string? DetailsHref { get; set; }
+    [Parameter] public string? EditHref { get; set; }
+    [Parameter] public Action? DeleteOnClick { get; set; }
+}
\ No newline at end of file
diff --git a/WebApp/Components/Pages/EventAttributes.razor b/WebApp/Components/Pages/EventAttributes.razor
index e755ca4..a21343a 100644
--- a/WebApp/Components/Pages/EventAttributes.razor
+++ b/WebApp/Components/Pages/EventAttributes.razor
@@ -1,5 +1,7 @@
 @using WebApp.Models
 
+<MudTooltip Text="Level of Effort">@AppIcons.LevelOfEffortIcon(EventDefinition.LevelOfEffort)</MudTooltip>
+
 @if(EventDefinition.EventFormat ==  EventFormat.Individual) {
     <MudTooltip Text="Individual">@AppIcons.IndividualEvent</MudTooltip>
 }
diff --git a/WebApp/Components/Pages/EventDefinitionPages/Index.razor b/WebApp/Components/Pages/EventDefinitionPages/Index.razor
index 0112edb..fc9353a 100644
--- a/WebApp/Components/Pages/EventDefinitionPages/Index.razor
+++ b/WebApp/Components/Pages/EventDefinitionPages/Index.razor
@@ -25,35 +25,19 @@
             </CellTemplate>
         </TemplateColumn>
         <PropertyColumn Property="@(e => e.ChapterEligibilityCountState)" Title="State#" />
-        <TemplateColumn Title="Regionals" Sortable="true" SortBy="e => e.ChapterEligibilityCountRegionals">
+        <TemplateColumn Title="Attributes" Sortable="false">
             <CellTemplate>
-                @if (context.Item.RegionalEvent) { @AppIcons.RegionalEvent }
-            </CellTemplate>
-        </TemplateColumn>
-        <TemplateColumn Title="Pre-submission" Sortable="true" SortBy="e => e.Presubmission">
-            <CellTemplate>
-                @if (context.Item.Presubmission) { @AppIcons.PresubmissionEvent }
+                <EventAttributes EventDefinition="context.Item"></EventAttributes>
             </CellTemplate>
         </TemplateColumn>
         
         <PropertyColumn Property="@(e => e.LevelOfEffort)" Title="Level of Effort" />
         <TemplateColumn>
             <CellTemplate>
-                <MudStack Row>
-                    <MudButtonGroup Size="Size.Small">
-                        <MudTooltip Text="Details">
-                            <MudIconButton Href="@($"/events/details?id={context.Item.Id}")" Icon="@Icons.Material.Filled.Description">Details</MudIconButton>
-                        </MudTooltip>
-                        <MudTooltip Text="Edit">
-                            <MudIconButton Href="@($"/events/edit?id={context.Item.Id}")" Icon="@Icons.Material.Filled.Edit">Edit</MudIconButton>
-                        </MudTooltip>
-                        <MudTooltip Text="Delete">
-                            <MudIconButton Icon="@Icons.Material.Outlined.Delete"
-                                           Color="Color.Error"
-                                           OnClick="() => DeleteEventDefinition(context.Item)" />
-                        </MudTooltip>
-                    </MudButtonGroup>
-                </MudStack>
+                <CrudActions DetailsHref="@($"/events/details?id={context.Item!.Id}")"
+                             EditHref="@($"/events/edit?id={context.Item!.Id}")"
+                             DeleteOnClick="() => DeleteEventDefinition(context.Item!)">
+                </CrudActions>
             </CellTemplate>
         </TemplateColumn>
     </Columns>
diff --git a/WebApp/Components/Pages/StudentPages/Index.razor b/WebApp/Components/Pages/StudentPages/Index.razor
index ad55620..29a7637 100644
--- a/WebApp/Components/Pages/StudentPages/Index.razor
+++ b/WebApp/Components/Pages/StudentPages/Index.razor
@@ -31,21 +31,10 @@
         </TemplateColumn>
         <TemplateColumn>
             <CellTemplate>
-                <MudStack Row>
-                    <MudButtonGroup Size="Size.Small">
-                        <MudTooltip Text="Details">
-                            <MudIconButton Href="@($"/students/details?id={context.Item.Id}")" Icon="@Icons.Material.Filled.Description" />
-                        </MudTooltip>
-                        <MudTooltip Text="Edit">
-                            <MudIconButton Href="@($"/students/edit?id={context.Item.Id}")" Icon="@Icons.Material.Filled.Edit" />
-                        </MudTooltip>
-                        <MudTooltip Text="Delete">
-                            <MudIconButton Icon="@Icons.Material.Outlined.Delete" 
-                                           Color="Color.Error" 
-                                           OnClick="() => DeleteStudent(context.Item)" />
-                        </MudTooltip>
-                    </MudButtonGroup>
-                </MudStack>
+                <CrudActions DetailsHref="@($"/students/details?id={context.Item!.Id}")"
+                             EditHref="@($"/students/edit?id={context.Item!.Id}")"
+                             DeleteOnClick="() => DeleteStudent(context.Item!)">
+                </CrudActions>
             </CellTemplate>
         </TemplateColumn>
     </Columns>
diff --git a/WebApp/Components/Pages/TeamPages/Index.razor b/WebApp/Components/Pages/TeamPages/Index.razor
index 5dac594..2a60a83 100644
--- a/WebApp/Components/Pages/TeamPages/Index.razor
+++ b/WebApp/Components/Pages/TeamPages/Index.razor
@@ -38,21 +38,11 @@
         </TemplateColumn> *@
         <TemplateColumn>
             <CellTemplate>
-                <MudStack Row>
-                    <MudButtonGroup Size="Size.Small">
-                        <MudTooltip Text="Details">
-                            <MudIconButton Href="@($"/teams/details?id={context.Item!.Id}")" Icon="@Icons.Material.Filled.Description">Details</MudIconButton>
-                        </MudTooltip>
-                        <MudTooltip Text="Edit">
-                            <MudIconButton Href="@($"/teams/edit?id={context.Item!.Id}")" Icon="@Icons.Material.Filled.Edit">Edit</MudIconButton>
-                        </MudTooltip>
-                        <MudTooltip Text="Delete">
-                            <MudIconButton Icon="@Icons.Material.Outlined.Delete"
-                                           Color="Color.Error"
-                                           OnClick="() => DeleteTeam(context.Item!)"/>
-                        </MudTooltip>
-                    </MudButtonGroup>
-                </MudStack>
+                <CrudActions
+                    DetailsHref="@($"/teams/details?id={context.Item!.Id}")"
+                    EditHref="@($"/teams/edit?id={context.Item!.Id}")"
+                    DeleteOnClick="() => DeleteTeam(context.Item!)">
+                </CrudActions>
             </CellTemplate>
         </TemplateColumn>
     </Columns>