diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbf75b2..35ac1e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,55 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- **Device Groups** — Organize devices into named categories (e.g., "Gaming", "Work", "Media Server"). New nullable `GroupName` field on `PcDevice` model enables lightweight categorization. Card view displays devices grouped by category with "Ungrouped" section for unassigned devices (sorted last). Table view includes filterable `GroupName` column. Group badge (MudChip) shown in `DeviceCard` header.
+- **Enhanced Loading Screen** — Redesigned Blazor WASM initial loading page with modern dark gradient background (`#1a1a2e` → `#0f3460`), animated LANdalf wizard emoji (🧙‍♂️) with floating animation, cyan progress circle with glow effect matching app theme, and centered "LANdalf" app name display.
+- **Device Monitoring Service** — Background `IHostedService` that automatically pings devices at configurable intervals (default 30s) to track online/offline status. Updates `IsOnline` field in database and broadcasts changes via SignalR for real-time UI updates.
+- **Real-time Status Updates** — SignalR `DeviceStatusHub` broadcasts device status changes to connected clients. `DeviceStatusHubService` (UI) manages WebSocket connections with automatic reconnection.
+- **Online Timestamp Tracking** — `OnlineSince` field tracks when devices come online (UTC). UI displays user-friendly durations ("5 minutes ago", "2 hours ago") via `Formatter.FormatOnlineSince()`.
+- **Device Monitoring Configuration** — `DeviceMonitoringOptions` class using IOptions pattern for type-safe settings (`Enabled`, `IntervalSeconds`, `TimeoutMilliseconds`) in `appsettings.json`.
+- **Docker Ping Utilities** — Added `iputils-ping` package installation in API Dockerfile for ICMP ping support in containerized environments. Enhanced error handling for `PlatformNotSupportedException` with thread-safe logging guard.
+- **Minimal API Strategy Pattern** — Endpoint registration refactored into strategy classes (`IMinimalApiStrategy`, `MinimalApiStrategyExtensions` with `AddMinimalApiStrategies()` assembly scanning and `MapMinimalApiStrategies()`). `PcDeviceMinimalApiStrategy` moves all `/pc-devices/` endpoint definitions out of `Program.cs`.
+- **Card View for Devices** — Home page now supports toggling between a table view and a card view via `DeviceCard.razor` and `DeviceEditDialog.razor` components.
+- **`ViewPreferenceService`** — Persists the card/table view preference to `localStorage`; registered in `Program.cs` (UI).
+- **Footer Bar** — A persistent bottom `MudAppBar` showing the app version and a GitHub link.
+- **Snackbar Notifications** — Add, update, delete, and WoL actions now show `ISnackbar` toasts.
+- **`PcDeviceDTO.Clone()` Extension** — New `Extensions.cs` in `src/UI/ApiClient/` adds a `Clone()` helper to avoid editing live objects in dialogs.
+- **Development `appsettings`** — Added `src/UI/wwwroot/appsettings.development.json` with `ApiBaseAddress` set to `https://localhost:7206/` for local development; `Program.cs` (UI) uses `#if DEBUG` to select the right base address.
+- `MinimalApiStrategyTests` — New tests covering `AddMinimalApiStrategies` registration, deduplication, and `MapMinimalApiStrategies` delegation.
+- `DeviceMonitoringServiceTests` — 16 new tests covering configuration validation, ping logic, status transitions, parallel processing, SignalR broadcasting, and IOptions pattern.
+- `DtoExtensionsTests` — New tests covering `GroupName` field mapping in device DTO conversions.
+
+### Changed
+
+- **Database Schema** — Added `GroupName` (nullable string) field with migration `20260329184944_AddDeviceGroupName`. Added `OnlineSince` (nullable DateTime) field with migration `20260328142753_AddOnlineSinceField`.
+- **API Program.cs** — Registered `DeviceMonitoringService` as singleton + hosted service, configured `DeviceMonitoringOptions` from `appsettings.json`, added SignalR with `DeviceStatusHub` mapping.
+- **UI Program.cs** — Registered `DeviceStatusHubService` as singleton, starts SignalR connection during app initialization.
+- **DTOs** — Updated `PcDeviceDTO` and `PcCreateDto` to include `GroupName` field. Updated `DtoExtensions` mapping methods to handle device groups.
+- `Home.razor` fully refactored: inline data-grid edit replaced by a dedicated `DeviceEditDialog` modal; `CommittedItemChanges` removed; separate `AddNewDevice`/`UpdateDevice` methods introduced; `LoadData` split into initial load + `RefreshData`. Now subscribes to `DeviceStatusHubService.OnDeviceStatusChanged` for real-time updates. Card view groups devices by `GroupName` with special handling for ungrouped devices.
+- `DeviceCard.razor` displays group badge (MudChip) in header when device has a group assigned. Shows "online since" timestamp when device is online using `Formatter.FormatOnlineSince()`.
+- `DeviceEditDialog.razor` added group input field with helper text for organizing devices into categories.
+- `PcDeviceHandler` updated to persist `GroupName` on device create and update operations.
+- `MainLayout.razor`: theme toggle button uses `aria-label` instead of `Title`; footer `MudAppBar` added.
+- `ThemeService.cs`: dark-mode primary color changed from `#bb86fc` to `#4fc3f7`.
+- `Program.cs` (API): all endpoint definitions moved to `PcDeviceMinimalApiStrategy`.
+- `HomeComponentTests` updated to inject `ViewPreferenceService` and mock `DeviceStatusHubService`.
+- `PcDeviceHandlerTests` updated to handle new `OnlineSince` and `GroupName` fields.
+- `MudBlazor` upgraded from `8.*` to `9.3.0`.
+- `bunit`: `2.6.2` → `2.7.2`
+- `dotnet-ef`: `10.0.1` → `10.0.5`
+- `Microsoft.AspNetCore.OpenApi`: `10.0.3` → `10.0.5`
+- `Microsoft.EntityFrameworkCore.Sqlite`: `10.0.3` → `10.0.5`
+- `Microsoft.EntityFrameworkCore.Tools`: `10.0.3` → `10.0.5`
+- `Scalar.AspNetCore`: `2.12.50` → `2.13.20`
+- `FluentAssertions`: `8.8.0` → `8.9.0`
+- `Microsoft.EntityFrameworkCore.InMemory`: `10.0.3` → `10.0.5`
+- `Microsoft.AspNetCore.Mvc.Testing`: `10.0.3` → `10.0.5`
+- GitHub Actions: `docker/setup-qemu-action` v3→v4, `docker/setup-buildx-action` v3→v4, `docker/login-action` v3→v4, `docker/metadata-action` v5→v6, `docker/build-push-action` v6→v7
+
+## [1.0.1]
+
+### Added
+
 - Initial public release
 - Wake-on-LAN device management with RESTful API
 - Blazor WebAssembly frontend with MudBlazor UI
