diff --git a/lib/connector/meshcore_connector.dart b/lib/connector/meshcore_connector.dart
index f74d5241..9b256e29 100644
--- a/lib/connector/meshcore_connector.dart
+++ b/lib/connector/meshcore_connector.dart
@@ -37,6 +37,42 @@ class MeshCoreUuids {
   static const String txCharacteristic = "6e400003-b5a3-f393-e0a9-e50e24dcca9e";
 }
 
+class DirectRepeater {
+  static const int maxAgeMinutes = 30; // Max age for direct repeater info
+  final int pubkeyFirstByte;
+  double snr;
+  DateTime lastUpdated;
+
+  DirectRepeater({
+    required this.pubkeyFirstByte,
+    required this.snr,
+    DateTime? lastUpdated,
+  }) : lastUpdated = lastUpdated ?? DateTime.now();
+
+  void update(double newSNR) {
+    snr = newSNR;
+    lastUpdated = DateTime.now();
+  }
+
+  int get ranking {
+    if (isStale()) {
+      return -1; // Stale repeaters get lowest rank
+    }
+    // Higher SNR gets higher rank and recency within maxAgeMinutes breaks ties.
+    final ageMs =
+        DateTime.now().millisecondsSinceEpoch -
+        lastUpdated.millisecondsSinceEpoch;
+    final maxAgeMs = maxAgeMinutes * 60 * 1000;
+    final recencyScore = (maxAgeMs - ageMs).clamp(0, maxAgeMs);
+    return ((snr - 31.75) * 1000).round() + recencyScore;
+  }
+
+  bool isStale() {
+    return DateTime.now().difference(lastUpdated) >
+        const Duration(minutes: maxAgeMinutes);
+  }
+}
+
 enum MeshCoreConnectionState {
   disconnected,
   scanning,
@@ -95,6 +131,7 @@ class MeshCoreConnector extends ChangeNotifier {
   int? _batteryMillivolts;
   double? _selfLatitude;
   double? _selfLongitude;
+  final List<DirectRepeater> _directRepeaters = List.empty(growable: true);
   bool _isLoadingContacts = false;
   bool _isLoadingChannels = false;
   bool _hasLoadedChannels = false;
@@ -196,6 +233,7 @@ class MeshCoreConnector extends ChangeNotifier {
   String? get selfName => _selfName;
   double? get selfLatitude => _selfLatitude;
   double? get selfLongitude => _selfLongitude;
+  List<DirectRepeater> get directRepeaters => _directRepeaters;
   int? get currentTxPower => _currentTxPower;
   int? get maxTxPower => _maxTxPower;
   int? get currentFreqHz => _currentFreqHz;
@@ -1696,6 +1734,11 @@ class MeshCoreConnector extends ChangeNotifier {
         _isLoadingContacts = true;
         notifyListeners();
         break;
+      case pushCodeNewAdvert:
+        debugPrint('Got New CONTACT');
+        // It's the same format as respCodeContact, so we can reuse the handler
+        _handleContact(frame);
+        break;
       case respCodeContact:
         debugPrint('Got CONTACT');
         _handleContact(frame);
@@ -1740,6 +1783,7 @@ class MeshCoreConnector extends ChangeNotifier {
       case pushCodeStatusResponse:
         break;
       case pushCodeLogRxData:
+        _handleRxData(frame);
         _handleLogRxData(frame);
         break;
       case respCodeChannelInfo:
@@ -2028,6 +2072,80 @@ class MeshCoreConnector extends ChangeNotifier {
     }
   }
 
+  void _handleContactAdvert(Contact contact) {
+    if (listEquals(contact.publicKey, _selfPublicKey)) {
+      return;
+    }
+
+    if (contact.type == advTypeRepeater) {
+      _contactUnreadCount.remove(contact.publicKeyHex);
+      _unreadStore.saveContactUnreadCount(
+        Map<String, int>.from(_contactUnreadCount),
+      );
+    }
+    // Check if this is a new contact
+    final isNewContact = !_knownContactKeys.contains(contact.publicKeyHex);
+    final existingIndex = _contacts.indexWhere(
+      (c) => c.publicKeyHex == contact.publicKeyHex,
+    );
+
+    if (existingIndex >= 0) {
+      final existing = _contacts[existingIndex];
+      final mergedLastMessageAt =
+          existing.lastMessageAt.isAfter(contact.lastMessageAt)
+          ? existing.lastMessageAt
+          : contact.lastMessageAt;
+
+      appLogger.info(
+        'Refreshing contact ${contact.name}: devicePath=${contact.pathLength}, existingOverride=${existing.pathOverride}',
+        tag: 'Connector',
+      );
+
+      // CRITICAL: Preserve user's path override when contact is refreshed from device
+      _contacts[existingIndex] = contact.copyWith(
+        lastMessageAt: mergedLastMessageAt,
+        pathOverride: existing.pathOverride, // Preserve user's path choice
+        pathOverrideBytes: existing.pathOverrideBytes,
+      );
+
+      appLogger.info(
+        'After merge: pathOverride=${_contacts[existingIndex].pathOverride}, devicePath=${_contacts[existingIndex].pathLength}',
+        tag: 'Connector',
+      );
+    } else {
+      _contacts.add(contact);
+      appLogger.info(
+        'Added new contact ${contact.name}: pathLen=${contact.pathLength}',
+        tag: 'Connector',
+      );
+    }
+    _knownContactKeys.add(contact.publicKeyHex);
+    _loadMessagesForContact(contact.publicKeyHex);
+
+    // Add path to history if we have a valid path
+    if (_pathHistoryService != null && contact.pathLength >= 0) {
+      _pathHistoryService!.handlePathUpdated(contact);
+    }
+
+    notifyListeners();
+
+    // Show notification for new contact (advertisement)
+    if (isNewContact && _appSettingsService != null) {
+      final settings = _appSettingsService!.settings;
+      if (settings.notificationsEnabled && settings.notifyOnNewAdvert) {
+        _notificationService.showAdvertNotification(
+          contactName: contact.name,
+          contactType: contact.typeLabel,
+          contactId: contact.publicKeyHex,
+        );
+      }
+    }
+
+    if (!_isLoadingContacts) {
+      unawaited(_persistContacts());
+    }
+  }
+
   Future<void> _persistContacts() async {
     await _contactStore.saveContacts(_contacts);
   }
@@ -3287,7 +3405,11 @@ class MeshCoreConnector extends ChangeNotifier {
 
   void _handleCustomVars(Uint8List frame) {
     final buf = BufferReader(frame.sublist(1));
-    _currentCustomVars = _parseKeyValueString(buf.readString());
+    try {
+      _currentCustomVars = _parseKeyValueString(buf.readString());
+    } catch (e) {
+      appLogger.warn('Malformed custom vars frame: $e', tag: 'Connector');
+    }
   }
 
   void _setState(MeshCoreConnectionState newState) {
@@ -3311,6 +3433,191 @@ class MeshCoreConnector extends ChangeNotifier {
 
     super.dispose();
   }
+
+  void _handleRxData(Uint8List frame) {
+    final packet = BufferReader(frame);
+    double snr = 0.0;
+    int routeType = 0;
+    int payloadType = 0;
+    Uint8List pathBytes = Uint8List(0);
+    Uint8List payload = Uint8List(0);
+    try {
+      packet.skipBytes(1); // Skip frame type byte
+      snr = packet.readInt8() / 4.0;
+      packet.skipBytes(1); // Skip RSSI byte
+      //final rssi = packet.readByte();
+      final header = packet.readByte();
+      routeType = header & 0x03;
+      payloadType = (header >> 2) & 0x0F;
+      //final payloadVer = (header >> 6) & 0x03;
+      final pathLen = packet.readByte();
+      pathBytes = packet.readBytes(pathLen);
+      payload = packet.readBytes(packet.remaining);
+    } catch (e) {
+      appLogger.warn('Malformed RX frame: $e', tag: 'Connector');
+      return;
+    }
+
+    switch (payloadType) {
+      case payloadTypeADVERT:
+        _handlePayloadAdvertReceived(payload, pathBytes, routeType, snr);
+        break;
+      default:
+    }
+  }
+
+  void _handlePayloadAdvertReceived(
+    Uint8List frame,
+    Uint8List path,
+    int routeType,
+    double snr,
+  ) {
+    final advert = BufferReader(frame);
+    double latitude = 0.0;
+    double longitude = 0.0;
+    String name = '';
+    String contactKeyHex = '';
+    Uint8List publicKey = Uint8List(0);
+    int type = 0;
+    int timestamp = 0;
+    bool hasLocation = false;
+    bool hasName = false;
+    try {
+      publicKey = advert.readBytes(32);
+      contactKeyHex = publicKey
+          .map((b) => b.toRadixString(16).padLeft(2, '0'))
+          .join();
+
+      timestamp = advert.readInt32LE();
+      //TODO add signature verification
+      advert.skipBytes(64); // Skip signature for now
+      final flags = advert.readByte();
+      type = flags & 0x0F;
+      hasLocation = (flags & 0x10) != 0;
+      // For future use:
+      //final hasFeature1 = (flags & 0x20) != 0;
+      //final hasFeature2 = (flags & 0x40) != 0;
+      hasName = (flags & 0x80) != 0;
+      if (hasLocation && advert.remaining >= 8) {
+        latitude = advert.readInt32LE() / 1e6;
+        longitude = advert.readInt32LE() / 1e6;
+      }
+      if (hasName && advert.remaining > 0) {
+        name = advert.readString();
+      }
+    } catch (e) {
+      appLogger.warn('Malformed advert frame: $e', tag: 'Connector');
+      return;
+    }
+
+    if (listEquals(publicKey, _selfPublicKey)) {
+      return;
+    }
+
+    // Check if this is a new contact
+    final isNewContact = !_knownContactKeys.contains(contactKeyHex);
+
+    if (isNewContact) {
+      final newContact = Contact(
+        publicKey: publicKey,
+        name: name,
+        type: type,
+        pathLength: path.length,
+        path: Uint8List.fromList(
+          path.reversed.toList(),
+        ), // Store path in reverse for easier use in outgoing messages
+        latitude: latitude,
+        longitude: longitude,
+        lastSeen: DateTime.fromMillisecondsSinceEpoch(timestamp * 1000),
+      );
+      _handleContactAdvert(newContact);
+      _updateDirectRepeater(newContact, snr, path);
+      return;
+    }
+
+    final existingIndex = _contacts.indexWhere(
+      (c) => c.publicKeyHex == contactKeyHex,
+    );
+
+    if (existingIndex >= 0) {
+      final existing = _contacts[existingIndex];
+      final mergedLastMessageAt = existing.lastMessageAt.isAfter(DateTime.now())
+          ? DateTime.now()
+          : existing.lastMessageAt;
+
+      appLogger.info(
+        'Refreshing contact ${existing.name}: devicePath=${existing.pathLength}, existingOverride=${existing.pathOverride}',
+        tag: 'Connector',
+      );
+
+      // CRITICAL: Preserve user's path override when contact is refreshed from device
+      _contacts[existingIndex] = existing.copyWith(
+        latitude: hasLocation ? latitude : existing.latitude,
+        longitude: hasLocation ? longitude : existing.longitude,
+        name: hasName ? name : existing.name,
+        path: Uint8List.fromList(path.reversed.toList()),
+        pathLength: path.length,
+        lastMessageAt: mergedLastMessageAt,
+        lastSeen: DateTime.fromMillisecondsSinceEpoch(timestamp * 1000),
+        pathOverride: existing.pathOverride, // Preserve user's path choice
+        pathOverrideBytes: existing.pathOverrideBytes,
+      );
+
+      // Add path to history if we have a valid path
+      if (_pathHistoryService != null &&
+          _contacts[existingIndex].pathLength >= 0) {
+        _pathHistoryService!.handlePathUpdated(_contacts[existingIndex]);
+      }
+
+      _updateDirectRepeater(_contacts[existingIndex], snr, path);
+
+      appLogger.info(
+        'After merge: pathOverride=${_contacts[existingIndex].pathOverride}, devicePath=${_contacts[existingIndex].pathLength}',
+        tag: 'Connector',
+      );
+    }
+  }
+
+  void _updateDirectRepeater(Contact contact, double snr, Uint8List path) {
+    final pubkeyFirstByte = path.isNotEmpty
+        ? path.last
+        : contact.publicKey.first;
+
+    _directRepeaters.removeWhere((r) => r.isStale());
+
+    //We can use adverts from chat and sensor nodes, but only if the advert has a path to get the last hop.
+    if ((contact.type == advTypeChat || contact.type == advTypeSensor) &&
+        path.isEmpty) {
+      notifyListeners();
+      return;
+    }
+
+    final isTracked = _directRepeaters.where(
+      (r) => r.pubkeyFirstByte == pubkeyFirstByte,
+    );
+
+    final sortedRepeaters = List<DirectRepeater>.from(_directRepeaters)
+      ..sort((a, b) => b.snr.compareTo(a.snr));
+    final weakestRepeater = sortedRepeaters.isNotEmpty
+        ? sortedRepeaters.last
+        : null;
+
+    if (_directRepeaters.length >= 5 &&
+        weakestRepeater != null &&
+        isTracked.isEmpty) {
+      _directRepeaters.remove(weakestRepeater);
+    }
+
+    if (isTracked.isNotEmpty) {
+      final repeater = isTracked.first;
+      repeater.update(snr);
+    } else if (_directRepeaters.length < 5) {
+      _directRepeaters.add(
+        DirectRepeater(pubkeyFirstByte: pubkeyFirstByte, snr: snr),
+      );
+    }
+    notifyListeners();
+  }
 }
 
 const int _phRouteMask = 0x03;
diff --git a/lib/connector/meshcore_protocol.dart b/lib/connector/meshcore_protocol.dart
index ee835781..2933e802 100644
--- a/lib/connector/meshcore_protocol.dart
+++ b/lib/connector/meshcore_protocol.dart
@@ -13,12 +13,22 @@ class BufferReader {
   int readByte() => readBytes(1)[0];
 
   Uint8List readBytes(int count) {
+    if (_pointer + count > _buffer.length) {
+      throw RangeError(
+        'Attempted to read $count bytes at offset $_pointer, but only $remaining bytes remaining in buffer of length ${_buffer.length}',
+      );
+    }
     final data = _buffer.sublist(_pointer, _pointer + count);
     _pointer += count;
     return data;
   }
 
   void skipBytes(int count) {
+    if (_pointer + count > _buffer.length) {
+      throw RangeError(
+        'Attempted to skip $count bytes at offset $_pointer, but only $remaining bytes remaining in buffer of length ${_buffer.length}',
+      );
+    }
     _pointer += count;
   }
 
@@ -151,6 +161,7 @@ const int cmdGetContactByKey = 30;
 const int cmdGetChannel = 31;
 const int cmdSetChannel = 32;
 const int cmdSendTracePath = 36;
+const int cmdSetOtherParams = 38;
 const int cmdGetRadioSettings = 57;
 const int cmdGetTelemetryReq = 39;
 const int cmdGetCustomVar = 40;
@@ -166,7 +177,7 @@ const int reqTypeGetStatus = 0x01;
 const int reqTypeKeepAlive = 0x02;
 const int reqTypeGetTelemetry = 0x03;
 const int reqTypeGetAccessList = 0x05;
-const int reqTypeGetNeighbours = 0x06;
+const int reqTypeGetNeighbors = 0x06;
 
 // Repeater response codes
 const int respServerLoginOk = 0;
@@ -212,6 +223,30 @@ const int advTypeRepeater = 2;
 const int advTypeRoom = 3;
 const int advTypeSensor = 4;
 
+// Payload Types
+const int payloadTypeREQ =
+    0x00; // request (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
+const int payloadTypeRESPONSE =
+    0x01; // response to REQ or ANON_REQ (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
+const int payloadTypeTXTMSG =
+    0x02; // a plain text message (prefixed with dest/src hashes, MAC) (enc data: timestamp, text)
+const int payloadTypeACK = 0x03; // a simple ack
+const int payloadTypeADVERT = 0x04; // a node advertising its Identity
+const int payloadTypeGRPTXT =
+    0x05; // an (unverified) group text message (prefixed with channel hash, MAC) (enc data: timestamp, "name: msg")
+const int payloadTypeGRPDATA =
+    0x06; // an (unverified) group datagram (prefixed with channel hash, MAC) (enc data: timestamp, blob)
+const int payloadTypeANONREQ =
+    0x07; // generic request (prefixed with dest_hash, ephemeral pub_key, MAC) (enc data: ...)
+const int payloadTypePATH =
+    0x08; // returned path (prefixed with dest/src hashes, MAC) (enc data: path, extra)
+const int payloadTypeTRACE = 0x09; // trace a path, collecting SNI for each hop
+const int payloadTypeMULTIPART = 0x0A; // packet is one of a set of packets
+const int payloadTypeCONTROL = 0x0B; // a control/discovery packet
+//...
+const int payloadTypeRawCustom =
+    0x0F; // custom packet as raw bytes, for applications with custom encryption, payloads, etc
+
 // Sizes
 const int pubKeySize = 32;
 const int maxPathSize = 64;
@@ -788,3 +823,22 @@ Uint8List buildZeroHopContact(Uint8List pubKey) {
   writer.writeBytes(pubKey);
   return writer.toBytes();
 }
+
+// Build CMD_SET_OTHER_PARAMS frame
+// Format: [cmd][allowAutoAddContacts][allowTelemetryFlags][advertLocationPolicy][multiAcks]
+Uint8List buildSetOtherParamsFrame(
+  bool allowAutoAddContacts,
+  int allowTelemetryFlags,
+  int advertLocationPolicy,
+  int multiAcks,
+) {
+  final writer = BufferWriter();
+  writer.writeByte(cmdSetOtherParams);
+  writer.writeByte(
+    allowAutoAddContacts ? 0x00 : 0x01,
+  ); // Allow Auto Add Contacts
+  writer.writeByte(allowTelemetryFlags); // Allow Telemetry Flags
+  writer.writeByte(advertLocationPolicy); // Advertisement Location Policy
+  writer.writeByte(multiAcks); // Multi Acknowledgements
+  return writer.toBytes();
+}
diff --git a/lib/helpers/cayenne_lpp.dart b/lib/helpers/cayenne_lpp.dart
index bf9b8e77..07909e63 100644
--- a/lib/helpers/cayenne_lpp.dart
+++ b/lib/helpers/cayenne_lpp.dart
@@ -1,4 +1,6 @@
 import 'dart:typed_data';
+import 'package:meshcore_open/utils/app_logger.dart';
+
 import '../connector/meshcore_protocol.dart';
 
 class CayenneLpp {
@@ -84,180 +86,192 @@ class CayenneLpp {
   static List<Map<String, dynamic>> parse(Uint8List bytes) {
     final buffer = BufferReader(bytes);
     final telemetry = <Map<String, dynamic>>[];
+    try {
+      while (buffer.remaining >= 2) {
+        final channel = buffer.readUInt8();
+        final type = buffer.readUInt8();
 
-    while (buffer.remaining >= 2) {
-      final channel = buffer.readUInt8();
-      final type = buffer.readUInt8();
+        if (channel == 0 && type == 0) {
+          break;
+        }
 
-      if (channel == 0 && type == 0) {
-        break;
-      }
-
-      switch (type) {
-        case lppGenericSensor:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt32BE(),
-          });
-          break;
-        case lppLuminosity:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt16BE(),
-          });
-          break;
-        case lppPresence:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt8(),
-          });
-          break;
-        case lppTemperature:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readInt16BE() / 10,
-          });
-          break;
-        case lppRelativeHumidity:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt8() / 2,
-          });
-          break;
-        case lppBarometricPressure:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt16BE() / 10,
-          });
-          break;
-        case lppVoltage:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readInt16BE() / 100,
-          });
-          break;
-        case lppCurrent:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readInt16BE() / 1000,
-          });
-          break;
-        case lppPercentage:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt8(),
-          });
-          break;
-        case lppConcentration:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt16BE(),
-          });
-          break;
-        case lppPower:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': buffer.readUInt16BE(),
-          });
-          break;
-        case lppGps:
-          telemetry.add({
-            'channel': channel,
-            'type': type,
-            'value': {
-              'latitude': buffer.readInt24BE() / 10000,
-              'longitude': buffer.readInt24BE() / 10000,
-              'altitude': buffer.readInt24BE() / 100,
-            },
-          });
-          break;
-        default:
-          return telemetry;
+        switch (type) {
+          case lppGenericSensor:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt32BE(),
+            });
+            break;
+          case lppLuminosity:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt16BE(),
+            });
+            break;
+          case lppPresence:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt8(),
+            });
+            break;
+          case lppTemperature:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readInt16BE() / 10,
+            });
+            break;
+          case lppRelativeHumidity:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt8() / 2,
+            });
+            break;
+          case lppBarometricPressure:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt16BE() / 10,
+            });
+            break;
+          case lppVoltage:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readInt16BE() / 100,
+            });
+            break;
+          case lppCurrent:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readInt16BE() / 1000,
+            });
+            break;
+          case lppPercentage:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt8(),
+            });
+            break;
+          case lppConcentration:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt16BE(),
+            });
+            break;
+          case lppPower:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': buffer.readUInt16BE(),
+            });
+            break;
+          case lppGps:
+            telemetry.add({
+              'channel': channel,
+              'type': type,
+              'value': {
+                'latitude': buffer.readInt24BE() / 10000,
+                'longitude': buffer.readInt24BE() / 10000,
+                'altitude': buffer.readInt24BE() / 100,
+              },
+            });
+            break;
+          default:
+            return telemetry;
+        }
       }
