new settings panel for url pickup

.vscode/settings.json

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

lib/app.dart

@@ -2,6 +2,7 @@ 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/endpoint_service.dart';
 import 'package:mileograph_flutter/ui/app_shell.dart';
 import 'package:provider/provider.dart';
 
@@ -12,8 +13,16 @@ class App extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiProvider(
       providers: [
-        Provider<ApiService>(
-          create: (_) => ApiService(baseUrl: 'https://mileograph.co.uk/api/v1'),
+        ChangeNotifierProvider<EndpointService>(
+          create: (_) => EndpointService(),
+        ),
+        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>()),

lib/components/dashboard/latest_loco_changes_panel.dart

@@ -0,0 +1,124 @@
+import 'package:flutter/material.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:provider/provider.dart';
+
+class LatestLocoChangesPanel extends StatefulWidget {
+  const LatestLocoChangesPanel({super.key});
+
+  @override
+  State<LatestLocoChangesPanel> createState() => _LatestLocoChangesPanelState();
+}
+
+class _LatestLocoChangesPanelState extends State<LatestLocoChangesPanel> {
+  late final ScrollController _controller;
+
+  @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
+              SizedBox(
+                height: 260,
+                child: Scrollbar(
+                  controller: _controller,
+                  child: ListView.separated(
+                    controller: _controller,
+                    itemCount: changes.length,
+                    separatorBuilder: (context, index) =>
+                        const Divider(height: 1),
+                    itemBuilder: (context, index) {
+                      final change = changes[index];
+                      return ListTile(
+                        dense: true,
+                        contentPadding: EdgeInsets.zero,
+                        title: Text(
+                          change.locoLabel,
+                          style: textTheme.titleSmall?.copyWith(
+                            fontWeight: FontWeight.w600,
+                          ),
+                        ),
+                        subtitle: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text('${change.changeLabel}: ${change.valueLabel}'),
+                            Text(
+                              change.approvedDateLabel,
+                              style: textTheme.labelSmall?.copyWith(
+                                color: textTheme.bodySmall?.color?.withValues(alpha: 0.7),
+                              ),
+                            ),
+                          ],
+                        ),
+                        trailing: change.approvedBy.isEmpty
+                            ? null
+                            : Text(
+                                change.approvedBy,
+                                style: textTheme.labelSmall,
+                              ),
+                      );
+                    },
+                  ),
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/components/dashboard/leaderboard_panel.dart

@@ -10,71 +10,88 @@ class LeaderboardPanel extends StatelessWidget {
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
     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(
-      padding: const EdgeInsets.all(10.0),
-      child: Card(
+    return Card(
+      clipBehavior: Clip.antiAlias,
+      child: Padding(
+        padding: const EdgeInsets.all(16),
         child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-            Text(
+            Row(
+              children: [
+                const Icon(Icons.emoji_events, size: 20),
+                const SizedBox(width: 8),
+                Expanded(
+                  child: Text(
                     "Leaderboard",
-              style: TextStyle(
-                fontSize: 24,
-                fontWeight: FontWeight.bold,
-                decoration: TextDecoration.underline,
+                    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(
-                  leaderboard.length,
-                  (index) {
-                    final leaderboardEntry = leaderboard[index];
-                    return Container(
-                      width: double.infinity,
-                      margin: const EdgeInsets.symmetric(
-                          horizontal: 0, vertical: 8),
-                      child: Padding(
-                        padding: const EdgeInsets.all(8),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-                            Text.rich(
-                              TextSpan(
-                                children: [
-                                  TextSpan(
-                                    text: '${index + 1}. ',
-                                    style: const TextStyle(
-                                      fontWeight: FontWeight.bold,
+                  for (int index = 0; index < leaderboard.length; index++) ...[
+                    ListTile(
+                      contentPadding: EdgeInsets.zero,
+                      dense: true,
+                      leading: CircleAvatar(
+                        radius: 18,
+                        backgroundColor:
+                            Theme.of(context).colorScheme.secondaryContainer,
+                        child: Text(
+                          '${index + 1}',
+                          style: textTheme.labelLarge?.copyWith(
+                            fontWeight: FontWeight.w800,
                           ),
                         ),
-                                  TextSpan(
-                                    text: leaderboardEntry.userFullName,
                       ),
+                      title: Text(
+                        leaderboard[index].userFullName,
+                        style: textTheme.titleSmall?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                      trailing: Text(
+                        '${leaderboard[index].mileage.toStringAsFixed(1)} mi',
+                        style: textTheme.labelLarge?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                    ),
+                    if (index != leaderboard.length - 1) const Divider(height: 12),
                   ],
-                              ),
-                            ),
-                            Text(
-                              '${leaderboardEntry.mileage.toStringAsFixed(1)} mi',
-                            ),
                 ],
               ),
-                      ),
-                    );
-                  },
-                ),
-              ),
           ],
         ),
       ),

lib/components/dashboard/top_traction_panel.dart

@@ -11,80 +11,83 @@ class TopTractionPanel extends StatelessWidget {
     final data = context.watch<DataService>();
     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(
-      padding: const EdgeInsets.all(10.0),
-      child: Card(
+    return Card(
+      clipBehavior: Clip.antiAlias,
+      child: Padding(
+        padding: const EdgeInsets.all(16),
         child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-            Text(
-              "Top Traction",
-              style: TextStyle(
-                fontSize: 24,
-                fontWeight: FontWeight.bold,
-                decoration: TextDecoration.underline,
+            Row(
+              children: [
+                const Icon(Icons.train, size: 20),
+                const SizedBox(width: 8),
+                Expanded(
+                  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(
-                  locos.length,
-                  (index) {
-                    final loco = locos[index];
-                    return Container(
-                      width: double.infinity,
-                      margin:
-                          const EdgeInsets.symmetric(horizontal: 0, vertical: 8),
-                      child: Padding(
-                        padding: const EdgeInsets.all(8),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-                            Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Text.rich(
-                                  TextSpan(
-                                    children: [
-                                      TextSpan(
-                                        text: '${index + 1}. ',
-                                        style: const TextStyle(
-                                          fontWeight: FontWeight.bold,
+                  for (int index = 0; index < locos.length; index++) ...[
+                    ListTile(
+                      contentPadding: EdgeInsets.zero,
+                      dense: true,
+                      leading: CircleAvatar(
+                        radius: 18,
+                        backgroundColor:
+                            Theme.of(context).colorScheme.primaryContainer,
+                        child: Text(
+                          '${index + 1}',
+                          style: textTheme.labelLarge?.copyWith(
+                            fontWeight: FontWeight.w800,
                           ),
                         ),
-                                      TextSpan(
-                                        text:
-                                            '${loco.locoClass} ${loco.number}',
                       ),
+                      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(
+                        '${locos[index].mileage?.toStringAsFixed(1)} mi',
+                        style: textTheme.labelLarge?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                    ),
+                    if (index != locos.length - 1) const Divider(height: 12),
                   ],
-                                  ),
-                                ),
-                                Text(
-                                  loco.name ?? '',
-                                  style:
-                                      const TextStyle(fontStyle: FontStyle.italic),
-                                ),
                 ],
               ),
-                            Text('${loco.mileage?.toStringAsFixed(1)} mi'),
-                          ],
-                        ),
-                      ),
-                    );
-                  },
-                ),
-              ),
           ],
         ),
       ),

lib/components/legs/leg_card.dart

@@ -9,10 +9,12 @@ class LegCard extends StatelessWidget {
     super.key,
     required this.leg,
     this.showEditButton = true,
+    this.showDate = true,
   });
 
   final Leg leg;
   final bool showEditButton;
+  final bool showDate;
 
   @override
   Widget build(BuildContext context) {
@@ -26,7 +28,7 @@ class LegCard extends StatelessWidget {
         subtitle: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(_formatDateTime(leg.beginTime)),
+            if (showDate) Text(_formatDateTime(leg.beginTime)),
             if (leg.headcode.isNotEmpty)
               Text(
                 'Headcode: ${leg.headcode}',
@@ -126,13 +128,32 @@ class LegCard extends StatelessWidget {
 
   List<Widget> _buildLocoChips(BuildContext context, Leg leg) {
     final theme = Theme.of(context);
+    final textTheme = theme.textTheme;
     return leg.locos
         .map(
-          (loco) => Chip(
-            label: Text('${loco.locoClass} ${loco.number}'),
-            avatar: const Icon(Icons.directions_railway, size: 16),
-            backgroundColor: theme.colorScheme.surfaceContainerHighest,
+          (loco) {
+            final powering = loco.powering == true;
+            final iconColor =
+                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();
   }
@@ -192,4 +213,3 @@ class LegCard extends StatelessWidget {
     return [trimmed];
   }
 }
-

lib/components/login/login.dart

@@ -81,6 +81,12 @@ class _LoginScreenState extends State<LoginScreen> {
                 ),
               const SizedBox(height: 50),
               const LoginPanel(),
+              const SizedBox(height: 16),
+              IconButton(
+                icon: const Icon(Icons.settings, color: Colors.grey),
+                tooltip: 'Settings',
+                onPressed: () => context.go('/settings'),
+              ),
             ],
           ),
         ),

lib/components/pages/dashboard.dart

@@ -1,5 +1,7 @@
 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';
@@ -32,45 +34,21 @@ class _DashboardState extends State<Dashboard> {
           data.fetchOnThisDay(),
           data.fetchTripDetails(),
           data.fetchHadTraction(),
+          data.fetchLatestLocoChanges(),
         ]);
       },
       child: LayoutBuilder(
         builder: (context, constraints) {
-          final isWide = constraints.maxWidth > 1100;
-          final metricChips = _buildMetricChips(
-            context,
-            totalMileage: stats?.totalMileage ?? 0,
-            currentYearMileage: data.getMileageForCurrentYear(),
-            trips: data.trips.length,
-          );
+          const spacing = 16.0;
+          final maxWidth = constraints.maxWidth;
           return Stack(
             children: [
               ListView(
                 padding: const EdgeInsets.all(16),
                 children: [
-                  _buildHeader(context, auth, stats, data.isHomepageLoading),
-                  const SizedBox(height: 12),
-                  Wrap(spacing: 12, runSpacing: 12, children: metricChips),
-                  const SizedBox(height: 16),
-                  isWide
-                      ? Row(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            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),
-                          ],
-                        ),
+                  _buildHero(context, auth, data, stats),
+                  const SizedBox(height: spacing),
+                  _buildTiles(context, data, maxWidth, spacing),
                 ],
               ),
               if (isInitialLoading)
@@ -98,104 +76,298 @@ class _DashboardState extends State<Dashboard> {
     );
   }
 
-  Widget _buildHeader(
+  Widget _buildHero(
     BuildContext context,
     AuthService auth,
+    DataService data,
     HomepageStats? stats,
-    bool loading,
   ) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final isCompact = MediaQuery.of(context).size.width < 720;
     final greetingName =
         stats?.user?.fullName ?? auth.fullName ?? auth.username ?? 'there';
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+    final totalMileage = stats?.totalMileage ?? 0;
+    final currentYearMileage = data.getMileageForCurrentYear();
+    final legCount = stats?.legCount ?? data.trips.length;
+    final progress = totalMileage == 0
+        ? 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: [
+            isCompact
+                ? Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      _heroHeading(context, greetingName, colorScheme),
+                      const SizedBox(height: 12),
+                      _heroActions(context, colorScheme, wrap: true),
+                    ],
+                  )
+                : Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Expanded(
+                        child: _heroHeading(context, greetingName, colorScheme),
+                      ),
+                      _heroActions(context, colorScheme, wrap: false),
+                    ],
+                  ),
+            const SizedBox(height: 18),
+            Wrap(
+              spacing: 12,
+              runSpacing: 12,
+              children: [
+                _metricTile(
+                  context,
+                  label: 'Total mileage',
+                  value: '${totalMileage.toStringAsFixed(1)} mi',
+                  icon: Icons.route,
+                  color: colorScheme.onPrimaryContainer,
+                ),
+                _metricTile(
+                  context,
+                  label: 'This year',
+                  value: '${currentYearMileage.toStringAsFixed(1)} mi',
+                  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(
+              totalMileage == 0
+                  ? '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),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _metricTile(
+    BuildContext context, {
+    required String label,
+    required String value,
+    required IconData icon,
+    required Color color,
+  }) {
+    final bg = Colors.white.withValues(alpha: 0.14);
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+      decoration: BoxDecoration(
+        color: bg,
+        borderRadius: BorderRadius.circular(12),
+        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,
             children: [
-            Text('Dashboard', style: Theme.of(context).textTheme.labelMedium),
-            const SizedBox(height: 2),
               Text(
-              'Welcome back, $greetingName',
-              style: Theme.of(context).textTheme.headlineSmall,
-            ),
-          ],
-        ),
-        if (loading)
-          const Padding(
-            padding: EdgeInsets.only(right: 8.0),
-            child: SizedBox(
-              height: 24,
-              width: 24,
-              child: CircularProgressIndicator(strokeWidth: 2),
+                label,
+                style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                  color: color.withValues(alpha: 0.85),
+                  letterSpacing: 0.4,
                 ),
               ),
-      ],
-    );
-  }
-
-  List<Widget> _buildMetricChips(
-    BuildContext context, {
-    required double totalMileage,
-    required double currentYearMileage,
-    required int trips,
-  }) {
-    final textTheme = Theme.of(context).textTheme;
-    Widget metricCard(String label, String value) {
-      return Card(
-        elevation: 1,
-        child: Padding(
-          padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 14),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Text(
-                label.toUpperCase(),
-                style: textTheme.labelSmall?.copyWith(
-                  letterSpacing: 0.7,
-                  color: textTheme.bodySmall?.color?.withValues(alpha: 0.7),
-                ),
-              ),
-              const SizedBox(height: 4),
               Text(
                 value,
-                style: textTheme.titleMedium?.copyWith(
-                  fontWeight: FontWeight.w700,
+                style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                  fontWeight: FontWeight.w800,
+                  color: color,
                 ),
               ),
             ],
           ),
+        ],
       ),
     );
   }
 
-    return [
-      metricCard('Total mileage', '${totalMileage.toStringAsFixed(1)} mi'),
-      metricCard('This year', '${currentYearMileage.toStringAsFixed(1)} mi'),
-      metricCard('Trips logged', trips.toString()),
-    ];
+  Widget _buildTiles(
+    BuildContext context,
+    DataService data,
+    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),
+                const SizedBox(height: 16),
+                _buildTripsCard(context, data),
+              ],
+            ),
+          ),
+          const SizedBox(width: 16),
+          Expanded(
+            flex: 1,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: const [
+                TopTractionPanel(),
+                SizedBox(height: 16),
+                LeaderboardPanel(),
+                SizedBox(height: 16),
+                LatestLocoChangesPanel(),
+              ],
+            ),
+          ),
+        ],
+      );
     }
 
-  Widget _buildMainColumn(BuildContext context, DataService data) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
-        _buildCard(
-          context,
-          title: 'On this day',
-          action:
-              data.onThisDay
+        _buildOnThisDayCard(context, data),
+        const SizedBox(height: 16),
+        const TopTractionPanel(),
+        const SizedBox(height: 16),
+        const LeaderboardPanel(),
+        const SizedBox(height: 16),
+        _buildTripsCard(context, data),
+        const SizedBox(height: 16),
+        const LatestLocoChangesPanel(),
+      ],
+    );
+  }
+
+  Widget _heroHeading(
+    BuildContext context,
+    String greetingName,
+    ColorScheme colorScheme,
+  ) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          'Dashboard',
+          style: Theme.of(context).textTheme.labelMedium?.copyWith(
+            color: colorScheme.onPrimaryContainer,
+            letterSpacing: 0.4,
+          ),
+        ),
+        const SizedBox(height: 2),
+        Text(
+          'Welcome back, $greetingName',
+          style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+            color: colorScheme.onPrimaryContainer,
+            fontWeight: FontWeight.w800,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _heroActions(
+    BuildContext context,
+    ColorScheme colorScheme, {
+    required bool wrap,
+  }) {
+    final buttons = [
+      FilledButton.icon(
+        style: FilledButton.styleFrom(
+          backgroundColor: Colors.white,
+          foregroundColor: colorScheme.primary,
+        ),
+        onPressed: () => context.go('/add'),
+        icon: const Icon(Icons.add_circle_outline),
+        label: const Text('Add entry'),
+      ),
+      FilledButton.tonalIcon(
+        onPressed: () => context.go('/traction'),
+        icon: const Icon(Icons.train),
+        label: const Text('Traction'),
+      ),
+      FilledButton.tonalIcon(
+        onPressed: () => context.go('/trips'),
+        icon: const Icon(Icons.book),
+        label: const Text('Trips'),
+      ),
+    ];
+
+    if (wrap) {
+      return Wrap(spacing: 8, runSpacing: 8, children: buttons);
+    }
+
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        for (final btn in buttons)
+          Padding(
+            padding: const EdgeInsets.only(left: 8.0),
+            child: btn,
+          ),
+      ],
+    );
+  }
+
+  Widget _buildOnThisDayCard(BuildContext context, DataService data) {
+    final filtered = data.onThisDay
         .where((leg) => leg.beginTime.year != DateTime.now().year)
-                      .length >
-                  5
-              ? TextButton(
-                  onPressed: () => setState(() {
-                    _showAllOnThisDay = !_showAllOnThisDay;
-                  }),
-                  child: Text(_showAllOnThisDay ? 'Show less' : 'Show more'),
-                )
-              : null,
+        .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,
@@ -203,33 +375,149 @@ class _DashboardState extends State<Dashboard> {
               child: CircularProgressIndicator(strokeWidth: 2),
             )
           : null,
-          child: _buildLegList(
-            context,
-            data.onThisDay,
-            showAll: _showAllOnThisDay,
-            emptyMessage: 'No historical moves for today yet.',
-          ),
-        ),
-        const SizedBox(height: 12),
-        _buildQuickCalcCard(context),
-        const SizedBox(height: 12),
-        _buildTripsCard(context, data),
-      ],
-    );
-  }
-
-  Widget _buildSidebar(BuildContext context, DataService data) {
-    return Column(
+      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: [
-        TopTractionPanel(),
-        const SizedBox(height: 12),
-        LeaderboardPanel(),
+                for (int idx = 0; idx < visible.length; idx++) ...[
+                  _otdRow(context, visible[idx], textTheme),
+                  if (idx != visible.length - 1) const Divider(height: 12),
+                ],
+              ],
+            ),
+    );
+  }
+
+  Widget _otdRow(BuildContext context, Leg leg, TextTheme textTheme) {
+    final traction = leg.locos;
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Container(
+          width: 64,
+          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(
+              '${leg.mileage.toStringAsFixed(1)} mi',
+              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 +526,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),
+                const SizedBox(width: 8),
+                Expanded(
+                  child: Text(
                     title,
                     style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                    fontWeight: FontWeight.w700,
+                      fontWeight: FontWeight.w800,
                     ),
                   ),
-                Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    if (action != null) action,
-                    if (trailing != null) ...[
-                      const SizedBox(width: 8),
-                      trailing,
-                    ],
-                  ],
                 ),
+                if (action != null)
+                  Padding(
+                    padding: const EdgeInsets.only(right: 8.0),
+                    child: action,
+                  ),
+                if (trailing != null) trailing,
               ],
             ),
             const SizedBox(height: 12),
@@ -271,72 +559,15 @@ class _DashboardState extends State<Dashboard> {
     );
   }
 
