diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
index 4ea4f78..0595d96 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
@@ -9,10 +9,15 @@
         public EditMaterialNameDialog(int id)
         {
             InitializeComponent();
-            
+
             Messenger.Default.Send(id, MessengerToken.EditMaterialName);
-            
+
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditMaterialNameDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
index 4ea4f78..0595d96 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
@@ -9,10 +9,15 @@
         public EditMaterialNameDialog(int id)
         {
             InitializeComponent();
-            
+
             Messenger.Default.Send(id, MessengerToken.EditMaterialName);
-            
+
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditMaterialNameDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml b/Correlator/Dialog/EditPipeDiameterDialog.xaml
index 717ef49..de82962 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeDiameter, Source={StaticResource Locator}}"
+    Loaded="EditPipeDiameterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -82,7 +83,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管径数值（整数），单位：mm"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -121,7 +121,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -141,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
index 4ea4f78..0595d96 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
@@ -9,10 +9,15 @@
         public EditMaterialNameDialog(int id)
         {
             InitializeComponent();
-            
+
             Messenger.Default.Send(id, MessengerToken.EditMaterialName);
-            
+
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditMaterialNameDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml b/Correlator/Dialog/EditPipeDiameterDialog.xaml
index 717ef49..de82962 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeDiameter, Source={StaticResource Locator}}"
+    Loaded="EditPipeDiameterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -82,7 +83,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管径数值（整数），单位：mm"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -121,7 +121,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -141,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
index 15bdb4c..6171ac7 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeDiameterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
index 4ea4f78..0595d96 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
@@ -9,10 +9,15 @@
         public EditMaterialNameDialog(int id)
         {
             InitializeComponent();
-            
+
             Messenger.Default.Send(id, MessengerToken.EditMaterialName);
-            
+
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditMaterialNameDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml b/Correlator/Dialog/EditPipeDiameterDialog.xaml
index 717ef49..de82962 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeDiameter, Source={StaticResource Locator}}"
+    Loaded="EditPipeDiameterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -82,7 +83,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管径数值（整数），单位：mm"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -121,7 +121,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -141,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
index 15bdb4c..6171ac7 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeDiameterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml b/Correlator/Dialog/EditPipeLengthDialog.xaml
index 459b58f..15f58e1 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeLength, Source={StaticResource Locator}}"
+    Loaded="EditPipeLengthDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -81,7 +82,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管段长度数值，单位：m"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -126,7 +126,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -146,7 +146,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
index 4ea4f78..0595d96 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
@@ -9,10 +9,15 @@
         public EditMaterialNameDialog(int id)
         {
             InitializeComponent();
-            
+
             Messenger.Default.Send(id, MessengerToken.EditMaterialName);
-            
+
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditMaterialNameDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml b/Correlator/Dialog/EditPipeDiameterDialog.xaml
index 717ef49..de82962 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeDiameter, Source={StaticResource Locator}}"
+    Loaded="EditPipeDiameterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -82,7 +83,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管径数值（整数），单位：mm"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -121,7 +121,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -141,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
index 15bdb4c..6171ac7 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeDiameterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml b/Correlator/Dialog/EditPipeLengthDialog.xaml
index 459b58f..15f58e1 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeLength, Source={StaticResource Locator}}"
+    Loaded="EditPipeLengthDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -81,7 +82,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管段长度数值，单位：m"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -126,7 +126,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -146,7 +146,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
index 6242ef8..f98e2c4 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeLengthDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
index 4ea4f78..0595d96 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
@@ -9,10 +9,15 @@
         public EditMaterialNameDialog(int id)
         {
             InitializeComponent();
-            
+
             Messenger.Default.Send(id, MessengerToken.EditMaterialName);
-            
+
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditMaterialNameDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml b/Correlator/Dialog/EditPipeDiameterDialog.xaml
index 717ef49..de82962 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeDiameter, Source={StaticResource Locator}}"
+    Loaded="EditPipeDiameterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -82,7 +83,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管径数值（整数），单位：mm"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -121,7 +121,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -141,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
index 15bdb4c..6171ac7 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeDiameterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml b/Correlator/Dialog/EditPipeLengthDialog.xaml
index 459b58f..15f58e1 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeLength, Source={StaticResource Locator}}"
+    Loaded="EditPipeLengthDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -81,7 +82,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管段长度数值，单位：m"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -126,7 +126,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -146,7 +146,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
index 6242ef8..f98e2c4 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeLengthDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml
index c1ed844..161be3c 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="EditSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -143,7 +144,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -163,7 +164,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
index 4ea4f78..0595d96 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
@@ -9,10 +9,15 @@
         public EditMaterialNameDialog(int id)
         {
             InitializeComponent();
-            
+
             Messenger.Default.Send(id, MessengerToken.EditMaterialName);
-            
+
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditMaterialNameDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml b/Correlator/Dialog/EditPipeDiameterDialog.xaml
index 717ef49..de82962 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeDiameter, Source={StaticResource Locator}}"
+    Loaded="EditPipeDiameterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -82,7 +83,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管径数值（整数），单位：mm"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -121,7 +121,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -141,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
index 15bdb4c..6171ac7 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeDiameterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml b/Correlator/Dialog/EditPipeLengthDialog.xaml
index 459b58f..15f58e1 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeLength, Source={StaticResource Locator}}"
+    Loaded="EditPipeLengthDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -81,7 +82,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管段长度数值，单位：m"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -126,7 +126,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -146,7 +146,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
index 6242ef8..f98e2c4 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeLengthDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml
index c1ed844..161be3c 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="EditSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -143,7 +144,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -163,7 +164,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
index 32170d8..10be48d 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
@@ -15,5 +15,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
index 4ea4f78..0595d96 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
@@ -9,10 +9,15 @@
         public EditMaterialNameDialog(int id)
         {
             InitializeComponent();
-            
+
             Messenger.Default.Send(id, MessengerToken.EditMaterialName);
-            
+
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditMaterialNameDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml b/Correlator/Dialog/EditPipeDiameterDialog.xaml
index 717ef49..de82962 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeDiameter, Source={StaticResource Locator}}"
+    Loaded="EditPipeDiameterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -82,7 +83,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管径数值（整数），单位：mm"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -121,7 +121,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -141,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
index 15bdb4c..6171ac7 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeDiameterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml b/Correlator/Dialog/EditPipeLengthDialog.xaml
index 459b58f..15f58e1 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeLength, Source={StaticResource Locator}}"
+    Loaded="EditPipeLengthDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -81,7 +82,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管段长度数值，单位：m"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -126,7 +126,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -146,7 +146,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
index 6242ef8..f98e2c4 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeLengthDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml
index c1ed844..161be3c 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="EditSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -143,7 +144,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -163,7 +164,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
index 32170d8..10be48d 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
@@ -15,5 +15,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/SelectMaterialDialog.xaml b/Correlator/Dialog/SelectMaterialDialog.xaml
index 0f3d68e..ec3deca 100644
--- a/Correlator/Dialog/SelectMaterialDialog.xaml
+++ b/Correlator/Dialog/SelectMaterialDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding PipeMaterial, Source={StaticResource Locator}}"
+    Loaded="SelectMaterialDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -94,7 +95,7 @@
                                 Source="/Correlator;component/Image/tubiao_45.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="还原默认值" />
                         </StackPanel>
                     </Button>
