diff --git a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
index 12368caa..dea190de 100644
--- a/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/AudioCuesheet/CuesheetManagerTests.cs
@@ -706,6 +706,75 @@ public void MoveUp_TracksAbove_ReturnsSuccess()
             _traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Once);
         }
 
+        [TestMethod]
+        public void MoveUp_Move2Positions_ReturnsSuccess()
+        {
+            // Arrange
+            var track1End = new TimeSpan(0, 3, 12);
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = track1End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track2End = new TimeSpan(0, 7, 34);
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = track1End,
+                End = track2End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track3End = new TimeSpan(0, 10, 4);
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = track2End,
+                End = track3End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track4 = new Track()
+            {
+                Position = 4,
+                Begin = track3End,
+                End = new TimeSpan(0, 13, 45),
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Audiofiles = [
+                    new() {
+                        Tracks = [track4, track3, track2, track1]
+                    }
+                ],
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            track3.Cuesheet = cuesheet;
+            track4.Cuesheet = cuesheet;
+            track1.Audiofile = cuesheet.Audiofiles.First();
+            track2.Audiofile = cuesheet.Audiofiles.First();
+            track3.Audiofile = cuesheet.Audiofiles.First();
+            track4.Audiofile = cuesheet.Audiofiles.First();
+            _sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
+            // Act
+            var result = _cuesheetManager.MoveUp([track2, track3], 2);
+            // Assert
+            Assert.IsTrue(result.IsSuccess);
+            Assert.AreEqual((ushort?)1, track2.Position);
+            Assert.AreEqual(TimeSpan.Zero, track2.Begin);
+            Assert.AreEqual(track1End, track2.End);
+            Assert.AreEqual((ushort?)2, track3.Position);
+            Assert.AreEqual(track1End, track3.Begin);
+            Assert.AreEqual(track2End, track3.End);
+            Assert.AreEqual((ushort?)3, track1.Position);
+            Assert.AreEqual(track2End, track1.Begin);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet.Audiofiles.First() && y.TraceableChange.PropertyName == nameof(Audiofile.Tracks))), Times.Never);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = true, Times.Once);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Once);
+        }
+
         [TestMethod]
         public void MoveUp_NoTracksAbove_ReturnsFailure()
         {
@@ -1060,6 +1129,78 @@ public void MoveDown_TracksBelow_ReturnsSuccess()
             _traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Once);
         }
 
+        [TestMethod]
+        public void MoveDown_Move2Positions_ReturnsSuccess()
+        {
+            // Arrange
+            var track1End = new TimeSpan(0, 3, 12);
+            var track1 = new Track()
+            {
+                Position = 1,
+                Begin = TimeSpan.Zero,
+                End = track1End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track2End = new TimeSpan(0, 7, 34);
+            var track2 = new Track()
+            {
+                Position = 2,
+                Begin = track1End,
+                End = track2End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track3End = new TimeSpan(0, 10, 4);
+            var track3 = new Track()
+            {
+                Position = 3,
+                Begin = track2End,
+                End = track3End,
+                IsLinkedToPreviousTrack = true
+            };
+            var track4 = new Track()
+            {
+                Position = 4,
+                Begin = track3End,
+                End = new TimeSpan(0, 13, 45),
+                IsLinkedToPreviousTrack = true
+            };
+            var cuesheet = new Cuesheet()
+            {
+                Audiofiles = [
+                    new() {
+                        Tracks = [track4, track3, track2, track1]
+                    }
+                ]
+            };
+            track1.Cuesheet = cuesheet;
+            track2.Cuesheet = cuesheet;
+            track3.Cuesheet = cuesheet;
+            track4.Cuesheet = cuesheet;
+            track1.Audiofile = cuesheet.Audiofiles.First();
+            track2.Audiofile = cuesheet.Audiofiles.First();
+            track3.Audiofile = cuesheet.Audiofiles.First();
+            track4.Audiofile = cuesheet.Audiofiles.First();
+            _sessionStateContainer.Setup(x => x.ActiveCuesheet).Returns(cuesheet);
+            // Act
+            var result = _cuesheetManager.MoveDown([track2, track1], 2);
+            // Assert
+            Assert.IsTrue(result.IsSuccess);
+            Assert.AreEqual((ushort?)1, track3.Position);
+            Assert.AreEqual(TimeSpan.Zero, track3.Begin);
+            Assert.AreEqual(track1End, track3.End);
+            Assert.AreEqual((ushort?)2, track4.Position);
+            Assert.AreEqual(track1End, track4.Begin);
+            Assert.AreEqual(track2End, track4.End);
+            Assert.AreEqual((ushort?)3, track1.Position);
+            Assert.AreEqual(track2End, track1.Begin);
+            Assert.AreEqual(track3End, track1.End);
+            Assert.AreEqual((ushort?)4, track2.Position);
+            Assert.AreEqual(track3End, track2.Begin);
+            _traceChangeManager.Verify(x => x.AddChange(It.Is<TracedChange>(y => y.TraceableObject == cuesheet.Audiofiles.First() && y.TraceableChange.PropertyName == nameof(Audiofile.Tracks))), Times.Never);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = true, Times.Once);
+            _traceChangeManager.VerifySet(x => x.BulkEdit = false, Times.Once);
+        }
+
         [TestMethod]
         public void MoveDown_NoTracksBelow_ReturnsFailure()
         {
diff --git a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
index 06613a8b..f1eeef6f 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
@@ -19,6 +19,7 @@
 using AudioCuesheetEditor.Tests.Utility;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace AudioCuesheetEditor.Tests.Services.UI
@@ -112,6 +113,40 @@ public void BulkEdit_AlreadyEnabledBulkEdit_DoesntDropPreviousEdits()
             Assert.IsTrue(_traceChangeManager.CanRedo);
         }
 
+
+        [TestMethod()]
+        public void BulkEditFalse_AfterBulkEditAndUndo_ResetsRedoStack()
+        {
+            // Arrange
+            var audiofile = new Audiofile();
+            var track1 = new Track();
+            var track2 = new Track();
+            var track3 = new Track();
+            _traceChangeManager.BulkEdit = true;
+            _traceChangeManager.AddChange(new(audiofile, new(new List<Track>() { track1 }, nameof(Audiofile.Tracks))));
+            track1.Audiofile = audiofile;
+            _traceChangeManager.BulkEdit = false;
+            _traceChangeManager.BulkEdit = true;
+            _traceChangeManager.AddChange(new(audiofile, new(new List<Track>() { track1, track2 }, nameof(Audiofile.Tracks))));
+            track1.Audiofile = audiofile;
+            track2.Audiofile = audiofile;
+            _traceChangeManager.BulkEdit = false;
+            _traceChangeManager.Undo();
+            _traceChangeManager.BulkEdit = true;
+            _traceChangeManager.AddChange(new(audiofile, new(new List<Track>() { track1, track2, track3 }, nameof(Audiofile.Tracks))));
+            track1.Audiofile = audiofile;
+            track2.Audiofile = audiofile;
+            track3.Audiofile = audiofile;
+            _traceChangeManager.BulkEdit = false;
+            _traceChangeManager.BulkEdit = true;
+            _traceChangeManager.AddChange(new(track2, new("Testartist", nameof(Track.Artist))));
+            // Act
+            _traceChangeManager.BulkEdit = false;
+            // Assert
+            Assert.IsTrue(_traceChangeManager.CanUndo);
+            Assert.IsFalse(_traceChangeManager.CanRedo);
+        }
+
         [TestMethod()]
         public void Undo_SingleChange_UndoesChange()
         {
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
index 3b635a50..6333479a 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/CuesheetManager.cs
@@ -141,41 +141,50 @@ public bool IsMoveDownPossible(HashSet<Audiofile> selectedAudiofiles)
         }
 
         /// <inheritdoc/>
-        public Result MoveUp(HashSet<Track> selectedTracks)
+        public Result MoveUp(HashSet<Track> selectedTracks, uint positions = 1)
         {
             if (IsMoveUpPossible(selectedTracks) == false)
             {
                 return Result.Failure(new Error(ErrorType.NotPossible, "Moving tracks up is not possible!"));
             }
             _traceChangeManager.BulkEdit = true;
-            var cuesheet = _sessionStateContainer.ActiveCuesheet;
-            foreach (var selectedTrack in selectedTracks.OrderBy(x => x.Position))
+            while (positions > 0)
             {
-                var previousTrack = cuesheet?.Audiofiles.SelectMany(x => x.Tracks).FirstOrDefault(x => x.Position == selectedTrack.Position - 1);
-                if (previousTrack?.Audiofile != null && previousTrack.Audiofile != selectedTrack.Audiofile)
+                if (IsMoveUpPossible(selectedTracks) == false)
                 {
-                    SwitchAudiofile(selectedTrack, previousTrack.Audiofile);
+                    positions = 0;
+                    break;
                 }
-                else
+                var cuesheet = _sessionStateContainer.ActiveCuesheet;
+                foreach (var selectedTrack in selectedTracks.OrderBy(x => x.Position))
                 {
-                    var newBegin = previousTrack?.Begin;
-                    var newEnd = previousTrack?.End;
-                    if (previousTrack != null)
+                    var previousTrack = cuesheet?.Audiofiles.SelectMany(x => x.Tracks).FirstOrDefault(x => x.Position == selectedTrack.Position - 1);
+                    if (previousTrack?.Audiofile != null && previousTrack.Audiofile != selectedTrack.Audiofile)
+                    {
+                        SwitchAudiofile(selectedTrack, previousTrack.Audiofile);
+                    }
+                    else
                     {
-                        _trackManager.SetProperty(previousTrack, x => x.Position, selectedTrack.Position);
-                        _trackManager.SetProperty(previousTrack, x => x.Begin, selectedTrack.Begin);
-                        _trackManager.SetProperty(previousTrack, x => x.End, selectedTrack.End);
+                        var newBegin = previousTrack?.Begin;
+                        var newEnd = previousTrack?.End;
+                        if (previousTrack != null)
+                        {
+                            _trackManager.SetProperty(previousTrack, x => x.Position, selectedTrack.Position);
+                            _trackManager.SetProperty(previousTrack, x => x.Begin, selectedTrack.Begin);
+                            _trackManager.SetProperty(previousTrack, x => x.End, selectedTrack.End);
+                        }
+                        _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position - 1));
+                        _trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
+                        _trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
                     }
-                    _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position - 1));
-                    _trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
-                    _trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
+
                 }