-  Widget _buildLegList(
-    BuildContext context,
-    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'),
@@ -348,20 +579,46 @@ class _DashboardState extends State<Dashboard> {
               style: Theme.of(context).textTheme.bodyMedium,
             )
           : Column(
-              children: trips.take(5).map((trip) {
-                return ListTile(
-                  contentPadding: EdgeInsets.zero,
-                  title: Text(trip.tripName),
-                  subtitle: Text('${trip.tripMileage.toStringAsFixed(1)} mi'),
-                  trailing: const Icon(Icons.chevron_right),
+              children: trips.take(6).map((trip) {
+                return Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 6.0),
+                  child: Row(
+                    children: [
+                      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(
+                              '${trip.tripMileage.toStringAsFixed(1)} mi',
+                              style: Theme.of(context).textTheme.labelMedium,
+                            ),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
                 );
               }).toList(),
             ),
     );
   }
 
-  String _formatDate(DateTime? dt) {
-    if (dt == null) return '';
-    return '${dt.year.toString().padLeft(4, '0')}-${dt.month.toString().padLeft(2, '0')}-${dt.day.toString().padLeft(2, '0')}';
+  String _formatTime(DateTime date) {
+    return DateFormat('HH:mm').format(date);
   }
 }

lib/components/pages/legs.dart

@@ -1,5 +1,6 @@
 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:provider/provider.dart';
 
@@ -211,7 +212,7 @@ class _LegsPageState extends State<LegsPage> {
           else
             Column(
               children: [
-                ...legs.map((leg) => LegCard(leg: leg)),
+                ..._buildLegsWithDividers(context, legs),
                 const SizedBox(height: 8),
                 if (data.legsHasMore || data.isLegsLoading)
                   Align(
@@ -238,6 +239,58 @@ class _LegsPageState extends State<LegsPage> {
     );
   }
 
+  List<Widget> _buildLegsWithDividers(BuildContext context, List<Leg> legs) {
+    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(
+                '${dayMileage.toStringAsFixed(1)} mi',
+                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/timeline_grid.dart

@@ -443,23 +443,15 @@ class _ValueBlockMenu extends StatelessWidget {
       return _ValueBlockView(block: block);
     }
 
-    return GestureDetector(
-      behavior: HitTestBehavior.opaque,
-      onLongPressStart: (details) async {
+    Future<void> showContextMenuAt(Offset globalPosition) 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);
+      // 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(
-            anchor.dx,
-            anchor.dy,
-            1,
-            1,
-          ),
+        Rect.fromLTWH(localPosition.dx, localPosition.dy, 1, 1),
         Offset.zero & renderBox.size,
       );
 
@@ -490,6 +482,18 @@ class _ValueBlockMenu extends StatelessWidget {
           onDeleteEntry?.call(entry);
           break;
       }
+    }
+
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onLongPressStart: (details) async {
+        if (defaultTargetPlatform == TargetPlatform.android) {
+          HapticFeedback.lightImpact();
+        }
+        await showContextMenuAt(details.globalPosition);
+      },
+      onSecondaryTapDown: (details) async {
+        await showContextMenuAt(details.globalPosition);
       },
       child: _ValueBlockView(block: block),
     );

lib/components/pages/new_entry/new_entry_draft_logic.dart

@@ -84,6 +84,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();
@@ -212,6 +238,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
           : {

lib/components/pages/new_entry/new_entry_page.dart

@@ -27,6 +27,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
   int? _selectedTripId;
   bool _restoringDraft = false;
   bool _loadingEdit = false;
+  bool _savingDraft = false;
   String? _loadError;
   Map<String, dynamic>? _lastSubmittedSnapshot;
   Map<String, dynamic>? _loadedDraftSnapshot;
@@ -48,7 +49,7 @@ class _NewEntryPageState extends State<NewEntryPage> {
       if (!mounted) return;
       final data = context.read<DataService>();
       data.fetchClassList();
-      data.fetchTrips();
+      data.fetchTripOptions();
       if (_draftPersistenceEnabled) {
         _loadDraft();
       }
@@ -150,16 +151,27 @@ class _NewEntryPageState extends State<NewEntryPage> {
         final data = context.read<DataService>();
         final messenger = ScaffoldMessenger.maybeOf(context);
         try {
-        await api.put('/trips/new', {"trip_name": result});
-        await data.fetchTrips();
+          final encoded = Uri.encodeComponent(result);
+          final res = await api.put('/trips/new?trip_name=$encoded', {});
+          await data.fetchTripOptions();
           if (!context.mounted) return;
           final trips = data.tripList;
-        final match = trips.firstWhere(
-          (t) => t.tripName == result,
-          orElse: () => trips.isNotEmpty
-              ? trips.first
-              : TripSummary(tripId: 0, tripName: result, tripMileage: 0),
+        final apiTripId = res is Map ? res['trip_id'] as int? : null;
+        TripSummary match;
+        try {
+          match = trips.firstWhere(
+            (t) =>
+                (apiTripId != null && t.tripId == apiTripId) ||
+                t.tripName == result,
           );
+        } catch (_) {
+          match = TripSummary(
+            tripId: apiTripId ?? 0,
+            tripName: result,
+            tripMileage: 0,
+          );
+          data.upsertTripSummary(match);
+        }
         setState(() => _selectedTripId = match.tripId);
         _saveDraft();
       } catch (e) {
@@ -176,9 +188,13 @@ class _NewEntryPageState extends State<NewEntryPage> {
   }
 
   Future<void> _openCalculator() async {
+    final initialStations = _routeResult?.inputRoute.isNotEmpty == true
+        ? _routeResult!.inputRoute
+        : (_routeResult?.calculatedRoute ?? const []);
     final result = await Navigator.of(context).push<RouteResult>(
       MaterialPageRoute(
         builder: (_) => _CalculatorPickerPage(
+          initialStations: initialStations.isEmpty ? null : initialStations,
           onResult: (res) => Navigator.of(context).pop(res),
         ),
       ),
@@ -373,6 +389,25 @@ class _NewEntryPageState extends State<NewEntryPage> {
                     icon: const Icon(Icons.list_alt, size: 16),
                     label: const Text('Drafts'),
                   ),
+                  const SizedBox(width: 12),
+                  TextButton.icon(
+                    style: TextButton.styleFrom(
+                      padding: EdgeInsets.zero,
+                      minimumSize: const Size(0, 36),
+                      tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                    ),
+                    onPressed: _isEditing || _savingDraft || _submitting
+                        ? null
+                        : _saveDraftManually,
+                    icon: _savingDraft
+                        ? const SizedBox(
+                            width: 16,
+                            height: 16,
+                            child: CircularProgressIndicator(strokeWidth: 2),
+                          )
+                        : const Icon(Icons.save_alt, size: 16),
+                    label: Text(_savingDraft ? 'Saving...' : 'Save to drafts'),
+                  ),
                   const Spacer(),
                   TextButton.icon(
                     style: TextButton.styleFrom(

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

@@ -27,7 +27,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 +37,7 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
         ),
         actions: [
           TextButton(
-            onPressed: () => Navigator.of(context).pop(),
+            onPressed: () => Navigator.of(dialogCtx).pop(),
             child: const Text('OK'),
           ),
         ],
@@ -46,7 +47,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
@@ -208,6 +211,8 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
       _selectedTripId = null;
       _submitting = false;
       _activeDraftId = null;
+      _savingDraft = false;
+      _loadedDraftSnapshot = null;
     });
     if (clearDraft) {
       await _clearDraft();

lib/components/pages/settings.dart

@@ -0,0 +1,213 @@
+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/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;
+
+  @override
+  void initState() {
+    super.initState();
+    final endpoint = context.read<EndpointService>().baseUrl;
+    _endpointController = TextEditingController(text: endpoint);
+  }
+
+  @override
+  void 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);
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final endpointService = context.watch<EndpointService>();
+    if (!endpointService.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: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            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,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/components/pages/trips.dart

@@ -26,6 +26,55 @@ class _TripsPageState extends State<TripsPage> {
     await context.read<DataService>().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 Future.wait([
+        data.fetchTripDetails(),
+        data.fetchTrips(),
+      ]);
+    } catch (e) {
+      messenger?.showSnackBar(
+        SnackBar(content: Text('Failed to rename trip: $e')),
+      );
+      rethrow;
+    }
+  }
+
+  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>();
@@ -218,6 +267,77 @@ class _TripsPageState extends State<TripsPage> {
       context: context,
       isScrollControlled: true,
       builder: (_) {
+        bool renaming = false;
+        bool deleting = false;
+        String tripName = trip.name;
+        return StatefulBuilder(
+          builder: (sheetCtx, setSheetState) {
+            Future<void> handleRename() async {
+              final newName =
+                  await _promptTripName(sheetCtx, tripName) ?? tripName;
+              if (newName.isEmpty || newName == tripName) return;
+              setSheetState(() => renaming = true);
+              try {
+                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.',
+                    ),
+                    actions: [
+                      TextButton(
+                        onPressed: () => Navigator.of(ctx).pop(false),
+                        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(),
+                ]);
+                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),
@@ -229,15 +349,43 @@ class _TripsPageState extends State<TripsPage> {
                       children: [
                         IconButton(
                           icon: const Icon(Icons.arrow_back),
-                      onPressed: () => Navigator.of(context).pop(),
+                          onPressed: () => Navigator.of(sheetCtx).pop(),
                         ),
-                    Text(
-                      trip.name,
-                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                        fontWeight: FontWeight.bold,
+                        Expanded(
+                          child: Text(
+                            tripName,
+                            style: Theme.of(context).textTheme.titleMedium
+                                ?.copyWith(fontWeight: FontWeight.bold),
                           ),
                         ),
-                    const Spacer(),
+                        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('${trip.mileage.toStringAsFixed(1)} mi'),
                       ],
                     ),
@@ -267,6 +415,8 @@ class _TripsPageState extends State<TripsPage> {
             );
           },
         );
+      },
+    );
   }
 
   void _showTripWinners(BuildContext context, TripDetail trip) {

lib/objects/objects.dart

@@ -1,11 +1,11 @@
 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 +20,15 @@ String _asString(dynamic value, [String fallback = '']) {
   return (str == null) ? fallback : str;
 }
 
+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 +76,7 @@ class HomepageStats {
   final List<LocoSummary> topLocos;
   final List<LeaderboardEntry> leaderboard;
   final List<TripSummary> trips;
+  final int legCount;
   final UserData? user;
 
   HomepageStats({
@@ -75,6 +85,7 @@ class HomepageStats {
     required this.topLocos,
     required this.leaderboard,
     required this.trips,
+    required this.legCount,
     this.user,
   });
 
@@ -98,6 +109,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(
@@ -126,6 +141,7 @@ 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 +152,7 @@ class Loco {
     required this.operator,
     this.notes,
     this.evn,
+    this.powering = true,
   });
 
   factory Loco.fromJson(Map<String, dynamic> json) => Loco(
@@ -147,6 +164,7 @@ class Loco {
     operator: json['operator'],
     notes: json['notes'],
     evn: json['evn'],
+    powering: _asBool(json['alloc_powering'] ?? json['powering'], true),
   );
 }
 
@@ -179,6 +197,7 @@ class LocoSummary extends Loco {
     this.livery,
     this.location,
     Map<String, dynamic>? extra,
+    super.powering = true,
   }) : extra = extra ?? const {},
        super(
          id: locoId,
@@ -213,6 +232,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 +373,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;

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;

lib/services/data_service/data_service_core.dart

@@ -44,6 +44,10 @@ 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;
   final Map<int, List<LocoAttrVersion>> _locoTimelines = {};
   final Map<int, bool> _isLocoTimelineLoading = {};
   List<LocoAttrVersion> timelineForLoco(int locoId) =>
@@ -148,7 +152,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 +185,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']) {
@@ -340,6 +345,8 @@ class DataService extends ChangeNotifier {
     _eventFields = [];
     _locoTimelines.clear();
     _isLocoTimelineLoading.clear();
+    _latestLocoChanges = [];
+    _isLatestLocoChangesLoading = false;
     _notifyAsync();
   }
 

lib/services/data_service/data_service_traction.dart

@@ -114,5 +114,40 @@ extension DataServiceTraction on DataService {
     }
     return _locoClasses;
   }
-}
 
+  Future<void> fetchLatestLocoChanges({int limit = 25, int offset = 0}) 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)),
+              ),
+            );
+          }
+        }
+        _latestLocoChanges = parsed;
+      } else {
+        throw Exception('Unexpected latest loco changes response: $json');
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch latest loco changes: $e');
+      _latestLocoChanges = [];
+    } finally {
+      _isLatestLocoChangesLoading = false;
+      _notifyAsync();
+    }
+  }
+}

lib/services/data_service/data_service_trips.dart

@@ -83,5 +83,50 @@ extension DataServiceTrips on DataService {
       _notifyAsync();
     }
   }
-}
 