@@ -113,7 +114,7 @@
                                 Source="/Correlator;component/Image/tubiao_42.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑声速" />
                         </StackPanel>
                     </Button>
@@ -132,7 +133,7 @@
                                 Source="/Correlator;component/Image/tubiao_43.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑名称" />
                         </StackPanel>
                     </Button>
@@ -189,7 +190,7 @@
                     </Image>
                     <TextBlock
                         FontSize="14"
-                        Foreground="#949494"
+                        Foreground="#595959"
                         Text="下一步" />
                 </StackPanel>
             </Button>

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
index 4ea4f78..0595d96 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
@@ -9,10 +9,15 @@
         public EditMaterialNameDialog(int id)
         {
             InitializeComponent();
-            
+
             Messenger.Default.Send(id, MessengerToken.EditMaterialName);
-            
+
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditMaterialNameDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml b/Correlator/Dialog/EditPipeDiameterDialog.xaml
index 717ef49..de82962 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeDiameter, Source={StaticResource Locator}}"
+    Loaded="EditPipeDiameterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -82,7 +83,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管径数值（整数），单位：mm"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -121,7 +121,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -141,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
index 15bdb4c..6171ac7 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeDiameterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml b/Correlator/Dialog/EditPipeLengthDialog.xaml
index 459b58f..15f58e1 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeLength, Source={StaticResource Locator}}"
+    Loaded="EditPipeLengthDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -81,7 +82,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管段长度数值，单位：m"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -126,7 +126,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -146,7 +146,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
index 6242ef8..f98e2c4 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeLengthDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml
index c1ed844..161be3c 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="EditSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -143,7 +144,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -163,7 +164,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
index 32170d8..10be48d 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
@@ -15,5 +15,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/SelectMaterialDialog.xaml b/Correlator/Dialog/SelectMaterialDialog.xaml
index 0f3d68e..ec3deca 100644
--- a/Correlator/Dialog/SelectMaterialDialog.xaml
+++ b/Correlator/Dialog/SelectMaterialDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding PipeMaterial, Source={StaticResource Locator}}"
+    Loaded="SelectMaterialDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -94,7 +95,7 @@
                                 Source="/Correlator;component/Image/tubiao_45.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="还原默认值" />
                         </StackPanel>
                     </Button>
