diff --git a/ErsatzTV/Pages/BlockEditor.razor b/ErsatzTV/Pages/BlockEditor.razor
index ceb5126b..012b37b5 100644
--- a/ErsatzTV/Pages/BlockEditor.razor
+++ b/ErsatzTV/Pages/BlockEditor.razor
@@ -27,7 +27,7 @@
             <div style="align-items: center; display: flex; margin-left: auto;" class="d-md-none">
                 <div class="flex-grow-1"></div>
                 <MudMenu Icon="@Icons.Material.Filled.MoreVert">
-                    <MudMenuItem Icon="@Icons.Material.Filled.Save" Label="Save Block" OnClick="@SaveChanges"/>
+                    <MudMenuItem Icon="@Icons.Material.Filled.Save" Label="Save Block" OnClick="SaveChanges"/>
                     <MudMenuItem Icon="@Icons.Material.Filled.PlaylistAdd" Label="Add Block Item" OnClick="AddBlockItem"/>
                     <MudMenuItem Icon="@Icons.Material.Filled.Preview" Label="Preview Block Playout" OnClick="PreviewPlayout"/>
                 </MudMenu>
@@ -159,7 +159,7 @@
                         <div class="d-flex">
                             <MudText>Collection</MudText>
                         </div>
-                        <MudAutocomplete Class="mt-3" T="MediaCollectionViewModel"
+                        <MudAutocomplete T="MediaCollectionViewModel"
                                          @bind-Value="_selectedItem.Collection" SearchFunc="@SearchCollections"
                                          ToStringFunc="@(c => c?.Name)" Placeholder="Type to search...">
                             <MoreItemsTemplate>
@@ -176,7 +176,7 @@
                         <div class="d-flex">
                             <MudText>Multi Collection</MudText>
                         </div>
-                        <MudAutocomplete Class="mt-3" T="MultiCollectionViewModel"
+                        <MudAutocomplete T="MultiCollectionViewModel"
                                          @bind-Value="_selectedItem.MultiCollection" SearchFunc="@SearchMultiCollections"
                                          ToStringFunc="@(c => c?.Name)" Placeholder="Type to search...">
                             <MoreItemsTemplate>
@@ -193,7 +193,7 @@
                         <div class="d-flex">
                             <MudText>Smart Collection</MudText>
                         </div>
-                        <MudAutocomplete Class="mt-3" T="SmartCollectionViewModel"
+                        <MudAutocomplete T="SmartCollectionViewModel"
                                          @bind-Value="_selectedItem.SmartCollection" SearchFunc="@SearchSmartCollections"
                                          ToStringFunc="@(c => c?.Name)" Placeholder="Type to search...">
                             <MoreItemsTemplate>
@@ -210,7 +210,7 @@
                         <div class="d-flex">
                             <MudText>Television Show</MudText>
                         </div>
-                        <MudAutocomplete Class="mt-3" T="NamedMediaItemViewModel"
+                        <MudAutocomplete T="NamedMediaItemViewModel"
                                          @bind-Value="_selectedItem.MediaItem" SearchFunc="@SearchTelevisionShows"
                                          ToStringFunc="@(c => c?.Name)" Placeholder="Type to search...">
                             <MoreItemsTemplate>
@@ -227,7 +227,7 @@
                         <div class="d-flex">
                             <MudText>Television Season</MudText>
                         </div>
-                        <MudAutocomplete Class="mt-3" T="NamedMediaItemViewModel"
+                        <MudAutocomplete T="NamedMediaItemViewModel"
                                          @bind-Value="_selectedItem.MediaItem" SearchFunc="@SearchTelevisionSeasons"
                                          ToStringFunc="@(c => c?.Name)" Placeholder="Type to search..."
                                          MaxItems="20">