+      return telemetry;
+    } catch (e) {
+      // Handle parsing errors, possibly due to malformed data
+      appLogger.error('Error parsing Cayenne LPP data: $e');
+      // Return any telemetry parsed so far to preserve partial data
+      return telemetry;
     }
-
-    return telemetry;
   }
 
   static List<Map<String, dynamic>> parseByChannel(Uint8List bytes) {
     final buffer = BufferReader(bytes);
     final Map<int, Map<String, dynamic>> channels = {};
+    try {
+      while (buffer.remaining >= 2) {
+        final channel = buffer.readUInt8();
+        final type = buffer.readUInt8();
 
-    while (buffer.remaining >= 2) {
-      final channel = buffer.readUInt8();
-      final type = buffer.readUInt8();
+        // Optional: stop on padding (00 00)
+        if (channel == 0 && type == 0) {
+          break;
+        }
 
-      // Optional: stop on padding (00 00)
-      if (channel == 0 && type == 0) {
-        break;
+        final channelData = channels.putIfAbsent(
+          channel,
+          () => {'channel': channel, 'values': <String, dynamic>{}},
+        );
+
+        switch (type) {
+          case lppGenericSensor:
+            channelData['values']['generic'] = buffer.readUInt32BE();
+            break;
+          case lppLuminosity:
+            channelData['values']['luminosity'] = buffer.readUInt16BE();
+            break;
+          case lppPresence:
+            channelData['values']['presence'] = buffer.readUInt8() != 0;
+            break;
+          case lppTemperature:
+            channelData['values']['temperature'] = buffer.readInt16BE() / 10.0;
+            break;
+          case lppRelativeHumidity:
+            channelData['values']['humidity'] = buffer.readUInt8() / 2.0;
+            break;
+          case lppBarometricPressure:
+            channelData['values']['pressure'] = buffer.readUInt16BE() / 10.0;
+            break;
+          case lppVoltage:
+            channelData['values']['voltage'] = buffer.readInt16BE() / 100.0;
+            break;
+          case lppCurrent:
+            channelData['values']['current'] = buffer.readInt16BE() / 1000.0;
+            break;
+          case lppPercentage:
+            channelData['values']['percentage'] = buffer.readUInt8();
+            break;
+          case lppConcentration:
+            channelData['values']['concentration'] = buffer.readUInt16BE();
+            break;
+          case lppPower:
+            channelData['values']['power'] = buffer.readUInt16BE();
+            break;
+          case lppGps:
+            channelData['values']['gps'] = {
+              'latitude': buffer.readInt24BE() / 10000.0,
+              'longitude': buffer.readInt24BE() / 10000.0,
+              'altitude': buffer.readInt24BE() / 100.0,
+            };
+            break;
+          // Add more types as needed...
+          default:
+            //Stopped parsing to avoid misalignment
+            return channels.values.toList();
+        }
       }
 
-      final channelData = channels.putIfAbsent(
-        channel,
-        () => {'channel': channel, 'values': <String, dynamic>{}},
-      );
-
-      switch (type) {
-        case lppGenericSensor:
-          channelData['values']['generic'] = buffer.readUInt32BE();
-          break;
-        case lppLuminosity:
-          channelData['values']['luminosity'] = buffer.readUInt16BE();
-          break;
-        case lppPresence:
-          channelData['values']['presence'] = buffer.readUInt8() != 0;
-          break;
-        case lppTemperature:
-          channelData['values']['temperature'] = buffer.readInt16BE() / 10.0;
-          break;
-        case lppRelativeHumidity:
-          channelData['values']['humidity'] = buffer.readUInt8() / 2.0;
-          break;
-        case lppBarometricPressure:
-          channelData['values']['pressure'] = buffer.readUInt16BE() / 10.0;
-          break;
-        case lppVoltage:
-          channelData['values']['voltage'] = buffer.readInt16BE() / 100.0;
-          break;
-        case lppCurrent:
-          channelData['values']['current'] = buffer.readInt16BE() / 1000.0;
-          break;
-        case lppPercentage:
-          channelData['values']['percentage'] = buffer.readUInt8();
-          break;
-        case lppConcentration:
-          channelData['values']['concentration'] = buffer.readUInt16BE();
-          break;
-        case lppPower:
-          channelData['values']['power'] = buffer.readUInt16BE();
-          break;
-        case lppGps:
-          channelData['values']['gps'] = {
-            'latitude': buffer.readInt24BE() / 10000.0,
-            'longitude': buffer.readInt24BE() / 10000.0,
-            'altitude': buffer.readInt24BE() / 100.0,
-          };
-          break;
-        // Add more types as needed...
-        default:
-          // Unknown type: skip or handle error?
-          continue;
-      }
+      final List<Map<String, dynamic>> channelsOut = channels.values.toList();
+      channelsOut.sort((a, b) => a['channel'].compareTo(b['channel']));
+      return channelsOut;
+    } catch (e) {
+      // Handle parsing errors, possibly due to malformed data
+      appLogger.error('Error parsing Cayenne LPP data: $e');
+      return <
+        Map<String, dynamic>
+      >[]; // Return an empty list on error to avoid crashing the app
     }
-
-    final List<Map<String, dynamic>> channelsOut = channels.values.toList();
-    channelsOut.sort((a, b) => a['channel'].compareTo(b['channel']));
-    return channelsOut;
   }
 }
diff --git a/lib/l10n/app_bg.arb b/lib/l10n/app_bg.arb
index 567c74c6..b6f4301e 100644
--- a/lib/l10n/app_bg.arb
+++ b/lib/l10n/app_bg.arb
@@ -1351,12 +1351,12 @@
       }
     }
   },
-  "repeater_neighboursSubtitle": "Преглед на съседни възли с нулев скок.",
-  "repeater_neighbours": "Съседи",
+  "repeater_neighborsSubtitle": "Преглед на съседни възли с нулев скок.",
+  "repeater_neighbors": "Съседи",
   "neighbors_receivedData": "Получени данни за съседи",
   "neighbors_requestTimedOut": "Съседите поискат изтичане на време.",
   "neighbors_errorLoading": "Грешка при зареждане на съседи: {error}",
-  "neighbors_repeatersNeighbours": "Повторители Съседи",
+  "neighbors_repeatersNeighbors": "Повторители Съседи",
   "neighbors_noData": "Няма налични данни за съседи.",
   "channels_createPrivateChannel": "Създай Частен Канал",
   "channels_joinPrivateChannel": "Присъедини се към Частен Канал",
@@ -1594,6 +1594,9 @@
   "scanner_bluetoothOff": "Bluetooth е изключен.",
   "scanner_enableBluetooth": "Активирайте Bluetooth",
   "scanner_bluetoothOffMessage": "Моля, активирайте Bluetooth, за да сканирате за устройства.",
+  "snrIndicator_lastSeen": "Последно видян",
+  "snrIndicator_nearByRepeaters": "Близки повтарящи се устройства",
+  "chat_ShowAllPaths": "Покажи всички пътища",
   "settings_clientRepeatSubtitle": "Позволете на това устройство да предава пакети към мрежата за други устройства.",
   "settings_clientRepeatFreqWarning": "За повторение извън мрежата са необходими честоти от 433, 869 или 918 MHz.",
   "settings_clientRepeat": "Без електричество – повторение"
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index 7aba89b1..077c3989 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -1351,12 +1351,12 @@
       }
     }
   },
-  "repeater_neighbours": "Nachbarn",
-  "repeater_neighboursSubtitle": "Anzahl der Hop-Nachbarn anzeigen.",
+  "repeater_neighbors": "Nachbarn",
+  "repeater_neighborsSubtitle": "Anzahl der Hop-Nachbarn anzeigen.",
   "neighbors_receivedData": "Empfangene Nachbarsdaten",
   "neighbors_requestTimedOut": "Anfrage durch Timeout fehlgeschlagen.",
   "neighbors_errorLoading": "Fehler beim Laden der Nachbarn: {error}",
-  "neighbors_repeatersNeighbours": "Nachbarn",
+  "neighbors_repeatersNeighbors": "Nachbarn",
   "neighbors_noData": "Keine Nachbarsdaten verfügbar.",
   "channels_joinPrivateChannel": "Treten Sie einem privaten Kanal bei",
   "channels_joinPrivateChannelDesc": "Manuelle Eingabe eines geheimen Schlüssels.",
@@ -1622,6 +1622,9 @@
   "scanner_bluetoothOffMessage": "Bitte aktivieren Sie Bluetooth, um nach Geräten zu suchen.",
   "scanner_bluetoothOff": "Bluetooth ist deaktiviert.",
   "scanner_enableBluetooth": "Bluetooth aktivieren",
+  "snrIndicator_lastSeen": "Zuletzt gesehen",
+  "snrIndicator_nearByRepeaters": "In der Nähe befindliche Repeater",
+  "chat_ShowAllPaths": "Alle Pfade anzeigen",
   "settings_clientRepeat": "Wiederholung, ohne Stromanschluss",
   "settings_clientRepeatFreqWarning": "Die Kommunikation ohne Stromversorgung erfordert Frequenzen von 433, 869 oder 918 MHz.",
   "settings_clientRepeatSubtitle": "Ermöglichen Sie diesem Gerät, Mesh-Pakete für andere zu wiederholen."
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index cfd63300..bf49d7ef 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -558,6 +558,7 @@
   },
   "debugFrame_hexDump": "Hex Dump:",
   "chat_pathManagement": "Path Management",
+  "chat_ShowAllPaths": "Show all paths",
   "chat_routingMode": "Routing mode",
   "chat_autoUseSavedPath": "Auto (use saved path)",
   "chat_forceFloodMode": "Force Flood Mode",
@@ -905,8 +906,8 @@
   "repeater_telemetrySubtitle": "View telemetry of sensors and system stats",
   "repeater_cli": "CLI",
   "repeater_cliSubtitle": "Send commands to the repeater",
-  "repeater_neighbours": "Neighbors",
-  "repeater_neighboursSubtitle": "View zero hop neighbors.",
+  "repeater_neighbors": "Neighbors",
+  "repeater_neighborsSubtitle": "View zero hop neighbors.",
   "repeater_settings": "Settings",
   "repeater_settingsSubtitle": "Configure repeater parameters",
   "repeater_statusTitle": "Repeater Status",
@@ -1266,8 +1267,8 @@
       }
     }
   },
-  "neighbors_receivedData": "Received Neighbours Data",
-  "neighbors_requestTimedOut": "Neighbours request timed out.",
+  "neighbors_receivedData": "Received Neighbors Data",
+  "neighbors_requestTimedOut": "Neighbors request timed out.",
   "neighbors_errorLoading": "Error loading neighbors: {error}",
   "@neighbors_errorLoading": {
     "placeholders": {
@@ -1276,8 +1277,8 @@
       }
     }
   },