@@ -113,7 +114,7 @@
                                 Source="/Correlator;component/Image/tubiao_42.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑声速" />
                         </StackPanel>
                     </Button>
@@ -132,7 +133,7 @@
                                 Source="/Correlator;component/Image/tubiao_43.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑名称" />
                         </StackPanel>
                     </Button>
@@ -189,7 +190,7 @@
                     </Image>
                     <TextBlock
                         FontSize="14"
-                        Foreground="#949494"
+                        Foreground="#595959"
                         Text="下一步" />
                 </StackPanel>
             </Button>
diff --git a/Correlator/Dialog/SelectMaterialDialog.xaml.cs b/Correlator/Dialog/SelectMaterialDialog.xaml.cs
index ebd04e4..5c91af4 100644
--- a/Correlator/Dialog/SelectMaterialDialog.xaml.cs
+++ b/Correlator/Dialog/SelectMaterialDialog.xaml.cs
@@ -15,5 +15,10 @@
 
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void SelectMaterialDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
index 4ea4f78..0595d96 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
@@ -9,10 +9,15 @@
         public EditMaterialNameDialog(int id)
         {
             InitializeComponent();
-            
+
             Messenger.Default.Send(id, MessengerToken.EditMaterialName);
-            
+
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditMaterialNameDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml b/Correlator/Dialog/EditPipeDiameterDialog.xaml
index 717ef49..de82962 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeDiameter, Source={StaticResource Locator}}"
+    Loaded="EditPipeDiameterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -82,7 +83,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管径数值（整数），单位：mm"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -121,7 +121,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -141,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
index 15bdb4c..6171ac7 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeDiameterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml b/Correlator/Dialog/EditPipeLengthDialog.xaml
index 459b58f..15f58e1 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeLength, Source={StaticResource Locator}}"
+    Loaded="EditPipeLengthDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -81,7 +82,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管段长度数值，单位：m"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -126,7 +126,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -146,7 +146,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
index 6242ef8..f98e2c4 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeLengthDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml
index c1ed844..161be3c 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="EditSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -143,7 +144,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -163,7 +164,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
index 32170d8..10be48d 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
@@ -15,5 +15,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/SelectMaterialDialog.xaml b/Correlator/Dialog/SelectMaterialDialog.xaml
index 0f3d68e..ec3deca 100644
--- a/Correlator/Dialog/SelectMaterialDialog.xaml
+++ b/Correlator/Dialog/SelectMaterialDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding PipeMaterial, Source={StaticResource Locator}}"
+    Loaded="SelectMaterialDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -94,7 +95,7 @@
                                 Source="/Correlator;component/Image/tubiao_45.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="还原默认值" />
                         </StackPanel>
                     </Button>
@@ -113,7 +114,7 @@
                                 Source="/Correlator;component/Image/tubiao_42.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑声速" />
                         </StackPanel>
                     </Button>
@@ -132,7 +133,7 @@
                                 Source="/Correlator;component/Image/tubiao_43.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑名称" />
                         </StackPanel>
                     </Button>
@@ -189,7 +190,7 @@
                     </Image>
                     <TextBlock
                         FontSize="14"
-                        Foreground="#949494"
+                        Foreground="#595959"
                         Text="下一步" />
                 </StackPanel>
             </Button>
diff --git a/Correlator/Dialog/SelectMaterialDialog.xaml.cs b/Correlator/Dialog/SelectMaterialDialog.xaml.cs
index ebd04e4..5c91af4 100644
--- a/Correlator/Dialog/SelectMaterialDialog.xaml.cs
+++ b/Correlator/Dialog/SelectMaterialDialog.xaml.cs
@@ -15,5 +15,10 @@
 
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void SelectMaterialDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index 3b90135..83a2a87 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding SoundSpeed, Source={StaticResource Locator}}"
+    Loaded="SoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -93,7 +94,7 @@
                                 Source="/Correlator;component/Image/tubiao_46.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="删除" />
                         </StackPanel>
                     </Button>
@@ -112,7 +113,7 @@
                                 Source="/Correlator;component/Image/tubiao_49.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="新建" />
                         </StackPanel>
                     </Button>
@@ -131,7 +132,7 @@
                                 Source="/Correlator;component/Image/tubiao_47.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑" />
                         </StackPanel>
                     </Button>
@@ -188,7 +189,7 @@
                     </Image>
                     <TextBlock
                         FontSize="14"
