diff --git a/src/gui.cpp b/src/gui.cpp
index cea9277..433e626 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -465,6 +465,10 @@ void BuildAFScreen() {
   PIold = " ";
   PSold = " ";
   xPos = 0;
+  xPos2 = 0;
+  xPos3 = 0;
+  xPos4 = 0;
+  xPos5 = 0;
   for (byte i = 0; i < 20; i++) {
     mappedfreqold[i] = 0;
     mappedfreqold2[i] = 0;
@@ -1554,6 +1558,7 @@ void BuildAdvancedRDS() {
   xPos2 = 0;
   xPos3 = 0;
   xPos4 = 0;
+  xPos5 = 0;
 }
 
 void BuildDisplay() {
@@ -1707,6 +1712,10 @@ void BuildDisplay() {
   BWreset = true;
   dropout = false;
   xPos = 0;
+  xPos2 = 0;
+  xPos3 = 0;
+  xPos4 = 0;
+  xPos5 = 0;
 }
 
 void MenuUp() {
@@ -4155,7 +4164,7 @@ void DoMenu() {
               char key [9];
               XDRGTK_key.toCharArray(key, 9);
               UpdateFonts(2);
-			  UpdateSprites(1);
+              UpdateSprites(1);
               WiFiConnectParam XDRGTK_key_text("Set XDRGTK Password: (max 8 characters)");
               WiFiConnectParam XDRGTK_key_input("XDRGTK_key", "Password", key, 9);
               wc.addParameter(&XDRGTK_key_text);
@@ -4164,7 +4173,7 @@ void DoMenu() {
               XDRGTK_key = XDRGTK_key_input.getValue();
               EEPROM.writeString(EE_STRING_XDRGTK_KEY, XDRGTK_key);
               EEPROM.commit();
-			  UpdateSprites(0);
+              UpdateSprites(0);
               UpdateFonts(1);
               wifi = true;
               tryWiFi();
diff --git a/src/rds.cpp b/src/rds.cpp
index 40c72e1..b3501c0 100644
--- a/src/rds.cpp
+++ b/src/rds.cpp
@@ -85,7 +85,7 @@ void ShowAdvancedRDS() {
   }
 
   if (millis() - afticker >= 5) {
-    if (radio.rds.hasAF) {
+    if (radio.rds.hasAF && afstring.length() > 30) {
       if (afstring.length() != afstringlengthold) {
         afstringWidth = afstring.length() * charwidth;
         afstringlengthold = afstring.length();
@@ -107,7 +107,7 @@ void ShowAdvancedRDS() {
     RDSSprite.fillSprite(BackgroundColor);
     if (RDSstatus) RDSSprite.setTextColor(RDSColor, RDSColorSmooth, false); else RDSSprite.setTextColor(RDSDropoutColor, RDSDropoutColorSmooth, false);
     RDSSprite.drawString(afstring, xPos2, 2);
-    if (radio.rds.hasAF) RDSSprite.drawString(afstring, xPos2 + afstringWidth, 2);
+    if (radio.rds.hasAF && afstring.length() > 30) RDSSprite.drawString(afstring, xPos2 + afstringWidth, 2);
     RDSSprite.pushSprite(35, 197);
     afticker = millis();
   }