adjust loggin in indicator

lib/app.dart

@@ -27,8 +27,13 @@ class App extends StatelessWidget {
         ChangeNotifierProvider<AuthService>(
           create: (context) => AuthService(api: context.read<ApiService>()),
         ),
-        ChangeNotifierProvider<DataService>(
+        ChangeNotifierProxyProvider<AuthService, DataService>(
           create: (context) => DataService(api: context.read<ApiService>()),
+          update: (context, auth, data) {
+            data ??= DataService(api: context.read<ApiService>());
+            data.handleAuthChanged(auth.userId);
+            return data;
+          },
         ),
       ],
       child: const MyApp(),

lib/components/dashboard/latest_loco_changes_panel.dart

@@ -36,7 +36,6 @@ class _LatestLocoChangesPanelState extends State<LatestLocoChangesPanel> {
     final data = context.watch<DataService>();
     final changes = data.latestLocoChanges;
     final isLoading = data.isLatestLocoChangesLoading;
-    final hasMore = data.latestLocoChangesHasMore;
     final textTheme = Theme.of(context).textTheme;
 
     return Card(
@@ -52,7 +51,7 @@ class _LatestLocoChangesPanelState extends State<LatestLocoChangesPanel> {
                 const SizedBox(width: 8),
                 Expanded(
                   child: Text(
-                    'Latest loco changes',
+                    'Latest Loco Changes',
                     style: textTheme.titleMedium?.copyWith(
                       fontWeight: FontWeight.w800,
                     ),
@@ -287,7 +286,7 @@ class _LatestLocoChangesPanelState extends State<LatestLocoChangesPanel> {
           ],
         );
       },
-      separatorBuilder: (_, __) => const Divider(height: 8),
+      separatorBuilder: (_, index) => const Divider(height: 8),
       itemCount: grouped.length,
     );
 

lib/components/legs/leg_card.dart

@@ -224,6 +224,7 @@ class _LegCardState extends State<LegCard> {
     );
     if (confirmed != true) return;
 
+    if (!context.mounted) return;
     final data = context.read<DataService>();
     final messenger = ScaffoldMessenger.of(context);
     try {

lib/components/login/login.dart

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

lib/components/pages/dashboard.dart

@@ -509,7 +509,7 @@ class _DashboardState extends State<Dashboard> {
       icon: Icons.bookmark,
       title: 'Trips',
       action: TextButton(
-        onPressed: () => context.push('/trips'),
+        onPressed: () => context.push('/logbook/trips'),
         child: const Text('View all'),
       ),
       child: trips.isEmpty

lib/components/pages/loco_timeline/event_editor.dart

@@ -299,7 +299,6 @@ class _FieldInput extends StatelessWidget {
     final name = field.name.toLowerCase();
     if (name == 'max_speed') {
       final unit = entry.unit ?? 'kph';
-      final isNumber = true;
       return Row(
         children: [
           Expanded(
@@ -307,7 +306,7 @@ class _FieldInput extends StatelessWidget {
               initialValue: value?.toString(),
               onChanged: (val) {
                 final parsed = double.tryParse(val);
-                onChanged(isNumber ? parsed : val, unit: unit);
+                onChanged(parsed, unit: unit);
               },
               decoration: const InputDecoration(
                 border: OutlineInputBorder(),

lib/components/pages/logbook.dart

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

lib/components/pages/more.dart

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

lib/components/pages/new_entry/new_entry_submit_logic.dart

@@ -120,6 +120,7 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
       }
       if (!mounted) return;
       dataService.refreshLegs();
+      await dataService.fetchNotifications();
       if (!mounted) return;
       messenger?.showSnackBar(
         SnackBar(

lib/components/pages/profile.dart

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

lib/components/pages/settings.dart

@@ -3,6 +3,7 @@ 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/api_service.dart';
 import 'package:mileograph_flutter/services/endpoint_service.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:provider/provider.dart';
@@ -17,16 +18,27 @@ class SettingsPage extends StatefulWidget {
 class _SettingsPageState extends State<SettingsPage> {
   late final TextEditingController _endpointController;
   bool _saving = false;
+  bool _changingPassword = false;
+  final _passwordFormKey = GlobalKey<FormState>();
+  late final TextEditingController _currentPasswordController;
+  late final TextEditingController _newPasswordController;
+  late final TextEditingController _confirmPasswordController;
 
   @override
   void initState() {
     super.initState();
     final endpoint = context.read<EndpointService>().baseUrl;
     _endpointController = TextEditingController(text: endpoint);
+    _currentPasswordController = TextEditingController();
+    _newPasswordController = TextEditingController();
+    _confirmPasswordController = TextEditingController();
   }
 
   @override
   void dispose() {
+    _currentPasswordController.dispose();
+    _newPasswordController.dispose();
+    _confirmPasswordController.dispose();
     _endpointController.dispose();
     super.dispose();
   }
@@ -125,6 +137,40 @@ class _SettingsPageState extends State<SettingsPage> {
     }
   }
 
+  Future<void> _changePassword() async {
+    final messenger = ScaffoldMessenger.of(context);
+    final formState = _passwordFormKey.currentState;
+    if (formState == null || !formState.validate()) return;
+
+    FocusScope.of(context).unfocus();
+    setState(() => _changingPassword = true);
+    try {
+      final api = context.read<ApiService>();
+      await api.post('/user/password/change', {
+        'old_password': _currentPasswordController.text,
+        'new_password': _newPasswordController.text,
+      });
+      if (!mounted) return;
+      messenger.showSnackBar(
+        const SnackBar(content: Text('Password updated successfully.')),
+      );
+      formState.reset();
+      _currentPasswordController.clear();
+      _newPasswordController.clear();
+      _confirmPasswordController.clear();
+    } catch (e) {
+      if (mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Failed to change password: $e')),
+        );
+      }
+    } finally {
+      if (mounted) {
+        setState(() => _changingPassword = false);
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final endpointService = context.watch<EndpointService>();
@@ -149,7 +195,7 @@ class _SettingsPageState extends State<SettingsPage> {
           },
         ),
       ),
-      body: Padding(
+      body: SingleChildScrollView(
         padding: const EdgeInsets.all(16.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -205,6 +251,97 @@ class _SettingsPageState extends State<SettingsPage> {
               'Current: ${endpointService.baseUrl}',
               style: Theme.of(context).textTheme.labelSmall,
             ),
+            const SizedBox(height: 32),
+            Text(
+              'Account',
+              style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              'Change your password for this account.',
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+            const SizedBox(height: 12),
+            Form(
+              key: _passwordFormKey,
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  TextFormField(
+                    controller: _currentPasswordController,
+                    decoration: const InputDecoration(
+                      labelText: 'Current password',
+                      border: OutlineInputBorder(),
+                    ),
+                    obscureText: true,
+                    enableSuggestions: false,
+                    autocorrect: false,
+                    autofillHints: const [AutofillHints.password],
+                    validator: (value) {
+                      if (value == null || value.isEmpty) {
+                        return 'Please enter your current password.';
+                      }
+                      return null;
+                    },
+                  ),
+                  const SizedBox(height: 12),
+                  TextFormField(
+                    controller: _newPasswordController,
+                    decoration: const InputDecoration(
+                      labelText: 'New password',
+                      border: OutlineInputBorder(),
+                    ),
+                    obscureText: true,
+                    enableSuggestions: false,
+                    autocorrect: false,
+                    autofillHints: const [AutofillHints.newPassword],
+                    validator: (value) {
+                      if (value == null || value.isEmpty) {
+                        return 'Please enter a new password.';
+                      }
+                      return null;
+                    },
+                  ),
+                  const SizedBox(height: 12),
+                  TextFormField(
+                    controller: _confirmPasswordController,
+                    decoration: const InputDecoration(
+                      labelText: 'Confirm new password',
+                      border: OutlineInputBorder(),
+                    ),
+                    obscureText: true,
+                    enableSuggestions: false,
+                    autocorrect: false,
+                    autofillHints: const [AutofillHints.newPassword],
+                    validator: (value) {
+                      if (value == null || value.isEmpty) {
+                        return 'Please confirm the new password.';
+                      }
+                      if (value != _newPasswordController.text) {
+                        return 'New passwords do not match.';
+                      }
+                      return null;
+                    },
+                  ),
+                  const SizedBox(height: 16),
+                  FilledButton.icon(
+                    onPressed: _changingPassword ? null : _changePassword,
+                    icon: _changingPassword
+                        ? const SizedBox(
+                            width: 18,
+                            height: 18,
+                            child: CircularProgressIndicator(strokeWidth: 2),
+                          )
+                        : const Icon(Icons.lock_reset),
+                    label: Text(
+                      _changingPassword ? 'Updating...' : 'Change password',
+                    ),
+                  ),
+                ],
+              ),
+            ),
           ],
         ),
       ),

lib/components/pages/traction/traction_page.dart

@@ -244,47 +244,7 @@ class _TractionPageState extends State<TractionPage> {
                       ],
                     ),
                   ),
-              Row(
+                  _buildHeaderActions(context, isMobile),
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  IconButton(
-                    tooltip: 'Refresh',
-                    onPressed: _refreshTraction,
-                    icon: const Icon(Icons.refresh),
-                  ),
-                  if (_hasClassQuery) ...[
-                    const SizedBox(width: 8),
-                    FilledButton.tonalIcon(
-                      onPressed: _toggleClassStatsPanel,
-                      icon: Icon(
-                        _showClassStatsPanel ? Icons.bar_chart : Icons.insights,
-                      ),
-                      label: Text(
-                        _showClassStatsPanel ? 'Hide class stats' : 'Class stats',
-                      ),
-                    ),
-                  ],
-                  const SizedBox(width: 8),
-                  FilledButton.icon(
-                    onPressed: () async {
-                      final createdClass = await context.push<String>(
-                        '/traction/new',
-                          );
-                          if (createdClass != null && createdClass.isNotEmpty) {
-                            _classController.text = createdClass;
-                            _selectedClass = createdClass;
-                            if (mounted) {
-                              _refreshTraction();
-                            }
-                          } else if (mounted && createdClass == '') {
-                            _refreshTraction();
-                          }
-                        },
-                        icon: const Icon(Icons.add),
-                        label: const Text('New Traction'),
-                      ),
-                    ],
-                  ),
                 ],
               ),
               const SizedBox(height: 12),
@@ -546,6 +506,78 @@ class _TractionPageState extends State<TractionPage> {
     return (_selectedClass ?? _classController.text).trim().isNotEmpty;
   }
 
+  Widget _buildHeaderActions(BuildContext context, bool isMobile) {
+    final refreshButton = IconButton(
+      tooltip: 'Refresh',
+      onPressed: _refreshTraction,
+      icon: const Icon(Icons.refresh),
+    );
+
+    final classStatsButton = !_hasClassQuery
+        ? null
+        : FilledButton.tonalIcon(
+            onPressed: _toggleClassStatsPanel,
+            icon: Icon(
+              _showClassStatsPanel ? Icons.bar_chart : Icons.insights,
+            ),
+            label: Text(
+              _showClassStatsPanel ? 'Hide class stats' : 'Class stats',
+            ),
+          );
+
+    final newTractionButton = FilledButton.icon(
+      onPressed: () async {
+        final createdClass = await context.push<String>(
+          '/traction/new',
+        );
+        if (!mounted) return;
+        if (createdClass != null && createdClass.isNotEmpty) {
+          _classController.text = createdClass;
+          _selectedClass = createdClass;
+          _refreshTraction();
+        } else if (createdClass == '') {
+          _refreshTraction();
+        }
+      },
+      icon: const Icon(Icons.add),
+      label: const Text('New Traction'),
+    );
+
+    final desktopActions = [
+      refreshButton,
+      if (classStatsButton != null) classStatsButton,
+      newTractionButton,
+    ];
+
+    final mobileActions = [
+      newTractionButton,
+      if (classStatsButton != null) classStatsButton,
+      refreshButton,
+    ];
+
+    if (isMobile) {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.end,
+        children: [
+          for (var i = 0; i < mobileActions.length; i++) ...[
+            if (i > 0) const SizedBox(height: 8),
+            Align(
+              alignment: Alignment.centerRight,
+              child: mobileActions[i],
+            ),
+          ],
+        ],
+      );
+    }
+
+    return Wrap(
+      spacing: 8,
+      runSpacing: 8,
+      crossAxisAlignment: WrapCrossAlignment.center,
+      children: desktopActions,
+    );
+  }
+
   Future<void> _toggleClassStatsPanel() async {
     if (!_hasClassQuery) return;
     final targetState = !_showClassStatsPanel;

lib/components/pages/trips.dart

@@ -12,6 +12,7 @@ class TripsPage extends StatefulWidget {
 
 class _TripsPageState extends State<TripsPage> {
   bool _initialised = false;
+  final Map<int, Future<List<TripLocoStat>>> _tripLocoStatsFutures = {};
 
   @override
   void didChangeDependencies() {
@@ -23,7 +24,13 @@ class _TripsPageState extends State<TripsPage> {
   }
 
   Future<void> _refreshTrips() async {
-    await context.read<DataService>().fetchTripDetails();
+    _tripLocoStatsFutures.clear();
+    final data = context.read<DataService>();
+    await data.fetchTripDetails();
+    if (!mounted) return;
+    for (final trip in data.tripDetails) {
+      _tripStatsFuture(trip.id);
+    }
   }
 
   Future<void> _renameTrip(TripDetail trip, String newName) async {
@@ -47,6 +54,13 @@ class _TripsPageState extends State<TripsPage> {
     }
   }
 
+  Future<List<TripLocoStat>> _tripStatsFuture(int tripId) {
+    return _tripLocoStatsFutures.putIfAbsent(
+      tripId,
+      () => context.read<DataService>().fetchTripLocoStats(tripId),
+    );
+  }
+
   Future<String?> _promptTripName(BuildContext context, String initial) async {
     final controller = TextEditingController(text: initial);
     final newName = await showDialog<String>(
@@ -80,7 +94,6 @@ class _TripsPageState extends State<TripsPage> {
     final data = context.watch<DataService>();
     final tripDetails = data.tripDetails;
     final tripSummaries = data.trips;
-    final isMobile = MediaQuery.of(context).size.width < 700;
     final showLoading = data.isTripDetailsLoading && tripDetails.isEmpty;
 
     return RefreshIndicator(
@@ -171,92 +184,191 @@ class _TripsPageState extends State<TripsPage> {
           }
 
           final trip = tripDetails[index - 1];
-          return _buildTripCard(context, trip, isMobile);
+          return _buildTripCard(context, trip);
         },
       ),
     );
   }
 
-  Widget _buildTripCard(BuildContext context, TripDetail trip, bool isMobile) {
+  Widget _buildTripCard(BuildContext context, TripDetail trip) {
     final legs = trip.legs;
+    final legCount = trip.legCount > 0 ? trip.legCount : legs.length;
+    final dateRange = _formatDateRange(legs);
+    final endpoints = _formatEndpoints(legs);
+    final statsFuture = _tripStatsFuture(trip.id);
+
     return Card(
       child: Padding(
-        padding: const EdgeInsets.all(12.0),
+        padding: const EdgeInsets.all(16.0),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        'Trip',
+                        style: Theme.of(context).textTheme.labelMedium,
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        trip.name,
+                        style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
                 Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
+                  crossAxisAlignment: CrossAxisAlignment.end,
                   children: [
                     Text(
-                      trip.name,
+                      trip.mileage.toStringAsFixed(1),
-                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                      style:
-                        fontWeight: FontWeight.w700,
+                          Theme.of(context).textTheme.headlineSmall?.copyWith(
+                        fontWeight: FontWeight.w800,
                       ),
                     ),
                     Text(
-                      '${trip.mileage.toStringAsFixed(1)} mi · ${trip.legCount} legs',
+                      'miles',
-                      style: Theme.of(context).textTheme.bodyMedium,
+                      style: Theme.of(context).textTheme.labelMedium?.copyWith(
-                    ),
+                        color: Theme.of(context).textTheme.bodySmall?.color,
-                  ],
+                      ),
-                ),
-                Row(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    IconButton(
-                      icon: const Icon(Icons.train),
-                      tooltip: 'Traction',
-                      onPressed: () => _showTripWinners(context, trip),
-                    ),
-                    IconButton(
-                      icon: const Icon(Icons.open_in_new),
-                      tooltip: 'Details',
-                      onPressed: () => _showTripDetail(context, trip),
                     ),
                   ],
                 ),
               ],
             ),
-            const SizedBox(height: 8),
+            const SizedBox(height: 12),
-            if (legs.isNotEmpty)
+            FutureBuilder<List<TripLocoStat>>(
-              Column(
+              future: statsFuture,
-                children: legs.take(isMobile ? 2 : 3).map((leg) {
+              builder: (context, snapshot) {
-                  return ListTile(
+                final chips = <Widget>[
-                    dense: isMobile,
+                  _buildMetaChip(context, Icons.timeline, '$legCount legs'),
-                    contentPadding: EdgeInsets.zero,
+                  if (dateRange != null)
-                    leading: const Icon(Icons.train),
+                    _buildMetaChip(context, Icons.calendar_month, dateRange),
-                    title: Text('${leg.start} → ${leg.end}'),
+                  if (endpoints != null)
-                    subtitle: Text(
+                    _buildMetaChip(context, Icons.route, endpoints),
-                      _formatDate(leg.beginTime),
+                ];
-                      maxLines: 1,
+
-                      overflow: TextOverflow.ellipsis,
+                final stats = snapshot.data ?? const [];
-                    ),
+                final hasStats = stats.isNotEmpty;
-                    trailing: Text(
+                final loading =
-                      leg.mileage?.toStringAsFixed(1) ?? '-',
+                    snapshot.connectionState == ConnectionState.waiting;
-                      style: Theme.of(context).textTheme.labelLarge?.copyWith(
+
-                        fontWeight: FontWeight.bold,
+                if (loading && !hasStats) {
-                      ),
+                  chips.add(
+                    _buildMetaChip(context, Icons.train, 'Loading traction...'),
+                  );
+                } else if (hasStats) {
+                  final winnerCount = stats.where((e) => e.won).length;
+                  chips.add(
+                    _buildMetaChip(context, Icons.train, '${stats.length} had'),
+                  );
+                  chips.add(
+                    _buildMetaChip(
+                      context,
+                      Icons.emoji_events_outlined,
+                      '$winnerCount winners',
                     ),
                   );
-                }).toList(),
+                } else if (snapshot.connectionState == ConnectionState.done) {
-              ),
+                  chips.add(
-            if (legs.length > 3)
+                    _buildMetaChip(context, Icons.train, 'No traction yet'),
-              Padding(
+                  );
-                padding: const EdgeInsets.only(top: 6.0),
+                }
-                child: Text(
+
-                  '+${legs.length - 3} more legs',
+                return Wrap(
-                  style: Theme.of(context).textTheme.bodySmall,
+                  spacing: 8,
-                ),
+                  runSpacing: 8,
+                  children: chips,
+                );
+              },
+            ),
+            const SizedBox(height: 12),
+            Align(
+              alignment: Alignment.centerRight,
+              child: Wrap(
+                spacing: 8,
+                runSpacing: 8,
+                alignment: WrapAlignment.end,
+                children: [
+                  OutlinedButton.icon(
+                    icon: const Icon(Icons.train),
+                    label: const Text('Locos'),
+                    onPressed: () => _showTripWinners(context, trip),
+                  ),
+                  FilledButton.icon(
+                    icon: const Icon(Icons.open_in_new),
+                    label: const Text('Details'),
+                    onPressed: () => _showTripDetail(context, trip),
+                  ),
+                ],
               ),
+            ),
           ],
         ),
       ),
     );
   }
 
+  Widget _buildMetaChip(BuildContext context, IconData icon, String label) {
+    return Chip(
+      avatar: Icon(icon, size: 16),
+      label: Text(label),
+      visualDensity: const VisualDensity(horizontal: -2, vertical: -2),
+      materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+    );
+  }
+
+  String? _formatDateRange(List<TripLeg> legs) {
+    final beginTimes =
+        legs.map((e) => e.beginTime).whereType<DateTime>().toList();
+    if (beginTimes.isEmpty) return null;
+    final start = beginTimes.first;
+    final end = beginTimes.last;
+    final startStr = _formatFriendlyDate(start);
+    final endStr = _formatFriendlyDate(end);
+    if (startStr == endStr) return startStr;
+    return '$startStr - $endStr';
+  }
+
+  String _formatFriendlyDate(DateTime date) {
+    const months = [
+      'Jan',
+      'Feb',
+      'Mar',
+      'Apr',
+      'May',
+      'Jun',
+      'Jul',
+      'Aug',
+      'Sep',
+      'Oct',
+      'Nov',
+      'Dec',
+    ];
+    final day = date.day.toString().padLeft(2, '0');
+    final monthIndex = (date.month - 1).clamp(0, months.length - 1).toInt();
+    final month = months[monthIndex];
+    return '$day $month ${date.year}';
+  }
+
+  String? _formatEndpoints(List<TripLeg> legs) {
+    if (legs.isEmpty) return null;
+    final start = legs.first.start;
+    final end = legs.last.end;
+    if (start.isEmpty && end.isEmpty) return null;
+    final startLabel = start.isNotEmpty ? start : '—';
+    final endLabel = end.isNotEmpty ? end : '—';
+    return '$startLabel → $endLabel';
+  }
+
   String _formatDate(DateTime? date) {
     if (date == null) return '';
     return '${date.year.toString().padLeft(4, '0')}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';
@@ -323,6 +435,7 @@ class _TripsPageState extends State<TripsPage> {
                   data.fetchTripDetails(),
                   data.fetchTrips(),
                 ]);
+                _tripLocoStatsFutures.remove(trip.id);
                 if (!mounted) return;
                 messenger?.showSnackBar(
                   SnackBar(content: Text('Deleted "${trip.name}"')),
@@ -424,10 +537,9 @@ class _TripsPageState extends State<TripsPage> {
       context: context,
       isScrollControlled: true,
       builder: (_) {
-        final data = context.read<DataService>();
         return SafeArea(
           child: FutureBuilder<List<TripLocoStat>>(
-            future: data.fetchTripLocoStats(trip.id),
+            future: _tripStatsFuture(trip.id),
             builder: (ctx, snapshot) {
               final items = snapshot.data ?? [];
               final loading =

lib/objects/objects.dart

@@ -750,3 +750,162 @@ class EventField {
     );
   }
 }
+
+class UserNotification {
+  final int id;
+  final String title;
+  final String body;
+  final DateTime? createdAt;
+  final bool dismissed;
+
+  UserNotification({
+    required this.id,
+    required this.title,
+    required this.body,
+    required this.createdAt,
+    required this.dismissed,
+  });
+
+  factory UserNotification.fromJson(Map<String, dynamic> json) {
+    final created = json['created_at'] ?? json['createdAt'];
+    DateTime? createdAt;
+    if (created is String) {
+      createdAt = DateTime.tryParse(created);
+    } else if (created is DateTime) {
+      createdAt = created;
+    }
+    return UserNotification(
+      id: _asInt(json['notification_id'] ?? json['id']),
+      title: _asString(json['title']),
+      body: _asString(json['body']),
+      createdAt: createdAt,
+      dismissed: _asBool(json['dismissed'] ?? false, false),
+    );
+  }
+}
+
+class BadgeAward {
+  final int id;
+  final int badgeId;
+  final String badgeCode;
+  final String badgeTier;
+  final String? scopeValue;
+  final DateTime? awardedAt;
+  final LocoSummary? loco;
+
+  BadgeAward({
+    required this.id,
+    required this.badgeId,
+    required this.badgeCode,
+    required this.badgeTier,
+    this.scopeValue,
+    this.awardedAt,
+    this.loco,
+  });
+
+  factory BadgeAward.fromJson(Map<String, dynamic> json) {
+    final awarded = json['awarded_at'] ?? json['awardedAt'];
+    DateTime? awardedAt;
+    if (awarded is String) {
+      awardedAt = DateTime.tryParse(awarded);
+    } else if (awarded is DateTime) {
+      awardedAt = awarded;
+    }
+    final locoJson = json['loco'];
+    LocoSummary? loco;
+    if (locoJson is Map<String, dynamic>) {
+      loco = LocoSummary.fromJson(Map<String, dynamic>.from(locoJson));
+    }
+    return BadgeAward(
+      id: _asInt(json['award_id'] ?? json['id']),
+      badgeId: _asInt(json['badge_id'] ?? 0),
+      badgeCode: _asString(json['badge_code']),
+      badgeTier: _asString(json['badge_tier']),
+      scopeValue: _asString(json['scope_value']),
+      awardedAt: awardedAt,
+      loco: loco,
+    );
+  }
+}
+
+class ClassClearanceProgress {
+  final String className;
+  final int completed;
+  final int total;
+  final double percentComplete;
+
+  ClassClearanceProgress({
+    required this.className,
+    required this.completed,
+    required this.total,
+    required this.percentComplete,
+  });
+
+  factory ClassClearanceProgress.fromJson(Map<String, dynamic> json) {
+    final name = _asString(json['class'] ?? json['class_name'] ?? json['name']);
+    final completed = _asInt(
+      json['completed'] ?? json['done'] ?? json['count'] ?? json['had'],
+    );
+    final total = _asInt(json['total'] ?? json['required'] ?? json['goal']);
+    double percent = _asDouble(
+      json['percent_complete'] ??
+          json['percent'] ??
+          json['completion'] ??
+          json['pct'],
+    );
+    if (percent == 0 && total > 0) {
+      percent = (completed / total) * 100;
+    }
+    return ClassClearanceProgress(
+      className: name.isNotEmpty ? name : 'Class',
+      completed: completed,
+      total: total,
+      percentComplete: percent,
+    );
+  }
+}
+
+class LocoClearanceProgress {
+  final LocoSummary loco;
+  final double mileage;
+  final double required;
+  final String nextTier;
+  final List<String> awardedTiers;
+  final double percent;
+
+  LocoClearanceProgress({
+    required this.loco,
+    required this.mileage,
+    required this.required,
+    required this.nextTier,
+    required this.awardedTiers,
+    required this.percent,
+  });
+
+  factory LocoClearanceProgress.fromJson(Map<String, dynamic> json) {
+    final locoJson = json['loco'];
+    final loco = locoJson is Map<String, dynamic>
+        ? LocoSummary.fromJson(Map<String, dynamic>.from(locoJson))
+        : LocoSummary(
+            locoId: _asInt(json['loco_id']),
+            locoType: _asString(json['loco_type']),
+            locoNumber: _asString(json['loco_number']),
+            locoName: _asString(json['loco_name']),
+            locoClass: _asString(json['loco_class']),
+            locoOperator: _asString(json['operator']),
+            powering: true,
+            locoNotes: null,
+            locoEvn: null,
+          );
+    return LocoClearanceProgress(
+      loco: loco,
+      mileage: _asDouble(json['mileage']),
+      required: _asDouble(json['required']),
+      nextTier: _asString(json['next_tier']),
+      awardedTiers: (json['awarded_tiers'] as List? ?? [])
+          .map((e) => e.toString())
+          .toList(),
+      percent: _asDouble(json['percent']),
+    );
+  }
+}

lib/services/data_service/data_service.dart

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

lib/services/data_service/data_service_badges.dart

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

lib/services/data_service/data_service_core.dart

@@ -21,6 +21,8 @@ class DataService extends ChangeNotifier {
 
   DataService({required this.api});
 
+  String? _currentUserId;
+
   _LegFetchOptions _lastLegsFetch = const _LegFetchOptions();
 
   // Homepage Data
@@ -91,6 +93,36 @@ class DataService extends ChangeNotifier {
   bool _isOnThisDayLoading = false;
   bool get isOnThisDayLoading => _isOnThisDayLoading;
 
+  // Notifications
+  List<UserNotification> _notifications = [];
+  List<UserNotification> get notifications => _notifications;
+  bool _isNotificationsLoading = false;
+  bool get isNotificationsLoading => _isNotificationsLoading;
+
+  // Badges
+  List<BadgeAward> _badgeAwards = [];
+  List<BadgeAward> get badgeAwards => _badgeAwards;
+  bool _isBadgeAwardsLoading = false;
+  bool get isBadgeAwardsLoading => _isBadgeAwardsLoading;
+  bool _badgeAwardsHasMore = false;
+  bool get badgeAwardsHasMore => _badgeAwardsHasMore;
+  List<ClassClearanceProgress> _classClearanceProgress = [];
+  List<ClassClearanceProgress> get classClearanceProgress =>
+      _classClearanceProgress;
+  bool _isClassClearanceProgressLoading = false;
+  bool get isClassClearanceProgressLoading =>
+      _isClassClearanceProgressLoading;
+  bool _classClearanceHasMore = false;
+  bool get classClearanceHasMore => _classClearanceHasMore;
+  List<LocoClearanceProgress> _locoClearanceProgress = [];
+  List<LocoClearanceProgress> get locoClearanceProgress =>
+      _locoClearanceProgress;
+  bool _isLocoClearanceProgressLoading = false;
+  bool get isLocoClearanceProgressLoading =>
+      _isLocoClearanceProgressLoading;
+  bool _locoClearanceHasMore = false;
+  bool get locoClearanceHasMore => _locoClearanceHasMore;
+
   static const List<EventField> _fallbackEventFields = [
     EventField(name: 'operator', display: 'Operator'),
     EventField(name: 'status', display: 'Status'),
@@ -345,6 +377,8 @@ class DataService extends ChangeNotifier {
   }
 
   void clear() {
+    _currentUserId = null;
+    _lastLegsFetch = const _LegFetchOptions();
     _homepageStats = null;
     _legs = [];
     _onThisDay = [];
@@ -355,9 +389,44 @@ class DataService extends ChangeNotifier {
     _isLocoTimelineLoading.clear();
     _latestLocoChanges = [];
     _isLatestLocoChangesLoading = false;
+    _isHomepageLoading = false;
+    _isOnThisDayLoading = false;
+    _legsHasMore = false;
+    _isLegsLoading = false;
+    _traction = [];
+    _isTractionLoading = false;
+    _tractionHasMore = false;
+    _latestLocoChangesHasMore = false;
+    _latestLocoChangesFetched = 0;
+    _isTripDetailsLoading = false;
+    _locoClasses = [];
+    _tripList = [];
+    _stationCache.clear();
+    _stationInFlightByKey.clear();
+    _stationNetworks = [];
+    _stationCountryNetworks = {};
+    _stationFiltersFetchedAt = null;
+    _notifications = [];
+    _isNotificationsLoading = false;
+    _badgeAwards = [];
+    _badgeAwardsHasMore = false;
+    _isBadgeAwardsLoading = false;
+    _classClearanceProgress = [];
+    _isClassClearanceProgressLoading = false;
+    _classClearanceHasMore = false;
+    _locoClearanceProgress = [];
+    _isLocoClearanceProgressLoading = false;
+    _locoClearanceHasMore = false;
     _notifyAsync();
   }
 
+  void handleAuthChanged(String? userId) {
+    if (_currentUserId == userId) return;
+    _currentUserId = userId;
+    clear();
+    _currentUserId = userId;
+  }
+
   double getMileageForCurrentYear() {
     final currentYear = DateTime.now().year;
     return getMileageForYear(currentYear) ?? 0;

lib/services/data_service/data_service_notifications.dart

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

lib/ui/app_shell.dart

@@ -4,17 +4,16 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/components/login/login.dart';
-import 'package:mileograph_flutter/components/pages/calculator.dart';
-import 'package:mileograph_flutter/components/pages/calculator_details.dart';
 import 'package:mileograph_flutter/components/pages/dashboard.dart';
-import 'package:mileograph_flutter/components/pages/legs.dart';
 import 'package:mileograph_flutter/components/pages/loco_legs.dart';
 import 'package:mileograph_flutter/components/pages/loco_timeline.dart';
+import 'package:mileograph_flutter/components/pages/logbook.dart';
+import 'package:mileograph_flutter/components/pages/more.dart';
 import 'package:mileograph_flutter/components/pages/new_entry.dart';
 import 'package:mileograph_flutter/components/pages/new_traction.dart';
+import 'package:mileograph_flutter/components/pages/profile.dart';
 import 'package:mileograph_flutter/components/pages/settings.dart';
 import 'package:mileograph_flutter/components/pages/traction.dart';
-import 'package:mileograph_flutter/components/pages/trips.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:mileograph_flutter/services/navigation_guard.dart';
@@ -23,15 +22,22 @@ import 'package:provider/provider.dart';
 final GlobalKey<NavigatorState> _shellNavigatorKey = GlobalKey<NavigatorState>();
 
 const List<String> _contentPages = [
-  "/",
+  "/dashboard",
-  "/calculator",
+  "/logbook",
-  "/legs",
   "/traction",
-  "/trips",
   "/add",
+  "/more",
 ];
 
-const int _addTabIndex = 5;
+const List<String> _defaultTabDestinations = [
+  "/dashboard",
+  "/logbook/entries",
+  "/traction",
+  "/add",
+  "/more",
+];
+
+const int _addTabIndex = 3;
 
 class _NavItem {
   final String label;
@@ -41,19 +47,32 @@ class _NavItem {
 
 const List<_NavItem> _navItems = [
   _NavItem("Home", Icons.home),
-  _NavItem("Calculator", Icons.route),
+  _NavItem("Logbook", Icons.menu_book),
-  _NavItem("Entries", Icons.list),
   _NavItem("Traction", Icons.train),
-  _NavItem("Trips", Icons.book),
   _NavItem("Add", Icons.add),
+  _NavItem("More", Icons.more_horiz),
 ];
 
 int tabIndexForPath(String path) {
-  final newIndex = _contentPages.indexWhere((routePath) {
+  var matchPath = path;
-    if (path == routePath) return true;
+  if (matchPath == '/') matchPath = '/dashboard';
-    if (routePath == '/') return path == '/';
+  if (matchPath.startsWith('/dashboard')) return 0;
-    return path.startsWith('$routePath/');
+  if (matchPath.startsWith('/legs')) {
-  });
+    matchPath = '/logbook/entries';
+  } else if (matchPath.startsWith('/trips')) {
+    matchPath = '/logbook/trips';
+  }
+  if (matchPath.startsWith('/logbook')) {
+    matchPath = '/logbook';
+  } else if (matchPath.startsWith('/profile') ||
+      matchPath.startsWith('/settings') ||
+      matchPath.startsWith('/more')) {
+    matchPath = '/more';
+  }
+  final newIndex = _contentPages.indexWhere(
+    (routePath) =>
+        matchPath == routePath || matchPath.startsWith('$routePath/'),
+  );
   return newIndex < 0 ? 0 : newIndex;
 }
 
@@ -81,6 +100,7 @@ class _MyAppState extends State<MyApp> {
     _routerInitialized = true;
     final auth = context.read<AuthService>();
     _router = GoRouter(
+      initialLocation: '/dashboard',
       refreshListenable: auth,
       redirect: (context, state) {
         final loggedIn = auth.isLoggedIn;
@@ -88,29 +108,51 @@ class _MyAppState extends State<MyApp> {
         final atSettings = state.uri.toString() == '/settings';
 
         if (!loggedIn && !loggingIn && !atSettings) return '/login';
-        if (loggedIn && loggingIn) return '/';
+        if (loggedIn && loggingIn) return '/dashboard';
         return null;
       },
       routes: [
+        GoRoute(
+          path: '/',
+          redirect: (context, state) => '/dashboard',
+        ),
         ShellRoute(
           navigatorKey: _shellNavigatorKey,
           builder: (context, state, child) => MyHomePage(child: child),
           routes: [
-            GoRoute(path: '/', builder: (context, state) => const Dashboard()),
             GoRoute(
-              path: '/calculator',
+              path: '/dashboard',
-              builder: (context, state) => CalculatorPage(),
+              builder: (context, state) => const Dashboard(),
             ),
             GoRoute(
-              path: '/calculator/details',
+              path: '/logbook',
+              redirect: (context, state) => '/logbook/entries',
+            ),
+            GoRoute(
+              path: '/logbook/entries',
+              builder: (context, state) => const LogbookPage(),
+            ),
+            GoRoute(
+              path: '/logbook/trips',
               builder: (context, state) =>
-                  CalculatorDetailsPage(result: state.extra),
+                  const LogbookPage(initialTab: LogbookTab.trips),
+            ),
+            GoRoute(
+              path: '/trips',
+              redirect: (context, state) => '/logbook/trips',
+            ),
+            GoRoute(
+              path: '/legs',
+              redirect: (context, state) => '/logbook/entries',
             ),
-            GoRoute(path: '/legs', builder: (context, state) => LegsPage()),
             GoRoute(
               path: '/traction',
               builder: (context, state) => TractionPage(),
             ),
+            GoRoute(
+              path: '/profile',
+              builder: (context, state) => const ProfilePage(),
+            ),
             GoRoute(
               path: '/traction/:id/timeline',
               builder: (_, state) {
@@ -147,8 +189,19 @@ class _MyAppState extends State<MyApp> {
               path: '/traction/new',
               builder: (context, state) => const NewTractionPage(),
             ),
-            GoRoute(path: '/trips', builder: (context, state) => TripsPage()),
             GoRoute(path: '/add', builder: (context, state) => NewEntryPage()),
+            GoRoute(
+              path: '/more',
+              builder: (context, state) => const MorePage(),
+            ),
+            GoRoute(
+              path: '/more/profile',
+              builder: (context, state) => const ProfilePage(),
+            ),
+            GoRoute(
+              path: '/more/settings',
+              builder: (context, state) => const SettingsPage(),
+            ),
             GoRoute(
               path: '/legs/edit/:id',
               builder: (_, state) {
@@ -207,24 +260,31 @@ class MyHomePage extends StatefulWidget {
 }
 
 class _MyHomePageState extends State<MyHomePage> {
-  List<String> get contentPages => _contentPages;
+  List<String> get tabDestinations => _defaultTabDestinations;
 
   Future<void> _onItemTapped(int index, int currentIndex) async {
-    if (index < 0 || index >= contentPages.length || index == currentIndex) {
+    if (index < 0 || index >= tabDestinations.length) {
       return;
     }
+    final currentPath = GoRouterState.of(context).uri.path;
+    final targetPath = tabDestinations[index];
+    final alreadyAtTarget =
+        currentPath == targetPath || currentPath.startsWith('$targetPath/');
+    if (index == currentIndex && alreadyAtTarget) return;
+
     await NavigationGuard.attemptNavigation(() async {
       if (!mounted) return;
       _navigateToIndex(index);
     });
   }
 
-  final List<int> _history = [];
+  final List<String> _history = [];
   int _historyPosition = -1;
-  final List<int> _forwardHistory = [];
+  final List<String> _forwardHistory = [];
   bool _suppressRecord = false;
 
   bool _fetched = false;
+  bool _railCollapsed = false;
 
   @override
   void didChangeDependencies() {
@@ -258,6 +318,9 @@ class _MyHomePageState extends State<MyHomePage> {
         if (data.tripDetails.isEmpty) {
           data.fetchTripDetails();
         }
+        if (data.notifications.isEmpty) {
+          data.fetchNotifications();
+        }
       });
     });
   }
@@ -266,13 +329,14 @@ class _MyHomePageState extends State<MyHomePage> {
   Widget build(BuildContext context) {
     final uri = GoRouterState.of(context).uri;
     final pageIndex = tabIndexForPath(uri.path);
-    _syncHistory(pageIndex);
+    _syncHistory(uri.path);
     if (pageIndex != _addTabIndex) {
       NavigationGuard.unregister();
     }
     final homepageReady = context.select<DataService, bool>(
       (data) => data.homepageStats != null || !data.isHomepageLoading,
     );
+    final data = context.watch<DataService>();
     final auth = context.read<AuthService>();
 
     final currentPage = homepageReady
@@ -282,7 +346,9 @@ class _MyHomePageState extends State<MyHomePage> {
     final scaffold = LayoutBuilder(
       builder: (context, constraints) {
         final isWide = constraints.maxWidth >= 900;
-        final railExtended = constraints.maxWidth >= 1400;
+        final defaultRailExtended = constraints.maxWidth >= 1400;
+        final railExtended = defaultRailExtended && !_railCollapsed;
+        final showRailToggle = defaultRailExtended;
         final navRailDestinations = _navItems
             .map(
               (item) => NavigationRailDestination(
@@ -318,13 +384,10 @@ class _MyHomePageState extends State<MyHomePage> {
               ),
             ),
             actions: [
-              const IconButton(
+              _buildNotificationAction(context, data),
-                onPressed: null,
-                icon: Icon(Icons.account_circle),
-              ),
               IconButton(
                 tooltip: 'Settings',
-                onPressed: () => context.go('/settings'),
+                onPressed: () => context.go('/more/settings'),
                 icon: const Icon(Icons.settings),
               ),
               IconButton(onPressed: auth.logout, icon: const Icon(Icons.logout)),
@@ -342,15 +405,35 @@ class _MyHomePageState extends State<MyHomePage> {
               ? Row(
                   children: [
                     SafeArea(
-                      child: NavigationRail(
+                      child: LayoutBuilder(
-                        selectedIndex: pageIndex,
+                        builder: (ctx, _) {
-                        extended: railExtended,
+                          return Stack(
-                        labelType: railExtended
+                            children: [
-                            ? NavigationRailLabelType.none
+                              Padding(
-                            : NavigationRailLabelType.selected,
+                                padding: EdgeInsets.only(
-                        onDestinationSelected: (int index) =>
+                                  bottom: showRailToggle ? 56.0 : 0.0,
-                            _onItemTapped(index, pageIndex),
+                                ),
-                        destinations: navRailDestinations,
+                                child: NavigationRail(
+                                  selectedIndex: pageIndex,
+                                  extended: railExtended,
+                                  labelType: railExtended
+                                      ? NavigationRailLabelType.none
+                                      : NavigationRailLabelType.selected,
+                                  onDestinationSelected: (int index) =>
+                                      _onItemTapped(index, pageIndex),
+                                  destinations: navRailDestinations,
+                                ),
+                              ),
+                              if (showRailToggle)
+                                Positioned(
+                                  left: 0,
+                                  right: 0,
+                                  bottom: 8,
+                                  child: _buildRailToggleButton(railExtended),
+                                ),
+                            ],
+                          );
+                        },
                       ),
                     ),
                     const VerticalDivider(width: 1),
@@ -410,31 +493,305 @@ class _MyHomePageState extends State<MyHomePage> {
     }
   }
 
-  int get _currentPageIndex => tabIndexForPath(GoRouterState.of(context).uri.path);
+  Widget _buildRailToggleButton(bool railExtended) {
+    final collapseIcon = railExtended ? Icons.chevron_left : Icons.chevron_right;
+    final collapseLabel = railExtended ? 'Collapse' : 'Expand';
+
+    if (railExtended) {
+      return Padding(
+        padding: const EdgeInsets.symmetric(vertical: 8.0),
+        child: TextButton.icon(
+          onPressed: () => setState(() => _railCollapsed = !_railCollapsed),
+          icon: Icon(collapseIcon),
+          label: Text(collapseLabel),
+        ),
+      );
+    }
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8.0),
+      child: IconButton(
+        icon: Icon(collapseIcon),
+        tooltip: collapseLabel,
+        onPressed: () => setState(() => _railCollapsed = !_railCollapsed),
+      ),
+    );
+  }
+
+  Widget _buildNotificationAction(BuildContext context, DataService data) {
+    final count = data.notifications.length;
+    final hasBadge = count > 0;
+    final badgeText = count > 9 ? '9+' : '$count';
+    final isLoading = data.isNotificationsLoading;
+
+    return Stack(
+      clipBehavior: Clip.none,
+      children: [
+        IconButton(
+          tooltip: 'Notifications',
+          onPressed: () => _openNotificationsPanel(context),
+          icon: isLoading
+              ? const SizedBox(
+                  width: 22,
+                  height: 22,
+                  child: CircularProgressIndicator(strokeWidth: 2),
+                )
+              : const Icon(Icons.notifications_none),
+        ),
+        if (hasBadge)
+          Positioned(
+            right: 6,
+            top: 8,
+            child: IgnorePointer(child: _buildBadge(badgeText)),
+          ),
+      ],
+    );
+  }
+
+  Future<void> _openNotificationsPanel(BuildContext context) async {
+    final data = context.read<DataService>();
+    final isWide = MediaQuery.sizeOf(context).width >= 900;
+    final sheetHeight = MediaQuery.sizeOf(context).height * 0.9;
+    try {
+      await data.fetchNotifications();
+    } catch (_) {
+      // Already logged inside data service.
+    }
+    if (!context.mounted) return;
+
+    if (isWide) {
+      await showDialog(
+        context: context,
+        builder: (dialogCtx) => Dialog(
+          insetPadding: const EdgeInsets.all(16),
+          child: _buildNotificationsContent(dialogCtx, isWide),
+        ),
+      );
+    } else {
+      await showModalBottomSheet(
+        context: context,
+        isScrollControlled: true,
+        builder: (sheetCtx) {
+          return SizedBox(
+            height: sheetHeight,
+            child: SafeArea(
+              child: _buildNotificationsContent(sheetCtx, isWide),
+            ),
+          );
+        },
+      );
+    }
+  }
+
+  Widget _buildNotificationsContent(BuildContext context, bool isWide) {
+    final data = context.watch<DataService>();
+    final notifications = data.notifications;
+    final loading = data.isNotificationsLoading;
+    final listHeight =
+        isWide ? 380.0 : MediaQuery.of(context).size.height * 0.6;
+
+    Widget body;
+    if (loading && notifications.isEmpty) {
+      body = const Center(
+        child: Padding(
+          padding: EdgeInsets.symmetric(vertical: 24.0),
+          child: CircularProgressIndicator(),
+        ),
+      );
+    } else if (notifications.isEmpty) {
+      body = const Padding(
+        padding: EdgeInsets.symmetric(vertical: 12.0),
+        child: Text('No notifications right now.'),
+      );
+    } else {
+      body = SizedBox(
+        height: listHeight,
+        child: ListView.separated(
+          itemCount: notifications.length,
+          separatorBuilder: (_, index) => const SizedBox(height: 8),
+          itemBuilder: (ctx, index) {
+            final item = notifications[index];
+            return Card(
+              child: Padding(
+                padding: const EdgeInsets.all(12.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Expanded(
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(
+                                item.title.isNotEmpty
+                                    ? item.title
+                                    : 'Notification',
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .titleMedium
+                                    ?.copyWith(fontWeight: FontWeight.w700),
+                              ),
+                              const SizedBox(height: 4),
+                              Text(
+                                item.body,
+                                style: Theme.of(context).textTheme.bodyMedium,
+                              ),
+                              if (item.createdAt != null) ...[
+                                const SizedBox(height: 6),
+                                Text(
+                                  _formatNotificationTime(item.createdAt!),
+                                  style: Theme.of(context)
+                                      .textTheme
+                                      .bodySmall
+                                      ?.copyWith(
+                                        color: () {
+                                          final baseColor = Theme.of(context)
+                                              .textTheme
+                                              .bodySmall
+                                              ?.color;
+                                          if (baseColor == null) return null;
+                                          final newAlpha =
+                                              (baseColor.a * 0.7).clamp(0.0, 1.0);
+                                          return baseColor.withValues(
+                                            alpha: newAlpha,
+                                          );
+                                        }(),
+                                      ),
+                                ),
+                              ],
+                            ],
+                          ),
+                        ),
+                        const SizedBox(width: 8),
+                        TextButton(
+                          onPressed: () => _dismissNotifications(
+                            context,
+                            [item.id],
+                          ),
+                          child: const Text('Dismiss'),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        ),
+      );
+    }
+
+    return SizedBox(
+      width: isWide ? 420 : double.infinity,
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Text(
+                  'Notifications',
+                  style: Theme.of(context)
+                      .textTheme
+                      .titleLarge
+                      ?.copyWith(fontWeight: FontWeight.bold),
+                ),
+                const Spacer(),
+                TextButton(
+                  onPressed: notifications.isEmpty
+                      ? null
+                      : () => _dismissNotifications(
+                            context,
+                            notifications.map((e) => e.id).toList(),
+                          ),
+                  child: const Text('Dismiss all'),
+                ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            body,
+          ],
+        ),
+      ),
+    );
+  }
+
+  Future<void> _dismissNotifications(
+    BuildContext context,
+    List<int> ids,
+  ) async {
+    if (ids.isEmpty) return;
+    final messenger = ScaffoldMessenger.maybeOf(context);
+    try {
+      await context.read<DataService>().dismissNotifications(ids);
+    } catch (e) {
+      messenger?.showSnackBar(
+        SnackBar(content: Text('Failed to dismiss: $e')),
+      );
+    }
+  }
+
+  String _formatNotificationTime(DateTime dateTime) {
+    final y = dateTime.year.toString().padLeft(4, '0');
+    final m = dateTime.month.toString().padLeft(2, '0');
+    final d = dateTime.day.toString().padLeft(2, '0');
+    final hh = dateTime.hour.toString().padLeft(2, '0');
+    final mm = dateTime.minute.toString().padLeft(2, '0');
+    return '$y-$m-$d $hh:$mm';
+  }
+
+  Widget _buildBadge(String label) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+      decoration: BoxDecoration(
+        color: Colors.redAccent,
+        borderRadius: BorderRadius.circular(10),
+      ),
+      constraints: const BoxConstraints(
+        minWidth: 20,
+      ),
+      child: Text(
+        label,
+        style: const TextStyle(
+          color: Colors.white,
+          fontSize: 11,
+          fontWeight: FontWeight.bold,
+        ),
+        textAlign: TextAlign.center,
+      ),
+    );
+  }
 
   Future<bool> _handleBackNavigation({
     bool allowExit = false,
     bool recordForward = false,
   }) async {
-    final pageIndex = _currentPageIndex;
+    final currentPath = GoRouterState.of(context).uri.path;
     final shellNav = _shellNavigatorKey.currentState;
     if (shellNav != null && shellNav.canPop()) {
+      if (recordForward) _pushForward(currentPath);
+      _alignHistoryAfterPop(currentPath);
       shellNav.pop();
       return true;
     }
 
     if (_historyPosition > 0) {
-      if (recordForward) _pushForward(pageIndex);
+      if (recordForward) _pushForward(currentPath);
       _historyPosition -= 1;
       _suppressRecord = true;
-      context.go(contentPages[_history[_historyPosition]]);
+      context.go(_history[_historyPosition]);
       return true;
     }
 
-    if (pageIndex != 0) {
+    final homePath = tabDestinations.first;
-      if (recordForward) _pushForward(pageIndex);
+    if (currentPath != homePath) {
+      if (recordForward) _pushForward(currentPath);
       _suppressRecord = true;
-      context.go(contentPages[0]);
+      context.go(homePath);
       return true;
     }
 
@@ -448,35 +805,48 @@ class _MyHomePageState extends State<MyHomePage> {
 
   Future<bool> _handleForwardNavigation() async {
     if (_forwardHistory.isEmpty) return false;
-    final nextTab = _forwardHistory.removeLast();
+    final nextPath = _forwardHistory.removeLast();
 
     // Move cursor forward, keeping history in sync.
     if (_historyPosition < _history.length - 1) {
       _historyPosition += 1;
-      _history[_historyPosition] = nextTab;
+      _history[_historyPosition] = nextPath;
       if (_historyPosition < _history.length - 1) {
         _history.removeRange(_historyPosition + 1, _history.length);
       }
     } else {
-      _history.add(nextTab);
+      _history.add(nextPath);
       _historyPosition = _history.length - 1;
     }
 
     _suppressRecord = true;
     if (!mounted) return false;
-    context.go(contentPages[nextTab]);
+    context.go(nextPath);
     return true;
   }
 
-  void _pushForward(int pageIndex) {
+  void _pushForward(String path) {
-    if (_forwardHistory.isEmpty || _forwardHistory.last != pageIndex) {
+    if (_forwardHistory.isEmpty || _forwardHistory.last != path) {
-      _forwardHistory.add(pageIndex);
+      _forwardHistory.add(path);
     }
   }
 
-  void _syncHistory(int pageIndex) {
+  void _alignHistoryAfterPop(String currentPath) {
+    if (_history.isEmpty) return;
+    if (_historyPosition >= 0 &&
+        _historyPosition < _history.length &&
+        _history[_historyPosition] == currentPath) {
+      if (_historyPosition > 0) {
+        _historyPosition -= 1;
+      }
+      _history.removeRange(_historyPosition + 1, _history.length);
+      _suppressRecord = true;
+    }
+  }
+
+  void _syncHistory(String path) {
     if (_history.isEmpty) {
-      _history.add(pageIndex);
+      _history.add(path);
       _historyPosition = 0;
       return;
     }
@@ -486,13 +856,13 @@ class _MyHomePageState extends State<MyHomePage> {
     }
     if (_historyPosition >= 0 &&
         _historyPosition < _history.length &&
-        _history[_historyPosition] == pageIndex) {
+        _history[_historyPosition] == path) {
       return;
     }
     if (_historyPosition < _history.length - 1) {
       _history.removeRange(_historyPosition + 1, _history.length);
     }
-    _history.add(pageIndex);
+    _history.add(path);
     _historyPosition = _history.length - 1;
     _forwardHistory.clear();
   }
@@ -500,6 +870,6 @@ class _MyHomePageState extends State<MyHomePage> {
   void _navigateToIndex(int index) {
     _suppressRecord = false;
     _forwardHistory.clear();
-    context.go(contentPages[index]);
+    context.go(tabDestinations[index]);
   }
 }

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.3.4+1
+version: 0.4.3+1
 
 environment:
   sdk: ^3.8.1