diff --git a/InternetTest/InternetTest/App.xaml b/InternetTest/InternetTest/App.xaml
index 7fc7fc2..3cf29de 100644
--- a/InternetTest/InternetTest/App.xaml
+++ b/InternetTest/InternetTest/App.xaml
@@ -236,6 +236,50 @@
                     </Setter.Value>
                 </Setter>
             </Style>
+            <Style x:Key="NavBarToolButton" TargetType="{x:Type RadioButton}">
+                <Setter Property="Cursor" Value="Hand" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type RadioButton}">
+                            <Border
+                                x:Name="border"
+                                Background="{TemplateBinding Background}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="5"
+                                SnapsToDevicePixels="true">
+                                <ContentPresenter
+                                    x:Name="contentPresenter"
+                                    Margin="{TemplateBinding Padding}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Focusable="False"
+                                    RecognizesAccessKey="True"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsChecked" Value="True">
+                                    <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource AccentColor}}" />
+                                    <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" />
+                                </Trigger>
+                                <Trigger Property="IsMouseOver" Value="true">
+                                    <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource LightAccentColor}}" />
+                                    <Setter TargetName="border" Property="BorderBrush" Value="{Binding Source={StaticResource LightAccentColor}}" />
+                                    <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{Binding Source={StaticResource AccentColor}}" />
+                                </Trigger>
+                                <Trigger Property="IsPressed" Value="true">
+                                    <Setter TargetName="border" Property="Background" Value="{Binding Source={StaticResource LightAccentColor}}" />
+                                    <Setter TargetName="border" Property="BorderBrush" Value="{Binding Source={StaticResource LightAccentColor}}" />
+                                </Trigger>
+                                <Trigger Property="IsEnabled" Value="false">
+                                    <Setter TargetName="border" Property="Background" Value="Transparent" />
+                                    <Setter TargetName="border" Property="BorderBrush" Value="Transparent" />
+                                    <Setter TargetName="contentPresenter" Property="TextElement.Foreground" Value="{Binding Source={StaticResource Gray}}" />
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
             <Style x:Key="TabRadioButton" TargetType="{x:Type RadioButton}">
                 <Setter Property="Cursor" Value="Hand" />
                 <Setter Property="Template">
diff --git a/InternetTest/InternetTest/MainWindow.xaml b/InternetTest/InternetTest/MainWindow.xaml
index 15e850b..87b4bc5 100644
--- a/InternetTest/InternetTest/MainWindow.xaml
+++ b/InternetTest/InternetTest/MainWindow.xaml
@@ -532,7 +532,7 @@
                                     </Button.Triggers>
                                 </Button>
                                 <StackPanel x:Name="UtilitiesPanel" Visibility="Collapsed">
-                                    <Button
+                                    <RadioButton
                                         x:Name="StatusPageBtn"
                                         Margin="10 0 0 0"
                                         Padding="5 2 2 2"
@@ -541,11 +541,11 @@
                                         BorderThickness="0"
                                         Click="StatusPageBtn_Click"
                                         Content="{x:Static lang:Resources.Status}"
-                                        FontSize="10"
+                                        FontSize="10" GroupName="NavBar"
                                         FontWeight="ExtraBold"
                                         Foreground="{Binding Source={StaticResource AccentColor}}"
-                                        Style="{DynamicResource DefaultButton}" />
-                                    <Button
+                                        Style="{DynamicResource NavBarToolButton}" />
+                                    <RadioButton
                                         x:Name="DownDetectorPageBtn"
                                         Margin="10 0 0 0"
                                         Padding="5 2 2 2"
@@ -554,11 +554,11 @@
                                         BorderThickness="0"
                                         Click="DownDetectorPageBtn_Click"
                                         Content="{x:Static lang:Resources.DownDetector}"
