diff --git a/UI/RenderConfigUIManager.cs b/UI/RenderConfigUIManager.cs
index 43ce3b6..ee44a03 100644
--- a/UI/RenderConfigUIManager.cs
+++ b/UI/RenderConfigUIManager.cs
@@ -47,7 +47,7 @@ namespace ADOFAIRenderer.UI
             _doubleValidator
                 .AddLimits("RenderFPS", new PositiveOnlyDoubleLimit(), new RangeDoubleLimit(0, 9600))
                 .AddLimits("VideoFPS", new PositiveOnlyDoubleLimit(), new RangeDoubleLimit(0, 4800))
-                .AddLimits("DelayAfterLevelEnd", new PositiveOnlyDoubleLimit(), new RangeDoubleLimit(0, 86400));
+                .AddLimits("DelayAfterEnd", new PositiveOnlyDoubleLimit(), new RangeDoubleLimit(0, 86400));
             
             _intValidator.SetupValidation();
             _doubleValidator.SetupValidation();
@@ -650,7 +650,7 @@ namespace ADOFAIRenderer.UI
             var heightField = _root.Q<IntegerField>("RenderHeight");
             var renderFpsField = _root.Q<DoubleField>("RenderFPS");
             var videoFpsField = _root.Q<DoubleField>("VideoFPS");
-            var delayField = _root.Q<DoubleField>("DelayAfterLevelEnd");
+            var delayField = _root.Q<DoubleField>("DelayAfterEnd");
             var showJudgementText = _root.Q<Toggle>("ShowJudgementText");
 
             // Copy validated values to Configuration manually
@@ -659,7 +659,7 @@ namespace ADOFAIRenderer.UI
             config.RenderHeight = heightField.value;
             config.RenderFPS = renderFpsField.value;
             config.VideoFPS = videoFpsField.value;
-            config.DelayAfterLevelEnd = delayField.value;
+            config.DelayAfterEnd = delayField.value;
             
             if (showJudgementText != null)
                 config.ShowJudgementText = showJudgementText.value;
@@ -676,7 +676,7 @@ namespace ADOFAIRenderer.UI
             var heightField = _root.Q<IntegerField>("RenderHeight");
             var renderFpsField = _root.Q<DoubleField>("RenderFPS");
             var videoFpsField = _root.Q<DoubleField>("VideoFPS");
-            var delayField = _root.Q<DoubleField>("DelayAfterLevelEnd");
+            var delayField = _root.Q<DoubleField>("DelayAfterEnd");
 
             if (widthField == null || string.IsNullOrEmpty(widthField.text) ||
                 heightField == null || string.IsNullOrEmpty(heightField.text) ||
@@ -703,14 +703,14 @@ namespace ADOFAIRenderer.UI
             var heightField = _root.Q<IntegerField>("RenderHeight");
             var renderFpsField = _root.Q<DoubleField>("RenderFPS");
             var videoFpsField = _root.Q<DoubleField>("VideoFPS");
-            var delayField = _root.Q<DoubleField>("DelayAfterLevelEnd");
+            var delayField = _root.Q<DoubleField>("DelayAfterEnd");
             var showJudgementText = _root.Q<Toggle>("ShowJudgementText");
 
             if (widthField != null) widthField.value = config.RenderWidth;
             if (heightField != null) heightField.value = config.RenderHeight;
             if (renderFpsField != null) renderFpsField.value = config.RenderFPS;
             if (videoFpsField != null) videoFpsField.value = config.VideoFPS;
-            if (delayField != null) delayField.value = config.DelayAfterLevelEnd;
+            if (delayField != null) delayField.value = config.DelayAfterEnd;
             if (showJudgementText != null) showJudgementText.value = config.ShowJudgementText;
 
             RenderManager.Instance.Configuration = config;
@@ -1039,7 +1039,7 @@ namespace ADOFAIRenderer.UI
                     var heightField = _root.Q<IntegerField>("RenderHeight");
                     var renderFpsField = _root.Q<DoubleField>("RenderFPS");
                     var videoFpsField = _root.Q<DoubleField>("VideoFPS");
-                    var delayField = _root.Q<DoubleField>("DelayAfterLevelEnd");
+                    var delayField = _root.Q<DoubleField>("DelayAfterEnd");
                     var showJudgementText = _root.Q<Toggle>("ShowJudgementText");
 
                     var currentConfig = new RenderConfig
@@ -1048,14 +1048,13 @@ namespace ADOFAIRenderer.UI
                         RenderHeight = heightField.value,
                         RenderFPS = renderFpsField.value,
                         VideoFPS = videoFpsField.value,
-                        DelayAfterLevelEnd = delayField.value,
-                        ShowJudgementText = showJudgementText?.value ?? true
+                        DelayAfterEnd = delayField.value,
+                        ShowJudgementText = showJudgementText?.value ?? true,
+                        VideoConfig = RenderManager.Instance.Configuration.VideoConfig,
+                        AudioConfig = RenderManager.Instance.Configuration.AudioConfig,
+                        AdvancedConfig = RenderManager.Instance.Configuration.AdvancedConfig
                     };
 
-                    currentConfig.VideoConfig = RenderManager.Instance.Configuration.VideoConfig;
-                    currentConfig.AudioConfig = RenderManager.Instance.Configuration.AudioConfig;
-                    currentConfig.AdvancedConfig = RenderManager.Instance.Configuration.AdvancedConfig;
-
                     PresetManager.SavePreset(presetName, currentConfig);
                     nameField.value = string.Empty;
                     refreshPresets();