diff --git a/Proxmox Desktop/Api/ApiClient.cs b/Proxmox Desktop/Api/ApiClient.cs
index 215c2b9..5f52d96 100644
--- a/Proxmox Desktop/Api/ApiClient.cs	
+++ b/Proxmox Desktop/Api/ApiClient.cs	
@@ -41,6 +41,9 @@ public ApiClient(ServerInfo info)
     public ApiClient(string server, string port, bool skipSsl)
         : this(new ServerInfo(server, int.Parse(port), skipSsl)) { }
 
+    /// <summary>Hostname/IP this client is connected to — used as the friendly server name.</summary>
+    public string Host => _http.BaseAddress!.Host;
+
     // ─── Auth ─────────────────────────────────────────────────────────────────────────
 
     public async Task<List<RealmData>> GetRealmsAsync(CancellationToken ct = default)
diff --git a/Proxmox Desktop/Api/Models/MachineData.cs b/Proxmox Desktop/Api/Models/MachineData.cs
index c1c01b8..1a9e77e 100644
--- a/Proxmox Desktop/Api/Models/MachineData.cs	
+++ b/Proxmox Desktop/Api/Models/MachineData.cs	
@@ -19,9 +19,10 @@ public record MachineData
     [JsonPropertyName("serial")]  public int    Serial  { get; init; }
     [JsonPropertyName("tags")]    public string? Tags   { get; init; }
 
-    // Set by ApiClient after deserialization
-    public string NodeName { get; init; } = string.Empty;
-    public string Type     { get; init; } = string.Empty;
+    // Set by ApiClient / ViewModel after deserialization
+    public string NodeName   { get; init; } = string.Empty;
+    public string Type       { get; init; } = string.Empty;
+    public string ServerName { get; init; } = string.Empty;
 
     // Computed
     public bool   IsRunning    => Status == "running";
diff --git a/Proxmox Desktop/App.xaml.cs b/Proxmox Desktop/App.xaml.cs
index 7d3c90d..06bd184 100644
--- a/Proxmox Desktop/App.xaml.cs	
+++ b/Proxmox Desktop/App.xaml.cs	
@@ -1,4 +1,6 @@
 using System.Windows;
+using MaterialDesignThemes.Wpf;
+using ProxmoxDesktop.Config;
 using ProxmoxDesktop.Services;
 
 namespace ProxmoxDesktop;
@@ -9,9 +11,23 @@ protected override void OnStartup(StartupEventArgs e)
     {
         base.OnStartup(e);
         NotificationService.Enable();
+        ApplySavedTheme();
         new Views.LoginWindow().Show();
     }
 
+    private static void ApplySavedTheme()
+    {
+        try
+        {
+            var cfg    = new ConfigurationService().Config;
+            var helper = new PaletteHelper();
+            var theme  = helper.GetTheme();
+            theme.SetBaseTheme(cfg.IsDarkTheme ? BaseTheme.Dark : BaseTheme.Light);
+            helper.SetTheme(theme);
+        }
+        catch { /* fall back to the default theme from App.xaml */ }
+    }
+
     protected override void OnExit(ExitEventArgs e)
     {
         NotificationService.Disable();
diff --git a/Proxmox Desktop/Controls/MachineCard.xaml b/Proxmox Desktop/Controls/MachineCard.xaml
index 2e4b7e5..199a44f 100644
--- a/Proxmox Desktop/Controls/MachineCard.xaml	
+++ b/Proxmox Desktop/Controls/MachineCard.xaml	
@@ -5,10 +5,12 @@
     xmlns:md="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:converters="clr-namespace:ProxmoxDesktop.Converters">
     <UserControl.Resources>
-        <converters:StatusToBrushConverter   x:Key="StatusToBrush"/>
-        <converters:BytesToReadableConverter x:Key="BytesToReadable"/>
-        <converters:CpuPercentConverter      x:Key="CpuPercent"/>
-        <BooleanToVisibilityConverter        x:Key="BoolToVisibility"/>
+        <converters:StatusToBrushConverter           x:Key="StatusToBrush"/>
+        <converters:BytesToReadableConverter         x:Key="BytesToReadable"/>
+        <converters:CpuPercentConverter              x:Key="CpuPercent"/>
+        <converters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibility"/>
+        <converters:CollectionToVisibilityConverter  x:Key="CollectionToVisibility"/>
+        <BooleanToVisibilityConverter                x:Key="BoolToVisibility"/>
         <Style x:Key="ActionBtn" TargetType="Button" BasedOn="{StaticResource MaterialDesignIconForegroundButton}">
             <Setter Property="Width"   Value="32"/>
             <Setter Property="Height"  Value="32"/>
@@ -82,6 +84,29 @@
                                FontSize="10" FontWeight="Bold" Foreground="White"/>
                 </Border>
 
+                <!-- Tags (click to filter) -->
+                <ItemsControl ItemsSource="{Binding Machine.TagList, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                              Visibility="{Binding Machine.TagList, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource CollectionToVisibility}}"
+                              HorizontalAlignment="Center" Margin="0,0,0,8">
+                    <ItemsControl.ItemsPanel>
+                        <ItemsPanelTemplate><WrapPanel HorizontalAlignment="Center"/></ItemsPanelTemplate>
+                    </ItemsControl.ItemsPanel>
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Button Command="{Binding FilterTagCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                    CommandParameter="{Binding}"
+                                    Style="{StaticResource MaterialDesignFlatButton}"
+                                    Padding="6,0" Height="20" MinWidth="0" Margin="2,0"
+                                    md:ButtonAssist.CornerRadius="10" ToolTip="Filter by this tag">
+                                <StackPanel Orientation="Horizontal">
+                                    <md:PackIcon Kind="Tag" Width="10" Height="10" VerticalAlignment="Center" Margin="0,0,3,0"/>
+                                    <TextBlock Text="{Binding}" FontSize="10"/>
+                                </StackPanel>
+                            </Button>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+
                 <!-- CPU bar -->
                 <Grid Margin="0,0,0,6">
                     <Grid.ColumnDefinitions>
@@ -131,7 +156,7 @@
                     </Button>
                     <Button Style="{StaticResource ActionBtn}" ToolTip="Start"
                             Command="{Binding StartCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
-                            Visibility="{Binding Machine.IsRunning, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource BoolToVisibility}, ConverterParameter=inverse}">
+                            Visibility="{Binding Machine.IsRunning, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource InverseBoolToVisibility}}">
                         <md:PackIcon Kind="Play" Width="16" Height="16" Foreground="#4CAF50"/>
                     </Button>
                     <Button Style="{StaticResource ActionBtn}" ToolTip="Shutdown"
diff --git a/Proxmox Desktop/Controls/MachineCard.xaml.cs b/Proxmox Desktop/Controls/MachineCard.xaml.cs
index 04efa81..ab8ea95 100644
--- a/Proxmox Desktop/Controls/MachineCard.xaml.cs	
+++ b/Proxmox Desktop/Controls/MachineCard.xaml.cs	
@@ -17,6 +17,8 @@ public partial class MachineCard : UserControl
 
     public string MachineIcon => Machine?.IsLxc == true ? "/Assets/lxc.png" : "/Assets/vm.png";
 
+    public IRelayCommand<string> FilterTagCommand => new RelayCommand<string>(tag => { if (!string.IsNullOrEmpty(tag)) VM?.FilterByTagCommand.Execute(tag); });
+
     public IRelayCommand OpenNoVncCommand    => new RelayCommand(() => VM?.OpenConsoleCommand.Execute(new ConsoleArgs(Machine, "novnc")));
     public IRelayCommand OpenXtermCommand    => new RelayCommand(() => VM?.OpenConsoleCommand.Execute(new ConsoleArgs(Machine, "xtermjs")));
     public IRelayCommand OpenSpiceCommand    => new RelayCommand(() => VM?.OpenSpiceCommand.Execute(Machine));