-                        Foreground="#949494"
+                        Foreground="#595959"
                         Text="下一步" />
                 </StackPanel>
             </Button>

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
index 4ea4f78..0595d96 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
@@ -9,10 +9,15 @@
         public EditMaterialNameDialog(int id)
         {
             InitializeComponent();
-            
+
             Messenger.Default.Send(id, MessengerToken.EditMaterialName);
-            
+
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditMaterialNameDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml b/Correlator/Dialog/EditPipeDiameterDialog.xaml
index 717ef49..de82962 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeDiameter, Source={StaticResource Locator}}"
+    Loaded="EditPipeDiameterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -82,7 +83,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管径数值（整数），单位：mm"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -121,7 +121,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -141,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
index 15bdb4c..6171ac7 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeDiameterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml b/Correlator/Dialog/EditPipeLengthDialog.xaml
index 459b58f..15f58e1 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeLength, Source={StaticResource Locator}}"
+    Loaded="EditPipeLengthDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -81,7 +82,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管段长度数值，单位：m"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -126,7 +126,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -146,7 +146,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
index 6242ef8..f98e2c4 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeLengthDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml
index c1ed844..161be3c 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="EditSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -143,7 +144,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -163,7 +164,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
index 32170d8..10be48d 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
@@ -15,5 +15,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/SelectMaterialDialog.xaml b/Correlator/Dialog/SelectMaterialDialog.xaml
index 0f3d68e..ec3deca 100644
--- a/Correlator/Dialog/SelectMaterialDialog.xaml
+++ b/Correlator/Dialog/SelectMaterialDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding PipeMaterial, Source={StaticResource Locator}}"
+    Loaded="SelectMaterialDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -94,7 +95,7 @@
                                 Source="/Correlator;component/Image/tubiao_45.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="还原默认值" />
                         </StackPanel>
                     </Button>
@@ -113,7 +114,7 @@
                                 Source="/Correlator;component/Image/tubiao_42.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑声速" />
                         </StackPanel>
                     </Button>
@@ -132,7 +133,7 @@
                                 Source="/Correlator;component/Image/tubiao_43.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑名称" />
                         </StackPanel>
                     </Button>
@@ -189,7 +190,7 @@
                     </Image>
                     <TextBlock
                         FontSize="14"
-                        Foreground="#949494"
+                        Foreground="#595959"
                         Text="下一步" />
                 </StackPanel>
             </Button>
diff --git a/Correlator/Dialog/SelectMaterialDialog.xaml.cs b/Correlator/Dialog/SelectMaterialDialog.xaml.cs
index ebd04e4..5c91af4 100644
--- a/Correlator/Dialog/SelectMaterialDialog.xaml.cs
+++ b/Correlator/Dialog/SelectMaterialDialog.xaml.cs
@@ -15,5 +15,10 @@
 
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void SelectMaterialDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index 3b90135..83a2a87 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding SoundSpeed, Source={StaticResource Locator}}"
+    Loaded="SoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -93,7 +94,7 @@
                                 Source="/Correlator;component/Image/tubiao_46.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="删除" />
                         </StackPanel>
                     </Button>
@@ -112,7 +113,7 @@
                                 Source="/Correlator;component/Image/tubiao_49.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="新建" />
                         </StackPanel>
                     </Button>
@@ -131,7 +132,7 @@
                                 Source="/Correlator;component/Image/tubiao_47.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑" />
                         </StackPanel>
                     </Button>
@@ -188,7 +189,7 @@
                     </Image>
                     <TextBlock
                         FontSize="14"
-                        Foreground="#949494"
+                        Foreground="#595959"
                         Text="下一步" />
                 </StackPanel>
             </Button>
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml.cs b/Correlator/Dialog/SoundSpeedDialog.xaml.cs
index e3c378b..229a704 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             GoBackButton.Click += delegate { Close(); };
         }
+
+        private void SoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
index 4ea4f78..0595d96 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
@@ -9,10 +9,15 @@
         public EditMaterialNameDialog(int id)
         {
             InitializeComponent();
-            
+
             Messenger.Default.Send(id, MessengerToken.EditMaterialName);
-            
+
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditMaterialNameDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml b/Correlator/Dialog/EditPipeDiameterDialog.xaml
index 717ef49..de82962 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeDiameter, Source={StaticResource Locator}}"
+    Loaded="EditPipeDiameterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -82,7 +83,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管径数值（整数），单位：mm"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -121,7 +121,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -141,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
index 15bdb4c..6171ac7 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeDiameterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml b/Correlator/Dialog/EditPipeLengthDialog.xaml
index 459b58f..15f58e1 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeLength, Source={StaticResource Locator}}"
+    Loaded="EditPipeLengthDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -81,7 +82,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管段长度数值，单位：m"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -126,7 +126,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -146,7 +146,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
index 6242ef8..f98e2c4 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeLengthDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml
index c1ed844..161be3c 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="EditSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -143,7 +144,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -163,7 +164,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
index 32170d8..10be48d 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
@@ -15,5 +15,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/SelectMaterialDialog.xaml b/Correlator/Dialog/SelectMaterialDialog.xaml
index 0f3d68e..ec3deca 100644
--- a/Correlator/Dialog/SelectMaterialDialog.xaml
+++ b/Correlator/Dialog/SelectMaterialDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding PipeMaterial, Source={StaticResource Locator}}"
+    Loaded="SelectMaterialDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -94,7 +95,7 @@
                                 Source="/Correlator;component/Image/tubiao_45.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="还原默认值" />
                         </StackPanel>
                     </Button>