-                
-            }
-            foreach (var audiofile in cuesheet!.Audiofiles)
-            {
-                var orderedTracks = audiofile.Tracks.OrderBy(x => x.Position).ToList();
-                _audiofileManager.SetProperty(audiofile, x => x.Tracks, orderedTracks);
+                foreach (var audiofile in cuesheet!.Audiofiles)
+                {
+                    var orderedTracks = audiofile.Tracks.OrderBy(x => x.Position).ToList();
+                    _audiofileManager.SetProperty(audiofile, x => x.Tracks, orderedTracks);
+                }
+                positions--;
             }
             _traceChangeManager.BulkEdit = false;
             return Result.Success();
@@ -216,40 +225,49 @@ public Result MoveUp(HashSet<Audiofile> selectedAudiofiles)
         }
 
         /// <inheritdoc/>
-        public Result MoveDown(HashSet<Track> selectedTracks)
+        public Result MoveDown(HashSet<Track> selectedTracks, uint positions = 1)
         {
             if (IsMoveDownPossible(selectedTracks) == false)
             {
                 return Result.Failure(new Error(ErrorType.NotPossible, "Moving tracks down is not possible!"));
             }
             _traceChangeManager.BulkEdit = true;
-            var cuesheet = _sessionStateContainer.ActiveCuesheet;
-            foreach (var selectedTrack in selectedTracks.OrderByDescending(x => x.Position))
+            while (positions > 0)
             {
-                var nextTrack = cuesheet?.Audiofiles.SelectMany(x => x.Tracks).FirstOrDefault(x => x.Position == selectedTrack.Position + 1);
-                if (nextTrack?.Audiofile != null && nextTrack.Audiofile != selectedTrack.Audiofile)
+                if (IsMoveDownPossible(selectedTracks) == false)
                 {
-                    SwitchAudiofile(selectedTrack, nextTrack.Audiofile);
+                    positions = 0;
+                    break;
                 }
-                else
+                var cuesheet = _sessionStateContainer.ActiveCuesheet;
+                foreach (var selectedTrack in selectedTracks.OrderByDescending(x => x.Position))
                 {
-                    var newBegin = nextTrack?.Begin;
-                    var newEnd = nextTrack?.End;
-                    if (nextTrack != null)
+                    var nextTrack = cuesheet?.Audiofiles.SelectMany(x => x.Tracks).FirstOrDefault(x => x.Position == selectedTrack.Position + 1);
+                    if (nextTrack?.Audiofile != null && nextTrack.Audiofile != selectedTrack.Audiofile)
+                    {
+                        SwitchAudiofile(selectedTrack, nextTrack.Audiofile);
+                    }
+                    else
                     {
-                        _trackManager.SetProperty(nextTrack, x => x.Position, selectedTrack.Position);
-                        _trackManager.SetProperty(nextTrack, x => x.Begin, selectedTrack.Begin);
-                        _trackManager.SetProperty(nextTrack, x => x.End, selectedTrack.End);
+                        var newBegin = nextTrack?.Begin;
+                        var newEnd = nextTrack?.End;
+                        if (nextTrack != null)
+                        {
+                            _trackManager.SetProperty(nextTrack, x => x.Position, selectedTrack.Position);
+                            _trackManager.SetProperty(nextTrack, x => x.Begin, selectedTrack.Begin);
+                            _trackManager.SetProperty(nextTrack, x => x.End, selectedTrack.End);
+                        }
+                        _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position + 1));
+                        _trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
+                        _trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
                     }
-                    _trackManager.SetProperty(selectedTrack, x => x.Position, (ushort?)(selectedTrack.Position + 1));
-                    _trackManager.SetProperty(selectedTrack, x => x.Begin, newBegin);
-                    _trackManager.SetProperty(selectedTrack, x => x.End, newEnd);
                 }