+  Future<void> fetchTripOptions() async {
+    try {
+      final json = await api.get('/trips');
+      Iterable<dynamic>? raw;
+      if (json is List) {
+        raw = json;
+      } else if (json is Map) {
+        for (final key in ['trips', 'trip_data', 'data']) {
+          final value = json[key];
+          if (value is List) {
+            raw = value;
+            break;
+          }
+        }
+      }
+      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();
+    }
+  }
+
+  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();
+  }
+}

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

@@ -11,6 +11,7 @@ import 'package:mileograph_flutter/components/pages/loco_legs.dart';
 import 'package:mileograph_flutter/components/pages/loco_timeline.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/settings.dart';
 import 'package:mileograph_flutter/components/pages/traction.dart';
 import 'package:mileograph_flutter/components/pages/trips.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
@@ -31,6 +32,21 @@ const List<String> _contentPages = [
 
 const int _addTabIndex = 5;
 
+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("Entries", Icons.list),
+  _NavItem("Traction", Icons.train),
+  _NavItem("Trips", Icons.book),
+  _NavItem("Add", Icons.add),
+];
+
 int tabIndexForPath(String path) {
   final newIndex = _contentPages.indexWhere((routePath) {
     if (path == routePath) return true;
@@ -139,6 +155,10 @@ class _MyAppState extends State<MyApp> {
                 return NewEntryPage(editLegId: legId);
               },
             ),
+            GoRoute(
+              path: '/settings',
+              builder: (context, state) => const SettingsPage(),
+            ),
           ],
         ),
         GoRoute(path: '/login', builder: (context, state) => const LoginScreen()),