-  "neighbors_repeatersNeighbours": "Repeaters Neighbours",
-  "neighbors_noData": "No neighbours data available.",
+  "neighbors_repeatersNeighbors": "Repeaters Neighbors",
+  "neighbors_noData": "No neighbors data available.",
   "neighbors_unknownContact": "Unknown {pubkey}",
   "@neighbors_unknownContact": {
     "placeholders": {
@@ -1624,5 +1625,7 @@
   "settings_gpxExportChat": "Companion locations",
   "settings_gpxExportAllContacts": "All contacts locations",
   "settings_gpxExportShareText": "Map data exported from meshcore-open",
-  "settings_gpxExportShareSubject": "meshcore-open GPX map data export"
+  "settings_gpxExportShareSubject": "meshcore-open GPX map data export",
+  "snrIndicator_nearByRepeaters": "Nearby Repeaters",
+  "snrIndicator_lastSeen": "Last seen"
 }
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index 4250a6f6..1896b4f3 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -1351,12 +1351,12 @@
       }
     }
   },
-  "repeater_neighbours": "Vecinos",
-  "repeater_neighboursSubtitle": "Ver vecinos de salto cero.",
+  "repeater_neighbors": "Vecinos",
+  "repeater_neighborsSubtitle": "Ver vecinos de salto cero.",
   "neighbors_receivedData": "Recibidas Datos de Vecinos",
   "neighbors_requestTimedOut": "Los vecinos solicitan que se desconecte.",
   "neighbors_errorLoading": "Error al cargar vecinos: {error}",
-  "neighbors_repeatersNeighbours": "Repetidores Vecinos",
+  "neighbors_repeatersNeighbors": "Repetidores Vecinos",
   "neighbors_noData": "No hay datos de vecinos disponibles.",
   "channels_joinPrivateChannel": "Únete a un Canal Privado",
   "channels_createPrivateChannel": "Crear un Canal Privado",
@@ -1622,6 +1622,9 @@
   "scanner_bluetoothOffMessage": "Por favor, active el Bluetooth para escanear dispositivos.",
   "scanner_bluetoothOff": "Bluetooth está desactivado.",
   "scanner_enableBluetooth": "Habilitar Bluetooth",
+  "snrIndicator_nearByRepeaters": "Repetidores cercanos",
+  "snrIndicator_lastSeen": "Visto por última vez",
+  "chat_ShowAllPaths": "Mostrar todos los caminos",
   "settings_clientRepeatFreqWarning": "Para la comunicación fuera de la red, se requiere una frecuencia de 433, 869 o 918 MHz.",
   "settings_clientRepeat": "Repetir sin conexión",
   "settings_clientRepeatSubtitle": "Permita que este dispositivo repita los paquetes de red para otros usuarios."
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index 56d4a410..d1befced 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -1351,12 +1351,12 @@
       }
     }
   },
-  "repeater_neighbours": "Voisins",
-  "repeater_neighboursSubtitle": "Afficher les voisins de saut nuls.",
+  "repeater_neighbors": "Voisins",
+  "repeater_neighborsSubtitle": "Afficher les voisins de saut nuls.",
   "neighbors_receivedData": "Données des voisins reçues",
   "neighbors_requestTimedOut": "Les voisins demandent un délai.",
   "neighbors_errorLoading": "Erreur lors du chargement des voisins : {error}",
-  "neighbors_repeatersNeighbours": "Répéteurs Voisins",
+  "neighbors_repeatersNeighbors": "Répéteurs Voisins",
   "neighbors_noData": "Aucune donnée concernant les voisins disponible.",
   "channels_createPrivateChannelDesc": "Sécurisé avec une clé secrète.",
   "channels_joinPrivateChannel": "Rejoindre un Canal Privé",
@@ -1594,6 +1594,9 @@
   "scanner_bluetoothOffMessage": "Veuillez activer le Bluetooth pour rechercher des appareils.",
   "scanner_bluetoothOff": "Le Bluetooth est désactivé.",
   "scanner_enableBluetooth": "Activer le Bluetooth",
+  "snrIndicator_lastSeen": "Dernière fois vu",
+  "snrIndicator_nearByRepeaters": "Répéteurs à proximité",
+  "chat_ShowAllPaths": "Afficher tous les chemins",
   "settings_clientRepeatFreqWarning": "Pour les transmissions hors réseau, il est nécessaire d'utiliser les fréquences de 433, 869 ou 918 MHz.",
   "settings_clientRepeatSubtitle": "Permettez à cet appareil de répéter les paquets de données pour les autres.",
   "settings_clientRepeat": "Répétition hors réseau"
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index 239c7659..22371baf 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -1351,12 +1351,12 @@
       }
     }
   },
-  "repeater_neighbours": "Vicini",
-  "repeater_neighboursSubtitle": "Visualizza vicini di salto pari a zero.",
+  "repeater_neighbors": "Vicini",
+  "repeater_neighborsSubtitle": "Visualizza vicini di salto pari a zero.",
   "neighbors_receivedData": "Ricevute dati vicini",
   "neighbors_requestTimedOut": "I vicini richiedono un timeout.",
   "neighbors_errorLoading": "Errore nel caricamento dei vicini: {error}",
-  "neighbors_repeatersNeighbours": "Ripetitori Vicini",
+  "neighbors_repeatersNeighbors": "Ripetitori Vicini",
   "neighbors_noData": "Nessun dato sugli vicini disponibile.",
   "channels_createPrivateChannel": "Crea un Canale Privato",
   "channels_createPrivateChannelDesc": "Protetta con una chiave segreta.",
@@ -1594,6 +1594,9 @@
   "scanner_bluetoothOff": "Il Bluetooth è disattivato.",
   "scanner_bluetoothOffMessage": "Si prega di attivare il Bluetooth per effettuare la scansione dei dispositivi.",
   "scanner_enableBluetooth": "Abilita il Bluetooth",
