diff --git a/ErsatzTV.Application/ProgramSchedules/ProgramScheduleItemMultipleViewModel.cs b/ErsatzTV.Application/ProgramSchedules/ProgramScheduleItemMultipleViewModel.cs
index 13cc47031..b298d63cb 100644
--- a/ErsatzTV.Application/ProgramSchedules/ProgramScheduleItemMultipleViewModel.cs
+++ b/ErsatzTV.Application/ProgramSchedules/ProgramScheduleItemMultipleViewModel.cs
@@ -17,7 +17,7 @@ namespace ErsatzTV.Application.ProgramSchedules
             index,
             startType,
             startTime,
-            PlayoutMode.Duration,
+            PlayoutMode.Multiple,
             mediaCollection) =>
             Count = count;
 
diff --git a/ErsatzTV.Core/FileSystemLayout.cs b/ErsatzTV.Core/FileSystemLayout.cs
index f683d9eec..5e2f17cf9 100644
--- a/ErsatzTV.Core/FileSystemLayout.cs
+++ b/ErsatzTV.Core/FileSystemLayout.cs
@@ -6,7 +6,9 @@ namespace ErsatzTV.Core
     public static class FileSystemLayout
     {
         public static readonly string AppDataFolder = Path.Combine(
-            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData, Environment.SpecialFolderOption.Create),
+            Environment.GetFolderPath(
+                Environment.SpecialFolder.LocalApplicationData,
+                Environment.SpecialFolderOption.Create),
             "ersatztv");
 
         public static readonly string DatabasePath = Path.Combine(AppDataFolder, "ersatztv.sqlite3");
diff --git a/ErsatzTV/Pages/ScheduleItemsEditor.razor b/ErsatzTV/Pages/ScheduleItemsEditor.razor
index 1307c8f08..e9ade974b 100644
--- a/ErsatzTV/Pages/ScheduleItemsEditor.razor
+++ b/ErsatzTV/Pages/ScheduleItemsEditor.razor
@@ -1,51 +1,96 @@
 @page "/schedules/{Id:int}/items"
+@using ErsatzTV.Application.MediaCollections
+@using ErsatzTV.Application.MediaCollections.Queries
 @using ErsatzTV.Application.ProgramSchedules
 @using ErsatzTV.Application.ProgramSchedules.Commands
 @using ErsatzTV.Application.ProgramSchedules.Queries
-@using ErsatzTV.Application.MediaCollections
-@using ErsatzTV.Application.MediaCollections.Queries
+@inject NavigationManager NavigationManager
+@inject ILogger<ChannelEditor> Logger
+@inject ISnackbar Snackbar
 @inject IMediator Mediator
 
-<MudTable Hover="true" Items="_schedule.Items.OrderBy(i => i.Index)" Class="mt-8">
+<MudTable Hover="true" Items="_schedule.Items.OrderBy(i => i.Index)" Dense="true" Class="mt-8" @bind-SelectedItem="_selectedItem">
     <ToolBarContent>
         <MudText Typo="Typo.h6">@_schedule.Name Items</MudText>
     </ToolBarContent>
+    <ColGroup>
+        <col/>
+        <col/>
+        <col/>
+        <col style="width: 60px;"/>
+    </ColGroup>
     <HeaderContent>
         <MudTh>Start Time</MudTh>
         <MudTh>Media Collection</MudTh>
         <MudTh>Playout Mode</MudTh>
+        <MudTh/>
     </HeaderContent>
     <RowTemplate>
         <MudTd DataLabel="Start Time">
-            @(context.StartType == StartType.Fixed ? context.StartTime : "Dynamic")
+            <MudText Typo="@(context == _selectedItem ? Typo.subtitle2 : Typo.body2)">
+                @(context.StartType == StartType.Fixed ? context.StartTime : "Dynamic")
+            </MudText>
+        </MudTd>
+        <MudTd DataLabel="Media Collection">
+            <MudText Typo="@(context == _selectedItem ? Typo.subtitle2 : Typo.body2)">
+                @context.MediaCollection.Name
+            </MudText>
+        </MudTd>
+        <MudTd DataLabel="Media Collection">
+            <MudText Typo="@(context == _selectedItem ? Typo.subtitle2 : Typo.body2)">
+                @context.PlayoutMode
+                @if (context.PlayoutMode == PlayoutMode.Multiple && context.MultipleCount.HasValue)
+                {
+                    @($" ({context.MultipleCount})")
+                }
+            </MudText>
+        </MudTd>
+        <MudTd>
+            <MudIconButton Icon="@Icons.Material.Filled.Delete" OnClick="@(_ => RemoveScheduleItem(context))"></MudIconButton>
         </MudTd>