@@ -113,7 +114,7 @@
                                 Source="/Correlator;component/Image/tubiao_42.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑声速" />
                         </StackPanel>
                     </Button>
@@ -132,7 +133,7 @@
                                 Source="/Correlator;component/Image/tubiao_43.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑名称" />
                         </StackPanel>
                     </Button>
@@ -189,7 +190,7 @@
                     </Image>
                     <TextBlock
                         FontSize="14"
-                        Foreground="#949494"
+                        Foreground="#595959"
                         Text="下一步" />
                 </StackPanel>
             </Button>
diff --git a/Correlator/Dialog/SelectMaterialDialog.xaml.cs b/Correlator/Dialog/SelectMaterialDialog.xaml.cs
index ebd04e4..5c91af4 100644
--- a/Correlator/Dialog/SelectMaterialDialog.xaml.cs
+++ b/Correlator/Dialog/SelectMaterialDialog.xaml.cs
@@ -15,5 +15,10 @@
 
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void SelectMaterialDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index 3b90135..83a2a87 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding SoundSpeed, Source={StaticResource Locator}}"
+    Loaded="SoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -93,7 +94,7 @@
                                 Source="/Correlator;component/Image/tubiao_46.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="删除" />
                         </StackPanel>
                     </Button>
@@ -112,7 +113,7 @@
                                 Source="/Correlator;component/Image/tubiao_49.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="新建" />
                         </StackPanel>
                     </Button>
@@ -131,7 +132,7 @@
                                 Source="/Correlator;component/Image/tubiao_47.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑" />
                         </StackPanel>
                     </Button>
@@ -188,7 +189,7 @@
                     </Image>
                     <TextBlock
                         FontSize="14"
-                        Foreground="#949494"
+                        Foreground="#595959"
                         Text="下一步" />
                 </StackPanel>
             </Button>
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml.cs b/Correlator/Dialog/SoundSpeedDialog.xaml.cs
index e3c378b..229a704 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             GoBackButton.Click += delegate { Close(); };
         }
+
+        private void SoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/View/HomePageWindow.xaml b/Correlator/View/HomePageWindow.xaml
index fba8c87..c99cf2b 100644
--- a/Correlator/View/HomePageWindow.xaml
+++ b/Correlator/View/HomePageWindow.xaml
@@ -349,7 +349,7 @@
                     <Grid Grid.Column="1" Margin="0,20">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="1.5*" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="*" />

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
index 4ea4f78..0595d96 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
@@ -9,10 +9,15 @@
         public EditMaterialNameDialog(int id)
         {
             InitializeComponent();
-            
+
             Messenger.Default.Send(id, MessengerToken.EditMaterialName);
-            
+
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditMaterialNameDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml b/Correlator/Dialog/EditPipeDiameterDialog.xaml
index 717ef49..de82962 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeDiameter, Source={StaticResource Locator}}"
+    Loaded="EditPipeDiameterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -82,7 +83,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管径数值（整数），单位：mm"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -121,7 +121,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -141,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
index 15bdb4c..6171ac7 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeDiameterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml b/Correlator/Dialog/EditPipeLengthDialog.xaml
index 459b58f..15f58e1 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeLength, Source={StaticResource Locator}}"
+    Loaded="EditPipeLengthDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -81,7 +82,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管段长度数值，单位：m"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -126,7 +126,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -146,7 +146,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
index 6242ef8..f98e2c4 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeLengthDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml
index c1ed844..161be3c 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="EditSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -143,7 +144,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -163,7 +164,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
index 32170d8..10be48d 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
@@ -15,5 +15,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/SelectMaterialDialog.xaml b/Correlator/Dialog/SelectMaterialDialog.xaml
index 0f3d68e..ec3deca 100644
--- a/Correlator/Dialog/SelectMaterialDialog.xaml
+++ b/Correlator/Dialog/SelectMaterialDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding PipeMaterial, Source={StaticResource Locator}}"
+    Loaded="SelectMaterialDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -94,7 +95,7 @@
                                 Source="/Correlator;component/Image/tubiao_45.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="还原默认值" />
                         </StackPanel>
                     </Button>