+  "snrIndicator_nearByRepeaters": "Ripetitori vicini",
+  "snrIndicator_lastSeen": "Ultimo accesso",
+  "chat_ShowAllPaths": "Mostra tutti i percorsi",
   "settings_clientRepeat": "Ripetizione \"fuori dalla rete\"",
   "settings_clientRepeatFreqWarning": "Per la comunicazione fuori rete, è necessario utilizzare frequenze di 433, 869 o 918 MHz.",
   "settings_clientRepeatSubtitle": "Permetti a questo dispositivo di ripetere i pacchetti di rete per gli altri."
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index 7235e90b..2bcda786 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -2032,6 +2032,12 @@ abstract class AppLocalizations {
   /// **'Path Management'**
   String get chat_pathManagement;
 
+  /// No description provided for @chat_ShowAllPaths.
+  ///
+  /// In en, this message translates to:
+  /// **'Show all paths'**
+  String get chat_ShowAllPaths;
+
   /// No description provided for @chat_routingMode.
   ///
   /// In en, this message translates to:
@@ -3027,17 +3033,17 @@ abstract class AppLocalizations {
   /// **'Send commands to the repeater'**
   String get repeater_cliSubtitle;
 
-  /// No description provided for @repeater_neighbours.
+  /// No description provided for @repeater_neighbors.
   ///
   /// In en, this message translates to:
   /// **'Neighbors'**
-  String get repeater_neighbours;
+  String get repeater_neighbors;
 
-  /// No description provided for @repeater_neighboursSubtitle.
+  /// No description provided for @repeater_neighborsSubtitle.
   ///
   /// In en, this message translates to:
   /// **'View zero hop neighbors.'**
-  String get repeater_neighboursSubtitle;
+  String get repeater_neighborsSubtitle;
 
   /// No description provided for @repeater_settings.
   ///
@@ -4181,13 +4187,13 @@ abstract class AppLocalizations {
   /// No description provided for @neighbors_receivedData.
   ///
   /// In en, this message translates to:
-  /// **'Received Neighbours Data'**
+  /// **'Received Neighbors Data'**
   String get neighbors_receivedData;
 
   /// No description provided for @neighbors_requestTimedOut.
   ///
   /// In en, this message translates to:
-  /// **'Neighbours request timed out.'**
+  /// **'Neighbors request timed out.'**
   String get neighbors_requestTimedOut;
 
   /// No description provided for @neighbors_errorLoading.
@@ -4196,16 +4202,16 @@ abstract class AppLocalizations {
   /// **'Error loading neighbors: {error}'**
   String neighbors_errorLoading(String error);
 
-  /// No description provided for @neighbors_repeatersNeighbours.
+  /// No description provided for @neighbors_repeatersNeighbors.
   ///
   /// In en, this message translates to:
-  /// **'Repeaters Neighbours'**
-  String get neighbors_repeatersNeighbours;
+  /// **'Repeaters Neighbors'**
+  String get neighbors_repeatersNeighbors;
 
   /// No description provided for @neighbors_noData.
   ///
   /// In en, this message translates to:
-  /// **'No neighbours data available.'**
+  /// **'No neighbors data available.'**
   String get neighbors_noData;
 
   /// No description provided for @neighbors_unknownContact.
@@ -5023,6 +5029,18 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'meshcore-open GPX map data export'**
   String get settings_gpxExportShareSubject;
+
+  /// No description provided for @snrIndicator_nearByRepeaters.
+  ///
+  /// In en, this message translates to:
+  /// **'Nearby Repeaters'**
+  String get snrIndicator_nearByRepeaters;
+
+  /// No description provided for @snrIndicator_lastSeen.
+  ///
+  /// In en, this message translates to:
+  /// **'Last seen'**
+  String get snrIndicator_lastSeen;
 }
 
 class _AppLocalizationsDelegate
diff --git a/lib/l10n/app_localizations_bg.dart b/lib/l10n/app_localizations_bg.dart
index fdf9ec7e..137d48a5 100644
--- a/lib/l10n/app_localizations_bg.dart
+++ b/lib/l10n/app_localizations_bg.dart
@@ -1080,6 +1080,9 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get chat_pathManagement => 'Управление на пътища';
 
+  @override
+  String get chat_ShowAllPaths => 'Покажи всички пътища';
+
   @override
   String get chat_routingMode => 'Режим на маршрутизиране';
 
@@ -1677,10 +1680,10 @@ class AppLocalizationsBg extends AppLocalizations {
   String get repeater_cliSubtitle => 'Изпрати команди към ретранслатора';
 
   @override
-  String get repeater_neighbours => 'Съседи';
+  String get repeater_neighbors => 'Съседи';
 
   @override
-  String get repeater_neighboursSubtitle =>
+  String get repeater_neighborsSubtitle =>
       'Преглед на съседни възли с нулев скок.';
 
   @override
@@ -2380,7 +2383,7 @@ class AppLocalizationsBg extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Повторители Съседи';
+  String get neighbors_repeatersNeighbors => 'Повторители Съседи';
 
   @override
   String get neighbors_noData => 'Няма налични данни за съседи.';
@@ -2890,4 +2893,10 @@ class AppLocalizationsBg extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open износ на данни за карта в формат GPX';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Близки повтарящи се устройства';
+
+  @override
+  String get snrIndicator_lastSeen => 'Последно видян';
 }
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index c0fc4c86..927ac488 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -1080,6 +1080,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get chat_pathManagement => 'Pfadverwaltung';
 
+  @override
+  String get chat_ShowAllPaths => 'Alle Pfade anzeigen';
+
   @override
   String get chat_routingMode => 'Routenmodus';
 
@@ -1676,10 +1679,10 @@ class AppLocalizationsDe extends AppLocalizations {
   String get repeater_cliSubtitle => 'Sende Befehle an den Repeater';
 
   @override
-  String get repeater_neighbours => 'Nachbarn';
+  String get repeater_neighbors => 'Nachbarn';
 
   @override
-  String get repeater_neighboursSubtitle => 'Anzahl der Hop-Nachbarn anzeigen.';
+  String get repeater_neighborsSubtitle => 'Anzahl der Hop-Nachbarn anzeigen.';
 
   @override
   String get repeater_settings => 'Einstellungen';
@@ -2382,7 +2385,7 @@ class AppLocalizationsDe extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Nachbarn';
+  String get neighbors_repeatersNeighbors => 'Nachbarn';
 
   @override
   String get neighbors_noData => 'Keine Nachbarsdaten verfügbar.';
@@ -2898,4 +2901,10 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'GPX-Kartendaten aus meshcore-open exportieren';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'In der Nähe befindliche Repeater';
+
+  @override
+  String get snrIndicator_lastSeen => 'Zuletzt gesehen';
 }
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index 4f0bed12..ef7c0c34 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -1065,6 +1065,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get chat_pathManagement => 'Path Management';
 
+  @override
+  String get chat_ShowAllPaths => 'Show all paths';
+
   @override
   String get chat_routingMode => 'Routing mode';
 
@@ -1650,10 +1653,10 @@ class AppLocalizationsEn extends AppLocalizations {
   String get repeater_cliSubtitle => 'Send commands to the repeater';
 
   @override
-  String get repeater_neighbours => 'Neighbors';
+  String get repeater_neighbors => 'Neighbors';
 
   @override
-  String get repeater_neighboursSubtitle => 'View zero hop neighbors.';
+  String get repeater_neighborsSubtitle => 'View zero hop neighbors.';
 
   @override
   String get repeater_settings => 'Settings';
@@ -2329,10 +2332,10 @@ class AppLocalizationsEn extends AppLocalizations {
   }
 
   @override
-  String get neighbors_receivedData => 'Received Neighbours Data';
+  String get neighbors_receivedData => 'Received Neighbors Data';
 
   @override
-  String get neighbors_requestTimedOut => 'Neighbours request timed out.';
+  String get neighbors_requestTimedOut => 'Neighbors request timed out.';
 
   @override
   String neighbors_errorLoading(String error) {
@@ -2340,10 +2343,10 @@ class AppLocalizationsEn extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Repeaters Neighbours';
+  String get neighbors_repeatersNeighbors => 'Repeaters Neighbors';
 
   @override
-  String get neighbors_noData => 'No neighbours data available.';
+  String get neighbors_noData => 'No neighbors data available.';
 
   @override
   String neighbors_unknownContact(String pubkey) {
@@ -2845,4 +2848,10 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open GPX map data export';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Nearby Repeaters';
+
+  @override
+  String get snrIndicator_lastSeen => 'Last seen';
 }
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
index f56e4e4a..f72196db 100644
--- a/lib/l10n/app_localizations_es.dart
+++ b/lib/l10n/app_localizations_es.dart
@@ -1079,6 +1079,9 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get chat_pathManagement => 'Gestión de Rutas';
 
+  @override
+  String get chat_ShowAllPaths => 'Mostrar todos los caminos';
+
   @override
   String get chat_routingMode => 'Modo de enrutamiento';
 
@@ -1674,10 +1677,10 @@ class AppLocalizationsEs extends AppLocalizations {
   String get repeater_cliSubtitle => 'Enviar comandos al repetidor';
 
   @override
-  String get repeater_neighbours => 'Vecinos';
+  String get repeater_neighbors => 'Vecinos';
 
   @override
-  String get repeater_neighboursSubtitle => 'Ver vecinos de salto cero.';
+  String get repeater_neighborsSubtitle => 'Ver vecinos de salto cero.';
 
   @override
   String get repeater_settings => 'Configuración';
@@ -2376,7 +2379,7 @@ class AppLocalizationsEs extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Repetidores Vecinos';
+  String get neighbors_repeatersNeighbors => 'Repetidores Vecinos';
 
   @override
   String get neighbors_noData => 'No hay datos de vecinos disponibles.';
@@ -2889,4 +2892,10 @@ class AppLocalizationsEs extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open exportación de datos de mapa GPX';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Repetidores cercanos';
+
+  @override
+  String get snrIndicator_lastSeen => 'Visto por última vez';
 }
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index e1325dae..89785685 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -1082,6 +1082,9 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get chat_pathManagement => 'Gestion des chemins';
 
+  @override
+  String get chat_ShowAllPaths => 'Afficher tous les chemins';
+
   @override
   String get chat_routingMode => 'Mode de routage';
 
@@ -1682,11 +1685,10 @@ class AppLocalizationsFr extends AppLocalizations {
   String get repeater_cliSubtitle => 'Envoyer des commandes au répéteur';
 
   @override
-  String get repeater_neighbours => 'Voisins';
+  String get repeater_neighbors => 'Voisins';
 
   @override
-  String get repeater_neighboursSubtitle =>
-      'Afficher les voisins de saut nuls.';
+  String get repeater_neighborsSubtitle => 'Afficher les voisins de saut nuls.';
 
   @override
   String get repeater_settings => 'Paramètres';
@@ -2391,7 +2393,7 @@ class AppLocalizationsFr extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Répéteurs Voisins';
+  String get neighbors_repeatersNeighbors => 'Répéteurs Voisins';
 
   @override
   String get neighbors_noData =>
@@ -2913,4 +2915,10 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open exporter les données de carte GPX';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Répéteurs à proximité';
+
+  @override
+  String get snrIndicator_lastSeen => 'Dernière fois vu';
 }
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
index 15d5354d..a2b790f6 100644
--- a/lib/l10n/app_localizations_it.dart
+++ b/lib/l10n/app_localizations_it.dart
@@ -1077,6 +1077,9 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get chat_pathManagement => 'Gestione Percorsi';
 
+  @override
+  String get chat_ShowAllPaths => 'Mostra tutti i percorsi';
+
   @override
   String get chat_routingMode => 'Modalità di routing';
 
@@ -1672,10 +1675,10 @@ class AppLocalizationsIt extends AppLocalizations {
   String get repeater_cliSubtitle => 'Invia comandi al ripetitore';
 
   @override
-  String get repeater_neighbours => 'Vicini';
+  String get repeater_neighbors => 'Vicini';
 
   @override
-  String get repeater_neighboursSubtitle =>
+  String get repeater_neighborsSubtitle =>
       'Visualizza vicini di salto pari a zero.';
 
   @override
@@ -2376,7 +2379,7 @@ class AppLocalizationsIt extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Ripetitori Vicini';
+  String get neighbors_repeatersNeighbors => 'Ripetitori Vicini';
 
   @override
   String get neighbors_noData => 'Nessun dato sugli vicini disponibile.';
@@ -2893,4 +2896,10 @@ class AppLocalizationsIt extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open esportazione dati mappa GPX';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Ripetitori vicini';
+
+  @override
+  String get snrIndicator_lastSeen => 'Ultimo accesso';
 }
diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart
index 17b3bce1..a958e795 100644
--- a/lib/l10n/app_localizations_nl.dart
+++ b/lib/l10n/app_localizations_nl.dart
@@ -1074,6 +1074,9 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get chat_pathManagement => 'Beheer van Paden';
 
+  @override
+  String get chat_ShowAllPaths => 'Toon alle paden';
+
   @override
   String get chat_routingMode => 'Routeerwijze';
 
@@ -1668,10 +1671,10 @@ class AppLocalizationsNl extends AppLocalizations {
   String get repeater_cliSubtitle => 'Verzend commando\'s naar de repeater';
 
   @override
-  String get repeater_neighbours => 'Buren';
+  String get repeater_neighbors => 'Buren';
 
   @override
-  String get repeater_neighboursSubtitle => 'Bekijk nul hops buren.';
+  String get repeater_neighborsSubtitle => 'Bekijk nul hops buren.';
 
   @override
   String get repeater_settings => 'Instellingen';
@@ -2367,7 +2370,7 @@ class AppLocalizationsNl extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Herhalingen Buren';
+  String get neighbors_repeatersNeighbors => 'Herhalingen Buren';
 
   @override
   String get neighbors_noData => 'Geen gegevens van buren beschikbaar.';
@@ -2881,4 +2884,10 @@ class AppLocalizationsNl extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open GPX kaartgegevens exporteren';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Nabije herhalingseenheden';
+
+  @override
+  String get snrIndicator_lastSeen => 'Laatst gezien';
 }
diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dart
index 147e1606..55bc6ec7 100644
--- a/lib/l10n/app_localizations_pl.dart
+++ b/lib/l10n/app_localizations_pl.dart
@@ -1079,6 +1079,9 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get chat_pathManagement => 'Zarządzanie ścieżkami';
 
+  @override
+  String get chat_ShowAllPaths => 'Pokaż wszystkie ścieżki';
+
   @override
   String get chat_routingMode => 'Tryb routingu';
 
@@ -1676,10 +1679,10 @@ class AppLocalizationsPl extends AppLocalizations {
   String get repeater_cliSubtitle => 'Wyślij polecenia do powielacza';
 
   @override
-  String get repeater_neighbours => 'Sąsiedzi';
+  String get repeater_neighbors => 'Sąsiedzi';
 
   @override
-  String get repeater_neighboursSubtitle =>
+  String get repeater_neighborsSubtitle =>
       'Wyświetl sąsiedztwo zerowych hopów.';
 
   @override
@@ -2375,7 +2378,7 @@ class AppLocalizationsPl extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Powtarzacze Sąsiedzi';
+  String get neighbors_repeatersNeighbors => 'Powtarzacze Sąsiedzi';
 
   @override
   String get neighbors_noData => 'Brak danych dotyczących sąsiadów.';
@@ -2895,4 +2898,10 @@ class AppLocalizationsPl extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'Eksport danych mapy GPX meshcore-open';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Nadajniki w pobliżu';
+
+  @override
+  String get snrIndicator_lastSeen => 'Ostatnio widziany';
 }
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
index b4817757..596d268b 100644
--- a/lib/l10n/app_localizations_pt.dart
+++ b/lib/l10n/app_localizations_pt.dart
@@ -1079,6 +1079,9 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get chat_pathManagement => 'Gerenciamento de Caminhos';
 
+  @override
+  String get chat_ShowAllPaths => 'Mostrar todos os caminhos';
+
   @override
   String get chat_routingMode => 'Modo de roteamento';
 
@@ -1674,11 +1677,10 @@ class AppLocalizationsPt extends AppLocalizations {
   String get repeater_cliSubtitle => 'Enviar comandos ao repetidor';
 
   @override
-  String get repeater_neighbours => 'Vizinhos';
+  String get repeater_neighbors => 'Vizinhos';
 
   @override
-  String get repeater_neighboursSubtitle =>
-      'Visualizar vizinhos de salto zero.';
+  String get repeater_neighborsSubtitle => 'Visualizar vizinhos de salto zero.';
 
   @override
   String get repeater_settings => 'Configurações';
@@ -2377,7 +2379,7 @@ class AppLocalizationsPt extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Repetidores Vizinhos';
+  String get neighbors_repeatersNeighbors => 'Repetidores Vizinhos';
 
   @override
   String get neighbors_noData => 'Não estão disponíveis dados de vizinhos.';
@@ -2890,4 +2892,10 @@ class AppLocalizationsPt extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open exportação de dados de mapa GPX';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Repetidores Próximos';
+
+  @override
+  String get snrIndicator_lastSeen => 'Visto pela última vez';
 }
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
index e5875b13..4647746a 100644
--- a/lib/l10n/app_localizations_ru.dart
+++ b/lib/l10n/app_localizations_ru.dart
@@ -1077,6 +1077,9 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get chat_pathManagement => 'Управление маршрутами';
 
+  @override
+  String get chat_ShowAllPaths => 'Показать все пути';
+
   @override
   String get chat_routingMode => 'Режим маршрутизации';
 
@@ -1676,10 +1679,10 @@ class AppLocalizationsRu extends AppLocalizations {
   String get repeater_cliSubtitle => 'Отправка команд репитеру';
 
   @override
-  String get repeater_neighbours => 'Соседи';
+  String get repeater_neighbors => 'Соседи';
 
   @override
-  String get repeater_neighboursSubtitle => 'Просмотр соседей на нулевом хопе.';
+  String get repeater_neighborsSubtitle => 'Просмотр соседей на нулевом хопе.';
 
   @override
   String get repeater_settings => 'Настройки';
@@ -2379,7 +2382,7 @@ class AppLocalizationsRu extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Соседи репитеров';
+  String get neighbors_repeatersNeighbors => 'Соседи репитеров';
 
   @override
   String get neighbors_noData => 'Данные о соседях недоступны.';
@@ -2901,4 +2904,10 @@ class AppLocalizationsRu extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open экспорт данных карты GPX';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Ближайшие ретрансляторы';
+
+  @override
+  String get snrIndicator_lastSeen => 'Последний раз видели';
 }
diff --git a/lib/l10n/app_localizations_sk.dart b/lib/l10n/app_localizations_sk.dart
index 4e8b4cb7..8e186631 100644
--- a/lib/l10n/app_localizations_sk.dart
+++ b/lib/l10n/app_localizations_sk.dart
@@ -1074,6 +1074,9 @@ class AppLocalizationsSk extends AppLocalizations {
   @override
   String get chat_pathManagement => 'Správa ciest';
 
+  @override
+  String get chat_ShowAllPaths => 'Zobraziť všetky cesty';
+
   @override
   String get chat_routingMode => 'Režim trasy';
 
@@ -1669,10 +1672,10 @@ class AppLocalizationsSk extends AppLocalizations {
   String get repeater_cliSubtitle => 'Pošlite príkazy opakovaču';
 
   @override
-  String get repeater_neighbours => 'Súsezný';
+  String get repeater_neighbors => 'Súsezný';
 
   @override
-  String get repeater_neighboursSubtitle => 'Zobraziť susedné body bez skokov.';
+  String get repeater_neighborsSubtitle => 'Zobraziť susedné body bez skokov.';
 
   @override
   String get repeater_settings => 'Nastavenia';
@@ -2363,7 +2366,7 @@ class AppLocalizationsSk extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Opakovadlá Súsezná';
+  String get neighbors_repeatersNeighbors => 'Opakovadlá Súsezná';
 
   @override
   String get neighbors_noData =>
@@ -2877,4 +2880,10 @@ class AppLocalizationsSk extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open export dát GPX mapových údajov';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Miestne opakovače';
+
+  @override
+  String get snrIndicator_lastSeen => 'Naposledy videný';
 }
diff --git a/lib/l10n/app_localizations_sl.dart b/lib/l10n/app_localizations_sl.dart
index e01151e3..b95e7115 100644
--- a/lib/l10n/app_localizations_sl.dart
+++ b/lib/l10n/app_localizations_sl.dart
@@ -1072,6 +1072,9 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get chat_pathManagement => 'Upravljanje poti';
 
+  @override
+  String get chat_ShowAllPaths => 'Prikaži vse poti';
+
   @override
   String get chat_routingMode => 'Navodilo za usmerjevalni način';
 
@@ -1668,10 +1671,10 @@ class AppLocalizationsSl extends AppLocalizations {
       'Pošlji ukazne povelje na ponovitveno enoto.';
 
   @override
-  String get repeater_neighbours => 'Sosedi';
+  String get repeater_neighbors => 'Sosedi';
 
   @override
-  String get repeater_neighboursSubtitle => 'Pogledati nič sosednjih hopjev.';
+  String get repeater_neighborsSubtitle => 'Pogledati nič sosednjih hopjev.';
 
   @override
   String get repeater_settings => 'Nastavitve';
@@ -2367,7 +2370,7 @@ class AppLocalizationsSl extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Ponovitve Sosedi';
+  String get neighbors_repeatersNeighbors => 'Ponovitve Sosedi';
 
   @override
   String get neighbors_noData => 'Niso na voljo podatki o sosedih.';
@@ -2882,4 +2885,10 @@ class AppLocalizationsSl extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open izvoz podatkov GPX karte';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Bližnji ponovitelji';
+
+  @override
+  String get snrIndicator_lastSeen => 'Zadnjič videno';
 }
diff --git a/lib/l10n/app_localizations_sv.dart b/lib/l10n/app_localizations_sv.dart
index f0817114..10047ca8 100644
--- a/lib/l10n/app_localizations_sv.dart
+++ b/lib/l10n/app_localizations_sv.dart
@@ -1069,6 +1069,9 @@ class AppLocalizationsSv extends AppLocalizations {
   @override
   String get chat_pathManagement => 'Stigarhantering';
 
+  @override
+  String get chat_ShowAllPaths => 'Visa alla vägar';
+
   @override
   String get chat_routingMode => 'Ruttläge';
 
@@ -1658,10 +1661,10 @@ class AppLocalizationsSv extends AppLocalizations {
   String get repeater_cliSubtitle => 'Skicka kommandon till repetitorn';
 
   @override
-  String get repeater_neighbours => 'Grannar';
+  String get repeater_neighbors => 'Grannar';
 
   @override
-  String get repeater_neighboursSubtitle => 'Visa noll hoppgrannar.';
+  String get repeater_neighborsSubtitle => 'Visa noll hoppgrannar.';
 
   @override
   String get repeater_settings => 'Inställningar';
@@ -2352,7 +2355,7 @@ class AppLocalizationsSv extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Upprepar grannar';
+  String get neighbors_repeatersNeighbors => 'Upprepar grannar';
 
   @override
   String get neighbors_noData => 'Inga grannuppgifter finns tillgängliga.';
@@ -2862,4 +2865,10 @@ class AppLocalizationsSv extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'meshcore-open export av GPX-kartdata';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Närliggande uppreparstationer';
+
+  @override
+  String get snrIndicator_lastSeen => 'Senast sedd';
 }
diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart
index 847c3e5d..9edc64a6 100644
--- a/lib/l10n/app_localizations_uk.dart
+++ b/lib/l10n/app_localizations_uk.dart
@@ -1075,6 +1075,9 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get chat_pathManagement => 'Керування шляхами';
 
+  @override
+  String get chat_ShowAllPaths => 'Показати всі шляхи';
+
   @override
   String get chat_routingMode => 'Режим маршрутизації';
 
@@ -1675,10 +1678,10 @@ class AppLocalizationsUk extends AppLocalizations {
   String get repeater_cliSubtitle => 'Надіслати команди ретранслятору';
 
   @override
-  String get repeater_neighbours => 'Сусіди';
+  String get repeater_neighbors => 'Сусіди';
 
   @override
-  String get repeater_neighboursSubtitle =>
+  String get repeater_neighborsSubtitle =>
       'Показати сусідів нульового стрибка.';
 
   @override
@@ -2380,7 +2383,7 @@ class AppLocalizationsUk extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => 'Ретранслятори-сусіди';
+  String get neighbors_repeatersNeighbors => 'Ретранслятори-сусіди';
 
   @override
   String get neighbors_noData => 'Дані про сусідів недоступні.';
@@ -2907,4 +2910,10 @@ class AppLocalizationsUk extends AppLocalizations {
   @override
   String get settings_gpxExportShareSubject =>
       'експорт даних карти meshcore-open у форматі GPX';
+
+  @override
+  String get snrIndicator_nearByRepeaters => 'Ближні ретранслятори';
+
+  @override
+  String get snrIndicator_lastSeen => 'Останній раз бачили';
 }
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index fdc45312..9753da6e 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -1031,6 +1031,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get chat_pathManagement => '路径管理';
 
+  @override
+  String get chat_ShowAllPaths => '显示所有路径';
+
   @override
   String get chat_routingMode => '路由模式';
 
@@ -1596,10 +1599,10 @@ class AppLocalizationsZh extends AppLocalizations {
   String get repeater_cliSubtitle => '向复用器发送指令';
 
   @override
-  String get repeater_neighbours => '邻居';
+  String get repeater_neighbors => '邻居';
 
   @override
-  String get repeater_neighboursSubtitle => '查看邻居节点（无需中间节点）。';
+  String get repeater_neighborsSubtitle => '查看邻居节点（无需中间节点）。';
 
   @override
   String get repeater_settings => '设置';
@@ -2246,7 +2249,7 @@ class AppLocalizationsZh extends AppLocalizations {
   }
 
   @override
-  String get neighbors_repeatersNeighbours => '重复使用的邻居';
+  String get neighbors_repeatersNeighbors => '重复使用的邻居';
 
   @override
   String get neighbors_noData => '没有可用的邻居信息。';
@@ -2714,4 +2717,10 @@ class AppLocalizationsZh extends AppLocalizations {
 
   @override
   String get settings_gpxExportShareSubject => 'meshcore-open GPX 地图数据导出';
+
+  @override
+  String get snrIndicator_nearByRepeaters => '附近的重复器';
+
+  @override
+  String get snrIndicator_lastSeen => '最近访问';
 }
diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb
index 7c397b46..859e48d9 100644
--- a/lib/l10n/app_nl.arb
+++ b/lib/l10n/app_nl.arb
@@ -1351,12 +1351,12 @@
       }
     }
   },
-  "repeater_neighbours": "Buren",
-  "repeater_neighboursSubtitle": "Bekijk nul hops buren.",
+  "repeater_neighbors": "Buren",
+  "repeater_neighborsSubtitle": "Bekijk nul hops buren.",
   "neighbors_receivedData": "Ontvangen Buurdata",
   "neighbors_requestTimedOut": "Buren vragen om tijdelijk uitgeschakeld.",
   "neighbors_errorLoading": "Fout bij het laden van buren: {error}",
-  "neighbors_repeatersNeighbours": "Herhalingen Buren",
+  "neighbors_repeatersNeighbors": "Herhalingen Buren",
   "neighbors_noData": "Geen gegevens van buren beschikbaar.",
   "channels_createPrivateChannelDesc": "Beveiligd met een geheime sleutel.",
   "channels_createPrivateChannel": "Maak een Privé Kanaal",
@@ -1594,6 +1594,9 @@
   "scanner_enableBluetooth": "Activeer Bluetooth",
   "scanner_bluetoothOffMessage": "Zorg ervoor dat Bluetooth is ingeschakeld om naar apparaten te zoeken.",
   "scanner_bluetoothOff": "Bluetooth is uitgeschakeld",
+  "snrIndicator_lastSeen": "Laatst gezien",
+  "snrIndicator_nearByRepeaters": "Nabije herhalingseenheden",
+  "chat_ShowAllPaths": "Toon alle paden",
   "settings_clientRepeat": "Herhalen: Afgekoppeld",
   "settings_clientRepeatSubtitle": "Laat dit apparaat de mesh-pakketten opnieuw verzenden voor andere apparaten.",
   "settings_clientRepeatFreqWarning": "Om een signaal buiten het netwerk te versturen, zijn frequenties van 433, 869 of 918 MHz vereist."
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
index 5ebeebff..d03b9119 100644
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@@ -1351,12 +1351,12 @@
       }
     }
   },
-  "repeater_neighbours": "Sąsiedzi",
-  "repeater_neighboursSubtitle": "Wyświetl sąsiedztwo zerowych hopów.",
+  "repeater_neighbors": "Sąsiedzi",
+  "repeater_neighborsSubtitle": "Wyświetl sąsiedztwo zerowych hopów.",
   "neighbors_receivedData": "Otrzymano dane sąsiedztwa",
   "neighbors_requestTimedOut": "Sąsiedzi proszą o wyłączenie timingu.",
   "neighbors_errorLoading": "Błąd podczas ładowania sąsiadów: {error}",
-  "neighbors_repeatersNeighbours": "Powtarzacze Sąsiedzi",
+  "neighbors_repeatersNeighbors": "Powtarzacze Sąsiedzi",
   "neighbors_noData": "Brak danych dotyczących sąsiadów.",
   "channels_joinPrivateChannelDesc": "Ręcznie wprowadź klucz tajny.",
   "channels_createPrivateChannel": "Utwórz Prywatny Kanał",
@@ -1594,6 +1594,9 @@
   "scanner_bluetoothOffMessage": "Prosimy włączyć Bluetooth, aby przeskanować urządzenia.",
   "scanner_bluetoothOff": "Bluetooth jest wyłączony",
   "scanner_enableBluetooth": "Włącz Bluetooth",
+  "snrIndicator_lastSeen": "Ostatnio widziany",
+  "snrIndicator_nearByRepeaters": "Nadajniki w pobliżu",
+  "chat_ShowAllPaths": "Pokaż wszystkie ścieżki",
   "settings_clientRepeatSubtitle": "Pozwól temu urządzeniu powtarzać pakiety danych dla innych urządzeń.",
   "settings_clientRepeat": "Powtórzenie: Niezależne od sieci",
   "settings_clientRepeatFreqWarning": "Powtórka poza siecią wymaga częstotliwości 433, 869 lub 918 MHz."
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index a88e0388..83a77197 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -1351,12 +1351,12 @@
       }
     }
   },