-        <MudTd DataLabel="Media Collection">@context.MediaCollectionName</MudTd>
-        <MudTd DataLabel="Media Collection">@context.PlayoutMode</MudTd>
     </RowTemplate>
-    @* <RowEditingTemplate> *@
-    @*     <MudTd> *@
-    @*         Start Time *@
-    @*     </MudTd> *@
-    @*     <MudTd> *@
-    @*         <MudTextField @bind-Value="@context.MediaCollectionName"></MudTextField> *@
-    @*     </MudTd> *@
-    @*     <MudTd> *@
-    @*         <MudSelect @bind-Value="@context.PlayoutMode"> *@
-    @*             @foreach (PlayoutMode playoutMode in Enum.GetValues<PlayoutMode>()) *@
-    @*             { *@
-    @*                 <MudSelectItem Value="@playoutMode">@playoutMode</MudSelectItem> *@
-    @*             } *@
-    @*         </MudSelect> *@
-    @*     </MudTd> *@
-    @* </RowEditingTemplate> *@
     <PagerContent>
         <MudTablePager/>
     </PagerContent>
 </MudTable>
-@* TODO: only enable this button when media collections exist *@
-<MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="@(_ => AddScheduleItem())" Class="mt-4">
+<MudButton Variant="Variant.Filled" Color="Color.Default" Disabled="@_defaultCollection.IsNone" OnClick="@(_ => AddScheduleItem())" Class="mt-4">
     Add Schedule Item
 </MudButton>