diff --git a/Proxmox Desktop/Converters/Converters.cs b/Proxmox Desktop/Converters/Converters.cs
index 88ab60c..034fd50 100644
--- a/Proxmox Desktop/Converters/Converters.cs	
+++ b/Proxmox Desktop/Converters/Converters.cs	
@@ -53,3 +53,34 @@ public object Convert(object? value, Type t, object? p, CultureInfo l)
         => value is true ? Visibility.Collapsed : Visibility.Visible;
     public object ConvertBack(object? v, Type t, object? p, CultureInfo l) => throw new NotImplementedException();
 }
+
+/// <summary>Visible when the bound collection has at least one item, otherwise Collapsed.</summary>
+public sealed class CollectionToVisibilityConverter : IValueConverter
+{
+    public object Convert(object? value, Type t, object? p, CultureInfo l)
+    {
+        if (value is System.Collections.IEnumerable e)
+        {
+            foreach (var _ in e) return Visibility.Visible;
+            return Visibility.Collapsed;
+        }
+        return value is null ? Visibility.Collapsed : Visibility.Visible;
+    }
+    public object ConvertBack(object? v, Type t, object? p, CultureInfo l) => throw new NotImplementedException();
+}
+
+/// <summary>
+/// Maps a bool to a <see cref="GridLength"/> — true → ConverterParameter px (default 320),
+/// false → 0. Used to collapse the activity panel column.
+/// </summary>
+public sealed class BoolToGridLengthConverter : IValueConverter
+{
+    public object Convert(object? value, Type t, object? p, CultureInfo l)
+    {
+        var width = 320.0;
+        if (p is string s && double.TryParse(s, NumberStyles.Any, CultureInfo.InvariantCulture, out var w))
+            width = w;
+        return value is true ? new GridLength(width) : new GridLength(0);
+    }
+    public object ConvertBack(object? v, Type t, object? p, CultureInfo l) => throw new NotImplementedException();
+}
diff --git a/Proxmox Desktop/ProxmoxDesktop.csproj b/Proxmox Desktop/ProxmoxDesktop.csproj
index 640a373..b583f92 100644
--- a/Proxmox Desktop/ProxmoxDesktop.csproj	
+++ b/Proxmox Desktop/ProxmoxDesktop.csproj	
@@ -10,8 +10,8 @@
     <UseWPF>true</UseWPF>
     <RootNamespace>ProxmoxDesktop</RootNamespace>
     <AssemblyName>ProxmoxDesktop</AssemblyName>
-    <AssemblyVersion>2.1.0.0</AssemblyVersion>
-    <InformationalVersion>2.1.0</InformationalVersion>
+    <AssemblyVersion>2.2.0.0</AssemblyVersion>
+    <InformationalVersion>2.2.0</InformationalVersion>
     <Platforms>x64</Platforms>
     <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