-            }
-            foreach (var audiofile in cuesheet!.Audiofiles)
-            {
-                var orderedTracks = audiofile.Tracks.OrderBy(x => x.Position).ToList();
-                _audiofileManager.SetProperty(audiofile, x => x.Tracks, orderedTracks);
+                foreach (var audiofile in cuesheet!.Audiofiles)
+                {
+                    var orderedTracks = audiofile.Tracks.OrderBy(x => x.Position).ToList();
+                    _audiofileManager.SetProperty(audiofile, x => x.Tracks, orderedTracks);
+                }
+                positions--;
             }
             _traceChangeManager.BulkEdit = false;
             return Result.Success();
diff --git a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
index bb4daed6..66631da8 100644
--- a/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
+++ b/AudioCuesheetEditor/Services/AudioCuesheet/ICuesheetManager.cs
@@ -78,7 +78,9 @@ public interface ICuesheetManager
         /// Moves selected tracks up
         /// </summary>
         /// <param name="selectedTracks"></param>
-        Result MoveUp(HashSet<Track> selectedTracks);
+        /// <param name="positions"></param>
+        /// <returns></returns>
+        Result MoveUp(HashSet<Track> selectedTracks, uint positions = 1);
         /// <summary>
         /// Moves selected audiofiles up
         /// </summary>
@@ -89,8 +91,9 @@ public interface ICuesheetManager
         /// Moves selected tracks down
         /// </summary>
         /// <param name="selectedTracks"></param>
+        /// <param name="positions"></param>
         /// <returns></returns>
-        Result MoveDown(HashSet<Track> selectedTracks);
+        Result MoveDown(HashSet<Track> selectedTracks, uint positions = 1);
         /// <summary>
         /// Moves selected audiofiles down
         /// </summary>
diff --git a/AudioCuesheetEditor/Services/Result.cs b/AudioCuesheetEditor/Services/Result.cs
index fac41830..565b1fe0 100644
--- a/AudioCuesheetEditor/Services/Result.cs
+++ b/AudioCuesheetEditor/Services/Result.cs
@@ -31,7 +31,11 @@ public enum ErrorType
         /// <summary>
         /// Current action is not possible
         /// </summary>
-        NotPossible
+        NotPossible,
+        /// <summary>
+        /// Action was aborted
+        /// </summary>
+        Aborted,
     }
 
     /// <summary>
diff --git a/AudioCuesheetEditor/Services/UI/DialogManager.cs b/AudioCuesheetEditor/Services/UI/DialogManager.cs
index bf33908a..f8712578 100644
--- a/AudioCuesheetEditor/Services/UI/DialogManager.cs
+++ b/AudioCuesheetEditor/Services/UI/DialogManager.cs
@@ -227,5 +227,30 @@ public async Task<Boolean> ShowImportAudiofilesDialogAsync()
             }
             return canceled;
         }
+
+        /// <inheritdoc/>
+        public async Task<Result<T>> ShowInputDialogAsync<T>(string? title, string? placeholder, string? label, T initialValue, string? OkText = "Ok", string? OkButtonStartIcon = null)
+        {
+            var parameters = new DialogParameters<InputDialog<T>>
+            {
+                { x => x.Placeholder, placeholder },
+                { x => x.Label, label },
+                { x => x.InitialValue, initialValue },
+                { x => x.OkText, OkText },
+                { x => x.OkButtonStartIcon, OkButtonStartIcon }
+            };
+            var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true, CloseButton = true };
+            var dialog = await _dialogService.ShowAsync<InputDialog<T>>(title, parameters, options);
+            var result = await dialog.Result;
+            if (result?.Canceled == false)
+            {
+                var value = (T)result.Data!;
+                return Result<T>.Success(value);
+            }
+            else
+            {
+                return Result<T>.Failure(new Error(ErrorType.Aborted, "User canceled the input dialog."));
+            }
+        }
     }
 }
diff --git a/AudioCuesheetEditor/Services/UI/IDialogManager.cs b/AudioCuesheetEditor/Services/UI/IDialogManager.cs
index b996a6b1..1394af97 100644
--- a/AudioCuesheetEditor/Services/UI/IDialogManager.cs
+++ b/AudioCuesheetEditor/Services/UI/IDialogManager.cs
@@ -24,5 +24,17 @@ public interface IDialogManager
         Task ShowAndHandleModalEditDialogAsync(IEnumerable<Track> tracks);
         Task<bool> ShowImportAudiofilesDialogAsync();
         Task ShowLoadingDialogAsync();
+        /// <summary>
+        /// Show input dialog and wait for user input.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="title"></param>
+        /// <param name="placeholder"></param>
+        /// <param name="label"></param>
+        /// <param name="initialValue"></param>
+        /// <param name="OkText"></param>
+        /// <param name="OkButtonStartIcon"></param>
+        /// <returns></returns>
+        Task<Result<T>> ShowInputDialogAsync<T>(string? title, string? placeholder, string? label, T initialValue, string? OkText = "Ok", string? OkButtonStartIcon = null);
     }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
index 79a53ef1..192c3866 100644
--- a/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
+++ b/AudioCuesheetEditor/Services/UI/TraceChangeManager.cs
@@ -175,6 +175,7 @@ public bool BulkEdit
                     if (_bulkEditTracedChanges?.Count > 0)
                     {
                         _undoStack.Add(new TracedChanges(_bulkEditTracedChanges));
+                        _redoStack.Clear();
                         TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
                     }
                     _bulkEditTracedChanges = null;
diff --git a/AudioCuesheetEditor/Shared/AppBar.razor b/AudioCuesheetEditor/Shared/AppBar.razor
index 5c8c03f6..4fad7e10 100644
--- a/AudioCuesheetEditor/Shared/AppBar.razor
+++ b/AudioCuesheetEditor/Shared/AppBar.razor
@@ -37,10 +37,10 @@ along with Foobar.  If not, see
     {
         <MudButtonGroup Color="Color.Primary" Variant="Variant.Filled" OverrideStyles>
             <MudTooltip Text="@_localizer["Undo last edit"]">
-                <MudIconButton Icon="@Icons.Material.Outlined.Undo" aria-label="undo" Disabled="!TraceChangeManager.CanUndo" OnClick="() => TraceChangeManager.Undo()" />
+                <MudIconButton Icon="@Icons.Material.Outlined.Undo" aria-label="undo" Disabled="!TraceChangeManager.CanUndo" OnClick="TraceChangeManager.Undo" />
             </MudTooltip>
             <MudTooltip Text="@_localizer["Redo last edit"]">
-                <MudIconButton Icon="@Icons.Material.Outlined.Redo" aria-label="redo" Disabled="!TraceChangeManager.CanRedo" OnClick="() => TraceChangeManager.Redo()" />
+                <MudIconButton Icon="@Icons.Material.Outlined.Redo" aria-label="redo" Disabled="!TraceChangeManager.CanRedo" OnClick="TraceChangeManager.Redo" />
             </MudTooltip>
         </MudButtonGroup>
     }
