diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/Contents.json b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/Contents.json
index 06ebbbb1..7f0651c4 100644
--- a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/Contents.json
+++ b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "play_store_icon_114px-2.png",
+      "filename" : "heltecwsl 2.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "play_store_icon_114px-3.png",
+      "filename" : "heltecwsl 1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "play_store_icon_114px-4.png",
+      "filename" : "heltecwsl.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl 1.png b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl 1.png
new file mode 100644
index 00000000..63ecd895
Binary files /dev/null and b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl 1.png differ
diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl 2.png b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl 2.png
new file mode 100644
index 00000000..63ecd895
Binary files /dev/null and b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl 2.png differ
diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl.png b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl.png
new file mode 100644
index 00000000..63ecd895
Binary files /dev/null and b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/heltecwsl.png differ
diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-2.png
deleted file mode 100644
index 79cf0e00..00000000
Binary files a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-2.png and /dev/null differ
diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-3.png
deleted file mode 100644
index 79cf0e00..00000000
Binary files a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-3.png and /dev/null differ
diff --git a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-4.png
deleted file mode 100644
index 79cf0e00..00000000
Binary files a/Meshtastic/Assets.xcassets/HELTECWSLV3.imageset/play_store_icon_114px-4.png and /dev/null differ
diff --git a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/Contents.json b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/Contents.json
index 06ebbbb1..dc52568b 100644
--- a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/Contents.json
+++ b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "play_store_icon_114px-2.png",
+      "filename" : "tbeam_supreme 2.jpg",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "play_store_icon_114px-3.png",
+      "filename" : "tbeam_supreme 1.jpg",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "play_store_icon_114px-4.png",
+      "filename" : "tbeam_supreme.jpg",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-2.png b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-2.png
deleted file mode 100644
index 79cf0e00..00000000
Binary files a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-2.png and /dev/null differ
diff --git a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-3.png b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-3.png
deleted file mode 100644
index 79cf0e00..00000000
Binary files a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-3.png and /dev/null differ
diff --git a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-4.png b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-4.png
deleted file mode 100644
index 79cf0e00..00000000
Binary files a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/play_store_icon_114px-4.png and /dev/null differ
diff --git a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme 1.jpg b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme 1.jpg
new file mode 100644
index 00000000..47fa5964
Binary files /dev/null and b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme 1.jpg differ
diff --git a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme 2.jpg b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme 2.jpg
new file mode 100644
index 00000000..47fa5964
Binary files /dev/null and b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme 2.jpg differ
diff --git a/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme.jpg b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme.jpg
new file mode 100644
index 00000000..47fa5964
Binary files /dev/null and b/Meshtastic/Assets.xcassets/LILYGOTBEAMS3CORE.imageset/tbeam_supreme.jpg differ
diff --git a/Meshtastic/Views/Helpers/LoRaSignalStrength.swift b/Meshtastic/Views/Helpers/LoRaSignalStrength.swift
index ee897c97..38bf0dab 100644
--- a/Meshtastic/Views/Helpers/LoRaSignalStrength.swift
+++ b/Meshtastic/Views/Helpers/LoRaSignalStrength.swift
@@ -47,25 +47,49 @@ struct LoRaSignalStrengthMeter: View {
 
 struct LoRaSignalStrengthMeter_Previews: PreviewProvider {
 	static var previews: some View {
-		VStack {
-			LoRaSignalStrengthMeter(snr: -10, rssi: -100, preset: ModemPresets.longFast, compact: false)
-			LoRaSignalStrengthMeter(snr: -17.5, rssi: -100, preset: ModemPresets.longFast, compact: false)
-			LoRaSignalStrengthMeter(snr: -12.75, rssi: -139, preset: ModemPresets.longFast, compact: false)
-			LoRaSignalStrengthMeter(snr: -20.25, rssi: -128, preset: ModemPresets.longFast, compact: false)
-			LoRaSignalStrengthMeter(snr: -30, rssi: -128, preset: ModemPresets.longFast, compact: false)
+		ScrollView {
+			VStack {
+				HStack {
+					// Good
+					LoRaSignalStrengthMeter(snr: -10, rssi: -100, preset: ModemPresets.longFast, compact: false)
+					LoRaSignalStrengthMeter(snr: -17, rssi: -100, preset: ModemPresets.longFast, compact: false)
+				}
+				HStack {
+					// Fair
+					LoRaSignalStrengthMeter(snr: -9.5, rssi: -119, preset: ModemPresets.longFast, compact: false)
+					LoRaSignalStrengthMeter(snr: -17.5, rssi: -100, preset: ModemPresets.longFast, compact: false)
+				}
+				HStack {
+					// Bad
+					LoRaSignalStrengthMeter(snr: -11.25, rssi: -120, preset: ModemPresets.longFast, compact: false)
+					LoRaSignalStrengthMeter(snr: -12.75, rssi: -139, preset: ModemPresets.longFast, compact: false)
+				}
+				HStack {
+					LoRaSignalStrengthMeter(snr: -20.25, rssi: -128, preset: ModemPresets.longFast, compact: false)
+					LoRaSignalStrengthMeter(snr: -30, rssi: -120, preset: ModemPresets.longFast, compact: false)
+				}
+				HStack {
+					LoRaSignalStrengthMeter(snr: -15, rssi: -124, preset: ModemPresets.longFast, compact: false)
+					LoRaSignalStrengthMeter(snr: -17.25, rssi: -126, preset: ModemPresets.longFast, compact: false)
+					LoRaSignalStrengthMeter(snr: -19.5, rssi: -128, preset: ModemPresets.longFast, compact: false)
+				}
+				HStack {
+					// None
+					LoRaSignalStrengthMeter(snr: -26.0, rssi: -129, preset: ModemPresets.longFast, compact: false)
+				}
+			}
 		}
+
 		VStack {
+			// Good
 			LoRaSignalStrengthMeter(snr: -10, rssi: -100, preset: ModemPresets.longFast, compact: true)
-				.padding(.bottom)
-			LoRaSignalStrengthMeter(snr: -17.5, rssi: -100, preset: ModemPresets.longFast, compact: true)
-				.padding(.bottom)
+			// Fair
+			LoRaSignalStrengthMeter(snr: -9.5, rssi: -119, preset: ModemPresets.longFast, compact: true)
+			// Bad
 			LoRaSignalStrengthMeter(snr: -12.75, rssi: -139, preset: ModemPresets.longFast, compact: true)
-				.padding(.bottom)
-			LoRaSignalStrengthMeter(snr: -20.25, rssi: -128, preset: ModemPresets.longFast, compact: true)
-				.padding(.bottom)
-			LoRaSignalStrengthMeter(snr: -30, rssi: -128, preset: ModemPresets.longFast, compact: true)
+			// None
+			LoRaSignalStrengthMeter(snr: -26.0, rssi: -128, preset: ModemPresets.longFast, compact: true)
 		}
-		.padding()
 	}
 }
 
diff --git a/Meshtastic/Views/Nodes/NodeList.swift b/Meshtastic/Views/Nodes/NodeList.swift
index 2802c788..251962e0 100644
--- a/Meshtastic/Views/Nodes/NodeList.swift
+++ b/Meshtastic/Views/Nodes/NodeList.swift
@@ -35,7 +35,7 @@ struct NodeList: View {
 				} else {
 					NavigationLink(value: node) {
 						let connected: Bool = (bleManager.connectedPeripheral != nil && bleManager.connectedPeripheral?.num ?? -1 == node.num)
-						VStack(alignment: .leading) {
+						LazyVStack(alignment: .leading) {
 							HStack {
 								VStack(alignment: .leading) {
 									CircleText(text: node.user?.shortName ?? "???", color: Color(UIColor(hex: UInt32(node.num))), circleSize: 65, fontSize: (node.user?.shortName ?? "???").isEmoji() ? 44 : 22, brightness: 0.0, textColor: UIColor(hex: UInt32(node.num)).isLight() ? .black : .white)