Add accent colour picker, fix empty user card when accepting friend request, add button to transfer allocations

.gitea/workflows/dev.yml

@@ -0,0 +1,411 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - dev-other
+
+env:
+  JAVA_VERSION: "17"
+  ANDROID_SDK_ROOT: "${{ github.workspace }}/android-sdk"
+  FLUTTER_VERSION: "3.38.5"
+  BUILD_WINDOWS: "false" # Windows build disabled (no runner available)
+  GITEA_BASE_URL: https://git.tgj.services
+  WEB_IMAGE: "git.tgj.services/petegregoryy/mileograph-web"
+  REGISTRY: git.tgj.services
+
+jobs:
+  meta:
+    runs-on:
+      - tgj-arc
+    outputs:
+      base_version: ${{ steps.meta.outputs.base }}
+      release_tag: ${{ steps.meta.outputs.release_tag }}
+      dev_suffix: ${{ steps.meta.outputs.dev_suffix }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Determine version
+        id: meta
+        run: |
+          RAW_VERSION=$(awk '/^version:/{print $2}' pubspec.yaml)
+          BASE_VERSION=${RAW_VERSION%%+*}
+          VERSION="${BASE_VERSION}"
+          TAG="v${VERSION}"
+          DEV_SUFFIX=""
+
+          if [ "${GITHUB_REF}" = "refs/heads/dev" ]; then
+            DEV_ITER="${GITHUB_RUN_NUMBER:-}"
+            if [ -z "$DEV_ITER" ]; then
+              DEV_ITER=$(git rev-list --count HEAD)
+            fi
+
+            DEV_SUFFIX="-dev.${DEV_ITER}"
+            VERSION="${BASE_VERSION}${DEV_SUFFIX}"
+            TAG="v${VERSION}"
+          fi
+
+          echo "base=${BASE_VERSION}" >> "$GITHUB_OUTPUT"
+          echo "release_tag=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "dev_suffix=${DEV_SUFFIX}" >> "$GITHUB_OUTPUT"
+
+      - name: Fail if release already exists
+        env:
+          TAG: ${{ steps.meta.outputs.release_tag }}
+        run: |
+          set -euo pipefail
+
+          if ! command -v curl >/dev/null 2>&1; then
+            if command -v sudo >/dev/null 2>&1; then
+              SUDO="sudo"
+            else
+              SUDO=""
+            fi
+            $SUDO apt-get update
+            $SUDO apt-get install -y curl ca-certificates
+          fi
+
+          URL="${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/tags/${TAG}"
+          CODE="$(curl -sS -o /dev/null -w "%{http_code}" -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" "$URL" || true)"
+
+          if [ "$CODE" = "200" ]; then
+            echo "Release already exists for tag ${TAG}; refusing to re-release."
+            exit 1
+          fi
+          if [ "$CODE" != "404" ]; then
+            echo "Unexpected response checking existing release (${CODE}) at ${URL}"
+            exit 1
+          fi
+
+  android-build:
+    runs-on:
+      - tgj-arc
+    needs: meta
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      #
+      #      - name: Install OS deps (Android)
+      #        run: |
+      #          if command -v sudo >/dev/null 2>&1; then
+      #            SUDO="sudo"
+      #          else
+      #            SUDO=""
+      #          fi
+      #          $SUDO apt-get update
+      #          $SUDO apt-get install -y unzip xz-utils zip libstdc++6 liblzma-dev curl jq
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: ${{ env.JAVA_VERSION }}
+
+      - name: Install Android SDK
+        run: |
+          mkdir -p "$ANDROID_SDK_ROOT"/cmdline-tools
+          curl -fsSL https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -o /tmp/cli-tools.zip
+          unzip -q /tmp/cli-tools.zip -d "$ANDROID_SDK_ROOT"/cmdline-tools
+          mv "$ANDROID_SDK_ROOT"/cmdline-tools/cmdline-tools "$ANDROID_SDK_ROOT"/cmdline-tools/latest
+
+          # Accept licences (ignore SIGPIPE exit 141)
+          yes | "$ANDROID_SDK_ROOT"/cmdline-tools/latest/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" --licenses || true
+
+          # Install required packages (also ignore SIGPIPE)
+          yes | "$ANDROID_SDK_ROOT"/cmdline-tools/latest/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" \
+            "platform-tools" "platforms;android-33" "build-tools;33.0.2" || true
+
+          echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> "$GITHUB_ENV"
+          echo "$ANDROID_SDK_ROOT/platform-tools" >> "$GITHUB_PATH"
+          echo "$ANDROID_SDK_ROOT/build-tools/33.0.2" >> "$GITHUB_PATH"
+
+      #      - name: Install Flutter SDK
+      #        run: |
+      #          set -euo pipefail
+      #          FLUTTER_HOME="$HOME/flutter"
+      #          # Avoid git ownership issues when Flutter checks out deps.
+      #          git config --global --add safe.directory "$FLUTTER_HOME" || true
+      #          if [ ! -x "$FLUTTER_HOME/bin/flutter" ]; then
+      #            rm -rf "$FLUTTER_HOME"
+      #            curl -fsSL -o /tmp/flutter.tar.xz "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz"
+      #            tar -C "$HOME" -xf /tmp/flutter.tar.xz
+      #          fi
+      #          echo "$FLUTTER_HOME/bin" >> "$GITHUB_PATH"
+      #          "$FLUTTER_HOME/bin/flutter" --version
+
+      - name: Allow all git directories (CI)
+        run: git config --global --add safe.directory '*'
+
+      - name: Set pub cache path
+        run: echo "PUB_CACHE=${GITHUB_WORKSPACE}/.pub-cache" >> "$GITHUB_ENV"
+
+      - name: Flutter dependencies
+        run: flutter pub get
+
+      - name: Prepare Android keystore (optional)
+        if: ${{ secrets.ANDROID_KEYSTORE_BASE64 != '' }}
+        run: |
+          echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d > android-release-key.jks
+          echo "ANDROID_KEYSTORE_PATH=$PWD/android-release-key.jks" >> "$GITHUB_ENV"
+          echo "ANDROID_KEYSTORE_PASSWORD=${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" >> "$GITHUB_ENV"
+          echo "ANDROID_KEY_ALIAS=${{ secrets.ANDROID_KEY_ALIAS }}" >> "$GITHUB_ENV"
+          echo "ANDROID_KEY_PASSWORD=${{ secrets.ANDROID_KEY_PASSWORD }}" >> "$GITHUB_ENV"
+
+      - name: Build Android App Bundle (release)
+        run: flutter build appbundle --release
+
+      - name: Archive Android App Bundle
+        env:
+          BASE_VERSION: ${{ needs.meta.outputs.base_version }}
+        run: |
+          set -euo pipefail
+          BUNDLE_SRC="build/app/outputs/bundle/release/app-release.aab"
+          if [ ! -f "$BUNDLE_SRC" ]; then
+            echo "Bundle not found at $BUNDLE_SRC"
+            exit 1
+          fi
+          cp "$BUNDLE_SRC" "mileograph-${BASE_VERSION}.aab"
+
+      - name: Download bundletool
+        run: |
+          BUNDLETOOL_VERSION=1.15.6
+          curl -fsSL -o bundletool.jar "https://github.com/google/bundletool/releases/download/${BUNDLETOOL_VERSION}/bundletool-all-${BUNDLETOOL_VERSION}.jar"
+
+      - name: Extract universal APK from bundle
+        env:
+          BASE_VERSION: ${{ needs.meta.outputs.base_version }}
+        run: |
+          set -euo pipefail
+
+          BUNDLE="build/app/outputs/bundle/release/app-release.aab"
+          OUTPUT_APKS="app-release.apks"
+          APK_NAME="mileograph-${BASE_VERSION}.apk"
+
+          if [ ! -f "$BUNDLE" ]; then
+            echo "Bundle not found at $BUNDLE"
+            exit 1
+          fi
+
+          SIGNING_ARGS=()
+          if [ -n "${ANDROID_KEYSTORE_PATH:-}" ] && [ -f "$ANDROID_KEYSTORE_PATH" ]; then
+            SIGNING_ARGS+=(--ks="$ANDROID_KEYSTORE_PATH")
+            SIGNING_ARGS+=(--ks-pass="pass:${ANDROID_KEYSTORE_PASSWORD}")
+            SIGNING_ARGS+=(--ks-key-alias="${ANDROID_KEY_ALIAS}")
+            KEY_PASS="${ANDROID_KEY_PASSWORD:-$ANDROID_KEYSTORE_PASSWORD}"
+            SIGNING_ARGS+=(--key-pass="pass:${KEY_PASS}")
+          else
+            echo "No release keystore provided; bundletool will sign with the debug keystore."
+          fi
+
+          java -jar bundletool.jar build-apks \
+            --bundle="$BUNDLE" \
+            --output="$OUTPUT_APKS" \
+            --mode=universal \
+            "${SIGNING_ARGS[@]}"
+
+          unzip -p "$OUTPUT_APKS" universal.apk > "$APK_NAME"
+          ls -lh "$APK_NAME"
+
+      - name: Upload Android APK artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: android-apk
+          path: mileograph-${{ needs.meta.outputs.base_version }}.apk
+
+      - name: Upload Android AAB artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: android-aab
+          path: mileograph-${{ needs.meta.outputs.base_version }}.aab
+
+  linux-build:
+    runs-on:
+      - tgj-arc
+    needs: meta
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Allow all git directories (CI)
+        run: git config --global --add safe.directory '*'
+
+      - name: Set pub cache path
+        run: echo "PUB_CACHE=${GITHUB_WORKSPACE}/.pub-cache" >> "$GITHUB_ENV"
+
+      - name: Flutter dependencies
+        run: flutter pub get
+
+      - name: Enable Linux desktop
+        run: flutter config --enable-linux-desktop
+
+      - name: Build Linux binary (release)
+        run: |
+          flutter build linux --release
+          tar -C build/linux/x64/release/bundle -czf app-linux-x64.tar.gz .
+
+      - name: Upload Linux artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: linux-bundle
+          path: app-linux-x64.tar.gz
+
+  web-build:
+    runs-on:
+      - tgj-arc
+    needs: meta
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Allow all git directories (CI)
+        run: git config --global --add safe.directory '*'
+
+      - name: Set pub cache path
+        run: echo "PUB_CACHE=${GITHUB_WORKSPACE}/.pub-cache" >> "$GITHUB_ENV"
+
+      - name: Flutter dependencies
+        run: flutter pub get
+
+      - name: Enable Flutter web
+        run: flutter config --enable-web
+
+      - name: Build Flutter web (release)
+        run: |
+          flutter build web --release --base-href=/
+          tar -C build/web -czf app-web.tar.gz .
+
+      - name: Upload Web artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: web-build
+          path: app-web.tar.gz
+
+      - name: Set up docker buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: dmeta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/petegregoryy/railframe-web
+          flavor: latest=false
+          tags: |
+            type=sha,prefix=
+            type=raw,value=${{ needs.meta.outputs.base_version }}${{ needs.meta.outputs.dev_suffix }}
+
+      - name: Login to the docker registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: petegregoryy
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v6
+        with:
+          file: Dockerfile.web
+          context: .
+          push: true
+          tags: ${{ steps.dmeta.outputs.tags }}
+          labels: ${{ steps.dmeta.outputs.labels }}
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/petegregoryy/railframe-web:buildcache-dev
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/petegregoryy/railframe-web:buildcache-dev,mode=max
+
+  release-dev:
+    runs-on:
+      - tgj-arc
+    needs:
+      - meta
+      - android-build
+      - linux-build
+      - web-build
+    steps:
+      - name: Download Android APK
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        uses: actions/download-artifact@v3
+        with:
+          name: android-apk
+          path: artifacts
+
+      - name: Download Android AAB
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        uses: actions/download-artifact@v3
+        with:
+          name: android-aab
+          path: artifacts
+
+      - name: Prepare APK and tag
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        id: bundle
+        run: |
+          BASE="${{ needs.meta.outputs.base_version }}"
+          TAG="${{ needs.meta.outputs.release_tag }}"
+          DEV_SUFFIX="${{ needs.meta.outputs.dev_suffix }}"
+          if [ -z "$DEV_SUFFIX" ]; then
+            echo "dev_suffix is empty; expected '-dev.<n>'"
+            exit 1
+          fi
+
+          VERSION="${BASE}${DEV_SUFFIX}"
+          APK_NAME="mileograph-${VERSION}.apk"
+          AAB_NAME="mileograph-${VERSION}.aab"
+
+          mv "artifacts/mileograph-${BASE}.apk" "artifacts/${APK_NAME}"
+          mv "artifacts/mileograph-${BASE}.aab" "artifacts/${AAB_NAME}"
+
+          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "apk=artifacts/${APK_NAME}" >> "$GITHUB_OUTPUT"
+          echo "aab=artifacts/${AAB_NAME}" >> "$GITHUB_OUTPUT"
+
+      - name: Create prerelease on Gitea
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ steps.bundle.outputs.tag }}
+          name: ${{ steps.bundle.outputs.tag }}
+          prerelease: true
+          commit: ${{ github.sha }}
+          token: ${{ secrets.GITEA_TOKEN }}
+          # NOTE: no `artifacts:` here
+
+      - name: Attach APK to Gitea release
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        run: |
+          set -euo pipefail
+
+          TAG="${{ steps.bundle.outputs.tag }}"
+          APK="${{ steps.bundle.outputs.apk }}"
+
+          # 1. Find release ID by tag
+          RELEASE_JSON=$(curl -sS \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/tags/${TAG}")
+
+          RELEASE_ID=$(echo "$RELEASE_JSON" | jq -r '.id')
+
+          echo "Release ID: $RELEASE_ID"
+
+          # 2. Upload APK with multipart/form-data
+          NAME=$(basename "$APK")
+          echo "Uploading $NAME"
+
+          curl -sS -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -F "attachment=@${APK}" \
+            -F "name=${NAME}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
+            >/dev/null
+
+          # Attach AAB
+          AAB="${{ steps.bundle.outputs.aab }}"
+          NAME_AAB=$(basename "$AAB")
+          echo "Uploading $NAME_AAB"
+
+          curl -sS -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -F "attachment=@${AAB}" \
+            -F "name=${NAME_AAB}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
+            >/dev/null

.gitea/workflows/release.yml

@@ -10,8 +10,10 @@ env:
   JAVA_VERSION: "17"
   ANDROID_SDK_ROOT: "${{ github.workspace }}/android-sdk"
   FLUTTER_VERSION: "3.38.5"
-  BUILD_WINDOWS: "false" # set to "true" when you actually want Windows builds
+  BUILD_WINDOWS: "false" # Windows build disabled (no runner available)
   GITEA_BASE_URL: https://git.tgj.services
+  WEB_IMAGE: "git.tgj.services/petegregoryy/mileograph-web"
+  REGISTRY: git.tgj.services
 
 jobs:
   meta:
@@ -20,6 +22,7 @@ jobs:
     outputs:
       base_version: ${{ steps.meta.outputs.base }}
       release_tag: ${{ steps.meta.outputs.release_tag }}
+      dev_suffix: ${{ steps.meta.outputs.dev_suffix }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -29,12 +32,24 @@ jobs:
         run: |
           RAW_VERSION=$(awk '/^version:/{print $2}' pubspec.yaml)
           BASE_VERSION=${RAW_VERSION%%+*}
-          TAG="v${BASE_VERSION}"
+          VERSION="${BASE_VERSION}"
+          TAG="v${VERSION}"
+          DEV_SUFFIX=""
+
           if [ "${GITHUB_REF}" = "refs/heads/dev" ]; then
-            TAG="v${BASE_VERSION}-dev"
+            DEV_ITER="${GITHUB_RUN_NUMBER:-}"
+            if [ -z "$DEV_ITER" ]; then
+              DEV_ITER=$(git rev-list --count HEAD)
             fi
+
+            DEV_SUFFIX="-dev.${DEV_ITER}"
+            VERSION="${BASE_VERSION}${DEV_SUFFIX}"
+            TAG="${VERSION}"
+          fi
+
           echo "base=${BASE_VERSION}" >> "$GITHUB_OUTPUT"
           echo "release_tag=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "dev_suffix=${DEV_SUFFIX}" >> "$GITHUB_OUTPUT"
 
       - name: Fail if release already exists
         env:
@@ -66,21 +81,21 @@ jobs:
 
   android-build:
     runs-on:
-      - mileograph
+      - tgj-arc
     needs: meta
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
-      - name: Install OS deps (Android)
-        run: |
-          if command -v sudo >/dev/null 2>&1; then
-            SUDO="sudo"
-          else
-            SUDO=""
-          fi
-          $SUDO apt-get update
-          $SUDO apt-get install -y unzip xz-utils zip libstdc++6 liblzma-dev curl jq
+      #
+      #      - name: Install OS deps (Android)
+      #        run: |
+      #          if command -v sudo >/dev/null 2>&1; then
+      #            SUDO="sudo"
+      #          else
+      #            SUDO=""
+      #          fi
+      #          $SUDO apt-get update
+      #          $SUDO apt-get install -y unzip xz-utils zip libstdc++6 liblzma-dev curl jq
 
       - name: Setup Java
         uses: actions/setup-java@v4
@@ -106,17 +121,19 @@ jobs:
           echo "$ANDROID_SDK_ROOT/platform-tools" >> "$GITHUB_PATH"
           echo "$ANDROID_SDK_ROOT/build-tools/33.0.2" >> "$GITHUB_PATH"
 
-      - name: Install Flutter SDK
-        run: |
-          set -euo pipefail
-          FLUTTER_HOME="$HOME/flutter"
-          if [ ! -x "$FLUTTER_HOME/bin/flutter" ]; then
-            rm -rf "$FLUTTER_HOME"
-            curl -fsSL -o /tmp/flutter.tar.xz "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz"
-            tar -C "$HOME" -xf /tmp/flutter.tar.xz
-          fi
-          echo "$FLUTTER_HOME/bin" >> "$GITHUB_PATH"
-          "$FLUTTER_HOME/bin/flutter" --version
+      #      - name: Install Flutter SDK
+      #        run: |
+      #          set -euo pipefail
+      #          FLUTTER_HOME="$HOME/flutter"
+      #          # Avoid git ownership issues when Flutter checks out deps.
+      #          git config --global --add safe.directory "$FLUTTER_HOME" || true
+      #          if [ ! -x "$FLUTTER_HOME/bin/flutter" ]; then
+      #            rm -rf "$FLUTTER_HOME"
+      #            curl -fsSL -o /tmp/flutter.tar.xz "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz"
+      #            tar -C "$HOME" -xf /tmp/flutter.tar.xz
+      #          fi
+      #          echo "$FLUTTER_HOME/bin" >> "$GITHUB_PATH"
+      #          "$FLUTTER_HOME/bin/flutter" --version
 
       - name: Allow all git directories (CI)
         run: git config --global --add safe.directory '*'
@@ -139,6 +156,18 @@ jobs:
       - name: Build Android App Bundle (release)
         run: flutter build appbundle --release
 
+      - name: Archive Android App Bundle
+        env:
+          BASE_VERSION: ${{ needs.meta.outputs.base_version }}
+        run: |
+          set -euo pipefail
+          BUNDLE_SRC="build/app/outputs/bundle/release/app-release.aab"
+          if [ ! -f "$BUNDLE_SRC" ]; then
+            echo "Bundle not found at $BUNDLE_SRC"
+            exit 1
+          fi
+          cp "$BUNDLE_SRC" "mileograph-${BASE_VERSION}.aab"
+
       - name: Download bundletool
         run: |
           BUNDLETOOL_VERSION=1.15.6
@@ -185,36 +214,20 @@ jobs:
           name: android-apk
           path: mileograph-${{ needs.meta.outputs.base_version }}.apk
 
+      - name: Upload Android AAB artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: android-aab
+          path: mileograph-${{ needs.meta.outputs.base_version }}.aab
+
   linux-build:
     runs-on:
-      - mileograph
+      - tgj-arc
     needs: meta
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install OS deps (Linux desktop)
-        run: |
-          if command -v sudo >/dev/null 2>&1; then
-            SUDO="sudo"
-          else
-            SUDO=""
-          fi
-          $SUDO apt-get update
-          $SUDO apt-get install -y unzip xz-utils zip libstdc++6 libglu1-mesa clang cmake ninja-build pkg-config libgtk-3-dev libsecret-1-dev liblzma-dev curl jq
-
-      - name: Install Flutter SDK
-        run: |
-          set -euo pipefail
-          FLUTTER_HOME="$HOME/flutter"
-          if [ ! -x "$FLUTTER_HOME/bin/flutter" ]; then
-            rm -rf "$FLUTTER_HOME"
-            curl -fsSL -o /tmp/flutter.tar.xz "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz"
-            tar -C "$HOME" -xf /tmp/flutter.tar.xz
-          fi
-          echo "$FLUTTER_HOME/bin" >> "$GITHUB_PATH"
-          "$FLUTTER_HOME/bin/flutter" --version
-
       - name: Allow all git directories (CI)
         run: git config --global --add safe.directory '*'
 
@@ -238,6 +251,70 @@ jobs:
           name: linux-bundle
           path: app-linux-x64.tar.gz
 
+  web-build:
+    runs-on:
+      - tgj-arc
+    needs: meta
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Allow all git directories (CI)
+        run: git config --global --add safe.directory '*'
+
+      - name: Set pub cache path
+        run: echo "PUB_CACHE=${GITHUB_WORKSPACE}/.pub-cache" >> "$GITHUB_ENV"
+
+      - name: Flutter dependencies
+        run: flutter pub get
+
+      - name: Enable Flutter web
+        run: flutter config --enable-web
+
+      - name: Build Flutter web (release)
+        run: |
+          flutter build web --release --base-href=/
+          tar -C build/web -czf app-web.tar.gz .
+
+      - name: Upload Web artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: web-build
+          path: app-web.tar.gz
+
+      - name: Set up docker buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: dmeta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/petegregoryy/railframe-web
+          flavor: latest=false
+          tags: |
+            type=sha,prefix=
+            type=raw,value=${{ needs.meta.outputs.base_version }}${{ needs.meta.outputs.dev_suffix }}
+            type=raw,value=dev
+
+      - name: Login to the docker registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: petegregoryy
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v6
+        with:
+          file: Dockerfile.web
+          context: .
+          push: true
+          tags: ${{ steps.dmeta.outputs.tags }}
+          labels: ${{ steps.dmeta.outputs.labels }}
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/petegregoryy/railframe-web:buildcache
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/petegregoryy/railframe-web:buildcache,mode=max
+
   release-dev:
     runs-on:
       - mileograph
@@ -245,6 +322,7 @@ jobs:
       - meta
       - android-build
       - linux-build
+      - web-build
     steps:
       - name: Install jq
         run: |
@@ -262,17 +340,35 @@ jobs:
           name: android-apk
           path: artifacts
 
+      - name: Download Android AAB
+        if: ${{ github.ref == 'refs/heads/dev' }}
+        uses: actions/download-artifact@v3
+        with:
+          name: android-aab
+          path: artifacts
+
       - name: Prepare APK and tag
         if: ${{ github.ref == 'refs/heads/dev' }}
         id: bundle
         run: |
           BASE="${{ needs.meta.outputs.base_version }}"
           TAG="${{ needs.meta.outputs.release_tag }}"
+          DEV_SUFFIX="${{ needs.meta.outputs.dev_suffix }}"
+          if [ -z "$DEV_SUFFIX" ]; then
+            echo "dev_suffix is empty; expected '-dev.<n>'"
+            exit 1
+          fi
 
-          mv "artifacts/mileograph-${BASE}.apk" "artifacts/mileograph-${BASE}-dev.apk"
+          VERSION="${BASE}${DEV_SUFFIX}"
+          APK_NAME="mileograph-${VERSION}.apk"
+          AAB_NAME="mileograph-${VERSION}.aab"
+
+          mv "artifacts/mileograph-${BASE}.apk" "artifacts/${APK_NAME}"
+          mv "artifacts/mileograph-${BASE}.aab" "artifacts/${AAB_NAME}"
 
           echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
-          echo "apk=artifacts/mileograph-${BASE}-dev.apk" >> "$GITHUB_OUTPUT"
+          echo "apk=artifacts/${APK_NAME}" >> "$GITHUB_OUTPUT"
+          echo "aab=artifacts/${AAB_NAME}" >> "$GITHUB_OUTPUT"
 
       - name: Create prerelease on Gitea
         if: ${{ github.ref == 'refs/heads/dev' }}
@@ -313,6 +409,18 @@ jobs:
             "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
             >/dev/null
 
+          # Attach AAB
+          AAB="${{ steps.bundle.outputs.aab }}"
+          NAME_AAB=$(basename "$AAB")
+          echo "Uploading $NAME_AAB"
+
+          curl -sS -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -F "attachment=@${AAB}" \
+            -F "name=${NAME_AAB}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
+            >/dev/null
+
   release-master:
     runs-on:
       - mileograph
@@ -320,6 +428,7 @@ jobs:
       - meta
       - android-build
       - linux-build
+      - web-build
     steps:
       - name: Install jq
         run: |
@@ -337,6 +446,13 @@ jobs:
           name: android-apk
           path: artifacts
 
+      - name: Download Android AAB
+        if: ${{ github.ref == 'refs/heads/master' }}
+        uses: actions/download-artifact@v3
+        with:
+          name: android-aab
+          path: artifacts
+
       - name: Prepare APK and tag
         if: ${{ github.ref == 'refs/heads/master' }}
         id: bundle
@@ -346,6 +462,7 @@ jobs:
 
           echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
           echo "apk=artifacts/mileograph-${BASE}.apk" >> "$GITHUB_OUTPUT"
+          echo "aab=artifacts/mileograph-${BASE}.aab" >> "$GITHUB_OUTPUT"
 
       - name: Create release on Gitea
         if: ${{ github.ref == 'refs/heads/master' }}
@@ -384,3 +501,15 @@ jobs:
             -F "name=${NAME}" \
             "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
             >/dev/null
+
+          # Attach AAB
+          AAB="${{ steps.bundle.outputs.aab }}"
+          NAME_AAB=$(basename "$AAB")
+          echo "Uploading $NAME_AAB"
+
+          curl -sS -X POST \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -F "attachment=@${AAB}" \
+            -F "name=${NAME_AAB}" \
+            "${GITEA_BASE_URL}/api/v1/repos/${{ github.repository }}/releases/${RELEASE_ID}/assets" \
+            >/dev/null

.vscode/settings.json

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

Dockerfile.web

@@ -0,0 +1,10 @@
+FROM nginx:1.27-alpine
+
+# Use a minimal Nginx image to serve the built Flutter web app.
+# Assumes `flutter build web` has already populated build/web/ in the build context.
+COPY deploy/web/nginx.conf /etc/nginx/conf.d/default.conf
+COPY build/web /usr/share/nginx/html
+
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]

README.md

@@ -1,16 +1,74 @@
-# mileograph_flutter
+# Mileograph (Flutter)
 
-A new Flutter project.
+Mileograph is a Flutter client for logging and analysing railway journeys. It lets you record legs, group them into trips, track locomotive mileage, and view stats and leaderboards.
 
-## Getting Started
 
-This project is a starting point for a Flutter application.
+## Features
+- Add and edit journey legs with traction, timings, routes, notes, and delays.
+- Group legs into trips and see mileage totals and traction stats.
+- Browse traction, view loco details, mileage leaderboards, timelines, and legs.
+- Dashboard with homepage stats, “On This Day”, recent traction changes, and trips.
+- Profile badges, class clearance progress, and traction progress.
+- Offline-friendly UI built with Provider, GoRouter, and Material 3 styling.
 
-A few resources to get you started if this is your first Flutter project:
+## Project layout
+- `lib/objects/objects.dart` — shared model classes and helpers.
+- `lib/services/` — API, data loading, auth, endpoints, distance units.
+- `lib/components/` — UI pages and widgets (entries, traction, dashboard, trips, settings, etc.).
+- `assets/` — icons/fonts and other bundled assets.
 
-- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
+## Prerequisites
+- Flutter SDK (3.x or later recommended).
+- Dart SDK (bundled with Flutter).
+- A Mileograph API endpoint (set in Settings within the app).
 
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
+## Setup
+1) Install Flutter: follow https://docs.flutter.dev/get-started/install and ensure `flutter doctor` is green.  
+2) Get dependencies:  
+   ```bash
+   flutter pub get
+   ```
+3) Configure an API endpoint:
+   - Run the app, open Settings, and set the base URL for your Mileograph backend.
+   - The app probes the endpoint for a version string before saving.
+
+## Running
+- Debug (mobile/web depending on your toolchain):  
+  ```bash
+  flutter run
+  ```
+- Release build (example for Android):  
+  ```bash
+  flutter build apk --release
+  ```
+- Web (release + CanvasKit renderer for best performance/icons):  
+  ```bash
+  flutter build web --release --web-renderer canvaskit --tree-shake-icons
+  # or for local profiling:
+  flutter run -d chrome --profile --web-renderer canvaskit
+  ```
+
+## Testing and linting
+- Static analysis: `flutter analyze`
+- Unit/widget tests (if present): `flutter test`
+
+## Contributing
+1) Fork or branch from `main`.  
+2) Make changes with clear, small commits.  
+3) Add tests where feasible and keep `flutter analyze` clean.  
+4) Submit a PR describing:
+   - What changed and why.
+   - How to test or reproduce.
+   - Any API or migration notes.
+
+### Coding conventions
+- Prefer stateless widgets where possible; keep state localized.
+- Use existing services in `lib/services` for API access; add new endpoints there.
+- Keep models in `objects.dart` (or nearby files) and use helper parsers for defensive JSON handling.
+- Follow Material theming already in use; keep strings user-facing and concise.
+
+### Issue reporting
+Include device/OS, Flutter version (`flutter --version`), steps to reproduce, expected vs. actual behaviour, and logs if available.
+
+## License
+Copyright © Mileograph contributors. See repository terms if provided.

android/app/build.gradle.kts