-                                        FontSize="10"
+                                        FontSize="10" GroupName="NavBar"
                                         FontWeight="ExtraBold"
                                         Foreground="{Binding Source={StaticResource AccentColor}}"
-                                        Style="{DynamicResource DefaultButton}" />
-                                    <Button
+                                        Style="{DynamicResource NavBarToolButton}" />
+                                    <RadioButton
                                         x:Name="DnsPageBtn"
                                         Margin="10 0 0 0"
                                         Padding="5 2 2 2"
@@ -567,11 +567,11 @@
                                         BorderThickness="0"
                                         Click="DnsPageBtn_Click"
                                         Content="{x:Static lang:Resources.DNSTool}"
-                                        FontSize="10"
+                                        FontSize="10" GroupName="NavBar"
                                         FontWeight="ExtraBold"
                                         Foreground="{Binding Source={StaticResource AccentColor}}"
-                                        Style="{DynamicResource DefaultButton}" />
-                                    <Button
+                                        Style="{DynamicResource NavBarToolButton}" />
+                                    <RadioButton
                                         x:Name="WiFiPageBtn"
                                         Margin="10 0 0 0"
                                         Padding="5 2 2 2"
@@ -580,10 +580,10 @@
                                         BorderThickness="0"
                                         Click="WiFiPageBtn_Click"
                                         Content="{x:Static lang:Resources.WiFiNetworks}"
-                                        FontSize="10"
+                                        FontSize="10" GroupName="NavBar"
                                         FontWeight="ExtraBold"
                                         Foreground="{Binding Source={StaticResource AccentColor}}"
-                                        Style="{DynamicResource DefaultButton}" />
+                                        Style="{DynamicResource NavBarToolButton}" />
                                 </StackPanel>
                                 <Button
                                     x:Name="IPToolsBtn"
@@ -648,7 +648,7 @@
                                     </Button.Triggers>
                                 </Button>
                                 <StackPanel x:Name="IPPanel" Visibility="Collapsed">
-                                    <Button
+                                    <RadioButton
                                         x:Name="MyIPPageBtn"
                                         Margin="10 0 0 0"
                                         Padding="5 2 2 2"
@@ -657,11 +657,11 @@
                                         BorderThickness="0"
                                         Click="MyIPPageBtn_Click"
                                         Content="{x:Static lang:Resources.MyIP}"
-                                        FontSize="10"
+                                        FontSize="10" GroupName="NavBar"
                                         FontWeight="ExtraBold"
                                         Foreground="{Binding Source={StaticResource AccentColor}}"
-                                        Style="{DynamicResource DefaultButton}" />
-                                    <Button
+                                        Style="{DynamicResource NavBarToolButton}" />
+                                    <RadioButton
                                         x:Name="LocateIPPageBtn"
                                         Margin="10 0 0 0"
                                         Padding="5 2 2 2"
@@ -670,10 +670,10 @@
                                         BorderThickness="0"
                                         Click="LocateIPPageBtn_Click"
                                         Content="{x:Static lang:Resources.LocateIP}"
-                                        FontSize="10"
+                                        FontSize="10" GroupName="NavBar"
                                         FontWeight="ExtraBold"
                                         Foreground="{Binding Source={StaticResource AccentColor}}"
-                                        Style="{DynamicResource DefaultButton}" />
+                                        Style="{DynamicResource NavBarToolButton}" />
                                 </StackPanel>
                                 <Button
                                     x:Name="CommandsBtn"
@@ -749,7 +749,7 @@
                                     </Button.Triggers>
                                 </Button>
                                 <StackPanel x:Name="CommandPanel" Visibility="Collapsed">
-                                    <Button
+                                    <RadioButton
                                         x:Name="PingPageBtn"
                                         Margin="10 0 0 0"
                                         Padding="5 2 2 2"
@@ -758,11 +758,11 @@
                                         BorderThickness="0"
                                         Click="PingPageBtn_Click"
                                         Content="{x:Static lang:Resources.Ping}"
