diff --git a/modules/system.py b/modules/system.py
index 4c43bc9..f621daa 100644
--- a/modules/system.py
+++ b/modules/system.py
@@ -13,7 +13,7 @@ from modules.log import *
 
 # Global Variables
 trap_list = ("cmd","cmd?") # default trap list
-help_message = "Bot CMD?:\n"
+help_message = "Bot CMD?:"
 asyncLoop = asyncio.new_event_loop()
 games_enabled = False
 multiPingList = [{'message_from_id': 0, 'count': 0, 'type': '', 'deviceID': 0, 'channel_number': 0, 'startCount': 0}]
@@ -191,6 +191,14 @@ if file_monitor_enabled or read_news_enabled:
         trap_list = trap_list + trap_list_filemon # items readnews
         help_message = help_message + ", readmail"
 
+# clean up the help message
+help_message = help_message.split(", ")
+help_message.sort()
+if len(help_message) > 20:
+    # split in half for formatting
+    help_message = help_message[:len(help_message)//2] + ["\nCMD?"] + help_message[len(help_message)//2:]
+help_message = ", ".join(help_message)
+
 # BLE dual interface prevention
 if interface1_type == 'ble' and interface2_type == 'ble':
     logger.critical(f"System: BLE Interface1 and Interface2 cannot both be BLE. Exiting")
@@ -1129,4 +1137,3 @@ async def watchdog():
                 except Exception as e:
                     logger.error(f"System: retrying interface2: {e}")
 
-