-  "repeater_neighbours": "Vizinhos",
+  "repeater_neighbors": "Vizinhos",
   "neighbors_receivedData": "Dados dos Vizinhos Recebidos",
-  "repeater_neighboursSubtitle": "Visualizar vizinhos de salto zero.",
+  "repeater_neighborsSubtitle": "Visualizar vizinhos de salto zero.",
   "neighbors_requestTimedOut": "Vizinhos solicitam tempo limite esgotado.",
   "neighbors_errorLoading": "Erro ao carregar vizinhos: {error}",
-  "neighbors_repeatersNeighbours": "Repetidores Vizinhos",
+  "neighbors_repeatersNeighbors": "Repetidores Vizinhos",
   "neighbors_noData": "Não estão disponíveis dados de vizinhos.",
   "channels_createPrivateChannelDesc": "Protegido com uma chave secreta.",
   "channels_joinPrivateChannelDesc": "Inserir uma chave secreta manualmente.",
@@ -1594,6 +1594,9 @@
   "scanner_enableBluetooth": "Ative o Bluetooth",
   "scanner_bluetoothOff": "Bluetooth está desativado",
   "scanner_bluetoothOffMessage": "Por favor, ative o Bluetooth para escanear por dispositivos.",
+  "snrIndicator_nearByRepeaters": "Repetidores Próximos",
+  "snrIndicator_lastSeen": "Visto pela última vez",
+  "chat_ShowAllPaths": "Mostrar todos os caminhos",
   "settings_clientRepeatFreqWarning": "A repetição fora da rede requer frequências de 433, 869 ou 918 MHz.",
   "settings_clientRepeat": "Repetição sem rede",
   "settings_clientRepeatSubtitle": "Permita que este dispositivo repita pacotes de rede para outros dispositivos."
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
index fc17eee1..380ba10b 100644
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -467,8 +467,8 @@
   "repeater_telemetrySubtitle": "Просмотр телеметрии датчиков и системной статистики",
   "repeater_cli": "CLI",
   "repeater_cliSubtitle": "Отправка команд репитеру",
-  "repeater_neighbours": "Соседи",
-  "repeater_neighboursSubtitle": "Просмотр соседей на нулевом хопе.",
+  "repeater_neighbors": "Соседи",
+  "repeater_neighborsSubtitle": "Просмотр соседей на нулевом хопе.",
   "repeater_settings": "Настройки",
   "repeater_settingsSubtitle": "Настройка параметров репитера",
   "repeater_statusTitle": "Статус репитера",
@@ -661,7 +661,7 @@
   "neighbors_receivedData": "Полученные данные о соседях",
   "neighbors_requestTimedOut": "Время ожидания данных о соседях истекло.",
   "neighbors_errorLoading": "Ошибка загрузки соседей: {error}",
-  "neighbors_repeatersNeighbours": "Соседи репитеров",
+  "neighbors_repeatersNeighbors": "Соседи репитеров",
   "neighbors_noData": "Данные о соседях недоступны.",
   "neighbors_unknownContact": "Неизвестный {pubkey}",
   "neighbors_heardA ago": "Слышали: {time} назад",
@@ -834,6 +834,9 @@
   "scanner_enableBluetooth": "Включите Bluetooth",
   "scanner_bluetoothOff": "Bluetooth выключен",
   "scanner_bluetoothOffMessage": "Пожалуйста, включите Bluetooth, чтобы найти устройства.",
+  "snrIndicator_nearByRepeaters": "Ближайшие ретрансляторы",
+  "snrIndicator_lastSeen": "Последний раз видели",
+  "chat_ShowAllPaths": "Показать все пути",
   "settings_clientRepeatFreqWarning": "Для работы в режиме \"без подключения к сети\" требуется частота 433, 869 или 918 МГц.",
   "settings_clientRepeatSubtitle": "Позвольте этому устройству повторять пакеты данных для других устройств.",
   "settings_clientRepeat": "Повторение \"вне сети\""
diff --git a/lib/l10n/app_sk.arb b/lib/l10n/app_sk.arb
index 14cd3eca..aca4a29b 100644
--- a/lib/l10n/app_sk.arb
+++ b/lib/l10n/app_sk.arb
@@ -1351,12 +1351,12 @@
       }
     }
   },
-  "repeater_neighboursSubtitle": "Zobraziť susedné body bez skokov.",
+  "repeater_neighborsSubtitle": "Zobraziť susedné body bez skokov.",
   "neighbors_requestTimedOut": "Súďia žiadajú o časové ukončenie.",
   "neighbors_receivedData": "Obdielo dáta suseda",
-  "repeater_neighbours": "Súsezný",
+  "repeater_neighbors": "Súsezný",
   "neighbors_errorLoading": "Chyba pri načítaní susedov: {error}",
-  "neighbors_repeatersNeighbours": "Opakovadlá Súsezná",
+  "neighbors_repeatersNeighbors": "Opakovadlá Súsezná",
   "neighbors_noData": "Nie je dostupná žiadna informácia o susedoch.",
   "channels_createPrivateChannel": "Vytvorte súkromný kanál",
   "channels_joinPrivateChannel": "Pripojiť sa k súkromnému kanálu",
@@ -1594,6 +1594,9 @@
   "scanner_bluetoothOffMessage": "Prosím, zapnite Bluetooth, aby ste mohli skenovať pre zariadenia.",
   "scanner_bluetoothOff": "Bluetooth je vypnutý",
   "scanner_enableBluetooth": "Povolte Bluetooth",
+  "snrIndicator_lastSeen": "Naposledy videný",
+  "snrIndicator_nearByRepeaters": "Miestne opakovače",
+  "chat_ShowAllPaths": "Zobraziť všetky cesty",
   "settings_clientRepeat": "Opätovné použitie bez elektrickej siete",
   "settings_clientRepeatFreqWarning": "Použitie off-grid systému vyžaduje frekvencie 433, 869 alebo 918 MHz.",
   "settings_clientRepeatSubtitle": "Umožnite, aby toto zariadenie opakovávalo siete pre ostatných."
diff --git a/lib/l10n/app_sl.arb b/lib/l10n/app_sl.arb
index e633965e..59b84342 100644
--- a/lib/l10n/app_sl.arb
+++ b/lib/l10n/app_sl.arb
@@ -1351,12 +1351,12 @@
       }
     }
   },
-  "repeater_neighboursSubtitle": "Pogledati nič sosednjih hopjev.",
-  "repeater_neighbours": "Sosedi",
+  "repeater_neighborsSubtitle": "Pogledati nič sosednjih hopjev.",
+  "repeater_neighbors": "Sosedi",
   "neighbors_receivedData": "Prejeto podatke o sosedih",
   "neighbors_requestTimedOut": "Sosedi zahtevajo izklop po dogovoru.",
   "neighbors_errorLoading": "Napaka pri obnašanju sosedov: {error}",
-  "neighbors_repeatersNeighbours": "Ponovitve Sosedi",
+  "neighbors_repeatersNeighbors": "Ponovitve Sosedi",
   "neighbors_noData": "Niso na voljo podatki o sosedih.",
   "channels_joinPrivateChannel": "Pridružite se zasebni skupini",
   "channels_createPrivateChannelDesc": "Varno zaklenjeno s skrivnim ključem.",
@@ -1594,6 +1594,9 @@
   "scanner_enableBluetooth": "Omogočite Bluetooth",
   "scanner_bluetoothOffMessage": "Prosimo, vklopite Bluetooth, da lahko poiščete naprave.",
   "scanner_bluetoothOff": "Bluetooth je izklopljen",
+  "snrIndicator_lastSeen": "Zadnjič videno",
+  "snrIndicator_nearByRepeaters": "Bližnji ponovitelji",
+  "chat_ShowAllPaths": "Prikaži vse poti",
   "settings_clientRepeatFreqWarning": "Za ponovni prenos na brezžični način so potrebne frekvence 433, 869 ali 918 MHz.",
   "settings_clientRepeatSubtitle": "Omogočite temu naprave, da ponavlja paketne sporočila za druge.",
   "settings_clientRepeat": "Neovadno ponavljanje"
diff --git a/lib/l10n/app_sv.arb b/lib/l10n/app_sv.arb
index 4e50409a..fa786f70 100644
--- a/lib/l10n/app_sv.arb
+++ b/lib/l10n/app_sv.arb
@@ -1351,12 +1351,12 @@
       }
     }
   },
-  "repeater_neighbours": "Grannar",
-  "repeater_neighboursSubtitle": "Visa noll hoppgrannar.",
+  "repeater_neighbors": "Grannar",
+  "repeater_neighborsSubtitle": "Visa noll hoppgrannar.",
   "neighbors_receivedData": "Mottagna grannars data",
   "neighbors_requestTimedOut": "Grannar begär tidsinställd utskick.",
   "neighbors_errorLoading": "Fel vid inläsning av grannar: {error}",
-  "neighbors_repeatersNeighbours": "Upprepar grannar",
+  "neighbors_repeatersNeighbors": "Upprepar grannar",
   "neighbors_noData": "Inga grannuppgifter finns tillgängliga.",
   "channels_createPrivateChannel": "Skapa en privat kanal",
   "channels_joinPrivateChannel": "Gå med i en Privat Kanal",
@@ -1594,6 +1594,9 @@
   "scanner_enableBluetooth": "Aktivera Bluetooth",
   "scanner_bluetoothOffMessage": "Vänligen aktivera Bluetooth för att söka efter enheter.",
   "scanner_bluetoothOff": "Bluetooth är avstängt",
+  "snrIndicator_lastSeen": "Senast sedd",
+  "snrIndicator_nearByRepeaters": "Närliggande uppreparstationer",
+  "chat_ShowAllPaths": "Visa alla vägar",
   "settings_clientRepeatSubtitle": "Låt enheten repetera nätpaket för andra användare.",
   "settings_clientRepeat": "Upprepa utan elnät",
   "settings_clientRepeatFreqWarning": "För att kunna kommunicera utanför elnätet krävs frekvenserna 433, 869 eller 918 MHz."
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
index afa11793..3f7b276f 100644
--- a/lib/l10n/app_uk.arb
+++ b/lib/l10n/app_uk.arb
@@ -1352,12 +1352,12 @@
       }
     }
   },
-  "repeater_neighbours": "Сусіди",
-  "repeater_neighboursSubtitle": "Показати сусідів нульового стрибка.",
+  "repeater_neighbors": "Сусіди",
+  "repeater_neighborsSubtitle": "Показати сусідів нульового стрибка.",
   "neighbors_receivedData": "Дані сусідів отримано",
   "neighbors_requestTimedOut": "Час запиту сусідів вичерпано.",
   "neighbors_errorLoading": "Помилка завантаження сусідів: {error}",
-  "neighbors_repeatersNeighbours": "Ретранслятори-сусіди",
+  "neighbors_repeatersNeighbors": "Ретранслятори-сусіди",
   "neighbors_noData": "Дані про сусідів недоступні.",
   "channels_createPrivateChannelDesc": "Захищено секретним ключем.",
   "channels_joinPrivateChannel": "Приєднатися до приватного каналу",
@@ -1594,6 +1594,9 @@
   "scanner_enableBluetooth": "Увімкніть Bluetooth",
   "scanner_bluetoothOffMessage": "Будь ласка, увімкніть Bluetooth, щоб сканувати пристрої.",
   "scanner_bluetoothOff": "Bluetooth вимкнено",
+  "snrIndicator_lastSeen": "Останній раз бачили",
+  "snrIndicator_nearByRepeaters": "Ближні ретранслятори",
+  "chat_ShowAllPaths": "Показати всі шляхи",
   "settings_clientRepeatFreqWarning": "Повтор без підключення до мережі вимагає частоти 433, 869 або 918 МГц.",
   "settings_clientRepeatSubtitle": "Дозвольте цьому пристрою повторювати пакети даних для інших пристроїв.",
   "settings_clientRepeat": "Автономна система"
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index 312ed1a1..bc433927 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -895,8 +895,8 @@
   "repeater_telemetrySubtitle": "查看传感器和系统状态的数据。",
   "repeater_cli": "命令行界面",
   "repeater_cliSubtitle": "向复用器发送指令",