@@ -218,6 +238,9 @@ class _MyHomePageState extends State<MyHomePage> {
         if (data.traction.isEmpty) {
           data.fetchHadTraction();
         }
+        if (data.latestLocoChanges.isEmpty) {
+          data.fetchLatestLocoChanges();
+        }
         if (data.onThisDay.isEmpty) {
           data.fetchOnThisDay();
         }
@@ -273,7 +296,28 @@ class _MyHomePageState extends State<MyHomePage> {
 
         SystemNavigator.pop();
       },
-      child: Scaffold(
+      child: LayoutBuilder(
+        builder: (context, constraints) {
+          final isWide = constraints.maxWidth >= 900;
+          final railExtended = constraints.maxWidth >= 1400;
+          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();
+
+          return Scaffold(
             appBar: AppBar(
               backgroundColor: Theme.of(context).colorScheme.inversePrimary,
               title: Text.rich(
@@ -291,23 +335,48 @@ class _MyHomePageState extends State<MyHomePage> {
                 ),
               ),
               actions: [
-            const IconButton(onPressed: null, icon: Icon(Icons.account_circle)),
+                const IconButton(
+                  onPressed: null,
+                  icon: Icon(Icons.account_circle),
+                ),
+                IconButton(
+                  tooltip: 'Settings',
+                  onPressed: () => context.go('/settings'),
+                  icon: const Icon(Icons.settings),
+                ),
                 IconButton(onPressed: auth.logout, icon: const Icon(Icons.logout)),
               ],
             ),
-        bottomNavigationBar: NavigationBar(
+            bottomNavigationBar: isWide
+                ? null
+                : 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"),
-          ],
+                    onDestinationSelected: (int index) =>
+                        _onItemTapped(index, pageIndex),
+                    destinations: navBarDestinations,
                   ),
-        body: currentPage,
+            body: isWide
+                ? Row(
+                    children: [
+                      SafeArea(
+                        child: NavigationRail(
+                          selectedIndex: pageIndex,
+                          extended: railExtended,
+                          labelType: railExtended
+                              ? NavigationRailLabelType.none
+                              : NavigationRailLabelType.selected,
+                          onDestinationSelected: (int index) =>
+                              _onItemTapped(index, pageIndex),
+                          destinations: navRailDestinations,
+                        ),
+                      ),
+                      const VerticalDivider(width: 1),
+                      Expanded(child: currentPage),
+                    ],
+                  )
+                : currentPage,
+          );
+        },
       ),
     );
   }

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.3.2+1
 
 environment:
   sdk: ^3.8.1