diff --git a/Proxmox Desktop/Services/ActivityLogService.cs b/Proxmox Desktop/Services/ActivityLogService.cs
new file mode 100644
index 0000000..bef3f95
--- /dev/null
+++ b/Proxmox Desktop/Services/ActivityLogService.cs	
@@ -0,0 +1,64 @@
+using System.Collections.ObjectModel;
+using System.Windows;
+using System.Windows.Media;
+using MaterialDesignThemes.Wpf;
+
+namespace ProxmoxDesktop.Services;
+
+public enum ActivityLevel { Info, Success, Warning, Error }
+
+/// <summary>A single, immutable line in the activity log (UI-facing).</summary>
+public sealed record ActivityEntry(DateTime Time, PackIconKind Icon, Brush Color, string Title, string? Detail)
+{
+    public string TimeText => Time.ToString("HH:mm:ss");
+}
+
+/// <summary>
+/// In-memory, bounded activity log. New entries are inserted at the top and the
+/// collection is always mutated on the UI thread so it can be bound directly.
+/// </summary>
+public sealed class ActivityLogService
+{
+    private const int MaxEntries = 200;
+
+    public ObservableCollection<ActivityEntry> Entries { get; } = [];
+
+    public void Info(string title, string? detail = null)    => Add(ActivityLevel.Info,    title, detail);
+    public void Success(string title, string? detail = null) => Add(ActivityLevel.Success, title, detail);
+    public void Warning(string title, string? detail = null) => Add(ActivityLevel.Warning, title, detail);
+    public void Error(string title, string? detail = null)   => Add(ActivityLevel.Error,   title, detail);
+
+    public void Add(ActivityLevel level, string title, string? detail = null)
+    {
+        var (icon, color) = level switch
+        {
+            ActivityLevel.Success => (PackIconKind.CheckCircle,       Rgb(76, 175, 80)),
+            ActivityLevel.Warning => (PackIconKind.AlertCircle,       Rgb(255, 152, 0)),
+            ActivityLevel.Error   => (PackIconKind.CloseCircle,       Rgb(244, 67, 54)),
+            _                     => (PackIconKind.InformationOutline, Rgb(33, 150, 243)),
+        };
+
+        var entry = new ActivityEntry(DateTime.Now, icon, color, title, detail);
+        OnUi(() =>
+        {
+            Entries.Insert(0, entry);
+            while (Entries.Count > MaxEntries) Entries.RemoveAt(Entries.Count - 1);
+        });
+    }
+
+    public void Clear() => OnUi(Entries.Clear);
+
+    private static void OnUi(Action action)
+    {
+        var app = Application.Current;
+        if (app is not null && !app.Dispatcher.CheckAccess()) app.Dispatcher.Invoke(action);
+        else action();
+    }
+
+    private static SolidColorBrush Rgb(byte r, byte g, byte b)
+    {
+        var brush = new SolidColorBrush(Color.FromRgb(r, g, b));
+        brush.Freeze();
+        return brush;
+    }
+}
diff --git a/Proxmox Desktop/ViewModels/MainViewModel.cs b/Proxmox Desktop/ViewModels/MainViewModel.cs
index da16ffa..9493c42 100644
--- a/Proxmox Desktop/ViewModels/MainViewModel.cs	
+++ b/Proxmox Desktop/ViewModels/MainViewModel.cs	
@@ -9,23 +9,32 @@ namespace ProxmoxDesktop.ViewModels;
 
 public partial class MainViewModel : ObservableObject, IDisposable
 {
-    private readonly ApiClient      _api;
     private readonly PeriodicTimer  _refreshTimer;
     private readonly PeriodicTimer  _ticketTimer;
     private CancellationTokenSource _cts = new();
-    private Dictionary<int, string> _previousStatuses = [];
+    private Dictionary<string, string> _previousStatuses = [];
+
+    /// <summary>One entry per connected Proxmox cluster.</summary>
+    public ObservableCollection<ServerConnection> Connections { get; } = [];
+    public ActivityLogService Activity { get; } = new();
 
     [ObservableProperty] private ObservableCollection<MachineData> machines         = [];
     [ObservableProperty] private ObservableCollection<NodeGroup>   groupedMachines  = [];
     [ObservableProperty] private ObservableCollection<MachineData> filteredMachines = [];
     [ObservableProperty] private ObservableCollection<string>      nodeList         = [];
     [ObservableProperty] private bool    isLoading;
+    [ObservableProperty] private bool    isEmpty;
     [ObservableProperty] private string  searchQuery      = string.Empty;
     [ObservableProperty] private string? statusMessage;
     [ObservableProperty] private bool    isGroupedByNode;
+    [ObservableProperty] private bool    isListView;
+    [ObservableProperty] private bool    isActivityPanelOpen;
+    [ObservableProperty] private int     sortIndex;        // 0=Name 1=VMID 2=CPU 3=RAM 4=Status 5=Uptime
     [ObservableProperty] private string? selectedNode;
+    [ObservableProperty] private string? selectedTag;
+    [ObservableProperty] private ServerConnection? selectedConnection;
 
-    // Dashboard stats
+    // Dashboard stats (cluster-wide, not affected by filters)
     [ObservableProperty] private int totalCount;
     [ObservableProperty] private int runningCount;
     [ObservableProperty] private int stoppedCount;
@@ -34,15 +43,26 @@ public partial class MainViewModel : ObservableObject, IDisposable
 
     partial void OnSearchQueryChanged(string value)   => ApplyFilter();
     partial void OnIsGroupedByNodeChanged(bool value) => ApplyFilter();
+    partial void OnIsListViewChanged(bool value)      => ApplyFilter();
+    partial void OnSortIndexChanged(int value)        => ApplyFilter();
     partial void OnSelectedNodeChanged(string? value) => ApplyFilter();
+    partial void OnSelectedTagChanged(string? value)  => ApplyFilter();
+    partial void OnSelectedConnectionChanged(ServerConnection? value) { SelectedNode = null; ApplyFilter(); }
 
-    public MainViewModel(ApiClient api)
+    public MainViewModel(ApiClient api, int refreshSeconds = 60)
     {
-        _api = api;
-        _refreshTimer = new PeriodicTimer(TimeSpan.FromSeconds(60));
+        Connections.Add(new ServerConnection(api.Host, api));
+        var seconds = refreshSeconds < 10 ? 10 : refreshSeconds;
+        _refreshTimer = new PeriodicTimer(TimeSpan.FromSeconds(seconds));
         _ticketTimer  = new PeriodicTimer(TimeSpan.FromMinutes(90));
         _ = Task.Run(async () => { while (await _refreshTimer.WaitForNextTickAsync(_cts.Token)) await RefreshAsync(_cts.Token); });
-        _ = Task.Run(async () => { while (await _ticketTimer .WaitForNextTickAsync(_cts.Token)) await _api.RenewTicketAsync(_cts.Token); });
+        _ = Task.Run(async () => { while (await _ticketTimer .WaitForNextTickAsync(_cts.Token)) await RenewAllTicketsAsync(_cts.Token); });
+    }
+
+    private async Task RenewAllTicketsAsync(CancellationToken ct)
+    {
+        foreach (var c in Connections.ToList())
+            try { await c.Api.RenewTicketAsync(ct); } catch { /* surfaced on next call */ }
     }
 
     [RelayCommand]
@@ -51,21 +71,38 @@ public async Task RefreshAsync(CancellationToken ct = default)
         IsLoading = true; StatusMessage = null;
         try
         {
-            var all = await _api.GetAllMachinesAsync(ct);
+            var conns = Connections.ToList();
+            var tasks = conns.Select(async c =>
+            {
+                try
+                {
+                    var ms = await c.Api.GetAllMachinesAsync(ct);
+                    return ms.Select(m => m with { ServerName = c.Name }).ToList();
+                }
+                catch (OperationCanceledException) { throw; }
+                catch (Exception ex) { Activity.Error($"{c.Name}: refresh failed", ex.Message); return new List<MachineData>(); }
+            });
+            var all = (await Task.WhenAll(tasks)).SelectMany(x => x).ToList();
+
             if (_previousStatuses.Count > 0)
                 foreach (var m in all)
-                    if (_previousStatuses.TryGetValue(m.Vmid, out var prev) && prev != m.Status)
+                {
+                    var key = $"{m.ServerName}:{m.Vmid}";
+                    if (_previousStatuses.TryGetValue(key, out var prev) && prev != m.Status)
+                    {
                         NotificationService.NotifyStateChange(m.Name, m.Vmid, prev, m.Status);
-            _previousStatuses = all.ToDictionary(m => m.Vmid, m => m.Status);
+                        Activity.Info($"{m.Name}: {prev} → {m.Status}", $"{m.ServerName} · {m.NodeName} · VMID {m.Vmid}");
+                    }
+                }
+            _previousStatuses = all.ToDictionary(m => $"{m.ServerName}:{m.Vmid}", m => m.Status);
 
             System.Windows.Application.Current.Dispatcher.Invoke(() =>
             {
                 Machines.Clear();
                 foreach (var m in all) Machines.Add(m);
 
-                var nodes = all.Select(m => m.NodeName).Distinct().OrderBy(n => n).ToList();
-                NodeList.Clear();
-                foreach (var n in nodes) NodeList.Add(n);
+                foreach (var c in Connections)
+                    c.MachineCount = all.Count(m => m.ServerName == c.Name);
 
                 TotalCount   = all.Count;
                 RunningCount = all.Count(m => m.IsRunning);
@@ -76,59 +113,182 @@ public async Task RefreshAsync(CancellationToken ct = default)
             ApplyFilter();
         }
         catch (OperationCanceledException) { }
-        catch (Exception ex) { StatusMessage = $"Load error: {ex.Message}"; }
+        catch (Exception ex) { StatusMessage = $"Load error: {ex.Message}"; OnNotify?.Invoke(StatusMessage); }
         finally { IsLoading = false; }
     }
 
     [RelayCommand]
     public async Task PowerActionAsync(PowerActionArgs args)
     {
-        var r = await _api.PowerActionAsync(args.Machine, args.Action, args.Action == "suspend" && args.Extra);
-        StatusMessage = r switch { PowerResult.Forbidden => "Permission denied.", PowerResult.Error => "Power action failed.", _ => null };
-        await Task.Delay(2000);
+        var api = ApiFor(args.Machine);
+        if (api is null) return;
+
+        var r = await api.PowerActionAsync(args.Machine, args.Action, args.Action == "suspend" && args.Extra);
+        switch (r)
+        {
+            case PowerResult.Forbidden:
+                StatusMessage = "Permission denied."; OnNotify?.Invoke(StatusMessage);
+                Activity.Warning($"{args.Action}: {args.Machine.Name} — permission denied"); break;
+            case PowerResult.Error:
+                StatusMessage = "Power action failed."; OnNotify?.Invoke(StatusMessage);
+                Activity.Error($"{args.Action}: {args.Machine.Name} — failed"); break;
+            default:
+                Activity.Success($"{args.Action} → {args.Machine.Name}", $"{args.Machine.ServerName} · {args.Machine.NodeName}"); break;
+        }
+        await Task.Delay(1500);
+        await RefreshAsync();
+    }
+
+    // Convenience per-machine commands (used by the list/DataGrid view)
+    [RelayCommand] public Task Start(MachineData m)     => PowerActionAsync(new PowerActionArgs(m, "start"));
+    [RelayCommand] public Task Shutdown(MachineData m)  => PowerActionAsync(new PowerActionArgs(m, "shutdown"));
+    [RelayCommand] public Task Reboot(MachineData m)    => PowerActionAsync(new PowerActionArgs(m, "reboot"));
+    [RelayCommand] public Task ForceStop(MachineData m) => PowerActionAsync(new PowerActionArgs(m, "stop"));
+    [RelayCommand] public Task OpenNoVnc(MachineData m) => OpenConsoleAsync(new ConsoleArgs(m, "novnc"));
+    [RelayCommand] public Task OpenXterm(MachineData m) => OpenConsoleAsync(new ConsoleArgs(m, "xtermjs"));
+
+    [RelayCommand]
+    public async Task OpenConsoleAsync(ConsoleArgs args)
+    {
+        var api = ApiFor(args.Machine);
+        if (api is null) return;
+        var url = await api.GetConsoleUrlAsync(args.Machine, args.ConsoleType);
+        if (url is not null) OnOpenConsole?.Invoke(args.Machine, url);
+        else { OnNotify?.Invoke("Cannot open console."); Activity.Warning($"Console failed: {args.Machine.Name}"); }
+    }
+
+    [RelayCommand]
+    public async Task OpenSpiceAsync(MachineData machine)
+    {
+        var api = ApiFor(machine);
+        if (api is null) return;
+        var cfg = await api.GetSpiceConfigAsync(machine);
+        if (cfg is not null) OnOpenSpice?.Invoke(cfg);
+        else OnNotify?.Invoke("SPICE is not available for this machine.");
+    }
+
+    [RelayCommand] public void Logout()            => OnLogout?.Invoke();
+    [RelayCommand] public void ClearNodeFilter()   => SelectedNode       = null;
+    [RelayCommand] public void ClearServerFilter() => SelectedConnection = null;
+    [RelayCommand] public void ClearTagFilter()    => SelectedTag        = null;
+    [RelayCommand] public void ClearSearch()       => SearchQuery        = string.Empty;
+    [RelayCommand] public void FilterByTag(string tag)   => SelectedTag = tag;
+    [RelayCommand] public void ToggleView()              => IsListView   = !IsListView;
+    [RelayCommand] public void ToggleActivityPanel()     => IsActivityPanelOpen = !IsActivityPanelOpen;
+    [RelayCommand] public void ClearActivity()           => Activity.Clear();
+    [RelayCommand] public void AddServer()               => OnRequestAddServer?.Invoke();
+
+    [RelayCommand]
+    public async Task RemoveServer(ServerConnection? conn)
+    {
+        if (conn is null) return;
+        if (Connections.Count <= 1) { OnNotify?.Invoke("At least one connection is required."); return; }
+        Connections.Remove(conn);
+        if (SelectedConnection == conn) SelectedConnection = null;
+        Activity.Info($"Disconnected from {conn.Name}");
+        try { conn.Api.Dispose(); } catch { }
         await RefreshAsync();
     }
 
-    [RelayCommand] public async Task OpenConsoleAsync(ConsoleArgs args) { var url = await _api.GetConsoleUrlAsync(args.Machine, args.ConsoleType); if (url is not null) OnOpenConsole?.Invoke(args.Machine, url); }
-    [RelayCommand] public async Task OpenSpiceAsync(MachineData machine) { var cfg = await _api.GetSpiceConfigAsync(machine); if (cfg is not null) OnOpenSpice?.Invoke(cfg); }
-    [RelayCommand] public void Logout() => OnLogout?.Invoke();
-    [RelayCommand] public void ClearNodeFilter() => SelectedNode = null;
+    /// <summary>Adds an already-authenticated client as an additional cluster.</summary>
+    public void AddConnection(IApiClient api)
+    {
+        var client = (ApiClient)api;
+        if (Connections.Any(c => c.Name.Equals(client.Host, StringComparison.OrdinalIgnoreCase)))
+        {
+            OnNotify?.Invoke($"Already connected to {client.Host}.");
+            try { client.Dispose(); } catch { }
+            return;
+        }
+        Connections.Add(new ServerConnection(client.Host, client));
+        Activity.Success($"Connected to {client.Host}");
+        _ = RefreshAsync();
+    }
+
+    private ApiClient? ApiFor(MachineData m)
+        => (Connections.FirstOrDefault(c => c.Name == m.ServerName) ?? Connections.FirstOrDefault())?.Api;
 
     private void ApplyFilter()
     {
-        var q = SearchQuery.Trim().ToLowerInvariant();
+        var q = SearchQuery.Trim();
         var source = Machines.AsEnumerable();
 
+        if (SelectedConnection is not null)
+            source = source.Where(m => m.ServerName == SelectedConnection.Name);
+
+        // Node list reflects the currently selected server (or all servers).
+        var nodes = source.Select(m => m.NodeName).Distinct().OrderBy(n => n).ToList();
+
         if (!string.IsNullOrEmpty(SelectedNode))
             source = source.Where(m => m.NodeName == SelectedNode);
 
+        if (!string.IsNullOrEmpty(SelectedTag))
+            source = source.Where(m => m.TagList.Contains(SelectedTag));
+
         if (!string.IsNullOrEmpty(q))
             source = source.Where(m =>
                 m.Name.Contains(q, StringComparison.OrdinalIgnoreCase) ||
                 m.Vmid.ToString().Contains(q) ||
-                m.NodeName.Contains(q, StringComparison.OrdinalIgnoreCase));
+                m.NodeName.Contains(q, StringComparison.OrdinalIgnoreCase) ||
+                m.ServerName.Contains(q, StringComparison.OrdinalIgnoreCase));
+
+        var filtered = Sort(source).ToList();
 
-        var filtered = source.ToList();
         System.Windows.Application.Current.Dispatcher.Invoke(() =>
         {
             FilteredMachines = new ObservableCollection<MachineData>(filtered);
             GroupedMachines  = new ObservableCollection<NodeGroup>(
                 filtered.GroupBy(m => m.NodeName)
                         .OrderBy(g => g.Key)
-                        .Select(g => new NodeGroup(g.Key, new ObservableCollection<MachineData>(g.OrderBy(m => m.Vmid)))));
+                        .Select(g => new NodeGroup(g.Key, new ObservableCollection<MachineData>(g))));
+
+            if (!nodes.SequenceEqual(NodeList))
+            {
+                NodeList.Clear();
+                foreach (var n in nodes) NodeList.Add(n);
+            }
+            IsEmpty = filtered.Count == 0;
         });
     }
 