-  "repeater_neighbours": "邻居",
-  "repeater_neighboursSubtitle": "查看邻居节点（无需中间节点）。",
+  "repeater_neighbors": "邻居",
+  "repeater_neighborsSubtitle": "查看邻居节点（无需中间节点）。",
   "repeater_settings": "设置",
   "repeater_settingsSubtitle": "配置重复器参数",
   "repeater_statusTitle": "重复器状态",
@@ -1266,7 +1266,7 @@
       }
     }
   },
-  "neighbors_repeatersNeighbours": "重复使用的邻居",
+  "neighbors_repeatersNeighbors": "重复使用的邻居",
   "neighbors_noData": "没有可用的邻居信息。",
   "neighbors_unknownContact": "Unknown {pubkey}",
   "@neighbors_unknownContact": {
@@ -1594,6 +1594,9 @@
   "scanner_bluetoothOffMessage": "请打开蓝牙功能，以便搜索设备。",
   "scanner_bluetoothOff": "蓝牙已关闭",
   "scanner_enableBluetooth": "启用蓝牙",
+  "snrIndicator_lastSeen": "最近访问",
+  "snrIndicator_nearByRepeaters": "附近的重复器",
+  "chat_ShowAllPaths": "显示所有路径",
   "settings_clientRepeat": "离网重复",
   "settings_clientRepeatSubtitle": "允许此设备重复发送网状数据包给其他设备",
   "settings_clientRepeatFreqWarning": "离网重复通信需要使用 433、869 或 918 兆赫兹的频率。"
diff --git a/lib/models/contact.dart b/lib/models/contact.dart
index a98580f3..143a62a2 100644
--- a/lib/models/contact.dart
+++ b/lib/models/contact.dart
@@ -119,7 +119,7 @@ class Contact {
     final pathBytes = _pathBytesForDisplay;
     Uint8List? traceBytes;
 
-    if (pathLength <= 0) {
+    if (pathBytes.isEmpty) {
       traceBytes = Uint8List(1);
       traceBytes[0] = publicKey[0];
       return traceBytes;
@@ -160,43 +160,47 @@ class Contact {
   }
 
   static Contact? fromFrame(Uint8List data) {
-    if (data.length < contactFrameSize) return null;
+    if (data.isEmpty) return null;
     if (data[0] != respCodeContact) return null;
+    try {
+      final pubKey = Uint8List.fromList(
+        data.sublist(contactPubKeyOffset, contactPubKeyOffset + pubKeySize),
+      );
+      final type = data[contactTypeOffset];
+      final pathLen = data[contactPathLenOffset].toSigned(8);
+      final safePathLen = pathLen > 0
+          ? (pathLen > maxPathSize ? maxPathSize : pathLen)
+          : 0;
+      final pathBytes = safePathLen > 0
+          ? Uint8List.fromList(
+              data.sublist(contactPathOffset, contactPathOffset + safePathLen),
+            )
+          : Uint8List(0);
+      final name = readCString(data, contactNameOffset, maxNameSize);
+      final lastmod = readUint32LE(data, contactLastmodOffset);
 
-    final pubKey = Uint8List.fromList(
-      data.sublist(contactPubKeyOffset, contactPubKeyOffset + pubKeySize),
-    );
-    final type = data[contactTypeOffset];
-    final pathLen = data[contactPathLenOffset].toSigned(8);
-    final safePathLen = pathLen > 0
-        ? (pathLen > maxPathSize ? maxPathSize : pathLen)
-        : 0;
-    final pathBytes = safePathLen > 0
-        ? Uint8List.fromList(
-            data.sublist(contactPathOffset, contactPathOffset + safePathLen),
-          )
-        : Uint8List(0);
-    final name = readCString(data, contactNameOffset, maxNameSize);
-    final lastmod = readUint32LE(data, contactLastmodOffset);
+      double? lat, lon;
+      final latRaw = readInt32LE(data, contactLatOffset);
+      final lonRaw = readInt32LE(data, contactLonOffset);
+      if (latRaw != 0 || lonRaw != 0) {
+        lat = latRaw / 1e6;
+        lon = lonRaw / 1e6;
+      }
 
-    double? lat, lon;
-    final latRaw = readInt32LE(data, contactLatOffset);
-    final lonRaw = readInt32LE(data, contactLonOffset);
-    if (latRaw != 0 || lonRaw != 0) {
-      lat = latRaw / 1e6;
-      lon = lonRaw / 1e6;
+      return Contact(
+        publicKey: pubKey,
+        name: name.isEmpty ? 'Unknown' : name,
+        type: type,
+        pathLength: pathLen,
+        path: pathBytes,
+        latitude: lat,
+        longitude: lon,
+        lastSeen: DateTime.fromMillisecondsSinceEpoch(lastmod * 1000),
+      );
+    } catch (e) {
+      // If parsing fails, return null
+      return null;
     }
-
-    return Contact(
-      publicKey: pubKey,
-      name: name.isEmpty ? 'Unknown' : name,
-      type: type,
-      pathLength: pathLen,
-      path: pathBytes,
-      latitude: lat,
-      longitude: lon,
-      lastSeen: DateTime.fromMillisecondsSinceEpoch(lastmod * 1000),
-    );
   }
 
   @override
diff --git a/lib/screens/channel_chat_screen.dart b/lib/screens/channel_chat_screen.dart
index c82356d2..021ad7d8 100644
--- a/lib/screens/channel_chat_screen.dart
+++ b/lib/screens/channel_chat_screen.dart
@@ -901,7 +901,8 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
     Navigator.push(
       context,
       MaterialPageRoute(
-        builder: (context) => ChannelMessagePathScreen(message: message),
+        builder: (context) =>
+            ChannelMessagePathScreen(message: message, channelMessage: true),
       ),
     );
   }
diff --git a/lib/screens/channel_message_path_screen.dart b/lib/screens/channel_message_path_screen.dart
index 1b0544ca..e6fcacce 100644
--- a/lib/screens/channel_message_path_screen.dart
+++ b/lib/screens/channel_message_path_screen.dart
@@ -17,18 +17,27 @@ import '../models/contact.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,7 +46,6 @@ class ChannelMessagePathScreen extends StatelessWidget {
           l10n,
         );
         final extraPaths = _otherPaths(primaryPath, message.pathVariants);
-
         return Scaffold(
           appBar: AppBar(
             title: Text(l10n.channelPath_title),
@@ -50,9 +58,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 +70,7 @@ class ChannelMessagePathScreen extends StatelessWidget {
                 tooltip: l10n.channelPath_viewMap,
                 onPressed: hasHopDetails
                     ? () {
-                        _openPathMap(context);
+                        _openPathMap(context, channelMessage: channelMessage);
                       }
                     : null,
               ),
@@ -157,7 +165,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 +260,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 +281,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
@@ -323,11 +342,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 +362,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
             ? [
diff --git a/lib/screens/channels_screen.dart b/lib/screens/channels_screen.dart
index 6b8b92d4..26062dea 100644
--- a/lib/screens/channels_screen.dart
+++ b/lib/screens/channels_screen.dart
@@ -3,6 +3,7 @@ import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
+import 'package:meshcore_open/widgets/app_bar.dart';
 import 'package:provider/provider.dart';
 import 'package:uuid/uuid.dart';
 
@@ -14,7 +15,6 @@ 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';
@@ -116,8 +116,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: [
diff --git a/lib/screens/chat_screen.dart b/lib/screens/chat_screen.dart
index f00f242a..ad897a0b 100644
--- a/lib/screens/chat_screen.dart
+++ b/lib/screens/chat_screen.dart
@@ -19,7 +19,9 @@ import '../helpers/utf8_length_limiter.dart';
 import '../models/channel_message.dart';
 import '../models/contact.dart';
 import '../models/message.dart';
+import '../models/path_history.dart';
 import '../services/path_history_service.dart';
+import '../widgets/elements_ui.dart';
 import 'channel_message_path_screen.dart';
 import 'map_screen.dart';
 import '../utils/emoji_utils.dart';
@@ -431,242 +433,317 @@ class _ChatScreenState extends State<ChatScreen> {
 
   void _showPathHistory(BuildContext context) {
     final connector = Provider.of<MeshCoreConnector>(context, listen: false);
-
+    bool showAllPaths = false;
     showDialog(
       context: context,
-      builder: (context) => Consumer<PathHistoryService>(
-        builder: (context, pathService, _) {
-          final paths = pathService.getRecentPaths(widget.contact.publicKeyHex);
-          return AlertDialog(
-            title: Row(
-              children: [
-                const Icon(Icons.timeline),
-                const SizedBox(width: 8),
-                Text(context.l10n.chat_pathManagement),
-              ],
-            ),
-            content: SingleChildScrollView(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
+      builder: (context) => StatefulBuilder(
+        builder: (context, setDialogState) => Consumer<PathHistoryService>(
+          builder: (context, pathService, _) {
+            final paths = pathService.getRecentPaths(
+              widget.contact.publicKeyHex,
+            );
+
+            final repeatersList = List.of(connector.directRepeaters)
+              ..sort((a, b) => b.ranking.compareTo(a.ranking));
+
+            if (repeatersList.isEmpty) {
+              showAllPaths = true;
+            }
+
+            final directRepeater = repeatersList.isEmpty
+                ? null
+                : repeatersList.first;
+            final secondDirectRepeater = repeatersList.length < 2
+                ? null
+                : repeatersList.elementAt(1);
+            final thirdDirectRepeater = repeatersList.length < 3
+                ? null
+                : repeatersList.elementAt(2);
+
+            List<MapEntry<int, MapEntry<Color, PathRecord>>>
+            pathsWithRepeaters = paths.map((path) {
+              final isDirectRepeater =
+                  directRepeater != null &&
+                  path.pathBytes.isNotEmpty &&
+                  directRepeater.pubkeyFirstByte == path.pathBytes.first;
+              final isSecondDirectRepeater =
+                  secondDirectRepeater != null &&
+                  path.pathBytes.isNotEmpty &&
+                  secondDirectRepeater.pubkeyFirstByte == path.pathBytes.first;
+              final isThirdDirectRepeater =
+                  thirdDirectRepeater != null &&
+                  path.pathBytes.isNotEmpty &&
+                  thirdDirectRepeater.pubkeyFirstByte == path.pathBytes.first;
+
+              int ranking = -1;
+              Color color = Colors.grey;
+              if (isDirectRepeater) {
+                color = Colors.green;
+                ranking = 3;
+              } else if (isSecondDirectRepeater) {
+                color = Colors.yellow;
+                ranking = 2;
+              } else if (isThirdDirectRepeater) {
+                color = Colors.red;
+                ranking = 1;
+              } else if (path.wasFloodDiscovery) {
+                color = Colors.blue;
+                ranking = 0;
+              }
+
+              return MapEntry(ranking, MapEntry(color, path));
+            }).toList();
+
+            pathsWithRepeaters.sort((a, b) => b.key.compareTo(a.key));
+
+            return AlertDialog(
+              title: Row(
                 children: [
-                  if (paths.isNotEmpty) ...[
+                  const Icon(Icons.timeline),
+                  const SizedBox(width: 8),
+                  Text(context.l10n.chat_pathManagement),
+                ],
+              ),
+              content: SingleChildScrollView(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    if (pathsWithRepeaters.isNotEmpty) ...[
+                      if (repeatersList.isNotEmpty)
+                        FeatureToggleRow(
+                          title: context.l10n.chat_ShowAllPaths,
+                          subtitle: "",
+                          value: showAllPaths,
+                          onChanged: (val) {
+                            setDialogState(() {
+                              showAllPaths = val;
+                            });
+                          },
+                        ),
+                      Text(
+                        context.l10n.chat_recentAckPaths,
+                        style: const TextStyle(
+                          fontWeight: FontWeight.bold,
+                          fontSize: 12,
+                        ),
+                      ),
+                      if (pathsWithRepeaters.length >= 100) ...[
+                        const SizedBox(height: 8),
+                        Container(
+                          width: double.infinity,
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 12,
+                            vertical: 8,
+                          ),
+                          decoration: BoxDecoration(
+                            color: Colors.amber[100],
+                            borderRadius: BorderRadius.circular(8),
+                          ),
+                          child: Text(
+                            context.l10n.chat_pathHistoryFull,
+                            style: const TextStyle(fontSize: 12),
+                          ),
+                        ),
+                      ],
+                      const SizedBox(height: 8),
+                      ...pathsWithRepeaters.map((entry) {
+                        final path = entry.value.value;
+                        final color = entry.value.key;
+                        if (!showAllPaths && entry.key < 1) {
+                          return const SizedBox.shrink();
+                        } else {
+                          return Card(
+                            margin: const EdgeInsets.symmetric(vertical: 4),
+                            child: ListTile(
+                              dense: true,
+                              leading: CircleAvatar(
+                                radius: 16,
+                                backgroundColor: color,
+                                child: Text(
+                                  '${path.hopCount}',
+                                  style: const TextStyle(fontSize: 12),
+                                ),
+                              ),
+                              title: Text(
+                                '${path.hopCount} ${path.hopCount == 1 ? context.l10n.chat_hopSingular : context.l10n.chat_hopPlural}',
+                                style: const TextStyle(fontSize: 14),
+                              ),
+                              subtitle: Text(
+                                '${(path.tripTimeMs / 1000).toStringAsFixed(2)}s • ${_formatRelativeTime(path.timestamp)} • ${path.successCount} ${context.l10n.chat_successes}',
+                                style: const TextStyle(fontSize: 11),
+                              ),
+                              trailing: Row(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  IconButton(
+                                    icon: const Icon(Icons.close, size: 16),
+                                    tooltip: context.l10n.chat_removePath,
+                                    onPressed: () async {
+                                      await pathService.removePathRecord(
+                                        widget.contact.publicKeyHex,
+                                        path.pathBytes,
+                                      );
+                                    },
+                                  ),
+                                  path.wasFloodDiscovery
+                                      ? const Icon(
+                                          Icons.waves,
+                                          size: 16,
+                                          color: Colors.grey,
+                                        )
+                                      : const Icon(
+                                          Icons.route,
+                                          size: 16,
+                                          color: Colors.grey,
+                                        ),
+                                ],
+                              ),
+                              onLongPress: () =>
+                                  _showFullPathDialog(context, path.pathBytes),
+                              onTap: () async {
+                                if (path.pathBytes.isEmpty) {
+                                  ScaffoldMessenger.of(context).showSnackBar(
+                                    SnackBar(
+                                      content: Text(
+                                        context
+                                            .l10n
+                                            .chat_pathDetailsNotAvailable,
+                                      ),
+                                      duration: const Duration(seconds: 2),
+                                    ),
+                                  );
+                                  return;
+                                }
+
+                                final pathBytes = Uint8List.fromList(
+                                  path.pathBytes,
+                                );
+                                final pathLength = path.pathBytes.length;
+
+                                // Set the path override to persist user's choice
+                                await connector.setPathOverride(
+                                  widget.contact,
+                                  pathLen: pathLength,
+                                  pathBytes: pathBytes,
+                                );
+
+                                if (!context.mounted) return;
+                                Navigator.pop(context);
+                                await _notifyPathSet(
+                                  connector,
+                                  widget.contact,
+                                  pathBytes,
+                                  path.hopCount,
+                                );
+                              },
+                            ),
+                          );
+                        }
+                      }),
+                      const Divider(),
+                    ] else ...[
+                      Text(context.l10n.chat_noPathHistoryYet),
+                      const Divider(),
+                    ],
+                    const SizedBox(height: 8),
                     Text(
-                      context.l10n.chat_recentAckPaths,
+                      context.l10n.chat_pathActions,
                       style: const TextStyle(
                         fontWeight: FontWeight.bold,
                         fontSize: 12,
                       ),
                     ),
-                    if (paths.length >= 100) ...[
-                      const SizedBox(height: 8),
-                      Container(
-                        width: double.infinity,
-                        padding: const EdgeInsets.symmetric(
-                          horizontal: 12,
-                          vertical: 8,
-                        ),
-                        decoration: BoxDecoration(
-                          color: Colors.amber[100],
-                          borderRadius: BorderRadius.circular(8),
-                        ),
-                        child: Text(
-                          context.l10n.chat_pathHistoryFull,
-                          style: const TextStyle(fontSize: 12),
-                        ),
-                      ),
-                    ],
                     const SizedBox(height: 8),
-                    ...paths.map((path) {
-                      return Card(
-                        margin: const EdgeInsets.symmetric(vertical: 4),
-                        child: ListTile(
-                          dense: true,
-                          leading: CircleAvatar(
-                            radius: 16,
-                            backgroundColor: path.wasFloodDiscovery
-                                ? Colors.blue
-                                : Colors.green,
-                            child: Text(
-                              '${path.hopCount}',
-                              style: const TextStyle(fontSize: 12),
-                            ),
+                    ListTile(
+                      dense: true,
+                      leading: const CircleAvatar(
+                        radius: 16,
+                        backgroundColor: Colors.purple,
+                        child: Icon(Icons.edit_road, size: 16),
+                      ),
+                      title: Text(
+                        context.l10n.chat_setCustomPath,
+                        style: const TextStyle(fontSize: 14),
+                      ),
+                      subtitle: Text(
+                        context.l10n.chat_setCustomPathSubtitle,
+                        style: const TextStyle(fontSize: 11),
+                      ),
+                      onTap: () {
+                        Navigator.pop(context);
+                        _showCustomPathDialog(context);
+                      },
+                    ),
+                    ListTile(
+                      dense: true,
+                      leading: const CircleAvatar(
+                        radius: 16,
+                        backgroundColor: Colors.orange,
+                        child: Icon(Icons.clear_all, size: 16),
+                      ),
+                      title: Text(
+                        context.l10n.chat_clearPath,
+                        style: const TextStyle(fontSize: 14),
+                      ),
+                      subtitle: Text(
+                        context.l10n.chat_clearPathSubtitle,
+                        style: const TextStyle(fontSize: 11),
+                      ),
+                      onTap: () async {
+                        await connector.clearContactPath(widget.contact);
+                        if (!context.mounted) return;
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          SnackBar(
+                            content: Text(context.l10n.chat_pathCleared),
+                            duration: const Duration(seconds: 2),
                           ),
-                          title: Text(
-                            '${path.hopCount} ${path.hopCount == 1 ? context.l10n.chat_hopSingular : context.l10n.chat_hopPlural}',
-                            style: const TextStyle(fontSize: 14),
+                        );
+                        Navigator.pop(context);
+                      },
+                    ),
+                    ListTile(
+                      dense: true,
+                      leading: const CircleAvatar(
+                        radius: 16,
+                        backgroundColor: Colors.blue,
+                        child: Icon(Icons.waves, size: 16),
+                      ),
+                      title: Text(
+                        context.l10n.chat_forceFloodMode,
+                        style: const TextStyle(fontSize: 14),
+                      ),
+                      subtitle: Text(
+                        context.l10n.chat_floodModeSubtitle,
+                        style: const TextStyle(fontSize: 11),
+                      ),
+                      onTap: () async {
+                        await connector.setPathOverride(
+                          widget.contact,
+                          pathLen: -1,
+                        );
+                        if (!context.mounted) return;
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          SnackBar(
+                            content: Text(context.l10n.chat_floodModeEnabled),
+                            duration: const Duration(seconds: 2),
                           ),
-                          subtitle: Text(
-                            '${(path.tripTimeMs / 1000).toStringAsFixed(2)}s • ${_formatRelativeTime(path.timestamp)} • ${path.successCount} ${context.l10n.chat_successes}',
-                            style: const TextStyle(fontSize: 11),
-                          ),
-                          trailing: Row(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              IconButton(
-                                icon: const Icon(Icons.close, size: 16),
-                                tooltip: context.l10n.chat_removePath,
-                                onPressed: () async {
-                                  await pathService.removePathRecord(
-                                    widget.contact.publicKeyHex,
-                                    path.pathBytes,
-                                  );
-                                },
-                              ),
-                              path.wasFloodDiscovery
-                                  ? const Icon(
-                                      Icons.waves,
-                                      size: 16,
-                                      color: Colors.grey,
-                                    )
-                                  : const Icon(
-                                      Icons.route,
-                                      size: 16,
-                                      color: Colors.grey,
-                                    ),
-                            ],
-                          ),
-                          onLongPress: () =>
-                              _showFullPathDialog(context, path.pathBytes),
-                          onTap: () async {
-                            if (path.pathBytes.isEmpty) {
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                SnackBar(
-                                  content: Text(
-                                    context.l10n.chat_pathDetailsNotAvailable,
-                                  ),
-                                  duration: const Duration(seconds: 2),
-                                ),
-                              );
-                              return;
-                            }
-
-                            final pathBytes = Uint8List.fromList(
-                              path.pathBytes,
-                            );
-                            final pathLength = path.pathBytes.length;
-
-                            // Set the path override to persist user's choice
-                            await connector.setPathOverride(
-                              widget.contact,
-                              pathLen: pathLength,
-                              pathBytes: pathBytes,
-                            );
-
-                            if (!context.mounted) return;
-                            Navigator.pop(context);
-                            await _notifyPathSet(
-                              connector,
-                              widget.contact,
-                              pathBytes,
-                              path.hopCount,
-                            );
-                          },
-                        ),
-                      );
-                    }),
-                    const Divider(),
-                  ] else ...[
-                    Text(context.l10n.chat_noPathHistoryYet),
-                    const Divider(),
+                        );
+                        Navigator.pop(context);
+                      },
+                    ),
                   ],
-                  const SizedBox(height: 8),
-                  Text(
-                    context.l10n.chat_pathActions,
-                    style: const TextStyle(
-                      fontWeight: FontWeight.bold,
-                      fontSize: 12,
-                    ),
-                  ),
-                  const SizedBox(height: 8),
-                  ListTile(
-                    dense: true,
-                    leading: const CircleAvatar(
-                      radius: 16,
-                      backgroundColor: Colors.purple,
-                      child: Icon(Icons.edit_road, size: 16),
-                    ),
-                    title: Text(
-                      context.l10n.chat_setCustomPath,
-                      style: const TextStyle(fontSize: 14),
-                    ),
-                    subtitle: Text(
-                      context.l10n.chat_setCustomPathSubtitle,
-                      style: const TextStyle(fontSize: 11),
-                    ),
-                    onTap: () {
-                      Navigator.pop(context);
-                      _showCustomPathDialog(context);
-                    },
-                  ),
-                  ListTile(
-                    dense: true,
-                    leading: const CircleAvatar(
-                      radius: 16,
-                      backgroundColor: Colors.orange,
-                      child: Icon(Icons.clear_all, size: 16),
-                    ),
-                    title: Text(
-                      context.l10n.chat_clearPath,
-                      style: const TextStyle(fontSize: 14),
-                    ),
-                    subtitle: Text(
-                      context.l10n.chat_clearPathSubtitle,
-                      style: const TextStyle(fontSize: 11),
-                    ),
-                    onTap: () async {
-                      await connector.clearContactPath(widget.contact);
-                      if (!context.mounted) return;
-                      ScaffoldMessenger.of(context).showSnackBar(
-                        SnackBar(
-                          content: Text(context.l10n.chat_pathCleared),
-                          duration: const Duration(seconds: 2),
-                        ),
-                      );
-                      Navigator.pop(context);
-                    },
-                  ),
-                  ListTile(
-                    dense: true,
-                    leading: const CircleAvatar(
-                      radius: 16,
-                      backgroundColor: Colors.blue,
-                      child: Icon(Icons.waves, size: 16),
-                    ),
-                    title: Text(
-                      context.l10n.chat_forceFloodMode,
-                      style: const TextStyle(fontSize: 14),
-                    ),
-                    subtitle: Text(
-                      context.l10n.chat_floodModeSubtitle,
-                      style: const TextStyle(fontSize: 11),
-                    ),
-                    onTap: () async {
-                      await connector.setPathOverride(
-                        widget.contact,
-                        pathLen: -1,
-                      );
-                      if (!context.mounted) return;
-                      ScaffoldMessenger.of(context).showSnackBar(
-                        SnackBar(
-                          content: Text(context.l10n.chat_floodModeEnabled),
-                          duration: const Duration(seconds: 2),
-                        ),
-                      );
-                      Navigator.pop(context);
-                    },
-                  ),
-                ],
+                ),
               ),
-            ),
-            actions: [
-              TextButton(
-                onPressed: () => Navigator.pop(context),
-                child: Text(context.l10n.common_close),
-              ),
-            ],
-          );
-        },
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.pop(context),
+                  child: Text(context.l10n.common_close),
+                ),
+              ],
+            );
+          },
+        ),
       ),
     );
   }
diff --git a/lib/screens/contacts_screen.dart b/lib/screens/contacts_screen.dart
index 6799d695..d4701075 100644
--- a/lib/screens/contacts_screen.dart
+++ b/lib/screens/contacts_screen.dart
@@ -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';
@@ -90,79 +91,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',
+        );
       }
     });
   }