@@ -97,8 +97,8 @@ along with Foobar.  If not, see
     {
         base.OnInitialized();
         _hotKeysContext = _hotKeys.CreateContext()
-            .Add(ModKey.Ctrl, Key.z, () => TraceChangeManager.Undo())
-            .Add(ModKey.Ctrl, Key.y, () => TraceChangeManager.Redo())
+            .Add(ModKey.Ctrl, Key.z, TraceChangeManager.Undo)
+            .Add(ModKey.Ctrl, Key.y, TraceChangeManager.Redo)
             .Add(ModKey.Ctrl, Key.s, DownloadProjectfileClicked)
             .Add(ModKey.Ctrl, Key.e, DownloadExportClicked)
             .Add(ModKey.Ctrl, Key.u, DownloadCuesheetClicked)
diff --git a/AudioCuesheetEditor/Shared/Cuesheet/Audiofiles.razor b/AudioCuesheetEditor/Shared/Cuesheet/Audiofiles.razor
index d16cc16f..ddf19bd9 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/Audiofiles.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/Audiofiles.razor
@@ -20,7 +20,7 @@ along with Foobar.  If not, see
 @inject IStringLocalizer<Audiofiles> _localizer
 @inject IStringLocalizer<ValidationMessage> _validationMessageLocalizer
 @inject IAudiofileManager _audiofileManager
-@inject IDialogService _dialogService
+@inject IDialogManager _dialogManager
 
 @switch (CurrentViewMode)
 {
@@ -77,34 +77,15 @@ along with Foobar.  If not, see
     [Parameter]
     public EventCallback<HashSet<Audiofile>> SelectedFilesChanged { get; set; }
 
-    async Task<String?> ShowInputDialog(string? initialValue)
-    {
-        var parameters = new DialogParameters<InputTextDialog>
-        {
-            { x => x.Placeholder, _localizer["Enter the new file name here"] },
-            { x => x.Label, _localizer["New file name"] },
-            { x => x.InitialValue, initialValue }
-        };
-        var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true, CloseButton = true };
-        var dialog = await _dialogService.ShowAsync<InputTextDialog>(_localizer["Change file name"], parameters, options);
-        var result = await dialog.Result;
-        var newFileName = result?.Data as string;
-        if ((result?.Canceled == false) && (String.IsNullOrEmpty(newFileName) == false))
-        {
-            return newFileName;
-        }
-        else
-        {
-            return null;
-        }
-    }
-
     async Task FileRenameClicked(Audiofile audiofile)
     {
-        var newFileName = await ShowInputDialog(audiofile.Name);
-        if (String.IsNullOrEmpty(newFileName) == false)
+        var result = await _dialogManager.ShowInputDialogAsync<string?>(_localizer["Change file name"], _localizer["Enter the new file name here"], _localizer["New file name"], audiofile.Name);
+        if (result.IsSuccess)
         {
-            _audiofileManager.SetProperty(audiofile, x => x.Name, newFileName);
+            if (String.IsNullOrEmpty(result.Value) == false)
+            {
+                _audiofileManager.SetProperty(audiofile, x => x.Name, result.Value);
+            }
         }
     }
 
diff --git a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
index f42de74b..07df226a 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor
@@ -20,7 +20,7 @@ along with Foobar.  If not, see
 @inject IStringLocalizer<CuesheetData> _localizer
 @inject ValidationService _validationService
 @inject IFileInputManager _fileInputManager
-@inject IDialogService _dialogService
+@inject IDialogManager _dialogManager
 @inject ISessionStateContainer _sessionStateContainer
 @inject ICuesheetManager _cuesheetManager
 
@@ -93,39 +93,20 @@ along with Foobar.  If not, see
 
     async Task CDTextFileRename()
     {
-        var newFileName = await ShowInputDialog(Cuesheet?.CDTextfile?.Name);
-        if (String.IsNullOrEmpty(newFileName) == false)
+        var result = await _dialogManager.ShowInputDialogAsync<string?>(_localizer["Change file name"], _localizer["Enter the new file name here"], _localizer["New file name"], Cuesheet?.CDTextfile?.Name);
+        if (result.IsSuccess)
         {
-            var cdTextFile = Cuesheet?.CDTextfile;
-            if (cdTextFile != null)
+            if (String.IsNullOrEmpty(result.Value) == false)
             {
-                cdTextFile.Name = newFileName;
+                var cdTextFile = Cuesheet?.CDTextfile;
+                if (cdTextFile != null)
+                {
+                    cdTextFile.Name = result.Value;
+                }
             }
         }
     }
 
-    async Task<String?> ShowInputDialog(string? initialValue)
-    {
-        var parameters = new DialogParameters<InputTextDialog>
-        {
-            { x => x.Placeholder, _localizer["Enter the new file name here"] },
-            { x => x.Label, _localizer["New file name"] },
-            { x => x.InitialValue, initialValue }
-        };
-        var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, FullWidth = true, CloseButton = true };
-        var dialog = await _dialogService.ShowAsync<InputTextDialog>(_localizer["Change file name"], parameters, options);
-        var result = await dialog.Result;
-        var newFileName = result?.Data as string;
-        if ((result?.Canceled == false) && (String.IsNullOrEmpty(newFileName) == false))
-        {
-            return newFileName;
-        }
-        else
-        {
-            return null;
-        }
-    }
-
     void CataloguenumberOnBlur()
     {
         var newValue = _catalogueNumber?.Replace(" ", string.Empty);
diff --git a/AudioCuesheetEditor/Shared/Dialogs/InputTextDialog.de.resx b/AudioCuesheetEditor/Shared/Dialogs/InputDialog.de.resx
similarity index 100%
rename from AudioCuesheetEditor/Shared/Dialogs/InputTextDialog.de.resx
rename to AudioCuesheetEditor/Shared/Dialogs/InputDialog.de.resx
diff --git a/AudioCuesheetEditor/Shared/Dialogs/InputTextDialog.razor b/AudioCuesheetEditor/Shared/Dialogs/InputDialog.razor
similarity index 60%
rename from AudioCuesheetEditor/Shared/Dialogs/InputTextDialog.razor
rename to AudioCuesheetEditor/Shared/Dialogs/InputDialog.razor
index 6eddbfcb..b835ed40 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/InputTextDialog.razor
+++ b/AudioCuesheetEditor/Shared/Dialogs/InputDialog.razor
@@ -15,26 +15,34 @@ You should have received a copy of the GNU General Public License
 along with Foobar.  If not, see
 <http: //www.gnu.org/licenses />.
 -->
+@typeparam T
 @inherits BaseLocalizedComponent
 
-@inject IStringLocalizer<InputTextDialog> _localizer
+@inject IStringLocalizer<InputDialog<T>> _localizer
 @inject HotKeys _hotKeys
 
 <MudDialog>
     <DialogContent>
-        <MudTextField @bind-Value="_inputValue" Label="@Label" Placeholder="@Placeholder" Variant="Variant.Outlined" Immediate OnKeyDown="TextFieldKeyDown" />
+        @if (IsNumericType)
+        {
+            <MudNumericField T="T" @bind-Value="_value" Label="@Label" Placeholder="@Placeholder" Variant="Variant.Outlined" Immediate OnKeyDown="OnKeyDown" />
+        }
+        else
+        {
+            <MudTextField T="T" @bind-Value="_value" Label="@Label" Placeholder="@Placeholder" Variant="Variant.Outlined" Immediate OnKeyDown="OnKeyDown" />
+        }
     </DialogContent>
     <DialogActions>
-        <MudButton Color="Color.Success" Variant="Variant.Filled" OnClick="CloseDialogOk">@_localizer["Ok"]</MudButton>
+        <MudButton Color="Color.Success" Variant="Variant.Filled" OnClick="CloseDialogOk" StartIcon="@OkButtonStartIcon">@OkText</MudButton>
     </DialogActions>
 </MudDialog>
 
 @code {
     HotKeysContext? _hotKeysContext;
-    string? _inputValue;
+    T? _value;
 
-    [CascadingParameter]
-    private IMudDialogInstance? MudDialog { get; set; }
+    [Parameter]
+    public T? InitialValue { get; set; }
 
     [Parameter]
     public string? Label { get; set; }
@@ -43,7 +51,16 @@ along with Foobar.  If not, see
     public string? Placeholder { get; set; }
 
     [Parameter]
-    public string? InitialValue { get; set; }
+    public string? OkText { get; set; }
+
+    [Parameter]
+    public string? OkButtonStartIcon { get; set; }
+
+    [CascadingParameter]
+    private IMudDialogInstance? MudDialog { get; set; }
+
+    bool IsNumericType => typeof(T) == typeof(short) || typeof(T) == typeof(ushort) || typeof(T) == typeof(int) || typeof(T) == typeof(uint) || typeof(T) == typeof(long) 
+                       || typeof(T) == typeof(ulong) || typeof(T) == typeof(float) || typeof(T) == typeof(double) || typeof(T) == typeof(decimal);
 
     protected override void OnInitialized()
     {
@@ -51,19 +68,23 @@ along with Foobar.  If not, see
         _hotKeysContext = _hotKeys.CreateContext().Add(ModKey.None, Key.Enter, CloseDialogOk);
     }
 
-    protected override void Dispose(bool disposing)
+    protected override void OnParametersSet()
     {
-        base.Dispose(disposing);
-        _hotKeysContext?.DisposeAsync();
+        base.OnParametersSet();
+        _value = InitialValue;
+        if (String.IsNullOrEmpty(OkText))
+        {
+            OkText = _localizer["Ok"];
+        }
     }
 
-    protected override void OnParametersSet()
+    protected override void Dispose(bool disposing)
     {
-        base.OnParametersSet();
-        _inputValue = InitialValue;
+        base.Dispose(disposing);
+        _hotKeysContext?.DisposeAsync();
     }
 
-    void TextFieldKeyDown(KeyboardEventArgs args)
+    void OnKeyDown(KeyboardEventArgs args)
     {
         if (args.Key == "Enter")
         {
@@ -74,6 +95,6 @@ along with Foobar.  If not, see
 
     void CloseDialogOk(object? state = null)
     {
-        MudDialog?.Close(_inputValue);
+        MudDialog?.Close(_value);
     }
 }
diff --git a/AudioCuesheetEditor/Shared/Dialogs/InputTextDialog.resx b/AudioCuesheetEditor/Shared/Dialogs/InputDialog.resx
similarity index 100%
rename from AudioCuesheetEditor/Shared/Dialogs/InputTextDialog.resx
rename to AudioCuesheetEditor/Shared/Dialogs/InputDialog.resx
diff --git a/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.de.resx b/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.de.resx
deleted file mode 100644
index 2128b9f9..00000000
--- a/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.de.resx
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Record countdown in sconds" xml:space="preserve">
-    <value>Aufnahmecountdown in Sekunden</value>
-  </data>
-  <data name="Seconds till record starts" xml:space="preserve">
-    <value>Sekunden bis die Aufnahme startet</value>
-  </data>
-  <data name="Start countdown" xml:space="preserve">
-    <value>Countdown starten</value>
-  </data>
-  <data name="Start record countdown timer" xml:space="preserve">
-    <value>Aufnahmecountdown starten</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.razor b/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.razor
deleted file mode 100644
index 1bccb8c9..00000000
--- a/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.razor
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--
-This file is part of AudioCuesheetEditor.
-
-AudioCuesheetEditor is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-AudioCuesheetEditor is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar.  If not, see
-<http: //www.gnu.org/licenses />.
--->
-@inherits BaseLocalizedComponent
-
-@inject IStringLocalizer<StartRecordCountdownDialog> _localizer
-
-<MudDialog>
-    <TitleContent>
-        @_localizer["Start record countdown timer"]
-    </TitleContent>
-    <DialogContent>
-        <MudNumericField T="uint?" Placeholder="@_localizer["Seconds till record starts"]" Label="@_localizer["Record countdown in sconds"]" Variant="Variant.Outlined" 
-                            Value="options?.RecordCountdownTimer" ValueChanged="(newValue) => LocalStorageOptionsProvider.SaveOptionsValueAsync<RecordOptions>(x => x.RecordCountdownTimer, newValue)" />
-    </DialogContent>
-    <DialogActions>
-        <MudButton Color="Color.Primary" Variant="Variant.Filled" StartIcon="@Icons.Material.Outlined.Timer" OnClick="() => MudDialog?.Close(DialogResult.Ok(options?.RecordCountdownTimer))">@_localizer["Start countdown"]</MudButton>
-    </DialogActions>
-</MudDialog>
-
-@code {
-    RecordOptions? options;
-
-    [CascadingParameter]
-    private IMudDialogInstance? MudDialog { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        await base.OnInitializedAsync();
-        options = await base.LocalStorageOptionsProvider.GetOptionsAsync<RecordOptions>();
-        base.LocalStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
-    }
-
-    protected override void Dispose(bool disposing)
-    {
-        base.Dispose(disposing);
-        base.LocalStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
-    }
-
-    void LocalStorageOptionsProvider_OptionSaved(object? sender, IOptions option)
-    {
-        if (option is RecordOptions recordOptions)
-        {
-            options = recordOptions;
-            StateHasChanged();
-        }
-    }
-}
diff --git a/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.resx b/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.resx
deleted file mode 100644
index d829f469..00000000
--- a/AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.resx
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Record countdown in sconds" xml:space="preserve">
-    <value>Record countdown in sconds</value>
-  </data>
-  <data name="Seconds till record starts" xml:space="preserve">
-    <value>Seconds till record starts</value>
-  </data>
-  <data name="Start countdown" xml:space="preserve">
-    <value>Start countdown</value>
-  </data>
-  <data name="Start record countdown timer" xml:space="preserve">
-    <value>Start record countdown timer</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Shared/Record/ControlRecording.de.resx b/AudioCuesheetEditor/Shared/Record/ControlRecording.de.resx
index 400150ef..4bdfe9f0 100644
--- a/AudioCuesheetEditor/Shared/Record/ControlRecording.de.resx
+++ b/AudioCuesheetEditor/Shared/Record/ControlRecording.de.resx
@@ -126,6 +126,9 @@
   <data name="Enter countdown timer" xml:space="preserve">
     <value>Countdowntimer angeben</value>
   </data>
+  <data name="Record countdown in sconds" xml:space="preserve">
+    <value>Aufnahmecountdown in Sekunden</value>
+  </data>
   <data name="Record is already running!" xml:space="preserve">
     <value>Die Aufnahme läuft bereits!</value>
   </data>
@@ -138,6 +141,15 @@
   <data name="Recording!" xml:space="preserve">
     <value>Aufnahme aktiv!</value>
   </data>
+  <data name="Seconds till record starts" xml:space="preserve">
+    <value>Sekunden bis die Aufnahme startet</value>
+  </data>
+  <data name="Start countdown" xml:space="preserve">
+    <value>Countdown starten</value>
+  </data>
+  <data name="Start record countdown timer" xml:space="preserve">
+    <value>Aufnahmecountdown starten</value>
+  </data>
   <data name="Start recording" xml:space="preserve">
     <value>Aufnahme starten</value>
   </data>
diff --git a/AudioCuesheetEditor/Shared/Record/ControlRecording.razor b/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
index dfeef283..e98af628 100644
--- a/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
+++ b/AudioCuesheetEditor/Shared/Record/ControlRecording.razor
@@ -18,7 +18,7 @@ along with Foobar.  If not, see
 @inherits BaseLocalizedComponent
 
 @inject IStringLocalizer<ControlRecording> _localizer
-@inject IDialogService _dialogService
+@inject IDialogManager _dialogManager
 @inject ISessionStateContainer _sessionStateContainer
 @inject ICuesheetManager _cuesheetManager
 
@@ -146,13 +146,12 @@ along with Foobar.  If not, see
 
     async Task DisplayStartCountdownDialog()
     {
-        var options = new DialogOptions() { CloseOnEscapeKey = true, BackdropClick = false, CloseButton = true };
-        var dialog = await _dialogService.ShowAsync<StartRecordCountdownDialog>(options);
-        var result = await dialog.Result;
-        var recordCountdownTimer = result?.Data as uint?;
-        if ((result?.Canceled == false) && (recordCountdownTimer.HasValue))
+        var recordOptions = await LocalStorageOptionsProvider.GetOptionsAsync<RecordOptions>();
+        var result = await _dialogManager.ShowInputDialogAsync<uint>(@_localizer["Start record countdown timer"], @_localizer["Seconds till record starts"], @_localizer["Record countdown in sconds"], recordOptions.RecordCountdownTimer, @_localizer["Start countdown"], @Icons.Material.Outlined.Timer);
+        if (result.IsSuccess)
         {
-            _startRecordTimer = new Timer(recordCountdownTimer.Value * 1000);
+            await LocalStorageOptionsProvider.SaveOptionsValueAsync<RecordOptions>(x => x.RecordCountdownTimer, result.Value);
+            _startRecordTimer = new Timer(result.Value * 1000);
             _startRecordTimer.Elapsed += delegate
             {
                 StartRecording();
diff --git a/AudioCuesheetEditor/Shared/Record/ControlRecording.resx b/AudioCuesheetEditor/Shared/Record/ControlRecording.resx
index d407ec4e..c69d68a6 100644
--- a/AudioCuesheetEditor/Shared/Record/ControlRecording.resx
+++ b/AudioCuesheetEditor/Shared/Record/ControlRecording.resx
@@ -126,6 +126,9 @@
   <data name="Enter countdown timer" xml:space="preserve">
     <value>Enter countdown timer</value>
   </data>
+  <data name="Record countdown in sconds" xml:space="preserve">
+    <value>Record countdown in sconds</value>
+  </data>
   <data name="Record is already running!" xml:space="preserve">
     <value>Record is already running!</value>
   </data>
@@ -138,6 +141,15 @@
   <data name="Recording!" xml:space="preserve">
     <value>Recording!</value>
   </data>
+  <data name="Seconds till record starts" xml:space="preserve">
+    <value>Seconds till record starts</value>
+  </data>
+  <data name="Start countdown" xml:space="preserve">
+    <value>Start countdown</value>
+  </data>
+  <data name="Start record countdown timer" xml:space="preserve">
+    <value>Start record countdown timer</value>
+  </data>
   <data name="Start recording" xml:space="preserve">
     <value>Start recording</value>
   </data>
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.de.resx b/AudioCuesheetEditor/Shared/TrackList/TrackList.de.resx
index 241c5171..40d84338 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.de.resx
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.de.resx
@@ -159,4 +159,22 @@
   <data name="Link this track to previous track" xml:space="preserve">
     <value>Track mit vorherigem verknüpfen</value>
   </data>
+  <data name="Move tracks up" xml:space="preserve">
+    <value>Titel nach oben bewegen</value>
+  </data>
+  <data name="Number of positions to move up" xml:space="preserve">
+    <value>Anzahl der Positionen die nach oben bewegt werden soll</value>
+  </data>
+  <data name="Enter positions to move up" xml:space="preserve">
+    <value>Anzahl der Positionen angeben</value>
+  </data>
+  <data name="Move tracks down" xml:space="preserve">
+    <value>Titel nach unten bewegen</value>
+  </data>
+  <data name="Number of positions to move down" xml:space="preserve">
+    <value>Anzahl der Positionen die nach unten bewegt werden soll</value>
+  </data>
+  <data name="Enter positions to move down" xml:space="preserve">
+    <value>Anzahl der Positionen angeben</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
index 60c33574..ea5c8c95 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.razor
@@ -25,6 +25,7 @@ along with Foobar.  If not, see
 @inject ValidationService _validationService
 @inject PlaybackService _playbackService
 @inject IDialogService _dialogService
+@inject IDialogManager _dialogManager
 @inject ITrackManager _trackManager
 @inject ICuesheetManager _cuesheetManager
 @inject ITraceChangeManager _traceChangeManager
@@ -37,24 +38,25 @@ along with Foobar.  If not, see
         <div aria-label="@_localizer["Track table controls"]">
             <TrackListControlButtons AddButtonClicked="AddTrackClicked" EditSelectedTracksClicked="EditSelectedTracksClicked" EditSelectedTracksDisabled="_selectedTracks.Count == 0"
                                      DeleteSelectedTracksClicked="DeleteSelectedTracksClicked" DeleteSelectedTracksDisabled="_selectedTracks.Count == 0"
-                                     DeleteAllTracksClicked="OnDeleteAllTracksClicked" DeleteAllTracksDisabled="Audiofile?.Tracks.Any() == false"
+                                     DeleteAllTracksClicked="OnDeleteAllTracksClicked" DeleteAllTracksDisabled="Audiofile.Tracks.Any() == false"
                                      MoveTracksUpDisabled="!_cuesheetManager.IsMoveUpPossible(_selectedTracks)" MoveTracksUpClicked="() => _cuesheetManager.MoveUp(_selectedTracks)"
-                                     MoveTracksDownDisabled="!_cuesheetManager.IsMoveDownPossible(_selectedTracks)" MoveTracksDownClicked="(MoveTracksDownClicked) => _cuesheetManager.MoveDown(_selectedTracks)"
+                                     MoveTracksDownDisabled="!_cuesheetManager.IsMoveDownPossible(_selectedTracks)" MoveTracksDownClicked="() => _cuesheetManager.MoveDown(_selectedTracks)"
                                      CopySelectedTracksDisabled="_selectedTracks.Count != 1" CopySelectedTracksClicked="() => CopyTrackClicked()"
-                                     FixedHeader="_fixedTableHeader" FixedHeaderClicked="() => _fixedTableHeader = !_fixedTableHeader" />
+                                     FixedHeader="_fixedTableHeader" FixedHeaderClicked="() => _fixedTableHeader = !_fixedTableHeader" MoveTracksUpSeveralClicked="MoveTracksUpSeveralClicked"
+                                     MoveTracksDownSeveralClicked="MoveTracksDownSeveralClicked" />
         </div>
         break;
 }
 
 <MudForm @ref="_form">
-    <MudDataGrid T="Track" Items="Audiofile?.Tracks" ReadOnly="false" Bordered MultiSelection SelectOnRowClick="false" @bind-SelectedItems="_selectedTracks" EditTrigger="DataGridEditTrigger.OnRowClick"
+    <MudDataGrid T="Track" Items="Audiofile.Tracks" ReadOnly="false" Bordered MultiSelection SelectOnRowClick="false" @bind-SelectedItems="_selectedTracks" EditTrigger="DataGridEditTrigger.OnRowClick"
                  EditMode="DataGridEditMode.Cell" ColumnResizeMode="ResizeMode.Column" RowContextMenuClick="OpenMenuContent" Height="@(_fixedTableHeader == true ? "600px" : null)"
                  FixedHeader="_fixedTableHeader" Validator="_form" Virtualize SortMode="SortMode.None">
         <Columns>
             <SelectColumn Hidden="CurrentViewMode == ViewMode.RecordView" />
             <TemplateColumn Title="@_localizer["Controls"]" Hidden="CurrentViewMode != ViewMode.RecordView">
                 <EditTemplate>
-                    <MudIconButton Icon="@Icons.Material.Outlined.Delete" Variant="Variant.Filled" Color="Color.Error" OnClick="() => _audiofileManager.RemoveTracks(Audiofile!, [context.Item])" />
+                    <MudIconButton Icon="@Icons.Material.Outlined.Delete" Variant="Variant.Filled" Color="Color.Error" OnClick="() => _audiofileManager.RemoveTracks(Audiofile, [context.Item])" />
                 </EditTemplate>
             </TemplateColumn>
             <PropertyColumn Property="x => x.Position" Title="#" Editable="false" HeaderStyle="width: 1px;" />
@@ -97,7 +99,7 @@ along with Foobar.  If not, see
             </PropertyColumn>
             <TemplateColumn Title="@_localizer["Status"]" Hidden="CurrentViewMode != ViewMode.DetailView" HeaderStyle="width: 1px;">
                 <EditTemplate>
-                    @if (Audiofile?.Tracks.FirstOrDefault() != context.Item)
+                    @if (Audiofile.Tracks.FirstOrDefault() != context.Item)
                     {
                         <MudTooltip Text="@GetLinkedTrackTooltip(context.Item)">
                             <MudChip Icon="@GetLinkedTrackIcon(context.Item)" Color="Color.Secondary" OnClick="() => _trackManager.SetProperty(context.Item, x => x.IsLinkedToPreviousTrack, !context.Item.IsLinkedToPreviousTrack)" />
@@ -127,7 +129,7 @@ along with Foobar.  If not, see
 
     [Parameter]
     [EditorRequired]
-    public Audiofile? Audiofile { get; set; }
+    public Audiofile Audiofile { get; set; }
 
     [CascadingParameter]
     public ViewMode CurrentViewMode { get; set; }
@@ -176,7 +178,7 @@ along with Foobar.  If not, see
         var result = await dialog.Result;
         if (result?.Canceled == false)
         {
-            _audiofileManager.RemoveTracks(Audiofile!, Audiofile!.Tracks);
+            _audiofileManager.RemoveTracks(Audiofile, Audiofile.Tracks);
             _selectedTracks.Clear();
         }
     }
@@ -213,7 +215,7 @@ along with Foobar.  If not, see
             copy.Position = (ushort?)(trackThatWillBeCopied.Position + 1);
             copy.Begin = trackThatWillBeCopied.End;
             copy.End = null;
-            _audiofileManager.AddTrack(Audiofile!, copy);
+            _audiofileManager.AddTrack(Audiofile, copy);
             await EditTrackModalClicked(copy);
         }
     }
@@ -286,4 +288,22 @@ along with Foobar.  If not, see
             await _form.ValidateAsync();
         }
     }
+
+    async Task MoveTracksUpSeveralClicked()
+    {
+        var result = await _dialogManager.ShowInputDialogAsync<uint>(@_localizer["Move tracks up"], @_localizer["Number of positions to move up"], @_localizer["Enter positions to move up"], 1);
+        if (result.IsSuccess)
+        {
+            _cuesheetManager.MoveUp(_selectedTracks, result.Value);
+        }
+    }
+
+    async Task MoveTracksDownSeveralClicked()
+    {
+        var result = await _dialogManager.ShowInputDialogAsync<uint>(@_localizer["Move tracks down"], @_localizer["Number of positions to move down"], @_localizer["Enter positions to move down"], 1);
+        if (result.IsSuccess)
+        {
+            _cuesheetManager.MoveDown(_selectedTracks, result.Value);
+        }
+    }
 }
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackList.resx b/AudioCuesheetEditor/Shared/TrackList/TrackList.resx
index 3501160a..084dd685 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackList.resx
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackList.resx
@@ -159,4 +159,22 @@
   <data name="Link this track to previous track" xml:space="preserve">
     <value>Link this track to previous track</value>
   </data>