+    private IEnumerable<MachineData> Sort(IEnumerable<MachineData> src) => SortIndex switch
+    {
+        1 => src.OrderBy(m => m.Vmid),
+        2 => src.OrderByDescending(m => m.Cpu).ThenBy(m => m.Name),
+        3 => src.OrderByDescending(m => m.MemPercent).ThenBy(m => m.Name),
+        4 => src.OrderBy(m => m.Status).ThenBy(m => m.Name),
+        5 => src.OrderByDescending(m => m.Uptime).ThenBy(m => m.Name),
+        _ => src.OrderBy(m => m.Name, StringComparer.OrdinalIgnoreCase),
+    };
+
     public event Action<MachineData, string>? OnOpenConsole;
     public event Action<SpiceObject>?         OnOpenSpice;
     public event Action?                      OnLogout;
+    public event Action?                      OnRequestAddServer;
+    public event Action<string>?              OnNotify;
 
-    public void Dispose() { _cts.Cancel(); _refreshTimer.Dispose(); _ticketTimer.Dispose(); _api.Dispose(); }
+    public void Dispose()
+    {
+        _cts.Cancel();
+        _refreshTimer.Dispose();
+        _ticketTimer.Dispose();
+        foreach (var c in Connections) { try { c.Api.Dispose(); } catch { } }
+    }
 }
 
 public record PowerActionArgs(MachineData Machine, string Action, bool Extra = false);
 public record ConsoleArgs(MachineData Machine, string ConsoleType);
 