@@ -229,9 +241,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(
diff --git a/lib/screens/map_screen.dart b/lib/screens/map_screen.dart
index 552f579e..1fad04b6 100644
--- a/lib/screens/map_screen.dart
+++ b/lib/screens/map_screen.dart
@@ -5,6 +5,7 @@ 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';
@@ -17,7 +18,6 @@ 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 'channels_screen.dart';
 import 'chat_screen.dart';
@@ -105,7 +105,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);
@@ -262,8 +262,7 @@ 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: [
@@ -384,8 +383,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(
@@ -826,7 +825,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(
@@ -997,7 +996,7 @@ class _MapScreenState extends State<MapScreen> {
             ),
           ),
           const SizedBox(height: 2),
-          Text(value, style: const TextStyle(fontSize: 14)),
+          SelectableText(value, style: const TextStyle(fontSize: 14)),
         ],
       ),
     );
diff --git a/lib/screens/neighbours_screen.dart b/lib/screens/neighbors_screen.dart
similarity index 75%
rename from lib/screens/neighbours_screen.dart
rename to lib/screens/neighbors_screen.dart
index b6061883..3dee3391 100644
--- a/lib/screens/neighbours_screen.dart
+++ b/lib/screens/neighbors_screen.dart
@@ -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),
+                  ),
+                ],
               ),
             ),
           ),
diff --git a/lib/screens/path_trace_map.dart b/lib/screens/path_trace_map.dart
index 7677d0df..8e24bee1 100644
--- a/lib/screens/path_trace_map.dart
+++ b/lib/screens/path_trace_map.dart
@@ -10,6 +10,7 @@ import 'package:meshcore_open/connector/meshcore_protocol.dart';
 import 'package:meshcore_open/l10n/l10n.dart';
 import 'package:meshcore_open/models/contact.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';
 
@@ -32,7 +33,7 @@ String formatDistance(double distanceMeters) {
 
 class PathTraceData {
   final Uint8List pathData;
-  final Uint8List snrData;
+  final List<double> snrData;
   final Map<int, Contact> pathContacts;
 
   PathTraceData({
@@ -45,6 +46,7 @@ class PathTraceData {
 class PathTraceMapScreen extends StatefulWidget {
   final String title;
   final Uint8List path;
+  final int? repeaterId;
   final bool flipPathRound;
   final bool reversePathRound;
 
@@ -52,6 +54,7 @@ class PathTraceMapScreen extends StatefulWidget {
     super.key,
     required this.title,
     required this.path,
+    this.repeaterId,
     this.flipPathRound = false,
     this.reversePathRound = false,
   });
@@ -96,7 +99,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);
@@ -124,7 +127,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
         : widget.path;
 
     if (widget.flipPathRound) {
-      path = addReturnpath(pathTmp);
+      path = addReturnPath(pathTmp);
     } else {
       path = pathTmp;
     }
@@ -146,42 +149,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;
           });
-        });
-      }
+        }
 
-      if (code == respCodeErr) {
+        // 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;
         setState(() {
           _isLoading = false;
           _failed2Loaded = true;
         });
-      }
-      // 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);
-        }
+        // Handle any parsing errors gracefully
+        appLogger.error('Error parsing frame: $e', tag: 'PathTraceMapScreen');
       }
     });
   }
@@ -190,63 +208,83 @@ 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!));
+      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',
       );
-      _pathDistanceMeters = getPathDistanceMeters(_points);
-    });
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+          _failed2Loaded = true;
+        });
+      }
+    }
   }
 
   @override
@@ -532,6 +570,12 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                           itemCount: pathTraceData.pathData.length + 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(
@@ -550,12 +594,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
diff --git a/lib/screens/repeater_hub_screen.dart b/lib/screens/repeater_hub_screen.dart
index 903f89e6..a5f503d5 100644
--- a/lib/screens/repeater_hub_screen.dart
+++ b/lib/screens/repeater_hub_screen.dart
@@ -6,7 +6,7 @@ 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;
@@ -174,17 +174,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),
                   ),
                 );
               },
diff --git a/lib/widgets/app_bar.dart b/lib/widgets/app_bar.dart
new file mode 100644
index 00000000..c88a5965
--- /dev/null
+++ b/lib/widgets/app_bar.dart
@@ -0,0 +1,48 @@
+import 'package:flutter/material.dart';
+import 'package:meshcore_open/connector/meshcore_connector.dart';
+import 'package:meshcore_open/widgets/battery_indicator.dart';
+import 'package:provider/provider.dart';
+
+import 'snr_indicator.dart';
+
+class AppBarTitle extends StatelessWidget {
+  final String title;
+  final Widget? leading;
+  final Widget? trailing;
+  const AppBarTitle(this.title, {this.leading, this.trailing, super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final connector = context.watch<MeshCoreConnector>();
+
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        leading ?? const SizedBox.shrink(),
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Text(title, overflow: TextOverflow.ellipsis),
+            if (connector.isConnected && connector.selfName != null)
+              Text(
+                '(${connector.selfName})',
+                style: TextStyle(fontSize: 14, color: Colors.grey[600]),
+                overflow: TextOverflow.ellipsis,
+              ),
+          ],
+        ),
+        const SizedBox(width: 8),
+        Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            BatteryIndicator(connector: connector),
+            SNRIndicator(connector: connector),
+          ],
+        ),
+        trailing ?? const SizedBox.shrink(),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/battery_indicator.dart b/lib/widgets/battery_indicator.dart
index 78374150..ccea59dd 100644
--- a/lib/widgets/battery_indicator.dart
+++ b/lib/widgets/battery_indicator.dart
@@ -68,20 +68,24 @@ class _BatteryIndicatorState extends State<BatteryIndicator> {
         child: Row(
           mainAxisSize: MainAxisSize.min,
           children: [
-            Icon(batteryUi.icon, size: 18, color: batteryUi.color),
-            const SizedBox(width: 2),
-            Flexible(
-              child: Text(
-                displayText,
-                style: TextStyle(
-                  fontSize: 12,
-                  fontWeight: FontWeight.w500,
-                  color: batteryUi.color,
+            Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Icon(batteryUi.icon, size: 18, color: batteryUi.color),
+                const SizedBox(height: 2),
+                Flexible(
+                  child: Text(
+                    displayText,
+                    style: TextStyle(
+                      fontSize: 12,
+                      fontWeight: FontWeight.w500,
+                      color: batteryUi.color,
+                    ),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                  ),
                 ),
-                overflow: TextOverflow.visible,
-                maxLines: 1,
-                softWrap: false,
-              ),
+              ],
             ),
           ],
         ),
diff --git a/lib/widgets/path_management_dialog.dart b/lib/widgets/path_management_dialog.dart
index 483697f1..c2b6d12a 100644
--- a/lib/widgets/path_management_dialog.dart
+++ b/lib/widgets/path_management_dialog.dart
@@ -1,7 +1,9 @@
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
+import 'package:meshcore_open/models/path_history.dart';
 import 'package:meshcore_open/screens/path_trace_map.dart';
+import 'package:meshcore_open/widgets/elements_ui.dart';
 import 'package:provider/provider.dart';
 
 import '../connector/meshcore_connector.dart';
@@ -19,15 +21,22 @@ class PathManagementDialog {
   }
 }
 