@@ -1,3 +1,4 @@
+import java.io.File
 import java.util.Properties
 
 plugins {
@@ -22,8 +23,21 @@ val releaseKeyAlias = System.getenv("ANDROID_KEY_ALIAS")
 val releaseKeyPassword = System.getenv("ANDROID_KEY_PASSWORD")
     ?: keystoreProperties.getProperty("keyPassword")
 
+val releaseStoreFilePath: File? = releaseStoreFile?.let { path ->
+    val candidate = File(path)
+    if (candidate.isAbsolute) return@let candidate
+
+    val candidates = listOfNotNull(
+        rootProject.file(path),
+        rootProject.projectDir.parentFile?.let { File(it, path) },
+        project.file(path),
+    )
+
+    candidates.firstOrNull { it.exists() }
+}
+
 val hasReleaseKeystore = listOf(
-    releaseStoreFile,
+    releaseStoreFilePath?.path,
     releaseStorePassword,
     releaseKeyAlias,
     releaseKeyPassword
@@ -31,7 +45,7 @@ val hasReleaseKeystore = listOf(
 
 android {
     namespace = "com.example.mileograph_flutter"
-    compileSdk = flutter.compileSdkVersion
+    compileSdk = 36
     ndkVersion = "27.0.12077973"
 
     compileOptions {
@@ -48,8 +62,8 @@ android {
         applicationId = "com.petegregoryy.mileograph_flutter"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdk = flutter.minSdkVersion
-        targetSdk = flutter.targetSdkVersion
+        minSdk = 24
+        targetSdk = 36
         versionCode = flutter.versionCode
         versionName = flutter.versionName
     }
@@ -57,7 +71,7 @@ android {
     signingConfigs {
         if (hasReleaseKeystore) {
             create("release") {
-                storeFile = file(releaseStoreFile!!)
+                storeFile = releaseStoreFilePath
                 storePassword = releaseStorePassword
                 keyAlias = releaseKeyAlias!!
                 keyPassword = releaseKeyPassword

android/app/src/main/res/values/colors.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#ffffff</color>
+    <color name="ic_launcher_background">#000000</color>
 </resources>

deploy/web/nginx.conf

@@ -0,0 +1,28 @@
+server {
+  listen 80;
+  server_name _;
+  root /usr/share/nginx/html;
+  include /etc/nginx/mime.types;
+
+  # Serve hashed assets aggressively; keep index/service worker cacheable but not immutable.
+  location /assets/ {
+    try_files $uri =404;
+    expires 30d;
+    add_header Cache-Control "public, max-age=2592000, immutable";
+  }
+
+  location /icons/ {
+    try_files $uri =404;
+    expires 30d;
+    add_header Cache-Control "public, max-age=2592000";
+  }
+
+  location = /flutter_service_worker.js {
+    add_header Cache-Control "no-cache";
+    try_files $uri =404;
+  }
+
+  location / {
+    try_files $uri $uri/ /index.html;
+  }
+}

lib/app.dart

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

lib/components/calculator/calculator.dart

@@ -61,14 +61,7 @@ class _StationAutocompleteState extends State<StationAutocomplete> {
           controller: textEditingController,
           focusNode: focusNode,
           textInputAction: TextInputAction.done,
-              onSubmitted: (_) {
-                final matches = _findTopMatches(textEditingController.text);
-                final firstMatch = matches.isEmpty ? null : matches.first;
-                if (firstMatch == null) return;
-                _controller.text = firstMatch;
-                widget.onChanged(firstMatch);
-                focusNode.unfocus(); // optionally close keyboard
-              },
+          onSubmitted: (_) => onFieldSubmitted(),
           decoration: const InputDecoration(
             labelText: 'Select station',
             border: OutlineInputBorder(),
@@ -133,6 +126,11 @@ class RouteCalculator extends StatefulWidget {
 
 class _RouteCalculatorState extends State<RouteCalculator> {
   List<Station> allStations = [];
+  List<String> _networks = [];
+  List<String> _countries = [];
+  List<String> _selectedNetworks = [];
+  List<String> _selectedCountries = [];
+  bool _loadingStations = false;
 
   RouteResult? _routeResult;
   RouteResult? get result => _routeResult;
@@ -150,15 +148,40 @@ class _RouteCalculatorState extends State<RouteCalculator> {
       }
       WidgetsBinding.instance.addPostFrameCallback((_) async {
         final data = context.read<DataService>();
-        final result = await data.fetchStations();
-        if (mounted) {
-          setState(() => allStations = result);
-        }
+        await data.fetchStationFilters();
+        if (!mounted) return;
+        setState(() {
+          _networks = data.stationNetworks;
+          _countries = data.stationCountryNetworks.keys.toList();
+        });
+        await _loadStations();
       });
     }
   }
 
+  Future<void> _loadStations() async {
+    setState(() => _loadingStations = true);
+    final data = context.read<DataService>();
+    final stations = await data.fetchStations(
+      countries: _selectedCountries,
+      networks: _selectedNetworks,
+    );
+    if (!mounted) return;
+    setState(() {
+      allStations = stations;
+      _loadingStations = false;
+    });
+  }
+
   Future<void> _calculateRoute(List<String> stations) async {
+    final cleaned = stations.where((s) => s.trim().isNotEmpty).toList();
+    if (cleaned.length < 2) {
+      setState(() {
+        _routeResult = null;
+        _errorMessage = 'Add at least two stations before calculating.';
+      });
+      return;
+    }
     setState(() {
       _errorMessage = null;
       _routeResult = null;
@@ -166,7 +189,7 @@ class _RouteCalculatorState extends State<RouteCalculator> {
     final api = context.read<ApiService>(); // context is valid here
     try {
       final res = await api.post('/route/distance2', {
-        'route': stations.where((s) => s.trim().isNotEmpty).toList(),
+        'route': cleaned,
       });
 
       if (res is Map && res['error'] == false) {
@@ -210,11 +233,65 @@ class _RouteCalculatorState extends State<RouteCalculator> {
     });
   }
 
+  void _clearCalculator() {
+    final data = context.read<DataService>();
+    setState(() {
+      data.stations = [''];
+      _routeResult = null;
+      _errorMessage = null;
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
     return Column(
       children: [
+        Align(
+          alignment: Alignment.centerRight,
+          child: IconButton(
+            tooltip: 'Clear calculator',
+            icon: const Icon(Icons.clear_all),
+            onPressed: _clearCalculator,
+          ),
+        ),
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
+          child: Wrap(
+            spacing: 12,
+            runSpacing: 12,
+            crossAxisAlignment: WrapCrossAlignment.center,
+            children: [
+              _MultiSelectFilter(
+                label: 'Countries',
+                options: _countries,
+                selected: _selectedCountries,
+                onChanged: (vals) {
+                  setState(() => _selectedCountries = vals);
+                  _loadStations();
+                },
+              ),
+              _MultiSelectFilter(
+                label: 'Networks',
+                options: _networks,
+                selected: _selectedNetworks,
+                onChanged: (vals) {
+                  setState(() => _selectedNetworks = vals);
+                  _loadStations();
+                },
+              ),
+              if (_loadingStations)
+                const Padding(
+                  padding: EdgeInsets.only(left: 8.0),
+                  child: SizedBox(
+                    height: 20,
+                    width: 20,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  ),
+                ),
+            ],
+          ),
+        ),
         Expanded(
           child: ReorderableListView(
             buildDefaultDragHandles: false,
@@ -300,32 +377,43 @@ class _RouteCalculatorState extends State<RouteCalculator> {
         else
           SizedBox.shrink(),
         const SizedBox(height: 10),
-        LayoutBuilder(
-          builder: (context, constraints) {
-            double screenWidth = constraints.maxWidth;
-
-            return Padding(
-              padding: EdgeInsets.only(right: screenWidth < 450 ? 70 : 0),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.center,
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16.0),
+          child: Wrap(
+            alignment: WrapAlignment.center,
+            spacing: 12,
+            runSpacing: 8,
             children: [
-                  ElevatedButton.icon(
+              ...(() {
+                final reverseButton = ElevatedButton.icon(
+                  icon: const Icon(Icons.swap_horiz),
+                  label: const Text('Reverse route'),
+                  onPressed: () async {
+                    setState(() {
+                      data.stations = data.stations.reversed.toList();
+                    });
+                    await _calculateRoute(data.stations);
+                  },
+                );
+                final addButton = ElevatedButton.icon(
                   icon: const Icon(Icons.add),
                   label: const Text('Add Station'),
                   onPressed: _addStation,
-                  ),
-                  const SizedBox(width: 16),
-                  ElevatedButton.icon(
+                );
+                final calculateButton = ElevatedButton.icon(
                   icon: const Icon(Icons.route),
                   label: const Text('Calculate Route'),
                   onPressed: () async {
                     await _calculateRoute(data.stations);
                   },
-                  ),
+                );
+                final isMobile = MediaQuery.of(context).size.width < 600;
+                return isMobile
+                    ? [addButton, reverseButton, calculateButton]
+                    : [reverseButton, addButton, calculateButton];
+              })(),
             ],
           ),
-            );
-          },
         ),
 
         const SizedBox(height: 16),
@@ -350,3 +438,159 @@ Widget debugPanel(List<String> stations) {
     ),
   );
 }
+
+class _MultiSelectFilter extends StatefulWidget {
+  const _MultiSelectFilter({
+    required this.label,
+    required this.options,
+    required this.selected,
+    required this.onChanged,
+  });
+
+  final String label;
+  final List<String> options;
+  final List<String> selected;
+  final ValueChanged<List<String>> onChanged;
+
+  @override
+  State<_MultiSelectFilter> createState() => _MultiSelectFilterState();
+}
+
+class _MultiSelectFilterState extends State<_MultiSelectFilter> {
+  late List<String> _tempSelected;
+  String _query = '';
+
+  @override
+  void initState() {
+    super.initState();
+    _tempSelected = List.from(widget.selected);
+  }
+
+  @override
+  void didUpdateWidget(covariant _MultiSelectFilter oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.selected != widget.selected) {
+      _tempSelected = List.from(widget.selected);
+    }
+  }
+
+  void _openPicker() async {
+    _tempSelected = List.from(widget.selected);
+    _query = '';
+    await showModalBottomSheet<void>(
+      context: context,
+      isScrollControlled: true,
+      builder: (ctx) {
+        return StatefulBuilder(
+          builder: (ctx, setModalState) {
+            final filtered = widget.options
+                .where((opt) =>
+                    _query.isEmpty || opt.toLowerCase().contains(_query.toLowerCase()))
+                .toList();
+            return SafeArea(
+              child: Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        Text(
+                          'Select ${widget.label.toLowerCase()}',
+                          style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                                fontWeight: FontWeight.w700,
+                              ),
+                        ),
+                        const Spacer(),
+                        TextButton(
+                          onPressed: () {
+                            setModalState(() {
+                              _tempSelected.clear();
+                            });
+                            Navigator.of(ctx).pop();
+                            widget.onChanged(const []);
+                          },
+                          child: const Text('Clear'),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    TextField(
+                      decoration: const InputDecoration(
+                        labelText: 'Search',
+                        border: OutlineInputBorder(),
+                      ),
+                      onChanged: (val) {
+                        setModalState(() {
+                          _query = val;
+                        });
+                      },
+                    ),
+                    const SizedBox(height: 12),
+                    SizedBox(
+                      height: 320,
+                      child: ListView.builder(
+                        itemCount: filtered.length,
+                        itemBuilder: (_, index) {
+                          final option = filtered[index];
+                          final selected = _tempSelected.contains(option);
+                          return CheckboxListTile(
+                            value: selected,
+                            title: Text(option),
+                            onChanged: (val) {
+                              setModalState(() {
+                                if (val == true) {
+                                  if (!_tempSelected.contains(option)) {
+                                    _tempSelected.add(option);
+                                  }
+                                } else {
+                                  _tempSelected.removeWhere((e) => e == option);
+                                }
+                              });
+                              widget.onChanged(List.from(_tempSelected.toSet()));
+                            },
+                          );
+                        },
+                      ),
+                    ),
+                    const SizedBox(height: 12),
+                    Align(
+                      alignment: Alignment.centerRight,
+                      child: FilledButton.icon(
+                        onPressed: () {
+                          widget.onChanged(List.from(_tempSelected.toSet()));
+                          Navigator.of(ctx).pop();
+                        },
+                        icon: const Icon(Icons.check),
+                        label: const Text('Apply'),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final hasSelection = widget.selected.isNotEmpty;
+    final display =
+        hasSelection ? widget.selected.join(', ') : 'Any ${widget.label.toLowerCase()}';
+    return OutlinedButton.icon(
+      onPressed: _openPicker,
+      icon: const Icon(Icons.filter_alt),
+      label: SizedBox(
+        width: 180,
+        child: Text(
+          '${widget.label}: $display',
+          overflow: TextOverflow.ellipsis,
+        ),
+      ),
+    );
+  }
+}

lib/components/calculator/route_summary_widget.dart

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

lib/components/dashboard/latest_loco_changes_panel.dart

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

lib/components/dashboard/leaderboard_panel.dart

@@ -1,83 +1,178 @@
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
-
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';
+enum _LeaderboardScope { global, friends }
 
-class LeaderboardPanel extends StatelessWidget {
+class LeaderboardPanel extends StatefulWidget {
   const LeaderboardPanel({super.key});
 
+  @override
+  State<LeaderboardPanel> createState() => _LeaderboardPanelState();
+}
+
+class _LeaderboardPanelState extends State<LeaderboardPanel> {
+  _LeaderboardScope _scope = _LeaderboardScope.global;
+
   @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
-    final leaderboard = data.homepageStats?.leaderboard ?? [];
-    if (data.isHomepageLoading && leaderboard.isEmpty) {
+    final distanceUnits = context.watch<DistanceUnitService>();
+    final leaderboard = _scope == _LeaderboardScope.global
+        ? (data.homepageStats?.leaderboard ?? [])
+        : data.friendsLeaderboard;
+    final loading = _scope == _LeaderboardScope.global
+        ? data.isHomepageLoading
+        : data.isFriendsLeaderboardLoading;
+    final textTheme = Theme.of(context).textTheme;
+    if (loading && leaderboard.isEmpty) {
       return const Padding(
         padding: EdgeInsets.all(16.0),
         child: Center(child: CircularProgressIndicator()),
       );
     }
-    return Padding(
-      padding: const EdgeInsets.all(10.0),
-      child: Card(
+    return Card(
+      clipBehavior: Clip.antiAlias,
+      child: Padding(
+        padding: const EdgeInsets.all(16),
         child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-            Text(
+            Row(
+              children: [
+                const Icon(Icons.emoji_events, size: 20),
+                const SizedBox(width: 8),
+                Expanded(
+                  child: Text(
                     "Leaderboard",
-              style: TextStyle(
-                fontSize: 24,
-                fontWeight: FontWeight.bold,
-                decoration: TextDecoration.underline,
+                    style: textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.w800,
                     ),
                   ),
+                ),
+                if (leaderboard.isNotEmpty &&
+                    MediaQuery.of(context).size.width > 600)
+                  Container(
+                    padding:
+                        const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                    decoration: BoxDecoration(
+                      color: Theme.of(context).colorScheme.surfaceContainerHighest,
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                    child: Text(
+                      'Top ${leaderboard.length}',
+                      style: textTheme.labelSmall,
+                    ),
+                  ),
+              ],
+            ),
+            const SizedBox(height: 8),
+            Center(
+              child: SegmentedButton<_LeaderboardScope>(
+                segments: const [
+                  ButtonSegment(
+                    value: _LeaderboardScope.global,
+                    label: Text('Global'),
+                  ),
+                  ButtonSegment(
+                    value: _LeaderboardScope.friends,
+                    label: Text('Friends'),
+                  ),
+                ],
+                selected: {_scope},
+                onSelectionChanged: (vals) async {
+                  if (vals.isEmpty) return;
+                  final selected = vals.first;
+                  setState(() => _scope = selected);
+                  if (selected == _LeaderboardScope.friends &&
+                      data.friendsLeaderboard.isEmpty &&
+                      !data.isFriendsLeaderboardLoading) {
+                    await data.fetchFriendsLeaderboard();
+                  } else if (selected == _LeaderboardScope.global &&
+                      (data.homepageStats?.leaderboard.isEmpty ?? true) &&
+                      !data.isHomepageLoading) {
+                    await data.fetchHomepageStats();
+                  }
+                },
+                style: SegmentedButton.styleFrom(
+                  visualDensity: VisualDensity.compact,
+                  padding: const EdgeInsets.symmetric(horizontal: 8),
+                ),
+              ),
+            ),
+            const SizedBox(height: 8),
             if (leaderboard.isEmpty)
               const Padding(
-                padding: EdgeInsets.all(16.0),
+                padding: EdgeInsets.all(8.0),
                 child: Text('No leaderboard data yet'),
               )
             else
               Column(
-                children: List.generate(
-                  leaderboard.length,
-                  (index) {
-                    final leaderboardEntry = leaderboard[index];
-                    return Container(
-                      width: double.infinity,
-                      margin: const EdgeInsets.symmetric(
-                          horizontal: 0, vertical: 8),
-                      child: Padding(
-                        padding: const EdgeInsets.all(8),
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-                            Text.rich(
-                              TextSpan(
+                  for (int index = 0; index < leaderboard.length; index++) ...[
+                    ListTile(
+                      contentPadding: EdgeInsets.zero,
+                      dense: true,
+                      leading: CircleAvatar(
+                        radius: 18,
+                        backgroundColor:
+                            Theme.of(context).colorScheme.secondaryContainer,
+                        child: Text(
+                          '${index + 1}',
+                          style: textTheme.labelLarge?.copyWith(
+                            fontWeight: FontWeight.w800,
+                          ),
+                        ),
+                      ),
+                      title: Text(
+                        leaderboard[index].userFullName,
+                        style: textTheme.titleSmall?.copyWith(
+                          fontWeight: FontWeight.w700,
+                        ),
+                      ),
+                      trailing: Wrap(
+                        crossAxisAlignment: WrapCrossAlignment.center,
+                        spacing: 8,
                         children: [
-                                  TextSpan(
-                                    text: '${index + 1}. ',
-                                    style: const TextStyle(
-                                      fontWeight: FontWeight.bold,
-                                    ),
-                                  ),
-                                  TextSpan(
-                                    text: leaderboardEntry.userFullName,
-                                  ),
-                                ],
-                              ),
-                            ),
                           Text(
-                              '${leaderboardEntry.mileage.toStringAsFixed(1)} mi',
+                            distanceUnits.format(
+                              leaderboard[index].mileage,
+                              decimals: 1,
                             ),
-                          ],
+                            style: textTheme.labelLarge?.copyWith(
+                              fontWeight: FontWeight.w700,
                             ),
                           ),
+                          Builder(
+                            builder: (ctx) => IconButton(
+                              tooltip: 'View profile',
+                              icon: const Icon(Icons.open_in_new, size: 20),
+                              onPressed: () {
+                                final auth = ctx.read<AuthService>();
+                                final userId = leaderboard[index].userId;
+                                if (auth.userId == userId) {
+                                  ctx.go('/more/profile');
+                                } else {
+                                  ctx.pushNamed(
+                                    'user-profile',
+                                    queryParameters: {'user_id': userId},
                                   );
+                                }
                               },
                             ),
                           ),
                         ],
                       ),
                     ),
+                    if (index != leaderboard.length - 1) const Divider(height: 12),
+                  ],
+                ],
+              ),
+          ],
+        ),
+      ),
     );
   }
 }

lib/components/dashboard/top_traction_panel.dart

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

lib/components/legs/leg_card.dart

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

lib/components/login/login.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
+import 'package:mileograph_flutter/components/pages/settings.dart';
 import 'package:provider/provider.dart';
 
 class LoginScreen extends StatefulWidget {
@@ -16,7 +17,9 @@ class _LoginScreenState extends State<LoginScreen> {
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) => _checkExistingSession());
+    WidgetsBinding.instance.addPostFrameCallback(
+      (_) => _checkExistingSession(),
+    );
   }
 
   Future<void> _checkExistingSession() async {
@@ -26,7 +29,7 @@ class _LoginScreenState extends State<LoginScreen> {
       if (!valid) return;
       await auth.tryRestoreSession();
       if (!mounted) return;
-      context.go('/');
+      context.go('/dashboard');
     } finally {
       if (mounted) setState(() => _checkingSession = false);
     }
@@ -70,17 +73,39 @@ class _LoginScreenState extends State<LoginScreen> {
                   ),
                 ),
               ),
-              if (_checkingSession)
-                const Padding(
-                  padding: EdgeInsets.only(top: 12),
-                  child: SizedBox(
+              const SizedBox(height: 50),
+              const LoginPanel(),
+              const SizedBox(height: 16),
+              IconButton(
+                icon: const Icon(Icons.settings, color: Colors.grey),
+                tooltip: 'Settings',
+                onPressed: () {
+                  Navigator.of(context).push(
+                    MaterialPageRoute(
+                      fullscreenDialog: true,
+                      builder: (_) => const SettingsPage(),
+                    ),
+                  );
+                },
+              ),
+              if (_checkingSession) ...[
+                const SizedBox(height: 12),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    const SizedBox(
                       height: 24,
                       width: 24,
                       child: CircularProgressIndicator(strokeWidth: 2),
                     ),
+                    const SizedBox(width: 8),
+                    Text(
+                      'Trying to log in',
+                      style: Theme.of(context).textTheme.bodyMedium,
                     ),
-              const SizedBox(height: 50),
-              const LoginPanel(),
+                  ],
+                ),
+              ],
             ],
           ),
         ),
@@ -173,14 +198,15 @@ class _LoginPanelContentState extends State<LoginPanelContent> {
       setState(() {
         _loggingIn = false;
       });
+      context.go('/dashboard');
     } catch (e) {
       if (!mounted) return;
       setState(() {
         _loggingIn = false;
       });
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text('Login failed: $e')),
-      );
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(SnackBar(content: Text('Login failed: $e')));
     }
   }
 
@@ -268,6 +294,7 @@ class _RegisterPanelContentState extends State<RegisterPanelContent> {
   final _passwordController = TextEditingController();
   final _inviteController = TextEditingController();
   bool _registering = false;
+  String? _usernameError;
 
   @override
   void dispose() {
@@ -280,10 +307,21 @@ class _RegisterPanelContentState extends State<RegisterPanelContent> {
   }
 
   Future<void> _register() async {
+    final username = _usernameController.text.trim();
+    if (username.contains(' ') || username.contains('@')) {
+      setState(() {
+        _usernameError = 'Username cannot contain spaces or @';
+      });
+      return;
+    } else {
+      setState(() {
+        _usernameError = null;
+      });
+    }
     setState(() => _registering = true);
     try {
       await widget.authService.register(
-        username: _usernameController.text.trim(),
+        username: username,
         email: _emailController.text.trim(),
         fullName: _displayNameController.text.trim(),
         password: _passwordController.text,
@@ -291,14 +329,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(
-        SnackBar(content: Text('Registration failed: $e')),
-      );
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(SnackBar(content: Text('Registration failed: $e')));
     } finally {
       if (mounted) setState(() => _registering = false);
     }
@@ -335,6 +375,21 @@ class _RegisterPanelContentState extends State<RegisterPanelContent> {
             border: OutlineInputBorder(),
             labelText: "Username",
           ),
+          onChanged: (_) {
+            if (_usernameError != null &&
+                !_usernameController.text.contains(' ') &&
+                !_usernameController.text.contains('@')) {
+              setState(() => _usernameError = null);
+            }
+          },
+        ),
+        if (_usernameError != null)
+          Padding(
+            padding: const EdgeInsets.only(top: 4.0),
+            child: Text(
+              _usernameError!,
+              style: TextStyle(color: Theme.of(context).colorScheme.error),
+            ),
           ),
         const SizedBox(height: 8),
         TextField(

lib/components/pages/badges.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 BadgesPage extends StatefulWidget {
+  const BadgesPage({super.key});
+
+  @override
+  State<BadgesPage> createState() => _BadgesPageState();
+}
+
+class _BadgesPageState extends State<BadgesPage> {
+  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('/more');
+            }
+          },
+        ),
+      ),
+      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/calculator_details.dart

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

lib/components/pages/dashboard.dart

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

lib/components/pages/legs.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/components/legs/leg_card.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'package:provider/provider.dart';
 
 class LegsPage extends StatefulWidget {
@@ -15,6 +17,8 @@ class _LegsPageState extends State<LegsPage> {
   DateTime? _startDate;
   DateTime? _endDate;
   bool _initialised = false;
+  bool _unallocatedOnly = false;
+  bool _showMoreFilters = false;
 
   @override
   void didChangeDependencies() {
@@ -31,6 +35,7 @@ class _LegsPageState extends State<LegsPage> {
       sortDirection: _sortDirection,
       dateRangeStart: _formatDate(_startDate),
       dateRangeEnd: _formatDate(_endDate),
+      unallocatedOnly: _unallocatedOnly,
     );
   }
 
@@ -42,6 +47,7 @@ class _LegsPageState extends State<LegsPage> {
       dateRangeEnd: _formatDate(_endDate),
       offset: data.legs.length,
       append: true,
+      unallocatedOnly: _unallocatedOnly,
     );
   }
 
@@ -82,6 +88,8 @@ class _LegsPageState extends State<LegsPage> {
       _startDate = null;
       _endDate = null;
       _sortDirection = 0;
+      _unallocatedOnly = false;
+      _showMoreFilters = false;
     });
     _refreshLegs();
   }
@@ -89,6 +97,7 @@ class _LegsPageState extends State<LegsPage> {
   @override
   Widget build(BuildContext context) {
     final data = context.watch<DataService>();
+    final distanceUnits = context.watch<DistanceUnitService>();
     final legs = data.legs;
     final pageMileage = _pageMileage(legs);
 
@@ -120,7 +129,7 @@ class _LegsPageState extends State<LegsPage> {
                     children: [
                       Text('Page mileage',
                           style: Theme.of(context).textTheme.labelSmall),
-                      Text('${pageMileage.toStringAsFixed(1)} mi',
+                      Text(distanceUnits.format(pageMileage, decimals: 1),
                           style: Theme.of(context)
                               .textTheme
                               .titleMedium
@@ -174,8 +183,46 @@ class _LegsPageState extends State<LegsPage> {
                               : _formatDate(_endDate!)!,
                         ),
                       ),
+                      TextButton.icon(
+                        onPressed: () => setState(
+                          () => _showMoreFilters = !_showMoreFilters,
+                        ),
+                        icon: Icon(
+                          _showMoreFilters
+                              ? Icons.expand_less
+                              : Icons.expand_more,
+                        ),
+                        label: Text(
+                          _showMoreFilters ? 'Hide filters' : 'More filters',
+                        ),
+                      ),
                     ],
                   ),
+                  AnimatedCrossFade(
+                    crossFadeState: _showMoreFilters
+                        ? CrossFadeState.showFirst
+                        : CrossFadeState.showSecond,
+                    duration: const Duration(milliseconds: 200),
+                    firstChild: Padding(
+                      padding: const EdgeInsets.only(top: 12.0),
+                      child: Wrap(
+                        spacing: 12,
+                        runSpacing: 12,
+                        children: [
+                          FilterChip(
+                            avatar: const Icon(Icons.flash_off),
+                            label: const Text('Unallocated only'),
+                            selected: _unallocatedOnly,
+                            onSelected: (selected) async {
+                              setState(() => _unallocatedOnly = selected);
+                              await _refreshLegs();
+                            },
+                          ),
+                        ],
+                      ),
+                    ),
+                    secondChild: const SizedBox.shrink(),
+                  ),
                 ],
               ),
             ),
@@ -211,7 +258,7 @@ class _LegsPageState extends State<LegsPage> {
           else
             Column(
               children: [
-                ...legs.map((leg) => LegCard(leg: leg)),
+                ..._buildLegsWithDividers(context, legs, distanceUnits),
                 const SizedBox(height: 8),
                 if (data.legsHasMore || data.isLegsLoading)
                   Align(
@@ -238,6 +285,60 @@ class _LegsPageState extends State<LegsPage> {
     );
   }
 
+  List<Widget> _buildLegsWithDividers(
+    BuildContext context,
+    List<Leg> legs,
+    DistanceUnitService distanceUnits,
+  ) {
+    final widgets = <Widget>[];
+    String? currentDate;
+    double dayMileage = 0;
+    final dayLegs = <Leg>[];
+
+    void flushDay() {
+      final date = currentDate;
+      if (date == null) return;
+      widgets.add(
+        Padding(
+          padding: const EdgeInsets.symmetric(vertical: 8.0),
+          child: Row(
+            children: [
+              Expanded(
+                child: Text(
+                  date,
+                  style: Theme.of(context).textTheme.labelMedium?.copyWith(
+                        fontWeight: FontWeight.w700,
+                      ),
+                ),
+              ),
+              Text(distanceUnits.format(dayMileage, decimals: 1),
+                  style: Theme.of(context).textTheme.labelMedium),
+            ],
+          ),
+        ),
+      );
+      widgets.add(const Divider());
+      widgets.addAll(
+        dayLegs.map((leg) => LegCard(leg: leg, showDate: false)),
+      );
+      dayLegs.clear();
+    }
+
+    for (final leg in legs) {
+      final dateStr = _formatDate(leg.beginTime) ?? '';
+      if (currentDate != null && dateStr != currentDate) {
+        flushDay();
+        dayMileage = 0;
+      }
+      currentDate = dateStr;
+      dayLegs.add(leg);
+      dayMileage += leg.mileage;
+    }
+
+    flushDay();
+    return widgets;
+  }
+
   String? _formatDate(DateTime? date) {
     if (date == null) return null;
     return '${date.year.toString().padLeft(4, '0')}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';

lib/components/pages/loco_timeline.dart

@@ -5,6 +5,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:intl/intl.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/authservice.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:provider/provider.dart';
 
@@ -29,6 +30,7 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
   final List<_EventDraft> _draftEvents = [];
   bool _isSaving = false;
   bool _isDeleting = false;
+  bool _isModerating = false;
 
   @override
   void initState() {
@@ -36,6 +38,21 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
     WidgetsBinding.instance.addPostFrameCallback((_) => _load());
   }
 
+  dynamic _normalizeFieldValue(_FieldEntry field) {
+    final name = field.field.name.toLowerCase();
+    final val = field.value;
+    if (name == 'max_speed') {
+      final numVal = val is num ? val.toDouble() : double.tryParse('$val');
+      if (numVal == null) return val;
+      final unit = (field.unit ?? 'kph').toLowerCase();
+      if (unit == 'mph') {
+        return numVal * 1.60934;
+      }
+      return numVal;
+    }
+    return val;
+  }
+
   @override
   void dispose() {
     _disposeDrafts(_draftEvents);
@@ -44,8 +61,12 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
 
   Future<void> _load() {
     final data = context.read<DataService>();
+    final auth = context.read<AuthService>();
     data.fetchEventFields();
-    return data.fetchLocoTimeline(widget.locoId);
+    return data.fetchLocoTimeline(
+      widget.locoId,
+      includeAllPending: auth.isElevated,
+    );
   }
 
   void _addDraftEvent() {
@@ -57,7 +78,7 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
   String? _eventDateForEntry(LocoAttrVersion entry) {
     final masked = entry.maskedValidFrom?.trim();
     if (masked != null && masked.isNotEmpty) return masked;
-    final from = entry.validFrom ?? entry.txnFrom;
+    final from = entry.validFrom;
     if (from == null) return null;
     return DateFormat('yyyy-MM-dd').format(from);
   }
@@ -115,7 +136,8 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
     draft.details = '';
     draft.fields.add(
       _FieldEntry(field: field)
-        ..value = _valueForEntry(entry),
+        ..value = _valueForEntry(entry)
+        ..unit = _guessUnit(field, entry.valueLabel),
     );
 
     setState(() {
@@ -123,10 +145,30 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
     });
   }
 
+  String? _guessUnit(EventField field, String valueLabel) {
+    final name = field.name.toLowerCase();
+    if (name == 'max_speed') {
+      final val = valueLabel.toLowerCase();
+      if (val.contains('mph')) return 'mph';
+      return 'kph';
+    }
+    return _defaultUnitForField(field);
+  }
+
   Future<void> _deleteEntry(LocoAttrVersion entry) async {
     if (_isDeleting) return;
+    final isPending = entry.isPending;
     final blockId = entry.versionId;
-    if (blockId == null) {
+    final pendingEventId = entry.sourceEventId;
+    if (isPending && pendingEventId == null) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Cannot delete: pending timeline block has no event ID.'),
+        ),
+      );
+      return;
+    }
+    if (!isPending && blockId == null) {
       ScaffoldMessenger.of(context).showSnackBar(
         const SnackBar(content: Text('Cannot delete: timeline block has no ID.')),
       );
@@ -167,13 +209,23 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
       _isDeleting = true;
     });
     try {
+      if (isPending && pendingEventId != null) {
+        await data.deletePendingEvent(eventId: pendingEventId);
+      } else if (blockId != null) {
         await data.deleteTimelineBlock(
           blockId: blockId,
         );
+      }
       await _load();
       if (mounted) {
         messenger.showSnackBar(
-          const SnackBar(content: Text('Timeline block deleted')),
+          SnackBar(
+            content: Text(
+              isPending
+                  ? 'Pending timeline block deleted'
+                  : 'Timeline block deleted',
+            ),
+          ),
         );
       }
     } catch (e) {
@@ -191,6 +243,79 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
     }
   }
 
+  Future<void> _moderatePendingEntry(
+    LocoAttrVersion entry,
+    _PendingModerationAction action,
+  ) async {
+    if (_isModerating) return;
+    final eventId = entry.sourceEventId;
+    if (eventId == null) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Cannot moderate: pending timeline block has no event ID.'),
+        ),
+      );
+      return;
+    }
+    final data = context.read<DataService>();
+    final approve = action == _PendingModerationAction.approve;
+    final messenger = ScaffoldMessenger.of(context);
+    final verb = approve ? 'approve' : 'reject';
+    final ok = await showDialog<bool>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text('${approve ? 'Approve' : 'Reject'} pending event?'),
+        content: Text(
+          'Are you sure you want to $verb this pending timeline block?',
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(false),
+            child: const Text('Cancel'),
+          ),
+          FilledButton(
+            onPressed: () => Navigator.of(context).pop(true),
+            child: Text(approve ? 'Approve' : 'Reject'),
+          ),
+        ],
+      ),
+    );
+    if (ok != true || !mounted) return;
+
+    setState(() {
+      _isModerating = true;
+    });
+    try {
+      if (approve) {
+        await data.approvePendingEvent(eventId: eventId);
+      } else {
+        await data.rejectPendingEvent(eventId: eventId);
+      }
+      await _load();
+      if (mounted) {
+        messenger.showSnackBar(
+          SnackBar(
+            content: Text(
+              'Pending timeline block ${approve ? 'approved' : 'rejected'}.',
+            ),
+          ),
+        );
+      }
+    } catch (e) {
+      if (mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Failed to $verb pending timeline block: $e')),
+        );
+      }
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isModerating = false;
+        });
+      }
+    }
+  }
+
   void _removeDraftAt(int index) {
     if (index < 0 || index >= _draftEvents.length) return;
     final draft = _draftEvents.removeAt(index);
@@ -222,6 +347,9 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
       _isSaving = true;
     });
     try {
+      final existingPending =
+          await data.fetchUserPendingEvents(widget.locoId);
+      final clearedEventIds = <int>{};
       final invalid = <String>[];
       for (final draft in _draftEvents) {
         final dateStr = draft.dateController.text.trim();
@@ -241,13 +369,20 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
             invalid.add('Field ${field.field.display} is empty');
             break;
           }
-          values[field.field.name] = val;
+          values[field.field.name] = _normalizeFieldValue(field);
         }
         if (invalid.isNotEmpty) continue;
         if (values.isEmpty) {
           invalid.add('Add at least one value');
           continue;
         }
+        await _clearDuplicatePending(
+          existingPending,
+          clearedEventIds,
+          values.keys,
+          dateStr,
+          data,
+        );
         await data.createLocoEvent(
           locoId: widget.locoId,
           eventDate: dateStr,
@@ -286,6 +421,42 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
     }
   }
 
+  Future<void> _clearDuplicatePending(
+    List<LocoAttrVersion> existingPending,
+    Set<int> clearedEventIds,
+    Iterable<String> attrs,
+    String dateStr,
+    DataService data,
+  ) async {
+    final trimmedDate = dateStr.trim().toLowerCase();
+    final attrSet = attrs.map((e) => e.toLowerCase()).toSet();
+    for (final pending in existingPending) {
+      final attrMatch = attrSet.contains(pending.attrCode.toLowerCase());
+      if (!attrMatch) continue;
+      final matchesDate = _dateMatchesPending(trimmedDate, pending);
+      if (!matchesDate) continue;
+      final eventId = pending.sourceEventId;
+      if (eventId == null || clearedEventIds.contains(eventId)) continue;
+      await data.deletePendingEvent(eventId: eventId);
+      clearedEventIds.add(eventId);
+    }
+  }
+
+  bool _dateMatchesPending(String draftDateLower, LocoAttrVersion pending) {
+    final masked = pending.maskedValidFrom?.trim().toLowerCase();
+    if (masked != null && masked.isNotEmpty && masked == draftDateLower) {
+      return true;
+    }
+    final draftDate = DateTime.tryParse(draftDateLower);
+    final pendingDate = pending.validFrom;
+    if (draftDate != null && pendingDate != null) {
+      return draftDate.year == pendingDate.year &&
+          draftDate.month == pendingDate.month &&
+          draftDate.day == pendingDate.day;
+    }
+    return false;
+  }
+
   bool _isValidDateString(String input) {
     final trimmed = input.trim();
     final regex = RegExp(r'^\d{4}-(\d{2}|xx|XX)-(\d{2}|xx|XX)$');
@@ -386,6 +557,8 @@ class _LocoTimelinePageState extends State<LocoTimelinePage> {
                     data.eventFields,
                   ),
                   onDeleteEntry: _deleteEntry,
+                  onModeratePending: _moderatePendingEntry,
+                  pendingActionsBusy: _isModerating,
                 ),
                 const SizedBox(height: 16),
                 _EventEditor(

lib/components/pages/loco_timeline/event_editor.dart

@@ -23,6 +23,7 @@ class _EventEditor extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final hasDrafts = drafts.isNotEmpty;
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -37,12 +38,14 @@ class _EventEditor extends StatelessWidget {
             ),
             Row(
               children: [
+                if (!hasDrafts) ...[
                   OutlinedButton.icon(
                     onPressed: onAddEvent,
                     icon: const Icon(Icons.add),
                     label: const Text('New event'),
                   ),
                   const SizedBox(width: 8),
+                ],
                 FilledButton.icon(
                   onPressed: (!canSave || isSaving) ? null : onSave,
                   icon: isSaving
@@ -147,6 +150,14 @@ class _EventEditor extends StatelessWidget {
               );
             },
           ),
+        if (hasDrafts) ...[
+          const SizedBox(height: 8),
+          OutlinedButton.icon(
+            onPressed: onAddEvent,
+            icon: const Icon(Icons.add),
+            label: const Text('New event'),
+          ),
+        ],
       ],
     );
   }
@@ -184,7 +195,9 @@ class _FieldList extends StatelessWidget {
               value: null,
               onChanged: (field) {
                 if (field == null) return;
-                draft.fields.add(_FieldEntry(field: field));
+                draft.fields.add(
+                  _FieldEntry(field: field)..unit = _defaultUnitForField(field),
+                );
                 onChange();
               },
               items: availableFields
@@ -224,10 +237,10 @@ class _FieldList extends StatelessWidget {
                           ),
                           const SizedBox(height: 4),
                           _FieldInput(
-                            field: field.field,
-                            value: field.value,
-                            onChanged: (val) {
+                            entry: field,
+                            onChanged: (val, {String? unit}) {
                               field.value = val;
+                              if (unit != null) field.unit = unit;
                               onChange();
                             },
                           ),
@@ -253,17 +266,18 @@ class _FieldList extends StatelessWidget {
 
 class _FieldInput extends StatelessWidget {
   const _FieldInput({
-    required this.field,
-    required this.value,
+    required this.entry,
     required this.onChanged,
   });
 
-  final EventField field;
-  final dynamic value;
-  final ValueChanged<dynamic> onChanged;
+  final _FieldEntry entry;
+  final void Function(dynamic value, {String? unit}) onChanged;
 
   @override
   Widget build(BuildContext context) {
+    final field = entry.field;
+    final value = entry.value;
+
     if (field.enumValues != null && field.enumValues!.isNotEmpty) {
       final options = field.enumValues!;
       return DropdownButtonFormField<String>(
@@ -293,6 +307,118 @@ class _FieldInput extends StatelessWidget {
       );
     }
 
+    final name = field.name.toLowerCase();
+    if (name == 'max_speed') {
+      final unit = entry.unit ?? 'kph';
+      return Row(
+        children: [
+          Expanded(
+            child: TextFormField(
+              initialValue: value?.toString(),
+              onChanged: (val) {
+                final parsed = double.tryParse(val);
+                onChanged(parsed, unit: unit);
+              },
+              decoration: const InputDecoration(
+                border: OutlineInputBorder(),
+                hintText: 'Enter value',
+                suffixText: 'kph/mph',
+              ),
+              keyboardType: TextInputType.number,
+            ),
+          ),
+          const SizedBox(width: 8),
+          SizedBox(
+            width: 88,
+            child: DropdownButtonFormField<String>(
+              value: unit,
+              items: const [
+                DropdownMenuItem(value: 'kph', child: Text('kph')),
+                DropdownMenuItem(value: 'mph', child: Text('mph')),
+              ],
+              onChanged: (val) {
+                if (val == null) return;
+                onChanged(value, unit: val);
+              },
+              decoration: const InputDecoration(
+                border: OutlineInputBorder(),
+                labelText: 'Unit',
+              ),
+            ),
+          ),
+        ],
+      );
+    }
+
+    if ({
+      'height',
+      'length',
+      'width',
+      'track_gauge',
+    }.contains(name)) {
+      return TextFormField(
+        initialValue: value?.toString(),
+        onChanged: (val) {
+          final parsed = double.tryParse(val);
+          onChanged(parsed ?? val);
+        },
+        decoration: const InputDecoration(
+          border: OutlineInputBorder(),
+          hintText: 'Enter value',
+          suffixText: 'mm',
+        ),
+        keyboardType: TextInputType.number,
+      );
+    }
+
+    if (name == 'weight') {
+      return TextFormField(
+        initialValue: value?.toString(),
+        onChanged: (val) {
+          final parsed = double.tryParse(val);
+          onChanged(parsed ?? val);
+        },
+        decoration: const InputDecoration(
+          border: OutlineInputBorder(),
+          hintText: 'Enter value',
+          suffixText: 'tonnes',
+        ),
+        keyboardType: TextInputType.number,
+      );
+    }
+
+    if (name == 'power') {
+      return TextFormField(
+        initialValue: value?.toString(),
+        onChanged: (val) {
+          final parsed = double.tryParse(val);
+          onChanged(parsed ?? val);
+        },
+        decoration: const InputDecoration(
+          border: OutlineInputBorder(),
+          hintText: 'Enter value',
+          suffixText: 'kW',
+        ),
+        keyboardType: TextInputType.number,
+      );
+    }
+
+    if (name == 'tractive_effort') {
+      return TextFormField(
+        initialValue: value?.toString(),
+        onChanged: (val) {
+          final parsed = double.tryParse(val);
+          onChanged(parsed ?? val);
+        },
+        decoration: const InputDecoration(
+          border: OutlineInputBorder(),
+          hintText: 'Enter value',
+          suffixText: 'kN',
+        ),
+        keyboardType: TextInputType.number,
+      );
+    }
+
     final isNumber = type == 'int' || type == 'integer';
     return TextFormField(
       initialValue: value?.toString(),
@@ -326,6 +452,13 @@ class _EventDraft {
 class _FieldEntry {
   final EventField field;
   dynamic value;
+  String? unit;
 
   _FieldEntry({required this.field});
 }
+
+String? _defaultUnitForField(EventField field) {
+  final name = field.name.toLowerCase();
+  if (name == 'max_speed') return 'kph';
+  return null;
+}

lib/components/pages/loco_timeline/timeline_grid.dart

@@ -2,16 +2,25 @@ part of 'package:mileograph_flutter/components/pages/loco_timeline.dart';
 
 final DateFormat _dateFormat = DateFormat('yyyy-MM-dd');
 
+enum _PendingModerationAction { approve, reject }
+
 class _TimelineGrid extends StatefulWidget {
   const _TimelineGrid({
     required this.entries,
     this.onEditEntry,
     this.onDeleteEntry,
+    this.onModeratePending,
+    this.pendingActionsBusy = false,
   });
 
   final List<LocoAttrVersion> entries;
   final void Function(LocoAttrVersion entry)? onEditEntry;
   final void Function(LocoAttrVersion entry)? onDeleteEntry;
+  final Future<void> Function(
+    LocoAttrVersion entry,
+    _PendingModerationAction action,
+  )? onModeratePending;
+  final bool pendingActionsBusy;
 
   @override
   State<_TimelineGrid> createState() => _TimelineGridState();
@@ -191,6 +200,8 @@ class _TimelineGridState extends State<_TimelineGrid> {
                                     viewportWidth: axisWidth,
                                     onEditEntry: widget.onEditEntry,
                                     onDeleteEntry: widget.onDeleteEntry,
+                                    onModeratePending: widget.onModeratePending,
+                                    pendingActionsBusy: widget.pendingActionsBusy,
                                   ),
                                 );
                               },
@@ -276,6 +287,8 @@ class _AttrRow extends StatelessWidget {
     required this.viewportWidth,
     this.onEditEntry,
     this.onDeleteEntry,
+    this.onModeratePending,
+    this.pendingActionsBusy = false,
   });
 
   final double rowHeight;
@@ -285,6 +298,11 @@ class _AttrRow extends StatelessWidget {
   final double viewportWidth;
   final void Function(LocoAttrVersion entry)? onEditEntry;
   final void Function(LocoAttrVersion entry)? onDeleteEntry;
+  final Future<void> Function(
+    LocoAttrVersion entry,
+    _PendingModerationAction action,
+  )? onModeratePending;
+  final bool pendingActionsBusy;
 
   @override
   Widget build(BuildContext context) {
@@ -310,6 +328,8 @@ class _AttrRow extends StatelessWidget {
                 block: block,
                 onEditEntry: onEditEntry,
                 onDeleteEntry: onDeleteEntry,
+                onModeratePending: onModeratePending,
+                pendingActionsBusy: pendingActionsBusy,
               ),
             ),
           if (activeBlock != null)
@@ -326,6 +346,7 @@ class _AttrRow extends StatelessWidget {
                       width: stickyWidth,
                     ),
                     clipLeftEdge: scrollOffset > activeBlock.left + 0.1,
+                    pendingActionsBusy: pendingActionsBusy,
                   ),
                 ),
               ),
@@ -347,15 +368,17 @@ class _ValueBlockView extends StatelessWidget {
   const _ValueBlockView({
     required this.block,
     this.clipLeftEdge = false,
+    this.pendingActionsBusy = false,
   });
 
   final _ValueBlock block;
   final bool clipLeftEdge;
+  final bool pendingActionsBusy;
 
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final color = block.cell.color.withValues(alpha: 0.9);
+    final color = block.cell.color;
     final textColor = ThemeData.estimateBrightnessForColor(color) ==
             Brightness.dark
         ? Colors.white
@@ -386,10 +409,35 @@ class _ValueBlockView extends StatelessWidget {
                 fit: BoxFit.scaleDown,
                 child: ConstrainedBox(
                   constraints: const BoxConstraints(minWidth: 1, minHeight: 1),
-                  child: Column(
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
+                          Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              if (block.cell.isPending)
+                                Padding(
+                                  padding: const EdgeInsets.only(right: 6),
+                                  child: SizedBox(
+                                    width: 16,
+                                    height: 16,
+                                    child: pendingActionsBusy
+                                        ? CircularProgressIndicator(
+                                            strokeWidth: 2,
+                                            valueColor:
+                                                AlwaysStoppedAnimation(textColor),
+                                          )
+                                        : Icon(
+                                            Icons.pending,
+                                            size: 16,
+                                            color: textColor,
+                                          ),
+                                  ),
+                                ),
                               Text(
                                 block.cell.value,
                                 maxLines: 1,
@@ -403,6 +451,8 @@ class _ValueBlockView extends StatelessWidget {
                                       color: textColor,
                                     ),
                               ),
+                            ],
+                          ),
                           const SizedBox(height: 4),
                           Text(
                             block.cell.rangeLabel,
@@ -411,7 +461,11 @@ class _ValueBlockView extends StatelessWidget {
                             style: theme.textTheme.labelSmall?.copyWith(
                                   color: textColor.withValues(alpha: 0.9),
                                 ) ??
-                            TextStyle(color: textColor.withValues(alpha: 0.9)),
+                                TextStyle(
+                                  color: textColor.withValues(alpha: 0.9),
+                                ),
+                          ),
+                        ],
                       ),
                     ],
                   ),
@@ -422,44 +476,55 @@ class _ValueBlockView extends StatelessWidget {
   }
 }
 
-enum _TimelineBlockAction { edit, delete }
+enum _TimelineBlockAction { edit, delete, approve, reject }
 
 class _ValueBlockMenu extends StatelessWidget {
   const _ValueBlockMenu({
     required this.block,
     this.onEditEntry,
     this.onDeleteEntry,
+    this.onModeratePending,
+    this.pendingActionsBusy = false,
   });
 
   final _ValueBlock block;
   final void Function(LocoAttrVersion entry)? onEditEntry;
   final void Function(LocoAttrVersion entry)? onDeleteEntry;
+  final Future<void> Function(
+    LocoAttrVersion entry,
+    _PendingModerationAction action,
+  )? onModeratePending;
+  final bool pendingActionsBusy;
 
-  bool get _hasActions => onEditEntry != null || onDeleteEntry != null;
+  bool get _hasActions {
+    final canModerate = block.entry?.isPending == true &&
+        block.entry?.canModeratePending == true &&
+        onModeratePending != null;
+    final canEdit = onEditEntry != null && block.entry?.isPending != true;
+    return onDeleteEntry != null || canModerate || canEdit;
+  }
 
   @override
   Widget build(BuildContext context) {
     if (!_hasActions || block.entry == null) {
-      return _ValueBlockView(block: block);
+      return _ValueBlockView(
+        block: block,
+      );
     }
+    final canModerate = block.entry?.isPending == true &&
+        block.entry?.canModeratePending == true &&
+        onModeratePending != null;
+    final canEdit = onEditEntry != null && block.entry?.isPending != true;
 
-    return GestureDetector(
-      behavior: HitTestBehavior.opaque,
-      onLongPressStart: (details) async {
+    Future<void> showContextMenuAt(Offset globalPosition) async {
       final overlay = Overlay.of(context);
       final renderBox = overlay.context.findRenderObject() as RenderBox?;
       if (renderBox == null) return;
-        if (defaultTargetPlatform == TargetPlatform.android) {
-          HapticFeedback.lightImpact();
-        }
-        final anchor = details.globalPosition + const Offset(0, -8);
+      // Translate from global screen coordinates into the overlay's local space
+      // so the menu appears where the gesture happened.
+      final localPosition = renderBox.globalToLocal(globalPosition);
       final position = RelativeRect.fromRect(
-          Rect.fromLTWH(
-            anchor.dx,
-            anchor.dy,
-            1,
-            1,
-          ),
+        Rect.fromLTWH(localPosition.dx, localPosition.dy, 1, 1),
         Offset.zero & renderBox.size,
       );
 
@@ -467,11 +532,23 @@ class _ValueBlockMenu extends StatelessWidget {
         context: context,
         position: position,
         items: [
-            if (onEditEntry != null)
+          if (canEdit)
             const PopupMenuItem(
               value: _TimelineBlockAction.edit,
               child: Text('Edit'),
             ),
+          if (canModerate)
+            PopupMenuItem(
+              value: _TimelineBlockAction.approve,
+              enabled: !pendingActionsBusy,
+              child: const Text('Approve pending'),
+            ),
+          if (canModerate)
+            PopupMenuItem(
+              value: _TimelineBlockAction.reject,
+              enabled: !pendingActionsBusy,
+              child: const Text('Reject pending'),
+            ),
           if (onDeleteEntry != null)
             const PopupMenuItem(
               value: _TimelineBlockAction.delete,
@@ -489,9 +566,30 @@ class _ValueBlockMenu extends StatelessWidget {
         case _TimelineBlockAction.delete:
           onDeleteEntry?.call(entry);
           break;
+        case _TimelineBlockAction.approve:
+          onModeratePending?.call(entry, _PendingModerationAction.approve);
+          break;
+        case _TimelineBlockAction.reject:
+          onModeratePending?.call(entry, _PendingModerationAction.reject);
+          break;
       }
+    }
+
+    return GestureDetector(
+      behavior: HitTestBehavior.deferToChild,
+      onLongPressStart: (details) async {
+        if (defaultTargetPlatform == TargetPlatform.android) {
+          HapticFeedback.lightImpact();
+        }
+        await showContextMenuAt(details.globalPosition);
       },
-      child: _ValueBlockView(block: block),
+      onSecondaryTapDown: (details) async {
+        await showContextMenuAt(details.globalPosition);
+      },
+      child: _ValueBlockView(
+        block: block,
+        pendingActionsBusy: pendingActionsBusy,
+      ),
     );
   }
 }
@@ -514,7 +612,28 @@ String _formatAttrLabel(String code) {
 
 DateTime? _parseDateString(String? value) {
   if (value == null || value.isEmpty) return null;
-  return DateTime.tryParse(value);
+  final direct = DateTime.tryParse(value);
+  if (direct != null) return direct;
+  final maskedMatch =
+      RegExp(r'^(\\d{4})-(\\d{2}|xx|XX)-(\\d{2}|xx|XX)\$').firstMatch(value);
+  if (maskedMatch != null) {
+    final year = int.tryParse(maskedMatch.group(1) ?? '');
+    if (year == null) return null;
+    String normalize(String part, int fallback) {
+      final lower = part.toLowerCase();
+      if (lower == 'xx') return fallback.toString().padLeft(2, '0');
+      return part;
+    }
+
+    final month = int.tryParse(normalize(maskedMatch.group(2) ?? '01', 1)) ?? 1;
+    final day = int.tryParse(normalize(maskedMatch.group(3) ?? '01', 1)) ?? 1;
+    try {
+      return DateTime(year, month.clamp(1, 12), day.clamp(1, 31));
+    } catch (_) {
+      return null;
+    }
+  }
+  return null;
 }
 
 DateTime? _effectiveStart(LocoAttrVersion entry) {
@@ -546,8 +665,11 @@ class _TimelineModel {
   });
 
   factory _TimelineModel.fromEntries(List<LocoAttrVersion> entries) {
+    final effectiveEntries = entries
+        .where((e) => _effectiveStart(e) != null)
+        .toList();
     final grouped = <String, List<LocoAttrVersion>>{};
-    for (final entry in entries) {
+    for (final entry in effectiveEntries) {
       grouped.putIfAbsent(entry.attrCode, () => []).add(entry);
     }
     final now = DateTime.now();
@@ -573,7 +695,7 @@ class _TimelineModel {
           _ValueSegment(
             start: start,
             end: end,
-            value: entry.valueLabel,
+            value: _formatValueWithUnits(entry),
             entry: entry,
           ),
         );
@@ -676,6 +798,53 @@ class _TimelineModel {
   }
 }
 
+String _formatValueWithUnits(LocoAttrVersion entry) {
+  final raw = entry.valueLabel;
+  final code = entry.attrCode.toLowerCase();
+  final lowerRaw = raw.toLowerCase();
+  // Avoid double-appending if units already present.
+  final hasUnits = lowerRaw.contains('mm') ||
+      lowerRaw.contains('tonne') ||
+      lowerRaw.contains('kph') ||
+      lowerRaw.contains('mph');
+
+  double? asNumber = double.tryParse(raw);
+  String formatNumber(double value) {
+    if (value % 1 == 0) return value.toStringAsFixed(0);
+    return value.toStringAsFixed(2);
+  }
+
+  switch (code) {
+    case 'height':
+    case 'length':
+    case 'width':
+    case 'track_gauge':
+      if (hasUnits) return raw;
+      return asNumber != null ? '${formatNumber(asNumber)} mm' : '$raw mm';
+    case 'weight':
+      if (hasUnits) return raw;
+      return asNumber != null ? '${formatNumber(asNumber)} tonnes' : '$raw tonnes';
+    case 'power':
+      if (hasUnits) return raw;
+      return asNumber != null ? '${formatNumber(asNumber)} kW' : '$raw kW';
+    case 'tractive_effort':
+      if (hasUnits) return raw;
+      return asNumber != null ? '${formatNumber(asNumber)} kN' : '$raw kN';
+    case 'max_speed':
+      if (hasUnits) return raw;
+      if (asNumber != null) {
+        // Stored as kph.
+        final formatted = asNumber % 1 == 0
+            ? asNumber.toStringAsFixed(0)
+            : asNumber.toStringAsFixed(1);
+        return '$formatted kph';
+      }
+      return '$raw kph';
+    default:
+      return raw;
+  }
+}
+
 class _AxisSegment {
   final DateTime start;
   final DateTime end;
@@ -723,11 +892,13 @@ class _RowCell {
   final String value;
   final String rangeLabel;
   final Color color;
+  final bool isPending;
 
   const _RowCell({
     required this.value,
     required this.rangeLabel,
     required this.color,
+    this.isPending = false,
   });
 
   factory _RowCell.fromSegment(_ValueSegment seg) {
@@ -736,13 +907,23 @@ class _RowCell {
         value: '',
         rangeLabel: '',
         color: Colors.transparent,
+        isPending: false,
       );
     }
-    final displayStart = _formatDate(seg.start) ?? '';
+    final entry = seg.entry;
+    String displayStart = '';
+    if (entry != null) {
+      if ((entry.maskedValidFrom ?? '').trim().isNotEmpty) {
+        displayStart = entry.maskedValidFrom!.trim();
+      } else if (entry.validFrom != null) {
+        displayStart = _formatDate(entry.validFrom) ?? '';
+      }
+    }
     return _RowCell(
       value: seg.value,
       rangeLabel: displayStart,
       color: _colorForValue(seg.value),
+      isPending: entry?.isPending ?? false,
     );
   }
 }

lib/components/pages/logbook.dart

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

lib/components/pages/more.dart

@@ -0,0 +1,13 @@
+import 'package:flutter/material.dart';
+import 'package:mileograph_flutter/components/pages/more/more_home_page.dart';
+
+export 'more/admin_page.dart';
+
+class MorePage extends StatelessWidget {
+  const MorePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const MoreHomePage();
+  }
+}

lib/components/pages/more/admin_page.dart

@@ -0,0 +1,489 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:provider/provider.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/api_service.dart';
+import 'package:mileograph_flutter/services/authservice.dart';
+
+class AdminPage extends StatefulWidget {
+  const AdminPage({super.key});
+
+  @override
+  State<AdminPage> createState() => _AdminPageState();
+}
+
+class _AdminPageState extends State<AdminPage> {
+  final TextEditingController _titleController = TextEditingController();
+  final TextEditingController _bodyController = TextEditingController();
+
+  final List<UserSummary> _selectedUsers = [];
+  List<UserSummary> _userOptions = [];
+
+  List<String> _channels = [];
+  String? _selectedChannel;
+  String? _channelError;
+  bool _loadingChannels = false;
+
+  String? _userError;
+
+  bool _sending = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadChannels();
+  }
+
+  @override
+  void dispose() {
+    _titleController.dispose();
+    _bodyController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _loadChannels() async {
+    setState(() {
+      _loadingChannels = true;
+      _channelError = null;
+    });
+    try {
+      final api = context.read<ApiService>();
+      final json = await api.get('/notifications/channels');
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['channels', 'data']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      final parsed =
+          list?.map((e) => e.toString()).where((e) => e.isNotEmpty).toList() ??
+              const [];
+      setState(() {
+        _channels = parsed;
+        _selectedChannel = parsed.isNotEmpty ? parsed.first : null;
+      });
+    } catch (e) {
+      setState(() {
+        _channelError = 'Failed to load channels';
+      });
+    } finally {
+      if (mounted) setState(() => _loadingChannels = false);
+    }
+  }
+
+  Future<List<UserSummary>> _fetchUserSuggestions(
+    ApiService api,
+    String query,
+  ) async {
+    final encoded = Uri.encodeComponent(query);
+    final candidates = [
+      '/users/search?q=$encoded',
+      '/users/search?query=$encoded',
+      '/users?search=$encoded',
+    ];
+    for (final path in candidates) {
+      try {
+        final json = await api.get(path);
+        List<dynamic>? list;
+        if (json is List) {
+          list = json;
+        } else if (json is Map) {
+          for (final key in ['users', 'data', 'results', 'items']) {
+            final value = json[key];
+            if (value is List) {
+              list = value;
+              break;
+            }
+          }
+        }
+        if (list != null) {
+          return list
+              .whereType<Map>()
+              .map((e) => UserSummary.fromJson(
+                    e.map((k, v) => MapEntry(k.toString(), v)),
+                  ))
+              .toList();
+        }
+      } catch (_) {
+        // Try next endpoint
+      }
+    }
+    return const [];
+  }
+
+  void _removeUser(UserSummary user) {
+    setState(() {
+      _selectedUsers.removeWhere((u) => u.userId == user.userId);
+    });
+  }
+
+  Future<void> _openUserPicker() async {
+    final api = context.read<ApiService>();
+    var tempSelected = List<UserSummary>.from(_selectedUsers);
+    var options = List<UserSummary>.from(_userOptions);
+    String query = '';
+    bool loading = false;
+    String? error = _userError;
+
+    Future<void> runSearch(String q, void Function(void Function()) setModalState) async {
+      setModalState(() {
+        query = q;
+        loading = true;
+        error = null;
+      });
+      try {
+        final results = await _fetchUserSuggestions(api, q);
+        setModalState(() {
+          options = results;
+          loading = false;
+          error = null;
+        });
+        if (mounted) {
+          setState(() {
+            _userOptions = results;
+            _userError = null;
+          });
+        }
+      } catch (e) {
+        setModalState(() {
+          loading = false;
+          error = 'Failed to search users';
+        });
+        if (mounted) {
+          setState(() {
+            _userError = 'Failed to search users';
+          });
+        }
+      }
+    }
+
+    var initialFetchTriggered = false;
+
+    await showModalBottomSheet<void>(
+      context: context,
+      isScrollControlled: true,
+      builder: (ctx) {
+        return StatefulBuilder(
+          builder: (ctx, setModalState) {
+            if (!initialFetchTriggered && !loading && options.isEmpty) {
+              initialFetchTriggered = true;
+              WidgetsBinding.instance.addPostFrameCallback(
+                (_) => runSearch('', setModalState),
+              );
+            }
+            final lowerQuery = query.toLowerCase();
+            final filtered = lowerQuery.isEmpty
+                ? options
+                : options.where((u) {
+                    return u.displayName.toLowerCase().contains(lowerQuery) ||
+                        u.username.toLowerCase().contains(lowerQuery) ||
+                        u.email.toLowerCase().contains(lowerQuery);
+                  }).toList();
+            return SafeArea(
+              child: Padding(
+                padding: EdgeInsets.only(
+                  left: 16,
+                  right: 16,
+                  top: 16,
+                  bottom: MediaQuery.of(ctx).viewInsets.bottom + 16,
+                ),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        Text(
+                          'Select recipients',
+                          style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                                fontWeight: FontWeight.w700,
+                              ),
+                        ),
+                        const Spacer(),
+                        TextButton(
+                          onPressed: () {
+                            setModalState(() {
+                              tempSelected.clear();
+                            });
+                            setState(() => _selectedUsers.clear());
+                          },
+                          child: const Text('Clear'),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    TextField(
+                      decoration: const InputDecoration(
+                        labelText: 'Search users',
+                        border: OutlineInputBorder(),
+                      ),
+                      onChanged: (val) => runSearch(val, setModalState),
+                    ),
+                    if (loading)
+                      const Padding(
+                        padding: EdgeInsets.only(top: 8.0),
+                        child: LinearProgressIndicator(minHeight: 2),
+                      ),
+                    if (error != null)
+                      Padding(
+                        padding: const EdgeInsets.only(top: 8.0),
+                        child: Text(
+                          error!,
+                          style:
+                              TextStyle(color: Theme.of(context).colorScheme.error),
+                        ),
+                      ),
+                    const SizedBox(height: 12),
+                    SizedBox(
+                      height: 340,
+                      child: filtered.isEmpty
+                          ? const Center(child: Text('No users yet.'))
+                          : ListView.builder(
+                              itemCount: filtered.length,
+                              itemBuilder: (_, index) {
+                                final user = filtered[index];
+                                final selected =
+                                    tempSelected.any((u) => u.userId == user.userId);
+                                return CheckboxListTile(
+                                  value: selected,
+                                  title: Text(user.displayName),
+                                  subtitle: user.email.isNotEmpty
+                                      ? Text(user.email)
+                                      : (user.username.isNotEmpty
+                                          ? Text(user.username)
+                                          : null),
+                                  onChanged: (val) {
+                                    setModalState(() {
+                                      if (val == true) {
+                                        if (!tempSelected
+                                            .any((u) => u.userId == user.userId)) {
+                                          tempSelected.add(user);
+                                        }
+                                      } else {
+                                        tempSelected.removeWhere(
+                                            (u) => u.userId == user.userId);
+                                      }
+                                    });
+                                    if (mounted) {
+                                      setState(() {
+                                        _selectedUsers
+                                          ..clear()
+                                          ..addAll(tempSelected);
+                                      });
+                                    }
+                                  },
+                                );
+                              },
+                            ),
+                    ),
+                    const SizedBox(height: 8),
+                    Align(
+                      alignment: Alignment.centerRight,
+                      child: TextButton(
+                        onPressed: () => Navigator.of(ctx).pop(),
+                        child: const Text('Done'),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+
+  Future<void> _sendNotification() async {
+    final channel = _selectedChannel;
+    if (channel == null || channel.isEmpty) {
+      _showSnack('Select a channel first.');
+      return;
+    }
+    if (_selectedUsers.isEmpty) {
+      _showSnack('Select at least one user.');
+      return;
+    }
+    final title = _titleController.text.trim();
+    final body = _bodyController.text.trim();
+    if (title.isEmpty || body.isEmpty) {
+      _showSnack('Title and body are required.');
+      return;
+    }
+    setState(() => _sending = true);
+    try {
+      final api = context.read<ApiService>();
+      await api.post('/notifications/new', {
+        'user_ids': _selectedUsers.map((e) => e.userId).toList(),
+        'channel': channel,
+        'title': title,
+        'body': body,
+      });
+      if (!mounted) return;
+      _showSnack('Notification sent');
+      setState(() {
+        _selectedUsers.clear();
+        _titleController.clear();
+        _bodyController.clear();
+        _userOptions.clear();
+      });
+    } catch (e) {
+      _showSnack('Failed to send: $e');
+    } finally {
+      if (mounted) setState(() => _sending = false);
+    }
+  }
+
+  void _showSnack(String message) {
+    ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(message)));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isAdmin = context.select<AuthService, bool>((auth) => auth.isElevated);
+    if (!isAdmin) {
+      return const Scaffold(
+        body: Center(child: Text('You do not have access to this page.')),
+      );
+    }
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Admin'),
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () {
+            final navigator = Navigator.of(context);
+            if (navigator.canPop()) {
+              navigator.maybePop();
+            } else {
+              context.go('/more');
+            }
+          },
+          tooltip: 'Back',
+        ),
+      ),
+      body: ListView(
+        padding: const EdgeInsets.all(16),
+        children: [
+          Text(
+            'Send notification',
+            style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                  fontWeight: FontWeight.w700,
+                ),
+          ),
+          const SizedBox(height: 12),
+          _buildUserPicker(),
+          const SizedBox(height: 12),
+          DropdownButtonFormField<String>(
+            value: _selectedChannel,
+            decoration: const InputDecoration(
+              labelText: 'Channel',
+              border: OutlineInputBorder(),
+            ),
+            items: _channels
+                .map(
+                  (c) => DropdownMenuItem(
+                    value: c,
+                    child: Text(c),
+                  ),
+                )
+                .toList(),
+            onChanged:
+                _loadingChannels ? null : (val) => setState(() => _selectedChannel = val),
+          ),
+          if (_loadingChannels)
+            const Padding(
+              padding: EdgeInsets.only(top: 8.0),
+              child: LinearProgressIndicator(minHeight: 2),
+            ),
+          if (_channelError != null)
+            Padding(
+              padding: const EdgeInsets.only(top: 8.0),
+              child: Text(
+                _channelError!,
+                style: TextStyle(color: Theme.of(context).colorScheme.error),
+              ),
+            ),
+          const SizedBox(height: 12),
+          TextField(
+            controller: _titleController,
+            decoration: const InputDecoration(
+              labelText: 'Title',
+              border: OutlineInputBorder(),
+            ),
+          ),
+          const SizedBox(height: 12),
+          TextField(
+            controller: _bodyController,
+            minLines: 3,
+            maxLines: 6,
+            decoration: const InputDecoration(
+              labelText: 'Body',
+              border: OutlineInputBorder(),
+            ),
+          ),
+          const SizedBox(height: 16),
+          SizedBox(
+            width: double.infinity,
+            child: ElevatedButton.icon(
+              onPressed: _sending ? null : _sendNotification,
+              icon: _sending
+                  ? const SizedBox(
+                      width: 18,
+                      height: 18,
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    )
+                  : const Icon(Icons.send),
+              label: Text(_sending ? 'Sending...' : 'Send notification'),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildUserPicker() {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          'Recipients',
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+        const SizedBox(height: 8),
+        Wrap(
+          spacing: 8,
+          runSpacing: 8,
+          children: _selectedUsers
+              .map(
+                (u) => InputChip(
+                  label: Text(u.displayName),
+                  onDeleted: () => _removeUser(u),
+                ),
+              )
+              .toList(),
+        ),
+        const SizedBox(height: 8),
+        OutlinedButton.icon(
+          onPressed: _openUserPicker,
+          icon: const Icon(Icons.person_search),
+          label: const Text('Select users'),
+        ),
+        if (_userError != null)
+          Padding(
+            padding: const EdgeInsets.only(top: 8.0),
+            child: Text(
+              _userError!,
+              style: TextStyle(color: Theme.of(context).colorScheme.error),
+            ),
+          ),
+      ],
+    );
+  }
+}

lib/components/pages/more/more_home_page.dart

@@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:provider/provider.dart';
+import 'package:mileograph_flutter/services/authservice.dart';
+
+class MoreHomePage extends StatelessWidget {
+  const MoreHomePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final isAdmin = context.select<AuthService, bool>((auth) => auth.isElevated);
+    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.person),
+                title: const Text('Profile'),
+                onTap: () => context.go('/more/profile'),
+              ),
+              const Divider(height: 1),
+              ListTile(
+                leading: const Icon(Icons.emoji_events),
+                title: const Text('Badges'),
+                onTap: () => context.go('/more/badges'),
+              ),
+              const Divider(height: 1),
+              ListTile(
+                leading: const Icon(Icons.bar_chart),
+                title: const Text('Stats'),
+                onTap: () => context.go('/more/stats'),
+              ),
+              const Divider(height: 1),
+              ListTile(
+                leading: const Icon(Icons.settings),
+                title: const Text('Settings'),
+                onTap: () => context.go('/more/settings'),
+              ),
+              if (isAdmin) const Divider(height: 1),
+              if (isAdmin)
+                ListTile(
+                  leading: const Icon(Icons.admin_panel_settings),
+                  title: const Text('Admin'),
+                  onTap: () => context.go('/more/admin'),
+                ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/components/pages/more/user_profile_page.dart

@@ -0,0 +1,529 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:provider/provider.dart';
+import 'package:mileograph_flutter/components/legs/leg_card.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/authservice.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+
+class UserProfilePage extends StatefulWidget {
+  const UserProfilePage({super.key, this.userId, this.initialUser});
+
+  final String? userId;
+  final UserSummary? initialUser;
+
+  @override
+  State<UserProfilePage> createState() => _UserProfilePageState();
+}
+
+class _UserProfilePageState extends State<UserProfilePage> {
+  static const int _pageSize = 22;
+  UserProfileDetail? _profile;
+  List<Leg> _legs = const [];
+  bool _loading = false;
+  bool _loadingMore = false;
+  bool _hasMore = false;
+  bool _lastFetchReturnedData = true;
+  Friendship? _friendship;
+  bool _actionsLoading = false;
+
+  String? get _userId => widget.initialUser?.userId ?? widget.userId;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _loadProfile();
+    });
+  }
+
+  Future<void> _loadProfile() async {
+    final userId = _userId;
+    if (userId == null || userId.isEmpty) {
+      if (mounted) {
+        ScaffoldMessenger.of(
+          context,
+        ).showSnackBar(const SnackBar(content: Text('No user selected.')));
+        context.pop();
+      }
+      return;
+    }
+    setState(() {
+      _loading = true;
+      _hasMore = false;
+      _legs = const [];
+    });
+    final data = context.read<DataService>();
+    try {
+      final profile = await data.fetchUserProfileDetail(userId);
+      final friendship = await data.fetchFriendshipStatus(userId);
+      if (!mounted) return;
+      if (profile == null) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('Failed to load user profile.')),
+        );
+        return;
+      }
+      final legs = profile.legs;
+      setState(() {
+        _profile = profile;
+        _legs = legs;
+        _lastFetchReturnedData = legs.isNotEmpty;
+        _hasMore = _lastFetchReturnedData && _legs.length >= _pageSize;
+        _friendship = friendship;
+      });
+    } finally {
+      if (mounted) setState(() => _loading = false);
+    }
+  }
+
+  Future<void> _loadMore() async {
+    final userId = _userId;
+    if (userId == null || userId.isEmpty || _loadingMore || !_hasMore) return;
+    setState(() => _loadingMore = true);
+    final data = context.read<DataService>();
+    try {
+      final more = await data.fetchUserLegs(
+        userId: userId,
+        offset: _legs.length,
+        limit: _pageSize,
+      );
+      if (!mounted) return;
+      setState(() {
+        _legs = [..._legs, ...more];
+        _lastFetchReturnedData = more.isNotEmpty;
+        _hasMore = _lastFetchReturnedData && _legs.length >= _pageSize;
+      });
+    } finally {
+      if (mounted) setState(() => _loadingMore = false);
+    }
+  }
+
+  void _handleBack() {
+    final router = GoRouter.of(context);
+    if (router.canPop()) {
+      router.pop();
+    } else {
+      router.go('/more/profile');
+    }
+  }
+
+  Widget _buildProfileHeader(ThemeData theme) {
+    final profile = _profile;
+    final username = profile?.username ?? widget.initialUser?.username ?? '';
+    final fullName = profile?.fullName ?? widget.initialUser?.fullName ?? '';
+    final mileage = profile?.mileage;
+    final privacy = profile?.privacyInfo;
+    final mileageHidden =
+        (mileage == null || mileage == 0) &&
+        privacy != null &&
+        privacy.isNotEmpty;
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(12.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                const CircleAvatar(child: Icon(Icons.person)),
+                const SizedBox(width: 12),
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      fullName.isNotEmpty ? fullName : username,
+                      style: theme.textTheme.titleMedium,
+                    ),
+                    if (username.isNotEmpty)
+                      Text('@$username', style: theme.textTheme.bodySmall),
+                  ],
+                ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            Text(
+              mileageHidden
+                  ? 'Mileage hidden'
+                  : 'Mileage: ${(mileage ?? 0).toStringAsFixed(1)}',
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTopLocos() {
+    final profile = _profile;
+    if (profile == null || profile.topLocos.isEmpty) {
+      return const SizedBox.shrink();
+    }
+    final topTen = [...profile.topLocos]
+      ..sort((a, b) => (b.mileage ?? 0).compareTo(a.mileage ?? 0));
+    final displayLocos = topTen.take(10).toList();
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(12.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              'Top locos by mileage',
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const SizedBox(height: 8),
+            ListView.separated(
+              physics: const NeverScrollableScrollPhysics(),
+              shrinkWrap: true,
+              itemCount: displayLocos.length,
+              separatorBuilder: (context, index) => const Divider(height: 1),
+              itemBuilder: (context, index) {
+                final loco = displayLocos[index];
+                final mileage = loco.mileage ?? 0;
+                return ListTile(
+                  leading: CircleAvatar(
+                    backgroundColor: Theme.of(
+                      context,
+                    ).colorScheme.primary.withValues(alpha: 0.1),
+                    child: Text(
+                      '${index + 1}',
+                      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                  title: Text(
+                    loco.number.isNotEmpty ? loco.number : 'Unknown',
+                    style: Theme.of(context).textTheme.bodyLarge,
+                  ),
+                  subtitle: Text(loco.locoClass),
+                  trailing: Text(
+                    '${mileage.toStringAsFixed(1)} mi',
+                    style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                      fontWeight: FontWeight.w700,
+                    ),
+                  ),
+                );
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  List<Widget> _buildLegsWithDividers(
+    BuildContext context,
+    List<Leg> legs, {
+    required bool showEditButton,
+  }) {
+    final widgets = <Widget>[];
+    String? currentDate;
+    final dayLegs = <Leg>[];
+
+    void flushDay() {
+      final date = currentDate;
+      if (date == null) return;
+      widgets.add(
+        Padding(
+          padding: const EdgeInsets.symmetric(vertical: 8.0),
+          child: Text(
+            date,
+            style: Theme.of(
+              context,
+            ).textTheme.labelMedium?.copyWith(fontWeight: FontWeight.w700),
+          ),
+        ),
+      );
+      widgets.add(const Divider());
+      widgets.addAll(
+        dayLegs.map(
+          (leg) => LegCard(
+            leg: leg,
+            showDate: false,
+            showEditButton: showEditButton,
+          ),
+        ),
+      );
+      dayLegs.clear();
+    }
+
+    for (final leg in legs) {
+      final dateStr = _formatDate(leg.beginTime) ?? '';
+      if (currentDate != null && dateStr != currentDate) {
+        flushDay();
+      }
+      currentDate = dateStr;
+      dayLegs.add(leg);
+    }
+
+    flushDay();
+    return widgets;
+  }
+
+  String? _formatDate(DateTime? date) {
+    if (date == null) return null;
+    return '${date.year.toString().padLeft(4, '0')}-${date.month.toString().padLeft(2, '0')}-${date.day.toString().padLeft(2, '0')}';
+  }
+
+  Widget _buildFriendSection(AuthService auth) {
+    final friendship = _friendship;
+    if (friendship == null) {
+      return const SizedBox.shrink();
+    }
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(12.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Text(
+                  'Friendship',
+                  style: Theme.of(context).textTheme.titleMedium,
+                ),
+                const SizedBox(width: 8),
+                _buildStatusChip(friendship, auth),
+              ],
+            ),
+            const SizedBox(height: 8),
+            _buildActions(friendship, auth),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildStatusChip(Friendship status, AuthService auth) {
+    String label = status.status;
+    Color color = Colors.grey;
+    switch (status.status.toLowerCase()) {
+      case 'accepted':
+        label = 'Friends';
+        color = Colors.green;
+        break;
+      case 'pending':
+        final isRequester = status.requesterId == auth.userId;
+        label = isRequester
+            ? 'Pending (you sent)'
+            : 'Pending (needs your reply)';
+        color = Colors.orange;
+        break;
+      case 'blocked':
+        color = Colors.red;
+        label = 'Blocked';
+        break;
+      case 'declined':
+      case 'rejected':
+        label = 'Declined';
+        break;
+      default:
+        label = 'Not friends';
+    }
+    final bg = Color.alphaBlend(
+      color.withValues(alpha: 0.15),
+      Theme.of(context).colorScheme.surface,
+    );
+    return Container(
+      margin: const EdgeInsets.only(left: 6),
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+      decoration: BoxDecoration(
+        color: bg,
+        borderRadius: BorderRadius.circular(20),
+      ),
+      child: Text(label),
+    );
+  }
+
+  Widget _buildActions(Friendship status, AuthService auth) {
+    final targetUserId = _userId;
+    final isSelf = targetUserId != null && targetUserId == auth.userId;
+    if (isSelf) return const Text('This is you.');
+    final isRequester = status.requesterId == auth.userId;
+    final id = status.id;
+    final buttons = <Widget>[];
+
+    Future<void> run(Future<void> Function() action) async {
+      setState(() => _actionsLoading = true);
+      try {
+        await action();
+      } finally {
+        if (mounted) setState(() => _actionsLoading = false);
+      }
+    }
+
+    final data = context.read<DataService>();
+
+    if (status.isNone || status.isDeclined) {
+      buttons.add(
+        ElevatedButton.icon(
+          onPressed: _actionsLoading
+              ? null
+              : () => run(() async {
+                  final updated = await data.requestFriendship(
+                    status.addresseeId,
+                  );
+                  if (!mounted) return;
+                  setState(() => _friendship = updated);
+                }),
+          icon: const Icon(Icons.person_add),
+          label: const Text('Send friend request'),
+        ),
+      );
+    } else if (status.isPending) {
+      if (isRequester) {
+        buttons.add(
+          OutlinedButton(
+            onPressed: _actionsLoading || id == null || id.isEmpty
+                ? null
+                : () => run(() async {
+                    await data.cancelFriendship(id);
+                    if (!mounted) return;
+                    setState(
+                      () => _friendship = status.copyWith(status: 'none'),
+                    );
+                  }),
+            child: const Text('Cancel request'),
+          ),
+        );
+      } else {
+        buttons.add(
+          ElevatedButton(
+            onPressed: _actionsLoading || id == null || id.isEmpty
+                ? null
+                : () => run(() async {
+                    final updated = await data.acceptFriendship(id);
+                    if (!mounted) return;
+                    setState(() => _friendship = updated);
+                  }),
+            child: const Text('Accept'),
+          ),
+        );
+        buttons.add(
+          OutlinedButton(
+            onPressed: _actionsLoading || id == null || id.isEmpty
+                ? null
+                : () => run(() async {
+                    final updated = await data.rejectFriendship(id);
+                    if (!mounted) return;
+                    setState(() => _friendship = updated);
+                  }),
+            child: const Text('Reject'),
+          ),
+        );
+      }
+    } else if (status.isAccepted) {
+      buttons.add(
+        ElevatedButton.icon(
+          onPressed: _actionsLoading || id == null || id.isEmpty
+              ? null
+              : () => run(() async {
+                  await data.deleteFriendship(id);
+                  if (!mounted) return;
+                  setState(() => _friendship = status.copyWith(status: 'none'));
+                }),
+          icon: const Icon(Icons.person_remove),
+          label: const Text('Unfriend'),
+        ),
+      );
+    }
+
+    if (buttons.isEmpty) return const SizedBox.shrink();
+
+    return Wrap(spacing: 8, runSpacing: 8, children: buttons);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final auth = context.watch<AuthService>();
+    final theme = Theme.of(context);
+    final canEdit = auth.userId != null && auth.userId == _userId;
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('User profile'),
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: _handleBack,
+        ),
+      ),
+      body: RefreshIndicator(
+        onRefresh: _loadProfile,
+        child: ListView(
+          padding: const EdgeInsets.all(16),
+          children: [
+            _buildProfileHeader(theme),
+            const SizedBox(height: 12),
+            _buildFriendSection(auth),
+            const SizedBox(height: 12),
+            _buildTopLocos(),
+            const SizedBox(height: 12),
+            Card(
+              child: Padding(
+                padding: const EdgeInsets.all(12.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Text('Entries', style: theme.textTheme.titleMedium),
+                        if (_loading)
+                          const SizedBox(
+                            width: 16,
+                            height: 16,
+                            child: CircularProgressIndicator(strokeWidth: 2),
+                          ),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    if (_loading && _legs.isEmpty)
+                      const Center(
+                        child: Padding(
+                          padding: EdgeInsets.symmetric(vertical: 16.0),
+                          child: CircularProgressIndicator(),
+                        ),
+                      )
+                    else if (_legs.isEmpty)
+                      Text(
+                        (_profile?.privacyInfo.isNotEmpty ?? false)
+                            ? 'Hidden due to privacy settings.'
+                            : 'No entries found.',
+                      )
+                    else ...[
+                      ..._buildLegsWithDividers(
+                        context,
+                        _legs,
+                        showEditButton: canEdit,
+                      ),
+                      const SizedBox(height: 8),
+                      if ((_hasMore || _loadingMore) && _legs.isNotEmpty)
+                        Align(
+                          alignment: Alignment.center,
+                          child: OutlinedButton.icon(
+                            onPressed: _loadingMore ? null : _loadMore,
+                            icon: _loadingMore
+                                ? const SizedBox(
+                                    height: 14,
+                                    width: 14,
+                                    child: CircularProgressIndicator(
+                                      strokeWidth: 2,
+                                    ),
+                                  )
+                                : const Icon(Icons.expand_more),
+                            label: Text(
+                              _loadingMore ? 'Loading...' : 'Load more',
+                            ),
+                          ),
+                        ),
+                    ],
+                  ],
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/components/pages/new_entry/new_entry.dart

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

lib/components/pages/new_entry/new_entry_draft_logic.dart

@@ -4,15 +4,28 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
   Future<bool> _handleExitIntent() async {
     if (!mounted) return false;
     if (_isEditing) return true;
+    if (_activeLegShare != null) return true;
     if (_formIsEmpty()) return true;
     if (_activeDraftId != null && !_draftChangedFromBaseline()) {
       return true;
     }
+    final currentSnapshot = _currentSubmissionSnapshot();
+    if (_lastSubmittedSnapshot != null &&
+        _snapshotEquality.equals(_lastSubmittedSnapshot, currentSnapshot)) {
+      return true;
+    }
     final choice = await _promptSaveDraft();
     if (choice == _ExitChoice.cancel) return false;
     if (choice == _ExitChoice.save) {
+      try {
         await _saveDraftEntry(draftId: _activeDraftId);
+      } catch (_) {
+        return true;
+      }
     } else if (choice == _ExitChoice.discard) {
+      // Delay reset to avoid setState during the dialog/build phase.
+      await Future<void>.delayed(Duration.zero);
+      if (!mounted) return false;
       await _resetFormState(clearDraft: true);
       _activeDraftId = null;
     }
@@ -29,18 +42,28 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
   }
 
   bool _formIsEmpty() {
+    final beginDelayVal = _parseDelayMinutes(_beginDelayController.text);
+    final endDelayVal = _parseDelayMinutes(_endDelayController.text);
     return _startController.text.trim().isEmpty &&
         _endController.text.trim().isEmpty &&
         _headcodeController.text.trim().isEmpty &&
         _notesController.text.trim().isEmpty &&
         _networkController.text.trim().isEmpty &&
         _mileageController.text.trim().isEmpty &&
+        _originController.text.trim().isEmpty &&
+        _destinationController.text.trim().isEmpty &&
+        beginDelayVal == 0 &&
+        endDelayVal == 0 &&
+        !_hasOriginTime &&
+        !_hasDestinationTime &&
+        !_hasEndTime &&
         _routeResult == null &&
         _tractionItems.length <= 1;
   }
 
   Future<_ExitChoice> _promptSaveDraft() async {
     if (!mounted) return _ExitChoice.cancel;
+    try {
       final result = await showDialog<_ExitChoice>(
         context: context,
         barrierDismissible: false,
@@ -66,10 +89,15 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
           ],
         ),
       );
+      if (!mounted) return _ExitChoice.cancel;
       return result ?? _ExitChoice.cancel;
+    } catch (_) {
+      return _ExitChoice.cancel;
+    }
   }
 
   Future<void> _openDrafts() async {
+    if (_activeLegShare != null) return;
     final selected = await Navigator.of(context).push<_StoredDraft>(
       MaterialPageRoute(
         builder: (_) => _DraftListPage(
@@ -84,8 +112,37 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
     }
   }
 
+  Future<void> _saveDraftManually() async {
+    if (_activeLegShare != null) return;
+    if (_savingDraft) return;
+    if (_formIsEmpty()) {
+      ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+        const SnackBar(content: Text('Nothing to save yet.')),
+      );
+      return;
+    }
+    final hadDraft = _activeDraftId != null;
+    _setState(() => _savingDraft = true);
+    try {
+      await _saveDraftEntry(draftId: _activeDraftId);
+      if (!mounted) return;
+      ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+        SnackBar(content: Text(hadDraft ? 'Draft updated' : 'Draft saved')),
+      );
+    } catch (e) {
+      if (!mounted) return;
+      ScaffoldMessenger.maybeOf(context)?.showSnackBar(
+        SnackBar(content: Text('Failed to save draft: $e')),
+      );
+    } finally {
+      if (mounted) _setState(() => _savingDraft = false);
+    }
+  }
+
   Future<void> _saveDraft() async {
-    if (_restoringDraft || !_draftPersistenceEnabled) return;
+    if (_restoringDraft || !_draftPersistenceEnabled || _activeLegShare != null) {
+      return;
+    }
     final prefs = await SharedPreferences.getInstance();
     final draft = {
       "date": _selectedDate.toIso8601String(),
@@ -96,6 +153,30 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
       "notes": _notesController.text,
       "mileage": _mileageController.text,
       "network": _networkController.text,
+      "origin": _originController.text,
+      "destination": _destinationController.text,
+      "hasEndTime": _hasEndTime,
+      "hasOriginTime": _hasOriginTime,
+      "hasDestinationTime": _hasDestinationTime,
+      "endDate": _selectedEndDate.toIso8601String(),
+      "endTime": {
+        "hour": _selectedEndTime.hour,
+        "minute": _selectedEndTime.minute,
+      },
+      "originDate": _selectedOriginDate.toIso8601String(),
+      "originTime": {
+        "hour": _selectedOriginTime.hour,
+        "minute": _selectedOriginTime.minute,
+      },
+      "destinationDate": _selectedDestinationDate.toIso8601String(),
+      "destinationTime": {
+        "hour": _selectedDestinationTime.hour,
+        "minute": _selectedDestinationTime.minute,
+      },
+      "matchOriginToEntry": _matchOriginToEntry,
+      "matchDestinationToEntry": _matchDestinationToEntry,
+      "beginDelay": _parseDelayMinutes(_beginDelayController.text),
+      "endDelay": _parseDelayMinutes(_endDelayController.text),
       "useManualMileage": _useManualMileage,
       "selectedTripId": _selectedTripId,
       "routeResult": _routeResult == null
@@ -107,6 +188,14 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
               "distance": _routeResult!.distance,
             },
       "tractionItems": _serializeTractionItems(),
+      "shareUserIds": _shareUserIds.toList(),
+      "shareUsers": _shareUsers
+          .map((u) => {
+                "user_id": u.userId,
+                "username": u.username,
+                "full_name": u.fullName,
+              })
+          .toList(),
     };
     await prefs.setString(_kDraftPrefsKey, jsonEncode(draft));
   }
@@ -173,7 +262,14 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
     required String id,
     bool includeTimestamp = true,
   }) {
+    final units = _distanceUnits(context);
     final routeStations = _routeResult?.calculatedRoute ?? [];
+    final endTime = _legEndDateTime;
+    final originTime = _originDateTime;
+    final destinationTime = _destinationDateTime;
+    final beginDelay = _parseDelayMinutes(_beginDelayController.text);
+    final endDelay =
+        _hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0;
     final startVal = _useManualMileage
         ? _startController.text.trim()
         : (routeStations.isNotEmpty ? routeStations.first : '');
@@ -181,30 +277,36 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
         ? _endController.text.trim()
         : (routeStations.isNotEmpty ? routeStations.last : '');
     final mileageVal = _useManualMileage
-        ? double.tryParse(_mileageController.text.trim()) ?? 0
+        ? (units.milesFromInput(_mileageController.text.trim()) ?? 0)
         : (_routeResult?.distance ?? 0);
     final tractionPayload = _buildTractionPayload();
+    final commonPayload = {
+      "leg_trip": _selectedTripId,
+      "leg_begin_time": _legDateTime.toIso8601String(),
+      if (endTime != null) "leg_end_time": endTime.toIso8601String(),
+      if (originTime != null) "leg_origin_time": originTime.toIso8601String(),
+      if (destinationTime != null)
+        "leg_destination_time": destinationTime.toIso8601String(),
+      "leg_notes": _notesController.text.trim(),
+      "leg_headcode": _headcodeController.text.trim(),
+      "leg_network": _networkController.text.trim(),
+      "leg_origin": _originController.text.trim(),
+      "leg_destination": _destinationController.text.trim(),
+      "leg_begin_delay": beginDelay,
+      if (_hasEndTime) "leg_end_delay": endDelay,
+      "locos": tractionPayload,
+    };
     final payload = _useManualMileage
         ? {
-            "leg_trip": _selectedTripId,
+            ...commonPayload,
             "leg_start": startVal,
             "leg_end": endVal,
-            "leg_begin_time": _legDateTime.toIso8601String(),
-            "leg_network": _networkController.text.trim(),
             "leg_distance": mileageVal,
             "isKilometers": false,
-            "leg_notes": _notesController.text.trim(),
-            "leg_headcode": _headcodeController.text.trim(),
-            "locos": tractionPayload,
           }
         : {
-            "leg_trip": _selectedTripId,
-            "leg_begin_time": _legDateTime.toIso8601String(),
+            ...commonPayload,
             "leg_route": routeStations,
-            "leg_notes": _notesController.text.trim(),
-            "leg_headcode": _headcodeController.text.trim(),
-            "leg_network": _networkController.text.trim(),
-            "locos": tractionPayload,
             "leg_mileage": _routeResult?.distance ?? mileageVal,
           };
     return {
@@ -212,6 +314,7 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
       if (includeTimestamp) "saved_at": DateTime.now().toIso8601String(),
       "mode": _useManualMileage ? 'manual' : 'auto',
       "payload": payload,
+      "mileageText": _mileageController.text.trim(),
       "routeResult": _routeResult == null
           ? null
           : {
@@ -221,6 +324,14 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
               "distance": _routeResult!.distance,
             },
       "tractionItems": _serializeTractionItems(),
+      "shareUserIds": _shareUserIds.toList(),
+      "shareUsers": _shareUsers
+          .map((u) => {
+                "user_id": u.userId,
+                "username": u.username,
+                "full_name": u.fullName,
+              })
+          .toList(),
     };
   }
 
@@ -238,8 +349,32 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
     final beginTime = beginStr == null
         ? DateTime.now()
         : DateTime.tryParse(beginStr) ?? DateTime.now();
+    final originTimeStr = payload['leg_origin_time'] as String?;
+    final destinationTimeStr = payload['leg_destination_time'] as String?;
+    final originTime =
+        originTimeStr == null ? null : DateTime.tryParse(originTimeStr);
+    final destinationTime = destinationTimeStr == null
+        ? null
+        : DateTime.tryParse(destinationTimeStr);
+    final endStr = payload['leg_end_time'] as String?;
+    final endTime =
+        endStr == null ? null : DateTime.tryParse(endStr);
+    final beginDelay =
+        _parseDelayMinutes('${payload['leg_begin_delay'] ?? ''}');
+    final endDelay =
+        _parseDelayMinutes('${payload['leg_end_delay'] ?? ''}');
+    final hasEndTime = endTime != null || endDelay != 0;
+    final matchOrigin = data['matchOriginToEntry'] == true;
+    final matchDestination = data['matchDestinationToEntry'] == true;
+    final hasOriginTime =
+        originTime != null || data['hasOriginTime'] == true;
+    final hasDestinationTime =
+        destinationTime != null || data['hasDestinationTime'] == true;
+    final origin = payload['leg_origin'] as String? ?? '';
+    final destination = payload['leg_destination'] as String? ?? '';
     final tripRaw = payload['leg_trip'];
     final tripId = tripRaw is num ? tripRaw.toInt() : null;
+    final units = _distanceUnits(context);
 
     List<String> routeStations = [];
     RouteResult? restoredRouteResult;
@@ -285,6 +420,21 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
       _useManualMileage = useManual;
       _selectedDate = beginTime;
       _selectedTime = TimeOfDay.fromDateTime(beginTime);
+      _selectedEndDate = endTime ?? beginTime;
+      _selectedEndTime = TimeOfDay.fromDateTime(endTime ?? beginTime);
+      _hasEndTime = hasEndTime;
+      _matchOriginToEntry = matchOrigin;
+      _matchDestinationToEntry = matchDestination;
+      _selectedOriginDate = originTime ?? beginTime;
+      _selectedOriginTime =
+          TimeOfDay.fromDateTime(originTime ?? beginTime);
+      _selectedDestinationDate =
+          destinationTime ?? endTime ?? beginTime;
+      _selectedDestinationTime = TimeOfDay.fromDateTime(
+        destinationTime ?? endTime ?? beginTime,
+      );
+      _hasOriginTime = hasOriginTime;
+      _hasDestinationTime = hasDestinationTime;
       _selectedTripId = tripId == null || tripId == 0 ? null : tripId;
       _routeResult = restoredRouteResult;
       _headcodeController.text = (payload['leg_headcode'] as String? ?? '')
@@ -292,6 +442,10 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
       _networkController.text = (payload['leg_network'] as String? ?? '')
           .toUpperCase();
       _notesController.text = payload['leg_notes'] ?? '';
+      _originController.text = origin;
+      _destinationController.text = destination;
+      _beginDelayController.text = beginDelay.toString();
+      _endDelayController.text = endDelay.toString();
 
       if (useManual) {
         _startController.text = payload['leg_start'] ?? '';
@@ -299,14 +453,20 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
         final miles = (payload['leg_distance'] as num?)?.toDouble();
         _mileageController.text = miles == null || miles == 0
             ? ''
-            : miles.toStringAsFixed(2);
+            : units.format(
+                miles,
+                decimals: 2,
+                includeUnit: false,
+              );
       } else {
         _startController.text =
             routeStations.isNotEmpty ? routeStations.first : '';
         _endController.text =
             routeStations.isNotEmpty ? routeStations.last : '';
         final dist = _routeResult?.distance ?? 0;
-        _mileageController.text = dist == 0 ? '' : dist.toStringAsFixed(2);
+        _mileageController.text = dist == 0
+            ? ''
+            : units.format(dist, decimals: 2, includeUnit: false);
       }
 
       final tractionRaw = data['tractionItems'];
@@ -319,6 +479,19 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
           ..clear()
           ..add(_TractionItem.marker());
       }
+      final shareIdsRaw = data['shareUserIds'];
+      final shareUsersRaw = data['shareUsers'];
+      _shareUserIds = shareIdsRaw is List
+          ? shareIdsRaw.map((e) => e.toString()).toSet()
+          : {};
+      _shareUsers = shareUsersRaw is List
+          ? shareUsersRaw
+              .whereType<Map>()
+              .map((e) => UserSummary.fromJson(
+                    e.map((k, v) => MapEntry(k.toString(), v)),
+                  ))
+              .toList()
+          : [];
       _lastSubmittedSnapshot = null;
       final idRaw = data['id'];
       if (idRaw != null) {
@@ -332,6 +505,7 @@ extension _NewEntryDraftLogic on _NewEntryPageState {
       includeTimestamp: false,
     );
     _restoringDraft = false;
+    _scheduleMatchUpdate();
   }
 
   Future<void> _loadDraft() async {

lib/components/pages/new_entry/new_entry_drafts.dart

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

lib/components/pages/new_entry/new_entry_picker_pages.dart

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

lib/components/pages/new_entry/new_entry_submit_logic.dart

@@ -4,11 +4,12 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
   Future<bool> _validateRequiredFields() async {
     final missing = <String>[];
 
+    final units = _distanceUnits(context);
     if (_useManualMileage) {
       if (_startController.text.trim().isEmpty) missing.add('From');
       if (_endController.text.trim().isEmpty) missing.add('To');
       final mileageText = _mileageController.text.trim();
-      if (double.tryParse(mileageText) == null) {
+      if (mileageText.isEmpty || units.milesFromInput(mileageText) == null) {
         missing.add('Mileage');
       }
     } else {
@@ -27,7 +28,8 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     final fieldList = missing.join(', ');
     await showDialog<void>(
       context: context,
-      builder: (_) => AlertDialog(
+      useRootNavigator: false,
+      builder: (dialogCtx) => AlertDialog(
         title: const Text('Required field missing'),
         content: Text(
           missing.length == 1
@@ -36,7 +38,7 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
         ),
         actions: [
           TextButton(
-            onPressed: () => Navigator.of(context).pop(),
+            onPressed: () => Navigator.of(dialogCtx).pop(),
             child: const Text('OK'),
           ),
         ],
@@ -46,8 +48,11 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
   }
 
   Future<void> _submit() async {
-    if (!_formKey.currentState!.validate()) return;
+    final form = _formKey.currentState;
+    if (form == null) return;
+    if (!form.validate()) return;
     if (!await _validateRequiredFields()) return;
+    if (!mounted) return;
     final routeStations = _routeResult?.calculatedRoute ?? [];
     final startVal = _useManualMileage
         ? _startController.text.trim()
@@ -55,16 +60,25 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     final endVal = _useManualMileage
         ? _endController.text.trim()
         : (routeStations.isNotEmpty ? routeStations.last : '');
+    final units = _distanceUnits(context);
     final mileageVal = _useManualMileage
-        ? double.tryParse(_mileageController.text.trim()) ?? 0
+        ? (units.milesFromInput(_mileageController.text.trim()) ?? 0)
         : (_routeResult?.distance ?? 0);
     final tractionPayload = _buildTractionPayload();
-    final snapshot = _buildSubmissionSnapshot(
+    final endTime = _legEndDateTime;
+    final originTime = _originDateTime;
+    final destinationTime = _destinationDateTime;
+    final beginDelay = _parseDelayMinutes(_beginDelayController.text);
+    final endDelay =
+        _hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0;
+    final snapshot = _currentSubmissionSnapshot(
       routeStations: routeStations,
       startVal: startVal,
       endVal: endVal,
       mileageVal: mileageVal,
       tractionPayload: tractionPayload,
+      beginDelay: beginDelay,
+      endDelay: endDelay,
     );
     if (_lastSubmittedSnapshot != null &&
         _snapshotEquality.equals(_lastSubmittedSnapshot, snapshot)) {
@@ -79,19 +93,33 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     final isEditingExisting = _isEditing && widget.editLegId != null;
 
     try {
-      if (_useManualMileage) {
-        final body = {
+      final commonPayload = {
         if (isEditingExisting) "leg_id": widget.editLegId,
         "leg_trip": _selectedTripId,
-          "leg_start": startVal,
-          "leg_end": endVal,
         "leg_begin_time": _legDateTime.toIso8601String(),
-          "leg_network": _networkController.text.trim(),
-          "leg_distance": mileageVal,
-          "isKilometers": false,
+        if (endTime != null) "leg_end_time": endTime.toIso8601String(),
+        if (originTime != null)
+          "leg_origin_time": originTime.toIso8601String(),
+        if (destinationTime != null)
+          "leg_destination_time": destinationTime.toIso8601String(),
         "leg_notes": _notesController.text.trim(),
         "leg_headcode": _headcodeController.text.trim(),
+        "leg_network": _networkController.text.trim(),
+        "leg_origin": _originController.text.trim(),
+        "leg_destination": _destinationController.text.trim(),
+        "leg_begin_delay": beginDelay,
+        if (_hasEndTime) "leg_end_delay": endDelay,
         "locos": tractionPayload,
+        if (_activeLegShare != null) "leg_share_id": _activeLegShare!.id,
+        "share_user_ids": _shareUserIds.toList(),
+      };
+      if (_useManualMileage) {
+        final body = {
+          ...commonPayload,
+          "leg_start": startVal,
+          "leg_end": endVal,
+          "leg_distance": mileageVal,
+          "isKilometers": false,
         };
         if (isEditingExisting) {
           await api.put('/update', body);
@@ -100,14 +128,8 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
         }
       } else {
         final body = {
-          if (isEditingExisting) "leg_id": widget.editLegId,
-          "leg_trip": _selectedTripId,
-          "leg_begin_time": _legDateTime.toIso8601String(),
+          ...commonPayload,
           "leg_route": routeStations,
-          "leg_notes": _notesController.text.trim(),
-          "leg_headcode": _headcodeController.text.trim(),
-          "leg_network": _networkController.text.trim(),
-          "locos": tractionPayload,
         };
         if (isEditingExisting) {
           await api.put('/update', body);
@@ -117,6 +139,10 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
       }
       if (!mounted) return;
       dataService.refreshLegs();
+      await dataService.fetchNotifications();
+      if (_shareNotificationId != null) {
+        await dataService.dismissNotifications([_shareNotificationId!]);
+      }
       if (!mounted) return;
       messenger?.showSnackBar(
         SnackBar(
@@ -125,7 +151,9 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
       );
       _lastSubmittedSnapshot = snapshot;
       _activeDraftId = null;
-    } catch (e) {
+    } catch (e, st) {
+      debugPrint('Leg submit/update failed: $e');
+      debugPrintStack(stackTrace: st);
       if (!mounted) return;
       messenger?.showSnackBar(
         SnackBar(content: Text('Failed to submit: $e')),
@@ -135,26 +163,60 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     }
   }
 
-  Map<String, dynamic> _buildSubmissionSnapshot({
-    required List<String> routeStations,
-    required String startVal,
-    required String endVal,
-    required double mileageVal,
-    required List<Map<String, dynamic>> tractionPayload,
+  Map<String, dynamic> _currentSubmissionSnapshot({
+    List<String>? routeStations,
+    String? startVal,
+    String? endVal,
+    double? mileageVal,
+    List<Map<String, dynamic>>? tractionPayload,
+    int? beginDelay,
+    int? endDelay,
   }) {
+    final stations = routeStations ?? (_routeResult?.calculatedRoute ?? []);
+    final start = startVal ??
+        (_useManualMileage
+            ? _startController.text.trim()
+            : (stations.isNotEmpty ? stations.first : ''));
+    final end = endVal ??
+        (_useManualMileage
+            ? _endController.text.trim()
+            : (stations.isNotEmpty ? stations.last : ''));
+    final mileage = mileageVal ??
+        (_useManualMileage
+            ? (_distanceUnits(context)
+                    .milesFromInput(_mileageController.text.trim()) ??
+                0)
+            : (_routeResult?.distance ?? 0));
+    final traction = tractionPayload ?? _buildTractionPayload();
+    final begin = beginDelay ?? _parseDelayMinutes(_beginDelayController.text);
+    final endDelayVal =
+        endDelay ?? (_hasEndTime ? _parseDelayMinutes(_endDelayController.text) : 0);
+
     return {
       "legId": widget.editLegId,
       "useManualMileage": _useManualMileage,
       "tripId": _selectedTripId,
       "legDateTime": _legDateTime.toIso8601String(),
-      "start": startVal,
-      "end": endVal,
-      "routeStations": routeStations,
-      "mileage": mileageVal,
+      "legEndTime": _legEndDateTime?.toIso8601String(),
+      "hasEndTime": _hasEndTime,
+      "legOriginTime": _originDateTime?.toIso8601String(),
+      "hasOriginTime": _hasOriginTime,
+      "legDestinationTime": _destinationDateTime?.toIso8601String(),
+      "hasDestinationTime": _hasDestinationTime,
+      "start": start,
+      "end": end,
+      "origin": _originController.text.trim(),
+      "destination": _destinationController.text.trim(),
+      "routeStations": stations,
+      "mileage": mileage,
       "network": _networkController.text.trim(),
       "notes": _notesController.text.trim(),
       "headcode": _headcodeController.text.trim(),
-      "locos": tractionPayload,
+      "beginDelay": begin,
+      "endDelay": endDelayVal,
+      "legShareId": _activeLegShare?.id,
+      "shareUserIds": _shareUserIds.toList(),
+      "locos": traction,
       "routeResult": _routeResult == null
           ? null
           : {
@@ -170,16 +232,16 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     if (!mounted) return false;
     final result = await showDialog<bool>(
       context: context,
-      builder: (_) => AlertDialog(
+      builder: (dialogContext) => AlertDialog(
         title: const Text('Duplicate entry?'),
         content: const Text('Entry already added, are you sure?'),
         actions: [
           TextButton(
-            onPressed: () => Navigator.of(context).pop(false),
+            onPressed: () => Navigator.of(dialogContext).pop(false),
             child: const Text('Cancel'),
           ),
           ElevatedButton(
-            onPressed: () => Navigator.of(context).pop(true),
+            onPressed: () => Navigator.of(dialogContext).pop(true),
             child: const Text('Submit anyway'),
           ),
         ],
@@ -189,6 +251,7 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
   }
 
   Future<void> _resetFormState({bool clearDraft = false}) async {
+    final hadShare = _activeLegShare != null || widget.legShare != null;
     _formKey.currentState?.reset();
     _startController.clear();
     _endController.clear();
@@ -196,19 +259,46 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     _notesController.clear();
     _mileageController.clear();
     _networkController.clear();
+    _originController.clear();
+    _destinationController.clear();
+    _beginDelayController.text = '0';
+    _endDelayController.text = '0';
     final now = DateTime.now();
     _setState(() {
       _selectedDate = now;
       _selectedTime = TimeOfDay.fromDateTime(now);
+      _selectedEndDate = now;
+      _selectedEndTime = TimeOfDay.fromDateTime(now);
+      _selectedOriginDate = now;
+      _selectedOriginTime = TimeOfDay.fromDateTime(now);
+      _selectedDestinationDate = now;
+      _selectedDestinationTime = TimeOfDay.fromDateTime(now);
       _useManualMileage = false;
+      _hasEndTime = false;
+      _hasOriginTime = false;
+      _hasDestinationTime = false;
+      _matchOriginToEntry = false;
+      _matchDestinationToEntry = false;
+      _matchUpdateScheduled = false;
       _routeResult = null;
+      _activeLegShare = null;
+      _sharedFromUser = null;
+      _shareNotificationId = null;
+      _shareUserIds.clear();
+      _shareUsers.clear();
       _tractionItems
         ..clear()
         ..add(_TractionItem.marker());
       _selectedTripId = null;
       _submitting = false;
       _activeDraftId = null;
+      _savingDraft = false;
+      _loadedDraftSnapshot = null;
     });
+    if (hadShare && mounted) {
+      // Clear any share params from the URL when resetting.
+      GoRouter.of(context).go('/add');
+    }
     if (clearDraft) {
       await _clearDraft();
     }

lib/components/pages/new_entry/new_entry_traction_logic.dart

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

lib/components/pages/new_traction.dart

@@ -84,6 +84,13 @@ class _NewTractionPageState extends State<NewTractionPage> {
       'traction_motors': TextEditingController(),
       'build_date': TextEditingController(),
     };
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      final data = context.read<DataService>();
+      if (data.locoClasses.isEmpty) {
+        data.fetchClassList();
+      }
+    });
   }
 
   @override
@@ -254,6 +261,10 @@ class _NewTractionPageState extends State<NewTractionPage> {
   @override
   Widget build(BuildContext context) {
     final isActive = _statusIsActive;
+    final data = context.watch<DataService>();
+    final classOptions = [...data.locoClasses]..sort(
+        (a, b) => a.toLowerCase().compareTo(b.toLowerCase()),
+      );
     final size = MediaQuery.of(context).size;
     final isNarrow = size.width < 720;
     final fieldWidth = isNarrow ? double.infinity : 340.0;
@@ -269,6 +280,89 @@ class _NewTractionPageState extends State<NewTractionPage> {
       double? widthOverride,
       String? Function(String?)? validator,
     }) {
+      // Special autocomplete for class field using existing loco classes.
+      if (key == 'class' && classOptions.isNotEmpty) {
+        return SizedBox(
+          width: widthOverride ?? fieldWidth,
+          child: Autocomplete<String>(
+            optionsBuilder: (TextEditingValue value) {
+              final query = value.text.trim().toLowerCase();
+              if (query.isEmpty) return classOptions;
+              return classOptions.where(
+                (c) => c.toLowerCase().contains(query),
+              );
+            },
+            onSelected: (selection) {
+              _controllers[key]?.text = selection;
+              _formKey.currentState?.validate();
+            },
+            fieldViewBuilder:
+                (context, textEditingController, focusNode, onFieldSubmitted) {
+              if (textEditingController.text != _controllers[key]?.text) {
+                WidgetsBinding.instance.addPostFrameCallback((_) {
+                  if (!mounted) return;
+                  if (textEditingController.text != _controllers[key]?.text) {
+                    textEditingController.value =
+                        _controllers[key]?.value ?? textEditingController.value;
+                  }
+                });
+              }
+              return TextFormField(
+                controller: textEditingController,
+                focusNode: focusNode,
+                decoration: InputDecoration(
+                  labelText: required ? '$label *' : label,
+                  helperText: helper,
+                  suffixText: suffixText,
+                  border: const OutlineInputBorder(),
+                ),
+                keyboardType: keyboardType,
+                maxLines: maxLines,
+                validator: (val) {
+                  if (required && (val == null || val.trim().isEmpty)) {
+                    return 'Required';
+                  }
+                  return validator?.call(val);
+                },
+                onChanged: (_) {
+                  _controllers[key]?.text = textEditingController.text;
+                  _formKey.currentState?.validate();
+                },
+                onFieldSubmitted: (_) => onFieldSubmitted(),
+              );
+            },
+            optionsViewBuilder: (context, onSelected, options) {
+              final opts = options.toList();
+              if (opts.isEmpty) return const SizedBox.shrink();
+              return Align(
+                alignment: Alignment.topLeft,
+                child: Material(
+                  elevation: 4,
+                  child: ConstrainedBox(
+                    constraints: BoxConstraints(
+                      maxHeight: 280,
+                      maxWidth: widthOverride ?? fieldWidth,
+                    ),
+                    child: ListView.builder(
+                      padding: EdgeInsets.zero,
+                      itemCount: opts.length,
+                      itemBuilder: (context, index) {
+                        final option = opts[index];
+                        return ListTile(
+                          dense: true,
+                          title: Text(option),
+                          onTap: () => onSelected(option),
+                        );
+                      },
+                    ),
+                  ),
+                ),
+              );
+            },
+          ),
+        );
+      }
+
       return SizedBox(
         width: widthOverride ?? fieldWidth,
         child: TextFormField(

lib/components/pages/settings.dart

@@ -0,0 +1,380 @@
+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/accent_color_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
+import 'package:mileograph_flutter/services/endpoint_service.dart';
+import 'package:mileograph_flutter/services/theme_mode_service.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:provider/provider.dart';
+
+class SettingsPage extends StatefulWidget {
+  const SettingsPage({super.key});
+
+  @override
+  State<SettingsPage> createState() => _SettingsPageState();
+}
+
+class _SettingsPageState extends State<SettingsPage> {
+  late final TextEditingController _endpointController;
+  bool _saving = false;
+  static const List<Color> _accentPalette = [
+    Colors.red,
+    Colors.pink,
+    Colors.orange,
+    Colors.amber,
+    Colors.green,
+    Colors.teal,
+    Colors.blue,
+    Colors.indigo,
+    Colors.purple,
+    Colors.cyan,
+  ];
+
+  @override
+  void initState() {
+    super.initState();
+    final endpoint = context.read<EndpointService>().baseUrl;
+    _endpointController = TextEditingController(text: endpoint);
+  }
+
+  @override
+  void dispose() {
+    _endpointController.dispose();
+    super.dispose();
+  }
+
+  Future<String?> _probeVersion(String url) async {
+    try {
+      var uri = Uri.parse(url.trim());
+      if (uri.scheme.isEmpty) {
+        uri = Uri.parse('https://$url');
+      }
+      // Probe the provided API endpoint as-is.
+      final target = uri;
+      final res = await http.get(target).timeout(const Duration(seconds: 10));
+      debugPrint(
+        'Endpoint probe ${target.toString()} -> ${res.statusCode} ${res.body}',
+      );
+      if (res.statusCode < 200 || res.statusCode >= 300) return null;
+      final body = res.body.trim();
+      debugPrint('Endpoint probe body: $body');
+      // Try JSON first
+      String? version;
+      try {
+        final parsed = jsonDecode(body);
+        debugPrint('Endpoint probe parsed: $parsed');
+        if (parsed is Map && parsed['version'] is String) {
+          version = parsed['version'] as String;
+        } else if (parsed is String) {
+          final candidate = parsed.trim().replaceAll('"', '');
+          if (RegExp(r'^\d+\.\d+\.\d+$').hasMatch(candidate)) {
+            version = candidate;
+          }
+        }
+      } catch (_) {
+        // fall back to raw body parsing
+      }
+      version ??= body.split(RegExp(r'\s+')).firstWhere(
+        (part) => RegExp(r'^\d+\.\d+\.\d+$').hasMatch(part),
+        orElse: () => '',
+      );
+      if (version.isEmpty) return null;
+      final isValid = RegExp(r'^\d+\.\d+\.\d+$').hasMatch(version);
+      return isValid ? version : null;
+    } catch (_) {
+      return null;
+    }
+  }
+
+  Future<void> _save() async {
+    final endpointService = context.read<EndpointService>();
+    final dataService = context.read<DataService>();
+    final messenger = ScaffoldMessenger.of(context);
+    final value = _endpointController.text.trim();
+    if (value.isEmpty) {
+      messenger.showSnackBar(
+        const SnackBar(content: Text('Please enter an endpoint URL.')),
+      );
+      return;
+    }
+    setState(() => _saving = true);
+    try {
+      final version = await _probeVersion(value);
+      if (version == null) {
+        if (mounted) {
+          messenger.showSnackBar(
+            const SnackBar(
+              content: Text('Endpoint test failed: no valid version returned.'),
+            ),
+          );
+        }
+        return;
+      }
+      await endpointService.setBaseUrl(value);
+      if (mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Endpoint set to "$value" ($version)')),
+        );
+        await Future.wait([
+          dataService.fetchHomepageStats(),
+          dataService.fetchOnThisDay(),
+          dataService.fetchTrips(),
+          dataService.fetchHadTraction(),
+          dataService.fetchLatestLocoChanges(),
+          dataService.fetchLegs(),
+        ]);
+      }
+    } catch (e) {
+      if (mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Failed to save endpoint: $e')),
+        );
+      }
+    } finally {
+      if (mounted) {
+        setState(() => _saving = false);
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final endpointService = context.watch<EndpointService>();
+    final distanceUnitService = context.watch<DistanceUnitService>();
+    final accentService = context.watch<AccentColorService>();
+    final themeModeService = context.watch<ThemeModeService>();
+    if (!endpointService.isLoaded ||
+        !distanceUnitService.isLoaded ||
+        !accentService.isLoaded ||
+        !themeModeService.isLoaded) {
+      return const Scaffold(
+        body: Center(child: CircularProgressIndicator()),
+      );
+    }
+
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Settings'),
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () {
+            final navigator = Navigator.of(context);
+            if (navigator.canPop()) {
+              navigator.pop();
+            } else {
+              context.go('/more');
+            }
+          },
+        ),
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              'Distance units',
+              style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              'Choose how distances are displayed across the app.',
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+            const SizedBox(height: 12),
+            SegmentedButton<DistanceUnit>(
+              segments: DistanceUnit.values
+                  .map(
+                    (unit) => ButtonSegment<DistanceUnit>(
+                      value: unit,
+                      label: Text(unit.label),
+                    ),
+                  )
+                  .toList(),
+              selected: {distanceUnitService.unit},
+              onSelectionChanged: (selection) {
+                final next = selection.first;
+                distanceUnitService.setUnit(next);
+              },
+            ),
+            const SizedBox(height: 24),
+            Text(
+              'Accent colour',
+              style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              'Choose your preferred accent colour or use system colours.',
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+            const SizedBox(height: 12),
+            Wrap(
+              spacing: 12,
+              runSpacing: 8,
+              crossAxisAlignment: WrapCrossAlignment.center,
+              children: [
+                OutlinedButton.icon(
+                  onPressed:
+                      accentService.useSystem ? null : () => accentService.setUseSystem(true),
+                  icon: const Icon(Icons.phone_android),
+                  label: const Text('Use system colours'),
+                ),
+                ..._accentPalette.map(
+                  (color) => _AccentSwatchButton(
+                    color: color,
+                    selected:
+                        !accentService.useSystem &&
+                            accentService.seedColor.toARGB32() == color.toARGB32(),
+                    onTap: () => accentService.setSeedColor(color),
+                  ),
+                ),
+              ],
+            ),
+            const SizedBox(height: 24),
+            Text(
+              'Theme mode',
+              style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
+            ),
+            const SizedBox(height: 8),
+            SegmentedButton<ThemeMode>(
+              segments: const [
+                ButtonSegment(
+                  value: ThemeMode.system,
+                  icon: Icon(Icons.settings_suggest),
+                  label: Text('System'),
+                ),
+                ButtonSegment(
+                  value: ThemeMode.light,
+                  icon: Icon(Icons.light_mode),
+                  label: Text('Light'),
+                ),
+                ButtonSegment(
+                  value: ThemeMode.dark,
+                  icon: Icon(Icons.dark_mode),
+                  label: Text('Dark'),
+                ),
+              ],
+              selected: {themeModeService.mode},
+              onSelectionChanged: (selection) {
+                final mode = selection.first;
+                themeModeService.setMode(mode);
+              },
+            ),
+            const SizedBox(height: 24),
+            Text(
+              'API endpoint',
+              style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: FontWeight.w700,
+                  ),
+            ),
+            const SizedBox(height: 8),
+            Text(
+              'Set the base URL for the Mileograph API. Leave blank to use the default.',
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+            const SizedBox(height: 16),
+            TextField(
+              controller: _endpointController,
+              decoration: const InputDecoration(
+                labelText: 'Endpoint URL',
+                hintText: 'https://mileograph.co.uk/api/v1',
+                border: OutlineInputBorder(),
+              ),
+            ),
+            const SizedBox(height: 16),
+            Row(
+              children: [
+                FilledButton.icon(
+                  onPressed: _saving ? null : _save,
+                  icon: _saving
+                      ? const SizedBox(
+                          width: 18,
+                          height: 18,
+                          child: CircularProgressIndicator(strokeWidth: 2),
+                        )
+                      : const Icon(Icons.save),
+                  label: const Text('Save endpoint'),
+                ),
+                const SizedBox(width: 12),
+                TextButton(
+                  onPressed: _saving
+                      ? null
+                      : () {
+                          _endpointController.text =
+                              EndpointService.defaultBaseUrl;
+                        },
+                  child: const Text('Reset to default'),
+                ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            Text(
+              'Current: ${endpointService.baseUrl}',
+              style: Theme.of(context).textTheme.labelSmall,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _AccentSwatchButton extends StatelessWidget {
+  const _AccentSwatchButton({
+    required this.color,
+    required this.selected,
+    required this.onTap,
+  });
+
+  final Color color;
+  final bool selected;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    final borderColor = selected
+        ? Theme.of(context).colorScheme.onSurface
+        : Colors.black26;
+    return InkWell(
+      onTap: onTap,
+      customBorder: const CircleBorder(),
+      child: Container(
+        width: 40,
+        height: 40,
+        decoration: BoxDecoration(
+          color: color,
+          shape: BoxShape.circle,
+          border: Border.all(
+            color: borderColor,
+            width: selected ? 3 : 1,
+          ),
+          boxShadow: [
+            BoxShadow(
+              color: Colors.black.withValues(alpha: 0.15),
+              blurRadius: 4,
+              offset: const Offset(0, 2),
+            ),
+          ],
+        ),
+        child: selected
+            ? const Center(
+                child: Icon(
+                  Icons.check,
+                  size: 18,
+                  color: Colors.white,
+                ),
+              )
+            : null,
+      ),
+    );
+  }
+}

lib/components/pages/stats.dart

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

lib/components/pages/traction/traction.dart

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

lib/components/pages/traction/traction_pending_page.dart

@@ -0,0 +1,140 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:mileograph_flutter/components/traction/traction_card.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/api_service.dart';
+import 'package:provider/provider.dart';
+
+class TractionPendingPage extends StatefulWidget {
+  const TractionPendingPage({super.key});
+
+  @override
+  State<TractionPendingPage> createState() => _TractionPendingPageState();
+}
+
+class _TractionPendingPageState extends State<TractionPendingPage> {
+  bool _isLoading = false;
+  String? _error;
+  List<LocoSummary> _locos = const [];
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) => _load());
+  }
+
+  Future<void> _load() async {
+    setState(() {
+      _isLoading = true;
+      _error = null;
+    });
+    try {
+      final api = context.read<ApiService>();
+      final params = '?limit=200&offset=0';
+      final json = await api.get('/loco/pending$params');
+      if (json is List) {
+        setState(() {
+          _locos = json
+              .whereType<Map>()
+              .map((e) => LocoSummary.fromJson(
+                    e.map((k, v) => MapEntry(k.toString(), v)),
+                  ))
+              .toList();
+        });
+      } else {
+        setState(() {
+          _error = 'Unexpected response';
+          _locos = const [];
+        });
+      }
+    } catch (e) {
+      setState(() {
+        _error = e.toString();
+        _locos = const [];
+      });
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+        });
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () => Navigator.of(context).maybePop(),
+        ),
+        title: const Text('Pending traction'),
+      ),
+      body: RefreshIndicator(
+        onRefresh: _load,
+        child: _buildBody(context),
+      ),
+    );
+  }
+
+  Widget _buildBody(BuildContext context) {
+    if (_isLoading && _locos.isEmpty) {
+      return const Center(child: CircularProgressIndicator());
+    }
+    if (_error != null) {
+      return ListView(
+        padding: const EdgeInsets.all(16),
+        children: [
+          Text(
+            'Failed to load pending traction: $_error',
+            style: Theme.of(context)
+                .textTheme
+                .bodyMedium
+                ?.copyWith(color: Theme.of(context).colorScheme.error),
+          ),
+          const SizedBox(height: 12),
+          FilledButton.icon(
+            onPressed: _load,
+            icon: const Icon(Icons.refresh),
+            label: const Text('Retry'),
+          ),
+        ],
+      );
+    }
+    if (_locos.isEmpty) {
+      return ListView(
+        padding: const EdgeInsets.all(16),
+        children: const [
+          Text('No pending traction found.'),
+        ],
+      );
+    }
+    return ListView.builder(
+      padding: const EdgeInsets.all(12),
+      itemCount: _locos.length,
+      itemBuilder: (context, index) {
+        final loco = _locos[index];
+        return Padding(
+          padding: const EdgeInsets.symmetric(vertical: 6.0),
+          child: TractionCard(
+            loco: loco,
+            selectionMode: false,
+            isSelected: false,
+            onShowInfo: () => showTractionDetails(
+              context,
+              loco,
+              onActionComplete: _load,
+            ),
+            onOpenTimeline: () => context.push(
+              '/traction/${loco.id}/timeline',
+              extra: {'label': '${loco.locoClass} ${loco.number}'.trim()},
+            ),
+            onOpenLegs: () => context.push('/traction/${loco.id}/legs'),
+            onActionComplete: _load,
+          ),
+        );
+      },
+    );
+  }
+}

lib/components/pages/traction/traction_persistence.dart

@@ -39,6 +39,16 @@ extension _TractionPersistence on _TractionPageState {
           enumValues[entry.key.toString()] = entry.value?.toString();
         }
       }
+      final lastOffsetRaw = decoded['lastOffset'];
+      if (lastOffsetRaw is int) {
+        _lastTractionOffset = lastOffsetRaw;
+      } else if (lastOffsetRaw is num) {
+        _lastTractionOffset = lastOffsetRaw.toInt();
+      }
+      final lastSig = decoded['querySignature']?.toString();
+      if (lastSig != null && lastSig.isNotEmpty) {
+        _lastQuerySignature = lastSig;
+      }
 
       for (final entry in dynamicValues.entries) {
         _dynamicControllers.putIfAbsent(
@@ -76,6 +86,8 @@ extension _TractionPersistence on _TractionPageState {
       'showAdvancedFilters': _showAdvancedFilters,
       'dynamic': _dynamicControllers.map((k, v) => MapEntry(k, v.text)),
       'enum': _enumSelections,
+      'lastOffset': _lastTractionOffset,
+      'querySignature': _lastQuerySignature,
     };
 
     try {

lib/components/pages/trips.dart

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

lib/components/traction/traction_card.dart

@@ -1,5 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:intl/intl.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/api_service.dart';
+import 'package:mileograph_flutter/services/authservice.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
+import 'package:provider/provider.dart';
 
 class TractionCard extends StatelessWidget {
   const TractionCard({
@@ -11,6 +18,9 @@ class TractionCard extends StatelessWidget {
     required this.onOpenTimeline,
     this.onOpenLegs,
     this.onToggleSelect,
+    this.onReplacePending,
+    this.onActionComplete,
+    this.onTransferAllocations,
   });
 
   final LocoSummary loco;
@@ -20,14 +30,23 @@ class TractionCard extends StatelessWidget {
   final VoidCallback onOpenTimeline;
   final VoidCallback? onOpenLegs;
   final VoidCallback? onToggleSelect;
+  final VoidCallback? onReplacePending;
+  final Future<void> Function()? onActionComplete;
+  final VoidCallback? onTransferAllocations;
 
   @override
   Widget build(BuildContext context) {
     final status = loco.status ?? 'Unknown';
     final operatorName = loco.operator ?? '';
     final domain = loco.domain ?? '';
+    final isVisibilityPending =
+        (loco.visibility ?? '').toLowerCase().trim() == 'pending';
+    final isRejected =
+        (loco.visibility ?? '').toLowerCase().contains('reject');
+    final isElevated = context.read<AuthService>().isElevated;
     final hasMileageOrTrips = _hasMileageOrTrips(loco);
     final statusColors = _statusChipColors(context, status);
+    final distanceUnits = context.watch<DistanceUnitService>();
 
     return Card(
       child: Padding(
@@ -41,23 +60,14 @@ class TractionCard extends StatelessWidget {
                 Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    Row(
-                      children: [
-                        Text(
-                          loco.number,
-                          style: Theme.of(context).textTheme.headlineSmall
-                              ?.copyWith(fontWeight: FontWeight.w800),
-                        ),
-                        if (hasMileageOrTrips)
-                          Padding(
-                            padding: const EdgeInsets.only(left: 6.0),
-                            child: Icon(
-                              Icons.check_circle,
-                              size: 18,
-                              color: Colors.green.shade600,
-                            ),
-                          ),
-                      ],
+                    _LocoNumberWithHistory(
+                      number: loco.number,
+                      matchedNumber: loco.matchedNumber,
+                      matchedNumberValidTo: loco.matchedNumberValidTo,
+                      hasMileageOrTrips: hasMileageOrTrips,
+                      largeStyle: Theme.of(context).textTheme.headlineSmall,
+                      showPendingChip: isVisibilityPending,
+                      showRejectedChip: isRejected && !isVisibilityPending,
                     ),
                     Text(
                       loco.locoClass,
@@ -74,6 +84,36 @@ class TractionCard extends StatelessWidget {
                       ),
                   ],
                 ),
+                Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    if (isElevated && isVisibilityPending) ...[
+                    PopupMenuButton<_PendingLocoAction>(
+                      tooltip: 'Pending options',
+                      onSelected: (action) => _handlePendingAction(
+                        context,
+                        action,
+                        loco,
+                        onActionComplete: onActionComplete,
+                      ),
+                      itemBuilder: (context) => const [
+                        PopupMenuItem(
+                          value: _PendingLocoAction.accept,
+                          child: Text('Accept loco'),
+                        ),
+                        PopupMenuItem(
+                          value: _PendingLocoAction.reject,
+                          child: Text('Reject loco'),
+                        ),
+                        PopupMenuItem(
+                          value: _PendingLocoAction.replace,
+                          child: Text('Replace...'),
+                        ),
+                      ],
+                      icon: const Icon(Icons.more_vert),
+                    ),
+                      const SizedBox(width: 6),
+                    ],
                     Chip(
                       label: Text(status),
                       backgroundColor: statusColors.$1,
@@ -81,40 +121,85 @@ class TractionCard extends StatelessWidget {
                     ),
                   ],
                 ),
+              ],
+            ),
             const SizedBox(height: 8),
-            Row(
-              children: [
+            LayoutBuilder(
+              builder: (context, constraints) {
+                final isNarrow = constraints.maxWidth < 520;
+                final buttons = [
                   TextButton.icon(
                     onPressed: onShowInfo,
                     icon: const Icon(Icons.info_outline),
                     label: const Text('Details'),
                   ),
-                const SizedBox(width: 8),
                   TextButton.icon(
                     onPressed: onOpenTimeline,
                     icon: const Icon(Icons.timeline),
                     label: const Text('Timeline'),
                   ),
-                if (hasMileageOrTrips && onOpenLegs != null) ...[
-                  const SizedBox(width: 8),
+                  if (hasMileageOrTrips && onOpenLegs != null)
                     TextButton.icon(
                       onPressed: onOpenLegs,
                       icon: const Icon(Icons.view_list),
                       label: const Text('Legs'),
                     ),
-                ],
-                const Spacer(),
-                if (selectionMode && onToggleSelect != null)
-                  TextButton.icon(
+                ];
+
+                // Prefer replace action when picking a replacement loco.
+                final addButton = onTransferAllocations != null
+                    ? TextButton.icon(
+                        onPressed: onTransferAllocations,
+                        icon: const Icon(Icons.swap_horiz),
+                        label: const Text('Transfer'),
+                      )
+                    : onReplacePending != null
+                        ? TextButton.icon(
+                            onPressed: onReplacePending,
+                            icon: const Icon(Icons.swap_horiz),
+                            label: const Text('Replace'),
+                          )
+                        : (!isRejected && selectionMode && onToggleSelect != null)
+                            ? TextButton.icon(
                                 onPressed: onToggleSelect,
                                 icon: Icon(
                                   isSelected
                                       ? Icons.remove_circle_outline
                                       : Icons.add_circle_outline,
                                 ),
-                    label: Text(isSelected ? 'Remove' : 'Add to entry'),
+                                label:
+                                    Text(isSelected ? 'Remove' : 'Add to entry'),
+                              )
+                            : null;
+
+                if (isNarrow) {
+                  return Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Wrap(
+                        spacing: 8,
+                        runSpacing: 4,
+                        children: buttons,
                       ),
+                      if (addButton != null) ...[
+                        const SizedBox(height: 6),
+                        addButton,
                       ],
+                    ],
+                  );
+                }
+
+                return Row(
+                  children: [
+                    ...buttons.expand((btn) sync* {
+                      yield btn;
+                      yield const SizedBox(width: 8);
+                    }).take(buttons.length * 2 - 1),
+                    const Spacer(),
+                    if (addButton != null) addButton,
+                  ],
+                );
+              },
             ),
             Wrap(
               spacing: 8,
@@ -122,8 +207,11 @@ class TractionCard extends StatelessWidget {
               children: [
                 _statPill(
                   context,
-                  label: 'Miles',
-                  value: _formatNumber(loco.mileage),
+                  label: 'Distance',
+                  value: distanceUnits.format(
+                    loco.mileage ?? 0,
+                    decimals: 1,
+                  ),
                 ),
                 _statPill(
                   context,
@@ -169,11 +257,331 @@ class TractionCard extends StatelessWidget {
   }
 }
 
+class _LocoNumberWithHistory extends StatelessWidget {
+  const _LocoNumberWithHistory({
+    required this.number,
+    required this.matchedNumber,
+    required this.matchedNumberValidTo,
+    required this.hasMileageOrTrips,
+    this.largeStyle,
+    this.showPendingChip = false,
+    this.showRejectedChip = false,
+  });
+
+  final String number;
+  final String? matchedNumber;
+  final DateTime? matchedNumberValidTo;
+  final bool hasMileageOrTrips;
+  final TextStyle? largeStyle;
+  final bool showPendingChip;
+  final bool showRejectedChip;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final historicNumber = matchedNumber?.trim() ?? '';
+    final hasHistoricDate = matchedNumberValidTo != null;
+    final showHistoric = historicNumber.isNotEmpty && hasHistoricDate;
+    final historicDate =
+        hasHistoricDate ? DateFormat('yyyy-MM-dd').format(matchedNumberValidTo!) : null;
+
+    return Row(
+      children: [
+        Text(
+          number,
+          style: (largeStyle ?? theme.textTheme.titleLarge)?.copyWith(
+            fontWeight: FontWeight.w800,
+          ),
+        ),
+        if (hasMileageOrTrips)
+          Padding(
+            padding: const EdgeInsets.only(left: 6.0),
+            child: Icon(
+              Icons.check_circle,
+              size: 18,
+              color: Colors.green.shade600,
+            ),
+          ),
+        if (showPendingChip) ...[
+          const SizedBox(width: 8),
+          Container(
+            padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+            decoration: BoxDecoration(
+              color: theme.colorScheme.surfaceContainerHighest,
+              borderRadius: BorderRadius.circular(8),
+            ),
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                const Icon(Icons.pending, size: 14),
+                const SizedBox(width: 4),
+                Text(
+                  'Pending',
+                  style: theme.textTheme.labelSmall
+                      ?.copyWith(fontWeight: FontWeight.w700),
+                ),
+              ],
+            ),
+          ),
+        ],
+        if (showRejectedChip) ...[
+          const SizedBox(width: 8),
+          Container(
+            padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+            decoration: BoxDecoration(
+              color: Colors.red.shade700,
+              borderRadius: BorderRadius.circular(8),
+            ),
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                const Icon(Icons.close, size: 14, color: Colors.white),
+                const SizedBox(width: 4),
+                Text(
+                  'Rejected',
+                  style: theme.textTheme.labelSmall?.copyWith(
+                    fontWeight: FontWeight.w700,
+                    color: Colors.white,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ],
+        if (showHistoric) ...[
+          const SizedBox(width: 8),
+          Text(
+            historicNumber,
+            style: theme.textTheme.labelMedium?.copyWith(
+              fontWeight: FontWeight.w800,
+              color: theme.colorScheme.onSurfaceVariant,
+            ),
+          ),
+          if (historicDate != null) ...[
+            const SizedBox(width: 6),
+            Text(
+              'until $historicDate',
+              style: theme.textTheme.labelSmall?.copyWith(
+                color: theme.colorScheme.onSurfaceVariant,
+              ),
+            ),
+          ],
+        ],
+      ],
+    );
+  }
+}
+
+enum _PendingLocoAction { accept, reject, replace }
+
+Future<void> _handlePendingAction(
+  BuildContext context,
+  _PendingLocoAction action,
+  LocoSummary loco, {
+  Future<void> Function()? onActionComplete,
+}) async {
+  final navContext = context;
+  final messenger = ScaffoldMessenger.of(navContext);
+  final data = navContext.read<DataService>();
+  if (action == _PendingLocoAction.replace) {
+    final path = Uri(
+      path: '/traction',
+      queryParameters: {
+        'selection': 'single',
+        'replacementPendingLocoId': loco.id.toString(),
+      },
+    ).toString();
+    final selected = await navContext.push<LocoSummary>(
+      path,
+      extra: {
+        'selection': 'single',
+        'replacementPendingLocoId': loco.id,
+      },
+    );
+    if (!navContext.mounted) return;
+    if (selected == null) return;
+    String rejectionReason = '';
+    final confirmed = await showDialog<bool>(
+      context: navContext,
+      builder: (dialogContext) {
+        return StatefulBuilder(
+          builder: (context, setState) {
+            final canSubmit = rejectionReason.trim().isNotEmpty;
+            return AlertDialog(
+              title: const Text('Replace pending loco?'),
+              content: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    'Replace ${loco.locoClass} ${loco.number} with ${selected.locoClass} ${selected.number}?',
+                  ),
+                  const SizedBox(height: 12),
+                  TextField(
+                    autofocus: true,
+                    maxLines: 2,
+                    decoration: const InputDecoration(
+                      labelText: 'Rejection reason',
+                      hintText: 'Reason for replacing this loco',
+                    ),
+                    onChanged: (val) => setState(() {
+                      rejectionReason = val;
+                    }),
+                  ),
+                ],
+              ),
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.of(dialogContext).pop(false),
+                  child: const Text('Cancel'),
+                ),
+                FilledButton(
+                  onPressed: canSubmit
+                      ? () => Navigator.of(dialogContext).pop(true)
+                      : null,
+                  child: const Text('Replace'),
+                ),
+              ],
+            );
+          },
+        );
+      },
+    );
+    if (!navContext.mounted) return;
+    if (confirmed != true) return;
+    try {
+      await data.rejectPendingLoco(
+        locoId: loco.id,
+        replacementLocoId: selected.id,
+        rejectedReason: rejectionReason,
+      );
+      await data.fetchClassList(force: true);
+      if (navContext.mounted) {
+        messenger.showSnackBar(
+          const SnackBar(content: Text('Pending loco replaced')),
+        );
+      }
+      await onActionComplete?.call();
+    } catch (e) {
+      messenger.showSnackBar(
+        SnackBar(content: Text('Failed to replace loco: $e')),
+      );
+    }
+    return;
+  }
+  if (action == _PendingLocoAction.reject) {
+    String rejectionReason = '';
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (dialogContext) {
+        return StatefulBuilder(
+          builder: (context, setState) {
+            final canSubmit = rejectionReason.trim().isNotEmpty;
+            return AlertDialog(
+              title: const Text('Reject loco?'),
+              content: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  TextField(
+                    autofocus: true,
+                    maxLines: 2,
+                    decoration: const InputDecoration(
+                      labelText: 'Rejection reason',
+                      hintText: 'Why is this loco being rejected?',
+                    ),
+                    onChanged: (val) => setState(() {
+                      rejectionReason = val;
+                    }),
+                  ),
+                ],
+              ),
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.of(context).pop(false),
+                  child: const Text('Cancel'),
+                ),
+                FilledButton(
+                  onPressed: canSubmit
+                      ? () => Navigator.of(context).pop(true)
+                      : null,
+                  child: const Text('Reject'),
+                ),
+              ],
+            );
+          },
+        );
+      },
+    );
+    if (confirmed != true) return;
+
+    if (!navContext.mounted) return;
+    try {
+      await data.rejectPendingLoco(
+        locoId: loco.id,
+        rejectedReason: rejectionReason,
+      );
+      await data.fetchClassList(force: true);
+      if (navContext.mounted) {
+        messenger.showSnackBar(
+          const SnackBar(content: Text('Pending loco rejected')),
+        );
+      }
+      await onActionComplete?.call();
+    } catch (e) {
+      if (navContext.mounted) {
+        messenger.showSnackBar(
+          SnackBar(content: Text('Failed to reject loco: $e')),
+        );
+      }
+    }
+    return;
+  }
+
+  try {
+    await data.acceptPendingLoco(locoId: loco.id);
+    if (navContext.mounted) {
+      messenger.showSnackBar(
+        const SnackBar(content: Text('Pending loco accepted')),
+      );
+    }
+    await onActionComplete?.call();
+  } catch (e) {
+    if (navContext.mounted) {
+      messenger.showSnackBar(
+        SnackBar(content: Text('Failed to accept loco: $e')),
+      );
+    }
+  }
+}
+
 Future<void> showTractionDetails(
   BuildContext context,
-  LocoSummary loco,
-) async {
+  LocoSummary loco, {
+  Future<void> Function()? onActionComplete,
+}) async {
+  final navContext = context;
   final hasMileageOrTrips = _hasMileageOrTrips(loco);
+  final isVisibilityPending =
+      (loco.visibility ?? '').toLowerCase().trim() == 'pending';
+  final isRejected =
+      (loco.visibility ?? '').toLowerCase().contains('reject');
+  final rejectedReason =
+      loco.extra['rejected_reason']?.toString().trim() ?? '';
+  final distanceUnits = context.read<DistanceUnitService>();
+  final api = context.read<ApiService>();
+  final data = context.read<DataService>();
+  final auth = context.read<AuthService>();
+  final messenger = ScaffoldMessenger.of(context);
+  final userId = auth.userId;
+  final createdBy = loco.extra['created_by']?.toString();
+  final isOwnedByUser =
+      userId != null && createdBy != null && createdBy == userId;
+  final canDeleteAsOwner = isOwnedByUser && (isVisibilityPending || isRejected);
+  final leaderboardId = _leaderboardId(loco);
+  final leaderboardFuture = leaderboardId == null
+      ? Future.value(const <LeaderboardEntry>[])
+      : _fetchLocoLeaderboard(api, leaderboardId);
   await showModalBottomSheet(
     context: context,
     isScrollControlled: true,
@@ -198,23 +606,13 @@ Future<void> showTractionDetails(
                     Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                        Row(
-                          children: [
-                            Text(
-                              loco.number,
-                              style: Theme.of(context).textTheme.titleLarge
-                                  ?.copyWith(fontWeight: FontWeight.w800),
-                            ),
-                            if (hasMileageOrTrips)
-                              Padding(
-                                padding: const EdgeInsets.only(left: 6.0),
-                                child: Icon(
-                                  Icons.check_circle,
-                                  size: 18,
-                                  color: Colors.green.shade600,
-                                ),
-                              ),
-                          ],
+                        _LocoNumberWithHistory(
+                          number: loco.number,
+                          matchedNumber: loco.matchedNumber,
+                          matchedNumberValidTo: loco.matchedNumberValidTo,
+                          hasMileageOrTrips: hasMileageOrTrips,
+                          showPendingChip: isVisibilityPending,
+                          showRejectedChip: isRejected && !isVisibilityPending,
                         ),
                         Text(
                           loco.locoClass,
@@ -237,6 +635,36 @@ Future<void> showTractionDetails(
                 child: ListView(
                   controller: controller,
                   children: [
+                      FilledButton.icon(
+                        onPressed: () {
+                          Navigator.of(ctx).pop();
+                          navContext.push(
+                            Uri(
+                              path: '/traction',
+                              queryParameters: {
+                                'selection': 'single',
+                                'transferFromLocoId': loco.id.toString(),
+                              },
+                            ).toString(),
+                            extra: {
+                              'selection': 'single',
+                              'transferFromLocoId': loco.id,
+                            },
+                          );
+                        },
+                        icon: const Icon(Icons.swap_horiz),
+                        label: const Text('Transfer allocations'),
+                      ),
+                      const SizedBox(height: 12),
+                    if (isRejected && rejectedReason.isNotEmpty)
+                      ...[
+                        _detailRow(
+                          context,
+                          'Rejection reason',
+                            rejectedReason,
+                          ),
+                          const Divider(),
+                        ],
                       _detailRow(context, 'Status', loco.status ?? 'Unknown'),
                       _detailRow(context, 'Operator', loco.operator ?? ''),
                       _detailRow(context, 'Domain', loco.domain ?? ''),
@@ -246,7 +674,10 @@ Future<void> showTractionDetails(
                       _detailRow(
                         context,
                         'Mileage',
-                        _formatNumber(loco.mileage ?? 0),
+                        distanceUnits.format(
+                          loco.mileage ?? 0,
+                          decimals: 1,
+                        ),
                       ),
                       _detailRow(
                         context,
@@ -256,6 +687,116 @@ Future<void> showTractionDetails(
                       _detailRow(context, 'EVN', loco.evn ?? ''),
                       if (loco.notes != null && loco.notes!.isNotEmpty)
                         _detailRow(context, 'Notes', loco.notes!),
+                      const SizedBox(height: 16),
+                      Text(
+                        'Leaderboard',
+                        style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                              fontWeight: FontWeight.w700,
+                            ),
+                      ),
+                      const SizedBox(height: 8),
+                      FutureBuilder<List<LeaderboardEntry>>(
+                        future: leaderboardFuture,
+                        builder: (context, snapshot) {
+                          if (snapshot.connectionState == ConnectionState.waiting) {
+                            return const Padding(
+                              padding: EdgeInsets.symmetric(vertical: 12.0),
+                              child: Center(
+                                child: SizedBox(
+                                  height: 24,
+                                  width: 24,
+                                  child: CircularProgressIndicator(strokeWidth: 2),
+                                ),
+                              ),
+                            );
+                          }
+                          if (snapshot.hasError) {
+                            return Padding(
+                              padding: const EdgeInsets.symmetric(vertical: 8.0),
+                              child: Text(
+                                'Failed to load leaderboard',
+                                style: Theme.of(context).textTheme.labelMedium?.copyWith(
+                                      color: Theme.of(context).colorScheme.error,
+                                    ),
+                              ),
+                            );
+                          }
+                          final entries = snapshot.data ?? const <LeaderboardEntry>[];
+                          if (entries.isEmpty) {
+                            return Padding(
+                              padding: const EdgeInsets.symmetric(vertical: 8.0),
+                              child: Text(
+                                'No mileage leaderboard yet.',
+                                style: Theme.of(context).textTheme.bodyMedium,
+                              ),
+                            );
+                          }
+                          return Column(
+                            children: entries.asMap().entries.map((entry) {
+                              final rank = entry.key + 1;
+                              return _leaderboardRow(
+                                context,
+                                rank,
+                                entry.value,
+                                distanceUnits,
+                              );
+                            }).toList(),
+                      );
+                    },
+                  ),
+                  if (auth.isElevated || canDeleteAsOwner) ...[
+                    const SizedBox(height: 16),
+                    FilledButton.tonal(
+                      style: FilledButton.styleFrom(
+                        backgroundColor:
+                            Theme.of(context).colorScheme.errorContainer,
+                        foregroundColor:
+                            Theme.of(context).colorScheme.onErrorContainer,
+                      ),
+                      onPressed: () async {
+                        final confirmed = await showDialog<bool>(
+                          context: context,
+                          builder: (context) {
+                            return AlertDialog(
+                              title: const Text('Delete loco?'),
+                              content: const Text(
+                                'This will permanently delete this loco. Are you sure?',
+                              ),
+                              actions: [
+                                TextButton(
+                                  onPressed: () => Navigator.of(context).pop(false),
+                                  child: const Text('Cancel'),
+                                ),
+                                FilledButton(
+                                  onPressed: () => Navigator.of(context).pop(true),
+                                  style: FilledButton.styleFrom(
+                                    backgroundColor:
+                                        Theme.of(context).colorScheme.error,
+                                  ),
+                                  child: const Text('Delete'),
+                                ),
+                              ],
+                            );
+                          },
+                        );
+                        if (confirmed != true) return;
+                        try {
+                          await data.adminDeleteLoco(locoId: loco.id);
+                          messenger.showSnackBar(
+                            const SnackBar(content: Text('Loco deleted')),
+                          );
+                          await onActionComplete?.call();
+                          if (!context.mounted) return;
+                          Navigator.of(ctx).pop();
+                        } catch (e) {
+                          messenger.showSnackBar(
+                            SnackBar(content: Text('Failed to delete loco: $e')),
+                          );
+                        }
+                      },
+                      child: const Text('Delete loco'),
+                    ),
+                  ],
                 ],
               ),
             ),
@@ -268,6 +809,105 @@ Future<void> showTractionDetails(
   );
 }
 
+Future<List<LeaderboardEntry>> _fetchLocoLeaderboard(
+  ApiService api,
+  int locoId,
+) async {
+  try {
+    final json = await api.get('/loco/leaderboard/id/$locoId');
+    Iterable<dynamic>? raw;
+    if (json is List) {
+      raw = json;
+    } else if (json is Map) {
+      for (final key in ['data', 'leaderboard', 'results']) {
+        final value = json[key];
+        if (value is List) {
+          raw = value;
+          break;
+        }
+      }
+    }
+    if (raw == null) return const [];
+    return raw.whereType<Map>().map((e) {
+      return LeaderboardEntry.fromJson(
+        e.map((key, value) => MapEntry(key.toString(), value)),
+      );
+    }).toList();
+  } catch (e) {
+    debugPrint('Failed to fetch loco leaderboard for $locoId: $e');
+    rethrow;
+  }
+}
+
+int? _leaderboardId(LocoSummary loco) {
+  int? parse(dynamic value) {
+    if (value == null) return null;
+    if (value is int) return value == 0 ? null : value;
+    if (value is num) return value.toInt() == 0 ? null : value.toInt();
+    return int.tryParse(value.toString());
+  }
+
+  return parse(loco.extra['loco_id']) ??
+      parse(loco.extra['id']) ??
+      parse(loco.id);
+}
+
+Widget _leaderboardRow(
+  BuildContext context,
+  int rank,
+  LeaderboardEntry entry,
+  DistanceUnitService distanceUnits,
+) {
+  final theme = Theme.of(context);
+  final primaryName =
+      entry.userFullName.isNotEmpty ? entry.userFullName : entry.username;
+  final mileageLabel = distanceUnits.format(entry.mileage, decimals: 1);
+
+  return Padding(
+    padding: const EdgeInsets.symmetric(vertical: 6.0),
+    child: Row(
+      children: [
+        Container(
+          width: 36,
+          height: 36,
+          alignment: Alignment.center,
+          decoration: BoxDecoration(
+            color: theme.colorScheme.primaryContainer,
+            borderRadius: BorderRadius.circular(10),
+          ),
+          child: Text(
+            '#$rank',
+            style: theme.textTheme.labelMedium?.copyWith(
+              fontWeight: FontWeight.w700,
+              color: theme.colorScheme.onPrimaryContainer,
+            ),
+          ),
+        ),
+        const SizedBox(width: 10),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                primaryName,
+                style: theme.textTheme.bodyMedium?.copyWith(
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+            ],
+          ),
+        ),
+        Text(
+          mileageLabel,
+          style: theme.textTheme.bodyMedium?.copyWith(
+            fontWeight: FontWeight.w700,
+          ),
+        ),
+      ],
+    ),
+  );
+}
+
 Widget _detailRow(BuildContext context, String label, String value) {
   if (value.isEmpty) return const SizedBox.shrink();
   return Padding(
@@ -339,8 +979,3 @@ bool _hasMileageOrTrips(LocoSummary loco) {
   final trips = loco.trips ?? loco.journeys ?? 0;
   return mileage > 0 || trips > 0;
 }
-
-String _formatNumber(double? value) {
-  if (value == null) return '0';
-  return value.toStringAsFixed(1);
-}

lib/components/widgets/friend_request_notification_card.dart

@@ -0,0 +1,127 @@
+import 'package:flutter/material.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:provider/provider.dart';
+
+class FriendRequestNotificationCard extends StatelessWidget {
+  const FriendRequestNotificationCard({super.key, required this.notification});
+
+  final UserNotification notification;
+
+  @override
+  Widget build(BuildContext context) {
+    final data = context.read<DataService>();
+    final friendshipId = notification.body.trim();
+    if (friendshipId.isEmpty) {
+      return const Text('Invalid friend request notification.');
+    }
+    final future = data.fetchFriendshipById(friendshipId);
+    return FutureBuilder<Friendship?>(
+      future: future,
+      builder: (context, snapshot) {
+        if (snapshot.connectionState == ConnectionState.waiting) {
+          return const Padding(
+            padding: EdgeInsets.symmetric(vertical: 6.0),
+            child: SizedBox(
+              height: 20,
+              width: 20,
+              child: CircularProgressIndicator(strokeWidth: 2),
+            ),
+          );
+        }
+        if (snapshot.hasError) {
+          return const Text('Failed to load request details.');
+        }
+        final friendship = snapshot.data;
+        final requester = friendship?.requester;
+        if (friendship == null || requester == null) {
+          return const Text('Friend request details unavailable.');
+        }
+        final buttonStyle = ElevatedButton.styleFrom(
+          minimumSize: const Size(0, 36),
+        );
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                const Icon(Icons.person_add_alt, size: 18),
+                const SizedBox(width: 6),
+                Text(
+                  requester.displayName.isNotEmpty
+                      ? requester.displayName
+                      : '@${requester.username}',
+                  style: Theme.of(context).textTheme.titleSmall,
+                ),
+              ],
+            ),
+            const SizedBox(height: 6),
+            Wrap(
+              spacing: 8,
+              children: [
+                ElevatedButton(
+                  style: buttonStyle,
+                  onPressed: () =>
+                      _respond(context, friendship.id, accept: true),
+                  child: const Text('Accept'),
+                ),
+                ElevatedButton(
+                  style: buttonStyle,
+                  onPressed: () =>
+                      _respond(context, friendship.id, accept: false),
+                  child: const Text('Reject'),
+                ),
+              ],
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  Future<void> _respond(
+    BuildContext context,
+    String? friendshipId, {
+    required bool accept,
+  }) async {
+    if (friendshipId == null || friendshipId.isEmpty) return;
+    final data = context.read<DataService>();
+    final messenger = ScaffoldMessenger.maybeOf(context);
+    try {
+      if (accept) {
+        await data.acceptFriendship(friendshipId);
+        if (!context.mounted) return;
+        messenger?.showSnackBar(
+          const SnackBar(content: Text('Friend request accepted')),
+        );
+        await _dismissNotification(context, messenger);
+      } else {
+        await data.rejectFriendship(friendshipId);
+        if (!context.mounted) return;
+        messenger?.showSnackBar(
+          const SnackBar(content: Text('Friend request rejected')),
+        );
+        await _dismissNotification(context, messenger);
+      }
+      await data.fetchPendingFriendships();
+    } catch (e) {
+      if (!context.mounted) return;
+      messenger?.showSnackBar(
+        SnackBar(content: Text('Failed to respond: $e')),
+      );
+    }
+  }
+
+  Future<void> _dismissNotification(
+    BuildContext context,
+    ScaffoldMessengerState? messenger,
+  ) async {
+    try {
+      await context.read<DataService>().dismissNotifications([notification.id]);
+    } catch (e) {
+      messenger?.showSnackBar(
+        SnackBar(content: Text('Failed to dismiss notification: $e')),
+      );
+    }
+  }
+}

lib/components/widgets/leg_share_edit_notification_card.dart

@@ -0,0 +1,533 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:provider/provider.dart';
+
+class LegShareEditNotificationCard extends StatefulWidget {
+  const LegShareEditNotificationCard({super.key, required this.notification});
+
+  final UserNotification notification;
+
+  @override
+  State<LegShareEditNotificationCard> createState() => _LegShareEditNotificationCardState();
+}
+
+class _LegShareEditNotificationCardState extends State<LegShareEditNotificationCard> {
+  Map<String, dynamic>? _changes;
+  int? _legId;
+  int? _shareId;
+  Leg? _currentLeg;
+  bool _loading = false;
+
+  static const int _summaryLimit = 3;
+
+  @override
+  void initState() {
+    super.initState();
+    _parseNotification();
+  }
+
+  @override
+  void didUpdateWidget(covariant LegShareEditNotificationCard oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.notification != widget.notification) {
+      _parseNotification();
+    }
+  }
+
+  void _parseNotification() {
+    final rawBody = widget.notification.body.trim();
+
+    // Reset
+    _shareId = null;
+    _legId = null;
+    _currentLeg = null;
+    _changes = null;
+
+    final parsed = _decodeBody(rawBody);
+    if (parsed != null) {
+      _shareId = _parseInt(parsed['share_id']);
+      _legId = _parseInt(parsed['leg_id']);
+      final accepted = _asStringKeyedMap(parsed['accepted_changes']);
+      if (accepted != null) {
+        _changes = accepted;
+      }
+    }
+
+    // Fallback: extract share_id from raw string if still missing.
+    _shareId ??= _extractShareId(rawBody);
+  }
+
+  int? _parseInt(dynamic value) {
+    if (value is int) return value;
+    if (value is num) return value.toInt();
+    if (value is String) return int.tryParse(value.trim());
+    return null;
+  }
+
+  Map<String, dynamic>? _decodeBody(String rawBody) {
+    final attempts = <String>[
+      rawBody,
+      _stripWrappingQuotes(rawBody),
+      _replaceSingleQuotes(rawBody),
+    ].where((s) => s.trim().isNotEmpty).toSet();
+
+    for (final attempt in attempts) {
+      final parsed = _decodeJsonToMap(attempt);
+      if (parsed != null) return parsed;
+    }
+    return null;
+  }
+
+  Map<String, dynamic>? _decodeJsonToMap(String source) {
+    dynamic parsed = source;
+    for (int i = 0; i < 3 && parsed is String; i++) {
+      try {
+        parsed = jsonDecode(parsed);
+      } catch (e) {
+        parsed = null;
+        break;
+      }
+    }
+    if (parsed is Map) {
+      final map = parsed.map((k, v) => MapEntry(k.toString(), v));
+      return map;
+    }
+    return null;
+  }
+
+  String _stripWrappingQuotes(String input) {
+    final trimmed = input.trim();
+    if (trimmed.length >= 2 &&
+        ((trimmed.startsWith('"') && trimmed.endsWith('"')) ||
+            (trimmed.startsWith("'") && trimmed.endsWith("'")))) {
+      return trimmed.substring(1, trimmed.length - 1);
+    }
+    return input;
+  }
+
+  String _replaceSingleQuotes(String input) {
+    if (!input.contains("'")) return input;
+    return input.replaceAll(RegExp(r"(?<!\\)'"), '"');
+  }
+
+  Map<String, dynamic>? _asStringKeyedMap(dynamic value) {
+    if (value is Map) {
+      return value.map((k, v) => MapEntry(k.toString(), v));
+    }
+    if (value is String && value.trim().isNotEmpty) {
+      for (final attempt in [value, _replaceSingleQuotes(value)]) {
+        try {
+          final decoded = jsonDecode(attempt);
+          if (decoded is Map) {
+            return decoded.map((k, v) => MapEntry(k.toString(), v));
+          }
+        } catch (_) {
+          // Ignore; handled by caller.
+        }
+      }
+    }
+    return null;
+  }
+
+  int? _extractShareId(String raw) {
+    final patterns = [
+      RegExp(r'"share_id"\s*:\s*(\d+)'),
+      RegExp(r"'share_id'\s*:\s*(\d+)"),
+      RegExp(r'share_id\s*:\s*(\d+)'),
+      RegExp(r'"share_id"\s*:\s*"(\d+)"'),
+    ];
+    for (final pattern in patterns) {
+      final match = pattern.firstMatch(raw);
+      if (match != null) {
+        final parsed = int.tryParse(match.group(1)!);
+        return parsed;
+      }
+    }
+    return null;
+  }
+
+  Future<void> _loadLegIdIfNeeded() async {
+    if (_legId != null) return;
+    if (_shareId == null) {
+      return;
+    }
+    try {
+      final share = await context.read<DataService>().fetchLegShare(_shareId!.toString());
+      if (!mounted) return;
+      _legId = share?.entry.id;
+      _currentLeg ??= _findCurrentLeg(_legId);
+    } catch (e) {
+      // ignore: avoid_empty_catches
+    }
+  }
+
+  Leg? _findCurrentLeg(int? legId) {
+    if (legId == null) return null;
+    final data = context.read<DataService>();
+    try {
+      return data.legs.firstWhere((l) => l.id == legId);
+    } catch (_) {
+      return null;
+    }
+  }
+
+
+  @override
+  Widget build(BuildContext context) {
+    final changes = _changes;
+    if (changes == null || changes.isEmpty) {
+      return const Text('No changes supplied.');
+    }
+    final entries = changes.entries.toList();
+    final shown = entries.take(_summaryLimit).toList();
+    final remaining = entries.length - shown.length;
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        ...shown.map((e) => _changePreview(context, e)),
+        if (remaining > 0)
+          Padding(
+            padding: const EdgeInsets.only(top: 4.0),
+            child: Text('+$remaining others…', style: Theme.of(context).textTheme.bodySmall),
+          ),
+        const SizedBox(height: 8),
+        Wrap(
+          spacing: 8,
+          runSpacing: 8,
+          children: [
+            ElevatedButton(
+              onPressed: _loading ? null : () => _openDrawer(changes),
+              child: const Text('View changes'),
+            ),
+            TextButton(
+              onPressed: _loading ? null : _dismiss,
+              child: const Text('Dismiss changes'),
+            ),
+          ],
+        ),
+      ],
+    );
+  }
+
+  Widget _changePreview(BuildContext context, MapEntry<String, dynamic> change) {
+    final key = _prettyField(change.key);
+    final value = change.value;
+    String display;
+    if (change.key == 'locos' && value is List) {
+      display = '${value.length} traction update${value.length == 1 ? '' : 's'}';
+    } else {
+      display = _stringify(value);
+    }
+    return Padding(
+      padding: const EdgeInsets.only(top: 4.0),
+      child: Text('$key: $display'),
+    );
+  }
+
+  String _prettyField(String raw) {
+    switch (raw) {
+      case 'leg_notes':
+        return 'Notes';
+      case 'locos':
+        return 'Traction';
+      default:
+        return raw.replaceAll('_', ' ');
+    }
+  }
+
+  dynamic _currentValueForField(Leg leg, String key) {
+    switch (key) {
+      case 'leg_begin_time':
+        return leg.beginTime;
+      case 'leg_end_time':
+        return leg.endTime;
+      case 'leg_origin_time':
+        return leg.originTime;
+      case 'leg_destination_time':
+        return leg.destinationTime;
+      case 'leg_notes':
+        return leg.notes;
+      case 'leg_headcode':
+        return leg.headcode;
+      case 'leg_network':
+        return leg.network;
+      case 'leg_start':
+        return leg.start;
+      case 'leg_end':
+        return leg.end;
+      case 'leg_origin':
+        return leg.origin;
+      case 'leg_destination':
+        return leg.destination;
+      case 'leg_route':
+        return leg.route;
+      case 'leg_mileage':
+        return leg.mileage;
+      case 'leg_begin_delay':
+        return leg.beginDelayMinutes;
+      case 'leg_end_delay':
+        return leg.endDelayMinutes;
+      case 'locos':
+        return leg.locos;
+      default:
+        return null;
+    }
+  }
+
+  Widget _buildChangeValueWidget(
+    String key,
+    dynamic newValue,
+    Leg? currentLeg,
+    Widget Function(List<dynamic>) buildLocos,
+  ) {
+    final currentValue = currentLeg == null ? null : _currentValueForField(currentLeg, key);
+    if (key == 'locos' && newValue is List) {
+      final currentCount = (currentValue is List) ? currentValue.length : 0;
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text('Current: $currentCount locos'),
+          const SizedBox(height: 4),
+          const Text('New:'),
+          buildLocos(newValue),
+        ],
+      );
+    }
+
+    final currentStr = _stringify(currentValue);
+    final newStr = _stringify(newValue);
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Expanded(child: Text(currentStr, maxLines: 3, overflow: TextOverflow.ellipsis)),
+        const Padding(
+          padding: EdgeInsets.symmetric(horizontal: 6.0),
+          child: Icon(Icons.arrow_right_alt, size: 18),
+        ),
+        Expanded(child: Text(newStr, maxLines: 3, overflow: TextOverflow.ellipsis)),
+      ],
+    );
+  }
+
+  String _stringify(dynamic value) {
+    if (value is DateTime) return value.toIso8601String();
+    if (value == null) return '—';
+    if (value is List || value is Map) {
+      return jsonEncode(value);
+    }
+    return value.toString();
+  }
+
+  Future<void> _openDrawer(Map<String, dynamic> changes) async {
+    setState(() => _loading = true);
+    await _loadLegIdIfNeeded();
+    _currentLeg ??= _findCurrentLeg(_legId);
+    if (!mounted) return;
+    setState(() => _loading = false);
+    final legId = _legId;
+    if (legId == null) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('Unable to load shared leg.')),
+      );
+      return;
+    }
+
+    final selected = Map<String, bool>.fromEntries(
+      changes.keys.map((k) => MapEntry(k, false)),
+    );
+
+    await showModalBottomSheet<void>(
+      context: context,
+      isScrollControlled: true,
+      builder: (ctx) {
+        return StatefulBuilder(
+          builder: (context, setSheetState) {
+            Future<void> apply() async {
+              final payload = <String, dynamic>{};
+              for (final entry in changes.entries) {
+                if (selected[entry.key] == true) {
+                  payload[entry.key] = entry.value;
+                }
+              }
+              if (payload.isEmpty) {
+                Navigator.of(context).pop();
+                return;
+              }
+              final messenger = ScaffoldMessenger.of(context);
+              setSheetState(() => _loading = true);
+              try {
+                final data = context.read<DataService>();
+                await data.applyLegPartialUpdates(
+                  legId: legId,
+                  updates: payload,
+                );
+                if (!context.mounted) return;
+                await data.dismissNotifications([widget.notification.id]);
+                if (!context.mounted) return;
+                messenger.showSnackBar(
+                  const SnackBar(content: Text('Changes applied.')),
+                );
+                Navigator.of(context).pop();
+              } catch (e) {
+                messenger.showSnackBar(
+                  SnackBar(content: Text('Failed to apply changes: $e')),
+                );
+              } finally {
+                setSheetState(() => _loading = false);
+              }
+            }
+
+            Widget buildLocos(List<dynamic> locos) {
+              final parsed = locos
+                  .whereType<Map>()
+                  .map((e) => e.map((k, v) => MapEntry(k.toString(), v)))
+                  .toList();
+              parsed.sort((a, b) => (b['alloc_pos'] ?? 0).compareTo(a['alloc_pos'] ?? 0));
+              final leading = parsed.where((e) => (e['alloc_pos'] ?? 0) > 0).toList();
+              final trailing = parsed.where((e) => (e['alloc_pos'] ?? 0) <= 0).toList();
+
+              List<Widget> chipsFor(List<Map<String, dynamic>> list) {
+                return list
+                    .map(
+                      (loco) => Chip(
+                        backgroundColor:
+                            (loco['alloc_powering'] == 1 || loco['alloc_powering'] == true)
+                                ? Theme.of(context).colorScheme.primary.withValues(alpha: 0.12)
+                                : Theme.of(context).colorScheme.surfaceContainerHighest,
+                        label: Text('Loco ${loco['loco_id'] ?? '?'} (pos ${loco['alloc_pos'] ?? '?'}'),
+                        avatar: Icon(
+                          Icons.train,
+                          size: 16,
+                          color: (loco['alloc_powering'] == 1 || loco['alloc_powering'] == true)
+                              ? Theme.of(context).colorScheme.primary
+                              : Theme.of(context).hintColor,
+                        ),
+                      ),
+                    )
+                    .toList();
+              }
+
+              return Wrap(
+                spacing: 8,
+                runSpacing: 8,
+                crossAxisAlignment: WrapCrossAlignment.center,
+                children: [
+                  ...chipsFor(leading),
+                  if (leading.isNotEmpty && trailing.isNotEmpty)
+                    const SizedBox(
+                      width: 24,
+                      child: Center(child: Divider(height: 16)),
+                    ),
+                  ...chipsFor(trailing),
+                ],
+              );
+            }
+
+            return SafeArea(
+              child: Padding(
+                padding: EdgeInsets.only(
+                  left: 16,
+                  right: 16,
+                  bottom: MediaQuery.of(context).viewInsets.bottom + 16,
+                  top: 16,
+                ),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Text('Review changes', style: Theme.of(context).textTheme.titleMedium),
+                        IconButton(
+                          icon: const Icon(Icons.close),
+                          onPressed: () => Navigator.of(context).pop(),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 12),
+                    Row(
+                      children: [
+                        TextButton(
+                          onPressed: () => setSheetState(() {
+                            for (final key in selected.keys) {
+                              selected[key] = true;
+                            }
+                          }),
+                          child: const Text('Select all'),
+                        ),
+                        const Spacer(),
+                        TextButton(
+                          onPressed: () => Navigator.of(context).pop(),
+                          child: const Text('Cancel'),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    ...changes.entries.map((entry) {
+                      final key = entry.key;
+                      final prettyKey = _prettyField(key);
+                      final value = entry.value;
+                      final currentLeg = _currentLeg ?? _findCurrentLeg(_legId);
+                      final valueWidget = _buildChangeValueWidget(
+                        key,
+                        value,
+                        currentLeg,
+                        buildLocos,
+                      );
+                      return Padding(
+                        padding: const EdgeInsets.only(bottom: 12.0),
+                        child: Row(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Checkbox(
+                              value: selected[key] ?? false,
+                              onChanged: (v) => setSheetState(() {
+                                selected[key] = v ?? false;
+                              }),
+                            ),
+                            Expanded(
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Text(prettyKey, style: Theme.of(context).textTheme.titleSmall),
+                                  const SizedBox(height: 4),
+                                  valueWidget,
+                                ],
+                              ),
+                            ),
+                          ],
+                        ),
+                      );
+                    }),
+                    Align(
+                      alignment: Alignment.centerRight,
+                      child: FilledButton(
+                        onPressed: _loading ? null : apply,
+                        child: _loading
+                            ? const SizedBox(
+                                height: 18,
+                                width: 18,
+                                child: CircularProgressIndicator(strokeWidth: 2),
+                              )
+                            : const Text('Apply changes'),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+
+  Future<void> _dismiss() async {
+    await context.read<DataService>().dismissNotifications([widget.notification.id]);
+  }
+}

lib/components/widgets/leg_share_notification_card.dart

@@ -0,0 +1,163 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/data_service.dart';
+import 'package:provider/provider.dart';
+
+class LegShareNotificationCard extends StatelessWidget {
+  const LegShareNotificationCard({super.key, required this.notification});
+
+  final UserNotification notification;
+
+  @override
+  Widget build(BuildContext context) {
+    final data = context.read<DataService>();
+    final legShareId = _extractLegShareId(notification.body);
+    if (legShareId == null) {
+      return const Text('Invalid leg share notification.');
+    }
+    final future = data.fetchLegShare(legShareId);
+    return FutureBuilder<LegShareData?>(
+      future: future,
+      builder: (context, snapshot) {
+        if (snapshot.connectionState == ConnectionState.waiting) {
+          return const Padding(
+            padding: EdgeInsets.symmetric(vertical: 6.0),
+            child: SizedBox(
+              height: 20,
+              width: 20,
+              child: CircularProgressIndicator(strokeWidth: 2),
+            ),
+          );
+        }
+        if (snapshot.hasError) {
+          return const Text('Failed to load shared entry.');
+        }
+        final share = snapshot.data;
+        final entry = share?.entry;
+        if (share == null || entry == null) {
+          return const Text('Shared entry unavailable.');
+        }
+        final begin = entry.beginTime;
+        final beginStr =
+            '${begin.year.toString().padLeft(4, '0')}-${begin.month.toString().padLeft(2, '0')}-${begin.day.toString().padLeft(2, '0')} ${begin.hour.toString().padLeft(2, '0')}:${begin.minute.toString().padLeft(2, '0')}';
+        final start = entry.route.isNotEmpty ? entry.route.first : entry.start;
+        final end = entry.route.isNotEmpty ? entry.route.last : entry.end;
+        final sharedAt = share.sharedAt;
+        final sharedAtStr = sharedAt == null
+            ? null
+            : '${sharedAt.year.toString().padLeft(4, '0')}-${sharedAt.month.toString().padLeft(2, '0')}-${sharedAt.day.toString().padLeft(2, '0')} ${sharedAt.hour.toString().padLeft(2, '0')}:${sharedAt.minute.toString().padLeft(2, '0')}';
+        final from = share.sharedFromName;
+
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text('$beginStr • $start → $end'),
+            if (from.isNotEmpty)
+              Padding(
+                padding: const EdgeInsets.only(top: 4.0),
+                child: Text(
+                  'From $from',
+                  style: Theme.of(context).textTheme.bodySmall,
+                ),
+              ),
+            if (sharedAtStr != null)
+              Padding(
+                padding: const EdgeInsets.only(top: 4.0),
+                child: Text(
+                  'Shared at $sharedAtStr',
+                  style: Theme.of(context).textTheme.bodySmall,
+                ),
+              ),
+            const SizedBox(height: 8),
+            Wrap(
+              spacing: 8,
+              runSpacing: 8,
+              children: [
+                ElevatedButton(
+                  onPressed: () => _accept(context, share),
+                  child: const Text('Accept'),
+                ),
+                OutlinedButton(
+                  onPressed: () => _inspect(context, share),
+                  child: const Text('Inspect'),
+                ),
+                TextButton(
+                  onPressed: () => _reject(context, share),
+                  child: const Text('Reject'),
+                ),
+              ],
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  Future<void> _accept(BuildContext context, LegShareData share) async {
+    final data = context.read<DataService>();
+    final messenger = ScaffoldMessenger.maybeOf(context);
+    try {
+      await data.acceptLegShare(share);
+      if (!context.mounted) return;
+      await data.dismissNotifications([notification.id]);
+      // Refresh legs in the background.
+      unawaited(data.refreshLegs());
+      messenger?.showSnackBar(
+        const SnackBar(content: Text('Shared entry added to logbook')),
+      );
+    } catch (e) {
+      messenger?.showSnackBar(
+        SnackBar(content: Text('Failed to add shared entry: $e')),
+      );
+    }
+  }
+
+  Future<void> _reject(BuildContext context, LegShareData share) async {
+    final data = context.read<DataService>();
+    final messenger = ScaffoldMessenger.maybeOf(context);
+    try {
+      await data.rejectLegShare(share.id);
+      if (!context.mounted) return;
+      await data.dismissNotifications([notification.id]);
+      messenger?.showSnackBar(
+        const SnackBar(content: Text('Share rejected')),
+      );
+    } catch (e) {
+      messenger?.showSnackBar(
+        SnackBar(content: Text('Failed to reject share: $e')),
+      );
+    }
+  }
+
+  Future<void> _inspect(BuildContext context, LegShareData share) async {
+    final router = GoRouter.of(context);
+    // Close notifications panel if open.
+    if (Navigator.canPop(context)) {
+      Navigator.of(context).pop();
+    }
+    await Future<void>.delayed(Duration.zero);
+    final target = share.copyWith(notificationId: notification.id);
+    final ts = DateTime.now().millisecondsSinceEpoch;
+    final path = '/add?share=${Uri.encodeComponent(share.id)}&ts=$ts';
+    router.go(path, extra: target);
+  }
+
+  String? _extractLegShareId(String rawBody) {
+    final trimmed = rawBody.trim();
+    if (trimmed.isEmpty) return null;
+    if (RegExp(r'^[0-9]+$').hasMatch(trimmed)) return trimmed;
+    try {
+      final decoded = jsonDecode(trimmed);
+      if (decoded is Map) {
+        final id = decoded['share_id'] ?? decoded['leg_share_id'];
+        final str = id?.toString() ?? '';
+        if (RegExp(r'^[0-9]+$').hasMatch(str)) return str;
+      }
+    } catch (_) {}
+    return null;
+  }
+}

lib/services/accent_color_service.dart

@@ -0,0 +1,51 @@
+import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class AccentColorService extends ChangeNotifier {
+  static const _prefsKeyUseSystem = 'accent_use_system';
+  static const _prefsKeySeed = 'accent_seed';
+  static const Color defaultSeed = Colors.red;
+
+  bool _useSystem = true;
+  Color _seedColor = defaultSeed;
+  bool _hasSavedSeed = false;
+  bool _loaded = false;
+
+  bool get useSystem => _useSystem;
+  Color get seedColor => _seedColor;
+  bool get hasSavedSeed => _hasSavedSeed;
+  bool get isLoaded => _loaded;
+
+  AccentColorService() {
+    _load();
+  }
+
+  Future<void> _load() async {
+    final prefs = await SharedPreferences.getInstance();
+    _useSystem = prefs.getBool(_prefsKeyUseSystem) ?? true;
+    final seedValue = prefs.getInt(_prefsKeySeed);
+    if (seedValue != null) {
+      _seedColor = Color(seedValue);
+      _hasSavedSeed = true;
+    }
+    _loaded = true;
+    notifyListeners();
+  }
+
+  Future<void> setUseSystem(bool value) async {
+    _useSystem = value;
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setBool(_prefsKeyUseSystem, _useSystem);
+    notifyListeners();
+  }
+
+  Future<void> setSeedColor(Color color) async {
+    _seedColor = color;
+    _useSystem = false;
+    _hasSavedSeed = true;
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setInt(_prefsKeySeed, color.toARGB32());
+    await prefs.setBool(_prefsKeyUseSystem, _useSystem);
+    notifyListeners();
+  }
+}

lib/services/api_service.dart

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

lib/services/authservice.dart

@@ -21,6 +21,11 @@ class AuthService extends ChangeNotifier {
   String? get userId => _user?.userId;
   String? get username => _user?.username;
   String? get fullName => _user?.fullName;
+  String get entriesVisibility => _user?.entriesVisibility ?? 'private';
+  String get mileageVisibility => _user?.mileageVisibility ?? 'private';
+  bool get isElevated => _user?.isElevated ?? false;
+  bool get isAdmin => isElevated; // alias for old name
+  bool get isDisabled => _user?.disabled ?? false;
 
   void setLoginData({
     required String userId,
@@ -28,6 +33,10 @@ class AuthService extends ChangeNotifier {
     required String fullName,
     required String accessToken,
     required String email,
+    String entriesVisibility = 'private',
+    String mileageVisibility = 'private',
+    bool isElevated = false,
+    bool isDisabled = false,
   }) {
     _user = AuthenticatedUserData(
       userId: userId,
@@ -35,6 +44,10 @@ class AuthService extends ChangeNotifier {
       fullName: fullName,
       accessToken: accessToken,
       email: email,
+      entriesVisibility: entriesVisibility,
+      mileageVisibility: mileageVisibility,
+      isElevated: isElevated,
+      disabled: isDisabled,
     );
     _persistToken(accessToken);
     notifyListeners();
@@ -70,6 +83,16 @@ class AuthService extends ChangeNotifier {
       fullName: userResponse['full_name'],
       accessToken: accessToken,
       email: userResponse['email'],
+      entriesVisibility: _parseVisibility(
+        userResponse['user_entries_visibility'] ?? userResponse['entries_visibility'],
+        'private',
+      ),
+      mileageVisibility: _parseVisibility(
+        userResponse['user_mileage_visibility'] ?? userResponse['mileage_visibility'],
+        'private',
+      ),
+      isElevated: _parseIsElevated(userResponse),
+      isDisabled: _parseIsDisabled(userResponse),
     );
   }
 
@@ -95,6 +118,16 @@ class AuthService extends ChangeNotifier {
       fullName: userResponse['full_name'],
       accessToken: token,
       email: userResponse['email'],
+      entriesVisibility: _parseVisibility(
+        userResponse['user_entries_visibility'] ?? userResponse['entries_visibility'],
+        'private',
+      ),
+      mileageVisibility: _parseVisibility(
+        userResponse['user_mileage_visibility'] ?? userResponse['mileage_visibility'],
+        'private',
+      ),
+      isElevated: _parseIsElevated(userResponse),
+      isDisabled: _parseIsDisabled(userResponse),
     );
   } catch (_) {
       await _clearToken();
@@ -157,4 +190,67 @@ class AuthService extends ChangeNotifier {
   void logout() {
     handleTokenExpired(); // reuse
   }
+
+  bool _parseIsElevated(Map<String, dynamic> json) {
+    dynamic value = json['is_elevated'] ??
+        json['elevated'] ??
+        json['is_admin'] ??
+        json['admin'] ??
+        json['isAdmin'] ??
+        json['admin_user'] ??
+        json['role'] ??
+        json['roles'] ??
+        json['permissions'] ??
+        json['scopes'] ??
+        json['is_staff'] ??
+        json['staff'] ??
+        json['is_superuser'] ??
+        json['superuser'] ??
+        json['groups'];
+
+    bool parseBoolish(dynamic v) {
+      if (v is bool) return v;
+      if (v is num) return v != 0;
+      final str = v?.toString().toLowerCase().trim();
+      if (str == null || str.isEmpty) return false;
+      if (['1', 'true', 'yes', 'y', 'admin', 'superuser', 'staff', 'elevated'].contains(str)) {
+        return true;
+      }
+      return str.contains('admin') || str.contains('superuser') || str.contains('staff');
+    }
+
+    if (value is List) {
+      for (final entry in value) {
+        if (parseBoolish(entry)) return true;
+        final s = entry?.toString().toLowerCase();
+        if (s != null &&
+            (s.contains('admin') ||
+                s.contains('superuser') ||
+                s.contains('staff') ||
+                s.contains('elevated') ||
+                s == 'root')) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    return parseBoolish(value);
+  }
+
+  bool _parseIsDisabled(Map<String, dynamic> json) {
+    dynamic value = json['disabled'] ?? json['is_disabled'];
+    if (value is bool) return value;
+    if (value is num) return value != 0;
+    final str = value?.toString().toLowerCase().trim();
+    if (str == null || str.isEmpty) return false;
+    return ['1', 'true', 'yes', 'y', 'disabled'].contains(str);
+  }
+
+  String _parseVisibility(dynamic value, String fallback) {
+    const allowed = ['private', 'friends', 'public'];
+    final str = value?.toString().toLowerCase().trim();
+    if (str != null && allowed.contains(str)) return str;
+    return fallback;
+  }
 }

lib/services/data_service/data_service.dart

@@ -9,4 +9,8 @@ import 'package:mileograph_flutter/services/api_service.dart';
 part 'data_service_core.dart';
 part 'data_service_traction.dart';
 part 'data_service_trips.dart';
-
+part 'data_service_notifications.dart';
+part 'data_service_badges.dart';
+part 'data_service_stats.dart';
+part 'data_service_friendships.dart';
+part 'data_service_leg_share.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

@@ -6,6 +6,7 @@ class _LegFetchOptions {
   final int sortDirection;
   final String? dateRangeStart;
   final String? dateRangeEnd;
+  final bool unallocatedOnly;
 
   const _LegFetchOptions({
     this.limit = 100,
@@ -13,6 +14,7 @@ class _LegFetchOptions {
     this.sortDirection = 0,
     this.dateRangeStart,
     this.dateRangeEnd,
+    this.unallocatedOnly = false,
   });
 }
 
@@ -21,11 +23,17 @@ class DataService extends ChangeNotifier {
 
   DataService({required this.api});
 
+  String? _currentUserId;
+
   _LegFetchOptions _lastLegsFetch = const _LegFetchOptions();
 
   // Homepage Data
   HomepageStats? _homepageStats;
   HomepageStats? get homepageStats => _homepageStats;
+  StatsAbout? _aboutStats;
+  StatsAbout? get aboutStats => _aboutStats;
+  bool _isAboutStatsLoading = false;
+  bool get isAboutStatsLoading => _isAboutStatsLoading;
 
   // Legs Data
   List<Leg> _legs = [];
@@ -44,6 +52,13 @@ class DataService extends ChangeNotifier {
   bool get isTractionLoading => _isTractionLoading;
   bool _tractionHasMore = false;
   bool get tractionHasMore => _tractionHasMore;
+  List<LocoChange> _latestLocoChanges = [];
+  List<LocoChange> get latestLocoChanges => _latestLocoChanges;
+  bool _isLatestLocoChangesLoading = false;
+  bool get isLatestLocoChangesLoading => _isLatestLocoChangesLoading;
+  bool _latestLocoChangesHasMore = false;
+  bool get latestLocoChangesHasMore => _latestLocoChangesHasMore;
+  int _latestLocoChangesFetched = 0;
   final Map<int, List<LocoAttrVersion>> _locoTimelines = {};
   final Map<int, bool> _isLocoTimelineLoading = {};
   List<LocoAttrVersion> timelineForLoco(int locoId) =>
@@ -51,6 +66,18 @@ class DataService extends ChangeNotifier {
   bool isLocoTimelineLoading(int locoId) =>
       _isLocoTimelineLoading[locoId] ?? false;
 
+  // Friendships
+  List<Friendship> _friendships = [];
+  List<Friendship> _pendingIncoming = [];
+  List<Friendship> _pendingOutgoing = [];
+  List<Friendship> get friendships => _friendships;
+  List<Friendship> get pendingIncoming => _pendingIncoming;
+  List<Friendship> get pendingOutgoing => _pendingOutgoing;
+  bool _isFriendshipsLoading = false;
+  bool get isFriendshipsLoading => _isFriendshipsLoading;
+  bool _isPendingFriendshipsLoading = false;
+  bool get isPendingFriendshipsLoading => _isPendingFriendshipsLoading;
+
   // Trips
   List<TripSummary> _trips = [];
   List<TripSummary> get trips => _trips;
@@ -68,9 +95,14 @@ class DataService extends ChangeNotifier {
   bool get isEventFieldsLoading => _isEventFieldsLoading;
 
   // Station Data
-  List<Station>? _cachedStations;
-  DateTime? _stationsFetchedAt;
-  Future<List<Station>>? _stationsInFlight;
+  final Map<String, List<Station>> _stationCache = {};
+  final Map<String, Future<List<Station>>?> _stationInFlightByKey = {};
+  List<String> _stationNetworks = [];
+  Map<String, List<String>> _stationCountryNetworks = {};
+  DateTime? _stationFiltersFetchedAt;
+  List<String> get stationNetworks => _stationNetworks;
+  Map<String, List<String>> get stationCountryNetworks =>
+      _stationCountryNetworks;
 
   List<String> stations = [""];
 
@@ -78,6 +110,50 @@ class DataService extends ChangeNotifier {
   bool get isHomepageLoading => _isHomepageLoading;
   bool _isOnThisDayLoading = false;
   bool get isOnThisDayLoading => _isOnThisDayLoading;
+  List<LeaderboardEntry> _friendsLeaderboard = [];
+  List<LeaderboardEntry> get friendsLeaderboard => _friendsLeaderboard;
+  bool _isFriendsLeaderboardLoading = false;
+  bool get isFriendsLeaderboardLoading => _isFriendsLeaderboardLoading;
+
+  // Notifications
+  List<UserNotification> _notifications = [];
+  List<UserNotification> get notifications => _notifications;
+  bool _isNotificationsLoading = false;
+  bool get isNotificationsLoading => _isNotificationsLoading;
+
+  // Privacy
+  String _userEntriesVisibility = 'private';
+  String _userMileageVisibility = 'private';
+  bool _isPrivacyLoading = false;
+  bool _isPrivacySaving = false;
+  String get userEntriesVisibility => _userEntriesVisibility;
+  String get userMileageVisibility => _userMileageVisibility;
+  bool get isPrivacyLoading => _isPrivacyLoading;
+  bool get isPrivacySaving => _isPrivacySaving;
+
+  // 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'),
@@ -97,23 +173,197 @@ class DataService extends ChangeNotifier {
     });
   }
 
+  int _visibilityRank(String value) {
+    switch (value.toLowerCase()) {
+      case 'public':
+        return 2;
+      case 'friends':
+        return 1;
+      default:
+        return 0;
+    }
+  }
+
+  String _normaliseVisibility(
+    dynamic value, {
+    required String fallback,
+  }) {
+    const allowed = ['private', 'friends', 'public'];
+    final str = value?.toString().toLowerCase().trim();
+    if (str != null && allowed.contains(str)) return str;
+    return fallback;
+  }
+
+  String _clampMileageVisibility(String entries, String mileage) {
+    return _visibilityRank(mileage) < _visibilityRank(entries)
+        ? entries
+        : mileage;
+  }
+
+  void _applyPrivacy(dynamic source) {
+    String entries = _userEntriesVisibility;
+    String mileage = _userMileageVisibility;
+    if (source is Map) {
+      entries = _normaliseVisibility(
+        source['user_entries_visibility'] ?? source['entries_visibility'],
+        fallback: entries,
+      );
+      mileage = _normaliseVisibility(
+        source['user_mileage_visibility'] ?? source['mileage_visibility'],
+        fallback: mileage,
+      );
+    } else if (source is UserData) {
+      entries = _normaliseVisibility(
+        source.entriesVisibility,
+        fallback: entries,
+      );
+      mileage = _normaliseVisibility(
+        source.mileageVisibility,
+        fallback: mileage,
+      );
+    }
+    _userEntriesVisibility = entries;
+    _userMileageVisibility = _clampMileageVisibility(entries, mileage);
+  }
+
+  Future<void> fetchPrivacySettings({String? targetUserId}) async {
+    _isPrivacyLoading = true;
+    _notifyAsync();
+    try {
+      Map<String, dynamic>? payload;
+      final hasTarget = targetUserId?.isNotEmpty ?? false;
+      if (!hasTarget) {
+        try {
+          final json = await api.get('/users/me');
+          if (json is Map<String, dynamic>) {
+            payload = json;
+          } else if (json is Map) {
+            payload = json.map((k, v) => MapEntry(k.toString(), v));
+          }
+        } catch (e) {
+          debugPrint('Failed to fetch /users/me: $e');
+        }
+      }
+      if (payload == null) {
+        final query = hasTarget ? '?target_user_id=$targetUserId' : '';
+        try {
+          final json = await api.get('/users/privacy$query');
+          if (json is Map<String, dynamic>) {
+            payload = json;
+          } else if (json is Map) {
+            payload = json.map((k, v) => MapEntry(k.toString(), v));
+          }
+        } catch (e) {
+          debugPrint('Failed to fetch /users/privacy: $e');
+        }
+      }
+      if (payload != null) {
+        _applyPrivacy(payload);
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch privacy settings: $e');
+    } finally {
+      _isPrivacyLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<void> updatePrivacySettings({
+    required String entriesVisibility,
+    required String mileageVisibility,
+    String? targetUserId,
+  }) async {
+    _isPrivacySaving = true;
+    _notifyAsync();
+    try {
+      final query = (targetUserId?.isNotEmpty ?? false)
+          ? '?target_user_id=$targetUserId'
+          : '';
+      await api.post('/users/privacy$query', {
+        'user_entries_visibility': entriesVisibility,
+        'user_mileage_visibility': mileageVisibility,
+      });
+      _userEntriesVisibility = entriesVisibility;
+      _userMileageVisibility = mileageVisibility;
+    } catch (e) {
+      debugPrint('Failed to update privacy settings: $e');
+      rethrow;
+    } finally {
+      _isPrivacySaving = false;
+      _notifyAsync();
+    }
+  }
+
   Future<void> fetchHomepageStats() async {
     _isHomepageLoading = true;
 
     try {
       final json = await api.get('/stats/homepage');
       _homepageStats = HomepageStats.fromJson(json);
-      _trips = _homepageStats?.trips ?? [];
+      _trips = [...(_homepageStats?.trips ?? const [])]
+        ..sort(TripSummary.compareByDateDesc);
+      _friendsLeaderboard = _homepageStats?.friendsLeaderboard ?? [];
+      if (_homepageStats?.user != null) {
+        _applyPrivacy(_homepageStats!.user!);
+      }
     } catch (e) {
       debugPrint('Failed to fetch homepage stats: $e');
       _homepageStats = null;
       _trips = [];
+      _friendsLeaderboard = [];
     } finally {
       _isHomepageLoading = false;
       _notifyAsync();
     }
   }
 
+  Future<UserProfileDetail?> fetchUserProfileDetail(String userId) async {
+    try {
+      final json = await api.get('/user/$userId');
+      if (json is Map) {
+        return UserProfileDetail.fromJson(
+          json.map((k, v) => MapEntry(k.toString(), v)),
+        );
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch user profile for $userId: $e');
+    }
+    return null;
+  }
+
+  Future<List<Leg>> fetchUserLegs({
+    required String userId,
+    int offset = 0,
+    int limit = 25,
+  }) async {
+    try {
+      final json =
+          await api.get('/legs/user/$userId?offset=$offset&limit=$limit');
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['legs', 'data', 'results', 'items']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      if (list == null) return const [];
+      return list
+          .whereType<Map>()
+          .map((e) => Leg.fromJson(
+                e.map((k, v) => MapEntry(k.toString(), v)),
+              ))
+          .toList();
+    } catch (e) {
+      debugPrint('Failed to fetch user legs for $userId: $e');
+      return const [];
+    }
+  }
+
   Future<void> fetchLegs({
     int offset = 0,
     int limit = 100,
@@ -122,6 +372,7 @@ class DataService extends ChangeNotifier {
     String? dateRangeStart,
     String? dateRangeEnd,
     bool append = false,
+    bool unallocatedOnly = false,
   }) async {
     _isLegsLoading = true;
     if (!append) {
@@ -131,6 +382,7 @@ class DataService extends ChangeNotifier {
         sortDirection: sortDirection,
         dateRangeStart: dateRangeStart,
         dateRangeEnd: dateRangeEnd,
+        unallocatedOnly: unallocatedOnly,
       );
     }
     final buffer = StringBuffer(
@@ -142,13 +394,17 @@ class DataService extends ChangeNotifier {
     if (dateRangeEnd != null && dateRangeEnd.isNotEmpty) {
       buffer.write('&date_range_end=$dateRangeEnd');
     }
+    if (unallocatedOnly) {
+      buffer.write('&unallocated_only=true');
+    }
     try {
       final json = await api.get('/user/legs${buffer.toString()}');
 
       if (json is List) {
         final newLegs = json.map((e) => Leg.fromJson(e)).toList();
         _legs = append ? [..._legs, ...newLegs] : newLegs;
-        _legsHasMore = newLegs.length >= limit;
+        // Keep "load more" available as long as the server returns items; hide only on empty.
+        _legsHasMore = newLegs.isNotEmpty;
       } else {
         throw Exception('Unexpected legs response: $json');
       }
@@ -169,6 +425,7 @@ class DataService extends ChangeNotifier {
       sortDirection: _lastLegsFetch.sortDirection,
       dateRangeStart: _lastLegsFetch.dateRangeStart,
       dateRangeEnd: _lastLegsFetch.dateRangeEnd,
+      unallocatedOnly: _lastLegsFetch.unallocatedOnly,
     );
   }
 
@@ -180,7 +437,7 @@ class DataService extends ChangeNotifier {
     final params =
         includeNonPowering ? '?include_non_powering=true' : '';
     try {
-      final json = await api.get('/legs/$locoId$params');
+      final json = await api.get('/legs/by-loco/$locoId$params');
       dynamic list = json;
       if (json is Map) {
         for (final key in ['legs', 'data', 'results']) {
@@ -331,7 +588,42 @@ class DataService extends ChangeNotifier {
     }
   }
 
+  Future<void> deletePendingEvent({
+    required int eventId,
+  }) async {
+    try {
+      await api.delete('/event/pending/$eventId');
+    } catch (e) {
+      debugPrint('Failed to delete pending event $eventId: $e');
+      rethrow;
+    }
+  }
+
+  Future<void> approvePendingEvent({
+    required int eventId,
+  }) async {
+    try {
+      await api.put('/event/approve/$eventId', null);
+    } catch (e) {
+      debugPrint('Failed to approve pending event $eventId: $e');
+      rethrow;
+    }
+  }
+
+  Future<void> rejectPendingEvent({
+    required int eventId,
+  }) async {
+    try {
+      await api.put('/event/reject/$eventId', null);
+    } catch (e) {
+      debugPrint('Failed to reject pending event $eventId: $e');
+      rethrow;
+    }
+  }
+
   void clear() {
+    _currentUserId = null;
+    _lastLegsFetch = const _LegFetchOptions();
     _homepageStats = null;
     _legs = [];
     _onThisDay = [];
@@ -340,9 +632,63 @@ class DataService extends ChangeNotifier {
     _eventFields = [];
     _locoTimelines.clear();
     _isLocoTimelineLoading.clear();
+    _latestLocoChanges = [];
+    _isLatestLocoChangesLoading = false;
+    _isHomepageLoading = false;
+    _isOnThisDayLoading = false;
+    _legsHasMore = false;
+    _isLegsLoading = false;
+    _traction = [];
+    _isTractionLoading = false;
+    _tractionHasMore = false;
+    _latestLocoChangesHasMore = false;
+    _latestLocoChangesFetched = 0;
+    _isTripDetailsLoading = false;
+    _locoClasses = [];
+    _tripList = [];
+    _stationCache.clear();
+    _stationInFlightByKey.clear();
+    _stationNetworks = [];
+    _stationCountryNetworks = {};
+    _stationFiltersFetchedAt = null;
+    _notifications = [];
+    _isNotificationsLoading = false;
+    _userEntriesVisibility = 'private';
+    _userMileageVisibility = 'private';
+    _isPrivacyLoading = false;
+    _isPrivacySaving = false;
+    _badgeAwards = [];
+    _badgeAwardsHasMore = false;
+    _isBadgeAwardsLoading = false;
+    _classClearanceProgress = [];
+    _isClassClearanceProgressLoading = false;
+    _classClearanceHasMore = false;
+    _locoClearanceProgress = [];
+    _isLocoClearanceProgressLoading = false;
+    _locoClearanceHasMore = false;
     _notifyAsync();
   }
 
+  void handleAuthChanged(
+    String? userId, {
+    String? entriesVisibility,
+    String? mileageVisibility,
+  }) {
+    final sameUser = _currentUserId == userId;
+    _currentUserId = userId;
+    if (!sameUser) {
+      clear();
+      _currentUserId = userId;
+    }
+    if (entriesVisibility != null || mileageVisibility != null) {
+      _applyPrivacy({
+        'user_entries_visibility': entriesVisibility,
+        'user_mileage_visibility': mileageVisibility,
+      });
+      _notifyAsync();
+    }
+  }
+
   double getMileageForCurrentYear() {
     final currentYear = DateTime.now().year;
     return getMileageForYear(currentYear) ?? 0;
@@ -358,37 +704,75 @@ class DataService extends ChangeNotifier {
         0;
   }
 
-  Future<List<Station>> fetchStations() async {
+  Future<void> fetchStationFilters() async {
     final now = DateTime.now();
-
-    // If cache exists and is less than 30 minutes old, return it
-    if (_cachedStations != null &&
-        _stationsFetchedAt != null &&
-        now.difference(_stationsFetchedAt!) < Duration(minutes: 30)) {
-      return _cachedStations!;
+    if (_stationFiltersFetchedAt != null &&
+        now.difference(_stationFiltersFetchedAt!) < const Duration(minutes: 30) &&
+        _stationNetworks.isNotEmpty) {
+      return;
+    }
+    try {
+      final response = await api.get('/stations/filter');
+      if (response is List && response.isNotEmpty && response.first is Map) {
+        final map = Map<String, dynamic>.from(response.first as Map);
+        final networks = (map['networks'] as List? ?? const [])
+            .whereType<String>()
+            .toList();
+        final countryNetworksRaw =
+            map['country_networks'] as Map? ?? const <String, dynamic>{};
+        final countryNetworks = <String, List<String>>{};
+        countryNetworksRaw.forEach((key, value) {
+          if (value is List) {
+            countryNetworks[key] = value.whereType<String>().toList();
+          }
+        });
+        _stationNetworks = networks;
+        _stationCountryNetworks = countryNetworks;
+        _stationFiltersFetchedAt = now;
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch station filters: $e');
+    }
   }
 
-    if (_stationsInFlight != null) return _stationsInFlight!;
+  String _stationKey(List<String> countries, List<String> networks) {
+    final c = countries..sort();
+    final n = networks..sort();
+    return 'c:${c.join('|')};n:${n.join('|')}';
+  }
 
-    _stationsInFlight = () async {
+  Future<List<Station>> fetchStations({
+    List<String> countries = const [],
+    List<String> networks = const [],
+  }) async {
+    final key = _stationKey(List.from(countries), List.from(networks));
+
+    if (_stationCache.containsKey(key)) return _stationCache[key]!;
+    final inflight = _stationInFlightByKey[key];
+    if (inflight != null) return inflight;
+
+    final future = () async {
       try {
-        final response = await api.get('/location');
+        final response = await api.post('/location', {
+          'countries_filter': countries,
+          'network_filter': networks,
+        });
         if (response is! List) return const <Station>[];
         final parsed = response
             .whereType<Map>()
             .map((e) => Station.fromJson(Map<String, dynamic>.from(e)))
             .toList();
-        _cachedStations = parsed;
-        _stationsFetchedAt = now;
+        _stationCache[key] = parsed;
         return parsed;
       } catch (e) {
         debugPrint('Failed to fetch stations: $e');
         return const <Station>[];
       } finally {
-        _stationsInFlight = null;
+        _stationInFlightByKey.remove(key);
       }
     }();
 
-    return _stationsInFlight!;
+    _stationInFlightByKey[key] = future;
+    return future;
   }
 }

lib/services/data_service/data_service_friendships.dart

@@ -0,0 +1,290 @@
+part of 'data_service.dart';
+
+extension DataServiceFriendships on DataService {
+  Future<void> fetchFriendships() async {
+    _isFriendshipsLoading = true;
+    try {
+      final json = await api.get('/friendships');
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['friendships', 'data', 'items', 'results']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      final parsed = list
+          ?.whereType<Map>()
+          .map((e) => Friendship.fromJson(
+                e.map((k, v) => MapEntry(k.toString(), v)),
+              ))
+          .where((f) => f.isAccepted)
+          .toList();
+      _friendships = parsed ?? [];
+    } catch (e) {
+      debugPrint('Failed to fetch friendships: $e');
+      _friendships = [];
+    } finally {
+      _isFriendshipsLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<void> fetchPendingFriendships() async {
+    _isPendingFriendshipsLoading = true;
+    try {
+      final incoming = await _fetchPending('incoming');
+      final outgoing = await _fetchPending('outgoing');
+      _pendingIncoming = incoming;
+      _pendingOutgoing = outgoing;
+    } catch (e) {
+      debugPrint('Failed to fetch pending friendships: $e');
+      _pendingIncoming = [];
+      _pendingOutgoing = [];
+    } finally {
+      _isPendingFriendshipsLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<List<Friendship>> _fetchPending(String direction) async {
+    final json = await api.get('/friendships/pending?direction=$direction');
+    List<dynamic>? list;
+    if (json is List) {
+      list = json;
+    } else if (json is Map) {
+      for (final key in ['friendships', 'data', 'items', 'results']) {
+        final value = json[key];
+        if (value is List) {
+          list = value;
+          break;
+        }
+      }
+    }
+    return list
+            ?.whereType<Map>()
+            .map((e) => Friendship.fromJson(
+                  e.map((k, v) => MapEntry(k.toString(), v)),
+                ))
+            .where((f) => f.isPending)
+            .toList() ??
+        const [];
+  }
+
+  Future<Friendship?> fetchFriendshipById(String friendshipId) async {
+    try {
+      final json = await api.get('/friendships/$friendshipId');
+      if (json is Map) {
+        return Friendship.fromJson(
+          json.map((k, v) => MapEntry(k.toString(), v)),
+        );
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch friendship $friendshipId: $e');
+    }
+    return null;
+  }
+
+  Future<List<UserSummary>> searchUsers(
+    String query, {
+    bool friendsOnly = false,
+  }) async {
+    final encoded = Uri.encodeComponent(query);
+    final json = await api.get(
+      '/users/search?search=$encoded${friendsOnly ? '&friends_only=true' : ''}',
+    );
+    List<dynamic>? list;
+    if (json is List) {
+      list = json;
+    } else if (json is Map) {
+      for (final key in ['users', 'data', 'results', 'items']) {
+        final value = json[key];
+        if (value is List) {
+          list = value;
+          break;
+        }
+      }
+    }
+    if (list == null) return const [];
+    return list
+        .whereType<Map>()
+        .map((e) => UserSummary.fromJson(
+              e.map((k, v) => MapEntry(k.toString(), v)),
+            ))
+        .toList();
+  }
+
+  Future<Friendship> fetchFriendshipStatus(String targetUserId) async {
+    try {
+      final json = await api.get('/friendships/status/$targetUserId');
+      if (json is Map) {
+        return Friendship.fromStatusJson(
+          json.map((k, v) => MapEntry(k.toString(), v)),
+          targetUserId: targetUserId,
+        );
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch friendship status for $targetUserId: $e');
+    }
+    return Friendship(
+      id: null,
+      status: 'none',
+      requesterId: '',
+      addresseeId: targetUserId,
+    );
+  }
+
+  Future<Friendship> requestFriendship(
+    String targetUserId, {
+    UserSummary? targetUser,
+  }) async {
+    final json = await api.post('/friendships/request', {
+      "target_user_id": targetUserId,
+    });
+    final friendship = _parseAndUpsertFriendship(
+      json,
+      fallbackStatus: 'pending',
+      overrideAddressee: targetUser,
+    );
+    _pendingOutgoing = [friendship, ..._pendingOutgoing];
+    await fetchFriendships();
+    await fetchPendingFriendships();
+    _notifyAsync();
+    return friendship;
+  }
+
+  Future<Friendship> acceptFriendship(String friendshipId) async {
+    final json = await api.post('/friendships/$friendshipId/accept', {});
+    final friendship = _parseAndUpsertFriendship(json, fallbackStatus: 'accepted');
+    _pendingIncoming = _pendingIncoming.where((f) => f.id != friendshipId).toList();
+    await fetchFriendships();
+    await fetchPendingFriendships();
+    _notifyAsync();
+    return friendship;
+  }
+
+  Future<Friendship> rejectFriendship(String friendshipId) async {
+    final json = await api.post('/friendships/$friendshipId/reject', {});
+    final friendship = _parseAndUpsertFriendship(json, fallbackStatus: 'declined');
+    _pendingIncoming = _pendingIncoming.where((f) => f.id != friendshipId).toList();
+    _notifyAsync();
+    return friendship;
+  }
+
+  Future<Friendship> cancelFriendship(String friendshipId) async {
+    final json = await api.post('/friendships/$friendshipId/cancel', {});
+    final friendship =
+        _parseAndRemoveFriendship(json, friendshipId, status: 'none');
+    _pendingOutgoing =
+        _pendingOutgoing.where((f) => f.id != friendshipId).toList();
+    await fetchFriendships();
+    await fetchPendingFriendships();
+    _notifyAsync();
+    return friendship;
+  }
+
+  Future<void> deleteFriendship(String friendshipId) async {
+    try {
+      await api.delete('/friendships/$friendshipId');
+    } catch (e) {
+      debugPrint('Failed to delete friendship $friendshipId: $e');
+      rethrow;
+    }
+    _friendships = _friendships.where((f) => f.id != friendshipId).toList();
+    _pendingIncoming =
+        _pendingIncoming.where((f) => f.id != friendshipId).toList();
+    _pendingOutgoing =
+        _pendingOutgoing.where((f) => f.id != friendshipId).toList();
+    await fetchFriendships();
+    await fetchPendingFriendships();
+    _notifyAsync();
+  }
+
+  Future<Friendship> blockUser(String targetUserId) async {
+    final json = await api.post('/friendships/block', {
+      "target_user_id": targetUserId,
+    });
+    final friendship = _parseAndUpsertFriendship(json, fallbackStatus: 'blocked');
+    _pendingIncoming = _pendingIncoming
+        .where((f) => f.addresseeId != targetUserId && f.requesterId != targetUserId)
+        .toList();
+    _pendingOutgoing = _pendingOutgoing
+        .where((f) => f.addresseeId != targetUserId && f.requesterId != targetUserId)
+        .toList();
+    _notifyAsync();
+    return friendship;
+  }
+
+  Friendship _parseAndUpsertFriendship(
+    dynamic json, {
+    String fallbackStatus = 'none',
+    UserSummary? overrideAddressee,
+  }) {
+    Friendship friendship;
+    if (json is Map) {
+      friendship = Friendship.fromJson(
+        json.map((k, v) => MapEntry(k.toString(), v)),
+      );
+    } else {
+      friendship = Friendship(
+        id: null,
+        status: fallbackStatus,
+        requesterId: '',
+        addresseeId: '',
+      );
+    }
+    if (overrideAddressee != null &&
+        (friendship.addressee == null ||
+            friendship.addressee!.userId.isEmpty ||
+            friendship.addressee!.displayName.isEmpty)) {
+      friendship = friendship.copyWith(
+        addressee: overrideAddressee,
+        addresseeId: overrideAddressee.userId,
+      );
+    }
+    _upsertFriendship(friendship);
+    return friendship;
+  }
+
+  Friendship _parseAndRemoveFriendship(
+    dynamic json,
+    String friendshipId, {
+    required String status,
+  }) {
+    Friendship friendship;
+    if (json is Map) {
+      friendship = Friendship.fromJson(
+        json.map((k, v) => MapEntry(k.toString(), v)),
+      );
+    } else {
+      friendship = Friendship(
+        id: friendshipId,
+        status: status,
+        requesterId: '',
+        addresseeId: '',
+      );
+    }
+    _friendships = _friendships.where((f) => f.id != friendshipId).toList();
+    _notifyAsync();
+    return friendship;
+  }
+
+  void _upsertFriendship(Friendship friendship) {
+    if (friendship.id == null || friendship.id!.isEmpty) {
+      _notifyAsync();
+      return;
+    }
+    final idx = _friendships.indexWhere((f) => f.id == friendship.id);
+    if (idx >= 0) {
+      _friendships[idx] = friendship;
+    } else {
+      _friendships = [friendship, ..._friendships];
+    }
+    _friendships = _friendships.where((f) => f.isAccepted).toList();
+    _notifyAsync();
+  }
+}

lib/services/data_service/data_service_leg_share.dart

@@ -0,0 +1,109 @@
+part of 'data_service.dart';
+
+extension DataServiceLegShare on DataService {
+  Future<LegShareData?> fetchLegShare(String legShareId) async {
+    try {
+      final json = await api.get('/legs/share/$legShareId');
+      if (json is Map) {
+        return LegShareData.fromJson(
+          json.map((k, v) => MapEntry(k.toString(), v)),
+        );
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch leg share $legShareId: $e');
+      rethrow;
+    }
+    return null;
+  }
+
+  Future<void> rejectLegShare(String legShareId) async {
+    try {
+      await api.post('/legs/share/$legShareId/reject', {});
+    } catch (e) {
+      debugPrint('Failed to reject leg share $legShareId: $e');
+      rethrow;
+    }
+  }
+
+  Future<int?> acceptLegShare(LegShareData share) async {
+    final entry = share.entry;
+    final hasRoute = entry.route.isNotEmpty;
+    final locosPayload = <Map<String, dynamic>>[];
+    for (var i = 0; i < entry.locos.length; i++) {
+      final loco = entry.locos[i];
+      final pos = loco.allocPos != 0 ? loco.allocPos : i;
+      locosPayload.add({
+        "loco_id": loco.id,
+        "alloc_pos": pos,
+        "alloc_powering": loco.powering ? 1 : 0,
+      });
+    }
+    final payload = <String, dynamic>{
+      "leg_share_id": share.id,
+      "leg_trip": null,
+      "leg_begin_time": entry.beginTime.toIso8601String(),
+      if (entry.endTime != null) "leg_end_time": entry.endTime!.toIso8601String(),
+      if (entry.originTime != null)
+        "leg_origin_time": entry.originTime!.toIso8601String(),
+      if (entry.destinationTime != null)
+        "leg_destination_time": entry.destinationTime!.toIso8601String(),
+      "leg_notes": entry.notes,
+      "leg_headcode": entry.headcode,
+      "leg_network": entry.network,
+      "leg_origin": entry.origin,
+      "leg_destination": entry.destination,
+      "leg_begin_delay": entry.beginDelayMinutes ?? 0,
+      if (entry.endDelayMinutes != null) "leg_end_delay": entry.endDelayMinutes,
+      "locos": locosPayload,
+      "share_user_ids": <String>[],
+    };
+
+    dynamic response;
+    if (hasRoute) {
+      response = await api.post(
+        '/add',
+        {
+          ...payload,
+          "leg_route": entry.route,
+          "leg_mileage": entry.mileage,
+        },
+      );
+    } else {
+      response = await api.post(
+        '/add/manual',
+        {
+          ...payload,
+          "leg_start": entry.start,
+          "leg_end": entry.end,
+          "leg_distance": entry.mileage,
+          "isKilometers": false,
+        },
+      );
+    }
+
+    final legId = _parseNullableInt(
+      response is Map ? response['leg_id'] : null,
+    );
+    if (legId != null) return legId;
+    return null;
+  }
+
+  Future<void> applyLegPartialUpdates({
+    required int legId,
+    required Map<String, dynamic> updates,
+  }) async {
+    try {
+      await api.post('/leg/update/$legId/partial', updates);
+    } catch (e) {
+      debugPrint('Failed to apply partial updates for leg $legId: $e');
+      rethrow;
+    }
+  }
+
+  int? _parseNullableInt(dynamic value) {
+    if (value is int) return value;
+    if (value is num) return value.toInt();
+    if (value is String) return int.tryParse(value);
+    return null;
+  }
+}

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 && n.channel.toLowerCase() != 'web')
+          .toList();
+
+      if (parsed != null) {
+        parsed.sort((a, b) {
+          final aTs = a.createdAt?.millisecondsSinceEpoch ?? 0;
+          final bTs = b.createdAt?.millisecondsSinceEpoch ?? 0;
+          return bTs.compareTo(aTs);
+        });
+        _notifications = parsed;
+      } else {
+        _notifications = [];
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch notifications: $e');
+      _notifications = [];
+    } finally {
+      _isNotificationsLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<void> dismissNotifications(List<int> notificationIds) async {
+    if (notificationIds.isEmpty) return;
+    try {
+      await api.put('/notifications/dismiss', {
+        "notification_ids": notificationIds,
+        "payload": {"dismissed": true},
+      });
+      _notifications = _notifications
+          .where((n) => !notificationIds.contains(n.id))
+          .toList();
+    } catch (e) {
+      debugPrint('Failed to dismiss notifications: $e');
+      rethrow;
+    } finally {
+      _notifyAsync();
+    }
+  }
+}

lib/services/data_service/data_service_stats.dart

@@ -0,0 +1,62 @@
+part of 'data_service.dart';
+
+extension DataServiceStats on DataService {
+  Future<void> fetchAboutStats({bool force = false}) async {
+    if (_isAboutStatsLoading) return;
+    if (!force && _aboutStats != null) return;
+    _isAboutStatsLoading = true;
+    _notifyAsync();
+    try {
+      final json = await api.get('/stats/about');
+      if (json is Map<String, dynamic>) {
+        _aboutStats = StatsAbout.fromJson(json);
+      } else if (json is Map) {
+        _aboutStats = StatsAbout.fromJson(
+          json.map((key, value) => MapEntry(key.toString(), value)),
+        );
+      } else {
+        throw Exception('Unexpected stats response: $json');
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch about stats: $e');
+      _aboutStats = null;
+    } finally {
+      _isAboutStatsLoading = false;
+      _notifyAsync();
+    }
+  }
+
+  Future<void> fetchFriendsLeaderboard() async {
+    if (_isFriendsLeaderboardLoading) return;
+    _isFriendsLeaderboardLoading = true;
+    _notifyAsync();
+    try {
+      final json = await api.get('/stats/leaderboard/friends');
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['leaderboard', 'data', 'items', 'results']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      _friendsLeaderboard = list
+              ?.whereType<Map>()
+              .map((e) => LeaderboardEntry.fromJson(
+                    e.map((k, v) => MapEntry(k.toString(), v)),
+                  ))
+              .toList() ??
+          const [];
+    } catch (e) {
+      debugPrint('Failed to fetch friends leaderboard: $e');
+      _friendsLeaderboard = [];
+    } finally {
+      _isFriendsLeaderboardLoading = false;
+      _notifyAsync();
+    }
+  }
+}

lib/services/data_service/data_service_traction.dart

@@ -13,7 +13,7 @@ extension DataServiceTraction on DataService {
   Future<void> fetchTraction({
     bool hadOnly = false,
     int offset = 0,
-    int limit = 50,
+    int limit = 100,
     String? locoClass,
     String? locoNumber,
     bool mileageFirst = true,
@@ -66,14 +66,68 @@ extension DataServiceTraction on DataService {
     }
   }
 
-  Future<List<LocoAttrVersion>> fetchLocoTimeline(int locoId) async {
+  Future<List<LocoAttrVersion>> fetchLocoTimeline(
+    int locoId, {
+    bool includeAllPending = false,
+  }) async {
     _isLocoTimelineLoading[locoId] = true;
     _notifyAsync();
     try {
-      final json = await api.get('/loco/get-timeline/$locoId');
-      final timeline = LocoAttrVersion.fromGroupedJson(json);
-      _locoTimelines[locoId] = timeline;
-      return timeline;
+      final baseJson = await api.get('/loco/get-timeline/$locoId');
+      final timeline = LocoAttrVersion.fromGroupedJson(baseJson);
+      final baseKeys = timeline
+          .map(_entryKey)
+          .where((key) => key.isNotEmpty)
+          .toSet();
+      final pendingEntries = <LocoAttrVersion>[];
+      final pendingSeen = <String>{};
+
+      void addPending(List<LocoAttrVersion> entries) {
+        for (final entry in entries) {
+          final key = _entryKey(entry);
+          if (pendingSeen.contains(key)) continue;
+          if (baseKeys.contains(key)) continue;
+          pendingSeen.add(key);
+          pendingEntries.add(entry);
+          baseKeys.add(key);
+        }
+      }
+
+      try {
+        final pendingJson =
+            await api.get('/event/pending/user?loco_id=$locoId');
+        addPending(
+          _parsePendingLocoEvents(
+            pendingJson,
+            locoId,
+            canModerate: false,
+          ),
+        );
+      } catch (e) {
+        debugPrint('Failed to fetch pending loco events for $locoId: $e');
+      }
+
+      if (includeAllPending) {
+        try {
+          final pendingJson = await api.get('/event/pending?loco_id=$locoId');
+          addPending(
+            _parsePendingLocoEvents(
+              pendingJson,
+              locoId,
+              canModerate: true,
+            ),
+          );
+        } catch (e) {
+          debugPrint('Failed to fetch all pending loco events for $locoId: $e');
+        }
+      }
+
+      final merged = [
+        ...timeline,
+        ...pendingEntries,
+      ]..sort(LocoAttrVersion.compareByStart);
+      _locoTimelines[locoId] = merged;
+      return merged;
     } catch (e) {
       debugPrint('Failed to fetch loco timeline for $locoId: $e');
       _locoTimelines[locoId] = [];
@@ -84,6 +138,173 @@ extension DataServiceTraction on DataService {
     }
   }
 
+  Future<List<LocoAttrVersion>> fetchUserPendingEvents(int locoId) async {
+    try {
+      final pendingJson = await api.get('/event/pending/user?loco_id=$locoId');
+      return _parsePendingLocoEvents(
+        pendingJson,
+        locoId,
+        canModerate: false,
+      );
+    } catch (e) {
+      debugPrint('Failed to fetch user pending events for $locoId: $e');
+      return const [];
+    }
+  }
+
+  List<LocoAttrVersion> _parsePendingLocoEvents(
+    dynamic json,
+    int fallbackLocoId, {
+    bool canModerate = false,
+  }) {
+    if (json is! List) return const <LocoAttrVersion>[];
+    final entries = <LocoAttrVersion>[];
+    final seen = <String>{};
+    for (final item in json) {
+      if (item is! Map) continue;
+      final map = _extractPendingEventMap(item);
+      final locoId = (map['loco_id'] as num?)?.toInt() ?? fallbackLocoId;
+      final maskedValidFrom = map['masked_valid_from']?.toString();
+      final precision = map['precision_level']?.toString();
+      final username = map['username']?.toString();
+      final sourceEventId = (map['loco_event_id'] as num?)?.toInt();
+      final startDate = _parsePendingDate(map);
+      final status = map['moderation_status']?.toString().toLowerCase();
+      if (status != null && status != 'pending') continue;
+      if (startDate == null &&
+          (maskedValidFrom == null || maskedValidFrom.trim().isEmpty)) {
+        continue;
+      }
+      final valueMap = _decodeEventValues(map['loco_event_value']);
+      if (valueMap.isEmpty) continue;
+
+      valueMap.forEach((attr, rawValue) {
+        final attrCode = attr.toString();
+        if (attrCode.isEmpty) return;
+        final key = [
+          sourceEventId?.toString() ?? '',
+          attrCode.toLowerCase(),
+          maskedValidFrom ?? '',
+          startDate?.toIso8601String() ?? '',
+        ].join('|');
+        if (seen.contains(key)) return;
+        seen.add(key);
+        final parsedValue = _PendingTimelineValue.fromDynamic(rawValue);
+        entries.add(
+          LocoAttrVersion(
+            attrCode: attrCode,
+            locoId: locoId,
+            valueStr: parsedValue.valueStr,
+            valueInt: parsedValue.valueInt,
+            valueBool: parsedValue.valueBool,
+            valueDate: parsedValue.valueDate,
+            valueNorm: parsedValue.valueNorm ?? rawValue,
+            validFrom: startDate,
+            maskedValidFrom: maskedValidFrom,
+            precisionLevel: precision,
+            suggestedBy: username,
+            sourceEventId: sourceEventId,
+            isPending: true,
+            canModeratePending: canModerate,
+          ),
+        );
+      });
+    }
+    return entries;
+  }
+
+  String _entryKey(LocoAttrVersion entry) {
+    final attr = entry.attrCode.toLowerCase();
+    final masked = entry.maskedValidFrom?.trim() ?? '';
+    final start = entry.validFrom?.toIso8601String() ?? '';
+    final source = entry.sourceEventId?.toString() ?? '';
+    return '$attr|$masked|$start|$source';
+  }
+
+  Map<String, dynamic> _extractPendingEventMap(Map raw) {
+    if (raw['event_info'] is Map) {
+      final eventInfo = Map<String, dynamic>.from(raw['event_info']);
+      final merged = {...eventInfo};
+      for (final key in [
+        'loco_id',
+        'masked_valid_from',
+        'precision_level',
+        'username',
+        'loco_event_id',
+        'earliest_date',
+        'valid_from',
+        'loco_event_date',
+        'event_year',
+        'event_month',
+        'event_day',
+        'loco_event_value',
+      ]) {
+        merged.putIfAbsent(key, () => raw[key]);
+      }
+      return merged;
+    }
+    return Map<String, dynamic>.from(raw);
+  }
+
+  Map<String, dynamic> _decodeEventValues(dynamic raw) {
+    if (raw is Map) {
+      return raw.map((key, value) => MapEntry(key.toString(), value));
+    }
+    if (raw is String) {
+      final trimmed = raw.trim();
+      if (trimmed.isEmpty) return const {};
+      try {
+        final decoded = jsonDecode(trimmed);
+        if (decoded is Map) {
+          return decoded.map((key, value) => MapEntry(key.toString(), value));
+        }
+      } catch (_) {}
+    }
+    return const <String, dynamic>{};
+  }
+
+  DateTime? _parsePendingDate(Map<String, dynamic> json) {
+    DateTime? parseDate(dynamic value) {
+      if (value == null) return null;
+      if (value is DateTime) return value;
+      return DateTime.tryParse(value.toString());
+    }
+
+    // Try masked date by normalising unknown parts to 01 so we can position on the axis.
+    final masked = json['masked_valid_from']?.toString();
+    if (masked is String && masked.contains('-')) {
+      final sanitized = masked
+          .replaceAll(RegExp(r'[Xx?]{2}'), '01')
+          .replaceAll(RegExp(r'[Xx?]'), '1');
+      final parsedMasked = DateTime.tryParse(sanitized);
+      if (parsedMasked != null) return parsedMasked;
+    }
+
+    for (final key in ['earliest_date', 'valid_from', 'loco_event_date']) {
+      final parsed = parseDate(json[key]);
+      if (parsed != null) return parsed;
+    }
+
+    final year = _asNullableInt(json['event_year']);
+    if (year != null && year > 0) {
+      final monthValue = _asNullableInt(json['event_month']) ?? 1;
+      final dayValue = _asNullableInt(json['event_day']) ?? 1;
+      final month = monthValue.clamp(1, 12).toInt();
+      final day = dayValue.clamp(1, 31).toInt();
+      try {
+        return DateTime(year, month, day);
+      } catch (_) {}
+    }
+    return null;
+  }
+
+  int? _asNullableInt(dynamic value) {
+    if (value == null) return null;
+    if (value is int) return value;
+    if (value is num) return value.toInt();
+    return int.tryParse(value.toString());
+  }
+
   Future<dynamic> createLoco(Map<String, dynamic> payload) async {
     try {
       final response = await api.put('/loco/new', payload);
@@ -101,8 +322,9 @@ extension DataServiceTraction on DataService {
     }
   }
 
-  Future<List<String>> fetchClassList() async {
-    if (_locoClasses.isNotEmpty) return _locoClasses;
+  Future<List<String>> fetchClassList({bool force = false}) async {
+    if (!force && _locoClasses.isNotEmpty) return _locoClasses;
+    if (force) _locoClasses = [];
     try {
       final json = await api.get('/loco/classlist');
       if (json is List) {
@@ -114,5 +336,205 @@ extension DataServiceTraction on DataService {
     }
     return _locoClasses;
   }
+
+  Future<void> fetchLatestLocoChanges({
+    int limit = 100,
+    int offset = 0,
+    bool append = false,
+  }) async {
+    _isLatestLocoChangesLoading = true;
+    _notifyAsync();
+    try {
+      final json =
+          await api.get('/loco/changes/latest?limit=$limit&offset=$offset');
+      dynamic results = json;
+      if (json is Map && json['data'] is List) {
+        results = json['data'];
+      }
+      if (results is List) {
+        final parsed = <LocoChange>[];
+        for (final item in results) {
+          if (item is Map<String, dynamic>) {
+            parsed.add(LocoChange.fromJson(item));
+          } else if (item is Map) {
+            parsed.add(
+              LocoChange.fromJson(
+                item.map((key, value) => MapEntry(key.toString(), value)),
+              ),
+            );
+          }
+        }
+        if (append) {
+          _latestLocoChanges = [..._latestLocoChanges, ...parsed];
+        } else {
+          _latestLocoChanges = parsed;
+        }
+        final fetchedCount = parsed.length;
+        _latestLocoChangesFetched = append
+            ? offset + fetchedCount
+            : fetchedCount;
+        _latestLocoChangesHasMore = _latestLocoChangesFetched < 5000;
+      } else {
+        throw Exception('Unexpected latest loco changes response: $json');
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch latest loco changes: $e');
+      _latestLocoChanges = [];
+      _latestLocoChangesHasMore = false;
+      _latestLocoChangesFetched = 0;
+    } finally {
+      _isLatestLocoChangesLoading = false;
+      _notifyAsync();
+    }
   }
 
+  Future<Map<String, dynamic>?> fetchClassStats(String locoClass) async {
+    try {
+      final path = Uri.encodeComponent(locoClass);
+      final json = await api.get('/loco/class/stats/$path/user');
+      if (json is Map) {
+        return Map<String, dynamic>.from(json);
+      }
+      debugPrint('Unexpected class stats response for $locoClass: $json');
+    } catch (e) {
+      debugPrint('Failed to fetch class stats for $locoClass: $e');
+    }
+    return null;
+  }
+
+  Future<List<LeaderboardEntry>> fetchClassLeaderboard(
+    String locoClass, {
+    bool friends = false,
+  }) async {
+    try {
+      final path = Uri.encodeComponent(locoClass);
+      final suffix = friends ? '/friends' : '';
+      final json = await api.get('/stats/class/$path/leaderboard$suffix');
+      List<dynamic>? list;
+      if (json is List) {
+        list = json;
+      } else if (json is Map) {
+        for (final key in ['leaderboard', 'data', 'items', 'results']) {
+          final value = json[key];
+          if (value is List) {
+            list = value;
+            break;
+          }
+        }
+      }
+      return list
+              ?.whereType<Map>()
+              .map((e) => LeaderboardEntry.fromJson(
+                    e.map((k, v) => MapEntry(k.toString(), v)),
+                  ))
+              .toList() ??
+          const [];
+    } catch (e) {
+      debugPrint(
+        'Failed to fetch class leaderboard for $locoClass (friends=$friends): $e',
+      );
+      return const [];
+    }
+  }
+
+  Future<void> acceptPendingLoco({required int locoId}) async {
+    try {
+      await api.put('/loco/pending/approve/$locoId', null);
+    } catch (e) {
+      debugPrint('Failed to approve pending loco $locoId: $e');
+      rethrow;
+    }
+  }
+
+  Future<void> rejectPendingLoco({
+    required int locoId,
+    int? replacementLocoId,
+    String? rejectedReason,
+  }) async {
+    try {
+      final body = <String, dynamic>{};
+      if (replacementLocoId != null) {
+        body['replacement_loco_id'] = replacementLocoId;
+      }
+      if (rejectedReason != null && rejectedReason.trim().isNotEmpty) {
+        body['rejected_reason'] = rejectedReason.trim();
+      }
+      await api.put('/loco/pending/reject/$locoId', body.isEmpty ? null : body);
+    } catch (e) {
+      debugPrint('Failed to reject pending loco $locoId: $e');
+      rethrow;
+    }
+  }
+
+  Future<void> transferAllocations({
+    required int fromLocoId,
+    required int toLocoId,
+  }) async {
+    try {
+      await api.post('/loco/alloc/transfer', {
+        'loco_id': fromLocoId,
+        'to_loco_id': toLocoId,
+      });
+    } catch (e) {
+      debugPrint('Failed to transfer allocations $fromLocoId -> $toLocoId: $e');
+      rethrow;
+    }
+  }
+
+  Future<void> adminDeleteLoco({required int locoId}) async {
+    try {
+      await api.delete('/loco/admin/delete/$locoId');
+    } catch (e) {
+      debugPrint('Failed to delete loco $locoId as admin: $e');
+      rethrow;
+    }
+  }
+}
+
+class _PendingTimelineValue {
+  final String? valueStr;
+  final int? valueInt;
+  final bool? valueBool;
+  final DateTime? valueDate;
+  final dynamic valueNorm;
+
+  const _PendingTimelineValue({
+    this.valueStr,
+    this.valueInt,
+    this.valueBool,
+    this.valueDate,
+    this.valueNorm,
+  });
+
+  factory _PendingTimelineValue.fromDynamic(dynamic raw) {
+    if (raw is Map || raw is List) {
+      return _PendingTimelineValue(valueStr: jsonEncode(raw));
+    }
+    if (raw is bool) return _PendingTimelineValue(valueBool: raw);
+    if (raw is int) return _PendingTimelineValue(valueInt: raw);
+    if (raw is num) return _PendingTimelineValue(valueNorm: raw);
+    if (raw is String) {
+      final trimmed = raw.trim();
+      if (trimmed.isEmpty) return const _PendingTimelineValue(valueStr: '');
+      final lower = trimmed.toLowerCase();
+      if (['true', 'yes', 'y'].contains(lower)) {
+        return const _PendingTimelineValue(valueBool: true);
+      }
+      if (['false', 'no', 'n'].contains(lower)) {
+        return const _PendingTimelineValue(valueBool: false);
+      }
+      final intVal = int.tryParse(trimmed);
+      if (intVal != null) return _PendingTimelineValue(valueInt: intVal);
+      final doubleVal = double.tryParse(trimmed);
+      if (doubleVal != null) {
+        return _PendingTimelineValue(valueNorm: doubleVal);
+      }
+      final dateVal = DateTime.tryParse(trimmed);
+      if (dateVal != null) {
+        return _PendingTimelineValue(valueDate: dateVal);
+      }
+      return _PendingTimelineValue(valueStr: trimmed);
+    }
+    return _PendingTimelineValue(valueNorm: raw);
+  }
+}

lib/services/data_service/data_service_trips.dart

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

lib/services/distance_unit_service.dart

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

lib/services/endpoint_service.dart

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

lib/services/theme_mode_service.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class ThemeModeService extends ChangeNotifier {
+  static const _prefsKey = 'theme_mode_preference';
+
+  ThemeMode _mode = ThemeMode.system;
+  bool _loaded = false;
+
+  ThemeMode get mode => _mode;
+  bool get isLoaded => _loaded;
+
+  ThemeModeService() {
+    _load();
+  }
+
+  Future<void> _load() async {
+    final prefs = await SharedPreferences.getInstance();
+    final saved = prefs.getString(_prefsKey);
+    if (saved != null) {
+      switch (saved) {
+        case 'light':
+          _mode = ThemeMode.light;
+          break;
+        case 'dark':
+          _mode = ThemeMode.dark;
+          break;
+        default:
+          _mode = ThemeMode.system;
+      }
+    }
+    _loaded = true;
+    notifyListeners();
+  }
+
+  Future<void> setMode(ThemeMode mode) async {
+    _mode = mode;
+    final prefs = await SharedPreferences.getInstance();
+    final value = switch (mode) {
+      ThemeMode.light => 'light',
+      ThemeMode.dark => 'dark',
+      _ => 'system',
+    };
+    await prefs.setString(_prefsKey, value);
+    notifyListeners();
+  }
+}

pubspec.yaml

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

test/app_shell_test.dart

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