re add mileograph tags

.gitea/workflows/release.yml

@@ -10,7 +10,7 @@ env:
   JAVA_VERSION: "17"
   ANDROID_SDK_ROOT: "${{ github.workspace }}/android-sdk"
   FLUTTER_VERSION: "3.38.5"
-  BUILD_WINDOWS: "false" # set to "true" when you actually want Windows builds
+  BUILD_WINDOWS: "false" # Windows build disabled (no runner available)
   GITEA_BASE_URL: https://git.tgj.services
 
 jobs:
@@ -20,6 +20,7 @@ jobs:
     outputs:
       base_version: ${{ steps.meta.outputs.base }}
       release_tag: ${{ steps.meta.outputs.release_tag }}
+      dev_suffix: ${{ steps.meta.outputs.dev_suffix }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -29,12 +30,24 @@ jobs:
         run: |
           RAW_VERSION=$(awk '/^version:/{print $2}' pubspec.yaml)
           BASE_VERSION=${RAW_VERSION%%+*}
-          TAG="v${BASE_VERSION}"
+          VERSION="${BASE_VERSION}"
+          TAG="v${VERSION}"
+          DEV_SUFFIX=""
+
           if [ "${GITHUB_REF}" = "refs/heads/dev" ]; then
-            TAG="v${BASE_VERSION}-dev"
+            DEV_ITER="${GITHUB_RUN_NUMBER:-}"
+            if [ -z "$DEV_ITER" ]; then
+              DEV_ITER=$(git rev-list --count HEAD)
+            fi
+
+            DEV_SUFFIX="-dev.${DEV_ITER}"
+            VERSION="${BASE_VERSION}${DEV_SUFFIX}"
+            TAG="v${VERSION}"
           fi
+
           echo "base=${BASE_VERSION}" >> "$GITHUB_OUTPUT"
           echo "release_tag=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "dev_suffix=${DEV_SUFFIX}" >> "$GITHUB_OUTPUT"
 
       - name: Fail if release already exists
         env:
@@ -110,6 +123,8 @@ jobs:
         run: |
           set -euo pipefail
           FLUTTER_HOME="$HOME/flutter"
+          # Avoid git ownership issues when Flutter checks out deps.
+          git config --global --add safe.directory "$FLUTTER_HOME" || true
           if [ ! -x "$FLUTTER_HOME/bin/flutter" ]; then
             rm -rf "$FLUTTER_HOME"
             curl -fsSL -o /tmp/flutter.tar.xz "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz"
@@ -207,6 +222,8 @@ jobs:
         run: |
           set -euo pipefail
           FLUTTER_HOME="$HOME/flutter"
+          # Avoid git ownership issues when Flutter checks out deps.
+          git config --global --add safe.directory "$FLUTTER_HOME" || true
           if [ ! -x "$FLUTTER_HOME/bin/flutter" ]; then
             rm -rf "$FLUTTER_HOME"
             curl -fsSL -o /tmp/flutter.tar.xz "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz"
@@ -268,11 +285,19 @@ jobs:
         run: |
           BASE="${{ needs.meta.outputs.base_version }}"
           TAG="${{ needs.meta.outputs.release_tag }}"
+          DEV_SUFFIX="${{ needs.meta.outputs.dev_suffix }}"
+          if [ -z "$DEV_SUFFIX" ]; then
+            echo "dev_suffix is empty; expected '-dev.<n>'"
+            exit 1
+          fi
 
-          mv "artifacts/mileograph-${BASE}.apk" "artifacts/mileograph-${BASE}-dev.apk"
+          VERSION="${BASE}${DEV_SUFFIX}"
+          APK_NAME="mileograph-${VERSION}.apk"
+
+          mv "artifacts/mileograph-${BASE}.apk" "artifacts/${APK_NAME}"
 
           echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
-          echo "apk=artifacts/mileograph-${BASE}-dev.apk" >> "$GITHUB_OUTPUT"
+          echo "apk=artifacts/${APK_NAME}" >> "$GITHUB_OUTPUT"
 
       - name: Create prerelease on Gitea
         if: ${{ github.ref == 'refs/heads/dev' }}

.vscode/settings.json

@@ -1 +1,3 @@
-{}
+{
+  "cmake.ignoreCMakeListsMissing": true
+}

lib/app.dart

@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/services/api_service.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
+import 'package:mileograph_flutter/services/endpoint_service.dart';
 import 'package:mileograph_flutter/ui/app_shell.dart';
 import 'package:provider/provider.dart';
 
@@ -12,14 +14,30 @@ class App extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiProvider(
       providers: [
-        Provider<ApiService>(
+        ChangeNotifierProvider<EndpointService>(
-          create: (_) => ApiService(baseUrl: 'https://mileograph.co.uk/api/v1'),
+          create: (_) => EndpointService(),
+        ),
+        ChangeNotifierProvider<DistanceUnitService>(
+          create: (_) => DistanceUnitService(),
+        ),
+        ProxyProvider<EndpointService, ApiService>(
+          update: (_, endpoint, api) {
+            final service = api ?? ApiService(baseUrl: endpoint.baseUrl);
+            service.setBaseUrl(endpoint.baseUrl);
+            return service;
+          },
+          create: (_) => ApiService(baseUrl: EndpointService.defaultBaseUrl),
         ),
         ChangeNotifierProvider<AuthService>(
           create: (context) => AuthService(api: context.read<ApiService>()),
         ),
-        ChangeNotifierProvider<DataService>(
+        ChangeNotifierProxyProvider<AuthService, DataService>(
           create: (context) => DataService(api: context.read<ApiService>()),
+          update: (context, auth, data) {
+            data ??= DataService(api: context.read<ApiService>());
+            data.handleAuthChanged(auth.userId);
+            return data;
+          },
         ),
       ],
       child: const MyApp(),

lib/components/calculator/calculator.dart

@@ -133,6 +133,11 @@ class RouteCalculator extends StatefulWidget {
 
 class _RouteCalculatorState extends State<RouteCalculator> {
   List<Station> allStations = [];
+  List<String> _networks = [];
+  List<String> _countries = [];
+  List<String> _selectedNetworks = [];
+  List<String> _selectedCountries = [];
+  bool _loadingStations = false;
 
   RouteResult? _routeResult;
   RouteResult? get result => _routeResult;
@@ -150,14 +155,31 @@ class _RouteCalculatorState extends State<RouteCalculator> {
       }
       WidgetsBinding.instance.addPostFrameCallback((_) async {
         final data = context.read<DataService>();
-        final result = await data.fetchStations();
+        await data.fetchStationFilters();
-        if (mounted) {
+        if (!mounted) return;
-          setState(() => allStations = result);
+        setState(() {
-        }
+          _networks = data.stationNetworks;
+          _countries = data.stationCountryNetworks.keys.toList();
+        });
+        await _loadStations();
       });
     }
   }
 
+  Future<void> _loadStations() async {
+    setState(() => _loadingStations = true);
+    final data = context.read<DataService>();
+    final stations = await data.fetchStations(
+      countries: _selectedCountries,
+      networks: _selectedNetworks,
+    );
+    if (!mounted) return;
+    setState(() {
+      allStations = stations;
+      _loadingStations = false;
+    });
+  }
+
   Future<void> _calculateRoute(List<String> stations) async {
     setState(() {
       _errorMessage = null;
@@ -215,6 +237,43 @@ class _RouteCalculatorState extends State<RouteCalculator> {
     final data = context.watch<DataService>();
     return Column(
       children: [
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
+          child: Wrap(
+            spacing: 12,
+            runSpacing: 12,
+            crossAxisAlignment: WrapCrossAlignment.center,
+            children: [
+              _MultiSelectFilter(
+                label: 'Countries',
+                options: _countries,
+                selected: _selectedCountries,
+                onChanged: (vals) {
+                  setState(() => _selectedCountries = vals);
+                  _loadStations();
+                },
+              ),
+              _MultiSelectFilter(
+                label: 'Networks',
+                options: _networks,
+                selected: _selectedNetworks,
+                onChanged: (vals) {
+                  setState(() => _selectedNetworks = vals);
+                  _loadStations();
+                },
+              ),
+              if (_loadingStations)
+                const Padding(
+                  padding: EdgeInsets.only(left: 8.0),
+                  child: SizedBox(
+                    height: 20,
+                    width: 20,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  ),
+                ),
+            ],
+          ),
+        ),
         Expanded(
           child: ReorderableListView(
             buildDefaultDragHandles: false,
@@ -300,32 +359,27 @@ class _RouteCalculatorState extends State<RouteCalculator> {
         else
           SizedBox.shrink(),
         const SizedBox(height: 10),
-        LayoutBuilder(
+        Padding(
-          builder: (context, constraints) {
+          padding: const EdgeInsets.symmetric(horizontal: 16.0),
-            double screenWidth = constraints.maxWidth;
+          child: Wrap(
-
+            alignment: WrapAlignment.center,
-            return Padding(
+            spacing: 12,
-              padding: EdgeInsets.only(right: screenWidth < 450 ? 70 : 0),
+            runSpacing: 8,
-              child: Row(
+            children: [
-                mainAxisAlignment: MainAxisAlignment.center,
+              ElevatedButton.icon(
-                children: [
+                icon: const Icon(Icons.add),
-                  ElevatedButton.icon(
+                label: const Text('Add Station'),
-                    icon: const Icon(Icons.add),
+                onPressed: _addStation,
-                    label: const Text('Add Station'),
-                    onPressed: _addStation,
-                  ),
-                  const SizedBox(width: 16),
-                  ElevatedButton.icon(
-                    icon: const Icon(Icons.route),
-                    label: const Text('Calculate Route'),
-                    onPressed: () async {
-                      await _calculateRoute(data.stations);
-                    },
-                  ),
-                ],
               ),
-            );
+              ElevatedButton.icon(
-          },
+                icon: const Icon(Icons.route),
+                label: const Text('Calculate Route'),
+                onPressed: () async {
+                  await _calculateRoute(data.stations);
+                },
+              ),
+            ],
+          ),
         ),
 
         const SizedBox(height: 16),
@@ -350,3 +404,159 @@ Widget debugPanel(List<String> stations) {
     ),
   );
 }
+
+class _MultiSelectFilter extends StatefulWidget {
+  const _MultiSelectFilter({
+    required this.label,
+    required this.options,
+    required this.selected,
+    required this.onChanged,
+  });
+
+  final String label;
+  final List<String> options;
+  final List<String> selected;
+  final ValueChanged<List<String>> onChanged;
+
+  @override
+  State<_MultiSelectFilter> createState() => _MultiSelectFilterState();
+}
+
+class _MultiSelectFilterState extends State<_MultiSelectFilter> {
+  late List<String> _tempSelected;
+  String _query = '';
+
+  @override
+  void initState() {
+    super.initState();
+    _tempSelected = List.from(widget.selected);
+  }
+
+  @override
+  void didUpdateWidget(covariant _MultiSelectFilter oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.selected != widget.selected) {
+      _tempSelected = List.from(widget.selected);
+    }
+  }
+
+  void _openPicker() async {
+    _tempSelected = List.from(widget.selected);
+    _query = '';
+    await showModalBottomSheet<void>(
+      context: context,
+      isScrollControlled: true,
+      builder: (ctx) {
+        return StatefulBuilder(
+          builder: (ctx, setModalState) {
+            final filtered = widget.options
+                .where((opt) =>
+                    _query.isEmpty || opt.toLowerCase().contains(_query.toLowerCase()))
+                .toList();
+            return SafeArea(
+              child: Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        Text(
+                          'Select ${widget.label.toLowerCase()}',
+                          style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                                fontWeight: FontWeight.w700,
+                              ),
+                        ),
+                        const Spacer(),
+                        TextButton(
+                          onPressed: () {
+                            setModalState(() {
+                              _tempSelected.clear();
+                            });
+                            Navigator.of(ctx).pop();
+                            widget.onChanged(const []);
+                          },
+                          child: const Text('Clear'),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    TextField(
+                      decoration: const InputDecoration(
+                        labelText: 'Search',
+                        border: OutlineInputBorder(),
+                      ),
+                      onChanged: (val) {
+                        setModalState(() {
+                          _query = val;
+                        });
+                      },
+                    ),
+                    const SizedBox(height: 12),
+                    SizedBox(
+                      height: 320,
+                      child: ListView.builder(
+                        itemCount: filtered.length,
+                        itemBuilder: (_, index) {
+                          final option = filtered[index];
+                          final selected = _tempSelected.contains(option);
+                          return CheckboxListTile(
+                            value: selected,
+                            title: Text(option),
+                            onChanged: (val) {
+                              setModalState(() {
+                                if (val == true) {
+                                  if (!_tempSelected.contains(option)) {
+                                    _tempSelected.add(option);
+                                  }
+                                } else {
+                                  _tempSelected.removeWhere((e) => e == option);
+                                }
+                              });
+                              widget.onChanged(List.from(_tempSelected.toSet()));
+                            },
+                          );
+                        },
+                      ),
+                    ),
+                    const SizedBox(height: 12),
+                    Align(
+                      alignment: Alignment.centerRight,
+                      child: FilledButton.icon(
+                        onPressed: () {
+                          widget.onChanged(List.from(_tempSelected.toSet()));
+                          Navigator.of(ctx).pop();
+                        },
+                        icon: const Icon(Icons.check),
+                        label: const Text('Apply'),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final hasSelection = widget.selected.isNotEmpty;
+    final display =
+        hasSelection ? widget.selected.join(', ') : 'Any ${widget.label.toLowerCase()}';
+    return OutlinedButton.icon(
+      onPressed: _openPicker,
+      icon: const Icon(Icons.filter_alt),
+      label: SizedBox(
+        width: 180,
+        child: Text(
+          '${widget.label}: $display',
+          overflow: TextOverflow.ellipsis,
+        ),
+      ),
+    );
+  }
+}

lib/components/calculator/route_summary_widget.dart

@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
+import 'package:provider/provider.dart';
 
 class RouteSummaryWidget extends StatelessWidget {
   final double distance;
@@ -12,13 +14,14 @@ class RouteSummaryWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final distanceUnits = context.watch<DistanceUnitService>();
     return Padding(
       padding: const EdgeInsets.all(16),
       child: Row(
         children: [
           Expanded(
             child: Text(
-              "Total Distance: ${distance.toStringAsFixed(2)} mi",
+              "Total Distance: ${distanceUnits.format(distance, decimals: 2)}",
               style: Theme.of(context).textTheme.titleMedium,
             ),
           ),
@@ -36,16 +39,21 @@ class RouteDetailsView extends StatelessWidget {
   final List<String> route;
   final List<double> costs;
   final VoidCallback onBack;
+  final Set<String> routingPoints;
 
   const RouteDetailsView({
     super.key,
     required this.route,
     required this.costs,
     required this.onBack,
+    this.routingPoints = const {},
   });
 
   @override
   Widget build(BuildContext context) {
+    final distanceUnits = context.watch<DistanceUnitService>();
+    final highlightColor = Theme.of(context).colorScheme.primary;
+    final mutedColor = Theme.of(context).colorScheme.outlineVariant;
     return Column(
       children: [
         Align(
@@ -60,9 +68,23 @@ class RouteDetailsView extends StatelessWidget {
           child: ListView.builder(
             itemCount: route.length,
             itemBuilder: (context, index) {
+              final label = route[index];
+              final isRoutingPoint = routingPoints.contains(label);
               return ListTile(
-                title: Text(route[index]),
+                leading: Icon(
-                trailing: Text("${costs[index].toStringAsFixed(2)} mi"),
+                  Icons.circle,
+                  size: 12,
+                  color: isRoutingPoint ? highlightColor : mutedColor,
+                ),
+                title: Text(
+                  label,
+                  style: isRoutingPoint
+                      ? TextStyle(color: highlightColor, fontWeight: FontWeight.w600)
+                      : null,
+                ),
+                trailing: Text(
+                  distanceUnits.format(costs[index], decimals: 2),
+                ),
               );
             },
           ),

lib/components/dashboard/latest_loco_changes_panel.dart

@@ -0,0 +1,498 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:provider/provider.dart';
+
+class LatestLocoChangesPanel extends StatefulWidget {
+  const LatestLocoChangesPanel({super.key, this.expanded = false});
+
+  final bool expanded;
+
+  @override
+  State<LatestLocoChangesPanel> createState() => _LatestLocoChangesPanelState();
+}
+
+class _LatestLocoChangesPanelState extends State<LatestLocoChangesPanel> {
+  late final ScrollController _controller;
+  final Set<String> _collapsedDates = {};
+  final Set<String> _collapsedClasses = {};
+  final Set<String> _collapsedLocos = {};
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = ScrollController();
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final data = context.watch<DataService>();
+    final changes = data.latestLocoChanges;
+    final isLoading = data.isLatestLocoChangesLoading;
+    final textTheme = Theme.of(context).textTheme;
+
+    return Card(
+      clipBehavior: Clip.antiAlias,
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              Row(
+                children: [
+                const Icon(Icons.bolt, size: 20),
+                const SizedBox(width: 8),
+                Expanded(
+                  child: Text(
+                    'Latest Loco Changes',
+                    style: textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.w800,
+                    ),
+                  ),
+                ),
+                if (isLoading && changes.isNotEmpty)
+                  const SizedBox(
+                    width: 18,
+                    height: 18,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  ),
+              ],
+            ),
+            const SizedBox(height: 8),
+            if (isLoading && changes.isEmpty)
+              const Padding(
+                padding: EdgeInsets.all(12.0),
+                child: Center(child: CircularProgressIndicator()),
+              )
+            else if (changes.isEmpty)
+              Padding(
+                padding: const EdgeInsets.symmetric(vertical: 8.0),
+                child: Text(
+                  'No recent loco changes yet.',
+                  style: textTheme.bodyMedium,
+                ),
+              )
+            else
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  _buildChangesList(changes, textTheme),
+                  const SizedBox(height: 8),
+                  Align(
+                    alignment: Alignment.centerLeft,
+                    child: OutlinedButton.icon(
+                      onPressed: isLoading ? null : _loadMore,
+                      icon: isLoading
+                          ? const SizedBox(
+                              height: 14,
+                              width: 14,
+                              child: CircularProgressIndicator(strokeWidth: 2),
+                            )
+                          : const Icon(Icons.expand_more),
+                      label: Text(isLoading ? 'Loading...' : 'Show more'),
+                    ),
+                  ),
+                ],
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildChangesList(List<LocoChange> changes, TextTheme textTheme) {
+    final grouped = _groupChanges(changes);
+    // Start with all locos collapsed by default.
+    if (_collapsedLocos.isEmpty) {
+      for (final group in grouped) {
+        for (final classGroup in group.classGroups) {
+          for (final locoGroup in classGroup.locoGroups) {
+            _collapsedLocos.add(
+              _locoKey(group.dateLabel, classGroup.classLabel, locoGroup.locoLabel),
+            );
+          }
+        }
+      }
+    }
+
+    final listView = ListView.separated(
+      controller: null,
+      shrinkWrap: true,
+      physics: const NeverScrollableScrollPhysics(),
+      itemBuilder: (context, groupIndex) {
+        final group = grouped[groupIndex];
+        final dateCollapsed = _collapsedDates.contains(group.dateLabel);
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 6.0),
+              child: Row(
+                children: [
+                  IconButton(
+                    iconSize: 18,
+                    padding: EdgeInsets.zero,
+                    constraints: const BoxConstraints(),
+                    onPressed: () => _toggleDate(group.dateLabel),
+                    icon: Icon(
+                      dateCollapsed ? Icons.chevron_right : Icons.expand_more,
+                    ),
+                  ),
+                  const SizedBox(width: 6),
+                  Expanded(
+                    child: Text(
+                      group.dateLabel,
+                      style: textTheme.labelLarge?.copyWith(
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                  ),
+                  TextButton(
+                    onPressed: () => _collapseDateChildren(
+                      group.dateLabel,
+                      group.classGroups,
+                      collapse: !_isDateFullyCollapsed(group),
+                    ),
+                    child: Text(
+                      _isDateFullyCollapsed(group) ? 'Expand all' : 'Collapse all',
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            if (!dateCollapsed)
+              ...group.classGroups.map(
+                (classGroup) {
+                  final classKey = _classKey(group.dateLabel, classGroup.classLabel);
+                  final classCollapsed = _collapsedClasses.contains(classKey);
+                  return Padding(
+                    padding: const EdgeInsets.only(bottom: 8.0, left: 12.0),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Row(
+                          children: [
+                            IconButton(
+                              iconSize: 18,
+                              padding: EdgeInsets.zero,
+                              constraints: const BoxConstraints(),
+                              onPressed: () => _toggleClass(classKey),
+                              icon: Icon(
+                                classCollapsed
+                                    ? Icons.chevron_right
+                                    : Icons.expand_more,
+                              ),
+                            ),
+                            const SizedBox(width: 4),
+                            Expanded(
+                              child: Text(
+                                classGroup.classLabel,
+                                style: textTheme.titleSmall?.copyWith(
+                                  fontWeight: FontWeight.w700,
+                                ),
+                              ),
+                            ),
+                            TextButton(
+                              onPressed: () => _collapseClassChildren(
+                                group.dateLabel,
+                                classGroup.classLabel,
+                                classGroup.locoGroups,
+                                collapse:
+                                    !_isClassFullyCollapsed(classKey, classGroup, group.dateLabel),
+                              ),
+                              child: Text(
+                                _isClassFullyCollapsed(classKey, classGroup, group.dateLabel)
+                                    ? 'Expand all'
+                                    : 'Collapse all',
+                              ),
+                            ),
+                          ],
+                        ),
+                        if (!classCollapsed)
+                          ...classGroup.locoGroups.map(
+                            (locoGroup) {
+                              final locoKey =
+                                  _locoKey(group.dateLabel, classGroup.classLabel, locoGroup.locoLabel);
+                              final locoCollapsed = _collapsedLocos.contains(locoKey);
+                              return Padding(
+                                padding:
+                                    const EdgeInsets.only(bottom: 4.0, left: 22.0),
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    Row(
+                                      children: [
+                                        IconButton(
+                                          iconSize: 18,
+                                          padding: EdgeInsets.zero,
+                                          constraints: const BoxConstraints(),
+                                          onPressed: () => _toggleLoco(locoKey),
+                                          icon: Icon(
+                                            locoCollapsed
+                                                ? Icons.chevron_right
+                                                : Icons.expand_more,
+                                          ),
+                                        ),
+                                        const SizedBox(width: 4),
+                                        Text(
+                                          locoGroup.locoLabel,
+                                          style: textTheme.bodyMedium?.copyWith(
+                                            fontWeight: FontWeight.w700,
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                    if (!locoCollapsed) ...[
+                                      const SizedBox(height: 2),
+                                      ...locoGroup.changes.map(
+                                        (change) => ListTile(
+                                          dense: true,
+                                          visualDensity: const VisualDensity(
+                                            horizontal: 0,
+                                            vertical: -3,
+                                          ),
+                                          minVerticalPadding: 0,
+                                          contentPadding: EdgeInsets.zero,
+                                          title: Text(
+                                            '${change.changeLabel}: ${change.valueLabel}',
+                                            style: textTheme.bodyMedium,
+                                          ),
+                                          trailing: change.approvedBy.isEmpty
+                                              ? null
+                                              : Text(
+                                                  change.approvedBy,
+                                                  style: textTheme.labelSmall,
+                                                ),
+                                        ),
+                                      ),
+                                    ],
+                                  ],
+                                ),
+                              );
+                            },
+                          ),
+                      ],
+                    ),
+                  );
+                },
+              ),
+          ],
+        );
+      },
+      separatorBuilder: (_, index) => const Divider(height: 8),
+      itemCount: grouped.length,
+    );
+
+    if (widget.expanded) {
+      return listView;
+    }
+
+    return listView;
+  }
+
+  void _toggleDate(String date) {
+    setState(() {
+      if (_collapsedDates.contains(date)) {
+        _collapsedDates.remove(date);
+      } else {
+        _collapsedDates.add(date);
+      }
+    });
+  }
+
+  void _toggleClass(String key) {
+    setState(() {
+      if (_collapsedClasses.contains(key)) {
+        _collapsedClasses.remove(key);
+      } else {
+        _collapsedClasses.add(key);
+      }
+    });
+  }
+
+  void _toggleLoco(String key) {
+    setState(() {
+      if (_collapsedLocos.contains(key)) {
+        _collapsedLocos.remove(key);
+      } else {
+        _collapsedLocos.add(key);
+      }
+    });
+  }
+
+  void _collapseDateChildren(
+    String date,
+    List<_ClassGroup> classGroups, {
+    required bool collapse,
+  }) {
+    setState(() {
+      for (final classGroup in classGroups) {
+        final classKey = _classKey(date, classGroup.classLabel);
+        if (collapse) {
+          _collapsedClasses.add(classKey);
+        } else {
+          _collapsedClasses.remove(classKey);
+        }
+        for (final locoGroup in classGroup.locoGroups) {
+          final locoKey = _locoKey(date, classGroup.classLabel, locoGroup.locoLabel);
+          if (collapse) {
+            _collapsedLocos.add(locoKey);
+          } else {
+            _collapsedLocos.remove(locoKey);
+          }
+        }
+      }
+    });
+  }
+
+  void _collapseClassChildren(
+    String date,
+    String classLabel,
+    List<_LocoGroup> locos, {
+    required bool collapse,
+  }) {
+    setState(() {
+      final classKey = _classKey(date, classLabel);
+      if (collapse) {
+        _collapsedClasses.add(classKey);
+      } else {
+        _collapsedClasses.remove(classKey);
+      }
+      for (final locoGroup in locos) {
+        final locoKey = _locoKey(date, classLabel, locoGroup.locoLabel);
+        if (collapse) {
+          _collapsedLocos.add(locoKey);
+        } else {
+          _collapsedLocos.remove(locoKey);
+        }
+      }
+    });
+  }
+
+  bool _isDateFullyCollapsed(_ChangeGroup group) {
+    for (final classGroup in group.classGroups) {
+      final classKey = _classKey(group.dateLabel, classGroup.classLabel);
+      if (!_collapsedClasses.contains(classKey)) return false;
+      for (final loco in classGroup.locoGroups) {
+        final locoKey = _locoKey(group.dateLabel, classGroup.classLabel, loco.locoLabel);
+        if (!_collapsedLocos.contains(locoKey)) return false;
+      }
+    }
+    return true;
+  }
+
+  bool _isClassFullyCollapsed(String classKey, _ClassGroup classGroup, String date) {
+    if (!_collapsedClasses.contains(classKey)) return false;
+    for (final loco in classGroup.locoGroups) {
+      final locoKey = _locoKey(date, classGroup.classLabel, loco.locoLabel);
+      if (!_collapsedLocos.contains(locoKey)) return false;
+    }
+    return true;
+  }
+
+  String _classKey(String date, String classLabel) => '$date|$classLabel';
+  String _locoKey(String date, String classLabel, String locoLabel) =>
+      '$date|$classLabel|$locoLabel';
+
+  List<_ChangeGroup> _groupChanges(List<LocoChange> changes) {
+    final dateFormat = DateFormat('yyyy-MM-dd');
+    final Map<String, Map<String, Map<String, List<LocoChange>>>> grouped = {};
+
+    final filtered = changes.where((change) {
+      final code = change.attrCode.toLowerCase();
+      return code != 'build_prec' && code != 'operational' && code != 'gettable';
+    });
+
+    for (final change in filtered) {
+      final date = change.approvedAt ?? change.validFrom;
+      final dateKey = date != null ? dateFormat.format(date) : 'Unknown date';
+      final classKey = change.locoClass.isNotEmpty
+          ? change.locoClass
+          : 'Unknown class';
+      final locoKey = _locoLabel(change);
+      grouped.putIfAbsent(dateKey, () => {});
+      grouped[dateKey]!.putIfAbsent(classKey, () => {});
+      grouped[dateKey]![classKey]!.putIfAbsent(locoKey, () => []);
+      grouped[dateKey]![classKey]![locoKey]!.add(change);
+    }
+
+    final sortedDates = grouped.keys.toList()
+      ..sort((a, b) {
+        if (a == 'Unknown date') return 1;
+        if (b == 'Unknown date') return -1;
+        return b.compareTo(a); // newest first
+      });
+
+    return sortedDates
+        .map(
+          (dateKey) => _ChangeGroup(
+            dateLabel: dateKey,
+            classGroups: grouped[dateKey]!.entries
+                .map(
+                  (classEntry) => _ClassGroup(
+                    classLabel: classEntry.key,
+                    locoGroups: classEntry.value.entries
+                        .map(
+                          (locoEntry) => _LocoGroup(
+                            locoLabel: locoEntry.key,
+                            changes: locoEntry.value
+                              ..sort(
+                                (a, b) => (b.approvedAt ?? b.validFrom ?? DateTime(0))
+                                    .compareTo(a.approvedAt ?? a.validFrom ?? DateTime(0)),
+                              ),
+                          ),
+                        )
+                        .toList(),
+                  ),
+                )
+                .toList(),
+          ),
+        )
+        .toList();
+  }
+
+  Future<void> _loadMore() async {
+    final data = context.read<DataService>();
+    await data.fetchLatestLocoChanges(
+      offset: data.latestLocoChanges.length,
+      append: true,
+    );
+  }
+}
+
+class _ChangeGroup {
+  final String dateLabel;
+  final List<_ClassGroup> classGroups;
+
+  _ChangeGroup({required this.dateLabel, required this.classGroups});
+}
+
+class _LocoGroup {
+  final String locoLabel;
+  final List<LocoChange> changes;
+
+  _LocoGroup({required this.locoLabel, required this.changes});
+}
+
+class _ClassGroup {
+  final String classLabel;
+  final List<_LocoGroup> locoGroups;
+
+  _ClassGroup({required this.classLabel, required this.locoGroups});
+}
+
+String _locoLabel(LocoChange change) {
+  final number = change.locoNumber.trim();
+  final name = change.locoName.trim();
+  if (number.isNotEmpty && name.isNotEmpty) return '$number — $name';
+  if (number.isNotEmpty) return number;
+  if (name.isNotEmpty) return name;
+  return 'Loco ${change.locoId}';
+}

lib/components/dashboard/leaderboard_panel.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 
 import 'package:provider/provider.dart';
 
@@ -9,71 +10,92 @@ class LeaderboardPanel extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
+    final distanceUnits = context.watch<DistanceUnitService>();
     final leaderboard = data.homepageStats?.leaderboard ?? [];
+    final textTheme = Theme.of(context).textTheme;
     if (data.isHomepageLoading && leaderboard.isEmpty) {
       return const Padding(
         padding: EdgeInsets.all(16.0),
         child: Center(child: CircularProgressIndicator()),
       );
     }
-    return Padding(
+    return Card(
-      padding: const EdgeInsets.all(10.0),
+      clipBehavior: Clip.antiAlias,
-      child: Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
         child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-            Text(
+            Row(
-              "Leaderboard",
+              children: [
-              style: TextStyle(
+                const Icon(Icons.emoji_events, size: 20),
-                fontSize: 24,
+                const SizedBox(width: 8),
-                fontWeight: FontWeight.bold,
+                Expanded(
-                decoration: TextDecoration.underline,
+                  child: Text(
-              ),
+                    "Leaderboard",
+                    style: textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.w800,
+                    ),
+                  ),
+                ),
+                if (leaderboard.isNotEmpty)
+                  Container(
+                    padding:
+                        const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                    decoration: BoxDecoration(
+                      color: Theme.of(context).colorScheme.surfaceContainerHighest,
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                    child: Text(
+                      'Top ${leaderboard.length}',
+                      style: textTheme.labelSmall,
+                    ),
+                  ),
+              ],
             ),
+            const SizedBox(height: 8),
             if (leaderboard.isEmpty)
               const Padding(
-                padding: EdgeInsets.all(16.0),
+                padding: EdgeInsets.all(8.0),
                 child: Text('No leaderboard data yet'),
               )
             else
               Column(
-                children: List.generate(
+                children: [
-                  leaderboard.length,
+                  for (int index = 0; index < leaderboard.length; index++) ...[
-                  (index) {
+                    ListTile(
-                    final leaderboardEntry = leaderboard[index];
+                      contentPadding: EdgeInsets.zero,
-                    return Container(
+                      dense: true,
-                      width: double.infinity,
+                      leading: CircleAvatar(
-                      margin: const EdgeInsets.symmetric(
+                        radius: 18,
-                          horizontal: 0, vertical: 8),
+                        backgroundColor:
-                      child: Padding(
+                            Theme.of(context).colorScheme.secondaryContainer,
-                        padding: const EdgeInsets.all(8),
+                        child: Text(
-                        child: Row(
+                          '${index + 1}',
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          style: textTheme.labelLarge?.copyWith(
-                          children: [
+                            fontWeight: FontWeight.w800,
-                            Text.rich(
+                          ),
-                              TextSpan(
-                                children: [
-                                  TextSpan(
-                                    text: '${index + 1}. ',
-                                    style: const TextStyle(
-                                      fontWeight: FontWeight.bold,
-                                    ),
-                                  ),
-                                  TextSpan(
-                                    text: leaderboardEntry.userFullName,
-                                  ),
-                                ],
-                              ),
-                            ),
-                            Text(
-                              '${leaderboardEntry.mileage.toStringAsFixed(1)} mi',
-                            ),
-                          ],
                         ),
                       ),
-                    );
+                      title: Text(
-                  },
+                        leaderboard[index].userFullName,
-                ),
+                        style: textTheme.titleSmall?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                      trailing: Text(
+                        distanceUnits.format(
+                          leaderboard[index].mileage,
+                          decimals: 1,
+                        ),
+                        style: textTheme.labelLarge?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                    ),
+                    if (index != leaderboard.length - 1) const Divider(height: 12),
+                  ],
+                ],
               ),
           ],
         ),

lib/components/dashboard/top_traction_panel.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
-
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';
 
 class TopTractionPanel extends StatelessWidget {
@@ -9,81 +9,88 @@ class TopTractionPanel extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
+    final distanceUnits = context.watch<DistanceUnitService>();
     final stats = data.homepageStats;
     final locos = stats?.topLocos ?? [];
+    final textTheme = Theme.of(context).textTheme;
     if (data.isHomepageLoading && locos.isEmpty) {
       return const Padding(
         padding: EdgeInsets.all(16.0),
         child: Center(child: CircularProgressIndicator()),
       );
     }
-    return Padding(
+    return Card(
-      padding: const EdgeInsets.all(10.0),
+      clipBehavior: Clip.antiAlias,
-      child: Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
         child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-            Text(
+            Row(
-              "Top Traction",
+              children: [
-              style: TextStyle(
+                const Icon(Icons.train, size: 20),
-                fontSize: 24,
+                const SizedBox(width: 8),
-                fontWeight: FontWeight.bold,
+                Expanded(
-                decoration: TextDecoration.underline,
+                  child: Text(
-              ),
+                    "Top traction",
+                    style: textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.w800,
+                    ),
+                  ),
+                ),
+              ],
             ),
+            const SizedBox(height: 8),
             if (locos.isEmpty)
               const Padding(
-                padding: EdgeInsets.all(16.0),
+                padding: EdgeInsets.all(8.0),
                 child: Text('No traction data yet'),
               )
             else
               Column(
-                children: List.generate(
+                children: [
-                  locos.length,
+                  for (int index = 0; index < locos.length; index++) ...[
-                  (index) {
+                    ListTile(
-                    final loco = locos[index];
+                      contentPadding: EdgeInsets.zero,
-                    return Container(
+                      dense: true,
-                      width: double.infinity,
+                      leading: CircleAvatar(
-                      margin:
+                        radius: 18,
-                          const EdgeInsets.symmetric(horizontal: 0, vertical: 8),
+                        backgroundColor:
-                      child: Padding(
+                            Theme.of(context).colorScheme.primaryContainer,
-                        padding: const EdgeInsets.all(8),
+                        child: Text(
-                        child: Row(
+                          '${index + 1}',
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          style: textTheme.labelLarge?.copyWith(
-                          children: [
+                            fontWeight: FontWeight.w800,
-                            Column(
+                          ),
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Text.rich(
-                                  TextSpan(
-                                    children: [
-                                      TextSpan(
-                                        text: '${index + 1}. ',
-                                        style: const TextStyle(
-                                          fontWeight: FontWeight.bold,
-                                        ),
-                                      ),
-                                      TextSpan(
-                                        text:
-                                            '${loco.locoClass} ${loco.number}',
-                                      ),
-                                    ],
-                                  ),
-                                ),
-                                Text(
-                                  loco.name ?? '',
-                                  style:
-                                      const TextStyle(fontStyle: FontStyle.italic),
-                                ),
-                              ],
-                            ),
-                            Text('${loco.mileage?.toStringAsFixed(1)} mi'),
-                          ],
                         ),
                       ),
-                    );
+                      title: Text(
-                  },
+                        '${locos[index].locoClass} ${locos[index].number}',
-                ),
+                        style: textTheme.titleSmall?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                      subtitle: (locos[index].name ?? '').isEmpty
+                          ? null
+                          : Text(
+                              locos[index].name ?? '',
+                              style: textTheme.bodySmall?.copyWith(
+                                fontStyle: FontStyle.italic,
+                              ),
+                      ),
+                      trailing: Text(
+                        distanceUnits.format(
+                          locos[index].mileage ?? 0,
+                          decimals: 1,
+                        ),
+                        style: textTheme.labelLarge?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                    ),
+                    if (index != locos.length - 1) const Divider(height: 12),
+                  ],
+                ],
               ),
           ],
         ),

lib/components/legs/leg_card.dart

@@ -1,43 +1,178 @@
-import 'dart:convert';
-
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
+import 'package:provider/provider.dart';
 
-class LegCard extends StatelessWidget {
+class LegCard extends StatefulWidget {
   const LegCard({
     super.key,
     required this.leg,
     this.showEditButton = true,
+    this.showDate = true,
   });
 
   final Leg leg;
   final bool showEditButton;
+  final bool showDate;
+
+  @override
+  State<LegCard> createState() => _LegCardState();
+}
+
+class _LegCardState extends State<LegCard> {
+  bool _expanded = false;
 
   @override
   Widget build(BuildContext context) {
+    final leg = widget.leg;
+    final distanceUnits = context.watch<DistanceUnitService>();
     final routeSegments = _parseRouteSegments(leg.route);
     final textTheme = Theme.of(context).textTheme;
     return Card(
       child: ExpansionTile(
+        onExpansionChanged: (v) => setState(() => _expanded = v),
         tilePadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
         leading: const Icon(Icons.train),
-        title: Text('${leg.start} → ${leg.end}'),
+        title: LayoutBuilder(
-        subtitle: Column(
+          builder: (context, constraints) {
-          crossAxisAlignment: CrossAxisAlignment.start,
+            final isWide = constraints.maxWidth > 520;
-          children: [
+            final beginTimeWidget = _timeWithDelay(
-            Text(_formatDateTime(leg.beginTime)),
+              context,
-            if (leg.headcode.isNotEmpty)
+              leg.beginTime,
-              Text(
+              leg.beginDelayMinutes,
-                'Headcode: ${leg.headcode}',
+              includeDate: widget.showDate,
-                style: textTheme.labelSmall,
+            );
-              ),
+            final endTimeWidget = leg.endTime == null
-            if (leg.network.isNotEmpty)
+                ? null
-              Text(
+                : _timeWithDelay(
-                leg.network,
+                    context,
-                style: textTheme.labelSmall,
+                    leg.endTime!,
-              ),
+                    leg.endDelayMinutes,
-          ],
+                    includeDate: widget.showDate,
+                  );
+
+            final routeText = Text(
+              '${leg.start} → ${leg.end}',
+              softWrap: true,
+            );
+            if (!isWide) {
+              final timeStyle = Theme.of(context).textTheme.labelSmall;
+              return Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  routeText,
+                  const SizedBox(height: 2),
+                  Wrap(
+                    spacing: 6,
+                    runSpacing: 4,
+                    crossAxisAlignment: WrapCrossAlignment.center,
+                    children: [
+                      _timeWithDelay(
+                        context,
+                        leg.beginTime,
+                        leg.beginDelayMinutes,
+                        includeDate: widget.showDate,
+                        style: timeStyle,
+                      ),
+                      if (endTimeWidget != null) ...[
+                        const Text('·'),
+                        _timeWithDelay(
+                          context,
+                          leg.endTime!,
+                          leg.endDelayMinutes,
+                          includeDate: widget.showDate,
+                          style: timeStyle,
+                        ),
+                      ],
+                    ],
+                  ),
+                ],
+              );
+            }
+
+            return Wrap(
+              spacing: 6,
+              runSpacing: 4,
+              crossAxisAlignment: WrapCrossAlignment.center,
+              children: [
+                beginTimeWidget,
+                const Text('·'),
+                routeText,
+                if (endTimeWidget != null) ...[
+                  const Text('·'),
+                  endTimeWidget,
+                ],
+              ],
+            );
+          },
+        ),
+        subtitle: LayoutBuilder(
+          builder: (context, constraints) {
+            final isWide = constraints.maxWidth > 520;
+            final timeWidget = _timeWithDelay(
+              context,
+              leg.beginTime,
+              leg.beginDelayMinutes,
+              includeDate: widget.showDate,
+            );
+            final tractionWrap = !_expanded && leg.locos.isNotEmpty
+                ? Wrap(
+                    spacing: 8,
+                    runSpacing: 4,
+                    children: leg.locos.map((loco) {
+                      final iconColor = loco.powering
+                          ? Theme.of(context).colorScheme.primary
+                          : Theme.of(context).hintColor;
+                      final label = '${loco.locoClass} ${loco.number}'.trim();
+                      return Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Icon(Icons.train, size: 14, color: iconColor),
+                          const SizedBox(width: 4),
+                          Text(
+                            label.isEmpty ? 'Loco ${loco.id}' : label,
+                            style: textTheme.labelSmall,
+                          ),
+                        ],
+                      );
+                    }).toList(),
+                  )
+                : null;
+
+            final children = <Widget>[];
+            if (isWide) {
+              if (tractionWrap != null) {
+                children.add(tractionWrap);
+              }
+            } else {
+              if (tractionWrap != null) {
+                children.add(tractionWrap);
+              }
+            }
+            if (leg.headcode.isNotEmpty) {
+              children.add(
+                Text(
+                  'Headcode: ${leg.headcode}',
+                  style: textTheme.labelSmall,
+                ),
+              );
+            }
+            if (leg.network.isNotEmpty) {
+              children.add(
+                Text(
+                  leg.network,
+                  style: textTheme.labelSmall,
+                ),
+              );
+            }
+
+            return Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: children,
+            );
+          },
         ),
         trailing: Row(
           mainAxisSize: MainAxisSize.min,
@@ -48,7 +183,7 @@ class LegCard extends StatelessWidget {
               crossAxisAlignment: CrossAxisAlignment.end,
               children: [
                 Text(
-                  '${leg.mileage.toStringAsFixed(1)} mi',
+                  distanceUnits.format(leg.mileage, decimals: 1),
                   style: textTheme.labelLarge?.copyWith(
                     fontWeight: FontWeight.w700,
                   ),
@@ -64,7 +199,7 @@ class LegCard extends StatelessWidget {
                 ],
               ],
             ),
-            if (showEditButton) ...[
+            if (widget.showEditButton) ...[
               const SizedBox(width: 8),
               IconButton(
                 tooltip: 'Edit entry',
@@ -74,6 +209,18 @@ class LegCard extends StatelessWidget {
                 constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
                 onPressed: () => context.push('/legs/edit/${leg.id}'),
               ),
+              if (_expanded) ...[
+                const SizedBox(width: 4),
+                IconButton(
+                  tooltip: 'Delete entry',
+                  icon: const Icon(Icons.delete_outline),
+                  color: Theme.of(context).colorScheme.error,
+                  visualDensity: VisualDensity.compact,
+                  padding: EdgeInsets.zero,
+                  constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
+                  onPressed: () => _confirmDelete(context, leg.id),
+                ),
+              ],
             ],
           ],
         ),
@@ -99,6 +246,12 @@ class LegCard extends StatelessWidget {
                   ),
                   const SizedBox(height: 12),
                 ],
+                if (_hasTrainDetails(leg)) ...[
+                  Text('Train', style: textTheme.titleSmall),
+                  const SizedBox(height: 6),
+                  ..._buildTrainDetails(leg, textTheme),
+                  const SizedBox(height: 12),
+                ],
                 if (routeSegments.isNotEmpty) ...[
                   Text('Route', style: textTheme.titleSmall),
                   const SizedBox(height: 6),
@@ -112,31 +265,167 @@ class LegCard extends StatelessWidget {
     );
   }
 
+  Future<void> _confirmDelete(BuildContext context, int legId) async {
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        title: const Text('Delete entry?'),
+        content: const Text('Are you sure you want to delete this entry?'),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(ctx).pop(false),
+            child: const Text('Cancel'),
+          ),
+          FilledButton(
+            onPressed: () => Navigator.of(ctx).pop(true),
+            child: const Text('Delete'),
+          ),
+        ],
+      ),
+    );
+    if (confirmed != true) return;
+
+    if (!context.mounted) return;
+    final data = context.read<DataService>();
+    final messenger = ScaffoldMessenger.of(context);
+    try {
+      await data.api.delete('/legs/delete?leg_id=$legId');
+      await data.refreshLegs();
+      messenger.showSnackBar(const SnackBar(content: Text('Entry deleted')));
+    } catch (e) {
+      messenger.showSnackBar(
+        SnackBar(content: Text('Failed to delete entry: $e')),
+      );
+    }
+  }
+
+  Widget _timeWithDelay(
+    BuildContext context,
+    DateTime time,
+    int? delay, {
+    bool includeDate = true,
+    TextStyle? style,
+  }) {
+    final textTheme = Theme.of(context).textTheme;
+    final colorScheme = Theme.of(context).colorScheme;
+    final delayMinutes = delay ?? 0;
+    final delayText =
+        delayMinutes == 0 ? null : '${delayMinutes > 0 ? '+' : ''}$delayMinutes';
+    final delayColor = delayMinutes == 0
+        ? null
+        : (delayMinutes < 0 ? Colors.green : colorScheme.error);
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Text(
+          _formatDateTime(time, includeDate: includeDate),
+          style: style,
+        ),
+        if (delayText != null) ...[
+          const SizedBox(width: 4),
+          Text(
+            '$delayText m',
+            style:
+                (style ?? textTheme.labelSmall)?.copyWith(color: delayColor),
+          ),
+        ],
+      ],
+    );
+  }
+
   String _formatDate(DateTime? date) {
     if (date == null) return '';
     return '${date.year.toString().padLeft(4, '0')}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';
   }
 
-  String _formatDateTime(DateTime date) {
+  String _formatTime(DateTime date) {
+    return '${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
+  }
+
+  String _formatDateTime(DateTime date, {bool includeDate = true}) {
+    final timeStr = _formatTime(date);
+    if (!includeDate) return timeStr;
     final dateStr = _formatDate(date);
-    final timeStr =
-        '${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
     return '$dateStr · $timeStr';
   }
 
   List<Widget> _buildLocoChips(BuildContext context, Leg leg) {
     final theme = Theme.of(context);
+    final textTheme = theme.textTheme;
     return leg.locos
         .map(
-          (loco) => Chip(
+          (loco) {
-            label: Text('${loco.locoClass} ${loco.number}'),
+            final powering = loco.powering == true;
-            avatar: const Icon(Icons.directions_railway, size: 16),
+            final iconColor =
-            backgroundColor: theme.colorScheme.surfaceContainerHighest,
+                powering ? theme.colorScheme.primary : theme.disabledColor;
-          ),
+            final labelStyle = powering
+                ? null
+                : textTheme.bodyMedium?.copyWith(color: theme.disabledColor);
+            final background = powering
+                ? theme.colorScheme.surfaceContainerHighest
+                : theme.colorScheme.surfaceContainerLow;
+            return Chip(
+              label: Text(
+                '${loco.locoClass} ${loco.number}',
+                style: labelStyle,
+              ),
+              avatar: Icon(
+                Icons.directions_railway,
+                size: 16,
+                color: iconColor,
+              ),
+              backgroundColor: background,
+            );
+          },
         )
         .toList();
   }
 
+  bool _hasTrainDetails(Leg leg) {
+    return leg.headcode.isNotEmpty ||
+        leg.origin.isNotEmpty ||
+        leg.destination.isNotEmpty ||
+        leg.originTime != null ||
+        leg.destinationTime != null;
+  }
+
+  List<Widget> _buildTrainDetails(Leg leg, TextTheme textTheme) {
+    final widgets = <Widget>[];
+    if (leg.headcode.isNotEmpty) {
+      widgets.add(
+        Text(
+          'Headcode: ${leg.headcode}',
+          style: textTheme.bodyMedium,
+        ),
+      );
+    }
+    final originLine = _locationLine(
+      'Origin',
+      leg.origin,
+      leg.originTime,
+    );
+    if (originLine != null) {
+      widgets.add(Text(originLine, style: textTheme.bodyMedium));
+    }
+    final destinationLine = _locationLine(
+      'Destination',
+      leg.destination,
+      leg.destinationTime,
+    );
+    if (destinationLine != null) {
+      widgets.add(Text(destinationLine, style: textTheme.bodyMedium));
+    }
+    return widgets;
+  }
+
+  String? _locationLine(String label, String location, DateTime? time) {
+    final parts = <String>[];
+    if (location.trim().isNotEmpty) parts.add(location.trim());
+    if (time != null) parts.add(_formatDateTime(time));
+    if (parts.isEmpty) return null;
+    return '$label: ${parts.join(' · ')}';
+  }
+
   Widget _buildRouteList(List<String> segments) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -157,39 +446,7 @@ class LegCard extends StatelessWidget {
     );
   }
 
-  List<String> _parseRouteSegments(String route) {
+  List<String> _parseRouteSegments(List<String> route) {
-    final trimmed = route.trim();
+    return route.map((e) => e.toString()).where((e) => e.trim().isNotEmpty).toList();
-    if (trimmed.isEmpty) return [];
-    try {
-      final decoded = jsonDecode(trimmed);
-      if (decoded is List) {
-        return decoded.map((e) => e.toString()).toList();
-      }
-    } catch (_) {}
-    if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
-      try {
-        final replaced = trimmed.replaceAll("'", '"');
-        final decoded = jsonDecode(replaced);
-        if (decoded is List) {
-          return decoded.map((e) => e.toString()).toList();
-        }
-      } catch (_) {}
-    }
-    if (trimmed.contains('->')) {
-      return trimmed
-          .split('->')
-          .map((e) => e.trim())
-          .where((e) => e.isNotEmpty)
-          .toList();
-    }
-    if (trimmed.contains(',')) {
-      return trimmed
-          .split(',')
-          .map((e) => e.trim())
-          .where((e) => e.isNotEmpty)
-          .toList();
-    }
-    return [trimmed];
   }
 }
-

lib/components/login/login.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
+import 'package:mileograph_flutter/components/pages/settings.dart';
 import 'package:provider/provider.dart';
 
 class LoginScreen extends StatefulWidget {
@@ -16,7 +17,9 @@ class _LoginScreenState extends State<LoginScreen> {
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) => _checkExistingSession());
+    WidgetsBinding.instance.addPostFrameCallback(
+      (_) => _checkExistingSession(),
+    );
   }
 
   Future<void> _checkExistingSession() async {
@@ -26,7 +29,7 @@ class _LoginScreenState extends State<LoginScreen> {
       if (!valid) return;
       await auth.tryRestoreSession();
       if (!mounted) return;
-      context.go('/');
+      context.go('/dashboard');
     } finally {
       if (mounted) setState(() => _checkingSession = false);
     }
@@ -70,17 +73,39 @@ class _LoginScreenState extends State<LoginScreen> {
                   ),
                 ),
               ),
-              if (_checkingSession)
-                const Padding(
-                  padding: EdgeInsets.only(top: 12),
-                  child: SizedBox(
-                    height: 24,
-                    width: 24,
-                    child: CircularProgressIndicator(strokeWidth: 2),
-                  ),
-                ),
               const SizedBox(height: 50),
               const LoginPanel(),
+              const SizedBox(height: 16),
+              IconButton(
+                icon: const Icon(Icons.settings, color: Colors.grey),
+                tooltip: 'Settings',
+                onPressed: () {
+                  Navigator.of(context).push(
+                    MaterialPageRoute(
+                      fullscreenDialog: true,
+                      builder: (_) => const SettingsPage(),
+                    ),
+                  );
+                },
+              ),
+              if (_checkingSession) ...[
+                const SizedBox(height: 12),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    const SizedBox(
+                      height: 24,
+                      width: 24,
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    ),
+                    const SizedBox(width: 8),
+                    Text(
+                      'Trying to log in',
+                      style: Theme.of(context).textTheme.bodyMedium,
+                    ),
+                  ],
+                ),
+              ],
             ],
           ),
         ),
@@ -173,14 +198,15 @@ class _LoginPanelContentState extends State<LoginPanelContent> {
       setState(() {
         _loggingIn = false;
       });
+      context.go('/dashboard');
     } catch (e) {
       if (!mounted) return;
       setState(() {
         _loggingIn = false;
       });
-      ScaffoldMessenger.of(context).showSnackBar(
+      ScaffoldMessenger.of(
-        SnackBar(content: Text('Login failed: $e')),
+        context,
-      );
+      ).showSnackBar(SnackBar(content: Text('Login failed: $e')));
     }
   }
 
@@ -291,14 +317,16 @@ class _RegisterPanelContentState extends State<RegisterPanelContent> {
       );
       if (!mounted) return;
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(content: Text('Registration successful. Please log in.')),
+        const SnackBar(
+          content: Text('Registration successful. Please log in.'),
+        ),
       );
       widget.onBack();
     } catch (e) {
       if (!mounted) return;
-      ScaffoldMessenger.of(context).showSnackBar(
+      ScaffoldMessenger.of(
-        SnackBar(content: Text('Registration failed: $e')),
+        context,
-      );
+      ).showSnackBar(SnackBar(content: Text('Registration failed: $e')));
     } finally {
       if (mounted) setState(() => _registering = false);
     }

lib/components/pages/calculator_details.dart

@@ -39,9 +39,9 @@ class CalculatorDetailsPage extends StatelessWidget {
       child: RouteDetailsView(
         route: parsed.calculatedRoute,
         costs: parsed.costs,
+        routingPoints: parsed.inputRoute.toSet(),
         onBack: () => context.pop(),
       ),
     );
   }
 }
-

lib/components/pages/dashboard.dart

@@ -1,10 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
+import 'package:intl/intl.dart';
+import 'package:mileograph_flutter/components/dashboard/latest_loco_changes_panel.dart';
 import 'package:mileograph_flutter/components/dashboard/leaderboard_panel.dart';
 import 'package:mileograph_flutter/components/dashboard/top_traction_panel.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';
 
 class Dashboard extends StatefulWidget {
@@ -21,6 +24,7 @@ class _DashboardState extends State<Dashboard> {
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
     final auth = context.watch<AuthService>();
+    final distanceUnits = context.watch<DistanceUnitService>();
     final stats = data.homepageStats;
 
     final isInitialLoading = data.isHomepageLoading || stats == null;
@@ -32,45 +36,27 @@ class _DashboardState extends State<Dashboard> {
           data.fetchOnThisDay(),
           data.fetchTripDetails(),
           data.fetchHadTraction(),
+          data.fetchLatestLocoChanges(),
         ]);
       },
       child: LayoutBuilder(
         builder: (context, constraints) {
-          final isWide = constraints.maxWidth > 1100;
+          const spacing = 16.0;
-          final metricChips = _buildMetricChips(
+          final maxWidth = constraints.maxWidth;
-            context,
-            totalMileage: stats?.totalMileage ?? 0,
-            currentYearMileage: data.getMileageForCurrentYear(),
-            trips: data.trips.length,
-          );
           return Stack(
             children: [
               ListView(
                 padding: const EdgeInsets.all(16),
                 children: [
-                  _buildHeader(context, auth, stats, data.isHomepageLoading),
+                  _buildHero(context, auth, data, stats, distanceUnits),
-                  const SizedBox(height: 12),
+                  const SizedBox(height: spacing),
-                  Wrap(spacing: 12, runSpacing: 12, children: metricChips),
+                  _buildTiles(
-                  const SizedBox(height: 16),
+                    context,
-                  isWide
+                    data,
-                      ? Row(
+                    distanceUnits,
-                          crossAxisAlignment: CrossAxisAlignment.start,
+                    maxWidth,
-                          children: [
+                    spacing,
-                            Expanded(child: _buildMainColumn(context, data)),
+                  ),
-                            const SizedBox(width: 16),
-                            SizedBox(
-                              width: 360,
-                              child: _buildSidebar(context, data),
-                            ),
-                          ],
-                        )
-                      : Column(
-                          children: [
-                            _buildMainColumn(context, data),
-                            const SizedBox(height: 16),
-                            _buildSidebar(context, data),
-                          ],
-                        ),
                 ],
               ),
               if (isInitialLoading)
@@ -98,138 +84,391 @@ class _DashboardState extends State<Dashboard> {
     );
   }
 
-  Widget _buildHeader(
+  Widget _buildHero(
     BuildContext context,
     AuthService auth,
+    DataService data,
     HomepageStats? stats,
-    bool loading,
+    DistanceUnitService distanceUnits,
   ) {
+    final colorScheme = Theme.of(context).colorScheme;
     final greetingName =
         stats?.user?.fullName ?? auth.fullName ?? auth.username ?? 'there';
-    return Row(
+    final totalMileage = stats?.totalMileage ?? 0;
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+    final currentYearMileage = data.getMileageForCurrentYear();
-      crossAxisAlignment: CrossAxisAlignment.start,
+    final legCount = stats?.legCount ?? data.trips.length;
-      children: [
+    final progress = totalMileage == 0
-        Column(
+        ? 0.0
+        : (currentYearMileage / totalMileage).clamp(0, 1).toDouble();
+
+    return Card(
+      clipBehavior: Clip.antiAlias,
+      elevation: 2,
+      child: Container(
+        decoration: BoxDecoration(
+          gradient: LinearGradient(
+            colors: [
+              colorScheme.primaryContainer,
+              colorScheme.secondaryContainer,
+            ],
+            begin: Alignment.topLeft,
+            end: Alignment.bottomRight,
+          ),
+        ),
+        padding: const EdgeInsets.all(18),
+        child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text('Dashboard', style: Theme.of(context).textTheme.labelMedium),
+            _heroHeading(context, greetingName, colorScheme),
-            const SizedBox(height: 2),
+            const SizedBox(height: 18),
+            Wrap(
+              spacing: 12,
+              runSpacing: 12,
+              children: [
+                _metricTile(
+                  context,
+                  label: 'Total mileage',
+                  value: distanceUnits.format(totalMileage, decimals: 1),
+                  icon: Icons.route,
+                  color: colorScheme.onPrimaryContainer,
+                ),
+                _metricTile(
+                  context,
+                  label: 'This year',
+                  value: distanceUnits.format(currentYearMileage, decimals: 1),
+                  icon: Icons.calendar_today,
+                  color: colorScheme.onPrimaryContainer,
+                ),
+                _metricTile(
+                  context,
+                  label: 'Entries logged',
+                  value: legCount.toString(),
+                  icon: Icons.format_list_bulleted,
+                  color: colorScheme.onPrimaryContainer,
+                ),
+              ],
+            ),
+            const SizedBox(height: 16),
+            ClipRRect(
+              borderRadius: BorderRadius.circular(12),
+              child: LinearProgressIndicator(
+                value: progress.isNaN ? 0 : progress,
+                minHeight: 10,
+                backgroundColor: colorScheme.onPrimaryContainer.withValues(
+                  alpha: 0.2,
+                ),
+                valueColor: AlwaysStoppedAnimation<Color>(
+                  colorScheme.onPrimaryContainer,
+                ),
+              ),
+            ),
+            const SizedBox(height: 6),
             Text(
-              'Welcome back, $greetingName',
+              totalMileage == 0
-              style: Theme.of(context).textTheme.headlineSmall,
+                  ? 'Log a new entry to start your timeline.'
+                  : 'Year-to-date is ${(progress * 100).toStringAsFixed(0)}% of all mileage.',
+              style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                color: colorScheme.onPrimaryContainer.withValues(alpha: 0.8),
+              ),
             ),
           ],
         ),
-        if (loading)
+      ),
-          const Padding(
-            padding: EdgeInsets.only(right: 8.0),
-            child: SizedBox(
-              height: 24,
-              width: 24,
-              child: CircularProgressIndicator(strokeWidth: 2),
-            ),
-          ),
-      ],
     );
   }
 
-  List<Widget> _buildMetricChips(
+  Widget _metricTile(
     BuildContext context, {
-    required double totalMileage,
+    required String label,
-    required double currentYearMileage,
+    required String value,
-    required int trips,
+    required IconData icon,
+    required Color color,
   }) {
-    final textTheme = Theme.of(context).textTheme;
+    final bg = Colors.white.withValues(alpha: 0.14);
-    Widget metricCard(String label, String value) {
+    return Container(
-      return Card(
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
-        elevation: 1,
+      decoration: BoxDecoration(
-        child: Padding(
+        color: bg,
-          padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 14),
+        borderRadius: BorderRadius.circular(12),
-          child: Column(
+        border: Border.all(color: Colors.white.withValues(alpha: 0.18)),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(icon, color: color),
+          const SizedBox(width: 10),
+          Column(
             crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisSize: MainAxisSize.min,
             children: [
               Text(
-                label.toUpperCase(),
+                label,
-                style: textTheme.labelSmall?.copyWith(
+                style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                  letterSpacing: 0.7,
+                  color: color.withValues(alpha: 0.85),
-                  color: textTheme.bodySmall?.color?.withValues(alpha: 0.7),
+                  letterSpacing: 0.4,
                 ),
               ),
-              const SizedBox(height: 4),
               Text(
                 value,
-                style: textTheme.titleMedium?.copyWith(
+                style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                  fontWeight: FontWeight.w700,
+                  fontWeight: FontWeight.w800,
+                  color: color,
                 ),
               ),
             ],
           ),
-        ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildTiles(
+    BuildContext context,
+    DataService data,
+    DistanceUnitService distanceUnits,
+    double maxWidth,
+    double spacing,
+  ) {
+    final isWide = maxWidth >= 1200;
+
+    if (isWide) {
+      return Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Expanded(
+            flex: 2,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                _buildOnThisDayCard(context, data, distanceUnits),
+                const SizedBox(height: 16),
+                _buildTripsCard(context, data, distanceUnits),
+                const SizedBox(height: 16),
+                const LatestLocoChangesPanel(expanded: true),
+              ],
+            ),
+          ),
+          const SizedBox(width: 16),
+          Expanded(
+            flex: 1,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: const [
+                TopTractionPanel(),
+                SizedBox(height: 16),
+                LeaderboardPanel(),
+              ],
+            ),
+          ),
+        ],
       );
     }
 
-    return [
-      metricCard('Total mileage', '${totalMileage.toStringAsFixed(1)} mi'),
-      metricCard('This year', '${currentYearMileage.toStringAsFixed(1)} mi'),
-      metricCard('Trips logged', trips.toString()),
-    ];
-  }
-
-  Widget _buildMainColumn(BuildContext context, DataService data) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
-        _buildCard(
+        _buildOnThisDayCard(context, data, distanceUnits),
-          context,
+        const SizedBox(height: 16),
-          title: 'On this day',
+        const TopTractionPanel(),
-          action:
+        const SizedBox(height: 16),
-              data.onThisDay
+        const LeaderboardPanel(),
-                      .where((leg) => leg.beginTime.year != DateTime.now().year)
+        const SizedBox(height: 16),
-                      .length >
+        _buildTripsCard(context, data, distanceUnits),
-                  5
+        const SizedBox(height: 16),
-              ? TextButton(
+        const LatestLocoChangesPanel(),
-                  onPressed: () => setState(() {
+      ],
-                    _showAllOnThisDay = !_showAllOnThisDay;
+    );
-                  }),
+  }
-                  child: Text(_showAllOnThisDay ? 'Show less' : 'Show more'),
+
-                )
+  Widget _heroHeading(
-              : null,
+    BuildContext context,
-          trailing: data.isOnThisDayLoading
+    String greetingName,
-              ? const SizedBox(
+    ColorScheme colorScheme,
-                  height: 18,
+  ) {
-                  width: 18,
+    return Column(
-                  child: CircularProgressIndicator(strokeWidth: 2),
+      crossAxisAlignment: CrossAxisAlignment.start,
-                )
+      children: [
-              : null,
+        Text(
-          child: _buildLegList(
+          'Dashboard',
-            context,
+          style: Theme.of(context).textTheme.labelMedium?.copyWith(
-            data.onThisDay,
+            color: colorScheme.onPrimaryContainer,
-            showAll: _showAllOnThisDay,
+            letterSpacing: 0.4,
-            emptyMessage: 'No historical moves for today yet.',
+          ),
+        ),
+        const SizedBox(height: 2),
+        Text(
+          'Welcome back, $greetingName',
+          style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+            color: colorScheme.onPrimaryContainer,
+            fontWeight: FontWeight.w800,
           ),
         ),
-        const SizedBox(height: 12),
-        _buildQuickCalcCard(context),
-        const SizedBox(height: 12),
-        _buildTripsCard(context, data),
       ],
     );
   }
 
-  Widget _buildSidebar(BuildContext context, DataService data) {
+  Widget _buildOnThisDayCard(
-    return Column(
+      BuildContext context, DataService data, DistanceUnitService distanceUnits) {
+    final filtered = data.onThisDay
+        .where((leg) => leg.beginTime.year != DateTime.now().year)
+        .toList();
+    final textTheme = Theme.of(context).textTheme;
+    final showMore = filtered.length > 5;
+    final visible = _showAllOnThisDay ? filtered : filtered.take(6).toList();
+    return _panel(
+      context,
+      icon: Icons.history_toggle_off,
+      title: 'On this day',
+      trailing: data.isOnThisDayLoading
+          ? const SizedBox(
+              height: 18,
+              width: 18,
+              child: CircularProgressIndicator(strokeWidth: 2),
+            )
+          : null,
+      action: showMore
+          ? TextButton(
+              onPressed: () =>
+                  setState(() => _showAllOnThisDay = !_showAllOnThisDay),
+              child: Text(_showAllOnThisDay ? 'Show less' : 'Show more'),
+            )
+          : null,
+      child: filtered.isEmpty
+          ? Text(
+              'No historical moves for today yet.',
+              style: textTheme.bodyMedium,
+            )
+          : Column(
+              children: [
+                for (int idx = 0; idx < visible.length; idx++) ...[
+                  _otdRow(context, visible[idx], textTheme, distanceUnits),
+                  if (idx != visible.length - 1) const Divider(height: 12),
+                ],
+              ],
+            ),
+    );
+  }
+
+  Widget _otdRow(BuildContext context, Leg leg, TextTheme textTheme,
+      DistanceUnitService distanceUnits) {
+    final traction = leg.locos;
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.center,
       children: [
-        TopTractionPanel(),
+        Container(
-        const SizedBox(height: 12),
+          width: 64,
-        LeaderboardPanel(),
+          height: 56,
+          padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+          decoration: BoxDecoration(
+            color: Theme.of(context).colorScheme.surfaceContainerHighest,
+            borderRadius: BorderRadius.circular(12),
+          ),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                leg.beginTime.year.toString(),
+                style: textTheme.titleMedium?.copyWith(
+                  fontWeight: FontWeight.w800,
+                ),
+              ),
+              const SizedBox(height: 2),
+              Text(_formatTime(leg.beginTime), style: textTheme.labelSmall),
+            ],
+          ),
+        ),
+        const SizedBox(width: 12),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                '${leg.start} → ${leg.end}',
+                style: textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.w700,
+                ),
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
+              ),
+              if (leg.headcode.isNotEmpty) ...[
+                const SizedBox(height: 4),
+                Row(
+                  children: [
+                    Text(
+                      leg.headcode,
+                      style: textTheme.labelSmall?.copyWith(
+                        color: textTheme.bodySmall?.color?.withValues(
+                          alpha: 0.7,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+              const SizedBox(height: 4),
+              Row(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const SizedBox(width: 6),
+                  Expanded(
+                    child: traction.isEmpty
+                        ? Text(
+                            'No traction recorded',
+                            style: textTheme.labelSmall?.copyWith(
+                              color: textTheme.bodySmall?.color?.withValues(
+                                alpha: 0.7,
+                              ),
+                            ),
+                          )
+                        : Wrap(
+                            spacing: 8,
+                            runSpacing: 4,
+                            children: traction.map((loco) {
+                              final iconColor = loco.powering
+                                  ? Theme.of(context).colorScheme.primary
+                                  : Theme.of(context).hintColor;
+                              final label = '${loco.locoClass} ${loco.number}';
+                              return Row(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  Icon(Icons.train, size: 14, color: iconColor),
+                                  const SizedBox(width: 4),
+                                  Text(
+                                    label,
+                                    style: textTheme.labelSmall?.copyWith(
+                                      color: textTheme.bodySmall?.color
+                                          ?.withValues(alpha: 0.85),
+                                    ),
+                                  ),
+                                ],
+                              );
+                            }).toList(),
+                          ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+        const SizedBox(width: 12),
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.end,
+          children: [
+            Text(
+              distanceUnits.format(leg.mileage, decimals: 1),
+              style: textTheme.labelLarge?.copyWith(
+                fontWeight: FontWeight.w800,
+              ),
+            ),
+          ],
+        ),
       ],
     );
   }
 
-  Widget _buildCard(
+  Widget _panel(
     BuildContext context, {
+    required IconData icon,
     required String title,
     required Widget child,
     Widget? trailing,
@@ -238,29 +477,29 @@ class _DashboardState extends State<Dashboard> {
     return Card(
       clipBehavior: Clip.antiAlias,
       child: Padding(
-        padding: const EdgeInsets.all(16),
+        padding: const EdgeInsets.all(16.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
             Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text(
+                Icon(icon, size: 20),
-                  title,
+                const SizedBox(width: 8),
-                  style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                Expanded(
-                    fontWeight: FontWeight.w700,
+                  child: Text(
+                    title,
+                    style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.w800,
+                    ),
                   ),
                 ),
-                Row(
+                if (action != null)
-                  mainAxisSize: MainAxisSize.min,
+                  Padding(
-                  children: [
+                    padding: const EdgeInsets.only(right: 8.0),
-                    if (action != null) action,
+                    child: action,
-                    if (trailing != null) ...[
+                  ),
-                      const SizedBox(width: 8),
+                if (trailing != null) trailing,
-                      trailing,
-                    ],
-                  ],
-                ),
               ],
             ),
             const SizedBox(height: 12),
@@ -271,75 +510,19 @@ class _DashboardState extends State<Dashboard> {
     );
   }
 
-  Widget _buildLegList(
+  Widget _buildTripsCard(
-    BuildContext context,
+      BuildContext context, DataService data, DistanceUnitService distanceUnits) {
-    List<Leg> legs, {
-    required String emptyMessage,
-    bool showAll = false,
-  }) {
-    final filtered = legs
-        .where((leg) => leg.beginTime.year != DateTime.now().year)
-        .toList();
-    if (filtered.isEmpty) {
-      return Text(emptyMessage, style: Theme.of(context).textTheme.bodyMedium);
-    }
-    final toShow = showAll ? filtered : filtered.take(5).toList();
-    return Column(
-      children: toShow.map((leg) {
-        return ListTile(
-          dense: true,
-          contentPadding: EdgeInsets.zero,
-          leading: CircleAvatar(
-            backgroundColor: Theme.of(context).colorScheme.primaryContainer,
-            child: const Icon(Icons.train),
-          ),
-          title: Text('${leg.start} → ${leg.end}'),
-          subtitle: Text(_formatDate(leg.beginTime)),
-          trailing: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Text('${leg.mileage.toStringAsFixed(1)} mi'),
-              if (leg.headcode.isNotEmpty)
-                Text(
-                  leg.headcode,
-                  style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                    color: Theme.of(context).hintColor,
-                  ),
-                ),
-            ],
-          ),
-        );
-      }).toList(),
-    );
-  }
-
-  Widget _buildQuickCalcCard(BuildContext context) {
-    return _buildCard(
-      context,
-      title: 'Quick mileage calculator',
-      action: TextButton.icon(
-        onPressed: () => context.push('/calculator'),
-        icon: const Icon(Icons.open_in_new),
-        label: const Text('Open calculator'),
-      ),
-      child: Text(
-        'Jump into the route calculator to quickly total a journey before saving it.',
-        style: Theme.of(context).textTheme.bodyMedium,
-      ),
-    );
-  }
-
-  Widget _buildTripsCard(BuildContext context, DataService data) {
     final tripsUnsorted = data.trips;
     List trips = [];
     if (tripsUnsorted.isNotEmpty) {
       trips = [...tripsUnsorted]..sort((a, b) => b.tripId.compareTo(a.tripId));
     }
-    return _buildCard(
+    return _panel(
       context,
+      icon: Icons.bookmark,
       title: 'Trips',
       action: TextButton(
-        onPressed: () => context.push('/trips'),
+        onPressed: () => context.push('/logbook/trips'),
         child: const Text('View all'),
       ),
       child: trips.isEmpty
@@ -348,20 +531,46 @@ class _DashboardState extends State<Dashboard> {
               style: Theme.of(context).textTheme.bodyMedium,
             )
           : Column(
-              children: trips.take(5).map((trip) {
+              children: trips.take(6).map((trip) {
-                return ListTile(
+                return Padding(
-                  contentPadding: EdgeInsets.zero,
+                  padding: const EdgeInsets.symmetric(vertical: 6.0),
-                  title: Text(trip.tripName),
+                  child: Row(
-                  subtitle: Text('${trip.tripMileage.toStringAsFixed(1)} mi'),
+                    children: [
-                  trailing: const Icon(Icons.chevron_right),
+                      Container(
+                        width: 42,
+                        height: 42,
+                        decoration: BoxDecoration(
+                          color: Theme.of(context).colorScheme.primaryContainer,
+                          borderRadius: BorderRadius.circular(12),
+                        ),
+                        child: const Icon(Icons.book, size: 18),
+                      ),
+                      const SizedBox(width: 10),
+                      Expanded(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text(
+                              trip.tripName,
+                              style: Theme.of(context).textTheme.titleSmall
+                                  ?.copyWith(fontWeight: FontWeight.w700),
+                            ),
+                            Text(
+                              distanceUnits.format(trip.tripMileage, decimals: 1),
+                              style: Theme.of(context).textTheme.labelMedium,
+                            ),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
                 );
               }).toList(),
             ),
     );
   }
 
-  String _formatDate(DateTime? dt) {
+  String _formatTime(DateTime date) {
-    if (dt == null) return '';
+    return DateFormat('HH:mm').format(date);
-    return '${dt.year.toString().padLeft(4, '0')}-${dt.month.toString().padLeft(2, '0')}-${dt.day.toString().padLeft(2, '0')}';
   }
 }

lib/components/pages/legs.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/components/legs/leg_card.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';
 
 class LegsPage extends StatefulWidget {
@@ -89,6 +91,7 @@ class _LegsPageState extends State<LegsPage> {
   @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
+    final distanceUnits = context.watch<DistanceUnitService>();
     final legs = data.legs;
     final pageMileage = _pageMileage(legs);
 
@@ -120,7 +123,7 @@ class _LegsPageState extends State<LegsPage> {
                     children: [
                       Text('Page mileage',
                           style: Theme.of(context).textTheme.labelSmall),
-                      Text('${pageMileage.toStringAsFixed(1)} mi',
+                      Text(distanceUnits.format(pageMileage, decimals: 1),
                           style: Theme.of(context)
                               .textTheme
                               .titleMedium
@@ -211,7 +214,7 @@ class _LegsPageState extends State<LegsPage> {
           else
             Column(
               children: [
-                ...legs.map((leg) => LegCard(leg: leg)),
+                ..._buildLegsWithDividers(context, legs, distanceUnits),
                 const SizedBox(height: 8),
                 if (data.legsHasMore || data.isLegsLoading)
                   Align(
@@ -238,6 +241,60 @@ class _LegsPageState extends State<LegsPage> {
     );
   }
 
+  List<Widget> _buildLegsWithDividers(
+    BuildContext context,
+    List<Leg> legs,
+    DistanceUnitService distanceUnits,
+  ) {
+    final widgets = <Widget>[];
+    String? currentDate;
+    double dayMileage = 0;
+    final dayLegs = <Leg>[];
+
+    void flushDay() {
+      final date = currentDate;
+      if (date == null) return;
+      widgets.add(
+        Padding(
+          padding: const EdgeInsets.symmetric(vertical: 8.0),
+          child: Row(
+            children: [
+              Expanded(
+                child: Text(
+                  date,
+                  style: Theme.of(context).textTheme.labelMedium?.copyWith(
+                        fontWeight: FontWeight.w700,
+                      ),
+                ),
+              ),
+              Text(distanceUnits.format(dayMileage, decimals: 1),
+                  style: Theme.of(context).textTheme.labelMedium),
+            ],
+          ),
+        ),
+      );
+      widgets.add(const Divider());
+      widgets.addAll(
+        dayLegs.map((leg) => LegCard(leg: leg, showDate: false)),
+      );
+      dayLegs.clear();
+    }
+
+    for (final leg in legs) {
+      final dateStr = _formatDate(leg.beginTime) ?? '';
+      if (currentDate != null && dateStr != currentDate) {
+        flushDay();
+        dayMileage = 0;
+      }
+      currentDate = dateStr;
+      dayLegs.add(leg);
+      dayMileage += leg.mileage;
+    }
+
+    flushDay();
+    return widgets;
+  }
+
   String? _formatDate(DateTime? date) {
     if (date == null) return null;
     return '${date.year.toString().padLeft(4, '0')}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';

lib/components/pages/loco_timeline.dart

@@ -36,6 +36,21 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
     WidgetsBinding.instance.addPostFrameCallback((_) => _load());
   }
 
+  dynamic _normalizeFieldValue(_FieldEntry field) {
+    final name = field.field.name.toLowerCase();
+    final val = field.value;
+    if (name == 'max_speed') {
+      final numVal = val is num ? val.toDouble() : double.tryParse('$val');
+      if (numVal == null) return val;
+      final unit = (field.unit ?? 'kph').toLowerCase();
+      if (unit == 'mph') {
+        return numVal * 1.60934;
+      }
+      return numVal;
+    }
+    return val;
+  }
+
   @override
   void dispose() {
     _disposeDrafts(_draftEvents);
@@ -57,7 +72,7 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
   String? _eventDateForEntry(LocoAttrVersion entry) {
     final masked = entry.maskedValidFrom?.trim();
     if (masked != null && masked.isNotEmpty) return masked;
-    final from = entry.validFrom ?? entry.txnFrom;
+    final from = entry.validFrom;
     if (from == null) return null;
     return DateFormat('yyyy-MM-dd').format(from);
   }
@@ -115,7 +130,8 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
     draft.details = '';
     draft.fields.add(
       _FieldEntry(field: field)
-        ..value = _valueForEntry(entry),
+        ..value = _valueForEntry(entry)
+        ..unit = _guessUnit(field, entry.valueLabel),
     );
 
     setState(() {
@@ -123,6 +139,16 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
     });
   }
 
+  String? _guessUnit(EventField field, String valueLabel) {
+    final name = field.name.toLowerCase();
+    if (name == 'max_speed') {
+      final val = valueLabel.toLowerCase();
+      if (val.contains('mph')) return 'mph';
+      return 'kph';
+    }
+    return _defaultUnitForField(field);
+  }
+
   Future<void> _deleteEntry(LocoAttrVersion entry) async {
     if (_isDeleting) return;
     final blockId = entry.versionId;
@@ -241,7 +267,7 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
             invalid.add('Field ${field.field.display} is empty');
             break;
           }
-          values[field.field.name] = val;
+          values[field.field.name] = _normalizeFieldValue(field);
         }
         if (invalid.isNotEmpty) continue;
         if (values.isEmpty) {

lib/components/pages/loco_timeline/event_editor.dart

@@ -184,7 +184,9 @@ class _FieldList extends StatelessWidget {
               value: null,
               onChanged: (field) {
                 if (field == null) return;
-                draft.fields.add(_FieldEntry(field: field));
+                draft.fields.add(
+                  _FieldEntry(field: field)..unit = _defaultUnitForField(field),
+                );
                 onChange();
               },
               items: availableFields
@@ -224,10 +226,10 @@ class _FieldList extends StatelessWidget {
                           ),
                           const SizedBox(height: 4),
                           _FieldInput(
-                            field: field.field,
+                            entry: field,
-                            value: field.value,
+                            onChanged: (val, {String? unit}) {
-                            onChanged: (val) {
                               field.value = val;
+                              if (unit != null) field.unit = unit;
                               onChange();
                             },
                           ),
@@ -253,17 +255,18 @@ class _FieldList extends StatelessWidget {
 
 class _FieldInput extends StatelessWidget {
   const _FieldInput({
-    required this.field,
+    required this.entry,
-    required this.value,
     required this.onChanged,
   });
 
-  final EventField field;
+  final _FieldEntry entry;
-  final dynamic value;
+  final void Function(dynamic value, {String? unit}) onChanged;
-  final ValueChanged<dynamic> onChanged;
 
   @override
   Widget build(BuildContext context) {
+    final field = entry.field;
+    final value = entry.value;
+
     if (field.enumValues != null && field.enumValues!.isNotEmpty) {
       final options = field.enumValues!;
       return DropdownButtonFormField<String>(
@@ -293,6 +296,118 @@ class _FieldInput extends StatelessWidget {
       );
     }
 
+    final name = field.name.toLowerCase();
+    if (name == 'max_speed') {
+      final unit = entry.unit ?? 'kph';
+      return Row(
+        children: [
+          Expanded(
+            child: TextFormField(
+              initialValue: value?.toString(),
+              onChanged: (val) {
+                final parsed = double.tryParse(val);
+                onChanged(parsed, unit: unit);
+              },
+              decoration: const InputDecoration(
+                border: OutlineInputBorder(),
+                hintText: 'Enter value',
+                suffixText: 'kph/mph',
+              ),
+              keyboardType: TextInputType.number,
+            ),
+          ),
+          const SizedBox(width: 8),
+          SizedBox(
+            width: 88,
+            child: DropdownButtonFormField<String>(
+              value: unit,
+              items: const [
+                DropdownMenuItem(value: 'kph', child: Text('kph')),
+                DropdownMenuItem(value: 'mph', child: Text('mph')),
+              ],
+              onChanged: (val) {
+                if (val == null) return;
+                onChanged(value, unit: val);
+              },
+              decoration: const InputDecoration(
+                border: OutlineInputBorder(),
+                labelText: 'Unit',
+              ),
+            ),
+          ),
+        ],
+      );
+    }
+
+    if ({
+      'height',
+      'length',
+      'width',
+      'track_gauge',
+    }.contains(name)) {
+      return TextFormField(
+        initialValue: value?.toString(),
+        onChanged: (val) {
+          final parsed = double.tryParse(val);
+          onChanged(parsed ?? val);
+        },
+        decoration: const InputDecoration(
+          border: OutlineInputBorder(),
+          hintText: 'Enter value',
+          suffixText: 'mm',
+        ),
+        keyboardType: TextInputType.number,
+      );
+    }
+
+    if (name == 'weight') {
+      return TextFormField(
+        initialValue: value?.toString(),
+        onChanged: (val) {
+          final parsed = double.tryParse(val);
+          onChanged(parsed ?? val);
+        },
+        decoration: const InputDecoration(
+          border: OutlineInputBorder(),
+          hintText: 'Enter value',
+          suffixText: 'tonnes',
+        ),
+        keyboardType: TextInputType.number,
+      );
+    }
+
+    if (name == 'power') {
+      return TextFormField(
+        initialValue: value?.toString(),
+        onChanged: (val) {
+          final parsed = double.tryParse(val);
+          onChanged(parsed ?? val);
+        },
+        decoration: const InputDecoration(
+          border: OutlineInputBorder(),
+          hintText: 'Enter value',
+          suffixText: 'kW',
+        ),
+        keyboardType: TextInputType.number,
+      );
+    }
+
+    if (name == 'tractive_effort') {
+      return TextFormField(
+        initialValue: value?.toString(),
+        onChanged: (val) {
+          final parsed = double.tryParse(val);
+          onChanged(parsed ?? val);
+        },
+        decoration: const InputDecoration(
+          border: OutlineInputBorder(),
+          hintText: 'Enter value',
+          suffixText: 'kN',
+        ),
+        keyboardType: TextInputType.number,
+      );
+    }
+
     final isNumber = type == 'int' || type == 'integer';
     return TextFormField(
       initialValue: value?.toString(),
@@ -326,6 +441,13 @@ class _EventDraft {
 class _FieldEntry {
   final EventField field;
   dynamic value;
+  String? unit;
 
   _FieldEntry({required this.field});
 }
+
+String? _defaultUnitForField(EventField field) {
+  final name = field.name.toLowerCase();
+  if (name == 'max_speed') return 'kph';
+  return null;
+}

lib/components/pages/loco_timeline/timeline_grid.dart

@@ -443,53 +443,57 @@ class _ValueBlockMenu extends StatelessWidget {
       return _ValueBlockView(block: block);
     }
 
+    Future<void> showContextMenuAt(Offset globalPosition) async {
+      final overlay = Overlay.of(context);
+      final renderBox = overlay.context.findRenderObject() as RenderBox?;
+      if (renderBox == null) return;
+      // Translate from global screen coordinates into the overlay's local space
+      // so the menu appears where the gesture happened.
+      final localPosition = renderBox.globalToLocal(globalPosition);
+      final position = RelativeRect.fromRect(
+        Rect.fromLTWH(localPosition.dx, localPosition.dy, 1, 1),
+        Offset.zero & renderBox.size,
+      );
+
+      final action = await showMenu<_TimelineBlockAction>(
+        context: context,
+        position: position,
+        items: [
+          if (onEditEntry != null)
+            const PopupMenuItem(
+              value: _TimelineBlockAction.edit,
+              child: Text('Edit'),
+            ),
+          if (onDeleteEntry != null)
+            const PopupMenuItem(
+              value: _TimelineBlockAction.delete,
+              child: Text('Delete'),
+            ),
+        ],
+      );
+
+      final entry = block.entry;
+      if (action == null || entry == null) return;
+      switch (action) {
+        case _TimelineBlockAction.edit:
+          onEditEntry?.call(entry);
+          break;
+        case _TimelineBlockAction.delete:
+          onDeleteEntry?.call(entry);
+          break;
+      }
+    }
+
     return GestureDetector(
       behavior: HitTestBehavior.opaque,
       onLongPressStart: (details) async {
-        final overlay = Overlay.of(context);
-        final renderBox = overlay.context.findRenderObject() as RenderBox?;
-        if (renderBox == null) return;
         if (defaultTargetPlatform == TargetPlatform.android) {
           HapticFeedback.lightImpact();
         }
-        final anchor = details.globalPosition + const Offset(0, -8);
+        await showContextMenuAt(details.globalPosition);
-        final position = RelativeRect.fromRect(
+      },
-          Rect.fromLTWH(
+      onSecondaryTapDown: (details) async {
-            anchor.dx,
+        await showContextMenuAt(details.globalPosition);
-            anchor.dy,
-            1,
-            1,
-          ),
-          Offset.zero & renderBox.size,
-        );
-
-        final action = await showMenu<_TimelineBlockAction>(
-          context: context,
-          position: position,
-          items: [
-            if (onEditEntry != null)
-              const PopupMenuItem(
-                value: _TimelineBlockAction.edit,
-                child: Text('Edit'),
-              ),
-            if (onDeleteEntry != null)
-              const PopupMenuItem(
-                value: _TimelineBlockAction.delete,
-                child: Text('Delete'),
-              ),
-          ],
-        );
-
-        final entry = block.entry;
-        if (action == null || entry == null) return;
-        switch (action) {
-          case _TimelineBlockAction.edit:
-            onEditEntry?.call(entry);
-            break;
-          case _TimelineBlockAction.delete:
-            onDeleteEntry?.call(entry);
-            break;
-        }
       },
       child: _ValueBlockView(block: block),
     );
@@ -573,7 +577,7 @@ class _TimelineModel {
           _ValueSegment(
             start: start,
             end: end,
-            value: entry.valueLabel,
+            value: _formatValueWithUnits(entry),
             entry: entry,
           ),
         );
@@ -676,6 +680,53 @@ class _TimelineModel {
   }
 }
 
+String _formatValueWithUnits(LocoAttrVersion entry) {
+  final raw = entry.valueLabel;
+  final code = entry.attrCode.toLowerCase();
+  final lowerRaw = raw.toLowerCase();
+  // Avoid double-appending if units already present.
+  final hasUnits = lowerRaw.contains('mm') ||
+      lowerRaw.contains('tonne') ||
+      lowerRaw.contains('kph') ||
+      lowerRaw.contains('mph');
+
+  double? asNumber = double.tryParse(raw);
+  String formatNumber(double value) {
+    if (value % 1 == 0) return value.toStringAsFixed(0);
+    return value.toStringAsFixed(2);
+  }
+
+  switch (code) {
+    case 'height':
+    case 'length':
+    case 'width':
+    case 'track_gauge':
+      if (hasUnits) return raw;
+      return asNumber != null ? '${formatNumber(asNumber)} mm' : '$raw mm';
+    case 'weight':
+      if (hasUnits) return raw;
+      return asNumber != null ? '${formatNumber(asNumber)} tonnes' : '$raw tonnes';
+    case 'power':
+      if (hasUnits) return raw;
+      return asNumber != null ? '${formatNumber(asNumber)} kW' : '$raw kW';
+    case 'tractive_effort':
+      if (hasUnits) return raw;
+      return asNumber != null ? '${formatNumber(asNumber)} kN' : '$raw kN';
+    case 'max_speed':
+      if (hasUnits) return raw;
+      if (asNumber != null) {
+        // Stored as kph.
+        final formatted = asNumber % 1 == 0
+            ? asNumber.toStringAsFixed(0)
+            : asNumber.toStringAsFixed(1);
+        return '$formatted kph';
+      }
+      return '$raw kph';
+    default:
+      return raw;
+  }
+}
+
 class _AxisSegment {
   final DateTime start;
   final DateTime end;
@@ -738,7 +789,15 @@ class _RowCell {
         color: Colors.transparent,
       );
     }
-    final displayStart = _formatDate(seg.start) ?? '';
+    final entry = seg.entry;
+    String displayStart = '';
+    if (entry != null) {
+      if ((entry.maskedValidFrom ?? '').trim().isNotEmpty) {
+        displayStart = entry.maskedValidFrom!.trim();
+      } else if (entry.validFrom != null) {
+        displayStart = _formatDate(entry.validFrom) ?? '';
+      }
+    }
     return _RowCell(
       value: seg.value,
       rangeLabel: displayStart,

lib/components/pages/logbook.dart

@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:mileograph_flutter/components/pages/legs.dart';
+import 'package:mileograph_flutter/components/pages/trips.dart';
+
+enum LogbookTab { entries, trips }
+
+class LogbookPage extends StatelessWidget {
+  const LogbookPage({super.key, this.initialTab = LogbookTab.entries});
+
+  final LogbookTab initialTab;
+
+  @override
+  Widget build(BuildContext context) {
+    final initialIndex = initialTab == LogbookTab.trips ? 1 : 0;
+    return DefaultTabController(
+      key: ValueKey(initialTab),
+      initialIndex: initialIndex,
+      length: 2,
+      child: Column(
+        children: [
+          TabBar(
+            onTap: (index) {
+              final dest = index == 0 ? '/logbook/entries' : '/logbook/trips';
+              final current = GoRouterState.of(context).uri.path;
+              if (current != dest) {
+                context.go(dest);
+              }
+            },
+            tabs: const [
+              Tab(text: 'Entries'),
+              Tab(text: 'Trips'),
+            ],
+          ),
+          Expanded(
+            child: TabBarView(children: const [LegsPage(), TripsPage()]),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/components/pages/more.dart

@@ -0,0 +1,81 @@
+import 'package:flutter/material.dart';
+import 'package:mileograph_flutter/components/pages/profile.dart';
+import 'package:mileograph_flutter/components/pages/settings.dart';
+import 'package:mileograph_flutter/components/pages/stats.dart';
+
+class MorePage extends StatelessWidget {
+  const MorePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Navigator(
+      onGenerateRoute: (settings) {
+        final name = settings.name ?? '/';
+        Widget page;
+        switch (name) {
+          case '/settings':
+            page = const SettingsPage();
+            break;
+          case '/profile':
+            page = const ProfilePage();
+            break;
+          case '/stats':
+            page = const StatsPage();
+            break;
+          case '/more/settings':
+            page = const SettingsPage();
+            break;
+          case '/more/profile':
+            page = const ProfilePage();
+            break;
+          case '/more/stats':
+            page = const StatsPage();
+            break;
+          case '/':
+          default:
+            page = _MoreHome();
+        }
+        return MaterialPageRoute(builder: (_) => page, settings: settings);
+      },
+    );
+  }
+}
+
+class _MoreHome extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return ListView(
+      padding: const EdgeInsets.all(16),
+      children: [
+        Text(
+          'More',
+          style: Theme.of(context).textTheme.headlineSmall,
+        ),
+        const SizedBox(height: 12),
+        Card(
+          child: Column(
+            children: [
+              ListTile(
+                leading: const Icon(Icons.emoji_events),
+                title: const Text('Badges'),
+                onTap: () => Navigator.of(context).pushNamed('/more/profile'),
+              ),
+              const Divider(height: 1),
+              ListTile(
+                leading: const Icon(Icons.bar_chart),
+                title: const Text('Stats'),
+                onTap: () => Navigator.of(context).pushNamed('/more/stats'),
+              ),
+              const Divider(height: 1),
+              ListTile(
+                leading: const Icon(Icons.settings),
+                title: const Text('Settings'),
+                onTap: () => Navigator.of(context).pushNamed('/more/settings'),
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/components/pages/new_entry/new_entry.dart

@@ -11,6 +11,7 @@ import 'package:mileograph_flutter/components/pages/traction.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/api_service.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:mileograph_flutter/services/navigation_guard.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';

lib/components/pages/new_entry/new_entry_draft_logic.dart

@@ -13,6 +13,9 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
     if (choice == _ExitChoice.save) {
       await _saveDraftEntry(draftId: _activeDraftId);
     } else if (choice == _ExitChoice.discard) {
+      // Delay reset to avoid setState during the dialog/build phase.
+      await Future<void>.delayed(Duration.zero);
+      if (!mounted) return false;
       await _resetFormState(clearDraft: true);
       _activeDraftId = null;
     }
@@ -29,12 +32,21 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
   }
 
   bool _formIsEmpty() {
+    final beginDelayVal = _parseDelayMinutes(_beginDelayController.text);
+    final endDelayVal = _parseDelayMinutes(_endDelayController.text);
     return _startController.text.trim().isEmpty &&
         _endController.text.trim().isEmpty &&
         _headcodeController.text.trim().isEmpty &&
         _notesController.text.trim().isEmpty &&
         _networkController.text.trim().isEmpty &&
         _mileageController.text.trim().isEmpty &&
+        _originController.text.trim().isEmpty &&
+        _destinationController.text.trim().isEmpty &&
+        beginDelayVal == 0 &&
+        endDelayVal == 0 &&
+        !_hasOriginTime &&
+        !_hasDestinationTime &&
+        !_hasEndTime &&
         _routeResult == null &&
         _tractionItems.length <= 1;
   }
@@ -84,6 +96,32 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
     }
   }
 
+  Future<void> _saveDraftManually() async {
+    if (_savingDraft) return;
+    if (_formIsEmpty()) {
+      ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+        const SnackBar(content: Text('Nothing to save yet.')),
+      );
+      return;
+    }
+    final hadDraft = _activeDraftId != null;
+    _setState(() => _savingDraft = true);
+    try {
+      await _saveDraftEntry(draftId: _activeDraftId);
+      if (!mounted) return;
+      ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+        SnackBar(content: Text(hadDraft ? 'Draft updated' : 'Draft saved')),
+      );
+    } catch (e) {
+      if (!mounted) return;
+      ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+        SnackBar(content: Text('Failed to save draft: $e')),
+      );
+    } finally {
+      if (mounted) _setState(() => _savingDraft = false);
+    }
+  }
+
   Future<void> _saveDraft() async {
     if (_restoringDraft || !_draftPersistenceEnabled) return;
     final prefs = await SharedPreferences.getInstance();
@@ -96,6 +134,30 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
       "notes": _notesController.text,
       "mileage": _mileageController.text,
       "network": _networkController.text,
+      "origin": _originController.text,
+      "destination": _destinationController.text,
+      "hasEndTime": _hasEndTime,
+      "hasOriginTime": _hasOriginTime,
+      "hasDestinationTime": _hasDestinationTime,
+      "endDate": _selectedEndDate.toIso8601String(),
+      "endTime": {
+        "hour": _selectedEndTime.hour,
+        "minute": _selectedEndTime.minute,
+      },
+      "originDate": _selectedOriginDate.toIso8601String(),
+      "originTime": {
+        "hour": _selectedOriginTime.hour,
+        "minute": _selectedOriginTime.minute,
+      },
+      "destinationDate": _selectedDestinationDate.toIso8601String(),
+      "destinationTime": {
+        "hour": _selectedDestinationTime.hour,
+        "minute": _selectedDestinationTime.minute,
+      },
+      "matchOriginToEntry": _matchOriginToEntry,
+      "matchDestinationToEntry": _matchDestinationToEntry,
+      "beginDelay": _parseDelayMinutes(_beginDelayController.text),
+      "endDelay": _parseDelayMinutes(_endDelayController.text),
       "useManualMileage": _useManualMileage,
       "selectedTripId": _selectedTripId,
       "routeResult": _routeResult == null
@@ -173,7 +235,14 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
     required String id,
     bool includeTimestamp = true,
   }) {
+    final units = _distanceUnits(context);
     final routeStations = _routeResult?.calculatedRoute ?? [];
+    final endTime = _legEndDateTime;
+    final originTime = _originDateTime;
+    final destinationTime = _destinationDateTime;
+    final beginDelay = _parseDelayMinutes(_beginDelayController.text);
+    final endDelay =
+        _hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0;
     final startVal = _useManualMileage
         ? _startController.text.trim()
         : (routeStations.isNotEmpty ? routeStations.first : '');
@@ -181,30 +250,36 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
         ? _endController.text.trim()
         : (routeStations.isNotEmpty ? routeStations.last : '');
     final mileageVal = _useManualMileage
-        ? double.tryParse(_mileageController.text.trim()) ?? 0
+        ? (units.milesFromInput(_mileageController.text.trim()) ?? 0)
         : (_routeResult?.distance ?? 0);
     final tractionPayload = _buildTractionPayload();
+    final commonPayload = {
+      "leg_trip": _selectedTripId,
+      "leg_begin_time": _legDateTime.toIso8601String(),
+      if (endTime != null) "leg_end_time": endTime.toIso8601String(),
+      if (originTime != null) "leg_origin_time": originTime.toIso8601String(),
+      if (destinationTime != null)
+        "leg_destination_time": destinationTime.toIso8601String(),
+      "leg_notes": _notesController.text.trim(),
+      "leg_headcode": _headcodeController.text.trim(),
+      "leg_network": _networkController.text.trim(),
+      "leg_origin": _originController.text.trim(),
+      "leg_destination": _destinationController.text.trim(),
+      "leg_begin_delay": beginDelay,
+      if (_hasEndTime) "leg_end_delay": endDelay,
+      "locos": tractionPayload,
+    };
     final payload = _useManualMileage
         ? {
-            "leg_trip": _selectedTripId,
+            ...commonPayload,
             "leg_start": startVal,
             "leg_end": endVal,
-            "leg_begin_time": _legDateTime.toIso8601String(),
-            "leg_network": _networkController.text.trim(),
             "leg_distance": mileageVal,
             "isKilometers": false,
-            "leg_notes": _notesController.text.trim(),
-            "leg_headcode": _headcodeController.text.trim(),
-            "locos": tractionPayload,
           }
         : {
-            "leg_trip": _selectedTripId,
+            ...commonPayload,
-            "leg_begin_time": _legDateTime.toIso8601String(),
             "leg_route": routeStations,
-            "leg_notes": _notesController.text.trim(),
-            "leg_headcode": _headcodeController.text.trim(),
-            "leg_network": _networkController.text.trim(),
-            "locos": tractionPayload,
             "leg_mileage": _routeResult?.distance ?? mileageVal,
           };
     return {
@@ -212,6 +287,7 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
       if (includeTimestamp) "saved_at": DateTime.now().toIso8601String(),
       "mode": _useManualMileage ? 'manual' : 'auto',
       "payload": payload,
+      "mileageText": _mileageController.text.trim(),
       "routeResult": _routeResult == null
           ? null
           : {
@@ -238,8 +314,32 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
     final beginTime = beginStr == null
         ? DateTime.now()
         : DateTime.tryParse(beginStr) ?? DateTime.now();
+    final originTimeStr = payload['leg_origin_time'] as String?;
+    final destinationTimeStr = payload['leg_destination_time'] as String?;
+    final originTime =
+        originTimeStr == null ? null : DateTime.tryParse(originTimeStr);
+    final destinationTime = destinationTimeStr == null
+        ? null
+        : DateTime.tryParse(destinationTimeStr);
+    final endStr = payload['leg_end_time'] as String?;
+    final endTime =
+        endStr == null ? null : DateTime.tryParse(endStr);
+    final beginDelay =
+        _parseDelayMinutes('${payload['leg_begin_delay'] ?? ''}');
+    final endDelay =
+        _parseDelayMinutes('${payload['leg_end_delay'] ?? ''}');
+    final hasEndTime = endTime != null || endDelay != 0;
+    final matchOrigin = data['matchOriginToEntry'] == true;
+    final matchDestination = data['matchDestinationToEntry'] == true;
+    final hasOriginTime =
+        originTime != null || data['hasOriginTime'] == true;
+    final hasDestinationTime =
+        destinationTime != null || data['hasDestinationTime'] == true;
+    final origin = payload['leg_origin'] as String? ?? '';
+    final destination = payload['leg_destination'] as String? ?? '';
     final tripRaw = payload['leg_trip'];
     final tripId = tripRaw is num ? tripRaw.toInt() : null;
+    final units = _distanceUnits(context);
 
     List<String> routeStations = [];
     RouteResult? restoredRouteResult;
@@ -285,6 +385,21 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
       _useManualMileage = useManual;
       _selectedDate = beginTime;
       _selectedTime = TimeOfDay.fromDateTime(beginTime);
+      _selectedEndDate = endTime ?? beginTime;
+      _selectedEndTime = TimeOfDay.fromDateTime(endTime ?? beginTime);
+      _hasEndTime = hasEndTime;
+      _matchOriginToEntry = matchOrigin;
+      _matchDestinationToEntry = matchDestination;
+      _selectedOriginDate = originTime ?? beginTime;
+      _selectedOriginTime =
+          TimeOfDay.fromDateTime(originTime ?? beginTime);
+      _selectedDestinationDate =
+          destinationTime ?? endTime ?? beginTime;
+      _selectedDestinationTime = TimeOfDay.fromDateTime(
+        destinationTime ?? endTime ?? beginTime,
+      );
+      _hasOriginTime = hasOriginTime;
+      _hasDestinationTime = hasDestinationTime;
       _selectedTripId = tripId == null || tripId == 0 ? null : tripId;
       _routeResult = restoredRouteResult;
       _headcodeController.text = (payload['leg_headcode'] as String? ?? '')
@@ -292,6 +407,10 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
       _networkController.text = (payload['leg_network'] as String? ?? '')
           .toUpperCase();
       _notesController.text = payload['leg_notes'] ?? '';
+      _originController.text = origin;
+      _destinationController.text = destination;
+      _beginDelayController.text = beginDelay.toString();
+      _endDelayController.text = endDelay.toString();
 
       if (useManual) {
         _startController.text = payload['leg_start'] ?? '';
@@ -299,14 +418,20 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
         final miles = (payload['leg_distance'] as num?)?.toDouble();
         _mileageController.text = miles == null || miles == 0
             ? ''
-            : miles.toStringAsFixed(2);
+            : units.format(
+                miles,
+                decimals: 2,
+                includeUnit: false,
+              );
       } else {
         _startController.text =
             routeStations.isNotEmpty ? routeStations.first : '';
         _endController.text =
             routeStations.isNotEmpty ? routeStations.last : '';
         final dist = _routeResult?.distance ?? 0;
-        _mileageController.text = dist == 0 ? '' : dist.toStringAsFixed(2);
+        _mileageController.text = dist == 0
+            ? ''
+            : units.format(dist, decimals: 2, includeUnit: false);
       }
 
       final tractionRaw = data['tractionItems'];
@@ -332,6 +457,7 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
       includeTimestamp: false,
     );
     _restoringDraft = false;
+    _scheduleMatchUpdate();
   }
 
   Future<void> _loadDraft() async {

lib/components/pages/new_entry/new_entry_drafts.dart

@@ -150,6 +150,7 @@ class _DraftListBodyState extends State<_DraftListBody> {
     final payload = draft.data['payload'];
     if (payload is! Map) return '';
     final map = Map<String, dynamic>.from(payload);
+    final units = context.read<DistanceUnitService>();
     final parts = <String>[];
     if ((map['leg_trip'] as int? ?? 0) != 0) {
       parts.add('Trip ${map['leg_trip']}');
@@ -164,7 +165,7 @@ class _DraftListBodyState extends State<_DraftListBody> {
         (map['leg_distance'] as num?)?.toDouble() ??
         (map['leg_mileage'] as num?)?.toDouble();
     if (mileage != null && mileage > 0) {
-      parts.add('${mileage.toStringAsFixed(1)} mi');
+      parts.add(units.format(mileage, decimals: 1));
     } else if (map['leg_route'] is List &&
         (map['leg_route'] as List).isNotEmpty) {
       parts.add('Route ${(map['leg_route'] as List).length} stops');
@@ -176,4 +177,3 @@ class _DraftListBodyState extends State<_DraftListBody> {
     return parts.join(' • ');
   }
 }
-

lib/components/pages/new_entry/new_entry_picker_pages.dart

@@ -1,8 +1,12 @@
 part of 'new_entry.dart';
 
 class _CalculatorPickerPage extends StatelessWidget {
-  const _CalculatorPickerPage({required this.onResult});
+  const _CalculatorPickerPage({
+    required this.onResult,
+    this.initialStations,
+  });
   final ValueChanged<RouteResult> onResult;
+  final List<String>? initialStations;
 
   @override
   Widget build(BuildContext context) {
@@ -14,8 +18,10 @@ class _CalculatorPickerPage extends StatelessWidget {
         ),
         title: const Text('Mileage calculator'),
       ),
-      body: RouteCalculator(onApplyRoute: onResult),
+      body: RouteCalculator(
+        onApplyRoute: onResult,
+        initialStations: initialStations,
+      ),
     );
   }
 }
-

lib/components/pages/new_entry/new_entry_submit_logic.dart

@@ -4,11 +4,12 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
   Future<bool> _validateRequiredFields() async {
     final missing = <String>[];
 
+    final units = _distanceUnits(context);
     if (_useManualMileage) {
       if (_startController.text.trim().isEmpty) missing.add('From');
       if (_endController.text.trim().isEmpty) missing.add('To');
       final mileageText = _mileageController.text.trim();
-      if (double.tryParse(mileageText) == null) {
+      if (mileageText.isEmpty || units.milesFromInput(mileageText) == null) {
         missing.add('Mileage');
       }
     } else {
@@ -27,7 +28,8 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     final fieldList = missing.join(', ');
     await showDialog<void>(
       context: context,
-      builder: (_) => AlertDialog(
+      useRootNavigator: false,
+      builder: (dialogCtx) => AlertDialog(
         title: const Text('Required field missing'),
         content: Text(
           missing.length == 1
@@ -36,7 +38,7 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
         ),
         actions: [
           TextButton(
-            onPressed: () => Navigator.of(context).pop(),
+            onPressed: () => Navigator.of(dialogCtx).pop(),
             child: const Text('OK'),
           ),
         ],
@@ -46,7 +48,9 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
   }
 
   Future<void> _submit() async {
-    if (!_formKey.currentState!.validate()) return;
+    final form = _formKey.currentState;
+    if (form == null) return;
+    if (!form.validate()) return;
     if (!await _validateRequiredFields()) return;
     final routeStations = _routeResult?.calculatedRoute ?? [];
     final startVal = _useManualMileage
@@ -55,10 +59,17 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     final endVal = _useManualMileage
         ? _endController.text.trim()
         : (routeStations.isNotEmpty ? routeStations.last : '');
+    final units = _distanceUnits(context);
     final mileageVal = _useManualMileage
-        ? double.tryParse(_mileageController.text.trim()) ?? 0
+        ? (units.milesFromInput(_mileageController.text.trim()) ?? 0)
         : (_routeResult?.distance ?? 0);
     final tractionPayload = _buildTractionPayload();
+    final endTime = _legEndDateTime;
+    final originTime = _originDateTime;
+    final destinationTime = _destinationDateTime;
+    final beginDelay = _parseDelayMinutes(_beginDelayController.text);
+    final endDelay =
+        _hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0;
     final snapshot = _buildSubmissionSnapshot(
       routeStations: routeStations,
       startVal: startVal,
@@ -79,19 +90,31 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     final isEditingExisting = _isEditing && widget.editLegId != null;
 
     try {
+      final commonPayload = {
+        if (isEditingExisting) "leg_id": widget.editLegId,
+        "leg_trip": _selectedTripId,
+        "leg_begin_time": _legDateTime.toIso8601String(),
+        if (endTime != null) "leg_end_time": endTime.toIso8601String(),
+        if (originTime != null)
+          "leg_origin_time": originTime.toIso8601String(),
+        if (destinationTime != null)
+          "leg_destination_time": destinationTime.toIso8601String(),
+        "leg_notes": _notesController.text.trim(),
+        "leg_headcode": _headcodeController.text.trim(),
+        "leg_network": _networkController.text.trim(),
+        "leg_origin": _originController.text.trim(),
+        "leg_destination": _destinationController.text.trim(),
+        "leg_begin_delay": beginDelay,
+        if (_hasEndTime) "leg_end_delay": endDelay,
+        "locos": tractionPayload,
+      };
       if (_useManualMileage) {
         final body = {
-          if (isEditingExisting) "leg_id": widget.editLegId,
+          ...commonPayload,
-          "leg_trip": _selectedTripId,
           "leg_start": startVal,
           "leg_end": endVal,
-          "leg_begin_time": _legDateTime.toIso8601String(),
-          "leg_network": _networkController.text.trim(),
           "leg_distance": mileageVal,
           "isKilometers": false,
-          "leg_notes": _notesController.text.trim(),
-          "leg_headcode": _headcodeController.text.trim(),
-          "locos": tractionPayload,
         };
         if (isEditingExisting) {
           await api.put('/update', body);
@@ -100,14 +123,8 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
         }
       } else {
         final body = {
-          if (isEditingExisting) "leg_id": widget.editLegId,
+          ...commonPayload,
-          "leg_trip": _selectedTripId,
-          "leg_begin_time": _legDateTime.toIso8601String(),
           "leg_route": routeStations,
-          "leg_notes": _notesController.text.trim(),
-          "leg_headcode": _headcodeController.text.trim(),
-          "leg_network": _networkController.text.trim(),
-          "locos": tractionPayload,
         };
         if (isEditingExisting) {
           await api.put('/update', body);
@@ -117,6 +134,7 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
       }
       if (!mounted) return;
       dataService.refreshLegs();
+      await dataService.fetchNotifications();
       if (!mounted) return;
       messenger?.showSnackBar(
         SnackBar(
@@ -125,7 +143,9 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
       );
       _lastSubmittedSnapshot = snapshot;
       _activeDraftId = null;
-    } catch (e) {
+    } catch (e, st) {
+      debugPrint('Leg submit/update failed: $e');
+      debugPrintStack(stackTrace: st);
       if (!mounted) return;
       messenger?.showSnackBar(
         SnackBar(content: Text('Failed to submit: $e')),
@@ -142,18 +162,31 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     required double mileageVal,
     required List<Map<String, dynamic>> tractionPayload,
   }) {
+    final beginDelay = _parseDelayMinutes(_beginDelayController.text);
+    final endDelay =
+        _hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0;
     return {
       "legId": widget.editLegId,
       "useManualMileage": _useManualMileage,
       "tripId": _selectedTripId,
       "legDateTime": _legDateTime.toIso8601String(),
+      "legEndTime": _legEndDateTime?.toIso8601String(),
+      "hasEndTime": _hasEndTime,
+      "legOriginTime": _originDateTime?.toIso8601String(),
+      "hasOriginTime": _hasOriginTime,
+      "legDestinationTime": _destinationDateTime?.toIso8601String(),
+      "hasDestinationTime": _hasDestinationTime,
       "start": startVal,
       "end": endVal,
+      "origin": _originController.text.trim(),
+      "destination": _destinationController.text.trim(),
       "routeStations": routeStations,
       "mileage": mileageVal,
       "network": _networkController.text.trim(),
       "notes": _notesController.text.trim(),
       "headcode": _headcodeController.text.trim(),
+      "beginDelay": beginDelay,
+      "endDelay": endDelay,
       "locos": tractionPayload,
       "routeResult": _routeResult == null
           ? null
@@ -196,11 +229,27 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     _notesController.clear();
     _mileageController.clear();
     _networkController.clear();
+    _originController.clear();
+    _destinationController.clear();
+    _beginDelayController.text = '0';
+    _endDelayController.text = '0';
     final now = DateTime.now();
     _setState(() {
       _selectedDate = now;
       _selectedTime = TimeOfDay.fromDateTime(now);
+      _selectedEndDate = now;
+      _selectedEndTime = TimeOfDay.fromDateTime(now);
+      _selectedOriginDate = now;
+      _selectedOriginTime = TimeOfDay.fromDateTime(now);
+      _selectedDestinationDate = now;
+      _selectedDestinationTime = TimeOfDay.fromDateTime(now);
       _useManualMileage = false;
+      _hasEndTime = false;
+      _hasOriginTime = false;
+      _hasDestinationTime = false;
+      _matchOriginToEntry = false;
+      _matchDestinationToEntry = false;
+      _matchUpdateScheduled = false;
       _routeResult = null;
       _tractionItems
         ..clear()
@@ -208,6 +257,8 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
       _selectedTripId = null;
       _submitting = false;
       _activeDraftId = null;
+      _savingDraft = false;
+      _loadedDraftSnapshot = null;
     });
     if (clearDraft) {
       await _clearDraft();

lib/components/pages/new_entry/new_entry_traction_logic.dart

@@ -73,6 +73,8 @@ extension _NewEntryTractionLogic on _NewEntryPageState {
     for (var i = 0; i < _tractionItems.length; i++) {
       final item = _tractionItems[i];
       if (item.isMarker || item.loco == null) continue;
+      final locoId = item.loco!.id;
+      if (locoId == 0) continue;
       int allocPos;
       if (i > markerIndex) {
         allocPos = -(i - markerIndex);
@@ -80,8 +82,7 @@ extension _NewEntryTractionLogic on _NewEntryPageState {
         allocPos = (markerIndex - 1) - i;
       }
       payload.add({
-        "loco_type": item.loco!.type,
+        "loco_id": locoId,
-        "loco_number": item.loco!.number,
         "alloc_pos": allocPos,
         "alloc_powering": item.powering ? 1 : 0,
       });

lib/components/pages/profile.dart

@@ -0,0 +1,705 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:provider/provider.dart';
+
+class ProfilePage extends StatefulWidget {
+  const ProfilePage({super.key});
+
+  @override
+  State<ProfilePage> createState() => _ProfilePageState();
+}
+
+class _ProfilePageState extends State<ProfilePage> {
+  bool _initialised = false;
+  final Map<String, bool> _groupExpanded = {};
+  bool _loadingAwards = false;
+  bool _loadingClassProgress = false;
+  bool _loadingLocoProgress = false;
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    if (_initialised) return;
+    _initialised = true;
+    _refreshAwards();
+  }
+
+  Future<void> _refreshAwards() {
+    _loadingAwards = false;
+    _loadingClassProgress = false;
+    _loadingLocoProgress = false;
+    final data = context.read<DataService>();
+    return Future.wait([
+      data.fetchBadgeAwards(limit: 20, badgeCode: 'class_clearance'),
+      data.fetchClassClearanceProgress(),
+      data.fetchLocoClearanceProgress(),
+    ]);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final data = context.watch<DataService>();
+    final awards = data.badgeAwards;
+    final loading = data.isBadgeAwardsLoading;
+    final classProgress = data.classClearanceProgress;
+    final classProgressLoading =
+        data.isClassClearanceProgressLoading || _loadingClassProgress;
+    final locoProgress = data.locoClearanceProgress;
+    final locoProgressLoading =
+        data.isLocoClearanceProgressLoading || _loadingLocoProgress;
+    final hasAnyData =
+        awards.isNotEmpty || classProgress.isNotEmpty || locoProgress.isNotEmpty;
+
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Badges'),
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () {
+            final navigator = Navigator.of(context);
+            if (navigator.canPop()) {
+              navigator.pop();
+            } else {
+              context.go('/');
+            }
+          },
+        ),
+      ),
+      body: RefreshIndicator(
+        onRefresh: _refreshAwards,
+        child: ListView(
+          padding: const EdgeInsets.all(16),
+          children: [
+            if ((loading || classProgressLoading || locoProgressLoading) &&
+                !hasAnyData)
+              const Center(
+                child: Padding(
+                  padding: EdgeInsets.symmetric(vertical: 24.0),
+                  child: CircularProgressIndicator(),
+                ),
+              )
+            else if (!hasAnyData)
+              const Padding(
+                padding: EdgeInsets.symmetric(vertical: 12.0),
+                child: Text('No badges awarded yet.'),
+              )
+            else
+              ..._buildGroupedAwards(
+                context,
+                awards,
+                classProgress,
+                locoProgress,
+                classProgressLoading,
+                locoProgressLoading,
+                data.classClearanceHasMore,
+                data.locoClearanceHasMore,
+                data.badgeAwardsHasMore,
+                loading,
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  List<Widget> _buildGroupedAwards(
+    BuildContext context,
+    List<BadgeAward> awards,
+    List<ClassClearanceProgress> classProgress,
+    List<LocoClearanceProgress> locoProgress,
+    bool classProgressLoading,
+    bool locoProgressLoading,
+    bool classProgressHasMore,
+    bool locoProgressHasMore,
+    bool badgeAwardsHasMore,
+    bool badgeAwardsLoading,
+  ) {
+    final grouped = _groupAwards(awards);
+    if ((classProgress.isNotEmpty || classProgressLoading) &&
+        !grouped.containsKey('class_clearance')) {
+      grouped['class_clearance'] = [];
+    }
+    if ((locoProgress.isNotEmpty || locoProgressLoading) &&
+        !grouped.containsKey('loco_clearance')) {
+      grouped['loco_clearance'] = [];
+    }
+    final codes = _orderedBadgeCodes(grouped.keys.toList());
+
+    return codes.map((code) {
+      final items = grouped[code]!;
+      final expanded = _groupExpanded[code] ?? true;
+      final title = _formatBadgeName(code);
+      final isClass = code == 'class_clearance';
+      final isLoco = code == 'loco_clearance';
+      final classItems = isClass ? classProgress : <ClassClearanceProgress>[];
+      final locoItems = isLoco ? locoProgress : <LocoClearanceProgress>[];
+      final awardCount = isLoco
+          ? locoItems.where((item) => item.awardedTiers.isNotEmpty).length
+          : items.length;
+      final isLoadingSection = isClass
+          ? (classProgressLoading || badgeAwardsLoading || _loadingAwards)
+          : (isLoco ? locoProgressLoading : false);
+
+      final children = <Widget>[];
+
+      if (isClass && items.isNotEmpty) {
+        children.add(_buildSubheading(context, 'Awarded'));
+        children.addAll(
+          items.map(
+            (award) => Padding(
+              padding:
+                  const EdgeInsets.symmetric(horizontal: 12.0, vertical: 4.0),
+              child: _buildAwardCard(context, award, compact: true),
+            ),
+          ),
+        );
+        if (badgeAwardsHasMore || badgeAwardsLoading || _loadingAwards) {
+          children.add(
+            Padding(
+              padding: const EdgeInsets.only(top: 4.0, bottom: 8.0),
+              child: _buildLoadMoreButton(
+                context,
+                badgeAwardsLoading || _loadingAwards,
+                () => _loadMoreAwards(),
+              ),
+            ),
+          );
+        }
+      } else if (!isClass && !isLoco && items.isNotEmpty) {
+        children.add(_buildSubheading(context, 'Awarded'));
+        children.addAll(
+          items.map(
+            (award) => Padding(
+              padding:
+                  const EdgeInsets.symmetric(horizontal: 12.0, vertical: 4.0),
+              child: _buildAwardCard(context, award, compact: true),
+            ),
+          ),
+        );
+      }
+
+      if (isClass) {
+        children.addAll(
+          _buildClassProgressSection(
+            context,
+            classItems,
+            classProgressLoading,
+            classProgressHasMore,
+          ),
+        );
+      }
+      if (isLoco) {
+        children.addAll(
+          _buildLocoProgressSection(
+            context,
+            locoItems,
+            locoProgressLoading,
+            locoProgressHasMore,
+            showHeading: false,
+          ),
+        );
+      }
+
+      if (children.isEmpty && !isLoadingSection) {
+        children.add(
+          const Padding(
+            padding: EdgeInsets.symmetric(vertical: 6.0),
+            child: Text('No awards'),
+          ),
+        );
+      }
+
+      return Card(
+        margin: const EdgeInsets.symmetric(vertical: 4.0),
+        child: ExpansionTile(
+          key: ValueKey(code),
+          tilePadding: const EdgeInsets.symmetric(horizontal: 12.0),
+          title: Row(
+            children: [
+              Expanded(child: Text(title)),
+              if (isLoadingSection) ...[
+                const SizedBox(width: 8),
+                const SizedBox(
+                  height: 18,
+                  width: 18,
+                  child: CircularProgressIndicator(strokeWidth: 2),
+                ),
+              ],
+              const SizedBox(width: 8),
+              _buildCountChip(context, awardCount),
+            ],
+          ),
+          initiallyExpanded: expanded,
+          onExpansionChanged: (isOpen) {
+            setState(() => _groupExpanded[code] = isOpen);
+          },
+          children: children,
+        ),
+      );
+    }).toList();
+  }
+
+  Map<String, List<BadgeAward>> _groupAwards(List<BadgeAward> awards) {
+    final Map<String, List<BadgeAward>> grouped = {};
+    for (final award in awards) {
+      final code = award.badgeCode.toLowerCase();
+      grouped.putIfAbsent(code, () => []).add(award);
+    }
+    return grouped;
+  }
+
+  Widget _buildAwardCard(
+    BuildContext context,
+    BadgeAward award, {
+    bool compact = false,
+  }) {
+    final badgeName = _formatBadgeName(award.badgeCode);
+    final tier = award.badgeTier.isNotEmpty
+        ? award.badgeTier[0].toUpperCase() + award.badgeTier.substring(1)
+        : '';
+    final tierIcon = _buildTierIcon(award.badgeTier);
+    final scope = _scopeToShow(award);
+
+    final content = Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          children: [
+            if (tierIcon != null) ...[
+              tierIcon,
+              const SizedBox(width: 8),
+            ],
+            Expanded(
+              child: Text(
+                '$badgeName • $tier',
+                style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.w700,
+                    ),
+              ),
+            ),
+            if (award.awardedAt != null)
+              Text(
+                _formatAwardDate(award.awardedAt!),
+                style: Theme.of(context).textTheme.bodySmall,
+              ),
+          ],
+        ),
+        if (scope != null && scope.isNotEmpty) ...[
+          const SizedBox(height: 4),
+          Text(
+            scope,
+            style: Theme.of(context).textTheme.bodyMedium,
+          ),
+        ],
+        if (award.loco != null) ...[
+          const SizedBox(height: 6),
+          _buildLocoInfo(context, award.loco!),
+        ],
+      ],
+    );
+
+    if (compact) {
+      return content;
+    }
+
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(10.0),
+        child: content,
+      ),
+    );
+  }
+
+  Widget _buildLocoInfo(BuildContext context, LocoSummary loco) {
+    final lines = <String>[];
+    final classNum = [
+      if (loco.locoClass.isNotEmpty) loco.locoClass,
+      if (loco.number.isNotEmpty) loco.number,
+    ].join(' ');
+    if (classNum.isNotEmpty) lines.add(classNum);
+    if ((loco.name ?? '').isNotEmpty) lines.add(loco.name!);
+    if ((loco.livery ?? '').isNotEmpty) lines.add(loco.livery!);
+    if ((loco.location ?? '').isNotEmpty) lines.add(loco.location!);
+
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        const Icon(Icons.train, size: 20),
+        const SizedBox(width: 8),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: lines.map((line) {
+              return Text(
+                line,
+                style: Theme.of(context).textTheme.bodyMedium,
+              );
+            }).toList(),
+          ),
+        ),
+      ],
+    );
+  }
+
+  String _formatBadgeName(String code) {
+    if (code.isEmpty) return 'Badge';
+    const known = {
+      'class_clearance': 'Class Clearance',
+      'loco_clearance': 'Loco Clearance',
+    };
+    final lower = code.toLowerCase();
+    if (known.containsKey(lower)) return known[lower]!;
+    final parts = code.split(RegExp(r'[_\\s]+')).where((p) => p.isNotEmpty);
+    return parts
+        .map((p) => p[0].toUpperCase() + p.substring(1).toLowerCase())
+        .join(' ');
+  }
+
+  List<String> _orderedBadgeCodes(List<String> codes) {
+    final lowerCodes = codes.map((c) => c.toLowerCase()).toSet();
+    final ordered = <String>[];
+    for (final code in ['loco_clearance', 'class_clearance']) {
+      if (lowerCodes.remove(code)) ordered.add(code);
+    }
+    final remaining = lowerCodes.toList()
+      ..sort((a, b) => _formatBadgeName(a).compareTo(_formatBadgeName(b)));
+    ordered.addAll(remaining);
+    return ordered;
+  }
+
+  Widget _buildSubheading(BuildContext context, String label) {
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(16, 8, 16, 4),
+      child: Text(
+        label,
+        style: Theme.of(context)
+            .textTheme
+            .labelMedium
+            ?.copyWith(fontWeight: FontWeight.w700),
+      ),
+    );
+  }
+
+  List<Widget> _buildClassProgressSection(
+    BuildContext context,
+    List<ClassClearanceProgress> progress,
+    bool isLoading,
+    bool hasMore,
+  ) {
+    if (progress.isEmpty && !isLoading && !hasMore) return const [];
+    return [
+      _buildSubheading(context, 'In Progress'),
+      ...progress.map(
+        (item) => Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 6.0),
+          child: _buildClassProgressCard(context, item),
+        ),
+      ),
+      if (hasMore || isLoading)
+        Padding(
+          padding: const EdgeInsets.only(top: 4.0, bottom: 8.0),
+          child: _buildLoadMoreButton(
+            context,
+            isLoading,
+            () => _loadMoreClassProgress(),
+          ),
+        ),
+      if (progress.isNotEmpty) const SizedBox(height: 4),
+    ];
+  }
+
+  List<Widget> _buildLocoProgressSection(
+    BuildContext context,
+    List<LocoClearanceProgress> progress,
+    bool isLoading,
+    bool hasMore,
+    {bool showHeading = true}
+  ) {
+    if (progress.isEmpty && !isLoading && !hasMore) return const [];
+    return [
+      if (showHeading) _buildSubheading(context, 'In Progress'),
+      if (progress.isEmpty && isLoading)
+        Padding(
+          padding: const EdgeInsets.symmetric(vertical: 12.0),
+          child: _buildLoadingIndicator(),
+        ),
+      ...progress.map(
+        (item) => Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 6.0),
+          child: _buildLocoProgressCard(context, item),
+        ),
+      ),
+      if (hasMore || isLoading)
+        Padding(
+          padding: const EdgeInsets.only(top: 4.0, bottom: 8.0),
+          child: _buildLoadMoreButton(
+            context,
+            isLoading,
+            () => _loadMoreLocoProgress(),
+          ),
+        ),
+      if (progress.isNotEmpty) const SizedBox(height: 4),
+    ];
+  }
+
+  Widget _buildClassProgressCard(
+    BuildContext context,
+    ClassClearanceProgress progress,
+  ) {
+    final pct = progress.percentComplete.clamp(0, 100);
+    return Card(
+      margin: const EdgeInsets.symmetric(vertical: 4.0),
+      child: Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Expanded(
+                  child: Text(
+                    progress.className,
+                    style: Theme.of(context).textTheme.bodyMedium,
+                  ),
+                ),
+                Text(
+                  '${pct.toStringAsFixed(0)}%',
+                  style: Theme.of(context).textTheme.labelMedium,
+                ),
+              ],
+            ),
+            const SizedBox(height: 4),
+            LinearProgressIndicator(
+              value: progress.total == 0 ? 0 : pct / 100,
+              minHeight: 6,
+            ),
+            if (progress.total > 0)
+              Padding(
+                padding: const EdgeInsets.only(top: 2.0),
+                child: Text(
+                  '${progress.completed}/${progress.total}',
+                  style: Theme.of(context)
+                      .textTheme
+                      .labelSmall
+                      ?.copyWith(color: Theme.of(context).hintColor),
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildLocoProgressCard(
+    BuildContext context,
+    LocoClearanceProgress progress,
+  ) {
+    final tierIcons = progress.awardedTiers
+        .map((tier) => _buildTierIcon(tier, size: 18))
+        .whereType<Widget>()
+        .toList();
+    final reachedTopTier = progress.nextTier.isEmpty;
+    final pct = progress.percent.clamp(0, 100);
+    final nextTier = progress.nextTier.isNotEmpty
+        ? progress.nextTier[0].toUpperCase() + progress.nextTier.substring(1)
+        : 'Next';
+    final loco = progress.loco;
+    final title = [
+      if (loco.number.isNotEmpty) loco.number,
+      if (loco.locoClass.isNotEmpty) loco.locoClass,
+    ].join(' • ');
+    return Card(
+      margin: const EdgeInsets.symmetric(vertical: 4.0),
+      child: Padding(
+        padding: const EdgeInsets.all(10.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Expanded(
+                  child: Text(
+                    title.isNotEmpty ? title : 'Loco',
+                    style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                  ),
+                ),
+                if (tierIcons.isNotEmpty)
+                  Row(
+                    children: tierIcons
+                        .expand((icon) sync* {
+                          yield icon;
+                          yield const SizedBox(width: 4);
+                        })
+                        .toList()
+                      ..removeLast(),
+                  ),
+              ],
+            ),
+            if ((loco.name ?? '').isNotEmpty)
+              Padding(
+                padding: const EdgeInsets.only(top: 2.0),
+                child: Text(
+                  loco.name ?? '',
+                  style: Theme.of(context).textTheme.bodySmall,
+                ),
+              ),
+            if (!reachedTopTier) ...[
+              const SizedBox(height: 4),
+              LinearProgressIndicator(
+                value: progress.required == 0 ? 0 : pct / 100,
+                minHeight: 6,
+              ),
+              Padding(
+                padding: const EdgeInsets.only(top: 2.0),
+                child: Text(
+                  '${pct.toStringAsFixed(0)}% to $nextTier award',
+                  style: Theme.of(context).textTheme.bodyMedium,
+                ),
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildLoadMoreButton(
+    BuildContext context,
+    bool isLoading,
+    Future<void> Function() onPressed,
+  ) {
+    return Align(
+      alignment: Alignment.center,
+      child: OutlinedButton.icon(
+        onPressed: isLoading
+            ? null
+            : () {
+                onPressed();
+              },
+        icon: isLoading
+            ? const SizedBox(
+                height: 18,
+                width: 18,
+                child: CircularProgressIndicator(strokeWidth: 2),
+              )
+            : const Icon(Icons.expand_more),
+        label: Text(isLoading ? 'Loading...' : 'Load more'),
+      ),
+    );
+  }
+
+  Widget _buildLoadingIndicator() {
+    return const Center(
+      child: SizedBox(
+        height: 24,
+        width: 24,
+        child: CircularProgressIndicator(strokeWidth: 2),
+      ),
+    );
+  }
+
+  Widget _buildCountChip(BuildContext context, int count) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.surfaceContainerHighest,
+        borderRadius: BorderRadius.circular(999),
+      ),
+      child: Text(
+        '$count',
+        style: Theme.of(context)
+            .textTheme
+            .labelMedium
+            ?.copyWith(fontWeight: FontWeight.w700),
+      ),
+    );
+  }
+
+  Future<void> _loadMoreClassProgress() {
+    final data = context.read<DataService>();
+    if (data.isClassClearanceProgressLoading || _loadingClassProgress) {
+      return Future.value();
+    }
+    setState(() => _loadingClassProgress = true);
+    return data
+        .fetchClassClearanceProgress(
+          offset: data.classClearanceProgress.length,
+          append: true,
+        )
+        .whenComplete(() {
+      if (mounted) setState(() => _loadingClassProgress = false);
+    });
+  }
+
+  Future<void> _loadMoreLocoProgress() {
+    final data = context.read<DataService>();
+    if (data.isLocoClearanceProgressLoading || _loadingLocoProgress) {
+      return Future.value();
+    }
+    setState(() => _loadingLocoProgress = true);
+    return data
+        .fetchLocoClearanceProgress(
+          offset: data.locoClearanceProgress.length,
+          append: true,
+        )
+        .whenComplete(() {
+      if (mounted) setState(() => _loadingLocoProgress = false);
+    });
+  }
+
+  Future<void> _loadMoreAwards() {
+    final data = context.read<DataService>();
+    if (data.isBadgeAwardsLoading || _loadingAwards) return Future.value();
+    setState(() => _loadingAwards = true);
+    return data
+        .fetchBadgeAwards(
+          offset: data.badgeAwards.length,
+          append: true,
+          badgeCode: 'class_clearance',
+          limit: 20,
+        )
+        .whenComplete(() {
+      if (mounted) setState(() => _loadingAwards = false);
+    });
+  }
+
+  String _formatAwardDate(DateTime date) {
+    final y = date.year.toString().padLeft(4, '0');
+    final m = date.month.toString().padLeft(2, '0');
+    final d = date.day.toString().padLeft(2, '0');
+    return '$y-$m-$d';
+  }
+
+  Widget? _buildTierIcon(String tier, {double size = 24}) {
+    final lower = tier.toLowerCase();
+    Color? color;
+    switch (lower) {
+      case 'bronze':
+        color = const Color(0xFFCD7F32);
+        break;
+      case 'silver':
+        color = const Color(0xFFC0C0C0);
+        break;
+      case 'gold':
+        color = const Color(0xFFFFD700);
+        break;
+    }
+    if (color == null) return null;
+    return Icon(Icons.emoji_events, color: color, size: size);
+  }
+
+  String? _scopeToShow(BadgeAward award) {
+    final scope = award.scopeValue?.trim() ?? '';
+    if (scope.isEmpty) return null;
+    final code = award.badgeCode.toLowerCase();
+    if (code == 'loco_clearance') {
+      // Hide numeric loco IDs; loco details are shown separately.
+      if (int.tryParse(scope) != null) return null;
+    }
+    return scope;
+  }
+}

lib/components/pages/settings.dart

@@ -0,0 +1,386 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:http/http.dart' as http;
+import 'package:mileograph_flutter/services/authservice.dart';
+import 'package:mileograph_flutter/services/api_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
+import 'package:mileograph_flutter/services/endpoint_service.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:provider/provider.dart';
+
+class SettingsPage extends StatefulWidget {
+  const SettingsPage({super.key});
+
+  @override
+  State<SettingsPage> createState() => _SettingsPageState();
+}
+
+class _SettingsPageState extends State<SettingsPage> {
+  late final TextEditingController _endpointController;
+  bool _saving = false;
+  bool _changingPassword = false;
+  final _passwordFormKey = GlobalKey<FormState>();
+  late final TextEditingController _currentPasswordController;
+  late final TextEditingController _newPasswordController;
+  late final TextEditingController _confirmPasswordController;
+
+  @override
+  void initState() {
+    super.initState();
+    final endpoint = context.read<EndpointService>().baseUrl;
+    _endpointController = TextEditingController(text: endpoint);
+    _currentPasswordController = TextEditingController();
+    _newPasswordController = TextEditingController();
+    _confirmPasswordController = TextEditingController();
+  }
+
+  @override
+  void dispose() {
+    _currentPasswordController.dispose();
+    _newPasswordController.dispose();
+    _confirmPasswordController.dispose();
+    _endpointController.dispose();
+    super.dispose();
+  }
+
+  Future<String?> _probeVersion(String url) async {
+    try {
+      var uri = Uri.parse(url.trim());
+      if (uri.scheme.isEmpty) {
+        uri = Uri.parse('https://$url');
+      }
+      // Probe the provided API endpoint as-is.
+      final target = uri;
+      final res = await http.get(target).timeout(const Duration(seconds: 10));
+      debugPrint(
+        'Endpoint probe ${target.toString()} -> ${res.statusCode} ${res.body}',
+      );
+      if (res.statusCode < 200 || res.statusCode >= 300) return null;
+      final body = res.body.trim();
+      debugPrint('Endpoint probe body: $body');
+      // Try JSON first
+      String? version;
+      try {
+        final parsed = jsonDecode(body);
+        debugPrint('Endpoint probe parsed: $parsed');
+        if (parsed is Map && parsed['version'] is String) {
+          version = parsed['version'] as String;
+        } else if (parsed is String) {
+          final candidate = parsed.trim().replaceAll('"', '');
+          if (RegExp(r'^\d+\.\d+\.\d+$').hasMatch(candidate)) {
+            version = candidate;
+          }
+        }
+      } catch (_) {
+        // fall back to raw body parsing
+      }
+      version ??= body.split(RegExp(r'\s+')).firstWhere(
+        (part) => RegExp(r'^\d+\.\d+\.\d+$').hasMatch(part),
+        orElse: () => '',
+      );
+      if (version.isEmpty) return null;
+      final isValid = RegExp(r'^\d+\.\d+\.\d+$').hasMatch(version);
+      return isValid ? version : null;
+    } catch (_) {
+      return null;
+    }
+  }
+
+  Future<void> _save() async {
+    final endpointService = context.read<EndpointService>();
+    final dataService = context.read<DataService>();
+    final messenger = ScaffoldMessenger.of(context);
+    final value = _endpointController.text.trim();
+    if (value.isEmpty) {
+      messenger.showSnackBar(
+        const SnackBar(content: Text('Please enter an endpoint URL.')),
+      );
+      return;
+    }
+    setState(() => _saving = true);
+    try {
+      final version = await _probeVersion(value);
+      if (version == null) {
+        if (mounted) {
+          messenger.showSnackBar(
+            const SnackBar(
+              content: Text('Endpoint test failed: no valid version returned.'),
+            ),
+          );
+        }
+        return;
+      }
+      await endpointService.setBaseUrl(value);
+      if (mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Endpoint set to "$value" ($version)')),
+        );
+        await Future.wait([
+          dataService.fetchHomepageStats(),
+          dataService.fetchOnThisDay(),
+          dataService.fetchTrips(),
+          dataService.fetchHadTraction(),
+          dataService.fetchLatestLocoChanges(),
+          dataService.fetchLegs(),
+        ]);
+      }
+    } catch (e) {
+      if (mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Failed to save endpoint: $e')),
+        );
+      }
+    } finally {
+      if (mounted) {
+        setState(() => _saving = false);
+      }
+    }
+  }
+
+  Future<void> _changePassword() async {
+    final messenger = ScaffoldMessenger.of(context);
+    final formState = _passwordFormKey.currentState;
+    if (formState == null || !formState.validate()) return;
+
+    FocusScope.of(context).unfocus();
+    setState(() => _changingPassword = true);
+    try {
+      final api = context.read<ApiService>();
+      await api.post('/user/password/change', {
+        'old_password': _currentPasswordController.text,
+        'new_password': _newPasswordController.text,
+      });
+      if (!mounted) return;
+      messenger.showSnackBar(
+        const SnackBar(content: Text('Password updated successfully.')),
+      );
+      formState.reset();
+      _currentPasswordController.clear();
+      _newPasswordController.clear();
+      _confirmPasswordController.clear();
+    } catch (e) {
+      if (mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Failed to change password: $e')),
+        );
+      }
+    } finally {
+      if (mounted) {
+        setState(() => _changingPassword = false);
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final endpointService = context.watch<EndpointService>();
+    final distanceUnitService = context.watch<DistanceUnitService>();
+    final loggedIn = context.select<AuthService, bool>(
+      (auth) => auth.isLoggedIn,
+    );
+    if (!endpointService.isLoaded || !distanceUnitService.isLoaded) {
+      return const Scaffold(
+        body: Center(child: CircularProgressIndicator()),
+      );
+    }
+
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Settings'),
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () {
+            final navigator = Navigator.of(context);
+            if (navigator.canPop()) {
+              navigator.pop();
+            } else {
+              context.go('/');
+            }
+          },
+        ),
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              'Distance units',
+              style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              'Choose how distances are displayed across the app.',
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+            const SizedBox(height: 12),
+            SegmentedButton<DistanceUnit>(
+              segments: DistanceUnit.values
+                  .map(
+                    (unit) => ButtonSegment<DistanceUnit>(
+                      value: unit,
+                      label: Text(unit.label),
+                    ),
+                  )
+                  .toList(),
+              selected: {distanceUnitService.unit},
+              onSelectionChanged: (selection) {
+                final next = selection.first;
+                distanceUnitService.setUnit(next);
+              },
+            ),
+            const SizedBox(height: 24),
+            Text(
+              'API endpoint',
+              style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              'Set the base URL for the Mileograph API. Leave blank to use the default.',
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+            const SizedBox(height: 16),
+            TextField(
+              controller: _endpointController,
+              decoration: const InputDecoration(
+                labelText: 'Endpoint URL',
+                hintText: 'https://mileograph.co.uk/api/v1',
+                border: OutlineInputBorder(),
+              ),
+            ),
+            const SizedBox(height: 16),
+            Row(
+              children: [
+                FilledButton.icon(
+                  onPressed: _saving ? null : _save,
+                  icon: _saving
+                      ? const SizedBox(
+                          width: 18,
+                          height: 18,
+                          child: CircularProgressIndicator(strokeWidth: 2),
+                        )
+                      : const Icon(Icons.save),
+                  label: const Text('Save endpoint'),
+                ),
+                const SizedBox(width: 12),
+                TextButton(
+                  onPressed: _saving
+                      ? null
+                      : () {
+                          _endpointController.text =
+                              EndpointService.defaultBaseUrl;
+                        },
+                  child: const Text('Reset to default'),
+                ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            Text(
+              'Current: ${endpointService.baseUrl}',
+              style: Theme.of(context).textTheme.labelSmall,
+            ),
+            if (loggedIn) ...[
+              const SizedBox(height: 32),
+              Text(
+                'Account',
+                style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.w700,
+                    ),
+              ),
+              const SizedBox(height: 8),
+              Text(
+                'Change your password for this account.',
+                style: Theme.of(context).textTheme.bodySmall,
+              ),
+              const SizedBox(height: 12),
+              Form(
+                key: _passwordFormKey,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    TextFormField(
+                      controller: _currentPasswordController,
+                      decoration: const InputDecoration(
+                        labelText: 'Current password',
+                        border: OutlineInputBorder(),
+                      ),
+                      obscureText: true,
+                      enableSuggestions: false,
+                      autocorrect: false,
+                      autofillHints: const [AutofillHints.password],
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'Please enter your current password.';
+                        }
+                        return null;
+                      },
+                    ),
+                    const SizedBox(height: 12),
+                    TextFormField(
+                      controller: _newPasswordController,
+                      decoration: const InputDecoration(
+                        labelText: 'New password',
+                        border: OutlineInputBorder(),
+                      ),
+                      obscureText: true,
+                      enableSuggestions: false,
+                      autocorrect: false,
+                      autofillHints: const [AutofillHints.newPassword],
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'Please enter a new password.';
+                        }
+                        return null;
+                      },
+                    ),
+                    const SizedBox(height: 12),
+                    TextFormField(
+                      controller: _confirmPasswordController,
+                      decoration: const InputDecoration(
+                        labelText: 'Confirm new password',
+                        border: OutlineInputBorder(),
+                      ),
+                      obscureText: true,
+                      enableSuggestions: false,
+                      autocorrect: false,
+                      autofillHints: const [AutofillHints.newPassword],
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'Please confirm the new password.';
+                        }
+                        if (value != _newPasswordController.text) {
+                          return 'New passwords do not match.';
+                        }
+                        return null;
+                      },
+                    ),
+                    const SizedBox(height: 16),
+                    FilledButton.icon(
+                      onPressed: _changingPassword ? null : _changePassword,
+                      icon: _changingPassword
+                          ? const SizedBox(
+                              width: 18,
+                              height: 18,
+                              child: CircularProgressIndicator(strokeWidth: 2),
+                            )
+                          : const Icon(Icons.lock_reset),
+                      label: Text(
+                        _changingPassword ? 'Updating...' : 'Change password',
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/components/pages/stats.dart

@@ -0,0 +1,225 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
+import 'package:provider/provider.dart';
+
+class StatsPage extends StatefulWidget {
+  const StatsPage({super.key});
+
+  @override
+  State<StatsPage> createState() => _StatsPageState();
+}
+
+class _StatsPageState extends State<StatsPage> {
+  final NumberFormat _countFormat = NumberFormat.decimalPattern();
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _loadStats();
+    });
+  }
+
+  Future<void> _loadStats({bool force = false}) {
+    return context.read<DataService>().fetchAboutStats(force: force);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final data = context.watch<DataService>();
+    final distanceUnits = context.watch<DistanceUnitService>();
+    return Scaffold(
+      appBar: AppBar(title: const Text('Stats')),
+      body: RefreshIndicator(
+        onRefresh: () => _loadStats(force: true),
+        child: _buildContent(data, distanceUnits),
+      ),
+    );
+  }
+
+  Widget _buildContent(
+    DataService data,
+    DistanceUnitService distanceUnits,
+  ) {
+    final stats = data.aboutStats;
+    final loading = data.isAboutStatsLoading;
+
+    if (loading && stats == null) {
+      return ListView(
+        physics: const AlwaysScrollableScrollPhysics(),
+        children: const [
+          SizedBox(height: 140),
+          Center(child: CircularProgressIndicator()),
+          SizedBox(height: 140),
+        ],
+      );
+    }
+
+    if (stats == null || stats.sortedYears.isEmpty) {
+      return ListView(
+        physics: const AlwaysScrollableScrollPhysics(),
+        padding: const EdgeInsets.all(24),
+        children: [
+          const SizedBox(height: 40),
+          const Center(child: Text('No stats available yet.')),
+          const SizedBox(height: 12),
+          Center(
+            child: OutlinedButton(
+              onPressed: () => _loadStats(force: true),
+              child: const Text('Retry'),
+            ),
+          ),
+        ],
+      );
+    }
+
+    final years = stats.sortedYears;
+    return ListView.builder(
+      padding: const EdgeInsets.all(16),
+      itemCount: years.length,
+      itemBuilder: (context, index) {
+        return Padding(
+          padding: EdgeInsets.only(bottom: index == years.length - 1 ? 0 : 12),
+          child: _buildYearCard(context, years[index], distanceUnits),
+        );
+      },
+    );
+  }
+
+  Widget _buildYearCard(
+      BuildContext context, StatsYear year, DistanceUnitService distanceUnits) {
+    final theme = Theme.of(context);
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(12),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  year.year.toString(),
+                  style: theme.textTheme.titleLarge,
+                ),
+                const Spacer(),
+                Wrap(
+                  spacing: 8,
+                  runSpacing: 8,
+                  alignment: WrapAlignment.end,
+                  children: [
+                    _buildInfoChip(
+                      context,
+                      label: 'Mileage',
+                      value: distanceUnits.format(year.mileage, decimals: 1),
+                    ),
+                    _buildInfoChip(
+                      context,
+                      label: 'Winners',
+                      value: _countFormat.format(year.winnerCount),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+            const SizedBox(height: 8),
+            _buildSection<StatsClassMileage>(
+              context,
+              title: 'Top classes',
+              items: year.topClasses,
+              emptyLabel: 'No class data',
+                itemBuilder: (item, index) => ListTile(
+                  dense: true,
+                  contentPadding: const EdgeInsets.symmetric(horizontal: 8),
+                  title: Text(item.locoClass),
+                  trailing: Text(
+                    distanceUnits.format(item.mileage, decimals: 1),
+                  ),
+                ),
+              ),
+            _buildSection<StatsNetworkMileage>(
+              context,
+              title: 'Top networks',
+              items: year.topNetworks,
+              emptyLabel: 'No network data',
+                itemBuilder: (item, index) => ListTile(
+                  dense: true,
+                  contentPadding: const EdgeInsets.symmetric(horizontal: 8),
+                  title: Text(item.network),
+                  trailing: Text(
+                    distanceUnits.format(item.mileage, decimals: 1),
+                  ),
+                ),
+              ),
+            _buildSection<StatsStationVisits>(
+              context,
+              title: 'Top stations',
+              items: year.topStations,
+              emptyLabel: 'No station data',
+              itemBuilder: (item, index) => ListTile(
+                dense: true,
+                contentPadding: const EdgeInsets.symmetric(horizontal: 8),
+                title: Text(item.station),
+                trailing: Text(
+                  '${_countFormat.format(item.visits)} visit${item.visits == 1 ? '' : 's'}',
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildInfoChip(BuildContext context,
+      {required String label, required String value}) {
+    final theme = Theme.of(context);
+    return Chip(
+      padding: const EdgeInsets.symmetric(horizontal: 8),
+      label: Text(
+        '$label: $value',
+        style: theme.textTheme.labelLarge,
+      ),
+    );
+  }
+
+  Widget _buildSection<T>(
+    BuildContext context, {
+    required String title,
+    required List<T> items,
+    required Widget Function(T item, int index) itemBuilder,
+    String emptyLabel = 'No data',
+  }) {
+    final theme = Theme.of(context);
+    return Padding(
+      padding: const EdgeInsets.only(top: 4),
+      child: ExpansionTile(
+        tilePadding: const EdgeInsets.symmetric(horizontal: 8),
+        childrenPadding:
+            const EdgeInsets.only(left: 8, right: 8, bottom: 8),
+        title: Text(
+          title,
+          style: theme.textTheme.titleMedium,
+        ),
+        children: items.isEmpty
+            ? [
+                Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 8),
+                  child: Text(
+                    emptyLabel,
+                    style: theme.textTheme.bodySmall,
+                  ),
+                ),
+              ]
+            : items
+                .asMap()
+                .entries
+                .map((entry) => itemBuilder(entry.value, entry.key))
+                .toList(),
+      ),
+    );
+  }
+}

lib/components/pages/traction/traction.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
@@ -5,6 +6,7 @@ import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/components/traction/traction_card.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 

lib/components/pages/trips.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';
 
 class TripsPage extends StatefulWidget {
@@ -12,6 +13,7 @@ class TripsPage extends StatefulWidget {
 
 class _TripsPageState extends State<TripsPage> {
   bool _initialised = false;
+  final Map<int, Future<List<TripLocoStat>>> _tripLocoStatsFutures = {};
 
   @override
   void didChangeDependencies() {
@@ -23,15 +25,87 @@ class _TripsPageState extends State<TripsPage> {
   }
 
   Future<void> _refreshTrips() async {
-    await context.read<DataService>().fetchTripDetails();
+    _tripLocoStatsFutures.clear();
+    final data = context.read<DataService>();
+    await data.fetchTripDetails();
+  }
+
+  Future<void> _renameTrip(TripDetail trip, String newName) async {
+    final data = context.read<DataService>();
+    final api = data.api;
+    final messenger = ScaffoldMessenger.maybeOf(context);
+    try {
+      await api.post('/trips/rename', {
+        "trip_id": trip.id,
+        "trip_name": newName,
+      });
+      await data.fetchTripDetails();
+    } catch (e) {
+      messenger?.showSnackBar(
+        SnackBar(content: Text('Failed to rename trip: $e')),
+      );
+      rethrow;
+    }
+  }
+
+  List<TripLocoStat> _cachedTripStats(
+    TripDetail trip,
+    TripSummary? summary,
+  ) {
+    if (trip.locoStats.isNotEmpty) return trip.locoStats;
+    if (summary?.locoStats.isNotEmpty == true) return summary!.locoStats;
+    return const [];
+  }
+
+  Future<List<TripLocoStat>> _loadTripStats(
+    TripDetail trip,
+    TripSummary? summary,
+  ) {
+    final cached = _cachedTripStats(trip, summary);
+    if (cached.isNotEmpty) return Future.value(cached);
+    return _tripLocoStatsFutures.putIfAbsent(
+      trip.id,
+      () => context.read<DataService>().fetchTripLocoStats(trip.id),
+    );
+  }
+
+  Future<String?> _promptTripName(BuildContext context, String initial) async {
+    final controller = TextEditingController(text: initial);
+    final newName = await showDialog<String>(
+      context: context,
+      builder: (dialogCtx) => AlertDialog(
+        title: const Text('Rename trip'),
+        content: TextField(
+          controller: controller,
+          decoration: const InputDecoration(labelText: 'Trip name'),
+          autofocus: true,
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(dialogCtx).pop(),
+            child: const Text('Cancel'),
+          ),
+          TextButton(
+            onPressed: () =>
+                Navigator.of(dialogCtx).pop(controller.text.trim()),
+            child: const Text('Save'),
+          ),
+        ],
+      ),
+    );
+    controller.dispose();
+    return newName;
   }
 
   @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
+    final distanceUnits = context.watch<DistanceUnitService>();
     final tripDetails = data.tripDetails;
-    final tripSummaries = data.trips;
+    final tripSummaries = data.tripList;
-    final isMobile = MediaQuery.of(context).size.width < 700;
+    final summaryById = {
+      for (final summary in tripSummaries) summary.tripId: summary,
+    };
     final showLoading = data.isTripDetailsLoading && tripDetails.isEmpty;
 
     return RefreshIndicator(
@@ -116,168 +190,360 @@ class _TripsPageState extends State<TripsPage> {
             return Card(
               child: ListTile(
                 title: Text(trip.tripName),
-                subtitle: Text('${trip.tripMileage.toStringAsFixed(1)} mi'),
+                subtitle:
+                    Text(distanceUnits.format(trip.tripMileage, decimals: 1)),
               ),
             );
           }
 
           final trip = tripDetails[index - 1];
-          return _buildTripCard(context, trip, isMobile);
+          final summary = summaryById[trip.id];
+          return _buildTripCard(context, trip, summary);
         },
       ),
     );
   }
 
-  Widget _buildTripCard(BuildContext context, TripDetail trip, bool isMobile) {
+  Widget _buildTripCard(
+    BuildContext context,
+    TripDetail trip,
+    TripSummary? summary,
+  ) {
+    final distanceUnits = context.watch<DistanceUnitService>();
     final legs = trip.legs;
+    final legCount =
+        trip.legCount > 0 ? trip.legCount : summary?.legCount ?? legs.length;
+    final dateRange = _formatDateRange(legs);
+    final endpoints = _formatEndpoints(legs);
+    final stats = _cachedTripStats(trip, summary);
+    final winnerCount = stats.where((e) => e.won).length;
+
     return Card(
       child: Padding(
-        padding: const EdgeInsets.all(12.0),
+        padding: const EdgeInsets.all(16.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Column(
+                Expanded(
-                  crossAxisAlignment: CrossAxisAlignment.start,
+                  child: Column(
-                  children: [
+                    crossAxisAlignment: CrossAxisAlignment.start,
-                    Text(
+                    children: [
-                      trip.name,
+                      Text(
-                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        'Trip',
-                        fontWeight: FontWeight.w700,
+                        style: Theme.of(context).textTheme.labelMedium,
                       ),
-                    ),
+                      const SizedBox(height: 4),
-                    Text(
+                      Text(
-                      '${trip.mileage.toStringAsFixed(1)} mi · ${trip.legCount} legs',
+                        trip.name,
-                      style: Theme.of(context).textTheme.bodyMedium,
+                        style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                    ),
+                          fontWeight: FontWeight.w700,
-                  ],
+                        ),
+                      ),
+                    ],
+                  ),
                 ),
-                Row(
+                Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
+                  crossAxisAlignment: CrossAxisAlignment.end,
                   children: [
-                    IconButton(
+                    Text(
-                      icon: const Icon(Icons.train),
+                      distanceUnits.format(trip.mileage, decimals: 1),
-                      tooltip: 'Traction',
+                      style:
-                      onPressed: () => _showTripWinners(context, trip),
+                          Theme.of(context).textTheme.headlineSmall?.copyWith(
-                    ),
+                        fontWeight: FontWeight.w800,
-                    IconButton(
+                      ),
-                      icon: const Icon(Icons.open_in_new),
-                      tooltip: 'Details',
-                      onPressed: () => _showTripDetail(context, trip),
                     ),
                   ],
                 ),
               ],
             ),
-            const SizedBox(height: 8),
+            const SizedBox(height: 12),
-            if (legs.isNotEmpty)
+            Wrap(
-              Column(
+              spacing: 8,
-                children: legs.take(isMobile ? 2 : 3).map((leg) {
+              runSpacing: 8,
-                  return ListTile(
+              children: [
-                    dense: isMobile,
+                _buildMetaChip(context, Icons.timeline, '$legCount legs'),
-                    contentPadding: EdgeInsets.zero,
+                if (dateRange != null)
-                    leading: const Icon(Icons.train),
+                  _buildMetaChip(context, Icons.calendar_month, dateRange),
-                    title: Text('${leg.start} → ${leg.end}'),
+                if (endpoints != null)
-                    subtitle: Text(
+                  _buildMetaChip(context, Icons.route, endpoints),
-                      _formatDate(leg.beginTime),
+                if (stats.isNotEmpty) ...[
-                      maxLines: 1,
+                  _buildMetaChip(context, Icons.train, '${stats.length} had'),
-                      overflow: TextOverflow.ellipsis,
+                  _buildMetaChip(
-                    ),
+                    context,
-                    trailing: Text(
+                    Icons.emoji_events_outlined,
-                      leg.mileage?.toStringAsFixed(1) ?? '-',
+                    '$winnerCount winners',
-                      style: Theme.of(context).textTheme.labelLarge?.copyWith(
+                  ),
-                        fontWeight: FontWeight.bold,
+                ] else
-                      ),
+                  _buildMetaChip(context, Icons.train, 'No traction yet'),
-                    ),
+              ],
-                  );
+            ),
-                }).toList(),
+            const SizedBox(height: 12),
-              ),
+            Align(
-            if (legs.length > 3)
+              alignment: Alignment.centerRight,
-              Padding(
+              child: Wrap(
-                padding: const EdgeInsets.only(top: 6.0),
+                spacing: 8,
-                child: Text(
+                runSpacing: 8,
-                  '+${legs.length - 3} more legs',
+                alignment: WrapAlignment.end,
-                  style: Theme.of(context).textTheme.bodySmall,
+                children: [
-                ),
+                  OutlinedButton.icon(
+                    icon: const Icon(Icons.train),
+                    label: const Text('Locos'),
+                    onPressed: () => _showTripWinners(context, trip, summary),
+                  ),
+                  FilledButton.icon(
+                    icon: const Icon(Icons.open_in_new),
+                    label: const Text('Details'),
+                    onPressed: () => _showTripDetail(context, trip),
+                  ),
+                ],
               ),
+            ),
           ],
         ),
       ),
     );
   }
 
+  Widget _buildMetaChip(BuildContext context, IconData icon, String label) {
+    return Chip(
+      avatar: Icon(icon, size: 16),
+      label: Text(label),
+      visualDensity: const VisualDensity(horizontal: -2, vertical: -2),
+      materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+    );
+  }
+
+  String? _formatDateRange(List<TripLeg> legs) {
+    final beginTimes =
+        legs.map((e) => e.beginTime).whereType<DateTime>().toList();
+    if (beginTimes.isEmpty) return null;
+    final start = beginTimes.first;
+    final end = beginTimes.last;
+    final startStr = _formatFriendlyDate(start);
+    final endStr = _formatFriendlyDate(end);
+    if (startStr == endStr) return startStr;
+    return '$startStr - $endStr';
+  }
+
+  String _formatFriendlyDate(DateTime date) {
+    const months = [
+      'Jan',
+      'Feb',
+      'Mar',
+      'Apr',
+      'May',
+      'Jun',
+      'Jul',
+      'Aug',
+      'Sep',
+      'Oct',
+      'Nov',
+      'Dec',
+    ];
+    final day = date.day.toString().padLeft(2, '0');
+    final monthIndex = (date.month - 1).clamp(0, months.length - 1).toInt();
+    final month = months[monthIndex];
+    return '$day $month ${date.year}';
+  }
+
+  String? _formatEndpoints(List<TripLeg> legs) {
+    if (legs.isEmpty) return null;
+    final start = legs.first.start;
+    final end = legs.last.end;
+    if (start.isEmpty && end.isEmpty) return null;
+    final startLabel = start.isNotEmpty ? start : '—';
+    final endLabel = end.isNotEmpty ? end : '—';
+    return '$startLabel → $endLabel';
+  }
+
   String _formatDate(DateTime? date) {
     if (date == null) return '';
     return '${date.year.toString().padLeft(4, '0')}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';
   }
 
   void _showTripDetail(BuildContext context, TripDetail trip) {
+    final distanceUnits = context.read<DistanceUnitService>();
     showModalBottomSheet(
       context: context,
       isScrollControlled: true,
       builder: (_) {
-        return SafeArea(
+        bool renaming = false;
-          child: Padding(
+        bool deleting = false;
-            padding: const EdgeInsets.all(16.0),
+        String tripName = trip.name;
-            child: Column(
+        return StatefulBuilder(
-              mainAxisSize: MainAxisSize.min,
+          builder: (sheetCtx, setSheetState) {
-              crossAxisAlignment: CrossAxisAlignment.start,
+            Future<void> handleRename() async {
-              children: [
+              final newName =
-                Row(
+                  await _promptTripName(sheetCtx, tripName) ?? tripName;
-                  children: [
+              if (newName.isEmpty || newName == tripName) return;
-                    IconButton(
+              setSheetState(() => renaming = true);
-                      icon: const Icon(Icons.arrow_back),
+              try {
-                      onPressed: () => Navigator.of(context).pop(),
+                await _renameTrip(trip, newName);
+                tripName = newName;
+                setSheetState(() {});
+              } finally {
+                if (mounted) setSheetState(() => renaming = false);
+              }
+            }
+
+            Future<void> handleDelete() async {
+              if (deleting || trip.legs.isNotEmpty) return;
+              final data = context.read<DataService>();
+              final api = data.api;
+              final messenger = ScaffoldMessenger.maybeOf(sheetCtx);
+              final navigator = Navigator.of(sheetCtx);
+
+              final ok = await showDialog<bool>(
+                context: sheetCtx,
+                builder: (ctx) {
+                  return AlertDialog(
+                    title: const Text('Delete trip?'),
+                    content: Text(
+                      'This will delete "${trip.name}". This cannot be undone.',
                     ),
-                    Text(
+                    actions: [
-                      trip.name,
+                      TextButton(
-                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        onPressed: () => Navigator.of(ctx).pop(false),
-                        fontWeight: FontWeight.bold,
+                        child: const Text('Cancel'),
+                      ),
+                      FilledButton(
+                        onPressed: () => Navigator.of(ctx).pop(true),
+                        child: const Text('Delete'),
+                      ),
+                    ],
+                  );
+                },
+              );
+              if (ok != true || !mounted) return;
+
+              setSheetState(() => deleting = true);
+              try {
+                await api.delete('/trips/delete/${trip.id}');
+                await Future.wait([
+                  data.fetchTripDetails(),
+                  data.fetchTrips(),
+                ]);
+                _tripLocoStatsFutures.remove(trip.id);
+                if (!mounted) return;
+                messenger?.showSnackBar(
+                  SnackBar(content: Text('Deleted "${trip.name}"')),
+                );
+                navigator.pop();
+              } catch (e) {
+                if (!mounted) return;
+                messenger?.showSnackBar(
+                  SnackBar(content: Text('Failed to delete trip: $e')),
+                );
+              } finally {
+                if (mounted) setSheetState(() => deleting = false);
+              }
+            }
+
+            return SafeArea(
+              child: Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        IconButton(
+                          icon: const Icon(Icons.arrow_back),
+                          onPressed: () => Navigator.of(sheetCtx).pop(),
+                        ),
+                        Expanded(
+                          child: Text(
+                            tripName,
+                            style: Theme.of(context).textTheme.titleMedium
+                                ?.copyWith(fontWeight: FontWeight.bold),
+                          ),
+                        ),
+                        IconButton(
+                          icon: renaming
+                              ? const SizedBox(
+                                  width: 18,
+                                  height: 18,
+                                  child:
+                                      CircularProgressIndicator(strokeWidth: 2),
+                                )
+                              : const Icon(Icons.edit),
+                          tooltip: 'Rename trip',
+                          onPressed: renaming ? null : handleRename,
+                        ),
+                        if (trip.legs.isEmpty) ...[
+                          const SizedBox(width: 4),
+                          IconButton(
+                            icon: deleting
+                                ? const SizedBox(
+                                    width: 18,
+                                    height: 18,
+                                    child: CircularProgressIndicator(strokeWidth: 2),
+                                  )
+                                : const Icon(Icons.delete_outline),
+                            tooltip: 'Delete trip',
+                            onPressed: deleting ? null : handleDelete,
+                            color: Theme.of(context).colorScheme.error,
+                          ),
+                        ],
+                        const SizedBox(width: 4),
+                        Text(
+                          distanceUnits.format(trip.mileage, decimals: 1),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    SizedBox(
+                      height: MediaQuery.of(context).size.height * 0.6,
+                      child: ListView.builder(
+                        itemCount: trip.legs.length,
+                        itemBuilder: (context, index) {
+                          final leg = trip.legs[index];
+                          return ListTile(
+                            leading: const Icon(Icons.train),
+                            title: Text('${leg.start} → ${leg.end}'),
+                            subtitle: Text(_formatDate(leg.beginTime)),
+                            trailing: Text(
+                              leg.mileage == null
+                                  ? '-'
+                                  : distanceUnits.format(
+                                      leg.mileage!,
+                                      decimals: 1,
+                                    ),
+                              style: Theme.of(context).textTheme.labelLarge
+                                  ?.copyWith(fontWeight: FontWeight.bold),
+                            ),
+                          );
+                        },
                       ),
                     ),
-                    const Spacer(),
-                    Text('${trip.mileage.toStringAsFixed(1)} mi'),
                   ],
                 ),
-                const SizedBox(height: 8),
+              ),
-                SizedBox(
+            );
-                  height: MediaQuery.of(context).size.height * 0.6,
+          },
-                  child: ListView.builder(
-                    itemCount: trip.legs.length,
-                    itemBuilder: (context, index) {
-                      final leg = trip.legs[index];
-                      return ListTile(
-                        leading: const Icon(Icons.train),
-                        title: Text('${leg.start} → ${leg.end}'),
-                        subtitle: Text(_formatDate(leg.beginTime)),
-                        trailing: Text(
-                          leg.mileage?.toStringAsFixed(1) ?? '-',
-                          style: Theme.of(context).textTheme.labelLarge
-                              ?.copyWith(fontWeight: FontWeight.bold),
-                        ),
-                      );
-                    },
-                  ),
-                ),
-              ],
-            ),
-          ),
         );
       },
     );
   }
 
-  void _showTripWinners(BuildContext context, TripDetail trip) {
+  void _showTripWinners(
+    BuildContext context,
+    TripDetail trip,
+    TripSummary? summary,
+  ) {
+    final distanceUnits = context.read<DistanceUnitService>();
     showModalBottomSheet(
       context: context,
       isScrollControlled: true,
       builder: (_) {
-        final data = context.read<DataService>();
         return SafeArea(
           child: FutureBuilder<List<TripLocoStat>>(
-            future: data.fetchTripLocoStats(trip.id),
+            future: _loadTripStats(trip, summary),
+            initialData: _cachedTripStats(trip, summary),
             builder: (ctx, snapshot) {
               final items = snapshot.data ?? [];
               final loading =
@@ -302,7 +568,9 @@ class _TripsPageState extends State<TripsPage> {
                               ?.copyWith(fontWeight: FontWeight.bold),
                         ),
                         const Spacer(),
-                        Text('${trip.mileage.toStringAsFixed(1)} mi'),
+                        Text(
+                          distanceUnits.format(trip.mileage, decimals: 1),
+                        ),
                       ],
                     ),
                     const SizedBox(height: 8),

lib/components/traction/traction_card.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
+import 'package:provider/provider.dart';
 
 class TractionCard extends StatelessWidget {
   const TractionCard({
@@ -28,6 +30,7 @@ class TractionCard extends StatelessWidget {
     final domain = loco.domain ?? '';
     final hasMileageOrTrips = _hasMileageOrTrips(loco);
     final statusColors = _statusChipColors(context, status);
+    final distanceUnits = context.watch<DistanceUnitService>();
 
     return Card(
       child: Padding(
@@ -82,39 +85,68 @@ class TractionCard extends StatelessWidget {
               ],
             ),
             const SizedBox(height: 8),
-            Row(
+            LayoutBuilder(
-              children: [
+              builder: (context, constraints) {
-                TextButton.icon(
+                final isNarrow = constraints.maxWidth < 520;
-                  onPressed: onShowInfo,
+                final buttons = [
-                  icon: const Icon(Icons.info_outline),
-                  label: const Text('Details'),
-                ),
-                const SizedBox(width: 8),
-                TextButton.icon(
-                  onPressed: onOpenTimeline,
-                  icon: const Icon(Icons.timeline),
-                  label: const Text('Timeline'),
-                ),
-                if (hasMileageOrTrips && onOpenLegs != null) ...[
-                  const SizedBox(width: 8),
                   TextButton.icon(
-                    onPressed: onOpenLegs,
+                    onPressed: onShowInfo,
-                    icon: const Icon(Icons.view_list),
+                    icon: const Icon(Icons.info_outline),
-                    label: const Text('Legs'),
+                    label: const Text('Details'),
                   ),
-                ],
-                const Spacer(),
-                if (selectionMode && onToggleSelect != null)
                   TextButton.icon(
-                    onPressed: onToggleSelect,
+                    onPressed: onOpenTimeline,
-                    icon: Icon(
+                    icon: const Icon(Icons.timeline),
-                      isSelected
+                    label: const Text('Timeline'),
-                          ? Icons.remove_circle_outline
+                  ),
-                          : Icons.add_circle_outline,
+                  if (hasMileageOrTrips && onOpenLegs != null)
+                    TextButton.icon(
+                      onPressed: onOpenLegs,
+                      icon: const Icon(Icons.view_list),
+                      label: const Text('Legs'),
                     ),
-                    label: Text(isSelected ? 'Remove' : 'Add to entry'),
+                ];
-                  ),
+
-              ],
+                final addButton = selectionMode && onToggleSelect != null
+                    ? TextButton.icon(
+                        onPressed: onToggleSelect,
+                        icon: Icon(
+                          isSelected
+                              ? Icons.remove_circle_outline
+                              : Icons.add_circle_outline,
+                        ),
+                        label: Text(isSelected ? 'Remove' : 'Add to entry'),
+                      )
+                    : null;
+
+                if (isNarrow) {
+                  return Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Wrap(
+                        spacing: 8,
+                        runSpacing: 4,
+                        children: buttons,
+                      ),
+                      if (addButton != null) ...[
+                        const SizedBox(height: 6),
+                        addButton,
+                      ],
+                    ],
+                  );
+                }
+
+                return Row(
+                  children: [
+                    ...buttons.expand((btn) sync* {
+                      yield btn;
+                      yield const SizedBox(width: 8);
+                    }).take(buttons.length * 2 - 1),
+                    const Spacer(),
+                    if (addButton != null) addButton,
+                  ],
+                );
+              },
             ),
             Wrap(
               spacing: 8,
@@ -122,8 +154,11 @@ class TractionCard extends StatelessWidget {
               children: [
                 _statPill(
                   context,
-                  label: 'Miles',
+                  label: 'Distance',
-                  value: _formatNumber(loco.mileage),
+                  value: distanceUnits.format(
+                    loco.mileage ?? 0,
+                    decimals: 1,
+                  ),
                 ),
                 _statPill(
                   context,
@@ -174,6 +209,7 @@ Future<void> showTractionDetails(
   LocoSummary loco,
 ) async {
   final hasMileageOrTrips = _hasMileageOrTrips(loco);
+  final distanceUnits = context.read<DistanceUnitService>();
   await showModalBottomSheet(
     context: context,
     isScrollControlled: true,
@@ -246,7 +282,10 @@ Future<void> showTractionDetails(
                       _detailRow(
                         context,
                         'Mileage',
-                        _formatNumber(loco.mileage ?? 0),
+                        distanceUnits.format(
+                          loco.mileage ?? 0,
+                          decimals: 1,
+                        ),
                       ),
                       _detailRow(
                         context,
@@ -339,8 +378,3 @@ bool _hasMileageOrTrips(LocoSummary loco) {
   final trips = loco.trips ?? loco.journeys ?? 0;
   return mileage > 0 || trips > 0;
 }
-
-String _formatNumber(double? value) {
-  if (value == null) return '0';
-  return value.toStringAsFixed(1);
-}

lib/objects/objects.dart

@@ -1,11 +1,13 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
-int _asInt(dynamic value, [int fallback = 0]) {
+int _asInt(dynamic value, [int? fallback]) {
   if (value is int) return value;
   if (value is num) return value.toInt();
   final parsed = int.tryParse(value?.toString() ?? '');
-  return parsed ?? fallback;
+  return parsed ?? fallback ?? 0;
 }
 
 double _asDouble(dynamic value, [double fallback = 0]) {
@@ -20,6 +22,44 @@ String _asString(dynamic value, [String fallback = '']) {
   return (str == null) ? fallback : str;
 }
 
+List<String> _asStringList(dynamic value) {
+  if (value is List) {
+    return value.map((e) => e.toString()).toList();
+  }
+  final trimmed = value?.toString().trim() ?? '';
+  if (trimmed.isEmpty) return const [];
+  try {
+    final decoded = jsonDecode(trimmed);
+    if (decoded is List) {
+      return decoded.map((e) => e.toString()).toList();
+    }
+  } catch (_) {}
+  if (trimmed.contains('->')) {
+    return trimmed
+        .split('->')
+        .map((e) => e.trim())
+        .where((e) => e.isNotEmpty)
+        .toList();
+  }
+  if (trimmed.contains(',')) {
+    return trimmed
+        .split(',')
+        .map((e) => e.trim())
+        .where((e) => e.isNotEmpty)
+        .toList();
+  }
+  return [trimmed];
+}
+
+bool _asBool(dynamic value, [bool fallback = false]) {
+  if (value is bool) return value;
+  if (value is num) return value != 0;
+  final lower = value?.toString().toLowerCase();
+  if (lower == 'true' || lower == 'yes' || lower == '1') return true;
+  if (lower == 'false' || lower == 'no' || lower == '0') return false;
+  return fallback;
+}
+
 DateTime _asDateTime(dynamic value, [DateTime? fallback]) {
   if (value is DateTime) return value;
   final parsed = DateTime.tryParse(value?.toString() ?? '');
@@ -67,6 +107,7 @@ class HomepageStats {
   final List<LocoSummary> topLocos;
   final List<LeaderboardEntry> leaderboard;
   final List<TripSummary> trips;
+  final int legCount;
   final UserData? user;
 
   HomepageStats({
@@ -75,6 +116,7 @@ class HomepageStats {
     required this.topLocos,
     required this.leaderboard,
     required this.trips,
+    required this.legCount,
     this.user,
   });
 
@@ -98,6 +140,10 @@ class HomepageStats {
       trips: (json['trip_data'] as List? ?? [])
           .map((e) => TripSummary.fromJson(e))
           .toList(),
+      legCount: _asInt(
+        json['leg_count'],
+        (json['trip_legs'] as List?)?.length ?? 0,
+      ),
       user: userData == null
           ? null
           : UserData(
@@ -122,10 +168,213 @@ class YearlyMileage {
   );
 }
 
+class StatsAbout {
+  final Map<int, StatsYear> years;
+
+  StatsAbout({required this.years});
+
+  factory StatsAbout.fromJson(Map<String, dynamic> json) {
+    final mileageByYear = <int, double>{};
+    final classByYear = <int, List<StatsClassMileage>>{};
+    final networkByYear = <int, List<StatsNetworkMileage>>{};
+    final stationByYear = <int, List<StatsStationVisits>>{};
+    final winnersByYear = <int, int>{};
+
+    void addYearMileage(dynamic entry) {
+      if (entry is Map<String, dynamic>) {
+        final year = entry['year'] is int
+            ? entry['year'] as int
+            : int.tryParse('${entry['year']}');
+        if (year != null) {
+          mileageByYear[year] = _asDouble(entry['mileage']);
+        }
+      }
+    }
+
+    if (json['year_mileages'] is List) {
+      for (final entry in json['year_mileages']) {
+        if (entry is Map<String, dynamic>) {
+          addYearMileage(entry);
+        } else if (entry is Map) {
+          addYearMileage(entry
+              .map((key, value) => MapEntry(key.toString(), value)));
+        }
+      }
+    }
+
+    List<StatsClassMileage> parseClassList(dynamic value) {
+      if (value is List) {
+        return value
+            .whereType<Map>()
+            .map((e) => StatsClassMileage.fromJson(
+                e.map((key, value) => MapEntry(key.toString(), value))))
+            .toList();
+      }
+      return const [];
+    }
+
+    List<StatsNetworkMileage> parseNetworkList(dynamic value) {
+      if (value is List) {
+        return value
+            .whereType<Map>()
+            .map((e) => StatsNetworkMileage.fromJson(
+                e.map((key, value) => MapEntry(key.toString(), value))))
+            .toList();
+      }
+      return const [];
+    }
+
+    List<StatsStationVisits> parseStationList(dynamic value) {
+      if (value is List) {
+        return value
+            .whereType<Map>()
+            .map((e) => StatsStationVisits.fromJson(
+                e.map((key, value) => MapEntry(key.toString(), value))))
+            .toList();
+      }
+      return const [];
+    }
+
+    void parseYearMap<T>(
+      dynamic source,
+      Map<int, T> target,
+      T Function(dynamic value) mapper,
+    ) {
+      if (source is Map) {
+        source.forEach((key, value) {
+          final year = int.tryParse(key.toString());
+          if (year == null) return;
+          target[year] = mapper(value);
+        });
+      }
+    }
+
+    parseYearMap<List<StatsClassMileage>>(
+      json['top_classes'],
+      classByYear,
+      parseClassList,
+    );
+    parseYearMap<List<StatsNetworkMileage>>(
+      json['top_networks'],
+      networkByYear,
+      parseNetworkList,
+    );
+    parseYearMap<List<StatsStationVisits>>(
+      json['top_stations'],
+      stationByYear,
+      parseStationList,
+    );
+    if (json['year_winners'] is Map) {
+      (json['year_winners'] as Map).forEach((key, value) {
+        final year = int.tryParse(key.toString());
+        if (year == null) return;
+        if (value is List) {
+          winnersByYear[year] = value.length;
+        }
+      });
+    }
+
+    final years = <int>{
+      ...mileageByYear.keys,
+      ...classByYear.keys,
+      ...networkByYear.keys,
+      ...stationByYear.keys,
+      ...winnersByYear.keys,
+    }..removeWhere((year) => year == 0);
+
+    final yearMap = <int, StatsYear>{};
+    for (final year in years) {
+      yearMap[year] = StatsYear(
+        year: year,
+        mileage: mileageByYear[year] ?? 0,
+        topClasses: classByYear[year] ?? const [],
+        topNetworks: networkByYear[year] ?? const [],
+        topStations: stationByYear[year] ?? const [],
+        winnerCount: winnersByYear[year] ?? 0,
+      );
+    }
+
+    return StatsAbout(years: yearMap);
+  }
+
+  List<StatsYear> get sortedYears {
+    final list = years.values.toList();
+    list.sort((a, b) => b.year.compareTo(a.year));
+    return list;
+  }
+}
+
+class StatsYear {
+  final int year;
+  final double mileage;
+  final List<StatsClassMileage> topClasses;
+  final List<StatsNetworkMileage> topNetworks;
+  final List<StatsStationVisits> topStations;
+  final int winnerCount;
+
+  StatsYear({
+    required this.year,
+    required this.mileage,
+    required this.topClasses,
+    required this.topNetworks,
+    required this.topStations,
+    required this.winnerCount,
+  });
+}
+
+class StatsClassMileage {
+  final String locoClass;
+  final double mileage;
+
+  StatsClassMileage({
+    required this.locoClass,
+    required this.mileage,
+  });
+
+  factory StatsClassMileage.fromJson(Map<String, dynamic> json) =>
+      StatsClassMileage(
+        locoClass: _asString(json['loco_class'], 'Unknown'),
+        mileage: _asDouble(json['mileage']),
+      );
+}
+
+class StatsNetworkMileage {
+  final String network;
+  final double mileage;
+
+  StatsNetworkMileage({
+    required this.network,
+    required this.mileage,
+  });
+
+  factory StatsNetworkMileage.fromJson(Map<String, dynamic> json) =>
+      StatsNetworkMileage(
+        network: _asString(json['network'], 'Unknown'),
+        mileage: _asDouble(json['mileage']),
+      );
+}
+
+class StatsStationVisits {
+  final String station;
+  final int visits;
+
+  StatsStationVisits({
+    required this.station,
+    required this.visits,
+  });
+
+  factory StatsStationVisits.fromJson(Map<String, dynamic> json) =>
+      StatsStationVisits(
+        station: _asString(json['station'], 'Unknown'),
+        visits: _asInt(json['visits']),
+      );
+}
+
 class Loco {
   final int id;
   final String type, number, locoClass;
   final String? name, operator, notes, evn;
+  final bool powering;
 
   Loco({
     required this.id,
@@ -136,6 +385,7 @@ class Loco {
     required this.operator,
     this.notes,
     this.evn,
+    this.powering = true,
   });
 
   factory Loco.fromJson(Map<String, dynamic> json) => Loco(
@@ -147,6 +397,7 @@ class Loco {
     operator: json['operator'],
     notes: json['notes'],
     evn: json['evn'],
+    powering: _asBool(json['alloc_powering'] ?? json['powering'], true),
   );
 }
 
@@ -179,6 +430,7 @@ class LocoSummary extends Loco {
     this.livery,
     this.location,
     Map<String, dynamic>? extra,
+    super.powering = true,
   }) : extra = extra ?? const {},
        super(
          id: locoId,
@@ -213,6 +465,7 @@ class LocoSummary extends Loco {
     livery: json['livery'],
     location: json['location'],
     extra: Map<String, dynamic>.from(json),
+    powering: _asBool(json['alloc_powering'] ?? json['powering'], true),
   );
 }
 
@@ -353,6 +606,96 @@ class LocoAttrVersion {
   }
 }
 
+class LocoChange {
+  final int locoId;
+  final String locoClass;
+  final String locoNumber;
+  final String locoName;
+  final String attrCode;
+  final String attrDisplay;
+  final String valueDisplay;
+  final DateTime? validFrom;
+  final DateTime? approvedAt;
+  final String approvedBy;
+
+  const LocoChange({
+    required this.locoId,
+    required this.locoClass,
+    required this.locoNumber,
+    required this.locoName,
+    required this.attrCode,
+    required this.attrDisplay,
+    required this.valueDisplay,
+    required this.validFrom,
+    required this.approvedAt,
+    required this.approvedBy,
+  });
+
+  factory LocoChange.fromJson(Map<String, dynamic> json) {
+    String cleanValue(dynamic value) {
+      final str = value?.toString().trim() ?? '';
+      if (str.isEmpty || str == '-' || str == '?') return '';
+      return str;
+    }
+
+    final valueLabel = json['value_norm'] ??
+        json['value_display'] ??
+        json['value_label'] ??
+        json['value_str'] ??
+        json['value_enum'] ??
+        json['value_norm'] ??
+        json['value'];
+    final approvedRaw = json['approved_at'] ?? json['approvedAt'];
+    final validFromRaw = json['valid_from'] ?? json['validFrom'];
+    return LocoChange(
+      locoId: _asInt(json['loco_id']),
+      locoClass: cleanValue(json['loco_class']),
+      locoNumber: cleanValue(json['loco_number']),
+      locoName: cleanValue(json['loco_name']),
+      attrCode: _asString(json['attr_code']),
+      attrDisplay: cleanValue(json['attr_display']),
+      valueDisplay: cleanValue(valueLabel),
+      validFrom: DateTime.tryParse(validFromRaw?.toString() ?? ''),
+      approvedAt: DateTime.tryParse(approvedRaw?.toString() ?? ''),
+      approvedBy: cleanValue(json['approved_by']),
+    );
+  }
+
+  String get locoLabel {
+    final parts = [locoClass, locoNumber]
+        .map((e) => e.trim())
+        .where((e) => e.isNotEmpty && e != '-')
+        .toList();
+    final label = parts.join(' ');
+    if (label.isEmpty) return locoName.isNotEmpty ? locoName : 'Loco $locoId';
+    return locoName.trim().isEmpty ? label : '$label — ${locoName.trim()}';
+  }
+
+  String get changeLabel =>
+      _cleanLabel(attrDisplay).isNotEmpty
+          ? _cleanLabel(attrDisplay)
+          : _cleanLabel(attrCode).toUpperCase();
+
+  String get approvedDateLabel {
+    final date = approvedAt ?? validFrom;
+    if (date == null) return 'Pending date';
+    return DateFormat('yyyy-MM-dd').format(date);
+  }
+
+  String get valueLabel {
+    final value = _cleanLabel(valueDisplay);
+    if (value.isNotEmpty) return value;
+    return 'Unknown value';
+  }
+
+  String _cleanLabel(String raw) {
+    final trimmed = raw.trim();
+    if (trimmed.isEmpty) return '';
+    if (trimmed == '-' || trimmed == '?') return '';
+    return trimmed;
+  }
+}
+
 class LeaderboardEntry {
   final String userId, username, userFullName;
   final double mileage;
@@ -377,25 +720,45 @@ class TripSummary {
   final int tripId;
   final String tripName;
   final double tripMileage;
+  final int legCount;
+  final List<TripLocoStat> locoStats;
+
+  int get locoHadCount => locoStats.length;
+  int get winnersCount => locoStats.where((e) => e.won).length;
 
   TripSummary({
     required this.tripId,
     required this.tripName,
     required this.tripMileage,
-  });
+    this.legCount = 0,
+    List<TripLocoStat>? locoStats,
+  }) : locoStats = locoStats ?? const [];
 
   factory TripSummary.fromJson(Map<String, dynamic> json) => TripSummary(
     tripId: _asInt(json['trip_id']),
     tripName: _asString(json['trip_name']),
     tripMileage: _asDouble(json['trip_mileage']),
+    legCount: _asInt(
+      json['leg_count'],
+      (json['trip_legs'] as List?)?.length ?? 0,
+    ),
+    locoStats: TripLocoStat.listFromJson(
+      json['stats'] ?? json['trip_locos'] ?? json['locos'],
+    ),
   );
 }
 
 class Leg {
   final int id, tripId, timezone, driving;
-  final String start, end, route, network, notes, headcode, user;
+  final String start, end, network, notes, headcode, user;
+  final String origin, destination;
+  final List<String> route;
   final DateTime beginTime;
+  final DateTime? endTime;
+  final DateTime? originTime;
+  final DateTime? destinationTime;
   final double mileage;
+  final int? beginDelayMinutes, endDelayMinutes;
   final List<Loco> locos;
 
   Leg({
@@ -413,27 +776,55 @@ class Leg {
     required this.driving,
     required this.user,
     required this.locos,
+    this.endTime,
+    this.originTime,
+    this.destinationTime,
+    this.beginDelayMinutes,
+    this.endDelayMinutes,
+    this.origin = '',
+    this.destination = '',
   });
 
-  factory Leg.fromJson(Map<String, dynamic> json) => Leg(
+  factory Leg.fromJson(Map<String, dynamic> json) {
-    id: _asInt(json['leg_id']),
+    final endTimeRaw = json['leg_end_time'];
-    tripId: _asInt(json['leg_trip']),
+    final parsedEndTime = (endTimeRaw == null || '$endTimeRaw'.isEmpty)
-    start: _asString(json['leg_start']),
+        ? null
-    end: _asString(json['leg_end']),
+        : _asDateTime(endTimeRaw);
-    beginTime: _asDateTime(json['leg_begin_time']),
+    return Leg(
-    timezone: _asInt(json['leg_timezone']),
+      id: _asInt(json['leg_id']),
-    network: _asString(json['leg_network']),
+      tripId: _asInt(json['leg_trip']),
-    route: _asString(json['leg_route']),
+      start: _asString(json['leg_start']),
-    mileage: _asDouble(json['leg_mileage']),
+      end: _asString(json['leg_end']),
-    notes: _asString(json['leg_notes']),
+      beginTime: _asDateTime(json['leg_begin_time']),
-    headcode: _asString(json['leg_headcode']),
+      endTime: parsedEndTime,
-    driving: _asInt(json['leg_driving']),
+      originTime: json['leg_origin_time'] == null
-    user: _asString(json['leg_user']),
+          ? null
-    locos: (json['locos'] is List ? (json['locos'] as List) : const [])
+          : _asDateTime(json['leg_origin_time']),
-        .whereType<Map>()
+      destinationTime: json['leg_destination_time'] == null
-        .map((e) => Loco.fromJson(Map<String, dynamic>.from(e)))
+          ? null
-        .toList(),
+          : _asDateTime(json['leg_destination_time']),
-  );
+      timezone: _asInt(json['leg_timezone']),
+      network: _asString(json['leg_network']),
+      route: _asStringList(json['leg_route']),
+      mileage: _asDouble(json['leg_mileage']),
+      notes: _asString(json['leg_notes']),
+      headcode: _asString(json['leg_headcode']),
+      driving: _asInt(json['leg_driving']),
+      user: _asString(json['leg_user']),
+      locos: (json['locos'] is List ? (json['locos'] as List) : const [])
+          .whereType<Map>()
+          .map((e) => Loco.fromJson(Map<String, dynamic>.from(e)))
+          .toList(),
+      beginDelayMinutes: json['leg_begin_delay'] == null
+          ? null
+          : _asInt(json['leg_begin_delay']),
+      endDelayMinutes: json['leg_end_delay'] == null
+          ? null
+          : _asInt(json['leg_end_delay']),
+      origin: _asString(json['leg_origin']),
+      destination: _asString(json['leg_destination']),
+    );
+  }
 }
 
 class RouteError {
@@ -515,17 +906,23 @@ class TripLeg {
   });
 
   factory TripLeg.fromJson(Map<String, dynamic> json) => TripLeg(
-    id: json['leg_id'],
+    id: _asInt(json['leg_id']),
-    start: json['leg_start'] ?? '',
+    start: _asString(json['leg_start']),
-    end: json['leg_end'] ?? '',
+    end: _asString(json['leg_end']),
     beginTime:
         json['leg_begin_time'] != null && json['leg_begin_time'] is String
         ? DateTime.tryParse(json['leg_begin_time'])
         : (json['leg_begin_time'] is DateTime ? json['leg_begin_time'] : null),
-    network: json['leg_network'],
+    network: _asString(json['leg_network'], ''),
-    route: json['leg_route'],
+    route: () {
+      final route = json['leg_route'];
+      if (route is List) {
+        return route.whereType<String>().join(' → ');
+      }
+      return _asString(route, '');
+    }(),
     mileage: (json['leg_mileage'] as num?)?.toDouble(),
-    notes: json['leg_notes'],
+    notes: _asString(json['leg_notes'], ''),
     locos:
         (json['locos'] as List?)
             ?.map((e) => Loco.fromJson(e as Map<String, dynamic>))
@@ -539,21 +936,32 @@ class TripDetail {
   final String name;
   final double mileage;
   final int legCount;
+  final List<TripLocoStat> locoStats;
   final List<TripLeg> legs;
 
+  int get locoHadCount => locoStats.length;
+  int get winnersCount => locoStats.where((e) => e.won).length;
+
   TripDetail({
     required this.id,
     required this.name,
     required this.mileage,
     required this.legCount,
     required this.legs,
-  });
+    List<TripLocoStat>? locoStats,
+  }) : locoStats = locoStats ?? const [];
 
   factory TripDetail.fromJson(Map<String, dynamic> json) => TripDetail(
     id: json['trip_id'] ?? json['id'] ?? 0,
     name: json['trip_name'] ?? '',
     mileage: (json['trip_mileage'] as num?)?.toDouble() ?? 0,
-    legCount: json['leg_count'] ?? ((json['trip_legs'] as List?)?.length ?? 0),
+    legCount: _asInt(
+      json['leg_count'],
+      (json['trip_legs'] as List?)?.length ?? 0,
+    ),
+    locoStats: TripLocoStat.listFromJson(
+      json['stats'] ?? json['trip_locos'] ?? json['locos'],
+    ),
     legs:
         (json['trip_legs'] as List?)
             ?.map((e) => TripLeg.fromJson(e as Map<String, dynamic>))
@@ -602,6 +1010,26 @@ class TripLocoStat {
     );
   }
 
+  static List<TripLocoStat> listFromJson(dynamic json) {
+    List<dynamic>? list;
+    if (json is List) {
+      list = json.expand((e) => e is List ? e : [e]).toList();
+    } else if (json is Map) {
+      for (final key in ['locos', 'stats', 'data', 'trip_locos']) {
+        final candidate = json[key];
+        if (candidate is List) {
+          list = candidate.expand((e) => e is List ? e : [e]).toList();
+          break;
+        }
+      }
+    }
+    if (list == null) return const [];
+    return list
+        .whereType<Map>()
+        .map((e) => TripLocoStat.fromJson(Map<String, dynamic>.from(e)))
+        .toList();
+  }
+
   static bool _parseWonFlag(dynamic value) {
     if (value == null) return false;
     if (value is bool) return value;
@@ -640,3 +1068,162 @@ class EventField {
     );
   }
 }
+
+class UserNotification {
+  final int id;
+  final String title;
+  final String body;
+  final DateTime? createdAt;
+  final bool dismissed;
+
+  UserNotification({
+    required this.id,
+    required this.title,
+    required this.body,
+    required this.createdAt,
+    required this.dismissed,
+  });
+
+  factory UserNotification.fromJson(Map<String, dynamic> json) {
+    final created = json['created_at'] ?? json['createdAt'];
+    DateTime? createdAt;
+    if (created is String) {
+      createdAt = DateTime.tryParse(created);
+    } else if (created is DateTime) {
+      createdAt = created;
+    }
+    return UserNotification(
+      id: _asInt(json['notification_id'] ?? json['id']),
+      title: _asString(json['title']),
+      body: _asString(json['body']),
+      createdAt: createdAt,
+      dismissed: _asBool(json['dismissed'] ?? false, false),
+    );
+  }
+}
+
+class BadgeAward {
+  final int id;
+  final int badgeId;
+  final String badgeCode;
+  final String badgeTier;
+  final String? scopeValue;
+  final DateTime? awardedAt;
+  final LocoSummary? loco;
+
+  BadgeAward({
+    required this.id,
+    required this.badgeId,
+    required this.badgeCode,
+    required this.badgeTier,
+    this.scopeValue,
+    this.awardedAt,
+    this.loco,
+  });
+
+  factory BadgeAward.fromJson(Map<String, dynamic> json) {
+    final awarded = json['awarded_at'] ?? json['awardedAt'];
+    DateTime? awardedAt;
+    if (awarded is String) {
+      awardedAt = DateTime.tryParse(awarded);
+    } else if (awarded is DateTime) {
+      awardedAt = awarded;
+    }
+    final locoJson = json['loco'];
+    LocoSummary? loco;
+    if (locoJson is Map<String, dynamic>) {
+      loco = LocoSummary.fromJson(Map<String, dynamic>.from(locoJson));
+    }
+    return BadgeAward(
+      id: _asInt(json['award_id'] ?? json['id']),
+      badgeId: _asInt(json['badge_id'] ?? 0),
+      badgeCode: _asString(json['badge_code']),
+      badgeTier: _asString(json['badge_tier']),
+      scopeValue: _asString(json['scope_value']),
+      awardedAt: awardedAt,
+      loco: loco,
+    );
+  }
+}
+
+class ClassClearanceProgress {
+  final String className;
+  final int completed;
+  final int total;
+  final double percentComplete;
+
+  ClassClearanceProgress({
+    required this.className,
+    required this.completed,
+    required this.total,
+    required this.percentComplete,
+  });
+
+  factory ClassClearanceProgress.fromJson(Map<String, dynamic> json) {
+    final name = _asString(json['class'] ?? json['class_name'] ?? json['name']);
+    final completed = _asInt(
+      json['completed'] ?? json['done'] ?? json['count'] ?? json['had'],
+    );
+    final total = _asInt(json['total'] ?? json['required'] ?? json['goal']);
+    double percent = _asDouble(
+      json['percent_complete'] ??
+          json['percent'] ??
+          json['completion'] ??
+          json['pct'],
+    );
+    if (percent == 0 && total > 0) {
+      percent = (completed / total) * 100;
+    }
+    return ClassClearanceProgress(
+      className: name.isNotEmpty ? name : 'Class',
+      completed: completed,
+      total: total,
+      percentComplete: percent,
+    );
+  }
+}
+
+class LocoClearanceProgress {
+  final LocoSummary loco;
+  final double mileage;
+  final double required;
+  final String nextTier;
+  final List<String> awardedTiers;
+  final double percent;
+
+  LocoClearanceProgress({
+    required this.loco,
+    required this.mileage,
+    required this.required,
+    required this.nextTier,
+    required this.awardedTiers,
+    required this.percent,
+  });
+
+  factory LocoClearanceProgress.fromJson(Map<String, dynamic> json) {
+    final locoJson = json['loco'];
+    final loco = locoJson is Map<String, dynamic>
+        ? LocoSummary.fromJson(Map<String, dynamic>.from(locoJson))
+        : LocoSummary(
+            locoId: _asInt(json['loco_id']),
+            locoType: _asString(json['loco_type']),
+            locoNumber: _asString(json['loco_number']),
+            locoName: _asString(json['loco_name']),
+            locoClass: _asString(json['loco_class']),
+            locoOperator: _asString(json['operator']),
+            powering: true,
+            locoNotes: null,
+            locoEvn: null,
+          );
+    return LocoClearanceProgress(
+      loco: loco,
+      mileage: _asDouble(json['mileage']),
+      required: _asDouble(json['required']),
+      nextTier: _asString(json['next_tier']),
+      awardedTiers: (json['awarded_tiers'] as List? ?? [])
+          .map((e) => e.toString())
+          .toList(),
+      percent: _asDouble(json['percent']),
+    );
+  }
+}

lib/services/api_service.dart

@@ -5,17 +5,24 @@ typedef TokenProvider = String? Function();
 typedef UnauthorizedHandler = Future<void> Function();
 
 class ApiService {
-  final String baseUrl;
+  String _baseUrl;
   final http.Client _client;
   final Duration timeout;
   TokenProvider? _getToken;
   UnauthorizedHandler? _onUnauthorized;
 
   ApiService({
-    required this.baseUrl,
+    required String baseUrl,
     http.Client? client,
     this.timeout = const Duration(seconds: 30),
-  }) : _client = client ?? http.Client();
+  })  : _baseUrl = baseUrl,
+        _client = client ?? http.Client();
+
+  String get baseUrl => _baseUrl;
+
+  void setBaseUrl(String url) {
+    _baseUrl = url;
+  }
 
   void setTokenProvider(TokenProvider provider) {
     _getToken = provider;
@@ -121,7 +128,12 @@ class ApiService {
       await _onUnauthorized!();
     }
 
-    throw Exception('API error ${res.statusCode}: $body');
+    final message = _extractErrorMessage(body);
+    throw ApiException(
+      statusCode: res.statusCode,
+      message: message,
+      body: body,
+    );
   }
 
   dynamic _decodeBody(http.Response res) {
@@ -142,4 +154,41 @@ class ApiService {
       return res.body;
     }
   }
+
+  String _extractErrorMessage(dynamic body) {
+    if (body == null) return 'No response body';
+    if (body is String) return body;
+    if (body is Map<String, dynamic>) {
+      for (final key in ['message', 'error', 'detail', 'msg']) {
+        final val = body[key];
+        if (val is String && val.trim().isNotEmpty) return val;
+      }
+      return body.toString();
+    }
+    if (body is List) {
+      final parts = body
+          .map((e) => e is Map
+              ? _extractErrorMessage(Map<String, dynamic>.from(e))
+              : e.toString())
+          .where((e) => e.trim().isNotEmpty)
+          .toList();
+      if (parts.isNotEmpty) return parts.join('; ');
+    }
+    return body.toString();
+  }
+}
+
+class ApiException implements Exception {
+  final int statusCode;
+  final String message;
+  final dynamic body;
+
+  ApiException({
+    required this.statusCode,
+    required this.message,
+    this.body,
+  });
+
+  @override
+  String toString() => 'API error $statusCode: $message';
 }

lib/services/data_service/data_service.dart

@@ -9,4 +9,6 @@ import 'package:mileograph_flutter/services/api_service.dart';
 part 'data_service_core.dart';
 part 'data_service_traction.dart';
 part 'data_service_trips.dart';
-
+part 'data_service_notifications.dart';
+part 'data_service_badges.dart';
+part 'data_service_stats.dart';

lib/services/data_service/data_service_badges.dart

@@ -0,0 +1,130 @@
+part of 'data_service.dart';
+
+extension DataServiceBadges on DataService {
+  Future<void> fetchBadgeAwards({
+    int offset = 0,
+    int limit = 50,
+    bool append = false,
+    String badgeCode = 'class_clearance',
+  }) async {
+    _isBadgeAwardsLoading = true;
+    if (!append) _badgeAwards = [];
+    try {
+      final json = await api.get(
+        '/badge/awards/me?limit=$limit&offset=$offset&badge_code=$badgeCode',
+      );
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['awards', 'badge_awards', 'data']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      final parsed = list
+          ?.whereType<Map<String, dynamic>>()
+          .map(BadgeAward.fromJson)
+          .toList();
+      final items = parsed ?? [];
+      _badgeAwards =
+          append ? [..._badgeAwards, ...items] : items;
+      _badgeAwards.sort((a, b) {
+        final aTs = a.awardedAt?.millisecondsSinceEpoch ?? 0;
+        final bTs = b.awardedAt?.millisecondsSinceEpoch ?? 0;
+        return bTs.compareTo(aTs);
+      });
+      _badgeAwardsHasMore = items.length >= limit;
+    } catch (e) {
+      debugPrint('Failed to fetch badge awards: $e');
+      if (!append) _badgeAwards = [];
+      _badgeAwardsHasMore = false;
+    } finally {
+      _isBadgeAwardsLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<void> fetchClassClearanceProgress({
+    int offset = 0,
+    int limit = 20,
+    bool append = false,
+  }) async {
+    _isClassClearanceProgressLoading = true;
+    if (!append) _classClearanceProgress = [];
+    try {
+      final json =
+          await api.get('/badge/completion/class?limit=$limit&offset=$offset');
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['progress', 'data', 'items', 'classes']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      final parsed = list
+          ?.whereType<Map<String, dynamic>>()
+          .map(ClassClearanceProgress.fromJson)
+          .toList();
+      final items = parsed ?? [];
+      _classClearanceProgress =
+          append ? [..._classClearanceProgress, ...items] : items;
+      _classClearanceHasMore = items.length >= limit;
+    } catch (e) {
+      debugPrint('Failed to fetch class clearance progress: $e');
+      if (!append) _classClearanceProgress = [];
+      _classClearanceHasMore = false;
+    } finally {
+      _isClassClearanceProgressLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<void> fetchLocoClearanceProgress({
+    int offset = 0,
+    int limit = 20,
+    bool append = false,
+  }) async {
+    _isLocoClearanceProgressLoading = true;
+    if (!append) _locoClearanceProgress = [];
+    try {
+      final json =
+          await api.get('/badge/completion/loco?limit=$limit&offset=$offset');
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['progress', 'data', 'items', 'locos']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      final parsed = list
+          ?.whereType<Map<String, dynamic>>()
+          .map(LocoClearanceProgress.fromJson)
+          .toList();
+      final items = parsed ?? [];
+      _locoClearanceProgress =
+          append ? [..._locoClearanceProgress, ...items] : items;
+      _locoClearanceHasMore = items.length >= limit;
+    } catch (e) {
+      debugPrint('Failed to fetch loco clearance progress: $e');
+      if (!append) _locoClearanceProgress = [];
+      _locoClearanceHasMore = false;
+    } finally {
+      _isLocoClearanceProgressLoading = false;
+      _notifyAsync();
+    }
+  }
+}

lib/services/data_service/data_service_core.dart

@@ -21,11 +21,17 @@ class DataService extends ChangeNotifier {
 
   DataService({required this.api});
 
+  String? _currentUserId;
+
   _LegFetchOptions _lastLegsFetch = const _LegFetchOptions();
 
   // Homepage Data
   HomepageStats? _homepageStats;
   HomepageStats? get homepageStats => _homepageStats;
+  StatsAbout? _aboutStats;
+  StatsAbout? get aboutStats => _aboutStats;
+  bool _isAboutStatsLoading = false;
+  bool get isAboutStatsLoading => _isAboutStatsLoading;
 
   // Legs Data
   List<Leg> _legs = [];
@@ -44,6 +50,13 @@ class DataService extends ChangeNotifier {
   bool get isTractionLoading => _isTractionLoading;
   bool _tractionHasMore = false;
   bool get tractionHasMore => _tractionHasMore;
+  List<LocoChange> _latestLocoChanges = [];
+  List<LocoChange> get latestLocoChanges => _latestLocoChanges;
+  bool _isLatestLocoChangesLoading = false;
+  bool get isLatestLocoChangesLoading => _isLatestLocoChangesLoading;
+  bool _latestLocoChangesHasMore = false;
+  bool get latestLocoChangesHasMore => _latestLocoChangesHasMore;
+  int _latestLocoChangesFetched = 0;
   final Map<int, List<LocoAttrVersion>> _locoTimelines = {};
   final Map<int, bool> _isLocoTimelineLoading = {};
   List<LocoAttrVersion> timelineForLoco(int locoId) =>
@@ -68,9 +81,14 @@ class DataService extends ChangeNotifier {
   bool get isEventFieldsLoading => _isEventFieldsLoading;
 
   // Station Data
-  List<Station>? _cachedStations;
+  final Map<String, List<Station>> _stationCache = {};
-  DateTime? _stationsFetchedAt;
+  final Map<String, Future<List<Station>>?> _stationInFlightByKey = {};
-  Future<List<Station>>? _stationsInFlight;
+  List<String> _stationNetworks = [];
+  Map<String, List<String>> _stationCountryNetworks = {};
+  DateTime? _stationFiltersFetchedAt;
+  List<String> get stationNetworks => _stationNetworks;
+  Map<String, List<String>> get stationCountryNetworks =>
+      _stationCountryNetworks;
 
   List<String> stations = [""];
 
@@ -79,6 +97,36 @@ class DataService extends ChangeNotifier {
   bool _isOnThisDayLoading = false;
   bool get isOnThisDayLoading => _isOnThisDayLoading;
 
+  // Notifications
+  List<UserNotification> _notifications = [];
+  List<UserNotification> get notifications => _notifications;
+  bool _isNotificationsLoading = false;
+  bool get isNotificationsLoading => _isNotificationsLoading;
+
+  // Badges
+  List<BadgeAward> _badgeAwards = [];
+  List<BadgeAward> get badgeAwards => _badgeAwards;
+  bool _isBadgeAwardsLoading = false;
+  bool get isBadgeAwardsLoading => _isBadgeAwardsLoading;
+  bool _badgeAwardsHasMore = false;
+  bool get badgeAwardsHasMore => _badgeAwardsHasMore;
+  List<ClassClearanceProgress> _classClearanceProgress = [];
+  List<ClassClearanceProgress> get classClearanceProgress =>
+      _classClearanceProgress;
+  bool _isClassClearanceProgressLoading = false;
+  bool get isClassClearanceProgressLoading =>
+      _isClassClearanceProgressLoading;
+  bool _classClearanceHasMore = false;
+  bool get classClearanceHasMore => _classClearanceHasMore;
+  List<LocoClearanceProgress> _locoClearanceProgress = [];
+  List<LocoClearanceProgress> get locoClearanceProgress =>
+      _locoClearanceProgress;
+  bool _isLocoClearanceProgressLoading = false;
+  bool get isLocoClearanceProgressLoading =>
+      _isLocoClearanceProgressLoading;
+  bool _locoClearanceHasMore = false;
+  bool get locoClearanceHasMore => _locoClearanceHasMore;
+
   static const List<EventField> _fallbackEventFields = [
     EventField(name: 'operator', display: 'Operator'),
     EventField(name: 'status', display: 'Status'),
@@ -148,7 +196,8 @@ class DataService extends ChangeNotifier {
       if (json is List) {
         final newLegs = json.map((e) => Leg.fromJson(e)).toList();
         _legs = append ? [..._legs, ...newLegs] : newLegs;
-        _legsHasMore = newLegs.length >= limit;
+        // Keep "load more" available as long as the server returns items; hide only on empty.
+        _legsHasMore = newLegs.isNotEmpty;
       } else {
         throw Exception('Unexpected legs response: $json');
       }
@@ -180,7 +229,7 @@ class DataService extends ChangeNotifier {
     final params =
         includeNonPowering ? '?include_non_powering=true' : '';
     try {
-      final json = await api.get('/legs/$locoId$params');
+      final json = await api.get('/legs/by-loco/$locoId$params');
       dynamic list = json;
       if (json is Map) {
         for (final key in ['legs', 'data', 'results']) {
@@ -332,6 +381,8 @@ class DataService extends ChangeNotifier {
   }
 
   void clear() {
+    _currentUserId = null;
+    _lastLegsFetch = const _LegFetchOptions();
     _homepageStats = null;
     _legs = [];
     _onThisDay = [];
@@ -340,9 +391,46 @@ class DataService extends ChangeNotifier {
     _eventFields = [];
     _locoTimelines.clear();
     _isLocoTimelineLoading.clear();
+    _latestLocoChanges = [];
+    _isLatestLocoChangesLoading = false;
+    _isHomepageLoading = false;
+    _isOnThisDayLoading = false;
+    _legsHasMore = false;
+    _isLegsLoading = false;
+    _traction = [];
+    _isTractionLoading = false;
+    _tractionHasMore = false;
+    _latestLocoChangesHasMore = false;
+    _latestLocoChangesFetched = 0;
+    _isTripDetailsLoading = false;
+    _locoClasses = [];
+    _tripList = [];
+    _stationCache.clear();
+    _stationInFlightByKey.clear();
+    _stationNetworks = [];
+    _stationCountryNetworks = {};
+    _stationFiltersFetchedAt = null;
+    _notifications = [];
+    _isNotificationsLoading = false;
+    _badgeAwards = [];
+    _badgeAwardsHasMore = false;
+    _isBadgeAwardsLoading = false;
+    _classClearanceProgress = [];
+    _isClassClearanceProgressLoading = false;
+    _classClearanceHasMore = false;
+    _locoClearanceProgress = [];
+    _isLocoClearanceProgressLoading = false;
+    _locoClearanceHasMore = false;
     _notifyAsync();
   }
 
+  void handleAuthChanged(String? userId) {
+    if (_currentUserId == userId) return;
+    _currentUserId = userId;
+    clear();
+    _currentUserId = userId;
+  }
+
   double getMileageForCurrentYear() {
     final currentYear = DateTime.now().year;
     return getMileageForYear(currentYear) ?? 0;
@@ -358,37 +446,75 @@ class DataService extends ChangeNotifier {
         0;
   }
 
-  Future<List<Station>> fetchStations() async {
+  Future<void> fetchStationFilters() async {
     final now = DateTime.now();
-
+    if (_stationFiltersFetchedAt != null &&
-    // If cache exists and is less than 30 minutes old, return it
+        now.difference(_stationFiltersFetchedAt!) < const Duration(minutes: 30) &&
-    if (_cachedStations != null &&
+        _stationNetworks.isNotEmpty) {
-        _stationsFetchedAt != null &&
+      return;
-        now.difference(_stationsFetchedAt!) < Duration(minutes: 30)) {
-      return _cachedStations!;
     }
+    try {
+      final response = await api.get('/stations/filter');
+      if (response is List && response.isNotEmpty && response.first is Map) {
+        final map = Map<String, dynamic>.from(response.first as Map);
+        final networks = (map['networks'] as List? ?? const [])
+            .whereType<String>()
+            .toList();
+        final countryNetworksRaw =
+            map['country_networks'] as Map? ?? const <String, dynamic>{};
+        final countryNetworks = <String, List<String>>{};
+        countryNetworksRaw.forEach((key, value) {
+          if (value is List) {
+            countryNetworks[key] = value.whereType<String>().toList();
+          }
+        });
+        _stationNetworks = networks;
+        _stationCountryNetworks = countryNetworks;
+        _stationFiltersFetchedAt = now;
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch station filters: $e');
+    }
+  }
 
-    if (_stationsInFlight != null) return _stationsInFlight!;
+  String _stationKey(List<String> countries, List<String> networks) {
+    final c = countries..sort();
+    final n = networks..sort();
+    return 'c:${c.join('|')};n:${n.join('|')}';
+  }
 
-    _stationsInFlight = () async {
+  Future<List<Station>> fetchStations({
+    List<String> countries = const [],
+    List<String> networks = const [],
+  }) async {
+    final key = _stationKey(List.from(countries), List.from(networks));
+
+    if (_stationCache.containsKey(key)) return _stationCache[key]!;
+    final inflight = _stationInFlightByKey[key];
+    if (inflight != null) return inflight;
+
+    final future = () async {
       try {
-        final response = await api.get('/location');
+        final response = await api.post('/location', {
+          'countries_filter': countries,
+          'network_filter': networks,
+        });
         if (response is! List) return const <Station>[];
         final parsed = response
             .whereType<Map>()
             .map((e) => Station.fromJson(Map<String, dynamic>.from(e)))
             .toList();
-        _cachedStations = parsed;
+        _stationCache[key] = parsed;
-        _stationsFetchedAt = now;
         return parsed;
       } catch (e) {
         debugPrint('Failed to fetch stations: $e');
         return const <Station>[];
       } finally {
-        _stationsInFlight = null;
+        _stationInFlightByKey.remove(key);
       }
     }();
 
-    return _stationsInFlight!;
+    _stationInFlightByKey[key] = future;
+    return future;
   }
 }

lib/services/data_service/data_service_notifications.dart

@@ -0,0 +1,62 @@
+part of 'data_service.dart';
+
+extension DataServiceNotifications on DataService {
+  Future<void> fetchNotifications() async {
+    _isNotificationsLoading = true;
+    try {
+      final json = await api.get('/notifications');
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['notifications', 'data', 'items']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      final parsed = list
+          ?.whereType<Map<String, dynamic>>()
+          .map(UserNotification.fromJson)
+          .where((n) => !n.dismissed)
+          .toList();
+
+      if (parsed != null) {
+        parsed.sort((a, b) {
+          final aTs = a.createdAt?.millisecondsSinceEpoch ?? 0;
+          final bTs = b.createdAt?.millisecondsSinceEpoch ?? 0;
+          return bTs.compareTo(aTs);
+        });
+        _notifications = parsed;
+      } else {
+        _notifications = [];
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch notifications: $e');
+      _notifications = [];
+    } finally {
+      _isNotificationsLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<void> dismissNotifications(List<int> notificationIds) async {
+    if (notificationIds.isEmpty) return;
+    try {
+      await api.put('/notifications/dismiss', {
+        "notification_ids": notificationIds,
+        "payload": {"dismissed": true},
+      });
+      _notifications = _notifications
+          .where((n) => !notificationIds.contains(n.id))
+          .toList();
+    } catch (e) {
+      debugPrint('Failed to dismiss notifications: $e');
+      rethrow;
+    } finally {
+      _notifyAsync();
+    }
+  }
+}

lib/services/data_service/data_service_stats.dart

@@ -0,0 +1,28 @@
+part of 'data_service.dart';
+
+extension DataServiceStats on DataService {
+  Future<void> fetchAboutStats({bool force = false}) async {
+    if (_isAboutStatsLoading) return;
+    if (!force && _aboutStats != null) return;
+    _isAboutStatsLoading = true;
+    _notifyAsync();
+    try {
+      final json = await api.get('/stats/about');
+      if (json is Map<String, dynamic>) {
+        _aboutStats = StatsAbout.fromJson(json);
+      } else if (json is Map) {
+        _aboutStats = StatsAbout.fromJson(
+          json.map((key, value) => MapEntry(key.toString(), value)),
+        );
+      } else {
+        throw Exception('Unexpected stats response: $json');
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch about stats: $e');
+      _aboutStats = null;
+    } finally {
+      _isAboutStatsLoading = false;
+      _notifyAsync();
+    }
+  }
+}

lib/services/data_service/data_service_traction.dart

@@ -114,5 +114,69 @@ extension DataServiceTraction on DataService {
     }
     return _locoClasses;
   }
-}
 
+  Future<void> fetchLatestLocoChanges({
+    int limit = 100,
+    int offset = 0,
+    bool append = false,
+  }) async {
+    _isLatestLocoChangesLoading = true;
+    _notifyAsync();
+    try {
+      final json =
+          await api.get('/loco/changes/latest?limit=$limit&offset=$offset');
+      dynamic results = json;
+      if (json is Map && json['data'] is List) {
+        results = json['data'];
+      }
+      if (results is List) {
+        final parsed = <LocoChange>[];
+        for (final item in results) {
+          if (item is Map<String, dynamic>) {
+            parsed.add(LocoChange.fromJson(item));
+          } else if (item is Map) {
+            parsed.add(
+              LocoChange.fromJson(
+                item.map((key, value) => MapEntry(key.toString(), value)),
+              ),
+            );
+          }
+        }
+        if (append) {
+          _latestLocoChanges = [..._latestLocoChanges, ...parsed];
+        } else {
+          _latestLocoChanges = parsed;
+        }
+        final fetchedCount = parsed.length;
+        _latestLocoChangesFetched = append
+            ? offset + fetchedCount
+            : fetchedCount;
+        _latestLocoChangesHasMore = _latestLocoChangesFetched < 5000;
+      } else {
+        throw Exception('Unexpected latest loco changes response: $json');
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch latest loco changes: $e');
+      _latestLocoChanges = [];
+      _latestLocoChangesHasMore = false;
+      _latestLocoChangesFetched = 0;
+    } finally {
+      _isLatestLocoChangesLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<Map<String, dynamic>?> fetchClassStats(String locoClass) async {
+    try {
+      final path = Uri.encodeComponent(locoClass);
+      final json = await api.get('/loco/class/stats/$path/user');
+      if (json is Map) {
+        return Map<String, dynamic>.from(json);
+      }
+      debugPrint('Unexpected class stats response for $locoClass: $json');
+    } catch (e) {
+      debugPrint('Failed to fetch class stats for $locoClass: $e');
+    }
+    return null;
+  }
+}

lib/services/data_service/data_service_trips.dart

@@ -4,16 +4,25 @@ extension DataServiceTrips on DataService {
   Future<void> fetchTripDetails() async {
     _isTripDetailsLoading = true;
     try {
-      final json = await api.get('/trips/legs-and-stats');
+      final json = await api.get('/trips/info');
-      if (json is List) {
+      final tripDetails = _parseTripInfoList(json);
-        final tripMap = json.map((e) => TripDetail.fromJson(e)).toList();
+      _tripDetails = [...tripDetails]..sort((a, b) => b.id.compareTo(a.id));
-        _tripDetails = [...tripMap]..sort((a, b) => b.id.compareTo(a.id));
+      _tripList = tripDetails
-      } else {
+          .map(
-        _tripDetails = [];
+            (detail) => TripSummary(
-      }
+              tripId: detail.id,
+              tripName: detail.name,
+              tripMileage: detail.mileage,
+              legCount: detail.legCount,
+              locoStats: detail.locoStats,
+            ),
+          )
+          .toList()
+        ..sort((a, b) => b.tripId.compareTo(a.tripId));
     } catch (e) {
       debugPrint('Failed to fetch trip_map: $e');
       _tripDetails = [];
+      _tripList = [];
     } finally {
       _isTripDetailsLoading = false;
       _notifyAsync();
@@ -23,36 +32,39 @@ extension DataServiceTrips on DataService {
   Future<List<TripLocoStat>> fetchTripLocoStats(int tripId) async {
     try {
       final json = await api.get('/trips/stats/$tripId');
-      return _parseTripLocoStats(json);
+      return TripLocoStat.listFromJson(json);
     } catch (e) {
       debugPrint('Failed to fetch trip loco stats: $e');
       return [];
     }
   }
 
-  List<TripLocoStat> _parseTripLocoStats(dynamic json) {
-    List<dynamic>? list;
-    if (json is List) {
-      list = json.expand((e) => e is List ? e : [e]).toList();
-    } else if (json is Map) {
-      for (final key in ['locos', 'stats', 'data', 'trip_locos']) {
-        final candidate = json[key];
-        if (candidate is List) {
-          list = candidate.expand((e) => e is List ? e : [e]).toList();
-          break;
-        }
-      }
-    }
-    if (list == null) return [];
-    return list
-        .whereType<Map<String, dynamic>>()
-        .map((e) => TripLocoStat.fromJson(e))
-        .toList();
-  }
-
   Future<void> fetchTrips() async {
     try {
-      final json = await api.get('/trips/mileage');
+      final json = await api.get('/trips/info');
+      final raw = _extractTrips(json);
+      if (raw != null) {
+        final tripMap = raw
+            .whereType<Map<String, dynamic>>()
+            .map((e) => TripSummary.fromJson(e))
+            .toList();
+
+        _tripList = [...tripMap]..sort((a, b) => b.tripId.compareTo(a.tripId));
+      } else {
+        debugPrint('Unexpected trip list response: $json');
+        _tripList = [];
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch trip list: $e');
+      _tripList = [];
+    } finally {
+      _notifyAsync();
+    }
+  }
+
+  Future<void> fetchTripOptions() async {
+    try {
+      final json = await api.get('/trips');
       Iterable<dynamic>? raw;
       if (json is List) {
         raw = json;
@@ -83,5 +95,37 @@ extension DataServiceTrips on DataService {
       _notifyAsync();
     }
   }
-}
 
+  void upsertTripSummary(TripSummary trip) {
+    final existingIndex = _tripList.indexWhere(
+      (element) => element.tripId == trip.tripId,
+    );
+    if (existingIndex >= 0) {
+      _tripList[existingIndex] = trip;
+    } else {
+      _tripList = [trip, ..._tripList];
+    }
+    _tripList.sort((a, b) => b.tripId.compareTo(a.tripId));
+    _notifyAsync();
+  }
+
+  Iterable<dynamic>? _extractTrips(dynamic json) {
+    if (json is List) return json;
+    if (json is Map) {
+      for (final key in ['trips', 'trip_data', 'data', 'trip_info']) {
+        final value = json[key];
+        if (value is List) return value;
+      }
+    }
+    return null;
+  }
+
+  List<TripDetail> _parseTripInfoList(dynamic json) {
+    final raw = _extractTrips(json);
+    if (raw == null) return const [];
+    return raw
+        .whereType<Map<String, dynamic>>()
+        .map((e) => TripDetail.fromJson(e))
+        .toList();
+  }
+}

lib/services/distance_unit_service.dart

@@ -0,0 +1,211 @@
+import 'package:flutter/foundation.dart';
+import 'package:intl/intl.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+enum DistanceUnit {
+  milesDecimal,
+  milesChains,
+  kilometers,
+}
+
+extension DistanceUnitLabels on DistanceUnit {
+  String get label {
+    switch (this) {
+      case DistanceUnit.milesDecimal:
+        return 'Miles (decimal)';
+      case DistanceUnit.milesChains:
+        return 'Miles & chains';
+      case DistanceUnit.kilometers:
+        return 'Kilometers';
+    }
+  }
+
+  String get shortLabel {
+    switch (this) {
+      case DistanceUnit.milesDecimal:
+        return 'mi';
+      case DistanceUnit.milesChains:
+        return 'm.ch';
+      case DistanceUnit.kilometers:
+        return 'km';
+    }
+  }
+
+  String get _prefsValue => toString().split('.').last;
+
+  static DistanceUnit fromPrefs(String raw) {
+    return DistanceUnit.values.firstWhere(
+      (u) => u._prefsValue == raw,
+      orElse: () => DistanceUnit.milesDecimal,
+    );
+  }
+}
+
+class DistanceUnitService extends ChangeNotifier {
+  static const _prefsKey = 'distance_unit';
+  static const double kmPerMile = 1.609344;
+  static const double chainsPerMile = 80.0;
+
+  DistanceUnitService() {
+    _load();
+  }
+
+  DistanceUnit _unit = DistanceUnit.milesDecimal;
+  bool _loaded = false;
+
+  DistanceUnit get unit => _unit;
+  bool get isLoaded => _loaded;
+
+  Future<void> _load() async {
+    final prefs = await SharedPreferences.getInstance();
+    final saved = prefs.getString(_prefsKey);
+    if (saved != null && saved.trim().isNotEmpty) {
+      _unit = DistanceUnitLabels.fromPrefs(saved.trim());
+    }
+    _loaded = true;
+    notifyListeners();
+  }
+
+  Future<void> setUnit(DistanceUnit unit) async {
+    _unit = unit;
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setString(_prefsKey, unit._prefsValue);
+    notifyListeners();
+  }
+
+  double? milesFromInput(String input) =>
+      DistanceFormatter(_unit).parseInputMiles(input);
+
+  String format(double miles,
+          {int decimals = 1, bool includeUnit = true}) =>
+      DistanceFormatter(_unit)
+          .format(miles, decimals: decimals, includeUnit: includeUnit);
+
+  double toDisplay(double miles, {int decimals = 1}) =>
+      DistanceFormatter(_unit).convertMiles(miles, decimals: decimals);
+}
+
+class DistanceFormatter {
+  DistanceFormatter(this.unit);
+
+  final DistanceUnit unit;
+
+  String format(double miles,
+      {int decimals = 1, bool includeUnit = true}) {
+    decimals = decimals.clamp(1, 2);
+    if (unit == DistanceUnit.milesChains) {
+      // Always show chains with two decimals.
+      decimals = 2;
+    }
+    switch (unit) {
+      case DistanceUnit.milesDecimal:
+        final value = _numberFormat(decimals).format(miles);
+        return includeUnit ? '$value mi' : value;
+      case DistanceUnit.kilometers:
+        final kms = miles * DistanceUnitService.kmPerMile;
+        final value = _numberFormat(decimals).format(kms);
+        return includeUnit ? '$value km' : value;
+      case DistanceUnit.milesChains:
+        final value = _formatMilesChains(miles);
+        return includeUnit ? '$value mi' : value;
+    }
+  }
+
+  double convertMiles(double miles, {int decimals = 1}) {
+    decimals = decimals.clamp(1, 2);
+    switch (unit) {
+      case DistanceUnit.milesDecimal:
+        return double.parse(miles.toStringAsFixed(decimals));
+      case DistanceUnit.kilometers:
+        final kms = miles * DistanceUnitService.kmPerMile;
+        return double.parse(kms.toStringAsFixed(decimals));
+      case DistanceUnit.milesChains:
+        // Return miles again; chains representation handled by format.
+        return double.parse(miles.toStringAsFixed(decimals));
+    }
+  }
+
+  double milesFromDisplayValue(double value) {
+    switch (unit) {
+      case DistanceUnit.milesDecimal:
+        return value;
+      case DistanceUnit.kilometers:
+        return value / DistanceUnitService.kmPerMile;
+      case DistanceUnit.milesChains:
+        // Value already represents miles when parsed via parseMilesChains.
+        return value;
+    }
+  }
+
+  double? parseInputMiles(String input) {
+    final trimmed = input.trim();
+    if (trimmed.isEmpty) return null;
+    switch (unit) {
+      case DistanceUnit.milesDecimal:
+        return double.tryParse(trimmed.replaceAll(',', ''));
+      case DistanceUnit.kilometers:
+        final km = double.tryParse(trimmed.replaceAll(',', ''));
+        if (km == null) return null;
+        return km / DistanceUnitService.kmPerMile;
+      case DistanceUnit.milesChains:
+        return _parseMilesChains(trimmed);
+    }
+  }
+
+  NumberFormat _numberFormat(int decimals) {
+    final pattern =
+        decimals == 1 ? '#,##0.0' : '#,##0.00';
+    return NumberFormat(pattern);
+  }
+
+  String _formatMilesChains(double miles, {int decimals = 1}) {
+    final totalChains = miles * DistanceUnitService.chainsPerMile;
+    var milesPart = totalChains ~/ DistanceUnitService.chainsPerMile;
+    final chainRemainder =
+        totalChains - (milesPart * DistanceUnitService.chainsPerMile);
+
+    // Always show chains as two digits (00-79), rounded to the nearest chain.
+    var roundedChains = chainRemainder.roundToDouble();
+    if (roundedChains >= DistanceUnitService.chainsPerMile) {
+      milesPart += 1;
+      roundedChains -= DistanceUnitService.chainsPerMile;
+    }
+    final chainText = NumberFormat('00').format(roundedChains);
+    return '$milesPart.$chainText';
+  }
+
+  double? _parseMilesChains(String raw) {
+    final cleaned = raw
+        .toLowerCase()
+        .replaceAll(',', '')
+        .replaceAll('m', '.')
+        .replaceAll('c', '.')
+        .replaceAll(RegExp(r'\s+'), '.')
+        .replaceAll(RegExp(r'\.+'), '.')
+        .trim();
+    if (cleaned.isEmpty) return null;
+
+    final parts = cleaned.split('.');
+    if (parts.isEmpty) return null;
+
+    final milesPart =
+        int.tryParse(parts[0].isEmpty ? '0' : parts[0]);
+    if (milesPart == null) return null;
+    double chainsPart = 0;
+    if (parts.length >= 2) {
+      final chainRaw = parts
+          .sublist(1)
+          .join()
+          .trim();
+      if (chainRaw.isNotEmpty) {
+        final parsedChains = double.tryParse(chainRaw);
+        if (parsedChains == null) return null;
+        chainsPart = parsedChains;
+      }
+    }
+    final totalMiles =
+        milesPart +
+        (chainsPart / DistanceUnitService.chainsPerMile);
+    return totalMiles;
+  }
+}

lib/services/endpoint_service.dart

@@ -0,0 +1,36 @@
+import 'package:flutter/foundation.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class EndpointService extends ChangeNotifier {
+  EndpointService() {
+    _load();
+  }
+
+  static const String defaultBaseUrl = 'https://mileograph.co.uk/api/v1';
+  static const String _prefsKey = 'api_base_url';
+
+  String _baseUrl = defaultBaseUrl;
+  bool _loaded = false;
+
+  String get baseUrl => _baseUrl;
+  bool get isLoaded => _loaded;
+
+  Future<void> _load() async {
+    final prefs = await SharedPreferences.getInstance();
+    final saved = prefs.getString(_prefsKey);
+    if (saved != null && saved.trim().isNotEmpty) {
+      _baseUrl = saved;
+    }
+    _loaded = true;
+    notifyListeners();
+  }
+
+  Future<void> setBaseUrl(String url) async {
+    final trimmed = url.trim();
+    if (trimmed.isEmpty) return;
+    _baseUrl = trimmed;
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setString(_prefsKey, _baseUrl);
+    notifyListeners();
+  }
+}

lib/ui/app_shell.dart

@@ -1,42 +1,85 @@
 import 'package:dynamic_color/dynamic_color.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mileograph_flutter/components/login/login.dart';
 import 'package:mileograph_flutter/components/pages/calculator.dart';
 import 'package:mileograph_flutter/components/pages/calculator_details.dart';
+import 'package:mileograph_flutter/components/login/login.dart';
 import 'package:mileograph_flutter/components/pages/dashboard.dart';
-import 'package:mileograph_flutter/components/pages/legs.dart';
 import 'package:mileograph_flutter/components/pages/loco_legs.dart';
 import 'package:mileograph_flutter/components/pages/loco_timeline.dart';
+import 'package:mileograph_flutter/components/pages/logbook.dart';
+import 'package:mileograph_flutter/components/pages/more.dart';
 import 'package:mileograph_flutter/components/pages/new_entry.dart';
 import 'package:mileograph_flutter/components/pages/new_traction.dart';
+import 'package:mileograph_flutter/components/pages/profile.dart';
+import 'package:mileograph_flutter/components/pages/settings.dart';
+import 'package:mileograph_flutter/components/pages/stats.dart';
 import 'package:mileograph_flutter/components/pages/traction.dart';
-import 'package:mileograph_flutter/components/pages/trips.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:mileograph_flutter/services/navigation_guard.dart';
 import 'package:provider/provider.dart';
 
-final GlobalKey<NavigatorState> _shellNavigatorKey = GlobalKey<NavigatorState>();
+final GlobalKey<NavigatorState> _shellNavigatorKey =
+    GlobalKey<NavigatorState>();
 
 const List<String> _contentPages = [
-  "/",
+  "/dashboard",
   "/calculator",
-  "/legs",
+  "/logbook",
   "/traction",
-  "/trips",
   "/add",
+  "/more",
 ];
 
-const int _addTabIndex = 5;
+const List<String> _defaultTabDestinations = [
+  "/dashboard",
+  "/calculator",
+  "/logbook/entries",
+  "/traction",
+  "/add",
+  "/more",
+];
+
+const int _addTabIndex = 4;
+
+class _NavItem {
+  final String label;
+  final IconData icon;
+  const _NavItem(this.label, this.icon);
+}
+
+const List<_NavItem> _navItems = [
+  _NavItem("Home", Icons.home),
+  _NavItem("Calculator", Icons.route),
+  _NavItem("Logbook", Icons.menu_book),
+  _NavItem("Traction", Icons.train),
+  _NavItem("Add", Icons.add),
+  _NavItem("More", Icons.more_horiz),
+];
 
 int tabIndexForPath(String path) {
-  final newIndex = _contentPages.indexWhere((routePath) {
+  var matchPath = path;
-    if (path == routePath) return true;
+  if (matchPath == '/') matchPath = '/dashboard';
-    if (routePath == '/') return path == '/';
+  if (matchPath.startsWith('/dashboard')) return 0;
-    return path.startsWith('$routePath/');
+  if (matchPath.startsWith('/legs')) {
-  });
+    matchPath = '/logbook/entries';
+  } else if (matchPath.startsWith('/trips')) {
+    matchPath = '/logbook/trips';
+  }
+  if (matchPath.startsWith('/logbook')) {
+    matchPath = '/logbook';
+  } else if (matchPath.startsWith('/profile') ||
+      matchPath.startsWith('/settings') ||
+      matchPath.startsWith('/more')) {
+    matchPath = '/more';
+  }
+  final newIndex = _contentPages.indexWhere(
+    (routePath) =>
+        matchPath == routePath || matchPath.startsWith('$routePath/'),
+  );
   return newIndex < 0 ? 0 : newIndex;
 }
 
@@ -64,35 +107,67 @@ class _MyAppState extends State<MyApp> {
     _routerInitialized = true;
     final auth = context.read<AuthService>();
     _router = GoRouter(
+      initialLocation: '/dashboard',
       refreshListenable: auth,
       redirect: (context, state) {
         final loggedIn = auth.isLoggedIn;
         final loggingIn = state.uri.toString() == '/login';
+        final atSettings = state.uri.toString() == '/settings';
 
-        if (!loggedIn && !loggingIn) return '/login';
+        if (!loggedIn && !loggingIn && !atSettings) return '/login';
-        if (loggedIn && loggingIn) return '/';
+        if (loggedIn && loggingIn) return '/dashboard';
         return null;
       },
       routes: [
+        GoRoute(path: '/', redirect: (context, state) => '/dashboard'),
         ShellRoute(
           navigatorKey: _shellNavigatorKey,
           builder: (context, state, child) => MyHomePage(child: child),
           routes: [
-            GoRoute(path: '/', builder: (context, state) => const Dashboard()),
+            GoRoute(
+              path: '/dashboard',
+              builder: (context, state) => const Dashboard(),
+            ),
             GoRoute(
               path: '/calculator',
-              builder: (context, state) => CalculatorPage(),
+              builder: (context, state) => const CalculatorPage(),
+              routes: [
+                GoRoute(
+                  path: 'details',
+                  builder: (context, state) =>
+                      CalculatorDetailsPage(result: state.extra),
+                ),
+              ],
             ),
             GoRoute(
-              path: '/calculator/details',
+              path: '/logbook',
-              builder: (context, state) =>
+              redirect: (context, state) => '/logbook/entries',
-                  CalculatorDetailsPage(result: state.extra),
+            ),
+            GoRoute(
+              path: '/logbook/entries',
+              builder: (context, state) => const LogbookPage(),
+            ),
+            GoRoute(
+              path: '/logbook/trips',
+              builder: (context, state) =>
+                  const LogbookPage(initialTab: LogbookTab.trips),
+            ),
+            GoRoute(
+              path: '/trips',
+              redirect: (context, state) => '/logbook/trips',
+            ),
+            GoRoute(
+              path: '/legs',
+              redirect: (context, state) => '/logbook/entries',
             ),
-            GoRoute(path: '/legs', builder: (context, state) => LegsPage()),
             GoRoute(
               path: '/traction',
               builder: (context, state) => TractionPage(),
             ),
+            GoRoute(
+              path: '/profile',
+              builder: (context, state) => const ProfilePage(),
+            ),
             GoRoute(
               path: '/traction/:id/timeline',
               builder: (_, state) {
@@ -129,8 +204,23 @@ class _MyAppState extends State<MyApp> {
               path: '/traction/new',
               builder: (context, state) => const NewTractionPage(),
             ),
-            GoRoute(path: '/trips', builder: (context, state) => TripsPage()),
             GoRoute(path: '/add', builder: (context, state) => NewEntryPage()),
+            GoRoute(
+              path: '/more',
+              builder: (context, state) => const MorePage(),
+            ),
+            GoRoute(
+              path: '/more/profile',
+              builder: (context, state) => const ProfilePage(),
+            ),
+            GoRoute(
+              path: '/more/stats',
+              builder: (context, state) => const StatsPage(),
+            ),
+            GoRoute(
+              path: '/more/settings',
+              builder: (context, state) => const SettingsPage(),
+            ),
             GoRoute(
               path: '/legs/edit/:id',
               builder: (_, state) {
@@ -141,7 +231,14 @@ class _MyAppState extends State<MyApp> {
             ),
           ],
         ),
-        GoRoute(path: '/login', builder: (context, state) => const LoginScreen()),
+        GoRoute(
+          path: '/login',
+          builder: (context, state) => const LoginScreen(),
+        ),
+        GoRoute(
+          path: '/settings',
+          builder: (context, state) => const SettingsPage(),
+        ),
       ],
     );
   }
@@ -168,6 +265,14 @@ class _MyAppState extends State<MyApp> {
   }
 }
 
+class _BackIntent extends Intent {
+  const _BackIntent();
+}
+
+class _ForwardIntent extends Intent {
+  const _ForwardIntent();
+}
+
 class MyHomePage extends StatefulWidget {
   final Widget child;
   const MyHomePage({super.key, required this.child});
@@ -177,23 +282,31 @@ class MyHomePage extends StatefulWidget {
 }
 
 class _MyHomePageState extends State<MyHomePage> {
-  List<String> get contentPages => _contentPages;
+  List<String> get tabDestinations => _defaultTabDestinations;
 
   Future<void> _onItemTapped(int index, int currentIndex) async {
-    if (index < 0 || index >= contentPages.length || index == currentIndex) {
+    if (index < 0 || index >= tabDestinations.length) {
       return;
     }
+    final currentPath = GoRouterState.of(context).uri.path;
+    final targetPath = tabDestinations[index];
+    final alreadyAtTarget =
+        currentPath == targetPath || currentPath.startsWith('$targetPath/');
+    if (index == currentIndex && alreadyAtTarget) return;
+
     await NavigationGuard.attemptNavigation(() async {
       if (!mounted) return;
-      context.go(contentPages[index]);
+      _navigateToIndex(index);
     });
   }
 
-  int? _lastTabIndex;
+  final List<String> _history = [];
-  final List<int> _tabHistory = [];
+  int _historyPosition = -1;
-  bool _handlingBackNavigation = false;
+  final List<String> _forwardHistory = [];
+  bool _suppressRecord = false;
 
   bool _fetched = false;
+  bool _railCollapsed = false;
 
   @override
   void didChangeDependencies() {
@@ -218,12 +331,18 @@ class _MyHomePageState extends State<MyHomePage> {
         if (data.traction.isEmpty) {
           data.fetchHadTraction();
         }
+        if (data.latestLocoChanges.isEmpty) {
+          data.fetchLatestLocoChanges();
+        }
         if (data.onThisDay.isEmpty) {
           data.fetchOnThisDay();
         }
         if (data.tripDetails.isEmpty) {
           data.fetchTripDetails();
         }
+        if (data.notifications.isEmpty) {
+          data.fetchNotifications();
+        }
       });
     });
   }
@@ -232,103 +351,548 @@ class _MyHomePageState extends State<MyHomePage> {
   Widget build(BuildContext context) {
     final uri = GoRouterState.of(context).uri;
     final pageIndex = tabIndexForPath(uri.path);
-    _recordTabChange(pageIndex);
+    _syncHistory(uri.path);
     if (pageIndex != _addTabIndex) {
       NavigationGuard.unregister();
     }
     final homepageReady = context.select<DataService, bool>(
       (data) => data.homepageStats != null || !data.isHomepageLoading,
     );
+    final data = context.watch<DataService>();
     final auth = context.read<AuthService>();
 
     final currentPage = homepageReady
         ? widget.child
         : const Center(child: CircularProgressIndicator());
 
-    return PopScope(
+    final scaffold = LayoutBuilder(
-      canPop: false,
+      builder: (context, constraints) {
-      onPopInvokedWithResult: (didPop, _) async {
+        final isWide = constraints.maxWidth >= 900;
-        if (didPop) return;
+        final defaultRailExtended = constraints.maxWidth >= 1400;
+        final railExtended = defaultRailExtended && !_railCollapsed;
+        final showRailToggle = defaultRailExtended;
+        final navRailDestinations = _navItems
+            .map(
+              (item) => NavigationRailDestination(
+                icon: Icon(item.icon),
+                label: Text(item.label),
+              ),
+            )
+            .toList();
+        final navBarDestinations = _navItems
+            .map(
+              (item) => NavigationDestination(
+                icon: Icon(item.icon),
+                label: item.label,
+              ),
+            )
+            .toList();
 
-        final shellNav = _shellNavigatorKey.currentState;
+        return Scaffold(
-        if (shellNav != null && shellNav.canPop()) {
+          appBar: AppBar(
-          shellNav.pop();
+            backgroundColor: Theme.of(context).colorScheme.inversePrimary,
-          return;
+            title: Text.rich(
-        }
+              TextSpan(
-
+                children: const [
-        if (_tabHistory.isNotEmpty) {
+                  TextSpan(text: "Mile"),
-          final previousTab = _tabHistory.removeLast();
+                  TextSpan(
-          if (!mounted) return;
+                    text: "O",
-          _handlingBackNavigation = true;
+                    style: TextStyle(color: Colors.red),
-          context.go(contentPages[previousTab]);
+                  ),
-          return;
+                  TextSpan(text: "graph"),
-        }
+                ],
-
+                style: const TextStyle(
-        if (pageIndex != 0) {
+                  decoration: TextDecoration.none,
-          if (!mounted) return;
+                  color: Colors.white,
-          _handlingBackNavigation = true;
+                  fontFamily: "Tomatoes",
-          context.go(contentPages[0]);
+                ),
-          return;
-        }
-
-        SystemNavigator.pop();
-      },
-      child: Scaffold(
-        appBar: AppBar(
-          backgroundColor: Theme.of(context).colorScheme.inversePrimary,
-          title: Text.rich(
-            TextSpan(
-              children: const [
-                TextSpan(text: "Mile"),
-                TextSpan(text: "O", style: TextStyle(color: Colors.red)),
-                TextSpan(text: "graph"),
-              ],
-              style: const TextStyle(
-                decoration: TextDecoration.none,
-                color: Colors.white,
-                fontFamily: "Tomatoes",
               ),
             ),
+            actions: [
+              _buildNotificationAction(context, data),
+              IconButton(
+                tooltip: 'Settings',
+                onPressed: () => context.go('/more/settings'),
+                icon: const Icon(Icons.settings),
+              ),
+              IconButton(
+                onPressed: auth.logout,
+                icon: const Icon(Icons.logout),
+              ),
+            ],
+          ),
+          bottomNavigationBar: isWide
+              ? null
+              : NavigationBar(
+                  selectedIndex: pageIndex,
+                  onDestinationSelected: (int index) =>
+                      _onItemTapped(index, pageIndex),
+                  destinations: navBarDestinations,
+                ),
+          body: isWide
+              ? Row(
+                  children: [
+                    SafeArea(
+                      child: LayoutBuilder(
+                        builder: (ctx, _) {
+                          return Stack(
+                            children: [
+                              Padding(
+                                padding: EdgeInsets.only(
+                                  bottom: showRailToggle ? 56.0 : 0.0,
+                                ),
+                                child: NavigationRail(
+                                  selectedIndex: pageIndex,
+                                  extended: railExtended,
+                                  labelType: railExtended
+                                      ? NavigationRailLabelType.none
+                                      : NavigationRailLabelType.selected,
+                                  onDestinationSelected: (int index) =>
+                                      _onItemTapped(index, pageIndex),
+                                  destinations: navRailDestinations,
+                                ),
+                              ),
+                              if (showRailToggle)
+                                Positioned(
+                                  left: 0,
+                                  right: 0,
+                                  bottom: 8,
+                                  child: _buildRailToggleButton(railExtended),
+                                ),
+                            ],
+                          );
+                        },
+                      ),
+                    ),
+                    const VerticalDivider(width: 1),
+                    Expanded(child: currentPage),
+                  ],
+                )
+              : currentPage,
+        );
+      },
+    );
+
+    return Shortcuts(
+      shortcuts: <LogicalKeySet, Intent>{
+        LogicalKeySet(LogicalKeyboardKey.browserBack): const _BackIntent(),
+        LogicalKeySet(LogicalKeyboardKey.browserForward):
+            const _ForwardIntent(),
+      },
+      child: Actions(
+        actions: {
+          _BackIntent: CallbackAction<_BackIntent>(
+            onInvoke: (_) {
+              _handleBackNavigation(allowExit: false, recordForward: true);
+              return null;
+            },
+          ),
+          _ForwardIntent: CallbackAction<_ForwardIntent>(
+            onInvoke: (_) {
+              _handleForwardNavigation();
+              return null;
+            },
+          ),
+        },
+        child: Focus(
+          autofocus: true,
+          child: Listener(
+            onPointerDown: _handlePointerButtons,
+            behavior: HitTestBehavior.opaque,
+            child: PopScope(
+              canPop: false,
+              onPopInvokedWithResult: (didPop, _) async {
+                if (didPop) return;
+                await _handleBackNavigation(
+                  allowExit: true,
+                  recordForward: false,
+                );
+              },
+              child: scaffold,
+            ),
           ),
-          actions: [
-            const IconButton(onPressed: null, icon: Icon(Icons.account_circle)),
-            IconButton(onPressed: auth.logout, icon: const Icon(Icons.logout)),
-          ],
         ),
-        bottomNavigationBar: NavigationBar(
-          selectedIndex: pageIndex,
-          onDestinationSelected: (int index) => _onItemTapped(index, pageIndex),
-          destinations: const [
-            NavigationDestination(icon: Icon(Icons.home), label: "Home"),
-            NavigationDestination(icon: Icon(Icons.route), label: "Calculator"),
-            NavigationDestination(icon: Icon(Icons.list), label: "Entries"),
-            NavigationDestination(icon: Icon(Icons.train), label: "Traction"),
-            NavigationDestination(icon: Icon(Icons.book), label: "Trips"),
-            NavigationDestination(icon: Icon(Icons.add), label: "Add"),
-          ],
-        ),
-        body: currentPage,
       ),
     );
   }
 
-  void _recordTabChange(int pageIndex) {
+  void _handlePointerButtons(PointerDownEvent event) {
-    final last = _lastTabIndex;
+    // Support mouse back/forward buttons.
-    if (last == null) {
+    if (event.buttons == kBackMouseButton) {
-      _lastTabIndex = pageIndex;
+      _handleBackNavigation(allowExit: false, recordForward: true);
-      return;
+    } else if (event.buttons == kForwardMouseButton) {
+      _handleForwardNavigation();
     }
-    if (last == pageIndex) return;
+  }
 
-    if (_handlingBackNavigation) {
+  Widget _buildRailToggleButton(bool railExtended) {
-      _handlingBackNavigation = false;
+    final collapseIcon = railExtended
-      _lastTabIndex = pageIndex;
+        ? Icons.chevron_left
-      return;
+        : Icons.chevron_right;
+    final collapseLabel = railExtended ? 'Collapse' : 'Expand';
+
+    if (railExtended) {
+      return Padding(
+        padding: const EdgeInsets.symmetric(vertical: 8.0),
+        child: TextButton.icon(
+          onPressed: () => setState(() => _railCollapsed = !_railCollapsed),
+          icon: Icon(collapseIcon),
+          label: Text(collapseLabel),
+        ),
+      );
     }
 
-    if (_tabHistory.isEmpty || _tabHistory.last != last) {
+    return Padding(
-      _tabHistory.add(last);
+      padding: const EdgeInsets.symmetric(vertical: 8.0),
+      child: IconButton(
+        icon: Icon(collapseIcon),
+        tooltip: collapseLabel,
+        onPressed: () => setState(() => _railCollapsed = !_railCollapsed),
+      ),
+    );
+  }
+
+  Widget _buildNotificationAction(BuildContext context, DataService data) {
+    final count = data.notifications.length;
+    final hasBadge = count > 0;
+    final badgeText = count > 9 ? '9+' : '$count';
+    final isLoading = data.isNotificationsLoading;
+
+    return Stack(
+      clipBehavior: Clip.none,
+      children: [
+        IconButton(
+          tooltip: 'Notifications',
+          onPressed: () => _openNotificationsPanel(context),
+          icon: isLoading
+              ? const SizedBox(
+                  width: 22,
+                  height: 22,
+                  child: CircularProgressIndicator(strokeWidth: 2),
+                )
+              : const Icon(Icons.notifications_none),
+        ),
+        if (hasBadge)
+          Positioned(
+            right: 6,
+            top: 8,
+            child: IgnorePointer(child: _buildBadge(badgeText)),
+          ),
+      ],
+    );
+  }
+
+  Future<void> _openNotificationsPanel(BuildContext context) async {
+    final data = context.read<DataService>();
+    final isWide = MediaQuery.sizeOf(context).width >= 900;
+    final sheetHeight = MediaQuery.sizeOf(context).height * 0.9;
+    try {
+      await data.fetchNotifications();
+    } catch (_) {
+      // Already logged inside data service.
     }
-    _lastTabIndex = pageIndex;
+    if (!context.mounted) return;
+
+    if (isWide) {
+      await showDialog(
+        context: context,
+        builder: (dialogCtx) => Dialog(
+          insetPadding: const EdgeInsets.all(16),
+          child: _buildNotificationsContent(dialogCtx, isWide),
+        ),
+      );
+    } else {
+      await showModalBottomSheet(
+        context: context,
+        isScrollControlled: true,
+        builder: (sheetCtx) {
+          return SizedBox(
+            height: sheetHeight,
+            child: SafeArea(
+              child: _buildNotificationsContent(sheetCtx, isWide),
+            ),
+          );
+        },
+      );
+    }
+  }
+
+  Widget _buildNotificationsContent(BuildContext context, bool isWide) {
+    final data = context.watch<DataService>();
+    final notifications = data.notifications;
+    final loading = data.isNotificationsLoading;
+    final listHeight = isWide
+        ? 380.0
+        : MediaQuery.of(context).size.height * 0.6;
+
+    Widget body;
+    if (loading && notifications.isEmpty) {
+      body = const Center(
+        child: Padding(
+          padding: EdgeInsets.symmetric(vertical: 24.0),
+          child: CircularProgressIndicator(),
+        ),
+      );
+    } else if (notifications.isEmpty) {
+      body = const Padding(
+        padding: EdgeInsets.symmetric(vertical: 12.0),
+        child: Text('No notifications right now.'),
+      );
+    } else {
+      body = SizedBox(
+        height: listHeight,
+        child: ListView.separated(
+          itemCount: notifications.length,
+          separatorBuilder: (_, index) => const SizedBox(height: 8),
+          itemBuilder: (ctx, index) {
+            final item = notifications[index];
+            return Card(
+              child: Padding(
+                padding: const EdgeInsets.all(12.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Expanded(
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(
+                                item.title.isNotEmpty
+                                    ? item.title
+                                    : 'Notification',
+                                style: Theme.of(context).textTheme.titleMedium
+                                    ?.copyWith(fontWeight: FontWeight.w700),
+                              ),
+                              const SizedBox(height: 4),
+                              Text(
+                                item.body,
+                                style: Theme.of(context).textTheme.bodyMedium,
+                              ),
+                              if (item.createdAt != null) ...[
+                                const SizedBox(height: 6),
+                                Text(
+                                  _formatNotificationTime(item.createdAt!),
+                                  style: Theme.of(context).textTheme.bodySmall
+                                      ?.copyWith(
+                                        color: () {
+                                          final baseColor = Theme.of(
+                                            context,
+                                          ).textTheme.bodySmall?.color;
+                                          if (baseColor == null) return null;
+                                          final newAlpha = (baseColor.a * 0.7)
+                                              .clamp(0.0, 1.0);
+                                          return baseColor.withValues(
+                                            alpha: newAlpha,
+                                          );
+                                        }(),
+                                      ),
+                                ),
+                              ],
+                            ],
+                          ),
+                        ),
+                        const SizedBox(width: 8),
+                        TextButton(
+                          onPressed: () =>
+                              _dismissNotifications(context, [item.id]),
+                          child: const Text('Dismiss'),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        ),
+      );
+    }
+
+    return SizedBox(
+      width: isWide ? 420 : double.infinity,
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Text(
+                  'Notifications',
+                  style: Theme.of(
+                    context,
+                  ).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
+                ),
+                const Spacer(),
+                TextButton(
+                  onPressed: notifications.isEmpty
+                      ? null
+                      : () => _dismissNotifications(
+                          context,
+                          notifications.map((e) => e.id).toList(),
+                        ),
+                  child: const Text('Dismiss all'),
+                ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            body,
+          ],
+        ),
+      ),
+    );
+  }
+
+  Future<void> _dismissNotifications(
+    BuildContext context,
+    List<int> ids,
+  ) async {
+    if (ids.isEmpty) return;
+    final messenger = ScaffoldMessenger.maybeOf(context);
+    try {
+      await context.read<DataService>().dismissNotifications(ids);
+    } catch (e) {
+      messenger?.showSnackBar(SnackBar(content: Text('Failed to dismiss: $e')));
+    }
+  }
+
+  String _formatNotificationTime(DateTime dateTime) {
+    final y = dateTime.year.toString().padLeft(4, '0');
+    final m = dateTime.month.toString().padLeft(2, '0');
+    final d = dateTime.day.toString().padLeft(2, '0');
+    final hh = dateTime.hour.toString().padLeft(2, '0');
+    final mm = dateTime.minute.toString().padLeft(2, '0');
+    return '$y-$m-$d $hh:$mm';
+  }
+
+  Widget _buildBadge(String label) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+      decoration: BoxDecoration(
+        color: Colors.redAccent,
+        borderRadius: BorderRadius.circular(10),
+      ),
+      constraints: const BoxConstraints(minWidth: 20),
+      child: Text(
+        label,
+        style: const TextStyle(
+          color: Colors.white,
+          fontSize: 11,
+          fontWeight: FontWeight.bold,
+        ),
+        textAlign: TextAlign.center,
+      ),
+    );
+  }
+
+  Future<bool> _handleBackNavigation({
+    bool allowExit = false,
+    bool recordForward = false,
+  }) async {
+    final currentPath = GoRouterState.of(context).uri.path;
+    final shellNav = _shellNavigatorKey.currentState;
+    if (shellNav != null && shellNav.canPop()) {
+      if (recordForward) _pushForward(currentPath);
+      _alignHistoryAfterPop(currentPath);
+      shellNav.pop();
+      return true;
+    }
+
+    if (_historyPosition > 0) {
+      if (recordForward) _pushForward(currentPath);
+      _historyPosition -= 1;
+      _suppressRecord = true;
+      context.go(_history[_historyPosition]);
+      return true;
+    }
+
+    final homePath = tabDestinations.first;
+    if (currentPath != homePath) {
+      if (recordForward) _pushForward(currentPath);
+      _suppressRecord = true;
+      context.go(homePath);
+      return true;
+    }
+
+    if (allowExit) {
+      SystemNavigator.pop();
+      return true;
+    }
+
+    return false;
+  }
+
+  Future<bool> _handleForwardNavigation() async {
+    if (_forwardHistory.isEmpty) return false;
+    final nextPath = _forwardHistory.removeLast();
+
+    // Move cursor forward, keeping history in sync.
+    if (_historyPosition < _history.length - 1) {
+      _historyPosition += 1;
+      _history[_historyPosition] = nextPath;
+      if (_historyPosition < _history.length - 1) {
+        _history.removeRange(_historyPosition + 1, _history.length);
+      }
+    } else {
+      _history.add(nextPath);
+      _historyPosition = _history.length - 1;
+    }
+
+    _suppressRecord = true;
+    if (!mounted) return false;
+    context.go(nextPath);
+    return true;
+  }
+
+  void _pushForward(String path) {
+    if (_forwardHistory.isEmpty || _forwardHistory.last != path) {
+      _forwardHistory.add(path);
+    }
+  }
+
+  void _alignHistoryAfterPop(String currentPath) {
+    if (_history.isEmpty) return;
+    if (_historyPosition >= 0 &&
+        _historyPosition < _history.length &&
+        _history[_historyPosition] == currentPath) {
+      if (_historyPosition > 0) {
+        _historyPosition -= 1;
+      }
+      _history.removeRange(_historyPosition + 1, _history.length);
+      _suppressRecord = true;
+    }
+  }
+
+  void _syncHistory(String path) {
+    if (_history.isEmpty) {
+      _history.add(path);
+      _historyPosition = 0;
+      return;
+    }
+    if (_suppressRecord) {
+      _suppressRecord = false;
+      return;
+    }
+    if (_historyPosition >= 0 &&
+        _historyPosition < _history.length &&
+        _history[_historyPosition] == path) {
+      return;
+    }
+    if (_historyPosition < _history.length - 1) {
+      _history.removeRange(_historyPosition + 1, _history.length);
+    }
+    _history.add(path);
+    _historyPosition = _history.length - 1;
+    _forwardHistory.clear();
+  }
+
+  void _navigateToIndex(int index) {
+    _suppressRecord = false;
+    _forwardHistory.clear();
+    context.go(tabDestinations[index]);
   }
 }

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.2.4+1
+version: 0.5.1+1
 
 environment:
   sdk: ^3.8.1
@@ -103,6 +103,6 @@ flutter_launcher_icons:
   android: true
   ios: true
   image_path: assets/icons/app_icon.png
-  adaptive_icon_background: "#ffffff"
+  adaptive_icon_background: "#000000"
   adaptive_icon_foreground: assets/icons/app_icon.png
   min_sdk_android: 21

test/app_shell_test.dart

@@ -8,13 +8,12 @@ void main() {
     expect(tabIndexForPath('/calculator/details'), 1);
     expect(tabIndexForPath('/legs'), 2);
     expect(tabIndexForPath('/traction/12/timeline'), 3);
-    expect(tabIndexForPath('/trips'), 4);
+    expect(tabIndexForPath('/trips'), 2);
-    expect(tabIndexForPath('/add'), 5);
+    expect(tabIndexForPath('/add'), 4);
   });
 
   test('tabIndexForPath ignores query when parsing uri', () {
-    expect(tabIndexForPath(Uri.parse('/trips?sort=desc').path), 4);
+    expect(tabIndexForPath(Uri.parse('/trips?sort=desc').path), 2);
     expect(tabIndexForPath(Uri.parse('/calculator/details?x=1').path), 1);
   });
 }
-