@@ -113,7 +114,7 @@
                                 Source="/Correlator;component/Image/tubiao_42.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑声速" />
                         </StackPanel>
                     </Button>
@@ -132,7 +133,7 @@
                                 Source="/Correlator;component/Image/tubiao_43.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑名称" />
                         </StackPanel>
                     </Button>
@@ -189,7 +190,7 @@
                     </Image>
                     <TextBlock
                         FontSize="14"
-                        Foreground="#949494"
+                        Foreground="#595959"
                         Text="下一步" />
                 </StackPanel>
             </Button>
diff --git a/Correlator/Dialog/SelectMaterialDialog.xaml.cs b/Correlator/Dialog/SelectMaterialDialog.xaml.cs
index ebd04e4..5c91af4 100644
--- a/Correlator/Dialog/SelectMaterialDialog.xaml.cs
+++ b/Correlator/Dialog/SelectMaterialDialog.xaml.cs
@@ -15,5 +15,10 @@
 
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void SelectMaterialDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index 3b90135..83a2a87 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding SoundSpeed, Source={StaticResource Locator}}"
+    Loaded="SoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -93,7 +94,7 @@
                                 Source="/Correlator;component/Image/tubiao_46.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="删除" />
                         </StackPanel>
                     </Button>
@@ -112,7 +113,7 @@
                                 Source="/Correlator;component/Image/tubiao_49.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="新建" />
                         </StackPanel>
                     </Button>
@@ -131,7 +132,7 @@
                                 Source="/Correlator;component/Image/tubiao_47.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑" />
                         </StackPanel>
                     </Button>
@@ -188,7 +189,7 @@
                     </Image>
                     <TextBlock
                         FontSize="14"
-                        Foreground="#949494"
+                        Foreground="#595959"
                         Text="下一步" />
                 </StackPanel>
             </Button>
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml.cs b/Correlator/Dialog/SoundSpeedDialog.xaml.cs
index e3c378b..229a704 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             GoBackButton.Click += delegate { Close(); };
         }
+
+        private void SoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/View/HomePageWindow.xaml b/Correlator/View/HomePageWindow.xaml
index fba8c87..c99cf2b 100644
--- a/Correlator/View/HomePageWindow.xaml
+++ b/Correlator/View/HomePageWindow.xaml
@@ -349,7 +349,7 @@
                     <Grid Grid.Column="1" Margin="0,20">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="1.5*" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="*" />
diff --git a/Correlator/View/MainWindow.xaml b/Correlator/View/MainWindow.xaml
index 99cc72f..a0cc8c1 100644
--- a/Correlator/View/MainWindow.xaml
+++ b/Correlator/View/MainWindow.xaml
@@ -5,8 +5,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="相关仪"
-    Width="1366"
-    Height="768"
+    Width="1280"
+    Height="720"
     ResizeMode="NoResize"
     WindowStartupLocation="CenterScreen"
     WindowStyle="None"
@@ -19,9 +19,11 @@
 
         <Button
             x:Name="SkipButton"
+            Height="30"
             Margin="10,7"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
+            VerticalContentAlignment="Center"
             Background="Transparent"
             BorderBrush="Blue"
             BorderThickness="1.5"

diff --git a/Correlator.sln b/Correlator.sln
index 02122b1..ea97844 100644
--- a/Correlator.sln
+++ b/Correlator.sln
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Correlator", "Correlator\Correlator.csproj", "{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "相关仪", "..\..\..\..\Setup Project\相关仪\相关仪.vdproj", "{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.ActiveCfg = Release|x64
 		{BD4834CC-8FE1-47B4-BF30-982CD23CBC7F}.Release|x64.Build.0 = Release|x64
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|Any CPU.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Debug|x64.ActiveCfg = Debug
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|Any CPU.ActiveCfg = Release
-		{6B97EEFC-3704-4C51-9B89-A5C0C6C2C2ED}.Release|x64.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Correlator/Correlator.csproj b/Correlator/Correlator.csproj
index a58ea1e..09758d9 100644
--- a/Correlator/Correlator.csproj
+++ b/Correlator/Correlator.csproj
@@ -37,7 +37,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>Image\favicon.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml b/Correlator/Dialog/AddSoundSpeedDialog.xaml
index cfcd515..a7aa2a9 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="AddSoundSpeedDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding AddSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="AddSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -140,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -160,7 +161,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
index 4f310c6..632ab91 100644
--- a/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/AddSoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void AddSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditFilterDialog.xaml b/Correlator/Dialog/EditFilterDialog.xaml
index 304f2d0..0c96730 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml
+++ b/Correlator/Dialog/EditFilterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditFilter, Source={StaticResource Locator}}"
+    Loaded="EditFilterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -85,7 +86,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -103,7 +103,6 @@
                         Height="50"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Background="#f7f7f7"
                         BorderBrush="#d2d2d2"
                         FontSize="20"
                         Foreground="#545454"