@@ -17,4 +66,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Real-time device status monitoring
 - OpenAPI/Swagger API documentation
 
-[Unreleased]: https://github.com/renedierking/LANdalf/commits/master
+[Unreleased]: https://github.com/renedierking/LANdalf/compare/v1.0.1...HEAD
+[1.0.1]: https://github.com/renedierking/LANdalf/compare/v1.0.0...v1.0.1
diff --git a/README.md b/README.md
index a8bdf17..1fcd66e 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,13 @@ LANdalf is a web-based Wake-on-LAN management platform built with .NET 10.0, Bla
 ## ✨ Features
 
 - **Device Management** — Add, edit, and organize network devices with MAC address storage
+- **Device Groups** — Organize devices into named categories (e.g., "Gaming", "Work", "Media Server") for better organization. Card view automatically groups devices, table view includes filterable group column
 - **Wake-on-LAN** — Send magic packets to wake sleeping devices remotely
+- **Real-time Device Monitoring** — Automatic background pinging tracks online/offline status with configurable intervals (default 30s)
+- **Live Status Updates** — SignalR WebSocket integration provides instant UI updates when device status changes (no manual refresh needed)
+- **Online Timestamp Tracking** — See when devices came online with user-friendly time display ("5 minutes ago", "2 hours ago")
+- **Card/Table view toggle** — Switch between a card view and a table view with persistent preference (saved to `localStorage`)
+- **Snackbar notifications** — Toast notifications for add, edit, delete, and WoL actions
 - **RESTful API** — Versioned API with OpenAPI documentation ([API Guide](docs/API_USAGE.md))
 - **Docker Ready** — One-command deployment, cross-platform (Windows, Linux, macOS)
 
@@ -110,11 +116,33 @@ docker compose build         # Docker images
 LANdalf uses a strategy pattern for Minimal API endpoint registration:
 
 - Implement `IMinimalApiStrategy` in the API project.
-- Register strategies through `AddMinimalApiStrategies()` (assembly scanning).
+- Register strategies through `AddMinimalApiStrategies()` (assembly scanning via `TryAddEnumerable` for idempotent registration).
 - Strategies are applied in `Program.cs` via `MapMinimalApiStrategies(...)`.
 
 This keeps `Program.cs` focused on composition and makes new endpoint groups plug-in friendly.
 
+### View preference persistence
+
+The `ViewPreferenceService` (in `src/UI/Services/`) stores the user's chosen view mode (card or table) in the browser's `localStorage` under the key `"view-preference"`. It is registered as a scoped service in `Program.cs` (UI) and injected into the `Home` page component.
+
+### Device monitoring configuration
+
+The `DeviceMonitoringService` (in `src/API/Services/`) runs as a background `IHostedService` that automatically pings devices to track their online/offline status. Configuration is managed through the IOptions pattern in `appsettings.json`:
+
+```json
+"DeviceMonitoring": {
+  "Enabled": true,
+  "IntervalSeconds": 30,
+  "TimeoutMilliseconds": 2000
+}
+```
+
+- **Enabled**: Toggle device monitoring on/off
+- **IntervalSeconds**: How often to ping devices (minimum 5 seconds)
+- **TimeoutMilliseconds**: Ping timeout threshold (minimum 100ms)
+
+Status changes are broadcast to connected clients via SignalR's `DeviceStatusHub`, enabling real-time UI updates without polling.
+
 See **[CONTRIBUTING.md](CONTRIBUTING.md)** for prerequisites, project structure, and development guidelines.
 
 ## 🤝 Contributing