diff --git a/ErsatzTV/Pages/PlaylistEditor.razor b/ErsatzTV/Pages/PlaylistEditor.razor
index 445b1373..27b67ccf 100644
--- a/ErsatzTV/Pages/PlaylistEditor.razor
+++ b/ErsatzTV/Pages/PlaylistEditor.razor
@@ -9,216 +9,253 @@
 @inject ISnackbar Snackbar
 @inject IMediator Mediator
 
-<MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="pt-8">
-<MudText Typo="Typo.h4" Class="mb-4">Edit Playlist</MudText>
-<div style="max-width: 400px">
-    <MudCard>
-        <MudCardContent>
-            <MudTextField Label="Name" @bind-Value="_playlist.Name" For="@(() => _playlist.Name)"/>
-        </MudCardContent>
-    </MudCard>
-</div>
-<MudButton Variant="Variant.Filled" Color="Color.Default" OnClick="@(_ => AddPlaylistItem())" Class="mt-4">
-    Add Playlist Item
-</MudButton>
-<MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="@(_ => SaveChanges())" Class="mt-4 ml-4">
-    Save Changes
-</MudButton>
-<MudButton Variant="Variant.Filled" Color="Color.Secondary" OnClick="@(_ => PreviewPlayout())" Class="mt-4 ml-4">
-    Preview Playlist Playout
-</MudButton>
-<MudGrid>
-    <MudItem xs="12">
-        <MudTable Class="mt-6" Hover="true" Items="_playlist.Items.OrderBy(i => i.Index)" Dense="true" @bind-SelectedItem="_selectedItem">
-            <ColGroup>
-                <col/>
-                <col/>
-                <col/>
-                <col/>
-                <col/>
-                <col style="width: 60px;"/>
-                <col style="width: 60px;"/>
-                <col style="width: 60px;"/>
-                <col style="width: 60px;"/>
-            </ColGroup>
-            <HeaderContent>
-                <MudTh>Item Type</MudTh>
-                <MudTh>Item</MudTh>
-                <MudTh>Playback Order</MudTh>
-                <MudTh>Play All</MudTh>
-                <MudTh>Show In EPG</MudTh>
-                <MudTh/>
-                <MudTh/>
-                <MudTh/>
-                <MudTh/>
-            </HeaderContent>
-            <RowTemplate>
-                <MudTd DataLabel="Item Type">
-                    <MudText Typo="@(context == _selectedItem ? Typo.subtitle2 : Typo.body2)">
-                        @context.ItemType
-                    </MudText>
-                </MudTd>
-                <MudTd DataLabel="Item">
-                    <MudText Typo="@(context == _selectedItem ? Typo.subtitle2 : Typo.body2)">
-                        @context.ItemName
-                    </MudText>
-                </MudTd>
-                <MudTd DataLabel="Playback Order">
-                    <MudText Typo="@(context == _selectedItem ? Typo.subtitle2 : Typo.body2)">
-                        @(context.PlaybackOrder > 0 ? context.PlaybackOrder : "")
-                    </MudText>
-                </MudTd>
-                <MudTd>
-                    <MudCheckBox T="bool" Value="@context.PlayAll" ValueChanged="@(e => UpdatePlayAll(context, e))"/>
-                </MudTd>
-                <MudTd>
-                    <MudCheckBox T="bool" Value="@context.IncludeInProgramGuide" ValueChanged="@(e => UpdateEPG(context, e))"/>
-                </MudTd>
-                <MudTd>
-                    <MudIconButton Icon="@Icons.Material.Filled.ContentCopy"
-                                   OnClick="@(_ => CopyItem(context))">
-                    </MudIconButton>
-                </MudTd>
-                <MudTd>
-                    <MudIconButton Icon="@Icons.Material.Filled.ArrowUpward"
-                                   OnClick="@(_ => MoveItemUp(context))"
-                                   Disabled="@(_playlist.Items.All(x => x.Index >= context.Index))">
-                    </MudIconButton>
-                </MudTd>
-                <MudTd>
-                    <MudIconButton Icon="@Icons.Material.Filled.ArrowDownward"
-                                   OnClick="@(_ => MoveItemDown(context))"
-                                   Disabled="@(_playlist.Items.All(x => x.Index <= context.Index))">
-                    </MudIconButton>
-                </MudTd>
-                <MudTd>
-                    <MudIconButton Icon="@Icons.Material.Filled.Delete"
-                                   OnClick="@(_ => RemovePlaylistItem(context))">
-                    </MudIconButton>
-                </MudTd>
-            </RowTemplate>
-        </MudTable>
-    </MudItem>
-</MudGrid>
-<div class="mt-4">
-    @if (_selectedItem is not null)
-    {
-        <EditForm Model="_selectedItem">
-            <FluentValidationValidator/>
-            <div style="max-width: 400px;" class="mr-6">
-                <MudCard>
-                    <MudCardContent>
-                        <MudSelect Class="mt-3" Label="Collection Type" @bind-Value="_selectedItem.CollectionType" For="@(() => _selectedItem.CollectionType)">
-                            <MudSelectItem Value="ProgramScheduleItemCollectionType.Collection">Collection</MudSelectItem>
-                            <MudSelectItem Value="ProgramScheduleItemCollectionType.TelevisionShow">Television Show</MudSelectItem>
-                            <MudSelectItem Value="ProgramScheduleItemCollectionType.TelevisionSeason">Television Season</MudSelectItem>
-                            <MudSelectItem Value="ProgramScheduleItemCollectionType.Artist">Artist</MudSelectItem>
-                            <MudSelectItem Value="ProgramScheduleItemCollectionType.MultiCollection">Multi Collection</MudSelectItem>
-                            <MudSelectItem Value="ProgramScheduleItemCollectionType.SmartCollection">Smart Collection</MudSelectItem>
-                            <MudSelectItem Value="ProgramScheduleItemCollectionType.Movie">Movie</MudSelectItem>
-                            <MudSelectItem Value="ProgramScheduleItemCollectionType.Episode">Episode</MudSelectItem>
-                            <MudSelectItem Value="ProgramScheduleItemCollectionType.MusicVideo">Music Video</MudSelectItem>
-                            <MudSelectItem Value="ProgramScheduleItemCollectionType.OtherVideo">Other Video</MudSelectItem>
-                            <MudSelectItem Value="ProgramScheduleItemCollectionType.Song">Song</MudSelectItem>
-                            <MudSelectItem Value="ProgramScheduleItemCollectionType.Image">Image</MudSelectItem>
-                        </MudSelect>
-                        @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.Collection)
-                        {
-                            <MudAutocomplete Class="mt-3" T="MediaCollectionViewModel" Label="Collection"
-                                             @bind-Value="_selectedItem.Collection" SearchFunc="@SearchCollections"
-                                             ToStringFunc="@(c => c?.Name)" Placeholder="Type to search...">
-                                <MoreItemsTemplate>
-                                    <MudText Align="Align.Center" Class="px-4 py-1">
-                                        Only the first 10 items are shown
-                                    </MudText>
-                                </MoreItemsTemplate>
-                            </MudAutocomplete>
-                        }
-
-                        @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.MultiCollection)
-                        {
-                            <MudAutocomplete Class="mt-3" T="MultiCollectionViewModel" Label="Multi Collection"
-                                             @bind-Value="_selectedItem.MultiCollection" SearchFunc="@SearchMultiCollections"
-                                             ToStringFunc="@(c => c?.Name)" Placeholder="Type to search...">
-                                <MoreItemsTemplate>
-                                    <MudText Align="Align.Center" Class="px-4 py-1">
-                                        Only the first 10 items are shown
-                                    </MudText>
-                                </MoreItemsTemplate>
-                            </MudAutocomplete>
-                        }
-
-                        @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.SmartCollection)
-                        {
-                            <MudAutocomplete Class="mt-3" T="SmartCollectionViewModel" Label="Smart Collection"
-                                             @bind-Value="_selectedItem.SmartCollection" SearchFunc="@SearchSmartCollections"
-                                             ToStringFunc="@(c => c?.Name)" Placeholder="Type to search...">
-                                <MoreItemsTemplate>
-                                    <MudText Align="Align.Center" Class="px-4 py-1">
-                                        Only the first 10 items are shown
-                                    </MudText>
-                                </MoreItemsTemplate>
-                            </MudAutocomplete>
-                        }
-
-                        @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.TelevisionShow)
-                        {
-                            <MudAutocomplete Class="mt-3" T="NamedMediaItemViewModel" Label="Television Show"
-                                             @bind-Value="_selectedItem.MediaItem" SearchFunc="@SearchTelevisionShows"
-                                             ToStringFunc="@(c => c?.Name)" Placeholder="Type to search...">
-                                <MoreItemsTemplate>
-                                    <MudText Align="Align.Center" Class="px-4 py-1">
-                                        Only the first 10 items are shown
-                                    </MudText>
-                                </MoreItemsTemplate>
-                            </MudAutocomplete>
-                        }
-
-                        @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.TelevisionSeason)
-                        {
-                            <MudAutocomplete Class="mt-3" T="NamedMediaItemViewModel" Label="Television Season"
-                                             @bind-Value="_selectedItem.MediaItem" SearchFunc="@SearchTelevisionSeasons"
-                                             ToStringFunc="@(c => c?.Name)" Placeholder="Type to search..."
-                                             MaxItems="20">
-                                <MoreItemsTemplate>
-                                    <MudText Align="Align.Center" Class="px-4 py-1">
-                                        Only the first 20 items are shown
-                                    </MudText>
-                                </MoreItemsTemplate>
-                            </MudAutocomplete>
-                        }
-
-                        @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.Artist)
-                        {
-                            <MudAutocomplete Class="mt-3" T="NamedMediaItemViewModel" Label="Artist"
-                                             @bind-Value="_selectedItem.MediaItem" SearchFunc="@SearchArtists"
-                                             ToStringFunc="@(c => c?.Name)" Placeholder="Type to search..."
-                                             MaxItems="10">
-                                <MoreItemsTemplate>
-                                    <MudText Align="Align.Center" Class="px-4 py-1">
-                                        Only the first 10 items are shown
-                                    </MudText>
-                                </MoreItemsTemplate>
-                            </MudAutocomplete>
-                        }
-
-                        @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.Movie)
-                        {
-                            <MudAutocomplete Class="mt-3" T="NamedMediaItemViewModel" Label="Movie"
-                                             @bind-Value="_selectedItem.MediaItem" SearchFunc="@SearchMovies"
-                                             ToStringFunc="@(c => c?.Name)" Placeholder="Type to search..."
-                                             MaxItems="10">
-                                <MoreItemsTemplate>
-                                    <MudText Align="Align.Center" Class="px-4 py-1">
-                                        Only the first 10 items are shown
-                                    </MudText>
-                                </MoreItemsTemplate>
-                            </MudAutocomplete>
-                        }
-
-                        <MudSelect Class="mt-3"
-                                   Label="Playback Order"
-                                   @bind-Value="@_selectedItem.PlaybackOrder"
+<MudForm Style="max-height: 100%">
+    <MudPaper Square="true" Style="display: flex; height: 64px; min-height: 64px; width: 100%; z-index: 100; align-items: center">
+        <div style="display: flex; flex-direction: row; margin-bottom: auto; margin-top: auto; width: 100%; align-items: center" class="ml-6 mr-6">
+            <div class="d-none d-md-flex">
+                <MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="SaveChanges" StartIcon="@Icons.Material.Filled.Save">
+                    Save Playlist
+                </MudButton>
+                <MudButton Class="ml-3" Variant="Variant.Filled" Color="Color.Default" OnClick="AddPlaylistItem" StartIcon="@Icons.Material.Filled.PlaylistAdd">
+                    Add Playlist Item
+                </MudButton>
+                <MudButton Class="ml-3" Variant="Variant.Filled" Color="Color.Secondary" OnClick="PreviewPlayout" StartIcon="@Icons.Material.Filled.Preview">
+                    Preview Playlist Playout
+                </MudButton>
+            </div>
+            <div style="align-items: center; display: flex; margin-left: auto;" class="d-md-none">
+                <div class="flex-grow-1"></div>
+                <MudMenu Icon="@Icons.Material.Filled.MoreVert">
+                    <MudMenuItem Icon="@Icons.Material.Filled.Save" Label="Save Playlist" OnClick="SaveChanges"/>
+                    <MudMenuItem Icon="@Icons.Material.Filled.PlaylistAdd" Label="Add Playlist Item" OnClick="AddPlaylistItem"/>
+                    <MudMenuItem Icon="@Icons.Material.Filled.Preview" Label="Preview Playlist Playout" OnClick="PreviewPlayout"/>
+                </MudMenu>
+            </div>
+        </div>
+    </MudPaper>
+    <div class="d-flex flex-column" style="height: 100vh; overflow-x: auto">
+        <MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="pt-8">
+            <MudText Typo="Typo.h5" Class="mb-2">Playlist</MudText>
+            <MudDivider Class="mb-6"/>
+            <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
+                <div class="d-flex">
+                    <MudText>Name</MudText>
+                </div>
+                <MudTextField @bind-Value="_playlist.Name" For="@(() => _playlist.Name)"/>
+            </MudStack>
+            <MudText Typo="Typo.h5" Class="mt-10 mb-2">Playlist Items</MudText>
+            <MudDivider Class="mb-6"/>
+            <MudTable Hover="true" Items="_playlist.Items.OrderBy(i => i.Index)" Dense="true" @bind-SelectedItem="_selectedItem" RowClassFunc="@SelectedRowClassFunc">
+                <ColGroup>
+                    <MudHidden Breakpoint="Breakpoint.Xs">
+                        <col/>
+                        <col/>
+                        <col/>
+                        <col/>
+                        <col/>
+                        <col style="width: 240px;"/>
+                    </MudHidden>
+                </ColGroup>
+                <HeaderContent>
+                    <MudTh>Item Type</MudTh>
+                    <MudTh>Item</MudTh>
+                    <MudTh>Playback Order</MudTh>
+                    <MudTh>Play All</MudTh>
+                    <MudTh>Show In EPG</MudTh>
+                    <MudTh/>
+                </HeaderContent>
+                <RowTemplate>
+                    <MudTd DataLabel="Item Type">
+                        <MudText Typo="@(context == _selectedItem ? Typo.subtitle2 : Typo.body2)">
+                            @context.ItemType
+                        </MudText>
+                    </MudTd>
+                    <MudTd DataLabel="Item">
+                        <MudText Typo="@(context == _selectedItem ? Typo.subtitle2 : Typo.body2)">
+                            @context.ItemName
+                        </MudText>
+                    </MudTd>
+                    <MudTd DataLabel="Playback Order">
+                        <MudText Typo="@(context == _selectedItem ? Typo.subtitle2 : Typo.body2)">
+                            @(context.PlaybackOrder > 0 ? context.PlaybackOrder : "")
+                        </MudText>
+                    </MudTd>
+                    <MudTd DataLabel="Play All">
+                        <MudCheckBox T="bool" Value="@context.PlayAll" ValueChanged="@(e => UpdatePlayAll(context, e))"/>
+                    </MudTd>
+                    <MudTd DataLabel="Show In EPG">
+                        <MudCheckBox T="bool" Value="@context.IncludeInProgramGuide" ValueChanged="@(e => UpdateEPG(context, e))"/>
+                    </MudTd>
+                    <MudTd>
+                        <div class="d-flex">
+                            <MudIconButton Icon="@Icons.Material.Filled.ContentCopy"
+                                           OnClick="@(_ => CopyItem(context))">
+                            </MudIconButton>
+                            <MudIconButton Icon="@Icons.Material.Filled.ArrowUpward"
+                                           OnClick="@(_ => MoveItemUp(context))"
+                                           Disabled="@(_playlist.Items.All(x => x.Index >= context.Index))">
+                            </MudIconButton>
+                            <MudIconButton Icon="@Icons.Material.Filled.ArrowDownward"
+                                           OnClick="@(_ => MoveItemDown(context))"
+                                           Disabled="@(_playlist.Items.All(x => x.Index <= context.Index))">
+                            </MudIconButton>
+                            <MudIconButton Icon="@Icons.Material.Filled.Delete"
+                                           OnClick="@(_ => RemovePlaylistItem(context))">
+                            </MudIconButton>
+                        </div>
+                    </MudTd>
+                </RowTemplate>
+            </MudTable>
+            @if (_selectedItem is not null)
+            {
+                <MudText Typo="Typo.h5" Class="mt-10 mb-2">Playlist Item</MudText>
+                <MudDivider Class="mb-6"/>
+                <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
+                    <div class="d-flex">
+                        <MudText>Collection Type</MudText>
+                    </div>
+                    <MudSelect @bind-Value="_selectedItem.CollectionType" For="@(() => _selectedItem.CollectionType)">
+                        <MudSelectItem Value="ProgramScheduleItemCollectionType.Collection">Collection</MudSelectItem>
+                        <MudSelectItem Value="ProgramScheduleItemCollectionType.TelevisionShow">Television Show</MudSelectItem>
+                        <MudSelectItem Value="ProgramScheduleItemCollectionType.TelevisionSeason">Television Season</MudSelectItem>
+                        <MudSelectItem Value="ProgramScheduleItemCollectionType.Artist">Artist</MudSelectItem>
+                        <MudSelectItem Value="ProgramScheduleItemCollectionType.MultiCollection">Multi Collection</MudSelectItem>
+                        <MudSelectItem Value="ProgramScheduleItemCollectionType.SmartCollection">Smart Collection</MudSelectItem>
+                        <MudSelectItem Value="ProgramScheduleItemCollectionType.Movie">Movie</MudSelectItem>
+                        <MudSelectItem Value="ProgramScheduleItemCollectionType.Episode">Episode</MudSelectItem>
+                        <MudSelectItem Value="ProgramScheduleItemCollectionType.MusicVideo">Music Video</MudSelectItem>
+                        <MudSelectItem Value="ProgramScheduleItemCollectionType.OtherVideo">Other Video</MudSelectItem>
+                        <MudSelectItem Value="ProgramScheduleItemCollectionType.Song">Song</MudSelectItem>
+                        <MudSelectItem Value="ProgramScheduleItemCollectionType.Image">Image</MudSelectItem>
+                    </MudSelect>
+                </MudStack>
+                @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.Collection)
+                {
+                    <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
+                        <div class="d-flex">
+                            <MudText>Collection</MudText>
+                        </div>
+                        <MudAutocomplete T="MediaCollectionViewModel"
+                                         @bind-Value="_selectedItem.Collection" SearchFunc="@SearchCollections"
+                                         ToStringFunc="@(c => c?.Name)" Placeholder="Type to search...">
+                            <MoreItemsTemplate>
+                                <MudText Align="Align.Center" Class="px-4 py-1">
+                                    Only the first 10 items are shown
+                                </MudText>
+                            </MoreItemsTemplate>
+                        </MudAutocomplete>
+                    </MudStack>
+                }
+                @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.MultiCollection)
+                {
+                    <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
+                        <div class="d-flex">
+                            <MudText>Multi Collection</MudText>
+                        </div>
+                        <MudAutocomplete T="MultiCollectionViewModel"
+                                         @bind-Value="_selectedItem.MultiCollection" SearchFunc="@SearchMultiCollections"
+                                         ToStringFunc="@(c => c?.Name)" Placeholder="Type to search...">
+                            <MoreItemsTemplate>
+                                <MudText Align="Align.Center" Class="px-4 py-1">
+                                    Only the first 10 items are shown
+                                </MudText>
+                            </MoreItemsTemplate>
+                        </MudAutocomplete>
+                    </MudStack>
+                }
+                @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.SmartCollection)
+                {
+                    <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
+                        <div class="d-flex">
+                            <MudText>Smart Collection</MudText>
+                        </div>
+                        <MudAutocomplete T="SmartCollectionViewModel"
+                                         @bind-Value="_selectedItem.SmartCollection" SearchFunc="@SearchSmartCollections"
+                                         ToStringFunc="@(c => c?.Name)" Placeholder="Type to search...">
+                            <MoreItemsTemplate>
+                                <MudText Align="Align.Center" Class="px-4 py-1">
+                                    Only the first 10 items are shown
+                                </MudText>
+                            </MoreItemsTemplate>
+                        </MudAutocomplete>
+                    </MudStack>
+                }
+                @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.TelevisionShow)
+                {
+                    <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
+                        <div class="d-flex">
+                            <MudText>Television Show</MudText>
+                        </div>
+                        <MudAutocomplete T="NamedMediaItemViewModel"
+                                         @bind-Value="_selectedItem.MediaItem" SearchFunc="@SearchTelevisionShows"
+                                         ToStringFunc="@(c => c?.Name)" Placeholder="Type to search...">
+                            <MoreItemsTemplate>
+                                <MudText Align="Align.Center" Class="px-4 py-1">
+                                    Only the first 10 items are shown
+                                </MudText>
+                            </MoreItemsTemplate>
+                        </MudAutocomplete>
+                    </MudStack>
+                }
+                @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.TelevisionSeason)
+                {
+                    <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
+                        <div class="d-flex">
+                            <MudText>Television Season</MudText>
+                        </div>
+                        <MudAutocomplete T="NamedMediaItemViewModel"
+                                         @bind-Value="_selectedItem.MediaItem" SearchFunc="@SearchTelevisionSeasons"
+                                         ToStringFunc="@(c => c?.Name)" Placeholder="Type to search..."
+                                         MaxItems="20">
+                            <MoreItemsTemplate>
+                                <MudText Align="Align.Center" Class="px-4 py-1">
+                                    Only the first 20 items are shown
+                                </MudText>
+                            </MoreItemsTemplate>
+                        </MudAutocomplete>
+                    </MudStack>
+                }
+                @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.Artist)
+                {
+                    <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
+                        <div class="d-flex">
+                            <MudText>Artist</MudText>
+                        </div>
+                        <MudAutocomplete T="NamedMediaItemViewModel"
+                                         @bind-Value="_selectedItem.MediaItem" SearchFunc="@SearchArtists"
+                                         ToStringFunc="@(c => c?.Name)" Placeholder="Type to search..."
+                                         MaxItems="10">
+                            <MoreItemsTemplate>
+                                <MudText Align="Align.Center" Class="px-4 py-1">
+                                    Only the first 10 items are shown
+                                </MudText>
+                            </MoreItemsTemplate>
+                        </MudAutocomplete>
+                    </MudStack>
+                }
+                @if (_selectedItem.CollectionType == ProgramScheduleItemCollectionType.Movie)
+                {
+                    <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
+                        <div class="d-flex">
+                            <MudText>Movie</MudText>
+                        </div>
+                        <MudAutocomplete T="NamedMediaItemViewModel"
+                                         @bind-Value="_selectedItem.MediaItem" SearchFunc="@SearchMovies"
+                                         ToStringFunc="@(c => c?.Name)" Placeholder="Type to search..."
+                                         MaxItems="10">
+                            <MoreItemsTemplate>
+                                <MudText Align="Align.Center" Class="px-4 py-1">
+                                    Only the first 10 items are shown
+                                </MudText>
+                            </MoreItemsTemplate>
+                        </MudAutocomplete>
+                    </MudStack>
+                }
+                <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="form-field-stack gap-md-8 mb-5">
+                    <div class="d-flex">
+                        <MudText>Playback Order</MudText>
+                    </div>
+                        <MudSelect @bind-Value="@_selectedItem.PlaybackOrder"
                                    For="@(() => _selectedItem.PlaybackOrder)"
                                    Disabled="@(_selectedItem.CollectionType is ProgramScheduleItemCollectionType.Movie or ProgramScheduleItemCollectionType.Episode or ProgramScheduleItemCollectionType.MusicVideo or ProgramScheduleItemCollectionType.OtherVideo or ProgramScheduleItemCollectionType.Song or ProgramScheduleItemCollectionType.Image)">
                             @switch (_selectedItem.CollectionType)
