remove hero buttons

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>(
+        ChangeNotifierProvider<EndpointService>(
-          create: (_) => ApiService(baseUrl: 'http://localhost:8000/api/v1'),
+          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/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,21 +359,18 @@ 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(
-                mainAxisAlignment: MainAxisAlignment.center,
             children: [
               ElevatedButton.icon(
                 icon: const Icon(Icons.add),
                 label: const Text('Add Station'),
                 onPressed: _addStation,
               ),
-                  const SizedBox(width: 16),
               ElevatedButton.icon(
                 icon: const Icon(Icons.route),
                 label: const Text('Calculate Route'),
@@ -324,8 +380,6 @@ class _RouteCalculatorState extends State<RouteCalculator> {
               ),
             ],
           ),
-            );
-          },
         ),
 
         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/dashboard/latest_loco_changes_panel.dart

@@ -80,7 +80,8 @@ class _LatestLocoChangesPanelState extends State<LatestLocoChangesPanel> {
                   child: ListView.separated(
                     controller: _controller,
                     itemCount: changes.length,
-                    separatorBuilder: (_, __) => const Divider(height: 1),
+                    separatorBuilder: (context, index) =>
+                        const Divider(height: 1),
                     itemBuilder: (context, index) {
                       final change = changes[index];
                       return ListTile(

lib/components/legs/leg_card.dart

@@ -140,7 +140,7 @@ class LegCard extends StatelessWidget {
                 : textTheme.bodyMedium?.copyWith(color: theme.disabledColor);
             final background = powering
                 ? theme.colorScheme.surfaceContainerHighest
-                : theme.colorScheme.surfaceVariant;
+                : theme.colorScheme.surfaceContainerLow;
             return Chip(
               label: Text(
                 '${loco.locoClass} ${loco.number}',

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

@@ -83,7 +83,6 @@ class _DashboardState extends State<Dashboard> {
     HomepageStats? stats,
   ) {
     final colorScheme = Theme.of(context).colorScheme;
-    final isCompact = MediaQuery.of(context).size.width < 720;
     final greetingName =
         stats?.user?.fullName ?? auth.fullName ?? auth.username ?? 'there';
     final totalMileage = stats?.totalMileage ?? 0;
@@ -109,26 +108,9 @@ class _DashboardState extends State<Dashboard> {
         ),
         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,
@@ -314,52 +296,6 @@ class _DashboardState extends State<Dashboard> {
     );
   }
 
-  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: [
-        ...buttons
-            .map(
-              (btn) => Padding(
-                padding: const EdgeInsets.only(left: 8.0),
-                child: btn,
-              ),
-            )
-            .toList(),
-      ],
-    );
-  }
-
   Widget _buildOnThisDayCard(BuildContext context, DataService data) {
     final filtered = data.onThisDay
         .where((leg) => leg.beginTime.year != DateTime.now().year)

lib/components/pages/legs.dart

@@ -246,7 +246,8 @@ class _LegsPageState extends State<LegsPage> {
     final dayLegs = <Leg>[];
 
     void flushDay() {
-      if (currentDate == null) return;
+      final date = currentDate;
+      if (date == null) return;
       widgets.add(
         Padding(
           padding: const EdgeInsets.symmetric(vertical: 8.0),
@@ -254,7 +255,7 @@ class _LegsPageState extends State<LegsPage> {
             children: [
               Expanded(
                 child: Text(
-                  currentDate!,
+                  date,
                   style: Theme.of(context).textTheme.labelMedium?.copyWith(
                         fontWeight: FontWeight.w700,
                       ),

lib/components/pages/loco_timeline/timeline_grid.dart

@@ -445,7 +445,7 @@ class _ValueBlockMenu extends StatelessWidget {
 
     Future<void> showContextMenuAt(Offset globalPosition) async {
       final overlay = Overlay.of(context);
-      final renderBox = overlay?.context.findRenderObject() as RenderBox?;
+      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.

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/traction/traction_page.dart

@@ -513,21 +513,10 @@ class _TractionPageState extends State<TractionPage> {
     if (widget.selectionMode) {
       return Scaffold(
         appBar: AppBar(
-          leadingWidth: 140,
+          leadingWidth: 56,
-          leading: Padding(
+          leading: IconButton(
-            padding: const EdgeInsets.only(left: 8.0),
-            child: TextButton.icon(
-              onPressed: () => Navigator.of(context).pop(),
             icon: const Icon(Icons.arrow_back),
-              label: const Text('Back'),
+            onPressed: () => Navigator.of(context).pop(),
-              style: TextButton.styleFrom(
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 12,
-                  vertical: 10,
-                ),
-                foregroundColor: Theme.of(context).colorScheme.onSurface,
-              ),
-            ),
           ),
           title: null,
         ),

lib/components/pages/trips.dart

@@ -288,6 +288,11 @@ class _TripsPageState extends State<TripsPage> {
 
             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) {
@@ -309,11 +314,8 @@ class _TripsPageState extends State<TripsPage> {
                   );
                 },
               );
-              if (ok != true) return;
+              if (ok != true || !mounted) return;
 
-              final data = context.read<DataService>();
-              final api = data.api;
-              final messenger = ScaffoldMessenger.maybeOf(context);
               setSheetState(() => deleting = true);
               try {
                 await api.delete('/trips/delete/${trip.id}');
@@ -321,18 +323,16 @@ class _TripsPageState extends State<TripsPage> {
                   data.fetchTripDetails(),
                   data.fetchTrips(),
                 ]);
-                if (context.mounted) {
+                if (!mounted) return;
                 messenger?.showSnackBar(
                   SnackBar(content: Text('Deleted "${trip.name}"')),
                 );
-                  Navigator.of(sheetCtx).pop();
+                navigator.pop();
-                }
               } catch (e) {
-                if (context.mounted) {
+                if (!mounted) return;
                 messenger?.showSnackBar(
                   SnackBar(content: Text('Failed to delete trip: $e')),
                 );
-                }
               } finally {
                 if (mounted) setSheetState(() => deleting = false);
               }

lib/components/traction/traction_card.dart

@@ -82,30 +82,30 @@ class TractionCard extends StatelessWidget {
               ],
             ),
             const SizedBox(height: 8),
-            Row(
+            LayoutBuilder(
-              children: [
+              builder: (context, constraints) {
+                final isNarrow = constraints.maxWidth < 520;
+                final buttons = [
                   TextButton.icon(
                     onPressed: onShowInfo,
                     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) ...[
+                  if (hasMileageOrTrips && onOpenLegs != null)
-                  const SizedBox(width: 8),
                     TextButton.icon(
                       onPressed: onOpenLegs,
                       icon: const Icon(Icons.view_list),
                       label: const Text('Legs'),
                     ),
-                ],
+                ];
-                const Spacer(),
+
-                if (selectionMode && onToggleSelect != null)
+                final addButton = selectionMode && onToggleSelect != null
-                  TextButton.icon(
+                    ? TextButton.icon(
                         onPressed: onToggleSelect,
                         icon: Icon(
                           isSelected
@@ -113,8 +113,37 @@ class TractionCard extends StatelessWidget {
                               : 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,

lib/objects/objects.dart

@@ -197,7 +197,7 @@ class LocoSummary extends Loco {
     this.livery,
     this.location,
     Map<String, dynamic>? extra,
-    bool powering = true,
+    super.powering = true,
   }) : extra = extra ?? const {},
        super(
          id: locoId,
@@ -207,7 +207,6 @@ class LocoSummary extends Loco {
          operator: locoOperator,
          notes: locoNotes,
          evn: locoEvn,
-         powering: powering,
        );
 
   factory LocoSummary.fromJson(Map<String, dynamic> json) => LocoSummary(
@@ -400,7 +399,7 @@ class LocoChange {
   });
 
   factory LocoChange.fromJson(Map<String, dynamic> json) {
-    String _clean(dynamic value) {
+    String cleanValue(dynamic value) {
       final str = value?.toString().trim() ?? '';
       if (str.isEmpty || str == '-' || str == '?') return '';
       return str;
@@ -417,15 +416,15 @@ class LocoChange {
     final validFromRaw = json['valid_from'] ?? json['validFrom'];
     return LocoChange(
       locoId: _asInt(json['loco_id']),
-      locoClass: _clean(json['loco_class']),
+      locoClass: cleanValue(json['loco_class']),
-      locoNumber: _clean(json['loco_number']),
+      locoNumber: cleanValue(json['loco_number']),
-      locoName: _clean(json['loco_name']),
+      locoName: cleanValue(json['loco_name']),
       attrCode: _asString(json['attr_code']),
-      attrDisplay: _clean(json['attr_display']),
+      attrDisplay: cleanValue(json['attr_display']),
-      valueDisplay: _clean(valueLabel),
+      valueDisplay: cleanValue(valueLabel),
       validFrom: DateTime.tryParse(validFromRaw?.toString() ?? ''),
       approvedAt: DateTime.tryParse(approvedRaw?.toString() ?? ''),
-      approvedBy: _clean(json['approved_by']),
+      approvedBy: cleanValue(json['approved_by']),
     );
   }
 

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

@@ -72,9 +72,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 = [""];
 
@@ -365,37 +370,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/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';
@@ -83,8 +84,9 @@ class _MyAppState extends State<MyApp> {
       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 '/';
         return null;
       },
@@ -157,6 +159,10 @@ class _MyAppState extends State<MyApp> {
           ],
         ),
         GoRoute(path: '/login', builder: (context, state) => const LoginScreen()),
+        GoRoute(
+          path: '/settings',
+          builder: (context, state) => const SettingsPage(),
+        ),
       ],
     );
   }
@@ -334,6 +340,11 @@ class _MyHomePageState extends State<MyHomePage> {
                   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)),
               ],
             ),

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