diff --git a/GeMS-Key-Plus/GeMS-Key-Plus/GeMS-Key-Plus.csproj b/GeMS-Key-Plus/GeMS-Key-Plus/GeMS-Key-Plus.csproj
index c104198..31ddab8 100644
--- a/GeMS-Key-Plus/GeMS-Key-Plus/GeMS-Key-Plus.csproj
+++ b/GeMS-Key-Plus/GeMS-Key-Plus/GeMS-Key-Plus.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RootNamespace>GeMS_Key_Plus</RootNamespace>
     <UseWPF>true</UseWPF>
-    <Version>0.1.0</Version>
+    <Version>0.2.0</Version>
     <Authors>Rabbitism</Authors>
     <Company>Galaxism</Company>
-    <Product>GEMS Key Plus</Product>
+    <Product>Keyz</Product>
     <ApplicationIcon>Key.ico</ApplicationIcon>
   </PropertyGroup>
 
diff --git a/GeMS-Key-Plus/GeMS-Key-Plus/Properties/PublishProfiles/FolderProfile.pubxml b/GeMS-Key-Plus/GeMS-Key-Plus/Properties/PublishProfiles/FolderProfile.pubxml
index 3a94a4a..a612460 100644
--- a/GeMS-Key-Plus/GeMS-Key-Plus/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/GeMS-Key-Plus/GeMS-Key-Plus/Properties/PublishProfiles/FolderProfile.pubxml
@@ -6,10 +6,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>bin\Release\netcoreapp5.0\publish\</PublishDir>
+    <PublishDir>bin\Release\netcoreapp3.1\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <SelfContained>false</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun>False</PublishReadyToRun>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/GeMS-Key-Plus/GeMS-Key-Plus/ViewModels/ButtonPanelViewModel.cs b/GeMS-Key-Plus/GeMS-Key-Plus/ViewModels/ButtonPanelViewModel.cs
index d779315..095ae3e 100644
--- a/GeMS-Key-Plus/GeMS-Key-Plus/ViewModels/ButtonPanelViewModel.cs
+++ b/GeMS-Key-Plus/GeMS-Key-Plus/ViewModels/ButtonPanelViewModel.cs
@@ -83,6 +83,7 @@ public void Query(Key key)
             else if (_keyMapping.ContainsKey(key))
             {
                 _keyMapping[key].Query();
+                _latestButton = _keyMapping[key];
             }
         }
     }
diff --git a/GeMS-Key-Plus/GeMS-Key-Plus/Views/Setting.xaml b/GeMS-Key-Plus/GeMS-Key-Plus/Views/Setting.xaml
index d6563d5..fee2835 100644
--- a/GeMS-Key-Plus/GeMS-Key-Plus/Views/Setting.xaml
+++ b/GeMS-Key-Plus/GeMS-Key-Plus/Views/Setting.xaml
@@ -17,8 +17,8 @@
         WindowStartupLocation="CenterScreen"
         MinWidth="600"
         Title="Setting" Height="450" Width="800">
-    <materialDesign:Card>
-        <StackPanel MouseDown="StackPanel_MouseDown">
+    <materialDesign:Card Margin="8">
+        <StackPanel PreviewMouseDown="StackPanel_MouseDown">
             <Grid Margin="16">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>