-                                        FontSize="10"
+                                        FontSize="10" GroupName="NavBar"
                                         FontWeight="ExtraBold"
                                         Foreground="{Binding Source={StaticResource AccentColor}}"
-                                        Style="{DynamicResource DefaultButton}" />
-                                    <Button
+                                        Style="{DynamicResource NavBarToolButton}" />
+                                    <RadioButton
                                         x:Name="IPConfigPageBtn"
                                         Margin="10 0 0 0"
                                         Padding="5 2 2 2"
@@ -771,11 +771,11 @@
                                         BorderThickness="0"
                                         Click="IPConfigPageBtn_Click"
                                         Content="{x:Static lang:Resources.IPConfig}"
-                                        FontSize="10"
+                                        FontSize="10" GroupName="NavBar"
                                         FontWeight="ExtraBold"
                                         Foreground="{Binding Source={StaticResource AccentColor}}"
-                                        Style="{DynamicResource DefaultButton}" />
-                                    <Button
+                                        Style="{DynamicResource NavBarToolButton}" />
+                                    <RadioButton
                                         x:Name="TraceroutePageBtn"
                                         Margin="10 0 0 0"
                                         Padding="5 2 2 2"
@@ -784,11 +784,11 @@
                                         BorderThickness="0"
                                         Click="TraceroutePageBtn_Click"
                                         Content="{x:Static lang:Resources.TraceRoute}"
-                                        FontSize="10"
+                                        FontSize="10" GroupName="NavBar"
                                         FontWeight="ExtraBold"
                                         Foreground="{Binding Source={StaticResource AccentColor}}"
-                                        Style="{DynamicResource DefaultButton}" />
-                                    <Button
+                                        Style="{DynamicResource NavBarToolButton}" />
+                                    <RadioButton
                                         x:Name="WifiPasswordsPageBtn"
                                         Margin="10 0 0 0"
                                         Padding="5 2 2 2"
@@ -798,9 +798,10 @@
                                         Click="WifiPasswordsPageBtn_Click"
                                         Content="{x:Static lang:Resources.WifiPasswords}"
                                         FontSize="10"
+                                        GroupName="NavBar"
                                         FontWeight="ExtraBold"
                                         Foreground="{Binding Source={StaticResource AccentColor}}"
-                                        Style="{DynamicResource DefaultButton}" />
+                                        Style="{DynamicResource NavBarToolButton}" />
                                 </StackPanel>
                             </StackPanel>
                         </ScrollViewer>
diff --git a/InternetTest/InternetTest/MainWindow.xaml.cs b/InternetTest/InternetTest/MainWindow.xaml.cs
index 2fd42ab..2536744 100644
--- a/InternetTest/InternetTest/MainWindow.xaml.cs
+++ b/InternetTest/InternetTest/MainWindow.xaml.cs
@@ -78,73 +78,61 @@ private void InitUI()
 		{
 			case AppPages.Home:
 				PageDisplayer.Content = Global.HomePage;
-				UnCheckAllButton();
 				HomePageBtn.IsChecked = true;
 				break;
 			case AppPages.History:
 				PageDisplayer.Content = Global.HistoryPage;
-				UnCheckAllButton();
 				HistoryPageBtn.IsChecked = true;
 				break;
 			case AppPages.Status:
 				PageDisplayer.Content = Global.StatusPage;
 				Global.SynethiaConfig.StatusPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(StatusPageBtn);
+				StatusPageBtn.IsChecked = true;
 				break;
 			case AppPages.DownDetector:
 				PageDisplayer.Content = Global.DownDetectorPage;
 				Global.SynethiaConfig.DownDetectorPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(DownDetectorPageBtn);
+				DownDetectorPageBtn.IsChecked = true;
 				break;
 			case AppPages.MyIP:
 				PageDisplayer.Content = Global.MyIpPage;
 				Global.SynethiaConfig.MyIPPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(MyIPPageBtn);
+				MyIPPageBtn.IsChecked = true;
 				break;
 			case AppPages.LocateIP:
 				PageDisplayer.Content = Global.LocateIpPage;
 				Global.SynethiaConfig.LocateIPPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(LocateIPPageBtn);
+				LocateIPPageBtn.IsChecked = true;
 				break;
 			case AppPages.Ping:
 				PageDisplayer.Content = Global.PingPage;
 				Global.SynethiaConfig.PingPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(PingPageBtn);
+				PingPageBtn.IsChecked = true;
 				break;
 			case AppPages.IPConfig:
 				PageDisplayer.Content = Global.IpConfigPage;
 				Global.SynethiaConfig.IPConfigPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(IPConfigPageBtn);
+				IPConfigPageBtn.IsChecked = true;
 				break;
 			case AppPages.WiFiPasswords:
 				PageDisplayer.Content = Global.WiFiPasswordsPage;
 				Global.SynethiaConfig.WiFiPasswordsPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(WifiPasswordsPageBtn);
+				WifiPasswordsPageBtn.IsChecked = true;
 				break;
 			case AppPages.DnsTool:
 				PageDisplayer.Content = Global.DnsPage;
 				Global.SynethiaConfig.DnsPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(DnsPageBtn);
+				DnsPageBtn.IsChecked = true;
 				break;
 			case AppPages.TraceRoute:
 				PageDisplayer.Content = Global.TraceroutePage;
 				Global.SynethiaConfig.TraceRoutePageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(TraceroutePageBtn);
+				TraceroutePageBtn.IsChecked = true;
 				break;
 			case AppPages.WiFiNetworks:
 				PageDisplayer.Content = Global.WiFiNetworksPage;
 				Global.SynethiaConfig.WiFiNetworksPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(WiFiPageBtn);
+				WiFiPageBtn.IsChecked = true;
 				break;
 			default:
 				break;
@@ -181,62 +169,52 @@ private void PageCard_OnCardClick(object? sender, PageEventArgs e)
 			case AppPages.Status:
 				PageDisplayer.Content = Global.StatusPage;
 				Global.SynethiaConfig.StatusPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(StatusPageBtn);
+				StatusPageBtn.IsChecked = true;
 				break;
 			case AppPages.DownDetector:
 				PageDisplayer.Content = Global.DownDetectorPage;
 				Global.SynethiaConfig.DownDetectorPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(DownDetectorPageBtn);
+				DownDetectorPageBtn.IsChecked = true;
 				break;
 			case AppPages.MyIP:
 				PageDisplayer.Content = Global.MyIpPage;
 				Global.SynethiaConfig.MyIPPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(MyIPPageBtn);
+				MyIPPageBtn.IsChecked = true;
 				break;
 			case AppPages.LocateIP:
 				PageDisplayer.Content = Global.LocateIpPage;
 				Global.SynethiaConfig.LocateIPPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(LocateIPPageBtn);
+				LocateIPPageBtn.IsChecked = true;
 				break;
 			case AppPages.Ping:
 				PageDisplayer.Content = Global.PingPage;
 				Global.SynethiaConfig.PingPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(PingPageBtn);
+				PingPageBtn.IsChecked = true;
 				break;
 			case AppPages.IPConfig:
 				PageDisplayer.Content = Global.IpConfigPage;
 				Global.SynethiaConfig.IPConfigPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(IPConfigPageBtn);
+				IPConfigPageBtn.IsChecked = true;
 				break;
 			case AppPages.WiFiPasswords:
 				PageDisplayer.Content = Global.WiFiPasswordsPage;
 				Global.SynethiaConfig.WiFiPasswordsPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(WifiPasswordsPageBtn);
+				WifiPasswordsPageBtn.IsChecked = true;
 				break;
 			case AppPages.DnsTool:
 				PageDisplayer.Content = Global.DnsPage;
 				Global.SynethiaConfig.DnsPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(DnsPageBtn);
+				DnsPageBtn.IsChecked = true;
 				break;
 			case AppPages.TraceRoute:
 				PageDisplayer.Content = Global.TraceroutePage;
 				Global.SynethiaConfig.TraceRoutePageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(TraceroutePageBtn);
+				TraceroutePageBtn.IsChecked = true;
 				break;
 			case AppPages.WiFiNetworks:
 				PageDisplayer.Content = Global.WiFiNetworksPage;
 				Global.SynethiaConfig.WiFiNetworksPageInfo.EnterUnixTime = Sys.UnixTime;
-				UnCheckAllButton();
-				CheckButton(WiFiPageBtn);
+				WiFiPageBtn.IsChecked = true;
 				break;
 			default:
 				break;
@@ -350,54 +328,9 @@ private void CommandsBtn_Click(object sender, RoutedEventArgs e)
 		storyboard.Begin(this); // Animate the utilities panel
 	}
 
-	private void CheckButton(Button button, bool isSpecial = false)
-	{
-		if (isSpecial)
-		{
-			button.Background = new SolidColorBrush(Global.GetColorFromResource("Background1"));
-		}
-		else
-		{
-			button.Background = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-			button.Foreground = new SolidColorBrush(Global.GetColorFromResource("WindowButtonsHoverForeground1"));
-		}
-	}
-
-	private void UnCheckAllButton()
-	{
-		// Background
-		HomePageBtn.Background = new SolidColorBrush(Colors.Transparent);
-		HistoryPageBtn.Background = new SolidColorBrush(Colors.Transparent);
-		SettingsPageBtn.Background = new SolidColorBrush(Colors.Transparent);
-
-		StatusPageBtn.Background = new SolidColorBrush(Colors.Transparent);
-		DownDetectorPageBtn.Background = new SolidColorBrush(Colors.Transparent);
-		MyIPPageBtn.Background = new SolidColorBrush(Colors.Transparent);
-		LocateIPPageBtn.Background = new SolidColorBrush(Colors.Transparent);
-		PingPageBtn.Background = new SolidColorBrush(Colors.Transparent);
-		TraceroutePageBtn.Background = new SolidColorBrush(Colors.Transparent);
-		IPConfigPageBtn.Background = new SolidColorBrush(Colors.Transparent);
-		WifiPasswordsPageBtn.Background = new SolidColorBrush(Colors.Transparent);
-		DnsPageBtn.Background = new SolidColorBrush(Colors.Transparent);
-		WiFiPageBtn.Background = new SolidColorBrush(Colors.Transparent);
-
-		StatusPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		DownDetectorPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		MyIPPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		LocateIPPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		PingPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		TraceroutePageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		IPConfigPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		WifiPasswordsPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		DnsPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-		WiFiPageBtn.Foreground = new SolidColorBrush(Global.GetColorFromResource("AccentColor"));
-	}
-
 	private void StatusPageBtn_Click(object sender, RoutedEventArgs e)
 	{
 		LeavePage();
-		UnCheckAllButton(); // Reset all states
-		CheckButton(StatusPageBtn);
 
 		PageDisplayer.Content = Global.StatusPage; // Display the status page
 		Global.SynethiaConfig.StatusPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
@@ -406,8 +339,6 @@ private void StatusPageBtn_Click(object sender, RoutedEventArgs e)
 	private void DownDetectorPageBtn_Click(object sender, RoutedEventArgs e)
 	{
 		LeavePage();
-		UnCheckAllButton(); // Reset all states
-		CheckButton(DownDetectorPageBtn);
 
 		PageDisplayer.Content = Global.DownDetectorPage; // Display the down detector page
 		Global.SynethiaConfig.DownDetectorPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
@@ -416,8 +347,6 @@ private void DownDetectorPageBtn_Click(object sender, RoutedEventArgs e)
 	private void MyIPPageBtn_Click(object sender, RoutedEventArgs e)
 	{
 		LeavePage();
-		UnCheckAllButton(); // Reset all states
-		CheckButton(MyIPPageBtn);
 
 		PageDisplayer.Content = Global.MyIpPage; // Display the my IP page
 		Global.SynethiaConfig.MyIPPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
@@ -426,8 +355,6 @@ private void MyIPPageBtn_Click(object sender, RoutedEventArgs e)
 	private void LocateIPPageBtn_Click(object sender, RoutedEventArgs e)
 	{
 		LeavePage();
-		UnCheckAllButton(); // Reset all states
-		CheckButton(LocateIPPageBtn);
 
 		PageDisplayer.Content = Global.LocateIpPage; // Display the locate IP page
 		Global.SynethiaConfig.LocateIPPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
@@ -436,8 +363,6 @@ private void LocateIPPageBtn_Click(object sender, RoutedEventArgs e)
 	private void PingPageBtn_Click(object sender, RoutedEventArgs e)
 	{
 		LeavePage();
-		UnCheckAllButton(); // Reset all states
-		CheckButton(PingPageBtn);
 
 		PageDisplayer.Content = Global.PingPage; // Display the ping page
 		Global.SynethiaConfig.PingPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
@@ -446,8 +371,6 @@ private void PingPageBtn_Click(object sender, RoutedEventArgs e)
 	private void IPConfigPageBtn_Click(object sender, RoutedEventArgs e)
 	{
 		LeavePage();
-		UnCheckAllButton(); // Reset all states
-		CheckButton(IPConfigPageBtn);
 
 		PageDisplayer.Content = Global.IpConfigPage; // Display the IP config page
 		Global.SynethiaConfig.IPConfigPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
@@ -456,8 +379,6 @@ private void IPConfigPageBtn_Click(object sender, RoutedEventArgs e)
 	private void WifiPasswordsPageBtn_Click(object sender, RoutedEventArgs e)
 	{
 		LeavePage();
-		UnCheckAllButton(); // Reset all states
-		CheckButton(WifiPasswordsPageBtn);
 
 		PageDisplayer.Content = Global.WiFiPasswordsPage; // Display the wifi passwords page
 		Global.SynethiaConfig.WiFiPasswordsPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
@@ -565,8 +486,6 @@ private void PinBtn_Click(object sender, RoutedEventArgs e)
 	private void DnsPageBtn_Click(object sender, RoutedEventArgs e)
 	{
 		LeavePage();
-		UnCheckAllButton(); // Reset all states
-		CheckButton(DnsPageBtn);
 
 		PageDisplayer.Content = Global.DnsPage; // Display the IP config page
 		Global.SynethiaConfig.DnsPageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
@@ -575,8 +494,6 @@ private void DnsPageBtn_Click(object sender, RoutedEventArgs e)
 	private void TraceroutePageBtn_Click(object sender, RoutedEventArgs e)
 	{
 		LeavePage();
-		UnCheckAllButton(); // Reset all states
-		CheckButton(TraceroutePageBtn);
 
 		PageDisplayer.Content = Global.TraceroutePage; // Display the ping page
 		Global.SynethiaConfig.TraceRoutePageInfo.EnterUnixTime = Sys.UnixTime; // Update the last entered time
@@ -585,8 +502,6 @@ private void TraceroutePageBtn_Click(object sender, RoutedEventArgs e)
 	private void WiFiPageBtn_Click(object sender, RoutedEventArgs e)
 	{
 		LeavePage();
-		UnCheckAllButton(); // Reset all states
-		CheckButton(WiFiPageBtn);
 
 		PageDisplayer.Content = Global.WiFiNetworksPage;
 		Global.SynethiaConfig.WiFiNetworksPageInfo.EnterUnixTime = Sys.UnixTime;