diff --git a/App/app/aircopy.c b/App/app/aircopy.c
index a2ec1322..97d85839 100644
--- a/App/app/aircopy.c
+++ b/App/app/aircopy.c
@@ -39,7 +39,7 @@ static const uint16_t Obfuscation[8] = { 0x6C16, 0xE614, 0x912E, 0x400D, 0x3521,
 AIRCOPY_State_t gAircopyState;
 uint16_t gAirCopyBlockNumber;
 uint16_t gErrorsDuringAirCopy;
-uint8_t gAirCopyIsSendMode;
+bool     gAirCopyIsSendMode;
 
 uint16_t g_FSK_Buffer[36];
 
diff --git a/App/app/aircopy.h b/App/app/aircopy.h
index 9aba37bb..ce2a4032 100644
--- a/App/app/aircopy.h
+++ b/App/app/aircopy.h
@@ -92,7 +92,7 @@ typedef enum {
 extern AIRCOPY_State_t gAircopyState;
 extern uint16_t        gAirCopyBlockNumber;
 extern uint16_t        gErrorsDuringAirCopy;
-extern uint8_t         gAirCopyIsSendMode;
+extern bool            gAirCopyIsSendMode;
 
 extern uint16_t        g_FSK_Buffer[36];
 
diff --git a/App/audio.c b/App/audio.c
index 44295ef0..f2c2f23c 100644
--- a/App/audio.c
+++ b/App/audio.c
@@ -36,6 +36,13 @@
 
 BEEP_Type_t gBeepToPlay = BEEP_NONE;
 
+static void AUDIO_PlayBeepPulse(void) {
+    BK4819_ExitTxMute();
+    SYSTEM_DelayMs(60);
+    BK4819_EnterTxMute();
+    SYSTEM_DelayMs(20);
+}
+
 void AUDIO_PlayBeep(BEEP_Type_t Beep)
 {
 
@@ -128,17 +135,11 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
     switch (Beep)
     {
         case BEEP_880HZ_60MS_DOUBLE_BEEP:
-            BK4819_ExitTxMute();
-            SYSTEM_DelayMs(60);
-            BK4819_EnterTxMute();
-            SYSTEM_DelayMs(20);
+            AUDIO_PlayBeepPulse();
             [[fallthrough]];
         case BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL:
         case BEEP_500HZ_60MS_DOUBLE_BEEP:
-            BK4819_ExitTxMute();
-            SYSTEM_DelayMs(60);
-            BK4819_EnterTxMute();
-            SYSTEM_DelayMs(20);
+            AUDIO_PlayBeepPulse();
             [[fallthrough]];
         case BEEP_1KHZ_60MS_OPTIONAL:
             BK4819_ExitTxMute();
diff --git a/App/ui/main.c b/App/ui/main.c
index f30dbf62..28adfe45 100644
--- a/App/ui/main.c
+++ b/App/ui/main.c
@@ -1353,11 +1353,8 @@ void UI_DisplayMain(void)
             break;
 
             case 2:
-            sprintf(String, "%03oN", DCS_Options[pConfig->Code]);
-            break;
-
             case 3:
-            sprintf(String, "%03oI", DCS_Options[pConfig->Code]);
+            sprintf(String, (int)pConfig->CodeType == 2 ? "%03oN" : "%03oI", DCS_Options[pConfig->Code]);
             break;
 
             default:
diff --git a/App/ui/menu.c b/App/ui/menu.c
index a9b486ed..80c94a58 100644
--- a/App/ui/menu.c
+++ b/App/ui/menu.c
@@ -968,9 +968,10 @@ void UI_DisplayMenu(void)
             break;
 
         case MENU_LIST_CH:
+        case MENU_S_LIST:
             if (gSubMenuSelection == MR_CHANNELS_LIST + 1)
                 strcpy(String, "ALL");
-            else if (gSubMenuSelection == 0)
+            else if (gSubMenuSelection == 0 && UI_MENU_GetCurrentMenuId() == MENU_LIST_CH)
                 strcpy(String, "OFF");
             else {
                 const char *name = gListName[gSubMenuSelection - 1];
@@ -982,20 +983,7 @@ void UI_DisplayMenu(void)
                     sprintf(String, "%02u (%.3s)", gSubMenuSelection, name);
             }
             break;
-
-        case MENU_S_LIST:
-            if (gSubMenuSelection == MR_CHANNELS_LIST + 1)
-                strcpy(String, "ALL");
-            else {
-                const char *name = gListName[gSubMenuSelection - 1];
-                // If first character is empty/invalid, display "N/A"
-                if (IsEmptyName(name, sizeof(gListName[0])))
-                    sprintf(String, "%02u", gSubMenuSelection);
-                else
-                    sprintf(String, "%02u (%.3s)", gSubMenuSelection, name);
-            }
-            break;
-
+            
         #ifdef ENABLE_ALARM
             case MENU_AL_MOD:
                 sprintf(String, gSubMenu_AL_MOD[gSubMenuSelection]);
diff --git a/App/ui/status.c b/App/ui/status.c
index b2a97bc9..ec53fe20 100644
--- a/App/ui/status.c
+++ b/App/ui/status.c
@@ -99,15 +99,8 @@ void UI_DisplayStatus()
 
                 if(gEeprom.SCAN_LIST_DEFAULT == MR_CHANNELS_LIST + 1)
                 {
-                    if(gEeprom.SCAN_LIST_ENABLED==1) {
-                        sprintf(str, "%s+", "ALL");
-                        end = 18;
-                    }
-                    else
-                    {
-                        sprintf(str, "%s", "ALL");
-                        end = 14;
-                    }
+                    sprintf(str, gEeprom.SCAN_LIST_ENABLED ? "%s+" : "%s", "ALL");
+                    end = gEeprom.SCAN_LIST_ENABLED ? 18 : 14;
                 }
                 else
                 {