+  <data name="Move tracks up" xml:space="preserve">
+    <value>Move tracks up</value>
+  </data>
+  <data name="Number of positions to move up" xml:space="preserve">
+    <value>Number of positions to move up</value>
+  </data>
+  <data name="Enter positions to move up" xml:space="preserve">
+    <value>Enter positions to move up</value>
+  </data>
+  <data name="Move tracks down" xml:space="preserve">
+    <value>Move tracks down</value>
+  </data>
+  <data name="Number of positions to move down" xml:space="preserve">
+    <value>Number of positions to move down</value>
+  </data>
+  <data name="Enter positions to move down" xml:space="preserve">
+    <value>Enter positions to move down</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackListControlButtons.de.resx b/AudioCuesheetEditor/Shared/TrackList/TrackListControlButtons.de.resx
index 3b992c4d..c9deb962 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackListControlButtons.de.resx
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackListControlButtons.de.resx
@@ -144,7 +144,13 @@
   <data name="Move selected tracks down" xml:space="preserve">
     <value>Ausgewählte Titel nach unten bewegen</value>
   </data>
+  <data name="Move selected tracks down serveral positions" xml:space="preserve">
+    <value>Ausgewählte Titel mehrere Positionen nach unten bewegen</value>
+  </data>
   <data name="Move selected tracks up" xml:space="preserve">
     <value>Ausgewählte Titel nach oben bewegen</value>
   </data>