+<MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="@(_ => SaveChanges())" Class="mt-4 ml-4">
+    Save Changes
+</MudButton>
+
+@if (_selectedItem is not null)
+{
+    <div style="max-width: 400px;">
+        <EditForm Model="_selectedItem">
+            <FluentValidator/>
+            <MudCard Class="mt-6">
+                <MudCardContent>
+                    <MudSelect Label="Start Type" @bind-Value="_selectedItem.StartType" For="@(() => _selectedItem.StartType)">
+                        @foreach (StartType startType in Enum.GetValues<StartType>())
+                        {
+                            <MudSelectItem Value="@startType">@startType</MudSelectItem>
+                        }
+                    </MudSelect>
+                    <MudTextField Class="mt-3" Label="Start Time" @bind-Value="@_selectedItem.StartTime" For="@(() => _selectedItem.StartTime)" Disabled="@(_selectedItem.StartType == StartType.Dynamic)"/>
+                    <MudAutocomplete T="MediaCollectionViewModel" Label="Media Collection" @bind-value="_selectedItem.MediaCollection" SearchFunc="@SearchMediaCollections" ToStringFunc="@(c => c?.Name)"/>
+                    <MudSelect Class="mt-3" Label="Playout Mode" @bind-Value="@_selectedItem.PlayoutMode" For="@(() => _selectedItem.PlayoutMode)">
+                        @foreach (PlayoutMode playoutMode in Enum.GetValues<PlayoutMode>())
+                        {
+                            <MudSelectItem Value="@playoutMode">@playoutMode</MudSelectItem>
+                        }
+                    </MudSelect>
+                    <MudTextField Class="mt-3" Label="Multiple Count" @bind-Value="@_selectedItem.MultipleCount" For="@(() => _selectedItem.MultipleCount)" Disabled="@(_selectedItem.PlayoutMode != PlayoutMode.Multiple)"/>
+                    <MudTextField Class="mt-3" Label="Playout Duration" @bind-Value="@_selectedItem.PlayoutDuration" For="@(() => _selectedItem.PlayoutDuration)" Disabled="@(_selectedItem.PlayoutMode != PlayoutMode.Duration)"/>
+                    <MudElement HtmlTag="div" Class="mt-3">
+                        <MudSwitch Label="Offline Tail" @bind-Checked="@_selectedItem.OfflineTail" For="@(() => _selectedItem.OfflineTail)" Disabled="@(_selectedItem.PlayoutMode != PlayoutMode.Duration)"/>
+                    </MudElement>
+                </MudCardContent>
+            </MudCard>
+        </EditForm>
+    </div>
+}
 
 @code {
 
@@ -53,11 +98,18 @@
     public int Id { get; set; }
 
     private ProgramScheduleItemsEditViewModel _schedule;
+    private List<MediaCollectionViewModel> _mediaCollections;
+    private Option<MediaCollectionViewModel> _defaultCollection;
+
+    private ProgramScheduleItemEditViewModel _selectedItem;
 
     protected override Task OnParametersSetAsync() => LoadScheduleItems();
 
     private async Task LoadScheduleItems()
     {
+        _mediaCollections = await Mediator.Send(new GetAllMediaCollections());
+        _defaultCollection = _mediaCollections.HeadOrNone();
+
         string name = string.Empty;
         Option<ProgramScheduleViewModel> maybeSchedule = await Mediator.Send(new GetProgramScheduleById(Id));
         maybeSchedule.IfSome(vm => name = vm.Name);
@@ -66,33 +118,80 @@
         maybeResults.IfSome(items => _schedule = new ProgramScheduleItemsEditViewModel
         {
             Name = name,
-            Items = items.Map(i => new ProgramScheduleItemEditViewModel
-            {
-                Id = i.Id,
-                Index = i.Index,
-                StartType = i.StartType,
-                StartTime = i.StartTime,
-                PlayoutMode = i.PlayoutMode,
-                MediaCollectionName = i.MediaCollection.Name
-            }).ToList()
+            Items = items.Map(ProjectToEditViewModel).ToList()
         });
     }
 
-    private async Task AddScheduleItem()
+    private ProgramScheduleItemEditViewModel ProjectToEditViewModel(ProgramScheduleItemViewModel item)
     {
-        try
+        var result = new ProgramScheduleItemEditViewModel
         {
-    // TODO: don't bother going to the database for this, we probably want a "save changes" button
-    // to save all added, deleted, modified items
+            Id = item.Id,
+            Index = item.Index,
+            StartType = item.StartType,
+            StartTime = item.StartTime,
+            PlayoutMode = item.PlayoutMode,
+            MediaCollection = item.MediaCollection
+        };
 
-            MediaCollectionViewModel mediaCollection = await Mediator.Send(new GetAllMediaCollections()).Map(list => list.Head());
-            await Mediator.Send(new AddProgramScheduleItem(Id, StartType.Dynamic, null, PlayoutMode.One, mediaCollection.Id, null, null, null));
-            await LoadScheduleItems();
-        }
-        catch (Exception ex)
+        switch (item)
         {
-    // TODO: something?
+            case ProgramScheduleItemMultipleViewModel multiple:
+                result.MultipleCount = multiple.Count;
+                break;
+            case ProgramScheduleItemDurationViewModel duration:
+                result.PlayoutDuration = duration.PlayoutDuration;
+                result.OfflineTail = duration.OfflineTail;
+                break;
         }
+
+        return result;
+    }
+
+    private void AddScheduleItem()
+    {
+        var item = new ProgramScheduleItemEditViewModel
+        {
+            Index = _schedule.Items.Map(i => i.Index).DefaultIfEmpty().Max() + 1,
+            StartType = StartType.Dynamic,
+            PlayoutMode = PlayoutMode.One
+        };
+
+        _defaultCollection.IfSome(c => item.MediaCollection = c);
+
+        _schedule.Items.Add(item);
+        _selectedItem = item;
+    }
+
+    private void RemoveScheduleItem(ProgramScheduleItemEditViewModel item)
+    {
+        _selectedItem = null;
+        _schedule.Items.Remove(item);
+    }
+
+    private async Task<IEnumerable<MediaCollectionViewModel>> SearchMediaCollections(string value) => _mediaCollections.Filter(c => c.Name.StartsWith(value));
+
+    private async Task SaveChanges()
+    {
+        var items = _schedule.Items.Map(item => new ReplaceProgramScheduleItem(
+            item.Index,
+            item.StartType,
+            item.StartTime,
+            item.PlayoutMode,
+            item.MediaCollection.Id,
+            item.MultipleCount,
+            item.PlayoutDuration,
+            item.PlayoutMode == PlayoutMode.Duration ? item.OfflineTail.IfNone(false) : null)).ToList();
+
+        Seq<BaseError> errorMessages = await Mediator.Send(new ReplaceProgramScheduleItems(Id, items)).Map(e => e.LeftToSeq());
+
+        errorMessages.HeadOrNone().Match(
+            error =>
+            {
+                Snackbar.Add($"Unexpected error saving schedule: {error.Value}");
+                Logger.LogError("Unexpected error saving schedule: {Error}", error.Value);
+            },
+            () => NavigationManager.NavigateTo("/schedules"));
     }
 
 }