+/// <summary>An authenticated connection to a single Proxmox cluster.</summary>
+public sealed partial class ServerConnection : ObservableObject
+{
+    public string    Name { get; }
+    public ApiClient Api  { get; }
+    [ObservableProperty] private int machineCount;
+
+    public ServerConnection(string name, ApiClient api) { Name = name; Api = api; }
+}
+
 public sealed class NodeGroup(string nodeName, ObservableCollection<MachineData> machines)
 {
     public string NodeName   { get; } = nodeName;
diff --git a/Proxmox Desktop/Views/LoginWindow.xaml.cs b/Proxmox Desktop/Views/LoginWindow.xaml.cs
index e590b18..4aa1f8e 100644
--- a/Proxmox Desktop/Views/LoginWindow.xaml.cs	
+++ b/Proxmox Desktop/Views/LoginWindow.xaml.cs	
@@ -1,5 +1,6 @@
 using System.Windows;
 using System.Windows.Controls;
+using ProxmoxDesktop.Api;
 using ProxmoxDesktop.Config;
 using ProxmoxDesktop.ViewModels;
 
@@ -9,12 +10,27 @@ public partial class LoginWindow : Window
 {
     public LoginViewModel ViewModel { get; }
 
-    public LoginWindow()
+    /// <summary>
+    /// Default constructor: on success, opens the main window.
+    /// When <paramref name="onConnected"/> is supplied, the window acts as an
+    /// "add connection" dialog — on success it hands the authenticated client
+    /// back to the caller and closes, without opening a new main window.
+    /// </summary>
+    public LoginWindow(Action<IApiClient>? onConnected = null)
     {
         InitializeComponent();
         ViewModel   = new LoginViewModel(new ConfigurationService());
         DataContext = ViewModel;
-        ViewModel.OnLoginSuccess += api => { new MainWindow(api).Show(); Close(); };
+
+        if (onConnected is null)
+        {
+            ViewModel.OnLoginSuccess += api => { new MainWindow(api).Show(); Close(); };
+        }
+        else
+        {
+            Title = "Add Proxmox connection";
+            ViewModel.OnLoginSuccess += api => { onConnected(api); Close(); };
+        }
     }
 
     private void Server_LostFocus(object sender, RoutedEventArgs e)         => ViewModel.LoadRealmsCommand.Execute(null);
diff --git a/Proxmox Desktop/Views/MainWindow.xaml b/Proxmox Desktop/Views/MainWindow.xaml
index 262c96d..d78400c 100644
--- a/Proxmox Desktop/Views/MainWindow.xaml	
+++ b/Proxmox Desktop/Views/MainWindow.xaml	
@@ -13,12 +13,19 @@
     Background="{DynamicResource MaterialDesign.Brush.Background}"
     TextElement.Foreground="{DynamicResource MaterialDesign.Brush.Foreground}"
     FontFamily="{md:MaterialDesignFont}"
+    PreviewKeyDown="OnWindowPreviewKeyDown"
     md:ThemeAssist.Theme="Inherit">
+    <Window.InputBindings>
+        <KeyBinding Key="F5"     Command="{Binding RefreshCommand}"/>
+        <KeyBinding Key="Escape" Command="{Binding ClearSearchCommand}"/>
+    </Window.InputBindings>
     <Window.Resources>
         <converters:NotNullToVisibilityConverter     x:Key="NotNullToVisibility"/>
         <converters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibility"/>
-        <BooleanToVisibilityConverter               x:Key="BoolToVisibility"/>
-        <converters:StatusToBrushConverter          x:Key="StatusToBrush"/>
+        <converters:BoolToGridLengthConverter        x:Key="BoolToGridLength"/>
+        <converters:StatusToBrushConverter           x:Key="StatusToBrush"/>
+        <converters:BytesToReadableConverter         x:Key="BytesToReadable"/>
+        <BooleanToVisibilityConverter                x:Key="BoolToVisibility"/>
 
         <!-- Node sidebar item style -->
         <Style x:Key="NodeItem" TargetType="ListBoxItem" BasedOn="{StaticResource MaterialDesignListBoxItem}">
@@ -26,6 +33,15 @@
             <Setter Property="Margin"  Value="4,2"/>
             <Setter Property="md:ButtonAssist.CornerRadius" Value="8"/>
         </Style>
+
+        <!-- Active filter chip -->
+        <Style x:Key="FilterChip" TargetType="Border">
+            <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary}"/>
+            <Setter Property="CornerRadius" Value="12"/>
+            <Setter Property="Padding" Value="8,2"/>
+            <Setter Property="Margin" Value="8,0,0,0"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+        </Style>
     </Window.Resources>
 
     <md:DialogHost Identifier="MainDialog">
@@ -47,12 +63,25 @@
                                    FontWeight="Medium" VerticalAlignment="Center"/>
                     </StackPanel>
                     <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Center">
+                        <Button Style="{StaticResource MaterialDesignToolForegroundButton}" Command="{Binding ToggleViewCommand}"
+                                ToolTip="Toggle grid / list view" Foreground="White">
+                            <md:PackIcon Kind="ViewList" Width="20" Height="20"/>
+                        </Button>
+                        <Button Style="{StaticResource MaterialDesignToolForegroundButton}" Command="{Binding AddServerCommand}"
+                                ToolTip="Add a server connection" Foreground="White">
+                            <md:PackIcon Kind="ServerPlus" Width="20" Height="20"/>
+                        </Button>
+                        <Button Style="{StaticResource MaterialDesignToolForegroundButton}" Command="{Binding ToggleActivityPanelCommand}"
+                                ToolTip="Activity log" Foreground="White">
+                            <md:PackIcon Kind="History" Width="20" Height="20"/>
+                        </Button>
+                        <Separator Margin="4,0"/>
                         <Button Style="{StaticResource MaterialDesignToolForegroundButton}" Click="OnThemeToggle"
                                 ToolTip="Toggle theme" Foreground="White">
                             <md:PackIcon x:Name="ThemeIcon" Kind="WeatherNight" Width="20" Height="20"/>
                         </Button>
                         <Button Style="{StaticResource MaterialDesignToolForegroundButton}" Command="{Binding RefreshCommand}"
-                                ToolTip="Refresh" Foreground="White">
+                                ToolTip="Refresh (F5)" Foreground="White">
                             <md:PackIcon Kind="Refresh" Width="20" Height="20"/>
                         </Button>
                         <Separator Margin="4,0"/>
@@ -62,8 +91,8 @@
                         </Button>
                     </StackPanel>
                     <!-- Search -->
-                    <TextBox Margin="24,0"
-                             md:HintAssist.Hint="Search VMs and containers..."
+                    <TextBox x:Name="SearchBox" Margin="24,0"
+                             md:HintAssist.Hint="Search VMs and containers...  (Ctrl+F)"
                              md:TextFieldAssist.HasLeadingIcon="True"
                              md:TextFieldAssist.LeadingIcon="Magnify"
                              Style="{StaticResource MaterialDesignOutlinedTextBox}"
@@ -92,59 +121,285 @@
             <!-- ══ MAIN CONTENT ══ -->
             <Grid Grid.Row="3">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="200"/>  <!-- Sidebar -->
-                    <ColumnDefinition Width="*"/>    <!-- VM Grid -->
+                    <ColumnDefinition Width="210"/>  <!-- Sidebar -->
+                    <ColumnDefinition Width="*"/>    <!-- Views -->
+                    <ColumnDefinition Width="{Binding IsActivityPanelOpen, Converter={StaticResource BoolToGridLength}, ConverterParameter=340}"/>
                 </Grid.ColumnDefinitions>
 
-                <!-- SIDEBAR -->
+                <!-- ── SIDEBAR ── -->
                 <Border Grid.Column="0"
                         BorderThickness="0,0,1,0"
                         BorderBrush="{DynamicResource MaterialDesign.Brush.TextBox.HoverBackground}">
-                    <DockPanel>
-                        <TextBlock DockPanel.Dock="Top" Text="NODES"
-                                   Style="{StaticResource MaterialDesignOverlineTextBlock}"
-                                   Margin="16,12,0,6" Opacity="0.5"/>
-                        <Button DockPanel.Dock="Top"
-                                Style="{StaticResource MaterialDesignFlatButton}"
-                                Command="{Binding ClearNodeFilterCommand}"
-                                HorizontalAlignment="Stretch" HorizontalContentAlignment="Left"
-                                Margin="4,0,4,4" Padding="12,6"
-                                md:ButtonAssist.CornerRadius="8">
-                            <StackPanel Orientation="Horizontal">
-                                <md:PackIcon Kind="ServerNetwork" Width="16" Height="16" VerticalAlignment="Center" Margin="0,0,8,0"/>
-                                <TextBlock Text="All nodes" VerticalAlignment="Center"/>
+                    <ScrollViewer VerticalScrollBarVisibility="Auto">
+                        <StackPanel>
+                            <!-- Servers -->
+                            <TextBlock Text="SERVERS" Style="{StaticResource MaterialDesignOverlineTextBlock}"
+                                       Margin="16,12,0,6" Opacity="0.5"/>
+                            <Button Style="{StaticResource MaterialDesignFlatButton}"
+                                    Command="{Binding ClearServerFilterCommand}"
+                                    HorizontalAlignment="Stretch" HorizontalContentAlignment="Left"
+                                    Margin="4,0,4,4" Padding="12,6" md:ButtonAssist.CornerRadius="8">
+                                <StackPanel Orientation="Horizontal">
+                                    <md:PackIcon Kind="SelectAll" Width="16" Height="16" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                                    <TextBlock Text="All servers" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </Button>
+                            <ListBox ItemsSource="{Binding Connections}"
+                                     SelectedItem="{Binding SelectedConnection}"
+                                     ItemContainerStyle="{StaticResource NodeItem}"
+                                     ScrollViewer.VerticalScrollBarVisibility="Disabled">
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate DataType="{x:Type vm:ServerConnection}">
+                                        <DockPanel>
+                                            <Button DockPanel.Dock="Right" Width="22" Height="22" Padding="0"
+                                                    Style="{StaticResource MaterialDesignIconForegroundButton}"
+                                                    Command="{Binding DataContext.RemoveServerCommand, RelativeSource={RelativeSource AncestorType=ListBox}}"
+                                                    CommandParameter="{Binding}" ToolTip="Disconnect">
+                                                <md:PackIcon Kind="Close" Width="13" Height="13"/>
+                                            </Button>
+                                            <md:PackIcon Kind="Server" Width="14" Height="14" VerticalAlignment="Center" Margin="0,0,8,0" Opacity="0.7"/>
+                                            <TextBlock Text="{Binding Name}" VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
+                                            <TextBlock Text="{Binding MachineCount, StringFormat=' ({0})'}" VerticalAlignment="Center" Opacity="0.45" FontSize="11"/>
+                                        </DockPanel>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+
+                            <!-- Nodes -->
+                            <TextBlock Text="NODES" Style="{StaticResource MaterialDesignOverlineTextBlock}"
+                                       Margin="16,14,0,6" Opacity="0.5"/>
+                            <Button Style="{StaticResource MaterialDesignFlatButton}"
+                                    Command="{Binding ClearNodeFilterCommand}"
+                                    HorizontalAlignment="Stretch" HorizontalContentAlignment="Left"
+                                    Margin="4,0,4,4" Padding="12,6" md:ButtonAssist.CornerRadius="8">
+                                <StackPanel Orientation="Horizontal">
+                                    <md:PackIcon Kind="ServerNetwork" Width="16" Height="16" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                                    <TextBlock Text="All nodes" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </Button>
+                            <ListBox ItemsSource="{Binding NodeList}"
+                                     SelectedItem="{Binding SelectedNode}"
+                                     ItemContainerStyle="{StaticResource NodeItem}"
+                                     ScrollViewer.VerticalScrollBarVisibility="Disabled">
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <StackPanel Orientation="Horizontal">
+                                            <md:PackIcon Kind="Server" Width="14" Height="14" VerticalAlignment="Center" Margin="0,0,8,0" Opacity="0.7"/>
+                                            <TextBlock Text="{Binding}" VerticalAlignment="Center"/>
+                                        </StackPanel>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+                        </StackPanel>
+                    </ScrollViewer>
+                </Border>
+
+                <!-- ── VIEWS ── -->
+                <Grid Grid.Column="1">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>  <!-- sub-toolbar -->
+                        <RowDefinition Height="*"/>     <!-- grid / list / empty -->
+                    </Grid.RowDefinitions>
+
+                    <!-- Sub-toolbar: sort + active filters + count -->
+                    <Border Grid.Row="0" Padding="16,8"
+                            BorderThickness="0,0,0,1" BorderBrush="{DynamicResource MaterialDesign.Brush.TextBox.HoverBackground}">
+                        <DockPanel>
+                            <TextBlock DockPanel.Dock="Right" VerticalAlignment="Center" Opacity="0.5" FontSize="12"
+                                       Text="{Binding FilteredMachines.Count, StringFormat='{}{0} shown'}"/>
+                            <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                                <md:PackIcon Kind="SortVariant" Width="18" Height="18" VerticalAlignment="Center" Opacity="0.6" Margin="0,0,8,0"/>
+                                <ComboBox Width="120" SelectedIndex="{Binding SortIndex}" md:HintAssist.Hint="Sort"
+                                          Style="{StaticResource MaterialDesignComboBox}" VerticalAlignment="Center">
+                                    <ComboBoxItem Content="Name"/>
+                                    <ComboBoxItem Content="VMID"/>
+                                    <ComboBoxItem Content="CPU"/>
+                                    <ComboBoxItem Content="RAM"/>
+                                    <ComboBoxItem Content="Status"/>
+                                    <ComboBoxItem Content="Uptime"/>
+                                </ComboBox>
+
+                                <!-- active filter chips -->
+                                <Border Style="{StaticResource FilterChip}"
+                                        Visibility="{Binding SelectedConnection, Converter={StaticResource NotNullToVisibility}}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <md:PackIcon Kind="Server" Width="12" Height="12" VerticalAlignment="Center" Foreground="White" Margin="0,0,4,0"/>
+                                        <TextBlock Text="{Binding SelectedConnection.Name}" Foreground="White" FontSize="11" VerticalAlignment="Center"/>
+                                        <Button Command="{Binding ClearServerFilterCommand}" Margin="4,0,0,0" Padding="0" Width="16" Height="16"
+                                                Style="{StaticResource MaterialDesignIconForegroundButton}" Foreground="White">
+                                            <md:PackIcon Kind="Close" Width="11" Height="11"/>
+                                        </Button>
+                                    </StackPanel>
+                                </Border>
+                                <Border Style="{StaticResource FilterChip}"
+                                        Visibility="{Binding SelectedNode, Converter={StaticResource NotNullToVisibility}}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <md:PackIcon Kind="ServerNetwork" Width="12" Height="12" VerticalAlignment="Center" Foreground="White" Margin="0,0,4,0"/>
+                                        <TextBlock Text="{Binding SelectedNode}" Foreground="White" FontSize="11" VerticalAlignment="Center"/>
+                                        <Button Command="{Binding ClearNodeFilterCommand}" Margin="4,0,0,0" Padding="0" Width="16" Height="16"
+                                                Style="{StaticResource MaterialDesignIconForegroundButton}" Foreground="White">
+                                            <md:PackIcon Kind="Close" Width="11" Height="11"/>
+                                        </Button>
+                                    </StackPanel>
+                                </Border>
+                                <Border Style="{StaticResource FilterChip}"
+                                        Visibility="{Binding SelectedTag, Converter={StaticResource NotNullToVisibility}}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <md:PackIcon Kind="Tag" Width="12" Height="12" VerticalAlignment="Center" Foreground="White" Margin="0,0,4,0"/>
+                                        <TextBlock Text="{Binding SelectedTag}" Foreground="White" FontSize="11" VerticalAlignment="Center"/>
+                                        <Button Command="{Binding ClearTagFilterCommand}" Margin="4,0,0,0" Padding="0" Width="16" Height="16"
+                                                Style="{StaticResource MaterialDesignIconForegroundButton}" Foreground="White">
+                                            <md:PackIcon Kind="Close" Width="11" Height="11"/>
+                                        </Button>
+                                    </StackPanel>
+                                </Border>
                             </StackPanel>
-                        </Button>
-                        <ListBox ItemsSource="{Binding NodeList}"
-                                 SelectedItem="{Binding SelectedNode}"
-                                 ItemContainerStyle="{StaticResource NodeItem}">
+                        </DockPanel>
+                    </Border>
+
+                    <Grid Grid.Row="1">
+                        <!-- GRID VIEW -->
+                        <ScrollViewer Padding="16" VerticalScrollBarVisibility="Auto"
+                                      Visibility="{Binding IsListView, Converter={StaticResource InverseBoolToVisibility}}">
+                            <ItemsControl ItemsSource="{Binding FilteredMachines}">
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <WrapPanel Orientation="Horizontal"/>
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate DataType="{x:Type models:MachineData}">
+                                        <controls:MachineCard Machine="{Binding}" Margin="0,0,12,12"/>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </ScrollViewer>
+
+                        <!-- LIST VIEW -->
+                        <DataGrid ItemsSource="{Binding FilteredMachines}"
+                                  Visibility="{Binding IsListView, Converter={StaticResource BoolToVisibility}}"
+                                  AutoGenerateColumns="False" IsReadOnly="True"
+                                  CanUserAddRows="False" CanUserDeleteRows="False"
+                                  HeadersVisibility="Column" SelectionMode="Single"
+                                  GridLinesVisibility="Horizontal" Margin="8"
+                                  Style="{StaticResource MaterialDesignDataGrid}">
+                            <DataGrid.Columns>
+                                <DataGridTemplateColumn Header="" Width="36" CanUserSort="False">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <Ellipse Width="10" Height="10" HorizontalAlignment="Center"
+                                                     Fill="{Binding Status, Converter={StaticResource StatusToBrush}}"/>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTextColumn Header="Type"   Binding="{Binding Type}"   Width="60"/>
+                                <DataGridTextColumn Header="VMID"   Binding="{Binding Vmid}"   Width="70"/>
+                                <DataGridTextColumn Header="Name"   Binding="{Binding Name}"   Width="*"/>
+                                <DataGridTextColumn Header="Status" Binding="{Binding Status}" Width="90"/>
+                                <DataGridTextColumn Header="CPU"    Binding="{Binding CpuPercent, StringFormat={}{0:F1}%}" Width="70"/>
+                                <DataGridTextColumn Header="RAM"    Binding="{Binding Mem, Converter={StaticResource BytesToReadable}}" Width="80"/>
+                                <DataGridTextColumn Header="Uptime" Binding="{Binding UptimeFormatted}" Width="90"/>
+                                <DataGridTextColumn Header="Server" Binding="{Binding ServerName}" Width="110"/>
+                                <DataGridTextColumn Header="Node"   Binding="{Binding NodeName}"   Width="100"/>
+                                <DataGridTextColumn Header="Tags"   Binding="{Binding Tags}"       Width="120"/>
+                                <DataGridTemplateColumn Header="Actions" Width="170" CanUserSort="False">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <StackPanel Orientation="Horizontal">
+                                                <Button Width="30" Height="30" Padding="0" Style="{StaticResource MaterialDesignIconForegroundButton}"
+                                                        ToolTip="NoVNC" CommandParameter="{Binding}"
+                                                        Command="{Binding DataContext.OpenNoVncCommand, RelativeSource={RelativeSource AncestorType=DataGrid}}">
+                                                    <md:PackIcon Kind="MonitorEye" Width="15" Height="15"/>
+                                                </Button>
+                                                <Button Width="30" Height="30" Padding="0" Style="{StaticResource MaterialDesignIconForegroundButton}"
+                                                        ToolTip="xTermJS" CommandParameter="{Binding}"
+                                                        Command="{Binding DataContext.OpenXtermCommand, RelativeSource={RelativeSource AncestorType=DataGrid}}">
+                                                    <md:PackIcon Kind="Console" Width="15" Height="15"/>
+                                                </Button>
+                                                <Button Width="30" Height="30" Padding="0" Style="{StaticResource MaterialDesignIconForegroundButton}"
+                                                        ToolTip="Start" CommandParameter="{Binding}"
+                                                        Visibility="{Binding IsRunning, Converter={StaticResource InverseBoolToVisibility}}"
+                                                        Command="{Binding DataContext.StartCommand, RelativeSource={RelativeSource AncestorType=DataGrid}}">
+                                                    <md:PackIcon Kind="Play" Width="15" Height="15" Foreground="#4CAF50"/>
+                                                </Button>
+                                                <Button Width="30" Height="30" Padding="0" Style="{StaticResource MaterialDesignIconForegroundButton}"
+                                                        ToolTip="Shutdown" CommandParameter="{Binding}"
+                                                        Visibility="{Binding IsRunning, Converter={StaticResource BoolToVisibility}}"
+                                                        Command="{Binding DataContext.ShutdownCommand, RelativeSource={RelativeSource AncestorType=DataGrid}}">
+                                                    <md:PackIcon Kind="Power" Width="15" Height="15" Foreground="#F44336"/>
+                                                </Button>
+                                                <Button Width="30" Height="30" Padding="0" Style="{StaticResource MaterialDesignIconForegroundButton}"
+                                                        ToolTip="Reboot" CommandParameter="{Binding}"
+                                                        Visibility="{Binding IsRunning, Converter={StaticResource BoolToVisibility}}"
+                                                        Command="{Binding DataContext.RebootCommand, RelativeSource={RelativeSource AncestorType=DataGrid}}">
+                                                    <md:PackIcon Kind="Restart" Width="15" Height="15"/>
+                                                </Button>
+                                            </StackPanel>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                            </DataGrid.Columns>
+                        </DataGrid>
+
+                        <!-- EMPTY STATE -->
+                        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"
+                                    Visibility="{Binding IsEmpty, Converter={StaticResource BoolToVisibility}}">
+                            <md:PackIcon Kind="Magnify" Width="48" Height="48" Opacity="0.25" HorizontalAlignment="Center"/>
+                            <TextBlock Text="No machines match your filters" Opacity="0.5" Margin="0,8,0,0" HorizontalAlignment="Center"/>
+                        </StackPanel>
+                    </Grid>
+                </Grid>
+
+                <!-- ── ACTIVITY PANEL ── -->
+                <Border Grid.Column="2"
+                        Visibility="{Binding IsActivityPanelOpen, Converter={StaticResource BoolToVisibility}}"
+                        BorderThickness="1,0,0,0"
+                        BorderBrush="{DynamicResource MaterialDesign.Brush.TextBox.HoverBackground}"
+                        Background="{DynamicResource MaterialDesign.Brush.CardBackground}">
+                    <DockPanel>
+                        <Border DockPanel.Dock="Top" Background="{DynamicResource MaterialDesign.Brush.Primary}" Padding="12,8">
+                            <DockPanel>
+                                <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
+                                    <Button Style="{StaticResource MaterialDesignToolForegroundButton}" Width="28" Height="28" Padding="0"
+                                            Command="{Binding ClearActivityCommand}" ToolTip="Clear" Foreground="White">
+                                        <md:PackIcon Kind="DeleteSweep" Width="16" Height="16"/>
+                                    </Button>
+                                    <Button Style="{StaticResource MaterialDesignToolForegroundButton}" Width="28" Height="28" Padding="0"
+                                            Command="{Binding ToggleActivityPanelCommand}" ToolTip="Close" Foreground="White">
+                                        <md:PackIcon Kind="Close" Width="16" Height="16"/>
+                                    </Button>
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                                    <md:PackIcon Kind="History" Width="16" Height="16" Foreground="White" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                                    <TextBlock Text="ACTIVITY" Foreground="White" FontWeight="Medium" VerticalAlignment="Center"/>
+                                </StackPanel>
+                            </DockPanel>
+                        </Border>
+                        <ListBox ItemsSource="{Binding Activity.Entries}"
+                                 HorizontalContentAlignment="Stretch"
+                                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                 ScrollViewer.VerticalScrollBarVisibility="Auto">
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
-                                    <StackPanel Orientation="Horizontal">
-                                        <md:PackIcon Kind="Server" Width="14" Height="14" VerticalAlignment="Center" Margin="0,0,8,0" Opacity="0.7"/>
-                                        <TextBlock Text="{Binding}" VerticalAlignment="Center"/>
-                                    </StackPanel>
+                                    <Grid Margin="0,4">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition Width="*"/>
+                                        </Grid.ColumnDefinitions>
+                                        <md:PackIcon Grid.Column="0" Kind="{Binding Icon}" Foreground="{Binding Color}"
+                                                     Width="18" Height="18" Margin="0,1,8,0" VerticalAlignment="Top"/>
+                                        <StackPanel Grid.Column="1">
+                                            <TextBlock Text="{Binding Title}" FontSize="12" TextWrapping="Wrap"/>
+                                            <TextBlock Text="{Binding Detail}" FontSize="11" Opacity="0.55" TextWrapping="Wrap"
+                                                       Visibility="{Binding Detail, Converter={StaticResource NotNullToVisibility}}"/>
+                                            <TextBlock Text="{Binding TimeText}" FontSize="10" Opacity="0.4"/>
+                                        </StackPanel>
+                                    </Grid>
                                 </DataTemplate>
                             </ListBox.ItemTemplate>
                         </ListBox>
                     </DockPanel>
                 </Border>
-
-                <!-- VM GRID -->
-                <ScrollViewer Grid.Column="1" Padding="16" VerticalScrollBarVisibility="Auto">
-                    <ItemsControl ItemsSource="{Binding FilteredMachines}">
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <WrapPanel Orientation="Horizontal"/>
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate DataType="{x:Type models:MachineData}">
-                                <controls:MachineCard Machine="{Binding}" Margin="0,0,12,12"/>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ItemsControl>
-                </ScrollViewer>
             </Grid>
 
             <!-- ══ SNACKBAR ══ -->
diff --git a/Proxmox Desktop/Views/MainWindow.xaml.cs b/Proxmox Desktop/Views/MainWindow.xaml.cs
index 56cce82..b7cf3c6 100644
--- a/Proxmox Desktop/Views/MainWindow.xaml.cs	
+++ b/Proxmox Desktop/Views/MainWindow.xaml.cs	
@@ -1,7 +1,8 @@
 using System.Windows;
+using System.Windows.Input;
 using MaterialDesignThemes.Wpf;
 using ProxmoxDesktop.Api;
-using ProxmoxDesktop.Api.Models;
+using ProxmoxDesktop.Config;
 using ProxmoxDesktop.Console;
 using ProxmoxDesktop.ViewModels;
 
@@ -12,18 +13,31 @@ public partial class MainWindow : Window
     public static MainWindow? Instance { get; private set; }
     public ISnackbarMessageQueue SnackbarService => MainSnackbar.MessageQueue!;
 
-    private readonly MainViewModel _vm;
-    private bool _isDark = true;
+    private readonly MainViewModel        _vm;
+    private readonly ConfigurationService _config = new();
+    private bool _isDark;
 
     public MainWindow(IApiClient api)
     {
         InitializeComponent();
-        Instance    = this;
-        _vm         = new MainViewModel((ApiClient)api);
+        Instance = this;
+
+        _isDark = _config.Config.IsDarkTheme;
+        ApplyTheme();
+
+        _vm         = new MainViewModel((ApiClient)api, _config.Config.RefreshIntervalSeconds);
         DataContext = _vm;
+
         _vm.OnLogout      += () => { _vm.Dispose(); Instance = null; new LoginWindow().Show(); Close(); };
         _vm.OnOpenConsole += (m, url) => new ConsoleWindow(m, url).Show();
         _vm.OnOpenSpice   += async cfg => await SpiceLauncher.LaunchAsync(cfg);
+        _vm.OnNotify      += msg => Dispatcher.Invoke(() => SnackbarService.Enqueue(msg));
+        _vm.OnRequestAddServer += () =>
+        {
+            var dlg = new LoginWindow(connectedApi => _vm.AddConnection(connectedApi)) { Owner = this };
+            dlg.ShowDialog();
+        };
+
         Loaded += async (_, _) => await _vm.RefreshAsync();
         Closed += (_, _) => { _vm.Dispose(); Instance = null; };
     }
@@ -31,10 +45,27 @@ public MainWindow(IApiClient api)
     private void OnThemeToggle(object sender, RoutedEventArgs e)
     {
         _isDark = !_isDark;
+        ApplyTheme();
+        _config.Config.IsDarkTheme = _isDark;
+        _config.Save();
+    }
+
+    private void ApplyTheme()
+    {
         var helper = new PaletteHelper();
         var theme  = helper.GetTheme();
         theme.SetBaseTheme(_isDark ? BaseTheme.Dark : BaseTheme.Light);
         helper.SetTheme(theme);
         ThemeIcon.Kind = _isDark ? PackIconKind.WeatherNight : PackIconKind.WeatherSunny;
     }
+
+    private void OnWindowPreviewKeyDown(object sender, KeyEventArgs e)
+    {
+        if (e.Key == Key.F && Keyboard.Modifiers == ModifierKeys.Control)
+        {
+            SearchBox.Focus();
+            SearchBox.SelectAll();
+            e.Handled = true;
+        }
+    }
 }