@@ -251,36 +288,35 @@
                                     break;
                             }
                         </MudSelect>
-                    </MudCardContent>
-                </MudCard>
-            </div>
-        </EditForm>
-    }
-</div>
-@if (_previewItems != null)
-{
-    <MudTable Class="mt-8"
-              Hover="true"
-              Dense="true"
-              Items="_previewItems">
-        <ToolBarContent>
-            <MudText Typo="Typo.h6">Playlist Playout Preview</MudText>
-        </ToolBarContent>
-        <HeaderContent>
-            <MudTh>Start</MudTh>
-            <MudTh>Finish</MudTh>
-            <MudTh>Media Item</MudTh>
-            <MudTh>Duration</MudTh>
-        </HeaderContent>
-        <RowTemplate>
-            <MudTd DataLabel="Start">@context.Start.ToString(@"hh\:mm\:ss")</MudTd>
-            <MudTd DataLabel="Finish">@context.Finish.ToString(@"hh\:mm\:ss")</MudTd>
-            <MudTd DataLabel="Media Item">@context.Title</MudTd>
-            <MudTd DataLabel="Duration">@context.Duration</MudTd>
-        </RowTemplate>
-    </MudTable>
-}
-</MudContainer>
+                </MudStack>
+            }
+            else if (_previewItems is not null)
+            {
+                <MudText Typo="Typo.h5" Class="mt-10 mb-2">Preview</MudText>
+                <MudDivider Class="mb-6"/>
+                <MudTable Hover="true"
+                          Dense="true"
+                          Items="_previewItems">
+                    <ToolBarContent>
+                        <MudText Typo="Typo.h6">Playlist Playout Preview</MudText>
+                    </ToolBarContent>
+                    <HeaderContent>
+                        <MudTh>Start</MudTh>
+                        <MudTh>Finish</MudTh>
+                        <MudTh>Media Item</MudTh>
+                        <MudTh>Duration</MudTh>
+                    </HeaderContent>
+                    <RowTemplate>
+                        <MudTd DataLabel="Start">@context.Start.ToString(@"hh\:mm\:ss")</MudTd>
+                        <MudTd DataLabel="Finish">@context.Finish.ToString(@"hh\:mm\:ss")</MudTd>
+                        <MudTd DataLabel="Media Item">@context.Title</MudTd>
+                        <MudTd DataLabel="Duration">@context.Duration</MudTd>
+                    </RowTemplate>
+                </MudTable>
+            }
+        </MudContainer>
+    </div>
+</MudForm>
 
 @code {
     private readonly CancellationTokenSource _cts = new();
@@ -511,4 +547,6 @@
     private static void UpdateEPG(PlaylistItemEditViewModel context, bool includeInProgramGuide) => context.IncludeInProgramGuide = includeInProgramGuide;
 
     private static void UpdatePlayAll(PlaylistItemEditViewModel context, bool playAll) => context.PlayAll = playAll;
+
+    private string SelectedRowClassFunc(PlaylistItemEditViewModel element, int rowNumber) => _selectedItem != null && _selectedItem == element ? "selected" : string.Empty;
 }
\ No newline at end of file