-class _PathManagementDialog extends StatelessWidget {
+class _PathManagementDialog extends StatefulWidget {
   final Contact contact;
 
   const _PathManagementDialog({required this.contact});
 
+  @override
+  State<_PathManagementDialog> createState() => _PathManagementDialogState();
+}
+
+class _PathManagementDialogState extends State<_PathManagementDialog> {
+  bool _showAllPaths = false;
+
   Contact _resolveContact(MeshCoreConnector connector) {
     return connector.contacts.firstWhere(
-      (c) => c.publicKeyHex == contact.publicKeyHex,
-      orElse: () => contact,
+      (c) => c.publicKeyHex == widget.contact.publicKeyHex,
+      orElse: () => widget.contact,
     );
   }
 
@@ -134,6 +143,59 @@ class _PathManagementDialog extends StatelessWidget {
         final currentContact = _resolveContact(connector);
         final paths = pathService.getRecentPaths(currentContact.publicKeyHex);
 
+        final repeatersList = List.of(connector.directRepeaters)
+          ..sort((a, b) => b.ranking.compareTo(a.ranking));
+
+        if (repeatersList.isEmpty) {
+          _showAllPaths = true;
+        }
+
+        final directRepeater = repeatersList.isEmpty
+            ? null
+            : repeatersList.first;
+        final secondDirectRepeater = repeatersList.length < 2
+            ? null
+            : repeatersList.elementAt(1);
+        final thirdDirectRepeater = repeatersList.length < 3
+            ? null
+            : repeatersList.elementAt(2);
+
+        List<MapEntry<int, MapEntry<Color, PathRecord>>> pathsWithRepeaters =
+            paths.map((path) {
+              final isDirectRepeater =
+                  directRepeater != null &&
+                  path.pathBytes.isNotEmpty &&
+                  directRepeater.pubkeyFirstByte == path.pathBytes.first;
+              final isSecondDirectRepeater =
+                  secondDirectRepeater != null &&
+                  path.pathBytes.isNotEmpty &&
+                  secondDirectRepeater.pubkeyFirstByte == path.pathBytes.first;
+              final isThirdDirectRepeater =
+                  thirdDirectRepeater != null &&
+                  path.pathBytes.isNotEmpty &&
+                  thirdDirectRepeater.pubkeyFirstByte == path.pathBytes.first;
+
+              int ranking = -1;
+              Color color = Colors.grey;
+              if (isDirectRepeater) {
+                color = Colors.green;
+                ranking = 3;
+              } else if (isSecondDirectRepeater) {
+                color = Colors.yellow;
+                ranking = 2;
+              } else if (isThirdDirectRepeater) {
+                color = Colors.red;
+                ranking = 1;
+              } else if (path.wasFloodDiscovery) {
+                color = Colors.blue;
+                ranking = 0;
+              }
+
+              return MapEntry(ranking, MapEntry(color, path));
+            }).toList();
+
+        pathsWithRepeaters.sort((a, b) => b.key.compareTo(a.key));
+
         return AlertDialog(
           title: Text(l10n.chat_pathManagement),
           content: SingleChildScrollView(
@@ -147,6 +209,17 @@ class _PathManagementDialog extends StatelessWidget {
                 ),
                 const SizedBox(height: 12),
                 if (paths.isNotEmpty) ...[
+                  if (repeatersList.isNotEmpty)
+                    FeatureToggleRow(
+                      title: l10n.chat_ShowAllPaths,
+                      subtitle: "",
+                      value: _showAllPaths,
+                      onChanged: (val) {
+                        setState(() {
+                          _showAllPaths = val;
+                        });
+                      },
+                    ),
                   Text(
                     l10n.chat_recentAckPaths,
                     style: const TextStyle(
@@ -154,7 +227,7 @@ class _PathManagementDialog extends StatelessWidget {
                       fontSize: 12,
                     ),
                   ),
-                  if (paths.length >= 100) ...[
+                  if (pathsWithRepeaters.length >= 100) ...[
                     const SizedBox(height: 8),
                     Container(
                       width: double.infinity,
@@ -173,92 +246,99 @@ class _PathManagementDialog extends StatelessWidget {
                     ),
                   ],
                   const SizedBox(height: 8),
-                  ...paths.map((path) {
-                    return Card(
-                      margin: const EdgeInsets.symmetric(vertical: 4),
-                      child: ListTile(
-                        dense: true,
-                        leading: CircleAvatar(
-                          radius: 16,
-                          backgroundColor: path.wasFloodDiscovery
-                              ? Colors.blue
-                              : Colors.green,
-                          child: Text(
-                            '${path.hopCount}',
-                            style: const TextStyle(fontSize: 12),
-                          ),
-                        ),
-                        title: Text(
-                          l10n.chat_hopsCount(path.hopCount),
-                          style: const TextStyle(fontSize: 14),
-                        ),
-                        subtitle: Text(
-                          '${(path.tripTimeMs / 1000).toStringAsFixed(2)}s • ${_formatRelativeTime(context, path.timestamp)} • ${path.successCount} ${l10n.chat_successes}',
-                          style: const TextStyle(fontSize: 11),
-                        ),
-                        trailing: Row(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            IconButton(
-                              icon: const Icon(Icons.close, size: 16),
-                              tooltip: l10n.chat_removePath,
-                              onPressed: () async {
-                                await pathService.removePathRecord(
-                                  currentContact.publicKeyHex,
-                                  path.pathBytes,
-                                );
-                              },
+                  ...pathsWithRepeaters.map((entry) {
+                    final path = entry.value.value;
+                    final color = entry.value.key;
+
+                    if (!_showAllPaths && entry.key < 1) {
+                      return const SizedBox.shrink();
+                    } else {
+                      return Card(
+                        margin: const EdgeInsets.symmetric(vertical: 4),
+                        child: ListTile(
+                          dense: true,
+                          leading: CircleAvatar(
+                            radius: 16,
+                            backgroundColor: color,
+                            child: Text(
+                              '${path.hopCount}',
+                              style: const TextStyle(fontSize: 12),
                             ),
-                            path.wasFloodDiscovery
-                                ? const Icon(
-                                    Icons.waves,
-                                    size: 16,
-                                    color: Colors.grey,
-                                  )
-                                : const Icon(
-                                    Icons.route,
-                                    size: 16,
-                                    color: Colors.grey,
+                          ),
+                          title: Text(
+                            l10n.chat_hopsCount(path.hopCount),
+                            style: const TextStyle(fontSize: 14),
+                          ),
+                          subtitle: Text(
+                            '${(path.tripTimeMs / 1000).toStringAsFixed(2)}s • ${_formatRelativeTime(context, path.timestamp)} • ${path.successCount} ${l10n.chat_successes}',
+                            style: const TextStyle(fontSize: 11),
+                          ),
+                          trailing: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              IconButton(
+                                icon: const Icon(Icons.close, size: 16),
+                                tooltip: l10n.chat_removePath,
+                                onPressed: () async {
+                                  await pathService.removePathRecord(
+                                    currentContact.publicKeyHex,
+                                    path.pathBytes,
+                                  );
+                                },
+                              ),
+                              path.wasFloodDiscovery
+                                  ? const Icon(
+                                      Icons.waves,
+                                      size: 16,
+                                      color: Colors.grey,
+                                    )
+                                  : const Icon(
+                                      Icons.route,
+                                      size: 16,
+                                      color: Colors.grey,
+                                    ),
+                            ],
+                          ),
+                          onLongPress: () =>
+                              _showFullPathDialog(context, path.pathBytes),
+                          onTap: () async {
+                            if (path.pathBytes.isEmpty) {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(
+                                  content: Text(
+                                    l10n.chat_pathDetailsNotAvailable,
                                   ),
-                          ],
-                        ),
-                        onLongPress: () =>
-                            _showFullPathDialog(context, path.pathBytes),
-                        onTap: () async {
-                          if (path.pathBytes.isEmpty) {
+                                  duration: const Duration(seconds: 2),
+                                ),
+                              );
+                              return;
+                            }
+
+                            final pathBytes = Uint8List.fromList(
+                              path.pathBytes,
+                            );
+                            final pathLength = path.pathBytes.length;
+
+                            await connector.setPathOverride(
+                              currentContact,
+                              pathLen: pathLength,
+                              pathBytes: pathBytes,
+                            );
+
+                            if (!context.mounted) return;
+                            Navigator.pop(context);
                             ScaffoldMessenger.of(context).showSnackBar(
                               SnackBar(
                                 content: Text(
-                                  l10n.chat_pathDetailsNotAvailable,
+                                  l10n.path_usingHopsPath(path.hopCount),
                                 ),
                                 duration: const Duration(seconds: 2),
                               ),
                             );
-                            return;
-                          }
-
-                          final pathBytes = Uint8List.fromList(path.pathBytes);
-                          final pathLength = path.pathBytes.length;
-
-                          await connector.setPathOverride(
-                            currentContact,
-                            pathLen: pathLength,
-                            pathBytes: pathBytes,
-                          );
-
-                          if (!context.mounted) return;
-                          Navigator.pop(context);
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(
-                              content: Text(
-                                l10n.path_usingHopsPath(path.hopCount),
-                              ),
-                              duration: const Duration(seconds: 2),
-                            ),
-                          );
-                        },
-                      ),
-                    );
+                          },
+                        ),
+                      );
+                    }
                   }),
                   const Divider(),
                 ] else ...[
diff --git a/lib/widgets/snr_indicator.dart b/lib/widgets/snr_indicator.dart
index da68a65a..db4fb8e1 100644
--- a/lib/widgets/snr_indicator.dart
+++ b/lib/widgets/snr_indicator.dart
@@ -1,4 +1,13 @@
 import 'package:flutter/material.dart';
+import '../connector/meshcore_connector.dart';
+import '../l10n/l10n.dart';
+
+class SNRUi {
+  final IconData icon;
+  final Color color;
+  final String text;
+  const SNRUi(this.icon, this.color, this.text);
+}
 
 List<double> getSNRfromSF(int spreadingFactor) {
   switch (spreadingFactor) {
@@ -19,44 +28,178 @@ List<double> getSNRfromSF(int spreadingFactor) {
   }
 }
 
-class SNRIcon extends StatelessWidget {
-  final double snr;
-  final List<double> snrLevels;
+SNRUi snrUiFromSNR(double? snr, int? spreadingFactor) {
+  if (snr == null ||
+      spreadingFactor == null ||
+      spreadingFactor < 7 ||
+      spreadingFactor > 12) {
+    return const SNRUi(Icons.signal_cellular_off, Colors.grey, '—');
+  }
 
-  const SNRIcon({
-    super.key,
-    required this.snr,
-    this.snrLevels = const [4.0, -2.0, -4.0, -6.0],
-  });
+  final snrLevels = getSNRfromSF(spreadingFactor);
+
+  IconData icon;
+  Color color;
+  String text = '${snr.toStringAsFixed(1)} dB';
+
+  if (snr >= snrLevels[0]) {
+    icon = Icons.signal_cellular_alt;
+    color = Colors.green;
+  } else if (snr >= snrLevels[1]) {
+    icon = Icons.signal_cellular_alt;
+    color = Colors.lightGreen;
+  } else if (snr >= snrLevels[2]) {
+    icon = Icons.signal_cellular_alt;
+    color = Colors.yellow;
+  } else if (snr >= snrLevels[3]) {
+    icon = Icons.signal_cellular_alt_2_bar;
+    color = Colors.orange;
+  } else {
+    icon = Icons.signal_cellular_alt_1_bar;
+    color = Colors.red;
+  }
+
+  return SNRUi(icon, color, text);
+}
+
+class SNRIndicator extends StatefulWidget {
+  final MeshCoreConnector connector;
+
+  const SNRIndicator({super.key, required this.connector});
 
+  @override
+  State<SNRIndicator> createState() => _SNRIndicatorState();
+}
+
+class _SNRIndicatorState extends State<SNRIndicator> {
   @override
   Widget build(BuildContext context) {
-    IconData icon;
-    Color color;
+    final directRepeaters = widget.connector.directRepeaters;
+    final directBestRepeaters = List.of(directRepeaters)
+      ..sort((a, b) => (b.ranking).compareTo(a.ranking));
+    final directRepeater = directBestRepeaters.isEmpty
+        ? null
+        : directBestRepeaters.first;
 
-    if (snr >= snrLevels[0]) {
-      icon = Icons.signal_cellular_alt;
-      color = Colors.green;
-    } else if (snr >= snrLevels[1]) {
-      icon = Icons.signal_cellular_alt;
-      color = Colors.lightGreen;
-    } else if (snr >= snrLevels[2]) {
-      icon = Icons.signal_cellular_alt;
-      color = Colors.yellow;
-    } else if (snr >= snrLevels[3]) {
-      icon = Icons.signal_cellular_alt_2_bar;
-      color = Colors.orange;
-    } else {
-      icon = Icons.signal_cellular_alt_1_bar;
-      color = Colors.red;
+    final snrUi = snrUiFromSNR(
+      directBestRepeaters.isNotEmpty ? directRepeater!.snr : null,
+      widget.connector.currentSf,
+    );
+
+    return InkWell(
+      onTap: () {
+        if (directRepeater != null) {
+          _showFullPathDialog(context, directBestRepeaters);
+        }
+      },
+      borderRadius: BorderRadius.circular(8),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 8),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Icon(snrUi.icon, size: 18, color: snrUi.color),
+                Text(
+                  snrUi.text,
+                  style: TextStyle(fontSize: 12, color: snrUi.color),
+                ),
+              ],
+            ),
+            if (directRepeater != null)
+              Text(
+                '${directRepeaters.length}: ${directRepeater.pubkeyFirstByte.toRadixString(16).padLeft(2, '0')}: ${_formatLastUpdated(directRepeater.lastUpdated)}',
+                style: TextStyle(
+                  fontSize: 12,
+                  fontWeight: FontWeight.w500,
+                  color: Colors.grey,
+                ),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  String _formatLastUpdated(DateTime lastSeen) {
+    final now = DateTime.now();
+    final diff = now.difference(lastSeen);
+    if (diff.isNegative) {
+      return "0s";
     }
+    if (diff.inMinutes < 1) {
+      return "${diff.inSeconds}s";
+    }
+    if (diff.inMinutes < 60) {
+      return "${diff.inMinutes}m";
+    }
+    if (diff.inHours < 24) {
+      final hours = diff.inHours;
+      return "${hours}h";
+    }
+    final days = diff.inDays;
+    return "${days}d";
+  }
 
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: [
-        Icon(icon, color: color),
-        Text('$snr dB', style: TextStyle(fontSize: 10, color: color)),
-      ],
+  void _showFullPathDialog(
+    BuildContext context,
+    List<DirectRepeater> directBestRepeaters,
+  ) {
+    final l10n = context.l10n;
+
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(l10n.snrIndicator_nearByRepeaters),
+        content: SizedBox(
+          child: Scrollbar(
+            child: ListView.separated(
+              padding: const EdgeInsets.symmetric(vertical: 4),
+              itemCount: directBestRepeaters.length,
+              separatorBuilder: (_, _) => const Divider(height: 1),
+              itemBuilder: (context, index) {
+                final repeater = directBestRepeaters[index];
+                final snrUi = snrUiFromSNR(
+                  repeater.snr,
+                  widget.connector.currentSf,
+                );
+
+                final name = widget.connector.contacts
+                    .where((c) => c.publicKey.first == repeater.pubkeyFirstByte)
+                    .map((c) => c.name)
+                    .firstOrNull;
+
+                return Column(
+                  children: [
+                    ListTile(
+                      leading: Icon(snrUi.icon, color: snrUi.color),
+                      title: Text(
+                        name ??
+                            repeater.pubkeyFirstByte
+                                .toRadixString(16)
+                                .padLeft(2, '0'),
+                      ),
+                      subtitle: Text(
+                        'SNR: ${repeater.snr.toStringAsFixed(1)} dB\n${l10n.snrIndicator_lastSeen}: ${_formatLastUpdated(repeater.lastUpdated)}',
+                      ),
+                    ),
+                  ],
+                );
+              },
+            ),
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: Text(l10n.common_close),
+          ),
+        ],
+      ),
     );
   }
 }
diff --git a/pubspec.lock b/pubspec.lock
index 09e93017..f6958384 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -69,10 +69,10 @@ packages:
     dependency: "direct main"
     description:
       name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   checked_yaml:
     dependency: transitive
     description:
@@ -497,18 +497,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.17"
+    version: "0.12.18"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.1"
+    version: "0.13.0"
   meta:
     dependency: transitive
     description:
@@ -910,10 +910,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
+      sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.7"
+    version: "0.7.9"
   timezone:
     dependency: transitive
     description: