diff --git a/CRSim.ScreenSimulator/Views/SimulatorWindow.xaml.cs b/CRSim.ScreenSimulator/Views/SimulatorWindow.xaml.cs
index a03db14..52e66d2 100644
--- a/CRSim.ScreenSimulator/Views/SimulatorWindow.xaml.cs
+++ b/CRSim.ScreenSimulator/Views/SimulatorWindow.xaml.cs
@@ -33,17 +33,24 @@ namespace CRSim.ScreenSimulator.Views
 
         private void DecreaseSpeed(object sender, MouseButtonEventArgs e)
         {
-            _timeService.Speed /= 2 ;
-            SpeedText.Text = _timeService.Speed.ToString()+"x" ;
+            if (_timeService.Speed > 0.25 && _timeService.Speed <= 1024)
+            {
+                _timeService.Speed /= 2;
+                SpeedText.Text = _timeService.Speed.ToString() + "x";
+            }
         }
         private void IncreaseSpeed(object sender, MouseButtonEventArgs e)
         {
-            _timeService.Speed *= 2;
-            SpeedText.Text = _timeService.Speed.ToString() + "x";
+            if (_timeService.Speed >= 0.25 && _timeService.Speed < 1024)
+            {
+                _timeService.Speed *= 2;
+                SpeedText.Text = _timeService.Speed.ToString() + "x";
+            }
         }
 
         private void Close(object sender, MouseButtonEventArgs e)
         {
+            Close();
         }
     }
 }
diff --git a/CRSim/ViewModels/StationManagementPageViewModel.cs b/CRSim/ViewModels/StationManagementPageViewModel.cs
index e0f48da..d9a9517 100644
--- a/CRSim/ViewModels/StationManagementPageViewModel.cs
+++ b/CRSim/ViewModels/StationManagementPageViewModel.cs
@@ -69,7 +69,7 @@ public partial class StationManagementPageViewModel : ObservableObject
         });
     }
 
-    #region Station
+#region Station
     public void RefreshStations()
     {
         var stationsList = _databaseService.GetAllStations();