diff --git a/Qwilight/Compute/FlintCompute.cs b/Qwilight/Compute/FlintCompute.cs
index c5c1725..9a01de2 100644
--- a/Qwilight/Compute/FlintCompute.cs
+++ b/Qwilight/Compute/FlintCompute.cs
@@ -16,7 +16,7 @@
             Close();
             var mainViewModel = ViewModels.Instance.MainValue;
             var entryItem = mainViewModel.EntryItemValue;
-            if (entryItem != null)
+            if (entryItem != null && entryItem.EntryPath == NoteFile.EntryItem.EntryPath)
             {
                 mainViewModel.LoadEntryItem(entryItem.DefaultEntryItem, entryItem.EntryPath);
             }
diff --git a/Qwilight/JSON.cs b/Qwilight/JSON.cs
index 0e44fce..e220182 100644
--- a/Qwilight/JSON.cs
+++ b/Qwilight/JSON.cs
@@ -824,7 +824,9 @@
             public double totalLength;
             public int topCount;
             public long date;
-            public int[] avatarLevels;
+            public int avatarLevel;
+            public double avatarXP;
+            public double totalAvatarXP;
             public double avatarAbility5K;
             public double avatarAbility5KStatus;
             public int avatarAbility5KPlace;
diff --git a/Qwilight/MSG/GetEnrollCipher.cs b/Qwilight/MSG/GetEnrollCipher.cs
new file mode 100644
index 0000000..10460fa
--- /dev/null
+++ b/Qwilight/MSG/GetEnrollCipher.cs
@@ -0,0 +1,8 @@
+using CommunityToolkit.Mvvm.Messaging.Messages;
+
+namespace Qwilight.MSG
+{
+    public sealed class GetEnrollCipher : RequestMessage<(string, string)>
+    {
+    }
+}
\ No newline at end of file
diff --git a/Qwilight/MSG/GetSignUpCipher.cs b/Qwilight/MSG/GetSignUpCipher.cs
deleted file mode 100644
index 10460fa..0000000
--- a/Qwilight/MSG/GetSignUpCipher.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using CommunityToolkit.Mvvm.Messaging.Messages;
-
-namespace Qwilight.MSG
-{
-    public sealed class GetEnrollCipher : RequestMessage<(string, string)>
-    {
-    }
-}
\ No newline at end of file
diff --git a/Qwilight/System/NotifySystem.cs b/Qwilight/System/NotifySystem.cs
index f5a6367..ba976c7 100644
--- a/Qwilight/System/NotifySystem.cs
+++ b/Qwilight/System/NotifySystem.cs
@@ -17,7 +17,7 @@
 
         public enum NotifyVariety
         {
-            OK, Fault, Warning, Info, Handling, Stopped, Closed
+            OK, Fault, Warning, Info, Handling, Cancelled, Closed
         }
 
         public enum NotifyConfigure
diff --git a/Qwilight/System/TelnetSystem/DefaultTelnetSystem.cs b/Qwilight/System/TelnetSystem/DefaultTelnetSystem.cs
index 9eb3e6f..2d69b96 100644
--- a/Qwilight/System/TelnetSystem/DefaultTelnetSystem.cs
+++ b/Qwilight/System/TelnetSystem/DefaultTelnetSystem.cs
@@ -135,7 +135,7 @@
                                     valueNotifyItem = new NotifyItem
                                     {
                                         Text = Guid.NewGuid().ToString(),
-                                        Variety = NotifySystem.NotifyVariety.Stopped
+                                        Variety = NotifySystem.NotifyVariety.Cancelled
                                     };
                                     UIHandler.Instance.HandleParallel(() => ViewModels.Instance.NotifyValue.HandlingNotifyItemCollection.Insert(0, valueNotifyItem));
                                     NotifySystem.Instance.Notify(NotifySystem.NotifyVariety.Info, NotifySystem.NotifyConfigure.NotSave, valueNotifyItem.Text, true);
diff --git a/Qwilight/System/TwilightSystem.cs b/Qwilight/System/TwilightSystem.cs
index 4d7fa45..c46e552 100644
--- a/Qwilight/System/TwilightSystem.cs
+++ b/Qwilight/System/TwilightSystem.cs
@@ -914,7 +914,7 @@
                                     case Event.Types.EventID.StopSavingAsBundle:
                                         if (_bundleNotifyItems.TryGetValue(eventItemText, out bundleNotifyItem))
                                         {
-                                            bundleNotifyItem.Variety = NotifySystem.NotifyVariety.Stopped;
+                                            bundleNotifyItem.Variety = NotifySystem.NotifyVariety.Cancelled;
                                         }
                                         break;
                                     case Event.Types.EventID.SaveBundle:
diff --git a/Qwilight/View/BundleWindow/BundleWindow.xaml b/Qwilight/View/BundleWindow/BundleWindow.xaml
index 9acd2ba..a1304c5 100644
--- a/Qwilight/View/BundleWindow/BundleWindow.xaml
+++ b/Qwilight/View/BundleWindow/BundleWindow.xaml
@@ -44,12 +44,8 @@
                     </TabItem>
                 </TabControl>
                 <Grid Grid.Row="2">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
+                    <ProgressBar Grid.Column="1" Style="{StaticResource StandardStatusView}" Value="{Binding Value, Mode=OneWay}" Height="24" />
                     <TextBlock Style="{StaticResource StandardTextView}" Text="{Binding ValueContents}" />
-                    <ProgressBar Grid.Column="1" Style="{StaticResource StandardStatusView}" Value="{Binding Value, Mode=OneWay}" />
                 </Grid>
             </Grid>
         </Border>
diff --git a/Qwilight/ViewModel/AvatarViewModel.cs b/Qwilight/ViewModel/AvatarViewModel.cs
index 286e6bf..46fc778 100644
--- a/Qwilight/ViewModel/AvatarViewModel.cs
+++ b/Qwilight/ViewModel/AvatarViewModel.cs
@@ -71,7 +71,10 @@
             }
         }
 
-        readonly int[] _avatarLevels = new int[3];
+        readonly object[] _avatarLevels = new object[3];
+        int _avatarLevel;
+        double _avatarXP;
+        double _totalAvatarXP;
         Dictionary<string, JSON.TwilightWwwAvatarLevelVS> _twilightWwwAvatarLevelVSMap;
         Dictionary<string, JSON.TwilightWwwAvatarHandled> _twilightWwwAvatarHandledMap;
         string _avatarAbility5KPlaceText0 = string.Empty;
@@ -1205,9 +1208,9 @@
 
         public string AvatarViewDateText => string.Format(LanguageSystem.Instance.AvatarViewDateText, _date);
 
-        public string AvatarViewLevelText => $"LV. {_avatarLevels[0]} (XP: {_avatarLevels[1]}／{_avatarLevels[2]})";
+        public string AvatarViewLevelText => $"LV. {_avatarLevel} (XP: {(int)_avatarXP}／{(int)_totalAvatarXP})";
 
-        public double AvatarViewLevelValue => _avatarLevels[2] > 0 ? 100.0 * _avatarLevels[1] / _avatarLevels[2] : 0.0;
+        public double AvatarViewLevelValue => _totalAvatarXP > 0.0 ? 100.0 * _avatarXP / _totalAvatarXP : 0.0;
 
         public string AvatarViewWwwLevelText => string.Format(LanguageSystem.Instance.AvatarViewWwwLevelText, _wwwLevelIDCount);
 
@@ -1278,7 +1281,9 @@
                         _date = DateTime.UnixEpoch.ToLocalTime().AddMilliseconds(twilightWwwAvatarValue.date);
                         OnPropertyChanged(nameof(AvatarViewDateText));
 
-                        Array.Copy(twilightWwwAvatarValue.avatarLevels, _avatarLevels, _avatarLevels.Length);
+                        _avatarLevel = twilightWwwAvatarValue.avatarLevel;
+                        _avatarXP = twilightWwwAvatarValue.avatarXP;
+                        _totalAvatarXP = twilightWwwAvatarValue.totalAvatarXP;
                         OnPropertyChanged(nameof(AvatarViewLevelText));
                         OnPropertyChanged(nameof(AvatarViewLevelValue));
 
diff --git a/Qwilight/ViewModel/EnrollViewModel.cs b/Qwilight/ViewModel/EnrollViewModel.cs
index 54b593e..bf57a87 100644
--- a/Qwilight/ViewModel/EnrollViewModel.cs
+++ b/Qwilight/ViewModel/EnrollViewModel.cs
@@ -14,7 +14,7 @@
         private static partial Regex GetFaxComputer();
 
         string _avatarID = string.Empty;
-        string _avatarName = string.Empty;
+        string _avatarName = ValveSystem.Instance.ValveName ?? string.Empty;
         string _fax = string.Empty;
 
         public override double TargetLength => 0.2;
diff --git a/Qwilight/ViewModel/NotifyViewModel.cs b/Qwilight/ViewModel/NotifyViewModel.cs
index de8f098..4bfd383 100644
--- a/Qwilight/ViewModel/NotifyViewModel.cs
+++ b/Qwilight/ViewModel/NotifyViewModel.cs
@@ -86,7 +86,7 @@
                 if (handlingNotifyItem != null)
                 {
                     handlingNotifyItem.IsStopped = true;
-                    handlingNotifyItem.Variety = NotifySystem.NotifyVariety.Stopped;
+                    handlingNotifyItem.Variety = NotifySystem.NotifyVariety.Cancelled;
                     if (handlingNotifyItem.OnStop(false))
                     {
                         HandlingNotifyItemCollection.Remove(handlingNotifyItem);