+  <data name="Move selected tracks up serveral positions" xml:space="preserve">
+    <value>Ausgewählte Titel mehrere Positionen nach oben bewegen</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackListControlButtons.razor b/AudioCuesheetEditor/Shared/TrackList/TrackListControlButtons.razor
index e8255a42..4491b0c6 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackListControlButtons.razor
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackListControlButtons.razor
@@ -60,18 +60,30 @@ along with Foobar.  If not, see
     <MudHidden Breakpoint="Breakpoint.Xs" Invert>
         <MudMenu Color="Color.Tertiary" Variant="Variant.Filled" Icon="@Icons.Material.Filled.ArrowDropDown" Disabled="MoveTracksUpDisabled && MoveTracksDownDisabled">
             <MudMenuItem OnClick="MoveTracksUpClicked" Icon="@Icons.Material.Outlined.MoveUp" Disabled="MoveTracksUpDisabled" aria-label="@_localizer["Move selected tracks up"]">@_localizer["Move selected tracks up"]</MudMenuItem>
+            <MudMenuItem OnClick="MoveTracksUpSeveralClicked" Disabled="MoveTracksUpDisabled" aria-label="@_localizer["Move selected tracks up serveral positions"]">@_localizer["Move selected tracks up serveral positions"]</MudMenuItem>
             <MudMenuItem OnClick="MoveTracksDownClicked" Icon="@Icons.Material.Outlined.MoveDown" Disabled="MoveTracksDownDisabled" aria-label="@_localizer["Move selected tracks down"]">@_localizer["Move selected tracks down"]</MudMenuItem>
