diff --git a/bitmaps.c b/bitmaps.c
index 361ecda..d6b3185 100644
--- a/bitmaps.c
+++ b/bitmaps.c
@@ -71,6 +71,12 @@ const uint8_t gFontXB[2][6] =
 	{0x00, 0x7f, 0x49, 0x49, 0x49, 0x36},
 };
 
+const uint8_t gFontMO[2][6] =
+{	// "MO"
+	{0x00, 0x7f, 0x2, 0x1c, 0x2, 0x7f},
+	{0x00, 0x3e, 0x41, 0x41, 0x41, 0x3e},
+};
+
 const uint8_t gFontDWR[3][6] =
 {	// "DWR"
 
@@ -81,8 +87,8 @@ const uint8_t gFontDWR[3][6] =
 
 const uint8_t gFontHold[2][5] =
 {	// "><" .. DW on hold
-	{0x0, 0x41, 0x22, 0x14, 0x8},
-	{0x0, 0x8, 0x14, 0x22, 0x41},
+	{0x00, 0x41, 0x22, 0x14, 0x8},
+	{0x00, 0x8, 0x14, 0x22, 0x41},
 };
 
 const uint8_t BITMAP_BatteryLevel[2] =
diff --git a/bitmaps.h b/bitmaps.h
index 087a28b..8db1421 100644
--- a/bitmaps.h
+++ b/bitmaps.h
@@ -16,6 +16,7 @@ extern const uint8_t gFontScanAll[10];
 extern const uint8_t gFontF[1][7];
 */
 extern const uint8_t gFontXB[2][6];
+extern const uint8_t gFontMO[2][6];
 extern const uint8_t gFontDWR[3][6];
 extern const uint8_t gFontHold[2][5];
 
diff --git a/ui/main.c b/ui/main.c
index 1f0fc26..2b43799 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -1058,7 +1058,7 @@ void UI_DisplayMain(void)
 				if (code_type < ARRAY_SIZE(code_list))
 					s = code_list[code_type];
 #ifdef ENABLE_FEAT_F4HWN
-				if(gCurrentFunction != FUNCTION_TRANSMIT)
+				if(gCurrentFunction != FUNCTION_TRANSMIT || activeTxVFO != vfo_num)
 					t = gModulationStr[mod];
 #endif
 				break;
@@ -1093,22 +1093,26 @@ void UI_DisplayMain(void)
 
 		if (isMainOnly(true))
 		{
-			UI_PrintStringSmallNormal(s, 24, 0, 2);
-			UI_PrintStringSmallNormal(t, 2, 0, 2);
-			if(shift == 0)
-			{
-				UI_PrintStringSmallNormal(String, 2, 0, 6);
-			}
+			UI_PrintStringSmallNormal(s, LCD_WIDTH + 24, 0, line + 1);
+			UI_PrintStringSmallNormal(t, LCD_WIDTH + 2, 0, line + 1);
 
-			if((vfoInfo->StepFrequency / 100) < 100)
+			if (isMainOnly(false))
 			{
-				sprintf(String, "%d.%02uK", vfoInfo->StepFrequency / 100, vfoInfo->StepFrequency % 100);
+				if(shift == 0)
+				{
+					UI_PrintStringSmallNormal(String, 2, 0, 6);
+				}
+
+				if((vfoInfo->StepFrequency / 100) < 100)
+				{
+					sprintf(String, "%d.%02uK", vfoInfo->StepFrequency / 100, vfoInfo->StepFrequency % 100);
+				}
+				else
+				{
+					sprintf(String, "%dK", vfoInfo->StepFrequency / 100);				
+				}
+				UI_PrintStringSmallNormal(String, 46, 0, 6);
 			}
-			else
-			{
-				sprintf(String, "%dK", vfoInfo->StepFrequency / 100);				
-			}
-			UI_PrintStringSmallNormal(String, 46, 0, 6);
 		}
 		else
 		{
@@ -1203,8 +1207,8 @@ void UI_DisplayMain(void)
 #if ENABLE_FEAT_F4HWN
 		if (isMainOnly(true))
 		{
-			if (vfoInfo->CHANNEL_BANDWIDTH == BANDWIDTH_NARROW)
-				UI_PrintStringSmallNormal("N", LCD_WIDTH + 80, 0, line + 1);	
+			const char *bandWidthNames[] = {"W", "N"};
+			UI_PrintStringSmallNormal(bandWidthNames[vfoInfo->CHANNEL_BANDWIDTH], LCD_WIDTH + 80, 0, line + 1);
 		}
 		else
 		{
@@ -1242,7 +1246,7 @@ void UI_DisplayMain(void)
 	 		 	{
 					sprintf(String, "SQL%d", gEeprom.SQUELCH_LEVEL);
 	 		 	}
-				UI_PrintStringSmallNormal(String, 94, 0, 2);
+				UI_PrintStringSmallNormal(String, LCD_WIDTH + 98, 0, line + 1);
  			}
  			else
  			{
diff --git a/ui/status.c b/ui/status.c
index ed447a9..b267d37 100644
--- a/ui/status.c
+++ b/ui/status.c
@@ -121,6 +121,10 @@ void UI_DisplayStatus()
 		else if(dw == 2) { // XB - crossband
 			memcpy(line + x + 2, gFontXB, sizeof(gFontXB));
 		}
+		else
+		{
+			memcpy(line + x + 2, gFontMO, sizeof(gFontMO));
+		}
 	}
 	x += sizeof(gFontDWR) + 3;