diff --git a/notification_producer/cli.py b/notification_producer/cli.py
index b6fb31e..711b4ca 100644
--- a/notification_producer/cli.py
+++ b/notification_producer/cli.py
@@ -30,22 +30,25 @@ def up(
 
 @notify.command()
 def message(
+        notification_title: str = typer.Option(
+            "notification", "--title", "-t",
+            help="[b yellow]The title[/] for the [y b]notification[/].",
+            rich_help_panel="Notification",
+        ),
+        notification_message: str = typer.Option(
+            '', "--message", "-m",
+            help="[b yellow]The message[/] for the [y b]notification[/].",
+            rich_help_panel="Notification",
+        ),
         ip: str = typer.Option(
             "127.0.0.1", "--ip", "-i",
             help="The server's ip.",
+            rich_help_panel="Connection",
         ),
         port: int = typer.Option(
             5554, "--port", "-p",
             help="The server's port for [b]producers[/].",
-        ),
-        notification_title: str = typer.Option(
-            "notification", "--title", "-t",
-            help="[b yellow]The title[/] for the [y b]notification[/]."
-        ),
-        # TODO as argument (required)
-        notification_message: str = typer.Option(
-            'hello', "--title", "-t",
-            help="[b yellow]The message[/] for the [y b]notification[/]."
+            rich_help_panel="Connection",
         ),
 ):
     """