diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
index 9912a2f02..26c4d431a 100644
--- a/RotationSolver/Localization/Localization.json
+++ b/RotationSolver/Localization/Localization.json
@@ -176,10 +176,12 @@
   "ConfigWindow_Control_ShowControlWindow": "Show Control Window",
   "ConfigWindow_Control_UseKeyboardCommand": "Use Keyboard Command",
   "ConfigWindow_Control_UseGamepadCommand": "Use GamePad Command",
-  "ConfigWindow_Control_ControlShowCooldown": "Show action's cooldown",
+  "ConfigWindow_Control_ShowCooldownWindow": "Show Cooldown Window",
   "ConfigWindow_Control_IsWindowLock": "Lock",
+  "ConfigWindow_Control_ShowItemsCooldown": "Show Items' Cooldown",
+  "ConfigWindow_Control_CooldownActionOneLine": "The count of cooldown actions in one line.",
   "ConfigWindow_Control_BackgroundColor": "Control Window's Background",
-  "ConfigWindow_Control_NextActionWindowBg": "Next Action Window's Background",
+  "ConfigWindow_Control_InfoWindowBg": "Next Action Window's Background",
   "ConfigWindow_Control_ControlWindowGCDSize": "GCD icon size",
   "ConfigWindow_Control_ControlWindow0GCDSize": "0GCD icon size",
   "ConfigWindow_Control_ControlWindowNextSizeRatio": "Next Action Size Ratio",
diff --git a/RotationSolver/UI/CooldownWindow.cs b/RotationSolver/UI/CooldownWindow.cs
index fc9d7776d..3b7560aa1 100644
--- a/RotationSolver/UI/CooldownWindow.cs
+++ b/RotationSolver/UI/CooldownWindow.cs
@@ -24,7 +24,6 @@ public override void Draw()
     {
         if (RotationUpdater.RightNowRotation != null)
         {
-            ImGui.Separator();
             foreach (var pair in RotationUpdater.AllGroupedActions)
             {
                 var showItems = pair.Where(i => !(i is IBaseAction a && a.IsGeneralGCD)).OrderBy(a => a.ID);
diff --git a/RotationSolver/Updaters/RotationUpdater.cs b/RotationSolver/Updaters/RotationUpdater.cs
index ef229ac9c..23caa60e4 100644
--- a/RotationSolver/Updaters/RotationUpdater.cs
+++ b/RotationSolver/Updaters/RotationUpdater.cs
@@ -141,8 +141,10 @@ public static void UpdateRotation()
 
             RightNowRotation = GetChooseRotation(group, newName);
             RightRotationBaseActions = RightNowRotation.AllBaseActions;
-            break;
+            return;
         }
+        RightNowRotation = null;
+        RightRotationBaseActions = new IBaseAction[0];
     }
 
     internal static ICustomRotation GetChooseRotation(CustomRotationGroup group, string name)