@@ -170,7 +169,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -190,7 +189,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditFilterDialog.xaml.cs b/Correlator/Dialog/EditFilterDialog.xaml.cs
index a57f2b4..ccfc99e 100644
--- a/Correlator/Dialog/EditFilterDialog.xaml.cs
+++ b/Correlator/Dialog/EditFilterDialog.xaml.cs
@@ -16,5 +16,10 @@
             GoBackButton.Click += delegate { Close(); };
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditFilterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml b/Correlator/Dialog/EditMaterialNameDialog.xaml
index 980ac25..545c53d 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml
@@ -6,11 +6,12 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="EditMaterialNameDialog"
-    Width="600"
-    Height="300"
+    Width="660"
+    Height="330"
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditMaterialName, Source={StaticResource Locator}}"
+    Loaded="EditMaterialNameDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -59,7 +60,6 @@
 
                     <hc:TextBox
                         hc:InfoElement.Placeholder="请输入材料的新名称"
-                        Background="#f7f7f7"
                         BorderThickness="0"
                         FontSize="18"
                         ShowClearButton="True"
@@ -87,7 +87,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -106,7 +106,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
index 4ea4f78..0595d96 100644
--- a/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
+++ b/Correlator/Dialog/EditMaterialNameDialog.xaml.cs
@@ -9,10 +9,15 @@
         public EditMaterialNameDialog(int id)
         {
             InitializeComponent();
-            
+
             Messenger.Default.Send(id, MessengerToken.EditMaterialName);
-            
+
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditMaterialNameDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml b/Correlator/Dialog/EditPipeDiameterDialog.xaml
index 717ef49..de82962 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeDiameter, Source={StaticResource Locator}}"
+    Loaded="EditPipeDiameterDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -82,7 +83,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管径数值（整数），单位：mm"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -121,7 +121,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -141,7 +141,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
index 15bdb4c..6171ac7 100644
--- a/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeDiameterDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeDiameterDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml b/Correlator/Dialog/EditPipeLengthDialog.xaml
index 459b58f..15f58e1 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditPipeLength, Source={StaticResource Locator}}"
+    Loaded="EditPipeLengthDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -81,7 +82,6 @@
                 <hc:TextBox
                     Height="50"
                     hc:InfoElement.Placeholder="请输入管段长度数值，单位：m"
-                    Background="#f7f7f7"
                     BorderBrush="#d2d2d2"
                     FontSize="18"
                     ShowClearButton="True"
@@ -126,7 +126,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -146,7 +146,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
index 6242ef8..f98e2c4 100644
--- a/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
+++ b/Correlator/Dialog/EditPipeLengthDialog.xaml.cs
@@ -18,5 +18,10 @@
             
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void EditPipeLengthDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml b/Correlator/Dialog/EditSoundSpeedDialog.xaml
index c1ed844..161be3c 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding EditSoundSpeed, Source={StaticResource Locator}}"
+    Loaded="EditSoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -143,7 +144,7 @@
                             Source="/Correlator;component/Image/tubiao_48.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="取消" />
                     </StackPanel>
                 </Button>
@@ -163,7 +164,7 @@
                             Source="/Correlator;component/Image/tubiao_44.png" />
                         <TextBlock
                             FontSize="14"
-                            Foreground="#949494"
+                            Foreground="#595959"
                             Text="确定" />
                     </StackPanel>
                 </Button>
diff --git a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
index 32170d8..10be48d 100644
--- a/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/EditSoundSpeedDialog.xaml.cs
@@ -15,5 +15,10 @@
 
             CancelParamButton.Click += delegate { Close(); };
         }
+
+        private void EditSoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/SelectMaterialDialog.xaml b/Correlator/Dialog/SelectMaterialDialog.xaml
index 0f3d68e..ec3deca 100644
--- a/Correlator/Dialog/SelectMaterialDialog.xaml
+++ b/Correlator/Dialog/SelectMaterialDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding PipeMaterial, Source={StaticResource Locator}}"
+    Loaded="SelectMaterialDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -94,7 +95,7 @@
                                 Source="/Correlator;component/Image/tubiao_45.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="还原默认值" />
                         </StackPanel>
                     </Button>
@@ -113,7 +114,7 @@
                                 Source="/Correlator;component/Image/tubiao_42.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑声速" />
                         </StackPanel>
                     </Button>
