diff --git a/Marechai.App/Presentation/ViewModels/ComputersListViewModel.cs b/Marechai.App/Presentation/ViewModels/ComputersListViewModel.cs
index 2fa92341..603598ba 100644
--- a/Marechai.App/Presentation/ViewModels/ComputersListViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/ComputersListViewModel.cs
@@ -25,25 +25,25 @@ public partial class ComputersListViewModel : ObservableObject
     private readonly INavigator                      _navigator;
 
     [ObservableProperty]
-    private ObservableCollection<ComputerListItem> computersList = [];
+    private ObservableCollection<ComputerListItem> _computersList = [];
 
     [ObservableProperty]
-    private string errorMessage = string.Empty;
+    private string _errorMessage = string.Empty;
 
     [ObservableProperty]
-    private string filterDescription = string.Empty;
+    private string _filterDescription = string.Empty;
 
     [ObservableProperty]
-    private bool hasError;
+    private bool _hasError;
 
     [ObservableProperty]
-    private bool isDataLoaded;
+    private bool _isDataLoaded;
 
     [ObservableProperty]
-    private bool isLoading;
+    private bool _isLoading;
 
     [ObservableProperty]
-    private string pageTitle = string.Empty;
+    private string _pageTitle = string.Empty;
 
     public ComputersListViewModel(ComputersService                computersService, IStringLocalizer localizer,
                                   ILogger<ComputersListViewModel> logger,           INavigator       navigator,
diff --git a/Marechai.App/Presentation/ViewModels/ComputersViewModel.cs b/Marechai.App/Presentation/ViewModels/ComputersViewModel.cs
index 649826a9..22b86d1b 100644
--- a/Marechai.App/Presentation/ViewModels/ComputersViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/ComputersViewModel.cs
@@ -16,37 +16,37 @@ public partial class ComputersViewModel : ObservableObject
     private readonly INavigator                  _navigator;
 
     [ObservableProperty]
-    private int computerCount;
+    private int _computerCount;
 
     [ObservableProperty]
-    private string computerCountText = string.Empty;
+    private string _computerCountText = string.Empty;
 
     [ObservableProperty]
-    private string errorMessage = string.Empty;
+    private string _errorMessage = string.Empty;
 
     [ObservableProperty]
-    private bool hasError;
+    private bool _hasError;
 
     [ObservableProperty]
-    private bool isDataLoaded;
+    private bool _isDataLoaded;
 
     [ObservableProperty]
-    private bool isLoading;
+    private bool _isLoading;
 
     [ObservableProperty]
-    private ObservableCollection<char> lettersList = [];
+    private ObservableCollection<char> _lettersList = [];
 
     [ObservableProperty]
-    private int maximumYear;
+    private int _maximumYear;
 
     [ObservableProperty]
-    private int minimumYear;
+    private int _minimumYear;
 
     [ObservableProperty]
-    private string yearsGridTitle = string.Empty;
+    private string _yearsGridTitle = string.Empty;
 
     [ObservableProperty]
-    private ObservableCollection<int> yearsList = [];
+    private ObservableCollection<int> _yearsList = [];
 
     public ComputersViewModel(ComputersService            computersService, IStringLocalizer localizer,
                               ILogger<ComputersViewModel> logger,           INavigator       navigator,
diff --git a/Marechai.App/Presentation/ViewModels/MachineViewViewModel.cs b/Marechai.App/Presentation/ViewModels/MachineViewViewModel.cs
index a6209a36..43ad13e8 100644
--- a/Marechai.App/Presentation/ViewModels/MachineViewViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/MachineViewViewModel.cs
@@ -43,64 +43,64 @@ public partial class MachineViewViewModel : ObservableObject
     private readonly ComputersService              _computersService;
     private readonly ILogger<MachineViewViewModel> _logger;
     private readonly INavigator                    _navigator;
-    private          object?                       _navigationSource;
 
     [ObservableProperty]
-    private string companyName = string.Empty;
+    private string _companyName = string.Empty;
 
     [ObservableProperty]
-    private string errorMessage = string.Empty;
+    private string _errorMessage = string.Empty;
 
     [ObservableProperty]
-    private string? familyName;
+    private string? _familyName;
 
     [ObservableProperty]
-    private bool hasError;
+    private bool _hasError;
 
     [ObservableProperty]
-    private string? introductionDateDisplay;
+    private string? _introductionDateDisplay;
 
     [ObservableProperty]
-    private bool isDataLoaded;
+    private bool _isDataLoaded;
 
     [ObservableProperty]
-    private bool isLoading;
+    private bool _isLoading;
 
     [ObservableProperty]
-    private bool isPrototype;
+    private bool _isPrototype;
 
     [ObservableProperty]
-    private string machineName = string.Empty;
+    private string _machineName = string.Empty;
 
     [ObservableProperty]
-    private string? modelName;
+    private string? _modelName;
+    private object? _navigationSource;
 
     [ObservableProperty]
-    private Visibility showFamily = Visibility.Collapsed;
+    private Visibility _showFamily = Visibility.Collapsed;
 
     [ObservableProperty]
-    private Visibility showFamilyOrModel = Visibility.Collapsed;
+    private Visibility _showFamilyOrModel = Visibility.Collapsed;
 
     [ObservableProperty]
-    private Visibility showGpus = Visibility.Collapsed;
+    private Visibility _showGpus = Visibility.Collapsed;
 
     [ObservableProperty]
-    private Visibility showIntroductionDate = Visibility.Collapsed;
+    private Visibility _showIntroductionDate = Visibility.Collapsed;
 
     [ObservableProperty]
-    private Visibility showMemory = Visibility.Collapsed;
+    private Visibility _showMemory = Visibility.Collapsed;
 
     [ObservableProperty]
-    private Visibility showModel = Visibility.Collapsed;
+    private Visibility _showModel = Visibility.Collapsed;
 
     [ObservableProperty]
-    private Visibility showProcessors = Visibility.Collapsed;
+    private Visibility _showProcessors = Visibility.Collapsed;
 
     [ObservableProperty]
-    private Visibility showSoundSynthesizers = Visibility.Collapsed;
+    private Visibility _showSoundSynthesizers = Visibility.Collapsed;
 
     [ObservableProperty]
-    private Visibility showStorage = Visibility.Collapsed;
+    private Visibility _showStorage = Visibility.Collapsed;
 
     public MachineViewViewModel(ILogger<MachineViewViewModel> logger, INavigator navigator,
                                 ComputersService              computersService)
diff --git a/Marechai.App/Presentation/ViewModels/MainViewModel.cs b/Marechai.App/Presentation/ViewModels/MainViewModel.cs
index 8a23d5cd..f61e550c 100644
--- a/Marechai.App/Presentation/ViewModels/MainViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/MainViewModel.cs
@@ -11,18 +11,18 @@ public partial class MainViewModel : ObservableObject
     private readonly IStringLocalizer _localizer;
     private readonly INavigator       _navigator;
     [ObservableProperty]
-    private bool isSidebarOpen = true;
+    private bool _isSidebarOpen = true;
     [ObservableProperty]
-    private Dictionary<string, string> localizedStrings = new();
+    private Dictionary<string, string> _localizedStrings = new();
     [ObservableProperty]
-    private string loginLogoutButtonText = "";
+    private string _loginLogoutButtonText = "";
 
     [ObservableProperty]
-    private string? name;
+    private string? _name;
     [ObservableProperty]
-    private NewsViewModel? newsViewModel;
+    private NewsViewModel? _newsViewModel;
     [ObservableProperty]
-    private bool sidebarContentVisible = true;
+    private bool _sidebarContentVisible = true;
 
     public MainViewModel(IStringLocalizer localizer, IOptions<AppConfig> appInfo, INavigator navigator,
                          NewsViewModel    newsViewModel)
diff --git a/Marechai.App/Presentation/ViewModels/NewsViewModel.cs b/Marechai.App/Presentation/ViewModels/NewsViewModel.cs
index 3e67c51a..c18f2611 100644
--- a/Marechai.App/Presentation/ViewModels/NewsViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/NewsViewModel.cs
@@ -49,16 +49,16 @@ public partial class NewsViewModel : ObservableObject
     private readonly NewsService            _newsService;
 
     [ObservableProperty]
-    private string errorMessage = string.Empty;
+    private string _errorMessage = string.Empty;
 
     [ObservableProperty]
-    private bool hasError;
+    private bool _hasError;
 
     [ObservableProperty]
-    private bool isLoading;
+    private bool _isLoading;
 
     [ObservableProperty]
-    private ObservableCollection<NewsItemViewModel> newsList = [];
+    private ObservableCollection<NewsItemViewModel> _newsList = [];
 
     public NewsViewModel(NewsService newsService, IStringLocalizer localizer, ILogger<NewsViewModel> logger,
                          INavigator  navigator)