+            <MudMenuItem OnClick="MoveTracksDownSeveralClicked" Disabled="MoveTracksDownDisabled" aria-label="@_localizer["Move selected tracks down serveral positions"]">@_localizer["Move selected tracks down serveral positions"]</MudMenuItem>
         </MudMenu>
     </MudHidden>
 </MudButtonGroup>
 
 <MudHidden Breakpoint="Breakpoint.Xs">
-    <MudButtonGroup OverrideStyles="false">
+    <MudButtonGroup Color="Color.Tertiary" Variant="Variant.Filled">
+        <MudTooltip Text="@_localizer["Move selected tracks up"]">
+            <MudIconButton OnClick="MoveTracksUpClicked" Icon="@Icons.Material.Outlined.MoveUp" Disabled="MoveTracksUpDisabled" aria-label="@_localizer["Move selected tracks up"]" />
+        </MudTooltip>
         <MudTooltip Text="@_localizer["Move selected tracks up"]">
-            <MudIconButton Color="Color.Tertiary" Variant="Variant.Filled" OnClick="MoveTracksUpClicked" Icon="@Icons.Material.Outlined.MoveUp" Disabled="MoveTracksUpDisabled" aria-label="@_localizer["Move selected tracks up"]" />
+            <MudMenu Icon="@Icons.Material.Filled.ArrowDropDown" Style="align-self: auto;" Disabled="MoveTracksUpDisabled">
+                <MudMenuItem OnClick="MoveTracksUpSeveralClicked" aria-label="@_localizer["Move selected tracks up serveral positions"]">@_localizer["Move selected tracks up serveral positions"]</MudMenuItem>
+            </MudMenu>
+        </MudTooltip>
+        <MudTooltip Text="@_localizer["Move selected tracks down"]">
+            <MudIconButton OnClick="MoveTracksDownClicked" Icon="@Icons.Material.Outlined.MoveDown" Disabled="MoveTracksDownDisabled" aria-label="@_localizer["Move selected tracks down"]" />
         </MudTooltip>
         <MudTooltip Text="@_localizer["Move selected tracks down"]">