@@ -132,7 +133,7 @@
                                 Source="/Correlator;component/Image/tubiao_43.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑名称" />
                         </StackPanel>
                     </Button>
@@ -189,7 +190,7 @@
                     </Image>
                     <TextBlock
                         FontSize="14"
-                        Foreground="#949494"
+                        Foreground="#595959"
                         Text="下一步" />
                 </StackPanel>
             </Button>
diff --git a/Correlator/Dialog/SelectMaterialDialog.xaml.cs b/Correlator/Dialog/SelectMaterialDialog.xaml.cs
index ebd04e4..5c91af4 100644
--- a/Correlator/Dialog/SelectMaterialDialog.xaml.cs
+++ b/Correlator/Dialog/SelectMaterialDialog.xaml.cs
@@ -15,5 +15,10 @@
 
             Messenger.Default.Register<PipeMaterialModel>(this, MessengerToken.StartCalculate, it => { Close(); });
         }
+
+        private void SelectMaterialDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml b/Correlator/Dialog/SoundSpeedDialog.xaml
index 3b90135..83a2a87 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml
@@ -11,6 +11,7 @@
     AllowsTransparency="True"
     Background="Transparent"
     DataContext="{Binding SoundSpeed, Source={StaticResource Locator}}"
+    Loaded="SoundSpeedDialog_OnLoaded"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner"
@@ -93,7 +94,7 @@
                                 Source="/Correlator;component/Image/tubiao_46.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="删除" />
                         </StackPanel>
                     </Button>
@@ -112,7 +113,7 @@
                                 Source="/Correlator;component/Image/tubiao_49.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="新建" />
                         </StackPanel>
                     </Button>
@@ -131,7 +132,7 @@
                                 Source="/Correlator;component/Image/tubiao_47.png" />
                             <TextBlock
                                 FontSize="14"
-                                Foreground="#949494"
+                                Foreground="#595959"
                                 Text="编辑" />
                         </StackPanel>
                     </Button>
@@ -188,7 +189,7 @@
                     </Image>
                     <TextBlock
                         FontSize="14"
-                        Foreground="#949494"
+                        Foreground="#595959"
                         Text="下一步" />
                 </StackPanel>
             </Button>
diff --git a/Correlator/Dialog/SoundSpeedDialog.xaml.cs b/Correlator/Dialog/SoundSpeedDialog.xaml.cs
index e3c378b..229a704 100644
--- a/Correlator/Dialog/SoundSpeedDialog.xaml.cs
+++ b/Correlator/Dialog/SoundSpeedDialog.xaml.cs
@@ -14,5 +14,10 @@
 
             GoBackButton.Click += delegate { Close(); };
         }
+
+        private void SoundSpeedDialog_OnLoaded(object sender, RoutedEventArgs e)
+        {
+            MouseDown += delegate { DragMove(); };
+        }
     }
 }
\ No newline at end of file
diff --git a/Correlator/View/HomePageWindow.xaml b/Correlator/View/HomePageWindow.xaml
index fba8c87..c99cf2b 100644
--- a/Correlator/View/HomePageWindow.xaml
+++ b/Correlator/View/HomePageWindow.xaml
@@ -349,7 +349,7 @@
                     <Grid Grid.Column="1" Margin="0,20">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="1.5*" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="*" />
diff --git a/Correlator/View/MainWindow.xaml b/Correlator/View/MainWindow.xaml
index 99cc72f..a0cc8c1 100644
--- a/Correlator/View/MainWindow.xaml
+++ b/Correlator/View/MainWindow.xaml
@@ -5,8 +5,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="相关仪"
-    Width="1366"
-    Height="768"
+    Width="1280"
+    Height="720"
     ResizeMode="NoResize"
     WindowStartupLocation="CenterScreen"
     WindowStyle="None"
@@ -19,9 +19,11 @@
 
         <Button
             x:Name="SkipButton"
+            Height="30"
             Margin="10,7"
             HorizontalAlignment="Right"
             VerticalAlignment="Top"
+            VerticalContentAlignment="Center"
             Background="Transparent"
             BorderBrush="Blue"
             BorderThickness="1.5"
diff --git a/Correlator/ViewModel/HomePageViewModel.cs b/Correlator/ViewModel/HomePageViewModel.cs
index 84f5bc8..c4f019a 100644
--- a/Correlator/ViewModel/HomePageViewModel.cs
+++ b/Correlator/ViewModel/HomePageViewModel.cs
@@ -776,6 +776,8 @@
             PassTime = "0";
             _runningSeconds = 0;
             _runningTimer.Stop();
+            TransmitterADistance = 0;
+            TransmitterBDistance = 0;
             //清空波形图
             Messenger.Default.Send("", MessengerToken.ClearOscillogram);
         }