diff --git a/README.md b/README.md
index d5a7ff5..e87b9a6 100644
--- a/README.md
+++ b/README.md
@@ -29,16 +29,21 @@ Built with **WPF** and **Material Design**, using an **MVVM** architecture (Comm
 
 ## Features
 
-- 🖥️ **VM/LXC Dashboard** &mdash; Grid view of all machines with real-time status, CPU%, RAM%, uptime
+- 🖥️ **VM/LXC Dashboard** &mdash; Grid **or list** view of all machines with real-time status, CPU%, RAM%, uptime
+- 🌐 **Multi-server** &mdash; Connect several Proxmox clusters at once and see them side by side
 - 📊 **Stats bar** &mdash; Total / Running / Stopped / VMs / LXC at a glance
-- 🗂️ **Node sidebar** &mdash; Filter by node with a single click
-- 🔍 **Search** &mdash; Filter by name, VMID or node
+- 🗂️ **Server &amp; node sidebar** &mdash; Filter by cluster or node with a single click
+- 🏷️ **Proxmox tags** &mdash; Shown on each card, click a tag to filter
+- 🧭 **Sorting** &mdash; By name, VMID, CPU, RAM, status or uptime
+- 🕑 **Activity log** &mdash; Side panel recording power actions, state changes and errors
+- 🔍 **Search** &mdash; Filter by name, VMID, node or server
 - 🖥️ **Integrated console** &mdash; NoVNC, xTermJS and SPICE (Virt-Viewer)
 - ⚡ **Power control** &mdash; Start / Shutdown / Reboot / Suspend / Hibernate / Force Stop / Reset
 - 🔐 **Dual authentication** &mdash; Classic login + TOTP, or Proxmox API Token
 - 🔔 **Windows notifications** &mdash; Native toast on VM state changes
-- 🔄 **Auto-refresh** &mdash; Every 60 seconds, ticket renewed automatically every 90 min
-- 🌙 **Dark / Light theme** &mdash; Toggle in one click
+- ⌨️ **Keyboard shortcuts** &mdash; `F5` refresh · `Ctrl+F` search · `Esc` clear
+- 🔄 **Auto-refresh** &mdash; Configurable interval, ticket renewed automatically every 90 min
+- 🌙 **Dark / Light theme** &mdash; Toggle in one click, remembered between sessions
 
 ---
 
@@ -199,10 +204,12 @@ Proxmox-Desktop/
 - [x] Group by node
 - [x] Windows Toast notifications
 - [x] Dark / Light theme
-- [ ] Multi-server support (multiple Proxmox clusters)
-- [ ] List view in addition to grid view
-- [ ] Proxmox tags displayed on cards
-- [ ] Action history / logs
+- [x] Multi-server support (multiple Proxmox clusters)
+- [x] List view in addition to grid view
+- [x] Proxmox tags displayed on cards
+- [x] Action history / logs
+- [ ] Bulk power actions on multiple machines
+- [ ] Per-VM resource graphs (history)
 
 ---