diff --git a/ErsatzTV/Pages/Playouts.razor b/ErsatzTV/Pages/Playouts.razor
index b5af3bcff..8f2320177 100644
--- a/ErsatzTV/Pages/Playouts.razor
+++ b/ErsatzTV/Pages/Playouts.razor
@@ -14,7 +14,7 @@
             <col/>
             <col/>
             <col/>
-            <col style="width: 60px;"/>
+            <col style="width: 120px;"/>
         </ColGroup>
         <HeaderContent>
             <MudTh>Id</MudTh>
@@ -29,7 +29,18 @@
             <MudTd DataLabel="Schedule">@context.ProgramSchedule.Name</MudTd>
             @* <MudTd DataLabel="Playout Type">@context.ProgramSchedulePlayoutType</MudTd> *@
             <MudTd>
-                <MudIconButton Icon="@Icons.Material.Filled.Delete" OnClick="@(_ => DeletePlayout(context))"></MudIconButton>
+                <div style="align-items: center; display: flex;">
+                    <MudTooltip Text="Rebuild Playout">
+                        <MudIconButton Icon="@Icons.Material.Filled.Refresh"
+                                       OnClick="@(_ => RebuildPlayout(context))">
+                        </MudIconButton>
+                    </MudTooltip>
+                    <MudTooltip Text="Delete Playout">
+                        <MudIconButton Icon="@Icons.Material.Filled.Delete"
+                                       OnClick="@(_ => DeletePlayout(context))">
+                        </MudIconButton>
+                    </MudTooltip>
+                </div>
             </MudTd>
         </RowTemplate>
     </MudTable>
@@ -63,12 +74,16 @@
 @code {
     private List<PlayoutViewModel> _playouts;
     private List<PlayoutItemViewModel> _selectedPlayoutItems;
+    private int? _selectedPlayoutId;
 
     protected override Task OnParametersSetAsync() =>
         LoadAllPlayouts();
 
-    private async Task PlayoutSelected(PlayoutViewModel playout) =>
+    private async Task PlayoutSelected(PlayoutViewModel playout)
+    {
+        _selectedPlayoutId = playout.Id;
         _selectedPlayoutItems = await Mediator.Send(new GetPlayoutItemsById(playout.Id));
+    }
 
     private async Task DeletePlayout(PlayoutViewModel playout)
     {
@@ -84,6 +99,16 @@
         }
     }
 
+    private async Task RebuildPlayout(PlayoutViewModel playout)
+    {
+        await Mediator.Send(new BuildPlayout(playout.Id, true));
+        await LoadAllPlayouts();
+        if (_selectedPlayoutId == playout.Id)
+        {
+            await PlayoutSelected(playout);
+        }
+    }
+
     private async Task LoadAllPlayouts() =>
         _playouts = await Mediator.Send(new GetAllPlayouts());
 
diff --git a/ErsatzTV/Pages/Schedules.razor b/ErsatzTV/Pages/Schedules.razor
index 157b55e81..3c767ee88 100644
--- a/ErsatzTV/Pages/Schedules.razor
+++ b/ErsatzTV/Pages/Schedules.razor
@@ -14,7 +14,7 @@
             <col/>
             <col/>
             <col/>
-            <col style="width: 60px;"/>
+            <col style="width: 180px;"/>
         </ColGroup>
         <HeaderContent>
             <MudTh>Id</MudTh>
@@ -27,17 +27,23 @@
             <MudTd DataLabel="Name">@context.Name</MudTd>
             <MudTd DataLabel="Name">@context.MediaCollectionPlaybackOrder</MudTd>
             <MudTd>
-                <MudMenu Icon="@Icons.Material.Filled.MoreVert" Direction="Direction.Left" OffsetX="true">
-                    <MudMenuItem Icon="@Icons.Material.Filled.Edit" Link="@($"/schedules/{context.Id}")">
-                        Edit Properties
-                    </MudMenuItem>
-                    <MudMenuItem Icon="@Icons.Material.Filled.Edit" Link="@($"/schedules/{context.Id}/items")">
-                        Edit Schedule Items
-                    </MudMenuItem>
-                    <MudMenuItem Icon="@Icons.Material.Filled.Delete" OnClick="@(_ => DeleteSchedule(context))">
-                        Delete
-                    </MudMenuItem>
-                </MudMenu>
+                <div style="align-items: center; display: flex;">
+                    <MudTooltip Text="Edit Properties">
+                        <MudIconButton Icon="@Icons.Material.Filled.Edit"
+                                       Link="@($"/schedules/{context.Id}")">
+                        </MudIconButton>
+                    </MudTooltip>
+                    <MudTooltip Text="Edit Schedule Items">
+                        <MudIconButton Icon="@Icons.Material.Filled.FormatListNumbered"
+                                       Link="@($"/schedules/{context.Id}/items")">
+                        </MudIconButton>
+                    </MudTooltip>
+                    <MudTooltip Text="Delete Schedule">
+                        <MudIconButton Icon="@Icons.Material.Filled.Delete"
+                                       OnClick="@(_ => DeleteSchedule(context))">
+                        </MudIconButton>
+                    </MudTooltip>
+                </div>
             </MudTd>
         </RowTemplate>
     </MudTable>