\ No newline at end of file
diff --git a/ErsatzTV/Pages/Schedules.razor b/ErsatzTV/Pages/Schedules.razor
index 890131b00..5d3482581 100644
--- a/ErsatzTV/Pages/Schedules.razor
+++ b/ErsatzTV/Pages/Schedules.razor
@@ -5,7 +5,7 @@
 @inject IDialogService Dialog
 @inject IMediator Mediator
 
-<MudTable Hover="true" Items="_schedules" SelectedItemChanged="@(async (ProgramScheduleViewModel x) => await ScheduleSelected(x))">
+<MudTable Hover="true" Items="_schedules" Dense="true" SelectedItemChanged="@(async (ProgramScheduleViewModel x) => await ScheduleSelected(x))">
     <ToolBarContent>
         <MudText Typo="Typo.h6">Schedules</MudText>
     </ToolBarContent>
diff --git a/ErsatzTV/Startup.cs b/ErsatzTV/Startup.cs
index 6e98cc750..88413cd7e 100644
--- a/ErsatzTV/Startup.cs
+++ b/ErsatzTV/Startup.cs
@@ -86,7 +86,7 @@ namespace ErsatzTV
                 "Server will listen on port {Port} - try UI at {UI}",
                 8989,
                 "http://localhost:8989");
-            
+
             if (!Directory.Exists(FileSystemLayout.AppDataFolder))
             {
                 Directory.CreateDirectory(FileSystemLayout.AppDataFolder);
diff --git a/ErsatzTV/Validators/ProgramScheduleItemEditViewModelValidator.cs b/ErsatzTV/Validators/ProgramScheduleItemEditViewModelValidator.cs
new file mode 100644
index 000000000..19ccd4834
--- /dev/null
+++ b/ErsatzTV/Validators/ProgramScheduleItemEditViewModelValidator.cs
@@ -0,0 +1,22 @@
+using ErsatzTV.Core.Domain;
+using ErsatzTV.ViewModels;
+using FluentValidation;
+
+namespace ErsatzTV.Validators
+{
+    public class ProgramScheduleItemEditViewModelValidator : AbstractValidator<ProgramScheduleItemEditViewModel>
+    {
+        public ProgramScheduleItemEditViewModelValidator()
+        {
+            When(
+                i => i.StartType == StartType.Fixed,
+                () => RuleFor(i => i.StartTime).NotNull());
+            When(
+                i => i.PlayoutMode == PlayoutMode.Multiple,
+                () => RuleFor(i => i.MultipleCount).NotNull().GreaterThan(0));
+            When(
+                i => i.PlayoutMode == PlayoutMode.Duration,
+                () => RuleFor(i => i.PlayoutDuration).NotNull());
+        }
+    }
+}
diff --git a/ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs b/ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs
index 8694dbe0e..c9f04651c 100644
--- a/ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs
+++ b/ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs
@@ -1,15 +1,45 @@
 using System;
+using ErsatzTV.Application.MediaCollections;
 using ErsatzTV.Core.Domain;
 
 namespace ErsatzTV.ViewModels
 {
     public class ProgramScheduleItemEditViewModel
     {
+        private int? _multipleCount;
+        private bool? _offlineTail;
+        private TimeSpan? _playoutDuration;
+        private TimeSpan? _startTime;
+
         public int Id { get; set; }
         public int Index { get; set; }
         public StartType StartType { get; set; }
-        public TimeSpan? StartTime { get; set; }
+
+        public TimeSpan? StartTime
+        {
+            get => StartType == StartType.Fixed ? _startTime : null;
+            set => _startTime = value;
+        }
+
         public PlayoutMode PlayoutMode { get; set; }
-        public string MediaCollectionName { get; set; }
+        public MediaCollectionViewModel MediaCollection { get; set; }
+
+        public int? MultipleCount
+        {
+            get => PlayoutMode == PlayoutMode.Multiple ? _multipleCount : null;
+            set => _multipleCount = value;
+        }
+
+        public TimeSpan? PlayoutDuration
+        {
+            get => PlayoutMode == PlayoutMode.Duration ? _playoutDuration : null;
+            set => _playoutDuration = value;
+        }
+
+        public bool? OfflineTail
+        {
+            get => PlayoutMode == PlayoutMode.Duration ? _offlineTail : null;
+            set => _offlineTail = value;
+        }
     }
 }