-            <MudIconButton Color="Color.Tertiary" Variant="Variant.Filled" OnClick="MoveTracksDownClicked" Icon="@Icons.Material.Outlined.MoveDown" Disabled="MoveTracksDownDisabled" aria-label="@_localizer["Move selected tracks down"]" />
+            <MudMenu Icon="@Icons.Material.Filled.ArrowDropDown" Style="align-self: auto;" Disabled="MoveTracksDownDisabled">
+                <MudMenuItem OnClick="MoveTracksDownSeveralClicked" aria-label="@_localizer["Move selected tracks down serveral positions"]">@_localizer["Move selected tracks down serveral positions"]</MudMenuItem>
+            </MudMenu>
         </MudTooltip>
     </MudButtonGroup>
 </MudHidden>
@@ -115,12 +127,18 @@ along with Foobar.  If not, see
     [Parameter]
     public EventCallback MoveTracksUpClicked { get; set; }
 
+    [Parameter]
+    public EventCallback MoveTracksUpSeveralClicked { get; set; }
+
     [Parameter]
     public Boolean MoveTracksUpDisabled { get; set; }
 
     [Parameter]
     public EventCallback MoveTracksDownClicked { get; set; }
 
+    [Parameter]
+    public EventCallback MoveTracksDownSeveralClicked { get; set; }
+
     [Parameter]
     public Boolean MoveTracksDownDisabled { get; set; }
 
diff --git a/AudioCuesheetEditor/Shared/TrackList/TrackListControlButtons.resx b/AudioCuesheetEditor/Shared/TrackList/TrackListControlButtons.resx
index d2db673d..4df21bbf 100644
--- a/AudioCuesheetEditor/Shared/TrackList/TrackListControlButtons.resx
+++ b/AudioCuesheetEditor/Shared/TrackList/TrackListControlButtons.resx
@@ -144,7 +144,13 @@
   <data name="Move selected tracks down" xml:space="preserve">
     <value>Move selected tracks down</value>
   </data>
+  <data name="Move selected tracks down serveral positions" xml:space="preserve">
+    <value>Move selected tracks down serveral positions</value>
+  </data>
   <data name="Move selected tracks up" xml:space="preserve">
     <value>Move selected tracks up</value>
   </data>
+  <data name="Move selected tracks up serveral positions" xml:space="preserve">
+    <value>Move selected tracks up serveral positions</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Shared/ViewModes/ViewModeRecord.razor b/AudioCuesheetEditor/Shared/ViewModes/ViewModeRecord.razor
index b993b1d8..c3b702f6 100644
--- a/AudioCuesheetEditor/Shared/ViewModes/ViewModeRecord.razor
+++ b/AudioCuesheetEditor/Shared/ViewModes/ViewModeRecord.razor
@@ -43,7 +43,7 @@ along with Foobar.  If not, see
 </MudCard>
 
 @code {
-    Audiofile? _recordingAudiofile;
+    Audiofile _recordingAudiofile = new();
 
     protected override void OnInitialized()
     {