diff --git a/PrivateBox/InputDlgBox.Designer.cs b/PrivateBox/Forms/InputDlgBox.Designer.cs
similarity index 100%
rename from PrivateBox/InputDlgBox.Designer.cs
rename to PrivateBox/Forms/InputDlgBox.Designer.cs
diff --git a/PrivateBox/InputDlgBox.cs b/PrivateBox/Forms/InputDlgBox.cs
similarity index 100%
rename from PrivateBox/InputDlgBox.cs
rename to PrivateBox/Forms/InputDlgBox.cs
diff --git a/PrivateBox/InputDlgBox.resx b/PrivateBox/Forms/InputDlgBox.resx
similarity index 100%
rename from PrivateBox/InputDlgBox.resx
rename to PrivateBox/Forms/InputDlgBox.resx
diff --git a/PrivateBox/MainForm.Designer.cs b/PrivateBox/Forms/MainForm.Designer.cs
similarity index 100%
rename from PrivateBox/MainForm.Designer.cs
rename to PrivateBox/Forms/MainForm.Designer.cs
diff --git a/PrivateBox/MainForm.cs b/PrivateBox/Forms/MainForm.cs
similarity index 86%
rename from PrivateBox/MainForm.cs
rename to PrivateBox/Forms/MainForm.cs
index b86ea5e..073d3af 100644
--- a/PrivateBox/MainForm.cs
+++ b/PrivateBox/Forms/MainForm.cs
@@ -39,6 +39,7 @@ namespace PrivateBox
 
         private void RefreshKeyList() {
             this.lbKeyList.Items.Clear();
+            this.tbMessage.Text = "";
             var qu = this.Db.Queryable<CrytionItem>().Select(a => a.ItemName).ToList();
             foreach(var i in qu) {
                 this.lbKeyList.Items.Add(i);
@@ -65,6 +66,9 @@ namespace PrivateBox
                 return;
             }
             var sItem = this.lbKeyList.SelectedItem.ToString();
+            if(MessageBox.Show($"是否删除({sItem})？\n删除后无法恢复","删除确认",MessageBoxButtons.YesNo,MessageBoxIcon.Question) != DialogResult.Yes) {
+                return;
+            }
             this.Db.Deleteable<CrytionItem>().Where(a => a.ItemName == sItem).ExecuteCommand();
             RefreshKeyList();
         }
@@ -79,6 +83,7 @@ namespace PrivateBox
             this.Db.Updateable<CrytionItem>()
                 .Where(a => a.ItemName == tag.ItemName)
                 .SetColumns(a => a.ItemValue == val)
+                .SetColumns(a => a.CreateTime == DateTime.Now)
                 .ExecuteCommand();
         }
 
@@ -86,5 +91,13 @@ namespace PrivateBox
             var tag = this.tbMessage.Tag as CrytionItem;
             this.tbMessage.Text = tag.ItemValue;
         }
+
+        private bool MessageChanged {
+            get {
+                var tag = this.tbMessage.Tag as CrytionItem;
+                var val = tag?.ItemValue;
+                return val != this.tbMessage.Text;
+            }
+        }
     }
 }
diff --git a/PrivateBox/MainForm.resx b/PrivateBox/Forms/MainForm.resx
similarity index 100%
rename from PrivateBox/MainForm.resx
rename to PrivateBox/Forms/MainForm.resx
diff --git a/PrivateBox/Program.cs b/PrivateBox/Program.cs
index e3ec641..627a1d9 100644
--- a/PrivateBox/Program.cs
+++ b/PrivateBox/Program.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using System.Reflection;
 
 namespace PrivateBox
 {
@@ -21,7 +22,14 @@ namespace PrivateBox
         }
 
         static void AddServices(IServiceCollection services,AppConfig config) {
-            services.AddSingleton<MainForm>();
+            foreach(var t in Assembly.GetExecutingAssembly().GetTypes()) {
+                if(t.IsAbstract) {
+                    continue;
+                }
+                if(t.IsAssignableTo(typeof(Form))) {
+                    services.AddSingleton(t);
+                }
+            }
             services.AddSingleton<IEncryptionService,AesEncryptionService>();
             services.AddSingleton<DbContext>();
         }