diff --git a/app/menu.c b/app/menu.c
index b6cee58..39d83fc 100644
--- a/app/menu.c
+++ b/app/menu.c
@@ -119,7 +119,6 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
 
 		case MENU_FREQ_LOCK:
 			*pMin = 0;
-//			*pMax = ARRAY_SIZE(g_sub_menu_freq_lock) - 1;
 			*pMax = FREQ_LOCK_LAST - 1;
 			break;
 
diff --git a/firmware.bin b/firmware.bin
index 7db26f2..b869645 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index f4c5c7a..1a266f8 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/frequencies.c b/frequencies.c
index db413bb..8a02dc9 100644
--- a/frequencies.c
+++ b/frequencies.c
@@ -208,7 +208,13 @@ int TX_freq_check(const uint32_t Frequency)
 
 		#ifdef ENABLE_TX_UNLOCK
 			case FREQ_LOCK_TX_UNLOCK:
-				return 0;
+			{
+				unsigned int i;
+				for (i = 0; i < ARRAY_SIZE(FREQ_BAND_TABLE); i++)
+					if (Frequency >= FREQ_BAND_TABLE[i].lower && Frequency < FREQ_BAND_TABLE[i].upper)
+						return 0;
+				break;
+			}
 		#endif
 	}
 
diff --git a/ui/menu.c b/ui/menu.c
index 919fa12..b1fd1aa 100644
--- a/ui/menu.c
+++ b/ui/menu.c
@@ -749,22 +749,22 @@ void UI_DisplayMenu(void)
 		#endif
 
 		case MENU_350_EN:
-			strcpy(String, "350 ~ 400\n");
+			strcpy(String, "350~400\n");
 			strcat(String, g_sub_menu_DIS_EN[g_sub_menu_selection]);
 			break;
 
 		case MENU_350_TX:
-			strcpy(String, "TX\n350 ~ 400\n");
+			strcpy(String, "TX\n350~400\n");
 			strcat(String, g_sub_menu_DIS_EN[g_sub_menu_selection]);
 			break;
 
 		case MENU_174_TX:
-			strcpy(String, "TX\n174 ~ 350\n");
+			strcpy(String, "TX\n174~350\n");
 			strcat(String, g_sub_menu_DIS_EN[g_sub_menu_selection]);
 			break;
 
 		case MENU_470_TX:
-			strcpy(String, "TX\n470 ~ 600\n");
+			strcpy(String, "TX\n470~600\n");
 			strcat(String, g_sub_menu_DIS_EN[g_sub_menu_selection]);
 			break;
 
@@ -1068,7 +1068,7 @@ void UI_DisplayMenu(void)
 					break;
 				#ifdef ENABLE_TX_UNLOCK
 					case FREQ_LOCK_TX_UNLOCK:
-						sprintf(String, "UNLOCKED\n%u ~ %u", BX4819_BAND1.lower / 100000, BX4819_BAND2.upper / 100000);
+						sprintf(String, "UNLOCKED\n%u~%u", BX4819_BAND1.lower / 100000, BX4819_BAND2.upper / 100000);
 						break;
 				#endif
 			}
diff --git a/ui/menu.h b/ui/menu.h
index b5051b1..2906ba3 100644
--- a/ui/menu.h
+++ b/ui/menu.h
@@ -139,11 +139,11 @@ enum
 
 	MENU_SCRAMBLER_EN, // scrambler enable/disable
 	MENU_FREQ_LOCK,    // lock to a selected region
-	MENU_174_TX,       // 174~350MHz TX enable/disable
 	MENU_350_EN,       // 350~400MHz enable/disable
+	MENU_174_TX,       // 174~350MHz TX enable/disable
 	MENU_350_TX,       // 350~400MHz TX enable/disable
 	MENU_470_TX,       // 470MHz and up TX enable/disable
-	MENU_TX_EN,        // can disable the TX entirely
+	MENU_TX_EN,        // disable the TX entirely
 
 	// ************************************
 	// ************************************