Merge branch 'main' into unread-peoplefirst

2026-06-30 06:00:30 +10:00 · 2026-02-27 12:57:59 +02:00
parent 87b25655d0 e139383335
commit ecc496f2af
90 changed files with 16003 additions and 4657 deletions
@@ -4,6 +4,7 @@ import 'package:provider/provider.dart';

 import '../l10n/l10n.dart';
 import '../services/app_debug_log_service.dart';
+import '../widgets/adaptive_app_bar_title.dart';

 class AppDebugLogScreen extends StatelessWidget {
  const AppDebugLogScreen({super.key});
@@ -17,7 +18,7 @@ class AppDebugLogScreen extends StatelessWidget {

        return Scaffold(
          appBar: AppBar(
-            title: Text(context.l10n.debugLog_appTitle),
+            title: AdaptiveAppBarTitle(context.l10n.debugLog_appTitle),
            centerTitle: true,
            actions: [
              IconButton(
@@ -55,7 +56,7 @@ class AppDebugLogScreen extends StatelessWidget {
            child: hasEntries
                ? ListView.separated(
                    itemCount: entries.length,
-                    separatorBuilder: (_, __) => const Divider(height: 1),
+                    separatorBuilder: (_, _) => const Divider(height: 1),
                    itemBuilder: (context, index) {
                      final entry = entries[index];
                      return ListTile(
@@ -3,8 +3,10 @@ import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
+import '../models/app_settings.dart';
 import '../services/app_settings_service.dart';
 import '../services/notification_service.dart';
+import '../widgets/adaptive_app_bar_title.dart';
 import 'map_cache_screen.dart';

 class AppSettingsScreen extends StatelessWidget {
@@ -14,7 +16,7 @@ class AppSettingsScreen extends StatelessWidget {
  Widget build(BuildContext context) {
    return Scaffold(
      appBar: AppBar(
-        title: Text(context.l10n.appSettings_title),
+        title: AdaptiveAppBarTitle(context.l10n.appSettings_title),
        centerTitle: true,
      ),
      body: SafeArea(
@@ -80,6 +82,18 @@ class AppSettingsScreen extends StatelessWidget {
            trailing: const Icon(Icons.chevron_right),
            onTap: () => _showLanguageDialog(context, settingsService),
          ),
+          const Divider(height: 1),
+          SwitchListTile(
+            secondary: const Icon(Icons.location_searching),
+            title: Text(context.l10n.appSettings_enableMessageTracing),
+            subtitle: Text(
+              context.l10n.appSettings_enableMessageTracingSubtitle,
+            ),
+            value: settingsService.settings.enableMessageTracing,
+            onChanged: (value) {
+              settingsService.setEnableMessageTracing(value);
+            },
+          ),
        ],
      ),
    );
@@ -360,6 +374,18 @@ class AppSettingsScreen extends StatelessWidget {
            onTap: () => _showTimeFilterDialog(context, settingsService),
          ),
          const Divider(height: 1),
+          ListTile(
+            leading: const Icon(Icons.straighten),
+            title: Text(context.l10n.appSettings_unitsTitle),
+            subtitle: Text(
+              settingsService.settings.unitSystem == UnitSystem.imperial
+                  ? context.l10n.appSettings_unitsImperial
+                  : context.l10n.appSettings_unitsMetric,
+            ),
+            trailing: const Icon(Icons.chevron_right),
+            onTap: () => _showUnitsDialog(context, settingsService),
+          ),
+          const Divider(height: 1),
          ListTile(
            leading: const Icon(Icons.download_outlined),
            title: Text(context.l10n.appSettings_offlineMapCache),
@@ -384,6 +410,7 @@ class AppSettingsScreen extends StatelessWidget {
    );
  }

+  // Fixed rendering issues
  Widget _buildBatteryCard(
    BuildContext context,
    AppSettingsService settingsService,
@@ -399,6 +426,7 @@ class AppSettingsScreen extends StatelessWidget {
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
+          const SizedBox(height: 4),
          Padding(
            padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
            child: Text(
@@ -406,6 +434,8 @@ class AppSettingsScreen extends StatelessWidget {
              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
            ),
          ),
+
+          // Main tile (icon + text only)
          ListTile(
            leading: const Icon(Icons.battery_full),
            title: Text(context.l10n.appSettings_batteryChemistry),
@@ -416,8 +446,19 @@ class AppSettingsScreen extends StatelessWidget {
                    )
                  : context.l10n.appSettings_batteryChemistryConnectFirst,
            ),
-            trailing: DropdownButton<String>(
-              value: selection,
+            contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+          ),
+
+          // Dropdown (separate full-width row)
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+            child: DropdownButtonFormField<String>(
+              initialValue: selection,
+              isExpanded: true,
+              decoration: const InputDecoration(
+                border: UnderlineInputBorder(),
+                isDense: true,
+              ),
              onChanged: isConnected
                  ? (value) {
                      if (value != null) {
@@ -691,6 +732,46 @@ class AppSettingsScreen extends StatelessWidget {
    );
  }

+  void _showUnitsDialog(
+    BuildContext context,
+    AppSettingsService settingsService,
+  ) {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(context.l10n.appSettings_unitsTitle),
+        content: RadioGroup<UnitSystem>(
+          groupValue: settingsService.settings.unitSystem,
+          onChanged: (value) {
+            if (value != null) {
+              settingsService.setUnitSystem(value);
+              Navigator.pop(context);
+            }
+          },
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              ListTile(
+                title: Text(context.l10n.appSettings_unitsMetric),
+                leading: const Radio<UnitSystem>(value: UnitSystem.metric),
+              ),
+              ListTile(
+                title: Text(context.l10n.appSettings_unitsImperial),
+                leading: const Radio<UnitSystem>(value: UnitSystem.imperial),
+              ),
+            ],
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: Text(context.l10n.common_close),
+          ),
+        ],
+      ),
+    );
+  }
+
  Widget _buildDebugCard(
    BuildContext context,
    AppSettingsService settingsService,
@@ -4,6 +4,7 @@ import 'package:flutter/services.dart';
 import '../l10n/l10n.dart';
 import '../services/ble_debug_log_service.dart';
 import '../connector/meshcore_protocol.dart';
+import '../widgets/adaptive_app_bar_title.dart';

 enum _BleLogView { frames, rawLogRx }

@@ -29,7 +30,7 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
            : rawEntries.isNotEmpty;
        return Scaffold(
          appBar: AppBar(
-            title: Text(context.l10n.debugLog_bleTitle),
+            title: AdaptiveAppBarTitle(context.l10n.debugLog_bleTitle),
            actions: [
              IconButton(
                tooltip: context.l10n.debugLog_copyLog,
@@ -100,7 +101,7 @@ class _BleDebugLogScreenState extends State<BleDebugLogScreen> {
                          itemCount: showingFrames
                              ? entries.length
                              : rawEntries.length,
-                          separatorBuilder: (_, __) => const Divider(height: 1),
+                          separatorBuilder: (_, _) => const Divider(height: 1),
                          itemBuilder: (context, index) {
                            if (showingFrames) {
                              final entry = entries[index];
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:math' as math;

 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
@@ -16,11 +17,15 @@ import '../helpers/utf8_length_limiter.dart';
 import '../l10n/l10n.dart';
 import '../models/channel.dart';
 import '../models/channel_message.dart';
+import '../services/app_settings_service.dart';
+import '../services/chat_text_scale_service.dart';
 import '../utils/emoji_utils.dart';
+import '../widgets/chat_zoom_wrapper.dart';
 import '../widgets/emoji_picker.dart';
 import '../widgets/gif_message.dart';
 import '../widgets/jump_to_bottom_button.dart';
 import '../widgets/gif_picker.dart';
+import '../widgets/message_status_icon.dart';
 import 'channel_message_path_screen.dart';
 import 'map_screen.dart';

@@ -216,37 +221,50 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {

                  return Stack(
                    children: [
-                      ListView.builder(
-                        reverse: true, // List grows from bottom up
-                        controller: _scrollController,
-                        padding: const EdgeInsets.all(8),
-                        itemCount: itemCount,
-                        itemBuilder: (context, index) {
-                          // Loading indicator now appears at end (bottom) of reversed list
-                          if (_isLoadingOlder && index == itemCount - 1) {
-                            return const Padding(
-                              padding: EdgeInsets.symmetric(vertical: 16),
-                              child: Center(
-                                child: SizedBox(
-                                  width: 20,
-                                  height: 20,
-                                  child: CircularProgressIndicator(
-                                    strokeWidth: 2,
+                      ChatZoomWrapper(
+                        child: ListView.builder(
+                          reverse: true, // List grows from bottom up
+                          controller: _scrollController,
+                          padding: const EdgeInsets.all(8),
+                          itemCount: itemCount,
+                          itemBuilder: (context, index) {
+                            // Loading indicator now appears at end (bottom) of reversed list
+                            if (_isLoadingOlder && index == itemCount - 1) {
+                              return const Padding(
+                                padding: EdgeInsets.symmetric(vertical: 16),
+                                child: Center(
+                                  child: SizedBox(
+                                    width: 20,
+                                    height: 20,
+                                    child: CircularProgressIndicator(
+                                      strokeWidth: 2,
+                                    ),
                                  ),
                                ),
+                              );
+                            }
+                            final messageIndex = index;
+                            final message = reversedMessages[messageIndex];
+                            if (!_messageKeys.containsKey(message.messageId)) {
+                              _messageKeys[message.messageId] = GlobalKey();
+                            }
+                            return Container(
+                              key: _messageKeys[message.messageId]!,
+                              child: Builder(
+                                builder: (context) {
+                                  final textScale = context
+                                      .select<ChatTextScaleService, double>(
+                                        (service) => service.scale,
+                                      );
+                                  return _buildMessageBubble(
+                                    message,
+                                    textScale,
+                                  );
+                                },
                              ),
                            );
-                          }
-                          final messageIndex = index;
-                          final message = reversedMessages[messageIndex];
-                          if (!_messageKeys.containsKey(message.messageId)) {
-                            _messageKeys[message.messageId] = GlobalKey();
-                          }
-                          return Container(
-                            key: _messageKeys[message.messageId]!,
-                            child: _buildMessageBubble(message),
-                          );
-                        },
+                          },
+                        ),
                      ),
                      JumpToBottomButton(scrollController: _scrollController),
                    ],
@@ -261,7 +279,9 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
    );
  }

-  Widget _buildMessageBubble(ChannelMessage message) {
+  Widget _buildMessageBubble(ChannelMessage message, double textScale) {
+    final settingsService = context.watch<AppSettingsService>();
+    final enableTracing = settingsService.settings.enableMessageTracing;
    final isOutgoing = message.isOutgoing;
    final gifId = _parseGifId(message.text);
    final poi = _parsePoiMessage(message.text);
@@ -271,107 +291,184 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
              ? message.pathVariants.first
              : Uint8List(0));

-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
-      child: Column(
-        crossAxisAlignment: isOutgoing
-            ? CrossAxisAlignment.end
-            : CrossAxisAlignment.start,
-        children: [
-          Row(
-            mainAxisAlignment: isOutgoing
-                ? MainAxisAlignment.end
-                : MainAxisAlignment.start,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              if (!isOutgoing) ...[
-                _buildAvatar(message.senderName),
-                const SizedBox(width: 8),
-              ],
-              Flexible(
-                child: GestureDetector(
-                  onTap: () => _showMessagePathInfo(message),
-                  onLongPress: () => _showMessageActions(message),
-                  child: Container(
-                    padding: gifId != null
-                        ? const EdgeInsets.all(4)
-                        : const EdgeInsets.symmetric(
-                            horizontal: 12,
-                            vertical: 8,
+    const maxSwipeOffset = 64.0;
+    const replySwipeThreshold = 64.0;
+    const bodyFontSize = 14.0;
+    final messageBody = Column(
+      crossAxisAlignment: isOutgoing
+          ? CrossAxisAlignment.end
+          : CrossAxisAlignment.start,
+      children: [
+        Row(
+          mainAxisAlignment: isOutgoing
+              ? MainAxisAlignment.end
+              : MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (!isOutgoing) ...[
+              _buildAvatar(message.senderName),
+              const SizedBox(width: 8),
+            ],
+            Flexible(
+              child: GestureDetector(
+                onTap: () => _showMessagePathInfo(message),
+                onLongPress: () => _showMessageActions(message),
+                child: Container(
+                  padding: gifId != null
+                      ? const EdgeInsets.all(4)
+                      : const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                  constraints: BoxConstraints(
+                    maxWidth: MediaQuery.of(context).size.width * 0.65,
+                  ),
+                  decoration: BoxDecoration(
+                    color: isOutgoing
+                        ? Theme.of(context).colorScheme.primaryContainer
+                        : Theme.of(context).colorScheme.surfaceContainerHighest,
+                    borderRadius: BorderRadius.circular(12),
+                  ),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      if (!isOutgoing) ...[
+                        Padding(
+                          padding: gifId != null
+                              ? const EdgeInsets.only(
+                                  left: 8,
+                                  top: 4,
+                                  bottom: 4,
+                                )
+                              : EdgeInsets.zero,
+                          child: Text(
+                            message.senderName,
+                            style: TextStyle(
+                              fontSize: 12,
+                              fontWeight: FontWeight.bold,
+                              color: Theme.of(context).colorScheme.primary,
+                            ),
                          ),
-                    constraints: BoxConstraints(
-                      maxWidth: MediaQuery.of(context).size.width * 0.65,
-                    ),
-                    decoration: BoxDecoration(
-                      color: isOutgoing
-                          ? Theme.of(context).colorScheme.primaryContainer
-                          : Theme.of(
-                              context,
-                            ).colorScheme.surfaceContainerHighest,
-                      borderRadius: BorderRadius.circular(12),
-                    ),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        if (!isOutgoing) ...[
-                          Padding(
-                            padding: gifId != null
-                                ? const EdgeInsets.only(
-                                    left: 8,
-                                    top: 4,
-                                    bottom: 4,
-                                  )
-                                : EdgeInsets.zero,
-                            child: Text(
-                              message.senderName,
-                              style: TextStyle(
-                                fontSize: 12,
-                                fontWeight: FontWeight.bold,
-                                color: Theme.of(context).colorScheme.primary,
+                        ),
+                        if (gifId == null) const SizedBox(height: 4),
+                      ],
+                      if (message.replyToMessageId != null) ...[
+                        _buildReplyPreview(message, textScale),
+                        const SizedBox(height: 8),
+                      ],
+                      if (poi != null)
+                        _buildPoiMessage(
+                          context,
+                          poi,
+                          isOutgoing,
+                          textScale,
+                          trailing: (!enableTracing && isOutgoing)
+                              ? Padding(
+                                  padding: const EdgeInsets.only(bottom: 2),
+                                  child: MessageStatusIcon(
+                                    isAcked:
+                                        message.status ==
+                                            ChannelMessageStatus.sent &&
+                                        displayPath.isNotEmpty,
+                                    isFailed:
+                                        message.status ==
+                                        ChannelMessageStatus.failed,
+                                  ),
+                                )
+                              : null,
+                        )
+                      else if (gifId != null)
+                        Stack(
+                          children: [
+                            ClipRRect(
+                              borderRadius: BorderRadius.circular(8),
+                              child: GifMessage(
+                                url:
+                                    'https://media.giphy.com/media/$gifId/giphy.gif',
+                                backgroundColor: Colors.transparent,
+                                fallbackTextColor: isOutgoing
+                                    ? Theme.of(context)
+                                          .colorScheme
+                                          .onPrimaryContainer
+                                          .withValues(alpha: 0.7)
+                                    : Theme.of(context).colorScheme.onSurface
+                                          .withValues(alpha: 0.6),
                              ),
                            ),
-                          ),
-                          if (gifId == null) const SizedBox(height: 4),
-                        ],
-                        if (message.replyToMessageId != null) ...[
-                          _buildReplyPreview(message),
-                          const SizedBox(height: 8),
-                        ],
-                        if (poi != null)
-                          _buildPoiMessage(context, poi, isOutgoing)
-                        else if (gifId != null)
-                          ClipRRect(
-                            borderRadius: BorderRadius.circular(8),
-                            child: GifMessage(
-                              url:
-                                  'https://media.giphy.com/media/$gifId/giphy.gif',
-                              backgroundColor: Colors.transparent,
-                              fallbackTextColor: isOutgoing
-                                  ? Theme.of(context)
-                                        .colorScheme
-                                        .onPrimaryContainer
-                                        .withValues(alpha: 0.7)
-                                  : Theme.of(context).colorScheme.onSurface
-                                        .withValues(alpha: 0.6),
+                            if (!enableTracing && isOutgoing)
+                              Positioned(
+                                top: 0,
+                                right: 0,
+                                child: Container(
+                                  padding: const EdgeInsets.all(3),
+                                  decoration: BoxDecoration(
+                                    color: isOutgoing
+                                        ? Theme.of(
+                                            context,
+                                          ).colorScheme.primaryContainer
+                                        : Theme.of(
+                                            context,
+                                          ).colorScheme.surfaceContainerHighest,
+                                    borderRadius: const BorderRadius.only(
+                                      bottomLeft: Radius.circular(10),
+                                      topRight: Radius.circular(8),
+                                    ),
+                                  ),
+                                  child: MessageStatusIcon(
+                                    isAcked:
+                                        message.status ==
+                                            ChannelMessageStatus.sent &&
+                                        displayPath.isNotEmpty,
+                                    isFailed:
+                                        message.status ==
+                                        ChannelMessageStatus.failed,
+                                  ),
+                                ),
+                              ),
+                          ],
+                        )
+                      else
+                        Row(
+                          mainAxisSize: MainAxisSize.min,
+                          crossAxisAlignment: CrossAxisAlignment.end,
+                          children: [
+                            Flexible(
+                              child: Linkify(
+                                text: message.text,
+                                style: TextStyle(
+                                  fontSize: bodyFontSize * textScale,
+                                ),
+                                linkStyle: TextStyle(
+                                  fontSize: bodyFontSize * textScale,
+                                  color: Colors.green,
+                                  decoration: TextDecoration.underline,
+                                ),
+                                options: const LinkifyOptions(
+                                  humanize: false,
+                                  defaultToHttps: false,
+                                ),
+                                linkifiers: const [UrlLinkifier()],
+                                onOpen: (link) => LinkHandler.handleLinkTap(
+                                  context,
+                                  link.url,
+                                ),
+                              ),
                            ),
-                          )
-                        else
-                          Linkify(
-                            text: message.text,
-                            style: const TextStyle(fontSize: 14),
-                            linkStyle: const TextStyle(
-                              fontSize: 14,
-                              color: Colors.green,
-                              decoration: TextDecoration.underline,
-                            ),
-                            options: const LinkifyOptions(
-                              humanize: false,
-                              defaultToHttps: false,
-                            ),
-                            linkifiers: const [UrlLinkifier()],
-                            onOpen: (link) =>
-                                LinkHandler.handleLinkTap(context, link.url),
-                          ),
+                            if (!enableTracing && isOutgoing) ...[
+                              const SizedBox(width: 4),
+                              Padding(
+                                padding: const EdgeInsets.only(bottom: 2),
+                                child: MessageStatusIcon(
+                                  isAcked:
+                                      message.status ==
+                                          ChannelMessageStatus.sent &&
+                                      displayPath.isNotEmpty,
+                                  isFailed:
+                                      message.status ==
+                                      ChannelMessageStatus.failed,
+                                ),
+                              ),
+                            ],
+                          ],
+                        ),
+                      if (enableTracing) ...[
                        if (displayPath.isNotEmpty) ...[
                          const SizedBox(height: 4),
                          Padding(
@@ -443,25 +540,81 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                          ),
                        ),
                      ],
-                    ),
+                    ],
                  ),
                ),
              ),
-            ],
-          ),
-          if (message.reactions.isNotEmpty) ...[
-            const SizedBox(height: 4),
-            Padding(
-              padding: EdgeInsets.only(left: isOutgoing ? 0 : 48),
-              child: _buildReactionsDisplay(message),
            ),
          ],
+        ),
+        if (message.reactions.isNotEmpty) ...[
+          const SizedBox(height: 4),
+          Padding(
+            padding: EdgeInsets.only(left: isOutgoing ? 0 : 48),
+            child: _buildReactionsDisplay(message),
+          ),
        ],
-      ),
+      ],
+    );
+
+    if (!isOutgoing) {
+      return _SwipeReplyBubble(
+        maxSwipeOffset: maxSwipeOffset,
+        replySwipeThreshold: replySwipeThreshold,
+        onReplyTriggered: () => _setReplyingTo(message),
+        hintBuilder: ({required isStart}) =>
+            _buildReplySwipeHint(isStart: isStart),
+        child: messageBody,
+      );
+    } else {
+      return Padding(
+        padding: const EdgeInsets.symmetric(vertical: 4),
+        child: messageBody,
+      );
+    }
+  }
+
+  Widget _buildReplySwipeHint({required bool isStart}) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final content = Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Icon(Icons.reply, color: colorScheme.primary),
+        const SizedBox(width: 6),
+        Text(
+          context.l10n.chat_reply,
+          style: TextStyle(
+            color: colorScheme.primary,
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+      ],
+    );
+
+    return Container(
+      alignment: isStart ? Alignment.centerLeft : Alignment.centerRight,
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      color: colorScheme.primary.withValues(alpha: 0.08),
+      child: isStart
+          ? content
+          : Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text(
+                  context.l10n.chat_reply,
+                  style: TextStyle(
+                    color: colorScheme.primary,
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+                const SizedBox(width: 6),
+                Icon(Icons.reply, color: colorScheme.primary),
+              ],
+            ),
    );
  }

-  Widget _buildReplyPreview(ChannelMessage message) {
+  Widget _buildReplyPreview(ChannelMessage message, double textScale) {
    final connector = context.read<MeshCoreConnector>();
    final isOwnNode = message.replyToSenderName == connector.selfName;
    final replyText = message.replyToText ?? '';
@@ -489,7 +642,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
          const SizedBox(width: 4),
          Text(
            context.l10n.chat_location,
-            style: TextStyle(fontSize: 12, color: previewTextColor),
+            style: TextStyle(fontSize: 12 * textScale, color: previewTextColor),
          ),
        ],
      );
@@ -499,7 +652,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
        maxLines: 2,
        overflow: TextOverflow.ellipsis,
        style: TextStyle(
-          fontSize: 12,
+          fontSize: 12 * textScale,
          color: previewTextColor,
          fontStyle: FontStyle.italic,
        ),
@@ -523,7 +676,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
            Text(
              context.l10n.chat_replyTo(message.replyToSenderName ?? ''),
              style: TextStyle(
-                fontSize: 11,
+                fontSize: 11 * textScale,
                fontWeight: FontWeight.bold,
                color: isOwnNode
                    ? Theme.of(context).colorScheme.primary
@@ -599,7 +752,13 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
    return _PoiInfo(lat: lat, lon: lon, label: label);
  }

-  Widget _buildPoiMessage(BuildContext context, _PoiInfo poi, bool isOutgoing) {
+  Widget _buildPoiMessage(
+    BuildContext context,
+    _PoiInfo poi,
+    bool isOutgoing,
+    double textScale, {
+    Widget? trailing,
+  }) {
    final colorScheme = Theme.of(context).colorScheme;
    final textColor = isOutgoing
        ? colorScheme.onPrimaryContainer
@@ -635,16 +794,21 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
            children: [
              Text(
                context.l10n.chat_poiShared,
-                style: TextStyle(color: textColor, fontWeight: FontWeight.w600),
+                style: TextStyle(
+                  color: textColor,
+                  fontWeight: FontWeight.w600,
+                  fontSize: 14 * textScale,
+                ),
              ),
              if (poi.label.isNotEmpty)
                Text(
                  poi.label,
-                  style: TextStyle(color: metaColor, fontSize: 12),
+                  style: TextStyle(color: metaColor, fontSize: 12 * textScale),
                ),
            ],
          ),
        ),
+        if (trailing != null) ...[const SizedBox(width: 4), trailing],
      ],
    );
  }
@@ -709,7 +873,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
    return colors[hash.abs() % colors.length];
  }

-  Widget _buildReplyBanner() {
+  Widget _buildReplyBanner(double textScale) {
    final message = _replyingToMessage!;
    return Container(
      width: double.infinity,
@@ -735,7 +899,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                Text(
                  context.l10n.chat_replyingTo(message.senderName),
                  style: TextStyle(
-                    fontSize: 12,
+                    fontSize: 12 * textScale,
                    fontWeight: FontWeight.bold,
                    color: Theme.of(context).colorScheme.onSecondaryContainer,
                  ),
@@ -745,7 +909,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                  maxLines: 1,
                  overflow: TextOverflow.ellipsis,
                  style: TextStyle(
-                    fontSize: 11,
+                    fontSize: 11 * textScale,
                    color: Theme.of(
                      context,
                    ).colorScheme.onSecondaryContainer.withValues(alpha: 0.7),
@@ -772,7 +936,15 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
    return Column(
      mainAxisSize: MainAxisSize.min,
      children: [
-        if (_replyingToMessage != null) _buildReplyBanner(),
+        if (_replyingToMessage != null)
+          Builder(
+            builder: (context) {
+              final textScale = context.select<ChatTextScaleService, double>(
+                (service) => service.scale,
+              );
+              return _buildReplyBanner(textScale);
+            },
+          ),
        Container(
          padding: const EdgeInsets.all(8),
          decoration: BoxDecoration(
@@ -798,30 +970,47 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                  builder: (context, value, child) {
                    final gifId = _parseGifId(value.text);
                    if (gifId != null) {
-                      return Row(
-                        children: [
-                          Expanded(
-                            child: ClipRRect(
-                              borderRadius: BorderRadius.circular(12),
-                              child: GifMessage(
-                                url:
-                                    'https://media.giphy.com/media/$gifId/giphy.gif',
-                                backgroundColor: Theme.of(
-                                  context,
-                                ).colorScheme.surfaceContainerHighest,
-                                fallbackTextColor: Theme.of(
-                                  context,
-                                ).colorScheme.onSurface.withValues(alpha: 0.6),
-                                maxSize: 160,
+                      return Focus(
+                        autofocus: true,
+                        onKeyEvent: (node, event) {
+                          if (event is KeyDownEvent &&
+                              (event.logicalKey == LogicalKeyboardKey.enter ||
+                                  event.logicalKey ==
+                                      LogicalKeyboardKey.numpadEnter)) {
+                            _sendMessage();
+                            return KeyEventResult.handled;
+                          }
+                          return KeyEventResult.ignored;
+                        },
+                        child: Row(
+                          children: [
+                            Expanded(
+                              child: ClipRRect(
+                                borderRadius: BorderRadius.circular(12),
+                                child: GifMessage(
+                                  url:
+                                      'https://media.giphy.com/media/$gifId/giphy.gif',
+                                  backgroundColor: Theme.of(
+                                    context,
+                                  ).colorScheme.surfaceContainerHighest,
+                                  fallbackTextColor: Theme.of(context)
+                                      .colorScheme
+                                      .onSurface
+                                      .withValues(alpha: 0.6),
+                                  maxSize: 160,
+                                ),
                              ),
                            ),
-                          ),
-                          const SizedBox(width: 8),
-                          IconButton(
-                            icon: const Icon(Icons.close),
-                            onPressed: () => _textController.clear(),
-                          ),
-                        ],
+                            const SizedBox(width: 8),
+                            IconButton(
+                              icon: const Icon(Icons.close),
+                              onPressed: () {
+                                _textController.clear();
+                                _textFieldFocusNode.requestFocus();
+                              },
+                            ),
+                          ],
+                        ),
                      );
                    }

@@ -884,6 +1073,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
    connector.sendChannelMessage(widget.channel, messageText);
    _textController.clear();
    _cancelReply();
+    _textFieldFocusNode.requestFocus();
  }

  String _formatTime(DateTime time) {
@@ -901,7 +1091,8 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
    Navigator.push(
      context,
      MaterialPageRoute(
-        builder: (context) => ChannelMessagePathScreen(message: message),
+        builder: (context) =>
+            ChannelMessagePathScreen(message: message, channelMessage: true),
      ),
    );
  }
@@ -1006,6 +1197,157 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
  }
 }

+class _SwipeReplyBubble extends StatefulWidget {
+  final double maxSwipeOffset;
+  final double replySwipeThreshold;
+  final VoidCallback onReplyTriggered;
+  final Widget Function({required bool isStart}) hintBuilder;
+  final Widget child;
+
+  const _SwipeReplyBubble({
+    required this.maxSwipeOffset,
+    required this.replySwipeThreshold,
+    required this.onReplyTriggered,
+    required this.hintBuilder,
+    required this.child,
+  });
+
+  @override
+  State<_SwipeReplyBubble> createState() => _SwipeReplyBubbleState();
+}
+
+class _SwipeReplyBubbleState extends State<_SwipeReplyBubble> {
+  Offset? _swipeStartPosition;
+  double _swipeOffset = 0;
+  double _maxSwipeDistance = 0;
+  int? _swipePointerId;
+  bool _swipeLockedToHorizontal = false;
+
+  void _handleSwipeStart(Offset position) {
+    _swipeStartPosition = position;
+    _maxSwipeDistance = 0;
+    if (_swipeOffset != 0) {
+      setState(() => _swipeOffset = 0);
+    }
+  }
+
+  void _handleSwipePointerDown(PointerDownEvent event) {
+    _swipePointerId = event.pointer;
+    _swipeLockedToHorizontal = false;
+    _handleSwipeStart(event.position);
+  }
+
+  void _handleSwipePointerMove(PointerMoveEvent event) {
+    if (_swipePointerId != event.pointer || _swipeStartPosition == null) {
+      return;
+    }
+
+    final dx = event.position.dx - _swipeStartPosition!.dx;
+
+    const axisLockThreshold = 12.0;
+    if (!_swipeLockedToHorizontal) {
+      if (-dx < axisLockThreshold) {
+        return;
+      }
+      _swipeLockedToHorizontal = true;
+    }
+
+    _handleSwipeUpdate(event.position);
+  }
+
+  void _handleSwipeUpdate(Offset position) {
+    if (_swipeStartPosition == null) return;
+
+    final dx = position.dx - _swipeStartPosition!.dx;
+    if (dx >= 0) return;
+
+    if (-dx < 6) return;
+
+    if (-dx > _maxSwipeDistance) {
+      _maxSwipeDistance = -dx;
+    }
+
+    final double clamped = dx.clamp(-widget.maxSwipeOffset, 0.0).toDouble();
+    final adjusted = _applySwipeResistance(clamped, widget.maxSwipeOffset);
+    if (adjusted != _swipeOffset) {
+      setState(() => _swipeOffset = adjusted);
+    }
+  }
+
+  void _handleSwipePointerUp(Offset position) {
+    if (_swipeLockedToHorizontal && _swipeStartPosition != null) {
+      final dx = position.dx - _swipeStartPosition!.dx;
+      final peak = math.max(
+        _maxSwipeDistance,
+        (-dx).clamp(0.0, double.infinity),
+      );
+      if (peak >= widget.replySwipeThreshold) {
+        widget.onReplyTriggered();
+        HapticFeedback.selectionClick();
+      }
+    }
+    _resetSwipe();
+  }
+
+  void _resetSwipe() {
+    if (_swipeOffset != 0) {
+      setState(() => _swipeOffset = 0);
+    }
+    _swipeStartPosition = null;
+    _maxSwipeDistance = 0;
+    _swipePointerId = null;
+    _swipeLockedToHorizontal = false;
+  }
+
+  double _applySwipeResistance(double rawOffset, double maxOffset) {
+    final abs = rawOffset.abs();
+    if (abs <= 0) return 0;
+    final norm = (abs / maxOffset).clamp(0.0, 1.0);
+    const deadZone = 0.18;
+    if (norm <= deadZone) {
+      return rawOffset.sign * maxOffset * (norm * 0.08);
+    }
+    final t = ((norm - deadZone) / (1 - deadZone)).clamp(0.0, 1.0);
+    final curved = t < 0.5
+        ? 16 * math.pow(t, 5)
+        : 1 - math.pow(-2 * t + 2, 5) / 2;
+    const deadZoneEnd = 0.0144;
+    return rawOffset.sign *
+        maxOffset *
+        (deadZoneEnd + curved * (1 - deadZoneEnd));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Listener(
+      onPointerDown: _handleSwipePointerDown,
+      onPointerMove: _handleSwipePointerMove,
+      onPointerUp: (event) => _handleSwipePointerUp(event.position),
+      onPointerCancel: (_) => _resetSwipe(),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
+        child: Stack(
+          alignment: Alignment.center,
+          children: [
+            Positioned.fill(
+              child: Opacity(
+                opacity: _swipeOffset.abs() / widget.maxSwipeOffset,
+                child: widget.hintBuilder(isStart: false),
+              ),
+            ),
+            AnimatedContainer(
+              duration: const Duration(milliseconds: 150),
+              transform: Matrix4.translationValues(_swipeOffset, 0, 0),
+              curve: Curves.easeOut,
+              child: widget.child,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
 class _PoiInfo {
  final double lat;
  final double lon;
@@ -9,26 +9,38 @@ import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
 import '../services/map_tile_cache_service.dart';
+import '../services/app_settings_service.dart';
 import '../connector/meshcore_protocol.dart';
 import '../l10n/app_localizations.dart';
 import '../l10n/l10n.dart';
 import '../models/channel_message.dart';
+import '../models/app_settings.dart';
 import '../models/contact.dart';
+import '../widgets/adaptive_app_bar_title.dart';

 class ChannelMessagePathScreen extends StatelessWidget {
  final ChannelMessage message;
-
-  const ChannelMessagePathScreen({super.key, required this.message});
+  final bool channelMessage;
+  const ChannelMessagePathScreen({
+    super.key,
+    required this.message,
+    this.channelMessage = false,
+  });

  @override
  Widget build(BuildContext context) {
    return Consumer<MeshCoreConnector>(
      builder: (context, connector, _) {
        final l10n = context.l10n;
-        final primaryPath = _selectPrimaryPath(
+        final primaryPathTmp = _selectPrimaryPath(
          message.pathBytes,
          message.pathVariants,
        );
+
+        final primaryPath = !channelMessage && !message.isOutgoing
+            ? Uint8List.fromList(primaryPathTmp.reversed.toList())
+            : primaryPathTmp;
+
        final hops = _buildPathHops(primaryPath, connector.contacts, l10n);
        final hasHopDetails = primaryPath.isNotEmpty;
        final observedLabel = _formatObservedHops(
@@ -37,10 +49,9 @@ class ChannelMessagePathScreen extends StatelessWidget {
          l10n,
        );
        final extraPaths = _otherPaths(primaryPath, message.pathVariants);
-
        return Scaffold(
          appBar: AppBar(
-            title: Text(l10n.channelPath_title),
+            title: AdaptiveAppBarTitle(l10n.channelPath_title),
            actions: [
              IconButton(
                icon: const Icon(Icons.radar_outlined),
@@ -50,9 +61,9 @@ class ChannelMessagePathScreen extends StatelessWidget {
                  MaterialPageRoute(
                    builder: (context) => PathTraceMapScreen(
                      title: context.l10n.contacts_repeaterPathTrace,
-                      path: Uint8List.fromList(primaryPath),
+                      path: primaryPath,
                      flipPathRound: true,
-                      reversePathRound: true,
+                      reversePathRound: !message.isOutgoing && !channelMessage,
                    ),
                  ),
                ),
@@ -62,7 +73,7 @@ class ChannelMessagePathScreen extends StatelessWidget {
                tooltip: l10n.channelPath_viewMap,
                onPressed: hasHopDetails
                    ? () {
-                        _openPathMap(context);
+                        _openPathMap(context, channelMessage: channelMessage);
                      }
                    : null,
              ),
@@ -157,7 +168,11 @@ class ChannelMessagePathScreen extends StatelessWidget {
              ),
              subtitle: Text(_formatPathPrefixes(variants[i])),
              trailing: const Icon(Icons.map_outlined, size: 20),
-              onTap: () => _openPathMap(context, initialPath: variants[i]),
+              onTap: () => _openPathMap(
+                context,
+                initialPath: variants[i],
+                channelMessage: channelMessage,
+              ),
            ),
          ),
      ],
@@ -248,13 +263,18 @@ class ChannelMessagePathScreen extends StatelessWidget {
    );
  }

-  void _openPathMap(BuildContext context, {Uint8List? initialPath}) {
+  void _openPathMap(
+    BuildContext context, {
+    Uint8List? initialPath,
+    bool channelMessage = false,
+  }) {
    Navigator.push(
      context,
      MaterialPageRoute(
        builder: (context) => ChannelMessagePathMapScreen(
          message: message,
          initialPath: initialPath,
+          channelMessage: channelMessage,
        ),
      ),
    );
@@ -264,11 +284,13 @@ class ChannelMessagePathScreen extends StatelessWidget {
 class ChannelMessagePathMapScreen extends StatefulWidget {
  final ChannelMessage message;
  final Uint8List? initialPath;
+  final bool channelMessage;

  const ChannelMessagePathMapScreen({
    super.key,
    required this.message,
    this.initialPath,
+    this.channelMessage = false,
  });

  @override
@@ -278,8 +300,12 @@ class ChannelMessagePathMapScreen extends StatefulWidget {

 class _ChannelMessagePathMapScreenState
    extends State<ChannelMessagePathMapScreen> {
+  static const double _labelZoomThreshold = 8.5;
+
  Uint8List? _selectedPath;
  double _pathDistance = 0.0;
+  bool _showNodeLabels = true;
+  bool _didReceivePositionUpdate = false;

  @override
  void initState() {
@@ -314,6 +340,8 @@ class _ChannelMessagePathMapScreenState
  Widget build(BuildContext context) {
    return Consumer<MeshCoreConnector>(
      builder: (context, connector, _) {
+        final settings = context.watch<AppSettingsService>().settings;
+        final isImperial = settings.unitSystem == UnitSystem.imperial;
        final tileCache = context.read<MapTileCacheService>();
        final primaryPath = _selectPrimaryPath(
          widget.message.pathBytes,
@@ -323,11 +351,18 @@ class _ChannelMessagePathMapScreenState
          primaryPath,
          widget.message.pathVariants,
        );
-        final selectedPath = _resolveSelectedPath(
+        final selectedPathTmp = _resolveSelectedPath(
          _selectedPath,
          observedPaths,
          primaryPath,
        );
+
+        final selectedPath =
+            ((!widget.message.isOutgoing && !widget.channelMessage) ||
+                (widget.message.isOutgoing && widget.channelMessage))
+            ? Uint8List.fromList(selectedPathTmp.reversed.toList())
+            : selectedPathTmp;
+
        final selectedIndex = _indexForPath(selectedPath, observedPaths);
        final hops = _buildPathHops(
          selectedPath,
@@ -336,12 +371,22 @@ class _ChannelMessagePathMapScreenState
        );

        final points = <LatLng>[];
+
+        if ((widget.message.isOutgoing && !widget.channelMessage) ||
+            (widget.message.isOutgoing && widget.channelMessage)) {
+          points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+        }
+
        for (final hop in hops) {
          if (hop.hasLocation) {
            points.add(hop.position!);
          }
        }
-        points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+
+        if ((!widget.message.isOutgoing && !widget.channelMessage) ||
+            (!widget.message.isOutgoing && widget.channelMessage)) {
+          points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+        }

        final polylines = points.length > 1
            ? [
@@ -357,6 +402,9 @@ class _ChannelMessagePathMapScreenState
            ? points.first
            : const LatLng(0, 0);
        final initialZoom = points.isNotEmpty ? 13.0 : 2.0;
+        if (!_didReceivePositionUpdate) {
+          _showNodeLabels = initialZoom >= _labelZoomThreshold;
+        }
        final bounds = points.length > 1
            ? LatLngBounds.fromPoints(points)
            : null;
@@ -366,7 +414,9 @@ class _ChannelMessagePathMapScreenState
        _pathDistance = _getPathDistance(points);

        return Scaffold(
-          appBar: AppBar(title: Text(context.l10n.channelPath_mapTitle)),
+          appBar: AppBar(
+            title: AdaptiveAppBarTitle(context.l10n.channelPath_mapTitle),
+          ),
          body: SafeArea(
            top: false,
            child: Stack(
@@ -388,6 +438,17 @@ class _ChannelMessagePathMapScreenState
                    interactionOptions: InteractionOptions(
                      flags: ~InteractiveFlag.rotate,
                    ),
+                    onPositionChanged: (camera, hasGesture) {
+                      final shouldShow = camera.zoom >= _labelZoomThreshold;
+                      if (!_didReceivePositionUpdate ||
+                          shouldShow != _showNodeLabels) {
+                        if (!mounted) return;
+                        setState(() {
+                          _didReceivePositionUpdate = true;
+                          _showNodeLabels = shouldShow;
+                        });
+                      }
+                    },
                  ),
                  children: [
                    TileLayer(
@@ -399,7 +460,12 @@ class _ChannelMessagePathMapScreenState
                    ),
                    if (polylines.isNotEmpty)
                      PolylineLayer(polylines: polylines),
-                    MarkerLayer(markers: _buildHopMarkers(hops)),
+                    MarkerLayer(
+                      markers: _buildHopMarkers(
+                        hops,
+                        showLabels: _showNodeLabels,
+                      ),
+                    ),
                  ],
                ),
                if (observedPaths.length > 1)
@@ -422,7 +488,7 @@ class _ChannelMessagePathMapScreenState
                      ),
                    ),
                  ),
-                _buildLegendCard(context, hops),
+                _buildLegendCard(context, hops, isImperial),
              ],
            ),
          ),
@@ -494,45 +560,61 @@ class _ChannelMessagePathMapScreenState
    );
  }

-  List<Marker> _buildHopMarkers(List<_PathHop> hops) {
-    return [
-      for (final hop in hops)
-        if (hop.hasLocation)
-          Marker(
-            point: hop.position!,
-            width: 35,
-            height: 35,
-            child: Container(
-              decoration: BoxDecoration(
-                color: Colors.green,
-                shape: BoxShape.circle,
-                border: Border.all(color: Colors.white, width: 2),
-                boxShadow: [
-                  BoxShadow(
-                    color: Colors.black.withValues(alpha: 0.3),
-                    blurRadius: 4,
-                    offset: const Offset(0, 2),
-                  ),
-                ],
-              ),
-              alignment: Alignment.center,
-              child: Text(
-                hop.index.toString(),
-                style: const TextStyle(
-                  color: Colors.white,
-                  fontWeight: FontWeight.bold,
-                  fontSize: 12,
+  List<Marker> _buildHopMarkers(
+    List<_PathHop> hops, {
+    required bool showLabels,
+  }) {
+    final markers = <Marker>[];
+    for (final hop in hops) {
+      if (!hop.hasLocation) continue;
+      final point = hop.position!;
+      markers.add(
+        Marker(
+          point: point,
+          width: 35,
+          height: 35,
+          child: Container(
+            decoration: BoxDecoration(
+              color: Colors.green,
+              shape: BoxShape.circle,
+              border: Border.all(color: Colors.white, width: 2),
+              boxShadow: [
+                BoxShadow(
+                  color: Colors.black.withValues(alpha: 0.3),
+                  blurRadius: 4,
+                  offset: const Offset(0, 2),
                ),
+              ],
+            ),
+            alignment: Alignment.center,
+            child: Text(
+              hop.index.toString(),
+              style: const TextStyle(
+                color: Colors.white,
+                fontWeight: FontWeight.bold,
+                fontSize: 12,
              ),
            ),
          ),
-      if (context.read<MeshCoreConnector>().selfLatitude != null &&
-          context.read<MeshCoreConnector>().selfLongitude != null)
-        Marker(
-          point: LatLng(
-            context.read<MeshCoreConnector>().selfLatitude!,
-            context.read<MeshCoreConnector>().selfLongitude!,
+        ),
+      );
+      if (showLabels) {
+        markers.add(
+          _buildNodeLabelMarker(
+            point: point,
+            label: hop.contact?.name ?? _formatPrefix(hop.prefix),
          ),
+        );
+      }
+    }
+
+    final selfLat = context.read<MeshCoreConnector>().selfLatitude;
+    final selfLon = context.read<MeshCoreConnector>().selfLongitude;
+    if (selfLat != null && selfLon != null) {
+      final selfPoint = LatLng(selfLat, selfLon);
+      markers.add(
+        Marker(
+          point: selfPoint,
          width: 35,
          height: 35,
          child: Container(
@@ -559,10 +641,60 @@ class _ChannelMessagePathMapScreenState
            ),
          ),
        ),
-    ];
+      );
+      if (showLabels) {
+        markers.add(
+          _buildNodeLabelMarker(
+            point: selfPoint,
+            label: context.l10n.pathTrace_you,
+          ),
+        );
+      }
+    }
+
+    return markers;
  }

-  Widget _buildLegendCard(BuildContext context, List<_PathHop> hops) {
+  Marker _buildNodeLabelMarker({required LatLng point, required String label}) {
+    return Marker(
+      point: point,
+      width: 120,
+      height: 24,
+      alignment: Alignment.topCenter,
+      child: IgnorePointer(
+        child: Transform.translate(
+          offset: const Offset(0, -20),
+          child: FittedBox(
+            fit: BoxFit.contain,
+            child: Container(
+              padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+              decoration: BoxDecoration(
+                color: Colors.black54,
+                borderRadius: BorderRadius.circular(8),
+              ),
+              alignment: Alignment.center,
+              child: Text(
+                label,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 11,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildLegendCard(
+    BuildContext context,
+    List<_PathHop> hops,
+    bool isImperial,
+  ) {
    final l10n = context.l10n;
    final maxHeight = MediaQuery.of(context).size.height * 0.35;
    final estimatedHeight = 72.0 + (hops.length * 56.0);
@@ -581,7 +713,7 @@ class _ChannelMessagePathMapScreenState
              Padding(
                padding: const EdgeInsets.all(12),
                child: Text(
-                  '${l10n.channelPath_repeaterHops} (${(_pathDistance / 1609.34).toStringAsFixed(2)} Miles / ${(_pathDistance / 1000).toStringAsFixed(2)} Km)',
+                  '${l10n.channelPath_repeaterHops} ${formatDistance(_pathDistance, isImperial: isImperial)}',
                  style: const TextStyle(fontWeight: FontWeight.w600),
                ),
              ),
@@ -594,7 +726,7 @@ class _ChannelMessagePathMapScreenState
                    : ListView.separated(
                        padding: const EdgeInsets.symmetric(vertical: 4),
                        itemCount: hops.length,
-                        separatorBuilder: (_, __) => const Divider(height: 1),
+                        separatorBuilder: (_, _) => const Divider(height: 1),
                        itemBuilder: (context, index) {
                          final hop = hops[index];
                          return ListTile(
@@ -3,18 +3,20 @@ import 'dart:math';
 import 'dart:typed_data';

 import 'package:flutter/material.dart';
+import 'package:meshcore_open/storage/channel_message_store.dart';
+import 'package:meshcore_open/widgets/app_bar.dart';
 import 'package:provider/provider.dart';
 import 'package:uuid/uuid.dart';

 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
+import '../services/app_settings_service.dart';
 import '../models/channel.dart';
 import '../models/community.dart';
 import '../storage/community_store.dart';
 import '../utils/dialog_utils.dart';
 import '../utils/disconnect_navigation_mixin.dart';
 import '../utils/route_transitions.dart';
-import '../widgets/battery_indicator.dart';
 import '../widgets/list_filter_widget.dart';
 import '../widgets/empty_state.dart';
 import '../widgets/qr_code_display.dart';
@@ -104,6 +106,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
  @override
  Widget build(BuildContext context) {
    final connector = context.watch<MeshCoreConnector>();
+    final channelMessageStore = ChannelMessageStore();

    // Auto-navigate back to scanner if disconnected
    if (!checkConnectionAndNavigate(connector)) {
@@ -116,8 +119,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
      canPop: allowBack,
      child: Scaffold(
        appBar: AppBar(
-          leading: BatteryIndicator(connector: connector),
-          title: Text(context.l10n.channels_title),
+          title: AppBarTitle(context.l10n.channels_title),
          centerTitle: true,
          automaticallyImplyLeading: false,
          actions: [
@@ -304,6 +306,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                            return _buildChannelTile(
                              context,
                              connector,
+                              channelMessageStore,
                              channel,
                              showDragHandle: true,
                              dragIndex: index,
@@ -323,6 +326,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                            return _buildChannelTile(
                              context,
                              connector,
+                              channelMessageStore,
                              channel,
                            );
                          },
@@ -354,6 +358,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
  Widget _buildChannelTile(
    BuildContext context,
    MeshCoreConnector connector,
+    ChannelMessageStore channelMessageStore,
    Channel channel, {
    bool showDragHandle = false,
    int? dragIndex,
@@ -470,7 +475,12 @@ class _ChannelsScreenState extends State<ChannelsScreen>
            );
          }
        },
-        onLongPress: () => _showChannelActions(context, connector, channel),
+        onLongPress: () => _showChannelActions(
+          context,
+          connector,
+          channelMessageStore,
+          channel,
+        ),
      ),
    );
  }
@@ -478,11 +488,16 @@ class _ChannelsScreenState extends State<ChannelsScreen>
  void _showChannelActions(
    BuildContext context,
    MeshCoreConnector connector,
+    ChannelMessageStore channelMessageStore,
    Channel channel,
  ) {
+    final parentContext = context;
+    final settingsService = context.read<AppSettingsService>();
+    final isMuted = settingsService.isChannelMuted(channel.name);
+
    showModalBottomSheet(
-      context: context,
-      builder: (context) => SafeArea(
+      context: parentContext,
+      builder: (sheetContext) => SafeArea(
        child: Column(
          mainAxisSize: MainAxisSize.min,
          children: [
@@ -490,10 +505,30 @@ class _ChannelsScreenState extends State<ChannelsScreen>
              leading: const Icon(Icons.edit_outlined),
              title: Text(context.l10n.channels_editChannel),
              onTap: () async {
-                Navigator.pop(context);
+                Navigator.pop(sheetContext);
                await Future.delayed(const Duration(milliseconds: 100));
-                if (context.mounted) {
-                  _showEditChannelDialog(context, connector, channel);
+                if (parentContext.mounted) {
+                  _showEditChannelDialog(parentContext, connector, channel);
+                }
+              },
+            ),
+            ListTile(
+              leading: Icon(
+                isMuted
+                    ? Icons.notifications_outlined
+                    : Icons.notifications_off_outlined,
+              ),
+              title: Text(
+                isMuted
+                    ? context.l10n.channels_unmuteChannel
+                    : context.l10n.channels_muteChannel,
+              ),
+              onTap: () async {
+                Navigator.pop(sheetContext);
+                if (isMuted) {
+                  await settingsService.unmuteChannel(channel.name);
+                } else {
+                  await settingsService.muteChannel(channel.name);
                }
              },
            ),
@@ -504,10 +539,15 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                style: const TextStyle(color: Colors.red),
              ),
              onTap: () async {
-                Navigator.pop(context);
+                Navigator.pop(sheetContext);
                await Future.delayed(const Duration(milliseconds: 100));
-                if (context.mounted) {
-                  _confirmDeleteChannel(context, connector, channel);
+                if (parentContext.mounted) {
+                  _confirmDeleteChannel(
+                    context,
+                    connector,
+                    channelMessageStore,
+                    channel,
+                  );
                }
              },
            ),
@@ -1417,7 +1457,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
              child: Text(dialogContext.l10n.common_cancel),
            ),
            FilledButton(
-              onPressed: () {
+              onPressed: () async {
                final name = nameController.text.trim();
                final pskHex = pskController.text.trim();

@@ -1434,13 +1474,25 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                }

                Navigator.pop(dialogContext);
-                connector.setChannel(channel.index, name, psk);
-                connector.setChannelSmazEnabled(channel.index, smazEnabled);
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(
-                    content: Text(context.l10n.channels_channelUpdated(name)),
-                  ),
-                );
+                try {
+                  await connector.setChannel(channel.index, name, psk);
+                  await connector.setChannelSmazEnabled(
+                    channel.index,
+                    smazEnabled,
+                  );
+                  if (!context.mounted) return;
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(
+                      content: Text(context.l10n.channels_channelUpdated(name)),
+                    ),
+                  );
+                } catch (e, st) {
+                  debugPrint(st.toString());
+                  if (!context.mounted) return;
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(content: Text('Failed to update channel: $e')),
+                  );
+                }
              },
              child: Text(dialogContext.l10n.common_save),
            ),
@@ -1453,6 +1505,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
  void _confirmDeleteChannel(
    BuildContext context,
    MeshCoreConnector connector,
+    ChannelMessageStore channelMessageStore,
    Channel channel,
  ) {
    showDialog(
@@ -1468,16 +1521,36 @@ class _ChannelsScreenState extends State<ChannelsScreen>
            child: Text(dialogContext.l10n.common_cancel),
          ),
          TextButton(
-            onPressed: () {
+            onPressed: () async {
              Navigator.pop(dialogContext);
-              connector.deleteChannel(channel.index);
-              ScaffoldMessenger.of(context).showSnackBar(
-                SnackBar(
-                  content: Text(
-                    context.l10n.channels_channelDeleted(channel.name),
+              try {
+                await connector.deleteChannel(channel.index);
+
+                channelMessageStore.clearChannelMessages(channel.index);
+
+                if (!context.mounted) return;
+
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text(
+                      context.l10n.channels_channelDeleted(channel.name),
+                    ),
                  ),
-                ),
-              );
+                );
+              } catch (e, st) {
+                if (!context.mounted) return;
+
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text(
+                      context.l10n.channels_channelDeleteFailed(channel.name),
+                    ),
+                  ),
+                );
+
+                // Preserve existing logging (if it was there)
+                debugPrint('Failed to delete channel: $e\n$st');
+              }
            },
            child: Text(
              dialogContext.l10n.common_delete,
@@ -6,6 +6,7 @@ import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
 import '../models/community.dart';
 import '../storage/community_store.dart';
+import '../widgets/adaptive_app_bar_title.dart';
 import '../widgets/qr_scanner_widget.dart';

 /// Screen for scanning community QR codes to join communities.
@@ -29,7 +30,7 @@ class _CommunityQrScannerScreenState extends State<CommunityQrScannerScreen> {
  Widget build(BuildContext context) {
    return Scaffold(
      appBar: AppBar(
-        title: Text(context.l10n.community_scanQr),
+        title: AdaptiveAppBarTitle(context.l10n.community_scanQr),
        centerTitle: true,
      ),
      body: _isProcessing
@@ -3,6 +3,8 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:meshcore_open/screens/path_trace_map.dart';
+import 'package:meshcore_open/utils/app_logger.dart';
+import 'package:meshcore_open/widgets/app_bar.dart';
 import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
@@ -16,7 +18,6 @@ import '../utils/dialog_utils.dart';
 import '../utils/disconnect_navigation_mixin.dart';
 import '../utils/emoji_utils.dart';
 import '../utils/route_transitions.dart';
-import '../widgets/battery_indicator.dart';
 import '../widgets/list_filter_widget.dart';
 import '../widgets/empty_state.dart';
 import '../widgets/quick_switch_bar.dart';
@@ -91,79 +92,90 @@ class _ContactsScreenState extends State<ContactsScreen>
    _frameSubscription = connector.receivedFrames.listen((frame) {
      if (frame.isEmpty) return;
      final frameBuffer = BufferReader(frame);
-      final code = frameBuffer.readUInt8();
+      try {
+        final code = frameBuffer.readUInt8();

-      if (code == respCodeExportContact) {
-        final advertPacket = frameBuffer.readRemainingBytes();
-        // Validate packet has expected minimum size (98+ bytes per protocol)
-        if (advertPacket.length < 98) {
-          if (mounted) {
+        if (code == respCodeExportContact) {
+          final advertPacket = frameBuffer.readRemainingBytes();
+          // Validate packet has expected minimum size (98+ bytes per protocol)
+          if (advertPacket.length < 98) {
+            if (mounted) {
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  content: Text(context.l10n.contacts_invalidAdvertFormat),
+                ),
+              );
+            }
+            _pendingOperations.remove(ContactOperationType.export);
+            return;
+          }
+          final hexString = pubKeyToHex(advertPacket);
+          Clipboard.setData(ClipboardData(text: "meshcore://$hexString"));
+        }
+
+        if (code == respCodeOk) {
+          // Show a snackbar indicating success
+          if (!mounted) return;
+
+          if (_pendingOperations.contains(ContactOperationType.import)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(content: Text(context.l10n.contacts_contactImported)),
+            );
+          }
+
+          if (_pendingOperations.contains(ContactOperationType.zeroHopShare)) {
            ScaffoldMessenger.of(context).showSnackBar(
              SnackBar(
-                content: Text(context.l10n.contacts_invalidAdvertFormat),
+                content: Text(context.l10n.contacts_zeroHopContactAdvertSent),
              ),
            );
          }
-          _pendingOperations.remove(ContactOperationType.export);
-          return;
-        }
-        final hexString = pubKeyToHex(advertPacket);
-        Clipboard.setData(ClipboardData(text: "meshcore://$hexString"));
-      }

-      if (code == respCodeOk) {
-        // Show a snackbar indicating success
-        if (!mounted) return;
+          if (_pendingOperations.contains(ContactOperationType.export)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(context.l10n.contacts_contactAdvertCopied),
+              ),
+            );
+          }

-        if (_pendingOperations.contains(ContactOperationType.import)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(context.l10n.contacts_contactImported)),
-          );
+          _pendingOperations.clear();
        }

-        if (_pendingOperations.contains(ContactOperationType.zeroHopShare)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(context.l10n.contacts_zeroHopContactAdvertSent),
-            ),
-          );
+        if (code == respCodeErr) {
+          // Show a snackbar indicating failure
+          if (!mounted) return;
+
+          if (_pendingOperations.contains(ContactOperationType.import)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(context.l10n.contacts_contactImportFailed),
+              ),
+            );
+          }
+
+          if (_pendingOperations.contains(ContactOperationType.zeroHopShare)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(context.l10n.contacts_zeroHopContactAdvertFailed),
+              ),
+            );
+          }
+          if (_pendingOperations.contains(ContactOperationType.export)) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(context.l10n.contacts_contactAdvertCopyFailed),
+              ),
+            );
+          }
+
+          _pendingOperations.clear();
        }
-
-        if (_pendingOperations.contains(ContactOperationType.export)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(context.l10n.contacts_contactAdvertCopied)),
-          );
-        }
-
-        _pendingOperations.clear();
-      }
-
-      if (code == respCodeErr) {
-        // Show a snackbar indicating failure
-        if (!mounted) return;
-
-        if (_pendingOperations.contains(ContactOperationType.import)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(context.l10n.contacts_contactImportFailed)),
-          );
-        }
-
-        if (_pendingOperations.contains(ContactOperationType.zeroHopShare)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(context.l10n.contacts_zeroHopContactAdvertFailed),
-            ),
-          );
-        }
-        if (_pendingOperations.contains(ContactOperationType.export)) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(context.l10n.contacts_contactAdvertCopyFailed),
-            ),
-          );
-        }
-
-        _pendingOperations.clear();
+      } catch (e) {
+        appLogger.error(
+          'Error processing received frame: $e',
+          tag: 'ContactsScreen',
+        );
      }
    });
  }
@@ -172,14 +184,17 @@ class _ContactsScreenState extends State<ContactsScreen>
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
    final exportContactFrame = buildExportContactFrame(pubKey);
    _pendingOperations.add(ContactOperationType.export);
-    await connector.sendFrame(exportContactFrame);
+    await connector.sendFrame(exportContactFrame, expectsGenericAck: true);
  }

  Future<void> _contactZeroHop(Uint8List pubKey) async {
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
    final exportContactZeroHopFrame = buildZeroHopContact(pubKey);
    _pendingOperations.add(ContactOperationType.zeroHopShare);
-    await connector.sendFrame(exportContactZeroHopFrame);
+    await connector.sendFrame(
+      exportContactZeroHopFrame,
+      expectsGenericAck: true,
+    );
  }

  Future<void> _contactImport() async {
@@ -206,7 +221,7 @@ class _ContactsScreenState extends State<ContactsScreen>
    try {
      final importContactFrame = buildImportContactFrame(hexString);
      _pendingOperations.add(ContactOperationType.import);
-      await connector.sendFrame(importContactFrame);
+      await connector.sendFrame(importContactFrame, expectsGenericAck: true);
    } catch (e) {
      if (mounted) {
        ScaffoldMessenger.of(context).showSnackBar(
@@ -230,9 +245,7 @@ class _ContactsScreenState extends State<ContactsScreen>
      canPop: allowBack,
      child: Scaffold(
        appBar: AppBar(
-          leading: BatteryIndicator(connector: connector),
-          title: Text(context.l10n.contacts_title),
-          centerTitle: true,
+          title: AppBarTitle(context.l10n.contacts_title),
          automaticallyImplyLeading: false,
          actions: [
            PopupMenuButton(
@@ -398,6 +411,41 @@ class _ContactsScreenState extends State<ContactsScreen>
        ? const <ContactGroup>[]
        : _filterAndSortGroups(_groups, contacts);

+    String hintText = "";
+
+    switch (_typeFilter) {
+      case ContactTypeFilter.all:
+        hintText = context.l10n.contacts_searchContacts(
+          filteredAndSorted.length,
+          _showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+        );
+        break;
+      case ContactTypeFilter.users:
+        hintText = context.l10n.contacts_searchUsers(
+          filteredAndSorted.length,
+          _showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+        );
+        break;
+      case ContactTypeFilter.repeaters:
+        hintText = context.l10n.contacts_searchRepeaters(
+          filteredAndSorted.length,
+          _showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+        );
+        break;
+      case ContactTypeFilter.rooms:
+        hintText = context.l10n.contacts_searchRoomServers(
+          filteredAndSorted.length,
+          _showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+        );
+        break;
+      case ContactTypeFilter.favorites:
+        hintText = context.l10n.contacts_searchFavorites(
+          filteredAndSorted.length,
+          _showUnreadOnly ? " ${context.l10n.contacts_unread}" : "",
+        );
+        break;
+    }
+
    return Column(
      children: [
        Padding(
@@ -405,7 +453,7 @@ class _ContactsScreenState extends State<ContactsScreen>
          child: TextField(
            controller: _searchController,
            decoration: InputDecoration(
-              hintText: context.l10n.contacts_searchContacts,
+              hintText: hintText,
              prefixIcon: const Icon(Icons.search),
              suffixIcon: Row(
                mainAxisSize: MainAxisSize.min,
@@ -477,6 +525,7 @@ class _ContactsScreenState extends State<ContactsScreen>
                        contact: contact,
                        lastSeen: _resolveLastSeen(contact),
                        unreadCount: unreadCount,
+                        isFavorite: contact.isFavorite,
                        onTap: () => _openChat(context, contact),
                        onLongPress: () =>
                            _showContactOptions(context, connector, contact),
@@ -513,6 +562,8 @@ class _ContactsScreenState extends State<ContactsScreen>
        })
        .where((group) {
          if (_typeFilter == ContactTypeFilter.all) return true;
+          // Groups don't have a favorite flag, so hide them under favorites filter
+          if (_typeFilter == ContactTypeFilter.favorites) return false;
          for (final key in group.memberKeys) {
            final contact = contactsByKey[key];
            if (contact != null && _matchesTypeFilter(contact)) return true;
@@ -606,6 +657,8 @@ class _ContactsScreenState extends State<ContactsScreen>
    switch (_typeFilter) {
      case ContactTypeFilter.all:
        return true;
+      case ContactTypeFilter.favorites:
+        return contact.isFavorite;
      case ContactTypeFilter.users:
        return contact.type == advTypeChat;
      case ContactTypeFilter.repeaters:
@@ -996,6 +1049,7 @@ class _ContactsScreenState extends State<ContactsScreen>
  ) {
    final isRepeater = contact.type == advTypeRepeater;
    final isRoom = contact.type == advTypeRoom;
+    final isFavorite = contact.isFavorite;

    showModalBottomSheet(
      context: context,
@@ -1102,6 +1156,21 @@ class _ContactsScreenState extends State<ContactsScreen>
                },
              ),
            ],
+            ListTile(
+              leading: Icon(
+                isFavorite ? Icons.star : Icons.star_border,
+                color: Colors.amber[700],
+              ),
+              title: Text(
+                isFavorite
+                    ? context.l10n.listFilter_removeFromFavorites
+                    : context.l10n.listFilter_addToFavorites,
+              ),
+              onTap: () async {
+                Navigator.pop(sheetContext);
+                await connector.setContactFavorite(contact, !isFavorite);
+              },
+            ),
            ListTile(
              leading: const Icon(Icons.copy),
              title: Text(context.l10n.contacts_ShareContact),
@@ -1170,6 +1239,7 @@ class _ContactTile extends StatelessWidget {
  final Contact contact;
  final DateTime lastSeen;
  final int unreadCount;
+  final bool isFavorite;
  final VoidCallback onTap;
  final VoidCallback onLongPress;

@@ -1177,6 +1247,7 @@ class _ContactTile extends StatelessWidget {
    required this.contact,
    required this.lastSeen,
    required this.unreadCount,
+    required this.isFavorite,
    required this.onTap,
    required this.onLongPress,
  });
@@ -1188,12 +1259,17 @@ class _ContactTile extends StatelessWidget {
        backgroundColor: _getTypeColor(contact.type),
        child: _buildContactAvatar(contact),
      ),
-      title: Text(contact.name),
+      title: Text(contact.name, maxLines: 1, overflow: TextOverflow.ellipsis),
      subtitle: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
-          Text(contact.pathLabel),
-          Text(contact.shortPubKeyHex, style: TextStyle(fontSize: 12)),
+          Text(contact.pathLabel, maxLines: 1, overflow: TextOverflow.ellipsis),
+          Text(
+            contact.shortPubKeyHex,
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+            style: const TextStyle(fontSize: 12),
+          ),
        ],
      ),
      // Clamp text scaling in trailing section to prevent overflow while
@@ -1204,26 +1280,36 @@ class _ContactTile extends StatelessWidget {
            MediaQuery.textScalerOf(context).scale(1.0).clamp(1.0, 1.3),
          ),
        ),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.end,
-          children: [
-            if (unreadCount > 0) ...[
-              UnreadBadge(count: unreadCount),
-              const SizedBox(height: 4),
-            ],
-            Text(
-              _formatLastSeen(context, lastSeen),
-              style: TextStyle(fontSize: 12, color: Colors.grey[600]),
-            ),
-            Row(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                if (contact.hasLocation)
-                  Icon(Icons.location_on, size: 14, color: Colors.grey[400]),
+        child: SizedBox(
+          width: 120,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.end,
+            children: [
+              if (unreadCount > 0) ...[
+                UnreadBadge(count: unreadCount),
+                const SizedBox(height: 4),
              ],
-            ),
-          ],
+              Text(
+                _formatLastSeen(context, lastSeen),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                textAlign: TextAlign.right,
+                style: TextStyle(fontSize: 12, color: Colors.grey[600]),
+              ),
+              Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  if (isFavorite)
+                    Icon(Icons.star, size: 14, color: Colors.amber[700]),
+                  if (isFavorite && contact.hasLocation)
+                    const SizedBox(width: 2),
+                  if (contact.hasLocation)
+                    Icon(Icons.location_on, size: 14, color: Colors.grey[400]),
+                ],
+              ),
+            ],
+          ),
        ),
      ),
      onTap: onTap,
@@ -7,6 +7,7 @@ import '../l10n/app_localizations.dart';
 import '../l10n/l10n.dart';
 import '../services/app_settings_service.dart';
 import '../services/map_tile_cache_service.dart';
+import '../widgets/adaptive_app_bar_title.dart';

 class MapCacheScreen extends StatefulWidget {
  const MapCacheScreen({super.key});
@@ -224,7 +225,10 @@ class _MapCacheScreenState extends State<MapCacheScreen> {
        : (_completedTiles / _estimatedTiles).clamp(0.0, 1.0).toDouble();

    return Scaffold(
-      appBar: AppBar(title: Text(l10n.mapCache_title), centerTitle: true),
+      appBar: AppBar(
+        title: AdaptiveAppBarTitle(l10n.mapCache_title),
+        centerTitle: true,
+      ),
      body: Column(
        children: [
          Expanded(
@@ -1,13 +1,17 @@
 import 'dart:math';
+import 'dart:typed_data';

 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
+import 'package:meshcore_open/screens/path_trace_map.dart';
+import 'package:meshcore_open/widgets/app_bar.dart';
 import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
 import '../connector/meshcore_protocol.dart';
+import '../models/app_settings.dart';
 import '../models/channel.dart';
 import '../models/contact.dart';
 import '../services/app_settings_service.dart';
@@ -15,8 +19,8 @@ import '../services/map_marker_service.dart';
 import '../services/map_tile_cache_service.dart';
 import '../utils/contact_search.dart';
 import '../utils/route_transitions.dart';
-import '../widgets/battery_indicator.dart';
 import '../widgets/quick_switch_bar.dart';
+import '../icons/los_icon.dart';
 import 'channels_screen.dart';
 import 'chat_screen.dart';
 import 'contacts_screen.dart';
@@ -24,6 +28,7 @@ import '../widgets/repeater_login_dialog.dart';
 import '../widgets/room_login_dialog.dart';
 import 'repeater_hub_screen.dart';
 import 'settings_screen.dart';
+import 'line_of_sight_map_screen.dart';

 class MapScreen extends StatefulWidget {
  final LatLng? highlightPosition;
@@ -44,13 +49,21 @@ class MapScreen extends StatefulWidget {
 }

 class _MapScreenState extends State<MapScreen> {
+  static const double _labelZoomThreshold = 8.5;
+
  final MapController _mapController = MapController();
  final MapMarkerService _markerService = MapMarkerService();
  final Set<String> _hiddenMarkerIds = {};
  Set<String> _removedMarkerIds = {};
+  bool _isBuildingPathTrace = false;
  bool _isSelectingPoi = false;
  bool _hasInitializedMap = false;
  bool _removedMarkersLoaded = false;
+  final List<int> _pathTrace = [];
+  final List<LatLng> _points = [];
+  final List<Polyline> _polylines = [];
+  bool _legendExpanded = false;
+  bool _showNodeLabels = true;

  @override
  void initState() {
@@ -98,7 +111,7 @@ class _MapScreenState extends State<MapScreen> {
  double _zoomFromStdDev(double latStdDev, double lonStdDev) {
    final maxSpread = max(latStdDev, lonStdDev);
    if (maxSpread <= 0) return 13.0;
-    // Approzimate: each zoom level halves the visible area
+    // Approximate: each zoom level halves the visible area
    // ~0.01 degrees spread -> zoom 13, ~0.1 -> zoom 10, ~1.0 -> zoom 7
    final zoom = 10.0 - log(maxSpread * 10 + 1) / ln10 * 3;
    return zoom.clamp(4.0, 15.0);
@@ -147,6 +160,19 @@ class _MapScreenState extends State<MapScreen> {
            .where((c) => c.hasLocation)
            .toList();

+        _polylines.clear();
+        _polylines.addAll(
+          _points.length > 1
+              ? [
+                  Polyline(
+                    points: _points,
+                    strokeWidth: 4,
+                    color: Colors.blueAccent,
+                  ),
+                ]
+              : <Polyline>[],
+        );
+
        // Calculate center and zoom of all nodes, or default to (0, 0)
        LatLng center = const LatLng(0, 0);
        double initialZoom = 10.0;
@@ -227,6 +253,7 @@ class _MapScreenState extends State<MapScreen> {
        // Re center map after removed markers have loaded
        if (!_hasInitializedMap && _removedMarkersLoaded) {
          _hasInitializedMap = true;
+          _showNodeLabels = initialZoom >= _labelZoomThreshold;
          if (hasMapContent) {
            WidgetsBinding.instance.addPostFrameCallback((_) {
              if (mounted) {
@@ -242,11 +269,57 @@ class _MapScreenState extends State<MapScreen> {
          canPop: allowBack,
          child: Scaffold(
            appBar: AppBar(
-              leading: BatteryIndicator(connector: connector),
-              title: Text(context.l10n.map_title),
+              title: AppBarTitle(context.l10n.map_title),
              centerTitle: true,
              automaticallyImplyLeading: false,
              actions: [
+                if (!_isBuildingPathTrace)
+                  IconButton(
+                    icon: const Icon(Icons.radar),
+                    onPressed: () => _startPath(),
+                    tooltip: context.l10n.contacts_pathTrace,
+                  ),
+                if (!_isBuildingPathTrace)
+                  IconButton(
+                    icon: const LosIcon(),
+                    onPressed: () {
+                      final candidates = <LineOfSightEndpoint>[];
+                      if (connector.selfLatitude != null &&
+                          connector.selfLongitude != null) {
+                        candidates.add(
+                          LineOfSightEndpoint(
+                            label: context.l10n.pathTrace_you,
+                            point: LatLng(
+                              connector.selfLatitude!,
+                              connector.selfLongitude!,
+                            ),
+                            color: Colors.teal,
+                            icon: Icons.person_pin_circle,
+                          ),
+                        );
+                      }
+                      for (final c in contactsWithLocation) {
+                        candidates.add(
+                          LineOfSightEndpoint(
+                            label: c.name,
+                            point: LatLng(c.latitude!, c.longitude!),
+                            color: _getNodeColor(c.type),
+                            icon: _getNodeIcon(c.type),
+                          ),
+                        );
+                      }
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                          builder: (context) => LineOfSightMapScreen(
+                            title: context.l10n.map_losScreenTitle,
+                            candidates: candidates,
+                          ),
+                        ),
+                      );
+                    },
+                    tooltip: context.l10n.map_lineOfSight,
+                  ),
                PopupMenuButton(
                  itemBuilder: (context) => [
                    PopupMenuItem(
@@ -325,6 +398,14 @@ class _MapScreenState extends State<MapScreen> {
                        position: latLng,
                      );
                    },
+                    onPositionChanged: (camera, hasGesture) {
+                      final shouldShow = camera.zoom >= _labelZoomThreshold;
+                      if (shouldShow != _showNodeLabels && mounted) {
+                        setState(() {
+                          _showNodeLabels = shouldShow;
+                        });
+                      }
+                    },
                  ),
                  children: [
                    TileLayer(
@@ -334,6 +415,8 @@ class _MapScreenState extends State<MapScreen> {
                          MapTileCacheService.userAgentPackageName,
                      maxZoom: 19,
                    ),
+                    if (_polylines.isNotEmpty && _isBuildingPathTrace)
+                      PolylineLayer(polylines: _polylines),
                    MarkerLayer(
                      markers: [
                        if (highlightPosition != null)
@@ -347,7 +430,11 @@ class _MapScreenState extends State<MapScreen> {
                              size: 34,
                            ),
                          ),
-                        ..._buildMarkers(contactsWithLocation, settings),
+                        ..._buildMarkers(
+                          contactsWithLocation,
+                          settings,
+                          showLabels: _showNodeLabels,
+                        ),
                        ...sharedMarkers.map(_buildSharedMarker),
                        if (connector.selfLatitude != null &&
                            connector.selfLongitude != null)
@@ -356,8 +443,8 @@ class _MapScreenState extends State<MapScreen> {
                              connector.selfLatitude!,
                              connector.selfLongitude!,
                            ),
-                            width: 35,
-                            height: 35,
+                            width: 40,
+                            height: 40,
                            child: Container(
                              padding: const EdgeInsets.all(4),
                              decoration: BoxDecoration(
@@ -376,21 +463,34 @@ class _MapScreenState extends State<MapScreen> {
                                ],
                              ),
                              alignment: Alignment.center,
-                              child: Text(
-                                context.l10n.pathTrace_you,
-                                style: const TextStyle(
-                                  color: Colors.black,
-                                  fontWeight: FontWeight.bold,
-                                  fontSize: 12,
-                                ),
+                              child: const Icon(
+                                Icons.person_pin_circle,
+                                color: Colors.white,
+                                size: 20,
                              ),
                            ),
                          ),
+                        if (_showNodeLabels &&
+                            connector.selfLatitude != null &&
+                            connector.selfLongitude != null)
+                          _buildNodeLabelMarker(
+                            point: LatLng(
+                              connector.selfLatitude!,
+                              connector.selfLongitude!,
+                            ),
+                            label: context.l10n.pathTrace_you,
+                          ),
                      ],
                    ),
                  ],
                ),
-                _buildLegend(contactsWithLocation.length, sharedMarkers.length),
+                if (!_isBuildingPathTrace)
+                  _buildLegend(
+                    contactsWithLocation,
+                    settings,
+                    sharedMarkers.length,
+                  ),
+                if (_isBuildingPathTrace) _buildPathTraceOverlay(),
              ],
            ),
            bottomNavigationBar: SafeArea(
@@ -414,20 +514,28 @@ class _MapScreenState extends State<MapScreen> {
    );
  }

-  List<Marker> _buildMarkers(List<Contact> contacts, settings) {
+  List<Marker> _buildMarkers(
+    List<Contact> contacts,
+    settings, {
+    required bool showLabels,
+  }) {
    final markers = <Marker>[];

    for (final contact in contacts) {
      if (!contact.hasLocation) continue;

      // Apply node type filters
-      if (contact.type == advTypeRepeater && !settings.mapShowRepeaters) {
+      if (contact.type == advTypeRepeater &&
+          (!settings.mapShowRepeaters && !_isBuildingPathTrace)) {
+        continue;
+      }
+      if (contact.type == advTypeChat &&
+          !(settings.mapShowChatNodes && !_isBuildingPathTrace)) {
        continue;
      }
-      if (contact.type == advTypeChat && !settings.mapShowChatNodes) continue;
      if (contact.type != advTypeChat &&
          contact.type != advTypeRepeater &&
-          !settings.mapShowOtherNodes) {
+          (!settings.mapShowOtherNodes && !_isBuildingPathTrace)) {
        continue;
      }

@@ -436,7 +544,11 @@ class _MapScreenState extends State<MapScreen> {
        width: 35,
        height: 35,
        child: GestureDetector(
-          onTap: () => _showNodeInfo(context, contact),
+          onLongPress: () =>
+              _isBuildingPathTrace ? _showNodeInfo(context, contact) : null,
+          onTap: () => _isBuildingPathTrace
+              ? _addToPath(context, contact)
+              : _showNodeInfo(context, contact),
          child: Column(
            children: [
              Container(
@@ -465,11 +577,54 @@ class _MapScreenState extends State<MapScreen> {
      );

      markers.add(marker);
+      if (showLabels) {
+        markers.add(
+          _buildNodeLabelMarker(
+            point: LatLng(contact.latitude!, contact.longitude!),
+            label: contact.name,
+          ),
+        );
+      }
    }

    return markers;
  }

+  Marker _buildNodeLabelMarker({required LatLng point, required String label}) {
+    return Marker(
+      point: point,
+      width: 120,
+      height: 24,
+      alignment: Alignment.topCenter,
+      child: IgnorePointer(
+        child: Transform.translate(
+          offset: const Offset(0, -20),
+          child: FittedBox(
+            fit: BoxFit.contain,
+            child: Container(
+              padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+              decoration: BoxDecoration(
+                color: Colors.black54,
+                borderRadius: BorderRadius.circular(8),
+              ),
+              alignment: Alignment.center,
+              child: Text(
+                label,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 11,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
  Color _getNodeColor(int type) {
    switch (type) {
      case advTypeChat:
@@ -500,65 +655,126 @@ class _MapScreenState extends State<MapScreen> {
    }
  }

-  Widget _buildLegend(int nodeCount, int markerCount) {
+  Widget _buildLegend(
+    List<Contact> contactsWithLocation,
+    settings,
+    int markerCount,
+  ) {
+    int nodeCount = 0;
+    for (final contact in contactsWithLocation) {
+      // Apply node type filters
+      if (contact.type == advTypeRepeater && !settings.mapShowRepeaters) {
+        continue;
+      }
+      if (contact.type == advTypeChat && !settings.mapShowChatNodes) continue;
+      if (contact.type != advTypeChat &&
+          contact.type != advTypeRepeater &&
+          !settings.mapShowOtherNodes) {
+        continue;
+      }
+      nodeCount++;
+    }
+
    return Positioned(
      top: 16,
      right: 16,
      child: Card(
-        child: Padding(
-          padding: const EdgeInsets.all(12.0),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Text(
-                context.l10n.map_nodesCount(nodeCount),
-                style: const TextStyle(
-                  fontWeight: FontWeight.bold,
-                  fontSize: 14,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            InkWell(
+              borderRadius: BorderRadius.circular(12),
+              onTap: () {
+                setState(() {
+                  _legendExpanded = !_legendExpanded;
+                });
+              },
+              child: Padding(
+                padding: const EdgeInsets.fromLTRB(12, 10, 12, 10),
+                child: Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          context.l10n.map_nodesCount(nodeCount),
+                          style: const TextStyle(
+                            fontWeight: FontWeight.bold,
+                            fontSize: 14,
+                          ),
+                        ),
+                        Text(
+                          context.l10n.map_pinsCount(markerCount),
+                          style: const TextStyle(
+                            fontWeight: FontWeight.w600,
+                            fontSize: 12,
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(width: 8),
+                    AnimatedRotation(
+                      turns: _legendExpanded ? 0.5 : 0,
+                      duration: const Duration(milliseconds: 200),
+                      child: const Icon(Icons.expand_more, size: 20),
+                    ),
+                  ],
                ),
              ),
-              Text(
-                context.l10n.map_pinsCount(markerCount),
-                style: const TextStyle(
-                  fontWeight: FontWeight.bold,
-                  fontSize: 12,
+            ),
+            AnimatedCrossFade(
+              firstChild: const SizedBox.shrink(),
+              secondChild: Padding(
+                padding: const EdgeInsets.fromLTRB(12, 0, 12, 12),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    const SizedBox(height: 6),
+                    _buildLegendItem(
+                      Icons.person,
+                      context.l10n.map_chat,
+                      Colors.blue,
+                    ),
+                    _buildLegendItem(
+                      Icons.router,
+                      context.l10n.map_repeater,
+                      Colors.green,
+                    ),
+                    _buildLegendItem(
+                      Icons.meeting_room,
+                      context.l10n.map_room,
+                      Colors.purple,
+                    ),
+                    _buildLegendItem(
+                      Icons.sensors,
+                      context.l10n.map_sensor,
+                      Colors.orange,
+                    ),
+                    _buildLegendItem(
+                      Icons.flag,
+                      context.l10n.map_pinDm,
+                      Colors.blue,
+                    ),
+                    _buildLegendItem(
+                      Icons.flag,
+                      context.l10n.map_pinPrivate,
+                      Colors.purple,
+                    ),
+                    _buildLegendItem(
+                      Icons.flag,
+                      context.l10n.map_pinPublic,
+                      Colors.orange,
+                    ),
+                  ],
                ),
              ),
-              const SizedBox(height: 8),
-              _buildLegendItem(
-                Icons.person,
-                context.l10n.map_chat,
-                Colors.blue,
-              ),
-              _buildLegendItem(
-                Icons.router,
-                context.l10n.map_repeater,
-                Colors.green,
-              ),
-              _buildLegendItem(
-                Icons.meeting_room,
-                context.l10n.map_room,
-                Colors.purple,
-              ),
-              _buildLegendItem(
-                Icons.sensors,
-                context.l10n.map_sensor,
-                Colors.orange,
-              ),
-              _buildLegendItem(Icons.flag, context.l10n.map_pinDm, Colors.blue),
-              _buildLegendItem(
-                Icons.flag,
-                context.l10n.map_pinPrivate,
-                Colors.purple,
-              ),
-              _buildLegendItem(
-                Icons.flag,
-                context.l10n.map_pinPublic,
-                Colors.orange,
-              ),
-            ],
-          ),
+              crossFadeState: _legendExpanded
+                  ? CrossFadeState.showSecond
+                  : CrossFadeState.showFirst,
+              duration: const Duration(milliseconds: 200),
+            ),
+          ],
        ),
      ),
    );
@@ -566,7 +782,7 @@ class _MapScreenState extends State<MapScreen> {

  Widget _buildLegendItem(IconData icon, String label, Color color) {
    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 4.0),
+      padding: const EdgeInsets.symmetric(vertical: 1.0),
      child: Row(
        mainAxisSize: MainAxisSize.min,
        children: [
@@ -749,7 +965,7 @@ class _MapScreenState extends State<MapScreen> {
              color: _getNodeColor(contact.type),
            ),
            const SizedBox(width: 8),
-            Expanded(child: Text(contact.name)),
+            Expanded(child: SelectableText(contact.name)),
          ],
        ),
        content: Column(
@@ -920,7 +1136,7 @@ class _MapScreenState extends State<MapScreen> {
            ),
          ),
          const SizedBox(height: 2),
-          Text(value, style: const TextStyle(fontSize: 14)),
+          SelectableText(value, style: const TextStyle(fontSize: 14)),
        ],
      ),
    );
@@ -1087,7 +1303,8 @@ class _MapScreenState extends State<MapScreen> {
                        padding: const EdgeInsets.fromLTRB(16, 4, 16, 8),
                        child: TextField(
                          decoration: InputDecoration(
-                            hintText: context.l10n.contacts_searchContacts,
+                            hintText:
+                                context.l10n.contacts_searchContactsNoNumber,
                            prefixIcon: const Icon(Icons.search),
                            border: OutlineInputBorder(
                              borderRadius: BorderRadius.circular(12),
@@ -1414,6 +1631,119 @@ class _MapScreenState extends State<MapScreen> {
      return context.l10n.time_allTime;
    }
  }
+
+  void _addToPath(BuildContext context, Contact contact) {
+    setState(() {
+      _pathTrace.add(
+        contact.publicKey[0],
+      ); // Add first 16 bytes of public key to path trace
+      _points.add(LatLng(contact.latitude!, contact.longitude!));
+    });
+  }
+
+  void _startPath() {
+    setState(() {
+      _isBuildingPathTrace = true;
+      _pathTrace.clear();
+      _points.clear();
+      _polylines.clear();
+    });
+  }
+
+  void _removePath() {
+    setState(() {
+      _pathTrace.removeLast(); // Remove last node from path trace
+      _points.removeLast(); // Remove last point from points list
+      _polylines.clear(); // Clear polylines
+    });
+  }
+
+  Widget _buildPathTraceOverlay() {
+    final l10n = context.l10n;
+    final isImperial =
+        context.read<AppSettingsService>().settings.unitSystem ==
+        UnitSystem.imperial;
+    return Positioned(
+      top: 16,
+      left: 16,
+      right: 16,
+      child: Card(
+        child: Padding(
+          padding: const EdgeInsets.all(12.0),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Text(
+                l10n.contacts_pathTrace,
+                style: TextStyle(fontWeight: FontWeight.bold),
+              ),
+              if (_pathTrace.isEmpty) const SizedBox(height: 8),
+              if (_pathTrace.isEmpty)
+                Text(l10n.map_tapToAdd, style: TextStyle(fontSize: 12)),
+              const SizedBox(height: 6),
+              if (_pathTrace.isNotEmpty)
+                Text(
+                  "${l10n.path_currentPathLabel} ${formatDistance(getPathDistanceMeters(_points), isImperial: isImperial)}",
+                  style: TextStyle(fontSize: 12, color: Colors.grey[700]),
+                ),
+              SelectableText(
+                _pathTrace
+                    .map((b) => b.toRadixString(16).padLeft(2, '0'))
+                    .join(','),
+                style: TextStyle(fontSize: 18),
+              ),
+              const SizedBox(height: 6),
+              Wrap(
+                alignment: WrapAlignment.center,
+                spacing: 8,
+                runSpacing: 8,
+                children: [
+                  if (_pathTrace.isNotEmpty)
+                    ElevatedButton(
+                      onPressed: () {
+                        Navigator.push(
+                          context,
+                          MaterialPageRoute(
+                            builder: (context) => PathTraceMapScreen(
+                              title: l10n.contacts_pathTrace,
+                              path: Uint8List.fromList(_pathTrace),
+                            ),
+                          ),
+                        );
+                        setState(() {
+                          _isBuildingPathTrace = false;
+                        });
+                      },
+                      child: Text(l10n.map_runTrace),
+                    ),
+                  if (_pathTrace.isNotEmpty)
+                    ElevatedButton(
+                      onPressed: _removePath,
+                      child: Text(l10n.map_removeLast),
+                    ),
+                  if (_pathTrace.isEmpty)
+                    ElevatedButton(
+                      onPressed: () {
+                        setState(() {
+                          _isBuildingPathTrace = false;
+                          _pathTrace.clear();
+                          _points.clear();
+                          _polylines.clear();
+                        });
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          SnackBar(content: Text(l10n.map_pathTraceCancelled)),
+                        );
+                      },
+                      child: Text(l10n.common_cancel),
+                    ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
 }

 class _MarkerPayload {
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:meshcore_open/utils/app_logger.dart';
 import 'package:provider/provider.dart';
 import '../l10n/l10n.dart';
 import '../models/contact.dart';
@@ -11,28 +12,28 @@ import '../services/repeater_command_service.dart';
 import '../widgets/path_management_dialog.dart';
 import '../widgets/snr_indicator.dart';

-class NeighboursScreen extends StatefulWidget {
+class NeighborsScreen extends StatefulWidget {
  final Contact repeater;
  final String password;

-  const NeighboursScreen({
+  const NeighborsScreen({
    super.key,
    required this.repeater,
    required this.password,
  });

  @override
-  State<NeighboursScreen> createState() => _NeighboursScreenState();
+  State<NeighborsScreen> createState() => _NeighborsScreenState();
 }

-class _NeighboursScreenState extends State<NeighboursScreen> {
-  static const int _reqNeighboursKeyLen = 4;
+class _NeighborsScreenState extends State<NeighborsScreen> {
+  static const int _reqNeighborsKeyLen = 4;
  static const int _statusPayloadOffset = 8;
  static const int _statusStatsSize = 52;
  static const int _statusResponseBytes =
      _statusPayloadOffset + _statusStatsSize;
  Uint8List _tagData = Uint8List(4);
-  int _neighbourCount = 0;
+  int _neighborCount = 0;

  bool _isLoading = false;
  bool _isLoaded = false;
@@ -41,7 +42,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
  StreamSubscription<Uint8List>? _frameSubscription;
  RepeaterCommandService? _commandService;
  PathSelection? _pendingStatusSelection;
-  List<Map<String, dynamic>>? _parsedNeighbours;
+  List<Map<String, dynamic>>? _parsedNeighbors;

  @override
  void initState() {
@@ -49,7 +50,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
    _commandService = RepeaterCommandService(connector);
    _setupMessageListener();
-    _loadNeighbours();
+    _loadNeighbors();
    _hasData = false;
  }

@@ -62,13 +63,12 @@ class _NeighboursScreenState extends State<NeighboursScreen> {

      if (frame[0] == respCodeSent) {
        _tagData = frame.sublist(2, 6);
-        //_timeEstment = frame.buffer.asByteData().getUint32(6, Endian.little);
      }

      // Check if it's a binary response
      if (frame[0] == pushCodeBinaryResponse &&
          listEquals(frame.sublist(2, 6), _tagData)) {
-        _handleNeighboursResponse(connector, frame.sublist(6));
+        _handleNeighborsResponse(connector, frame.sublist(6));
      }
    });
  }
@@ -91,65 +91,77 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
    return '${h}h ${m2}m';
  }

-  static List<Map<String, dynamic>> parseNeighboursData(
+  static List<Map<String, dynamic>> parseNeighborsData(
    BufferReader buffer,
    int resultsCount,
  ) {
-    final Map<int, Map<String, dynamic>> neighbours = {};
-    for (var i = 0; i < resultsCount; i++) {
-      final neighbourData = neighbours.putIfAbsent(
-        i,
-        () => {
-          'contact': null,
-          'publicKey': <Uint8List>{},
-          'lastHeard': <int>{},
-          'snr': <double>{},
-        },
-      );
-      neighbourData['publicKey'] = buffer.readBytes(_reqNeighboursKeyLen);
-      neighbourData['lastHeard'] = buffer.readUInt32LE();
-      neighbourData['snr'] = buffer.readInt8() / 4.0;
-    }
+    final Map<int, Map<String, dynamic>> neighbors = {};
+    try {
+      for (var i = 0; i < resultsCount; i++) {
+        final neighborData = neighbors.putIfAbsent(
+          i,
+          () => {
+            'contact': null,
+            'publicKey': <Uint8List>{},
+            'lastHeard': <int>{},
+            'snr': <double>{},
+          },
+        );
+        neighborData['publicKey'] = buffer.readBytes(_reqNeighborsKeyLen);
+        neighborData['lastHeard'] = buffer.readUInt32LE();
+        neighborData['snr'] = buffer.readInt8() / 4.0;
+      }

-    return neighbours.values.toList();
+      return neighbors.values.toList();
+    } catch (e) {
+      appLogger.error(
+        'Error parsing neighbors data: $e',
+        tag: 'NeighborsScreen',
+      );
+      return [];
+    }
  }

-  void _handleNeighboursResponse(MeshCoreConnector connector, Uint8List frame) {
+  void _handleNeighborsResponse(MeshCoreConnector connector, Uint8List frame) {
    final buffer = BufferReader(frame);
-    final neighbourCount = buffer.readUInt16LE();
-    final parsedNeighbours = parseNeighboursData(buffer, buffer.readUInt16LE());
-    connector.contacts.where((c) => c.type == advTypeRepeater).forEach((
-      repeater,
-    ) {
-      for (var neighbourData in parsedNeighbours) {
-        final publicKey = neighbourData['publicKey'];
-        if (listEquals(
-          repeater.publicKey.sublist(0, _reqNeighboursKeyLen),
-          publicKey,
-        )) {
-          neighbourData['contact'] = repeater;
+    try {
+      final neighborCount = buffer.readUInt16LE();
+      final parsedNeighbors = parseNeighborsData(buffer, buffer.readUInt16LE());
+      connector.contacts.where((c) => c.type == advTypeRepeater).forEach((
+        repeater,
+      ) {
+        for (var neighborData in parsedNeighbors) {
+          final publicKey = neighborData['publicKey'];
+          if (listEquals(
+            repeater.publicKey.sublist(0, _reqNeighborsKeyLen),
+            publicKey,
+          )) {
+            neighborData['contact'] = repeater;
+          }
        }
-      }
-    });
+      });

-    setState(() {
-      _parsedNeighbours = parsedNeighbours;
-      _neighbourCount = neighbourCount;
-    });
+      setState(() {
+        _parsedNeighbors = parsedNeighbors;
+        _neighborCount = neighborCount;
+      });

-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(
-        content: Text(context.l10n.neighbors_receivedData),
-        backgroundColor: Colors.green,
-      ),
-    );
-    _statusTimeout?.cancel();
-    if (!mounted) return;
-    setState(() {
-      _isLoading = false;
-      _isLoaded = true;
-      _hasData = true;
-    });
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(context.l10n.neighbors_receivedData),
+          backgroundColor: Colors.green,
+        ),
+      );
+      _statusTimeout?.cancel();
+      if (!mounted) return;
+      setState(() {
+        _isLoading = false;
+        _isLoaded = true;
+        _hasData = true;
+      });
+    } catch (e) {
+      appLogger.error('Error handling neighbors response: $e');
+    }
  }

  Contact _resolveRepeater(MeshCoreConnector connector) {
@@ -159,7 +171,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
    );
  }

-  Future<void> _loadNeighbours() async {
+  Future<void> _loadNeighbors() async {
    if (_commandService == null) return;

    setState(() {
@@ -172,17 +184,17 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
      final selection = await connector.preparePathForContactSend(repeater);
      _pendingStatusSelection = selection;

-      //[version][number of requested neighbours][offset_16bit][order by][len of public key]
+      //[version][number of requested neighbors][offset_16bit][order by][len of public key]
      final frame = buildSendBinaryReq(
        repeater.publicKey,
        payload: Uint8List.fromList([
-          reqTypeGetNeighbours,
+          reqTypeGetNeighbors,
          0x00,
          0x0F,
          0x00,
          0x00,
          0x00,
-          _reqNeighboursKeyLen,
+          _reqNeighborsKeyLen,
        ]),
      );
      await connector.sendFrame(frame);
@@ -258,7 +270,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
          mainAxisSize: MainAxisSize.min,
          children: [
            Text(
-              l10n.neighbors_repeatersNeighbours,
+              l10n.neighbors_repeatersNeighbors,
              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
            ),
            Text(
@@ -345,7 +357,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
                    child: CircularProgressIndicator(strokeWidth: 2),
                  )
                : const Icon(Icons.refresh),
-            onPressed: _isLoading ? null : _loadNeighbours,
+            onPressed: _isLoading ? null : _loadNeighbors,
            tooltip: l10n.repeater_refresh,
          ),
        ],
@@ -353,13 +365,13 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
      body: SafeArea(
        top: false,
        child: RefreshIndicator(
-          onRefresh: _loadNeighbours,
+          onRefresh: _loadNeighbors,
          child: ListView(
            padding: const EdgeInsets.all(16),
            children: [
              if (!_isLoaded &&
                  !_hasData &&
-                  (_parsedNeighbours == null || _parsedNeighbours!.isEmpty))
+                  (_parsedNeighbors == null || _parsedNeighbors!.isEmpty))
                Center(
                  child: Text(
                    l10n.neighbors_noData,
@@ -368,10 +380,9 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
                ),
              if (_isLoaded ||
                  _hasData &&
-                      !(_parsedNeighbours == null ||
-                          _parsedNeighbours!.isEmpty))
-                _buildNeighboursInfoCard(
-                  "${l10n.repeater_neighbours} - $_neighbourCount",
+                      !(_parsedNeighbors == null || _parsedNeighbors!.isEmpty))
+                _buildNeighborsInfoCard(
+                  "${l10n.repeater_neighbors} - $_neighborCount",
                ),
            ],
          ),
@@ -380,7 +391,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
    );
  }

-  Widget _buildNeighboursInfoCard(String title) {
+  Widget _buildNeighborsInfoCard(String title) {
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
    return Card(
      child: Padding(
@@ -405,7 +416,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
              ],
            ),
            const Divider(),
-            for (final entry in _parsedNeighbours!.asMap().entries)
+            for (final entry in _parsedNeighbors!.asMap().entries)
              _buildInfoRow(
                entry.value['contact'] != null
                    ? entry.value['contact'].name
@@ -430,6 +441,7 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
    double snr,
    int spreadingFactor,
  ) {
+    final snrUi = snrUiFromSNR(snr, spreadingFactor);
    return Padding(
      padding: const EdgeInsets.symmetric(vertical: 3),
      child: Row(
@@ -443,9 +455,15 @@ class _NeighboursScreenState extends State<NeighboursScreen> {
                style: const TextStyle(fontWeight: FontWeight.w500),
              ),
              subtitle: Text(value),
-              trailing: SNRIcon(
-                snr: snr,
-                snrLevels: getSNRfromSF(spreadingFactor),
+              trailing: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Icon(snrUi.icon, color: snrUi.color, size: 18.0),
+                  Text(
+                    snrUi.text,
+                    style: TextStyle(fontSize: 10, color: snrUi.color),
+                  ),
+                ],
              ),
            ),
          ),
@@ -8,14 +8,37 @@ import 'package:latlong2/latlong.dart';
 import 'package:meshcore_open/connector/meshcore_connector.dart';
 import 'package:meshcore_open/connector/meshcore_protocol.dart';
 import 'package:meshcore_open/l10n/l10n.dart';
+import 'package:meshcore_open/models/app_settings.dart';
 import 'package:meshcore_open/models/contact.dart';
+import 'package:meshcore_open/services/app_settings_service.dart';
 import 'package:meshcore_open/services/map_tile_cache_service.dart';
+import 'package:meshcore_open/utils/app_logger.dart';
 import 'package:meshcore_open/widgets/snr_indicator.dart';
 import 'package:provider/provider.dart';

+double getPathDistanceMeters(List<LatLng> points) {
+  if (points.length <= 1) return 0.0;
+
+  double distanceMeters = 0.0;
+  final distanceCalculator = Distance();
+
+  for (int i = 0; i < points.length - 1; i++) {
+    distanceMeters += distanceCalculator(points[i], points[i + 1]);
+  }
+
+  return distanceMeters;
+}
+
+String formatDistance(double distanceMeters, {required bool isImperial}) {
+  if (isImperial) {
+    return '(${(distanceMeters / 1609.34).toStringAsFixed(2)} mi)';
+  }
+  return '(${(distanceMeters / 1000).toStringAsFixed(2)} km)';
+}
+
 class PathTraceData {
  final Uint8List pathData;
-  final Uint8List snrData;
+  final List<double> snrData;
  final Map<int, Contact> pathContacts;

  PathTraceData({
@@ -28,6 +51,7 @@ class PathTraceData {
 class PathTraceMapScreen extends StatefulWidget {
  final String title;
  final Uint8List path;
+  final int? repeaterId;
  final bool flipPathRound;
  final bool reversePathRound;

@@ -35,6 +59,7 @@ class PathTraceMapScreen extends StatefulWidget {
    super.key,
    required this.title,
    required this.path,
+    this.repeaterId,
    this.flipPathRound = false,
    this.reversePathRound = false,
  });
@@ -44,13 +69,14 @@ class PathTraceMapScreen extends StatefulWidget {
 }

 class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
+  static const double _labelZoomThreshold = 8.5;
+
  StreamSubscription<Uint8List>? _frameSubscription;
  Timer? _timeoutTimer;

  bool _isLoading = false;
  bool _failed2Loaded = false;
  bool _hasData = false;
-  bool _noLocationErr = false;
  PathTraceData? _traceData;
  List<LatLng> _points = <LatLng>[];
  List<Polyline> _polylines = [];
@@ -58,7 +84,8 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
  double _initialZoom = 2.0;
  LatLngBounds? _bounds;
  ValueKey<String> _mapKey = const ValueKey('initial');
-  double _pathDistance = 0.0;
+  double _pathDistanceMeters = 0.0;
+  bool _showNodeLabels = true;

  String _formatPathPrefixes(Uint8List pathBytes) {
    return pathBytes
@@ -80,7 +107,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
    super.dispose();
  }

-  Uint8List addReturnpath(Uint8List pathBytes) {
+  Uint8List addReturnPath(Uint8List pathBytes) {
    Uint8List? traceBytes;
    final len = (pathBytes.length + pathBytes.length - 1);
    traceBytes = Uint8List(len);
@@ -93,23 +120,11 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
    return traceBytes;
  }

-  double getPathDistance() {
-    double totalDistance = 0.0;
-    final distanceCalculator = Distance();
-
-    for (int i = 0; i < _points.length - 1; i++) {
-      totalDistance += distanceCalculator(_points[i], _points[i + 1]);
-    }
-
-    return totalDistance;
-  }
-
  Future<void> _doPathTrace() async {
    if (mounted) {
      setState(() {
        _isLoading = true;
        _failed2Loaded = false;
-        _noLocationErr = false;
      });
    }

@@ -120,7 +135,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
        : widget.path;

    if (widget.flipPathRound) {
-      path = addReturnpath(pathTmp);
+      path = addReturnPath(pathTmp);
    } else {
      path = pathTmp;
    }
@@ -142,34 +157,57 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
    _frameSubscription = connector.receivedFrames.listen((frame) {
      if (frame.isEmpty) return;
      final frameBuffer = BufferReader(frame);
-      final code = frameBuffer.readUInt8();
+      try {
+        final code = frameBuffer.readUInt8();

-      if (code == respCodeSent) {
-        frameBuffer.skipBytes(1); //reserved
-        tagData = frameBuffer.readBytes(4);
-        final timeoutSeconds = frameBuffer.readUInt32LE();
+        if (code == respCodeSent) {
+          frameBuffer.skipBytes(1); //reserved
+          tagData = frameBuffer.readBytes(4);
+          final timeoutMilliseconds = frameBuffer.readUInt32LE();

-        // Start timeout timer for trace response
-        _timeoutTimer?.cancel();
-        _timeoutTimer = Timer(Duration(milliseconds: timeoutSeconds), () {
+          // Start timeout timer for trace response
+          _timeoutTimer?.cancel();
+          _timeoutTimer = Timer(
+            Duration(milliseconds: timeoutMilliseconds),
+            () {
+              if (!mounted) return;
+              setState(() {
+                _isLoading = false;
+                _failed2Loaded = true;
+              });
+            },
+          );
+        }
+
+        if (code == respCodeErr) {
+          _timeoutTimer?.cancel();
          if (!mounted) return;
          setState(() {
            _isLoading = false;
            _failed2Loaded = true;
          });
-        });
-      }
+        }

-      // Check if it's a binary response
-      if (frame.length > 8 &&
-          code == pushCodeTraceData &&
-          listEquals(frame.sublist(4, 8), tagData)) {
+        // Check if it's a binary response
+        if (frame.length > 8 &&
+            code == pushCodeTraceData &&
+            listEquals(frame.sublist(4, 8), tagData)) {
+          _timeoutTimer?.cancel();
+          if (!mounted) return;
+          frameBuffer.skipBytes(3); //reserved + path length + flag
+          if (listEquals(frameBuffer.readBytes(4), tagData)) {
+            _handleTraceResponse(frame);
+          }
+        }
+      } catch (e) {
        _timeoutTimer?.cancel();
        if (!mounted) return;
-        frameBuffer.skipBytes(3); //reserved + path length + flag
-        if (listEquals(frameBuffer.readBytes(4), tagData)) {
-          _handleTraceResponse(frame);
-        }
+        setState(() {
+          _isLoading = false;
+          _failed2Loaded = true;
+        });
+        // Handle any parsing errors gracefully
+        appLogger.error('Error parsing frame: $e', tag: 'PathTraceMapScreen');
      }
    });
  }
@@ -178,71 +216,91 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);

    final buffer = BufferReader(frame);
-    buffer.skipBytes(2); // Skip push code and reserved byte
-    int pathLength = buffer.readUInt8();
-    buffer.skipBytes(5); // Skip Flag byte and tag data
-    buffer.skipBytes(4); // Skip auth code
-    Uint8List pathData = buffer.readBytes(pathLength);
-    Uint8List snrData = buffer.readRemainingBytes();
+    try {
+      buffer.skipBytes(2); // Skip push code and reserved byte
+      int pathLength = buffer.readUInt8();
+      buffer.skipBytes(5); // Skip Flag byte and tag data
+      buffer.skipBytes(4); // Skip auth code
+      Uint8List pathData = buffer.readBytes(pathLength);
+      List<double> snrData = buffer
+          .readRemainingBytes()
+          .map((snr) => snr.toSigned(8).toDouble() / 4)
+          .toList();

-    Map<int, Contact> pathContacts = {};
+      Map<int, Contact> pathContacts = {};

-    connector.contacts.where((c) => c.type != advTypeChat).forEach((repeater) {
-      for (var repeaterData in pathData) {
-        if (listEquals(
-          repeater.publicKey.sublist(0, 1),
-          Uint8List.fromList([repeaterData]),
-        )) {
-          pathContacts[repeaterData] = repeater;
+      connector.contacts.where((c) => c.type != advTypeChat).forEach((
+        repeater,
+      ) {
+        for (var repeaterData in pathData) {
+          if (listEquals(
+            repeater.publicKey.sublist(0, 1),
+            Uint8List.fromList([repeaterData]),
+          )) {
+            pathContacts[repeaterData] = repeater;
+          }
        }
-      }
-    });
+      });

-    setState(() {
-      _isLoading = false;
-      _hasData = true;
-      _traceData = PathTraceData(
-        pathData: pathData,
-        snrData: snrData,
-        pathContacts: pathContacts,
-      );
-      _points = <LatLng>[];
-      _points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
-      for (final hop in _traceData!.pathData) {
-        final contact = _traceData!.pathContacts[hop];
-        if (contact != null &&
-            contact.hasLocation &&
-            contact.latitude != null &&
-            contact.longitude != null) {
-          _points.add(LatLng(contact.latitude!, contact.longitude!));
-        } else {
-          _noLocationErr = true;
+      setState(() {
+        _isLoading = false;
+        _hasData = true;
+        _traceData = PathTraceData(
+          pathData: pathData,
+          snrData: snrData,
+          pathContacts: pathContacts,
+        );
+        _points = <LatLng>[];
+        _points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+        for (final hop in _traceData!.pathData) {
+          final contact = _traceData!.pathContacts[hop];
+          if (contact != null &&
+              contact.hasLocation &&
+              contact.latitude != null &&
+              contact.longitude != null) {
+            _points.add(LatLng(contact.latitude!, contact.longitude!));
+          }
        }
-      }
-      _polylines = _points.length > 1
-          ? [
-              Polyline(
-                points: _points,
-                strokeWidth: 4,
-                color: Colors.blueAccent,
-              ),
-            ]
-          : <Polyline>[];
+        _polylines = _points.length > 1
+            ? [
+                Polyline(
+                  points: _points,
+                  strokeWidth: 4,
+                  color: Colors.blueAccent,
+                ),
+              ]
+            : <Polyline>[];

-      _initialCenter = _points.isNotEmpty ? _points.first : const LatLng(0, 0);
-      _initialZoom = _points.isNotEmpty ? 13.0 : 2.0;
-      _bounds = _points.length > 1 ? LatLngBounds.fromPoints(_points) : null;
-      _mapKey = ValueKey(
-        '${context.l10n.pathTrace_you},${_formatPathPrefixes(_traceData!.pathData)}',
+        _initialCenter = _points.isNotEmpty
+            ? _points.first
+            : const LatLng(0, 0);
+        _initialZoom = _points.isNotEmpty ? 13.0 : 2.0;
+        _bounds = _points.length > 1 ? LatLngBounds.fromPoints(_points) : null;
+        _mapKey = ValueKey(
+          '${context.l10n.pathTrace_you},${_formatPathPrefixes(_traceData!.pathData)}',
+        );
+        _pathDistanceMeters = getPathDistanceMeters(_points);
+      });
+    } catch (e) {
+      appLogger.error(
+        'Error handling trace response: $e',
+        tag: 'PathTraceMapScreen',
      );
-      _pathDistance = getPathDistance();
-    });
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+          _failed2Loaded = true;
+        });
+      }
+    }
  }

  @override
  Widget build(BuildContext context) {
    return Consumer<MeshCoreConnector>(
      builder: (context, connector, _) {
+        final settings = context.watch<AppSettingsService>().settings;
+        final isImperial = settings.unitSystem == UnitSystem.imperial;
        final tileCache = context.read<MapTileCacheService>();

        return Scaffold(
@@ -279,20 +337,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
            top: false,
            child: Stack(
              children: [
-                if (_noLocationErr)
-                  Center(
-                    child: Card(
-                      color: Colors.red,
-                      child: Padding(
-                        padding: EdgeInsets.all(12),
-                        child: Text(
-                          context.l10n.pathTrace_someHopsNoLocation,
-                          style: TextStyle(color: Colors.white),
-                        ),
-                      ),
-                    ),
-                  ),
-                if (!_hasData && !_noLocationErr)
+                if (!_hasData)
                  Center(
                    child: Column(
                      mainAxisSize: MainAxisSize.min,
@@ -304,43 +349,11 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                      ],
                    ),
                  ),
-                if (_hasData && !_noLocationErr)
-                  FlutterMap(
-                    key: _mapKey,
-                    options: MapOptions(
-                      initialCenter: _initialCenter!,
-                      initialZoom: _initialZoom,
-                      initialCameraFit: _bounds == null
-                          ? null
-                          : CameraFit.bounds(
-                              bounds: _bounds!,
-                              padding: const EdgeInsets.all(64),
-                              maxZoom: 16,
-                            ),
-                      minZoom: 2.0,
-                      maxZoom: 18.0,
-                    ),
-                    children: [
-                      TileLayer(
-                        urlTemplate: kMapTileUrlTemplate,
-                        tileProvider: tileCache.tileProvider,
-                        userAgentPackageName:
-                            MapTileCacheService.userAgentPackageName,
-                        maxZoom: 19,
-                      ),
-                      if (_polylines.isNotEmpty)
-                        PolylineLayer(polylines: _polylines),
-                      if (_traceData!.pathData.isNotEmpty)
-                        MarkerLayer(
-                          markers: _buildHopMarkers(_traceData!.pathData),
-                        ),
-                    ],
-                  ),
+                if (_hasData) _buildMapPathTrace(context, tileCache),
                if (_points.isEmpty &&
                    !_hasData &&
                    !_isLoading &&
-                    !_failed2Loaded &&
-                    !_noLocationErr)
+                    !_failed2Loaded)
                  Center(
                    child: Card(
                      color: Colors.white.withValues(alpha: 0.9),
@@ -352,8 +365,8 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                      ),
                    ),
                  ),
-                if (_hasData && !_noLocationErr)
-                  _buildLegendCard(context, _traceData!),
+                if (_hasData)
+                  _buildLegendCard(context, _traceData!, isImperial),
              ],
            ),
          ),
@@ -362,54 +375,61 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
    );
  }

-  List<Marker> _buildHopMarkers(List<int> pathData) {
-    return [
-      for (final hop in pathData)
-        if (_traceData!.pathContacts[hop]!.hasLocation)
-          Marker(
-            point: LatLng(
-              _traceData!.pathContacts[hop]!.latitude!,
-              _traceData!.pathContacts[hop]!.longitude!,
-            ),
-            width: 35,
-            height: 35,
-            child: Container(
-              padding: const EdgeInsets.all(4),
-              decoration: BoxDecoration(
-                color: Colors.green,
-                shape: BoxShape.circle,
-                border: Border.all(color: Colors.white, width: 2),
-                boxShadow: [
-                  BoxShadow(
-                    color: Colors.black.withValues(alpha: 0.3),
-                    blurRadius: 4,
-                    offset: const Offset(0, 2),
-                  ),
-                ],
-              ),
-              alignment: Alignment.center,
-              child: Text(
-                _traceData!.pathContacts[hop]!.publicKey
-                    .sublist(0, 1)
-                    .map(
-                      (b) => b.toRadixString(16).padLeft(2, '0').toUpperCase(),
-                    )
-                    .join(),
-                style: const TextStyle(
-                  color: Colors.white,
-                  fontWeight: FontWeight.bold,
-                  fontSize: 12,
-                ),
-              ),
-            ),
-          ),
-      if (context.read<MeshCoreConnector>().selfLatitude != null &&
-          context.read<MeshCoreConnector>().selfLongitude != null)
+  List<Marker> _buildHopMarkers(
+    List<int> pathData, {
+    required bool showLabels,
+  }) {
+    final markers = <Marker>[];
+    for (final hop in pathData) {
+      final contact = _traceData!.pathContacts[hop];
+      if (contact == null || !contact.hasLocation) continue;
+      final point = LatLng(contact.latitude!, contact.longitude!);
+      markers.add(
        Marker(
-          point: LatLng(
-            context.read<MeshCoreConnector>().selfLatitude!,
-            context.read<MeshCoreConnector>().selfLongitude!,
+          point: point,
+          width: 35,
+          height: 35,
+          child: Container(
+            padding: const EdgeInsets.all(4),
+            decoration: BoxDecoration(
+              color: Colors.green,
+              shape: BoxShape.circle,
+              border: Border.all(color: Colors.white, width: 2),
+              boxShadow: [
+                BoxShadow(
+                  color: Colors.black.withValues(alpha: 0.3),
+                  blurRadius: 4,
+                  offset: const Offset(0, 2),
+                ),
+              ],
+            ),
+            alignment: Alignment.center,
+            child: Text(
+              contact.publicKey
+                  .sublist(0, 1)
+                  .map((b) => b.toRadixString(16).padLeft(2, '0').toUpperCase())
+                  .join(),
+              style: const TextStyle(
+                color: Colors.white,
+                fontWeight: FontWeight.bold,
+                fontSize: 12,
+              ),
+            ),
          ),
+        ),
+      );
+      if (showLabels) {
+        markers.add(_buildNodeLabelMarker(point: point, label: contact.name));
+      }
+    }
+
+    final selfLat = context.read<MeshCoreConnector>().selfLatitude;
+    final selfLon = context.read<MeshCoreConnector>().selfLongitude;
+    if (selfLat != null && selfLon != null) {
+      final selfPoint = LatLng(selfLat, selfLon);
+      markers.add(
+        Marker(
+          point: selfPoint,
          width: 35,
          height: 35,
          child: Container(
@@ -437,7 +457,53 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
            ),
          ),
        ),
-    ];
+      );
+      if (showLabels) {
+        markers.add(
+          _buildNodeLabelMarker(
+            point: selfPoint,
+            label: context.l10n.pathTrace_you,
+          ),
+        );
+      }
+    }
+
+    return markers;
+  }
+
+  Marker _buildNodeLabelMarker({required LatLng point, required String label}) {
+    return Marker(
+      point: point,
+      width: 120,
+      height: 24,
+      alignment: Alignment.topCenter,
+      child: IgnorePointer(
+        child: Transform.translate(
+          offset: const Offset(0, -20),
+          child: FittedBox(
+            fit: BoxFit.contain,
+            child: Container(
+              padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+              decoration: BoxDecoration(
+                color: Colors.black54,
+                borderRadius: BorderRadius.circular(8),
+              ),
+              alignment: Alignment.center,
+              child: Text(
+                label,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 11,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
  }

  String formatDirectionText(PathTraceData pathTraceData, int index) {
@@ -453,7 +519,9 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
            .toRadixString(16)
            .padLeft(2, '0')
            .toUpperCase();
-        return contactName != null ? "$hex: $contactName" : hex;
+        return contactName != null
+            ? "$hex: $contactName"
+            : "$hex: ${context.l10n.channelPath_unknownRepeater}";
      }
    } else {
      final contactName =
@@ -462,7 +530,9 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
          .toRadixString(16)
          .padLeft(2, '0')
          .toUpperCase();
-      return contactName != null ? "$hex: $contactName" : hex;
+      return contactName != null
+          ? "$hex: $contactName"
+          : "$hex: ${context.l10n.channelPath_unknownRepeater}";
    }
  }

@@ -475,7 +545,9 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
            .toRadixString(16)
            .padLeft(2, '0')
            .toUpperCase();
-        return contactName != null ? "$hex: $contactName" : hex;
+        return contactName != null
+            ? "$hex: $contactName"
+            : "$hex: ${context.l10n.channelPath_unknownRepeater}";
      } else {
        return context.l10n.pathTrace_you;
      }
@@ -486,11 +558,64 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
          .toRadixString(16)
          .padLeft(2, '0')
          .toUpperCase();
-      return contactName != null ? "$hex: $contactName" : hex;
+      return contactName != null
+          ? "$hex: $contactName"
+          : "$hex: ${context.l10n.channelPath_unknownRepeater}";
    }
  }

-  Widget _buildLegendCard(BuildContext context, PathTraceData pathTraceData) {
+  Widget _buildMapPathTrace(
+    BuildContext context,
+    MapTileCacheService tileCache,
+  ) {
+    return FlutterMap(
+      key: _mapKey,
+      options: MapOptions(
+        interactionOptions: InteractionOptions(flags: ~InteractiveFlag.rotate),
+        initialCenter: _initialCenter!,
+        initialZoom: _initialZoom,
+        initialCameraFit: _bounds == null
+            ? null
+            : CameraFit.bounds(
+                bounds: _bounds!,
+                padding: const EdgeInsets.all(64),
+                maxZoom: 16,
+              ),
+        minZoom: 2.0,
+        maxZoom: 18.0,
+        onPositionChanged: (camera, hasGesture) {
+          final shouldShow = camera.zoom >= _labelZoomThreshold;
+          if (shouldShow != _showNodeLabels && mounted) {
+            setState(() {
+              _showNodeLabels = shouldShow;
+            });
+          }
+        },
+      ),
+      children: [
+        TileLayer(
+          urlTemplate: kMapTileUrlTemplate,
+          tileProvider: tileCache.tileProvider,
+          userAgentPackageName: MapTileCacheService.userAgentPackageName,
+          maxZoom: 19,
+        ),
+        if (_polylines.isNotEmpty) PolylineLayer(polylines: _polylines),
+        if (_traceData!.pathData.isNotEmpty)
+          MarkerLayer(
+            markers: _buildHopMarkers(
+              _traceData!.pathData,
+              showLabels: _showNodeLabels,
+            ),
+          ),
+      ],
+    );
+  }
+
+  Widget _buildLegendCard(
+    BuildContext context,
+    PathTraceData pathTraceData,
+    bool isImperial,
+  ) {
    final l10n = context.l10n;
    final maxHeight = MediaQuery.of(context).size.height * 0.35;
    final estimatedHeight = 72.0 + (pathTraceData.pathData.length * 56.0);
@@ -509,7 +634,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
              Padding(
                padding: const EdgeInsets.all(12),
                child: Text(
-                  '${l10n.channelPath_repeaterHops} (${(_pathDistance / 1609.34).toStringAsFixed(2)} Miles / ${(_pathDistance / 1000).toStringAsFixed(2)} Km)',
+                  '${l10n.channelPath_repeaterHops} ${formatDistance(_pathDistanceMeters, isImperial: isImperial)}',
                  style: const TextStyle(fontWeight: FontWeight.w600),
                ),
              ),
@@ -523,8 +648,14 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                        child: ListView.separated(
                          padding: const EdgeInsets.symmetric(vertical: 4),
                          itemCount: pathTraceData.pathData.length + 1,
-                          separatorBuilder: (_, __) => const Divider(height: 1),
+                          separatorBuilder: (_, _) => const Divider(height: 1),
                          itemBuilder: (context, index) {
+                            final snrUi = snrUiFromSNR(
+                              index < pathTraceData.snrData.length
+                                  ? pathTraceData.snrData[index]
+                                  : null,
+                              context.read<MeshCoreConnector>().currentSf,
+                            );
                            return Column(
                              children: [
                                ListTile(
@@ -543,12 +674,22 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                                    ),
                                    style: const TextStyle(fontSize: 14),
                                  ),
-                                  trailing: SNRIcon(
-                                    snr:
-                                        pathTraceData.snrData[index].toSigned(
-                                          8,
-                                        ) /
-                                        4.0,
+                                  trailing: Column(
+                                    mainAxisAlignment: MainAxisAlignment.center,
+                                    children: [
+                                      Icon(
+                                        snrUi.icon,
+                                        color: snrUi.color,
+                                        size: 18.0,
+                                      ),
+                                      Text(
+                                        snrUi.text,
+                                        style: TextStyle(
+                                          fontSize: 10,
+                                          color: snrUi.color,
+                                        ),
+                                      ),
+                                    ],
                                  ),
                                  onTap: () {
                                    // Handle item tap
@@ -168,6 +168,7 @@ class _RepeaterCliScreenState extends State<RepeaterCliScreen> {

    _commandController.clear();
    _historyIndex = -1;
+    _commandFocusNode.requestFocus();

    // Auto-scroll to bottom
    Future.delayed(const Duration(milliseconds: 100), () {
@@ -1,12 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:meshcore_open/connector/meshcore_protocol.dart';
+import 'package:provider/provider.dart';
 import '../l10n/l10n.dart';
 import '../models/contact.dart';
+import '../services/app_settings_service.dart';
 import 'repeater_status_screen.dart';
 import 'repeater_cli_screen.dart';
 import 'repeater_settings_screen.dart';
 import 'telemetry_screen.dart';
-import 'neighbours_screen.dart';
+import 'neighbors_screen.dart';

 class RepeaterHubScreen extends StatelessWidget {
  final Contact repeater;
@@ -21,6 +23,10 @@ class RepeaterHubScreen extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    final l10n = context.l10n;
+    final settingsService = context.watch<AppSettingsService>();
+    final chemistry = settingsService.batteryChemistryForRepeater(
+      repeater.publicKeyHex,
+    );
    return Scaffold(
      appBar: AppBar(
        title: Column(
@@ -107,6 +113,62 @@ class RepeaterHubScreen extends StatelessWidget {
              ),
            ),
            const SizedBox(height: 24),
+            Card(
+              child: Padding(
+                padding: const EdgeInsets.fromLTRB(16, 16, 16, 12),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        const Icon(Icons.battery_full),
+                        const SizedBox(width: 10),
+                        Expanded(
+                          child: Text(
+                            l10n.appSettings_batteryChemistry,
+                            style: const TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.w600,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 12),
+                    DropdownButtonFormField<String>(
+                      initialValue: chemistry,
+                      isExpanded: true,
+                      decoration: const InputDecoration(
+                        border: UnderlineInputBorder(),
+                        isDense: true,
+                      ),
+                      onChanged: (value) {
+                        if (value == null) return;
+                        settingsService.setBatteryChemistryForRepeater(
+                          repeater.publicKeyHex,
+                          value,
+                        );
+                      },
+                      items: [
+                        DropdownMenuItem(
+                          value: 'nmc',
+                          child: Text(l10n.appSettings_batteryNmc),
+                        ),
+                        DropdownMenuItem(
+                          value: 'lifepo4',
+                          child: Text(l10n.appSettings_batteryLifepo4),
+                        ),
+                        DropdownMenuItem(
+                          value: 'lipo',
+                          child: Text(l10n.appSettings_batteryLipo),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+            ),
+            const SizedBox(height: 24),
            Text(
              l10n.repeater_managementTools,
              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
@@ -174,17 +236,15 @@ class RepeaterHubScreen extends StatelessWidget {
            _buildManagementCard(
              context,
              icon: Icons.group,
-              title: l10n.repeater_neighbours,
-              subtitle: l10n.repeater_neighboursSubtitle,
+              title: l10n.repeater_neighbors,
+              subtitle: l10n.repeater_neighborsSubtitle,
              color: Colors.orange,
              onTap: () {
                Navigator.push(
                  context,
                  MaterialPageRoute(
-                    builder: (context) => NeighboursScreen(
-                      repeater: repeater,
-                      password: password,
-                    ),
+                    builder: (context) =>
+                        NeighborsScreen(repeater: repeater, password: password),
                  ),
                );
              },
@@ -8,7 +8,9 @@ import '../models/contact.dart';
 import '../models/path_selection.dart';
 import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
+import '../services/app_settings_service.dart';
 import '../services/repeater_command_service.dart';
+import '../utils/battery_utils.dart';
 import '../widgets/path_management_dialog.dart';

 class RepeaterStatusScreen extends StatefulWidget {
@@ -179,6 +181,12 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
      _dupDirect = directDups;
      _dupFlood = floodDups;
    });
+    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
+    connector.updateRepeaterBatterySnapshot(
+      widget.repeater.publicKeyHex,
+      batteryMv,
+      source: 'status_binary',
+    );
    _recordStatusResult(true);
  }

@@ -201,6 +209,18 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
          _uptimeSecs = _asInt(data['uptime_secs']);
          _queueLen = _asInt(data['queue_len']);
          _debugFlags = _asInt(data['errors']);
+          final batteryMv = _batteryMv;
+          if (batteryMv != null) {
+            final connector = Provider.of<MeshCoreConnector>(
+              context,
+              listen: false,
+            );
+            connector.updateRepeaterBatterySnapshot(
+              widget.repeater.publicKeyHex,
+              batteryMv,
+              source: 'status_text',
+            );
+          }
        } else if (data.containsKey('noise_floor')) {
          _noiseFloor = _asInt(data['noise_floor']);
          _lastRssi = _asInt(data['last_rssi']);
@@ -590,18 +610,24 @@ class _RepeaterStatusScreenState extends State<RepeaterStatusScreen> {
  }

  String _batteryText() {
-    if (_batteryMv == null) return '—';
-    final percent = _batteryPercentFromMv(_batteryMv!);
-    final volts = (_batteryMv! / 1000.0).toStringAsFixed(2);
+    final connector = context.watch<MeshCoreConnector>();
+    final batteryMv =
+        connector.getRepeaterBatteryMillivolts(widget.repeater.publicKeyHex) ??
+        _batteryMv;
+    if (batteryMv == null) return '—';
+    final percent = estimateBatteryPercentFromMillivolts(
+      batteryMv,
+      _batteryChemistry(),
+    );
+    final volts = (batteryMv / 1000.0).toStringAsFixed(2);
    return '$percent% / ${volts}V';
  }

-  int _batteryPercentFromMv(int millivolts) {
-    const minMv = 3000;
-    const maxMv = 4200;
-    if (millivolts <= minMv) return 0;
-    if (millivolts >= maxMv) return 100;
-    return (((millivolts - minMv) * 100) / (maxMv - minMv)).round();
+  String _batteryChemistry() {
+    final settingsService = context.read<AppSettingsService>();
+    return settingsService.batteryChemistryForRepeater(
+      widget.repeater.publicKeyHex,
+    );
  }

  String _clockText() {
@@ -1,9 +1,13 @@
+import 'dart:async';
+import 'dart:io' show Platform;
+
 import 'package:flutter/material.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
+import '../widgets/adaptive_app_bar_title.dart';
 import '../widgets/device_tile.dart';
 import 'contacts_screen.dart';

@@ -18,6 +22,8 @@ class ScannerScreen extends StatefulWidget {
 class _ScannerScreenState extends State<ScannerScreen> {
  bool _changedNavigation = false;
  late final VoidCallback _connectionListener;
+  BluetoothAdapterState _bluetoothState = BluetoothAdapterState.unknown;
+  late StreamSubscription<BluetoothAdapterState> _bluetoothStateSubscription;

  @override
  void initState() {
@@ -39,12 +45,25 @@ class _ScannerScreenState extends State<ScannerScreen> {
    };

    connector.addListener(_connectionListener);
+
+    _bluetoothStateSubscription = FlutterBluePlus.adapterState.listen((state) {
+      if (mounted) {
+        setState(() {
+          _bluetoothState = state;
+        });
+        // Cancel scan if Bluetooth turns off while scanning
+        if (state != BluetoothAdapterState.on) {
+          unawaited(connector.stopScan());
+        }
+      }
+    });
  }

  @override
  void dispose() {
    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
    connector.removeListener(_connectionListener);
+    unawaited(_bluetoothStateSubscription.cancel());
    super.dispose();
  }

@@ -52,7 +71,7 @@ class _ScannerScreenState extends State<ScannerScreen> {
  Widget build(BuildContext context) {
    return Scaffold(
      appBar: AppBar(
-        title: Text(context.l10n.scanner_title),
+        title: AdaptiveAppBarTitle(context.l10n.scanner_title),
        centerTitle: true,
        automaticallyImplyLeading: false,
      ),
@@ -62,6 +81,10 @@ class _ScannerScreenState extends State<ScannerScreen> {
          builder: (context, connector, child) {
            return Column(
              children: [
+                // Bluetooth off warning
+                if (_bluetoothState == BluetoothAdapterState.off)
+                  _bluetoothOffWarning(context),
+
                // Status bar
                _buildStatusBar(context, connector),

@@ -76,15 +99,18 @@ class _ScannerScreenState extends State<ScannerScreen> {
        builder: (context, connector, child) {
          final isScanning =
              connector.state == MeshCoreConnectionState.scanning;
+          final isBluetoothOff = _bluetoothState == BluetoothAdapterState.off;

          return FloatingActionButton.extended(
-            onPressed: () {
-              if (isScanning) {
-                connector.stopScan();
-              } else {
-                connector.startScan();
-              }
-            },
+            onPressed: isBluetoothOff
+                ? null
+                : () {
+                    if (isScanning) {
+                      connector.stopScan();
+                    } else {
+                      connector.startScan();
+                    }
+                  },
            icon: isScanning
                ? const SizedBox(
                    width: 20,
@@ -205,4 +231,47 @@ class _ScannerScreenState extends State<ScannerScreen> {
      }
    }
  }
+
+  Widget _bluetoothOffWarning(BuildContext context) {
+    final errorColor = Theme.of(context).colorScheme.error;
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
+      color: errorColor.withValues(alpha: 0.15),
+      child: Row(
+        children: [
+          Icon(Icons.bluetooth_disabled, size: 24, color: errorColor),
+          const SizedBox(width: 12),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  context.l10n.scanner_bluetoothOff,
+                  style: TextStyle(
+                    color: errorColor,
+                    fontWeight: FontWeight.w600,
+                    fontSize: 14,
+                  ),
+                ),
+                const SizedBox(height: 4),
+                Text(
+                  context.l10n.scanner_bluetoothOffMessage,
+                  style: TextStyle(
+                    color: errorColor.withValues(alpha: 0.85),
+                    fontSize: 12,
+                  ),
+                ),
+              ],
+            ),
+          ),
+          if (Platform.isAndroid)
+            TextButton(
+              onPressed: () => FlutterBluePlus.turnOn(),
+              child: Text(context.l10n.scanner_enableBluetooth),
+            ),
+        ],
+      ),
+    );
+  }
 }
@@ -8,6 +8,7 @@ import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
 import '../l10n/l10n.dart';
 import '../models/radio_settings.dart';
+import '../widgets/adaptive_app_bar_title.dart';
 import 'app_settings_screen.dart';
 import 'app_debug_log_screen.dart';
 import 'ble_debug_log_screen.dart';
@@ -21,6 +22,7 @@ class SettingsScreen extends StatefulWidget {

 class _SettingsScreenState extends State<SettingsScreen> {
  bool _showBatteryVoltage = false;
+  bool _deviceInfoExpanded = false;
  String _appVersion = '';

  @override
@@ -40,7 +42,10 @@ class _SettingsScreenState extends State<SettingsScreen> {
  Widget build(BuildContext context) {
    final l10n = context.l10n;
    return Scaffold(
-      appBar: AppBar(title: Text(l10n.settings_title), centerTitle: true),
+      appBar: AppBar(
+        title: AdaptiveAppBarTitle(l10n.settings_title),
+        centerTitle: true,
+      ),
      body: SafeArea(
        top: false,
        child: Consumer<MeshCoreConnector>(
@@ -74,43 +79,84 @@ class _SettingsScreenState extends State<SettingsScreen> {
    MeshCoreConnector connector,
  ) {
    final l10n = context.l10n;
+
    return Card(
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              l10n.settings_deviceInfo,
-              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
-            ),
-            const SizedBox(height: 16),
-            _buildInfoRow(l10n.settings_infoName, connector.deviceDisplayName),
-            _buildInfoRow(l10n.settings_infoId, connector.deviceIdLabel),
-            _buildInfoRow(
-              l10n.settings_infoStatus,
-              connector.isConnected
-                  ? l10n.common_connected
-                  : l10n.common_disconnected,
-            ),
-            _buildBatteryInfoRow(context, connector),
-            if (connector.selfName != null)
-              _buildInfoRow(l10n.settings_nodeName, connector.selfName!),
-            if (connector.selfPublicKey != null)
-              _buildInfoRow(
-                l10n.settings_infoPublicKey,
-                '${pubKeyToHex(connector.selfPublicKey!).substring(0, 16)}...',
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          InkWell(
+            borderRadius: BorderRadius.circular(12),
+            onTap: () {
+              setState(() {
+                _deviceInfoExpanded = !_deviceInfoExpanded;
+              });
+            },
+            child: Padding(
+              padding: const EdgeInsets.fromLTRB(16, 16, 16, 16),
+              child: Row(
+                children: [
+                  Expanded(
+                    child: Text(
+                      l10n.settings_deviceInfo,
+                      style: const TextStyle(
+                        fontSize: 18,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                  AnimatedRotation(
+                    turns: _deviceInfoExpanded ? 0.5 : 0,
+                    duration: const Duration(milliseconds: 200),
+                    child: const Icon(Icons.expand_more),
+                  ),
+                ],
              ),
-            _buildInfoRow(
-              l10n.settings_infoContactsCount,
-              '${connector.contacts.length}',
            ),
-            _buildInfoRow(
-              l10n.settings_infoChannelCount,
-              '${connector.channels.length}',
+          ),
+
+          AnimatedCrossFade(
+            firstChild: const SizedBox.shrink(),
+            secondChild: Padding(
+              padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  _buildInfoRow(
+                    l10n.settings_infoName,
+                    connector.deviceDisplayName,
+                  ),
+                  _buildInfoRow(l10n.settings_infoId, connector.deviceIdLabel),
+                  _buildInfoRow(
+                    l10n.settings_infoStatus,
+                    connector.isConnected
+                        ? l10n.common_connected
+                        : l10n.common_disconnected,
+                  ),
+                  _buildBatteryInfoRow(context, connector),
+                  if (connector.selfName != null)
+                    _buildInfoRow(l10n.settings_nodeName, connector.selfName!),
+                  if (connector.selfPublicKey != null)
+                    _buildInfoRow(
+                      l10n.settings_infoPublicKey,
+                      '${pubKeyToHex(connector.selfPublicKey!).substring(0, 16)}...',
+                    ),
+                  _buildInfoRow(
+                    l10n.settings_infoContactsCount,
+                    '${connector.contacts.length}',
+                  ),
+                  _buildInfoRow(
+                    l10n.settings_infoChannelCount,
+                    '${connector.channels.length}',
+                  ),
+                ],
+              ),
            ),
-          ],
-        ),
+            crossFadeState: _deviceInfoExpanded
+                ? CrossFadeState.showSecond
+                : CrossFadeState.showFirst,
+            duration: const Duration(milliseconds: 200),
+          ),
+        ],
      ),
    );
  }
@@ -355,22 +401,33 @@ class _SettingsScreenState extends State<SettingsScreen> {
    Color? valueColor,
    VoidCallback? onTap,
  }) {
+    final theme = Theme.of(context);
+
    final row = Padding(
-      padding: const EdgeInsets.symmetric(vertical: 4),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      padding: const EdgeInsets.symmetric(vertical: 10),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          Row(
            children: [
              if (leading != null) ...[leading, const SizedBox(width: 8)],
-              Text(label, style: TextStyle(color: Colors.grey[600])),
+              Expanded(
+                child: Text(
+                  label,
+                  style: theme.textTheme.bodySmall?.copyWith(
+                    color: theme.colorScheme.onSurfaceVariant,
+                    fontWeight: FontWeight.w500,
+                  ),
+                ),
+              ),
            ],
          ),
-          Flexible(
-            child: Text(
-              value,
-              style: TextStyle(fontWeight: FontWeight.w500, color: valueColor),
-              overflow: TextOverflow.ellipsis,
+          const SizedBox(height: 4),
+          Text(
+            value,
+            style: theme.textTheme.bodyLarge?.copyWith(
+              color: valueColor,
+              fontWeight: FontWeight.w500,
            ),
          ),
        ],
@@ -379,11 +436,12 @@ class _SettingsScreenState extends State<SettingsScreen> {

    if (onTap != null) {
      return InkWell(
+        borderRadius: BorderRadius.circular(6),
        onTap: onTap,
-        borderRadius: BorderRadius.circular(4),
        child: row,
      );
    }
+
    return row;
  }

@@ -688,7 +746,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
    );
  }

-  _gpxExport(
+  Future<void> _gpxExport(
    GpxExport exporter,
    String name,
    String description,
@@ -728,7 +786,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
    }
  }

-  _buildExportCard(MeshCoreConnector connector) {
+  Widget _buildExportCard(MeshCoreConnector connector) {
    final l10n = context.l10n;
    return Card(
      child: Column(
@@ -808,6 +866,7 @@ class _RadioSettingsDialogState extends State<_RadioSettingsDialog> {
  LoRaSpreadingFactor _spreadingFactor = LoRaSpreadingFactor.sf7;
  LoRaCodingRate _codingRate = LoRaCodingRate.cr4_5;
  final _txPowerController = TextEditingController(text: '20');
+  bool _clientRepeat = false;

  @override
  void initState() {
@@ -857,6 +916,8 @@ class _RadioSettingsDialogState extends State<_RadioSettingsDialog> {
    if (widget.connector.currentTxPower != null) {
      _txPowerController.text = widget.connector.currentTxPower.toString();
    }
+
+    _clientRepeat = widget.connector.clientRepeat ?? false;
  }

  @override
@@ -906,9 +967,29 @@ class _RadioSettingsDialogState extends State<_RadioSettingsDialog> {
      widget.connector.currentCr,
    );

+    // if the client repeat isnt null then we know its supported
+    //otherwise we leave it out of the frame to avoid accidentally enabling
+    final knownRepeat = widget.connector.clientRepeat != null;
+
+    if (knownRepeat) {
+      const validRepeatFreqsKHz = {433000, 869000, 918000};
+      if (_clientRepeat && !validRepeatFreqsKHz.contains(freqHz)) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(l10n.settings_clientRepeatFreqWarning)),
+        );
+        return;
+      }
+    }
+
    try {
      await widget.connector.sendFrame(
-        buildSetRadioParamsFrame(freqHz, bwHz, sf, cr),
+        buildSetRadioParamsFrame(
+          freqHz,
+          bwHz,
+          sf,
+          cr,
+          clientRepeat: knownRepeat ? _clientRepeat : null,
+        ),
      );
      await widget.connector.sendFrame(buildSetRadioTxPowerFrame(txPower));
      await widget.connector.refreshDeviceInfo();
@@ -947,37 +1028,25 @@ class _RadioSettingsDialogState extends State<_RadioSettingsDialog> {
          mainAxisSize: MainAxisSize.min,
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
-            Text(
-              l10n.settings_presets,
-              style: const TextStyle(fontWeight: FontWeight.bold),
-            ),
-            const SizedBox(height: 8),
-            Wrap(
-              spacing: 8,
-              children: [
-                _PresetChip(
-                  label: l10n.settings_preset915Mhz,
-                  onTap: () => _applyPreset(RadioSettings.preset915MHz),
-                ),
-                _PresetChip(
-                  label: l10n.settings_preset868Mhz,
-                  onTap: () => _applyPreset(RadioSettings.preset868MHz),
-                ),
-                _PresetChip(
-                  label: l10n.settings_preset433Mhz,
-                  onTap: () => _applyPreset(RadioSettings.preset433MHz),
-                ),
-                _PresetChip(
-                  label: l10n.settings_longRange,
-                  onTap: () => _applyPreset(RadioSettings.presetLongRange),
-                ),
-                _PresetChip(
-                  label: l10n.settings_fastSpeed,
-                  onTap: () => _applyPreset(RadioSettings.presetFastSpeed),
-                ),
+            DropdownButtonFormField<int>(
+              decoration: InputDecoration(
+                labelText: l10n.settings_presets,
+                border: const OutlineInputBorder(),
+              ),
+              items: [
+                for (var i = 0; i < RadioSettings.presets.length; i++)
+                  DropdownMenuItem(
+                    value: i,
+                    child: Text(RadioSettings.presets[i].$1),
+                  ),
              ],
+              onChanged: (index) {
+                if (index != null) {
+                  _applyPreset(RadioSettings.presets[index].$2);
+                }
+              },
            ),
-            const SizedBox(height: 24),
+            const SizedBox(height: 16),
            TextField(
              controller: _frequencyController,
              decoration: InputDecoration(
@@ -1049,6 +1118,16 @@ class _RadioSettingsDialogState extends State<_RadioSettingsDialog> {
              ),
              keyboardType: TextInputType.number,
            ),
+            if (widget.connector.clientRepeat != null) ...[
+              const SizedBox(height: 16),
+              SwitchListTile(
+                title: Text(l10n.settings_clientRepeat),
+                subtitle: Text(l10n.settings_clientRepeatSubtitle),
+                value: _clientRepeat,
+                onChanged: (value) => setState(() => _clientRepeat = value),
+                contentPadding: EdgeInsets.zero,
+              ),
+            ],
          ],
        ),
      ),
@@ -1062,15 +1141,3 @@ class _RadioSettingsDialogState extends State<_RadioSettingsDialog> {
    );
  }
 }
-
-class _PresetChip extends StatelessWidget {
-  final String label;
-  final VoidCallback onTap;
-
-  const _PresetChip({required this.label, required this.onTap});
-
-  @override
-  Widget build(BuildContext context) {
-    return ActionChip(label: Text(label), onPressed: onTap);
-  }
-}
@@ -5,11 +5,14 @@ import 'package:provider/provider.dart';
 import '../l10n/l10n.dart';
 import '../models/contact.dart';
 import '../models/path_selection.dart';
+import '../models/app_settings.dart';
 import '../connector/meshcore_connector.dart';
 import '../connector/meshcore_protocol.dart';
+import '../services/app_settings_service.dart';
 import '../services/repeater_command_service.dart';
 import '../widgets/path_management_dialog.dart';
 import '../helpers/cayenne_lpp.dart';
+import '../utils/battery_utils.dart';

 class TelemetryScreen extends StatefulWidget {
  final Contact repeater;
@@ -72,9 +75,19 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
  }

  void _handleStatusResponse(Uint8List frame) {
+    final parsedTelemetry = CayenneLpp.parseByChannel(frame);
+    final batteryMv = _extractTelemetryBatteryMillivolts(parsedTelemetry);
+    if (batteryMv != null) {
+      final connector = Provider.of<MeshCoreConnector>(context, listen: false);
+      connector.updateRepeaterBatterySnapshot(
+        widget.repeater.publicKeyHex,
+        batteryMv,
+        source: 'telemetry',
+      );
+    }
    if (!mounted) return;
    setState(() {
-      _parsedTelemetry = CayenneLpp.parseByChannel(frame);
+      _parsedTelemetry = parsedTelemetry;
    });

    ScaffoldMessenger.of(context).showSnackBar(
@@ -181,6 +194,8 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
  Widget build(BuildContext context) {
    final l10n = context.l10n;
    final connector = context.watch<MeshCoreConnector>();
+    final settings = context.watch<AppSettingsService>().settings;
+    final isImperialUnits = settings.unitSystem == UnitSystem.imperial;
    final repeater = _resolveRepeater(connector);
    final isFloodMode = repeater.pathOverride == -1;

@@ -307,6 +322,7 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
                    entry['values'],
                    l10n.telemetry_channelTitle(entry['channel']),
                    entry['channel'],
+                    isImperialUnits,
                  ),
            ],
          ),
@@ -319,6 +335,7 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
    Map<String, dynamic> channelData,
    String title,
    int channel,
+    bool isImperialUnits,
  ) {
    final l10n = context.l10n;
    return Card(
@@ -358,12 +375,12 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
              else if (entry.key == 'temperature' && channel == 1)
                _buildInfoRow(
                  l10n.telemetry_mcuTemperatureLabel,
-                  _temperatureText(entry.value),
+                  _temperatureText(entry.value, isImperialUnits),
                )
              else if (entry.key == 'temperature')
                _buildInfoRow(
                  l10n.telemetry_temperatureLabel,
-                  _temperatureText(entry.value),
+                  _temperatureText(entry.value, isImperialUnits),
                )
              else if (entry.key == 'current' && channel == 1)
                _buildInfoRow(
@@ -405,29 +422,44 @@ class _TelemetryScreenState extends State<TelemetryScreen> {
    );
  }

-  String _batteryText(double? batteryMv) {
+  int? _extractTelemetryBatteryMillivolts(List<Map<String, dynamic>> entries) {
+    for (final entry in entries) {
+      if (entry['channel'] != 1) continue;
+      final values = entry['values'];
+      if (values is! Map<String, dynamic>) continue;
+      final voltage = values['voltage'];
+      if (voltage is num) return (voltage.toDouble() * 1000).round();
+    }
+    return null;
+  }
+
+  String _batteryText(double? telemetryVolts) {
    final l10n = context.l10n;
+    final connector = context.watch<MeshCoreConnector>();
+    final batteryMv =
+        connector.getRepeaterBatteryMillivolts(widget.repeater.publicKeyHex) ??
+        (telemetryVolts == null ? null : (telemetryVolts * 1000).round());
    if (batteryMv == null) return l10n.common_notAvailable;
-    final percent = _batteryPercentFromMv(batteryMv);
-    final volts = batteryMv.toStringAsFixed(2);
+    final chemistry = _batteryChemistry();
+    final percent = estimateBatteryPercentFromMillivolts(batteryMv, chemistry);
+    final volts = (batteryMv / 1000).toStringAsFixed(2);
    return l10n.telemetry_batteryValue(percent, volts);
  }

-  int _batteryPercentFromMv(double millivolts) {
-    const minMv = 2.800;
-    const maxMv = 4.200;
-    if (millivolts <= minMv) return 0;
-    if (millivolts >= maxMv) return 100;
-    return (((millivolts - minMv) * 100) / (maxMv - minMv)).round();
+  String _batteryChemistry() {
+    final settingsService = context.read<AppSettingsService>();
+    return settingsService.batteryChemistryForRepeater(
+      widget.repeater.publicKeyHex,
+    );
  }

-  String _temperatureText(double? tempC) {
+  String _temperatureText(double? tempC, bool isImperialUnits) {
    final l10n = context.l10n;
    if (tempC == null) return l10n.common_notAvailable;
    final tempF = (tempC * 9 / 5) + 32;
-    return l10n.telemetry_temperatureValue(
-      tempC.toStringAsFixed(1),
-      tempF.toStringAsFixed(1),
-    );
+    if (isImperialUnits) {
+      return '${tempF.toStringAsFixed(1)}°F';
+    }
+    return '${tempC.toStringAsFixed(1)}°C';
  }
 }