diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt
index b8ca19f1..1218aa7a 100644
--- a/HMI/n2t-out/nspanel_Stats.txt
+++ b/HMI/n2t-out/nspanel_Stats.txt
@@ -6,10 +6,6 @@ pageIcons
 	6    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
-popupNotify
-	15   Component(s)
-	143  Line(s) of event code
-	95   Unique line(s) of event code
 pageSerialTest
 	13   Component(s)
 	48   Line(s) of event code
@@ -30,6 +26,10 @@ pageSwipeTest
 	18   Component(s)
 	62   Line(s) of event code
 	44   Unique line(s) of event code
+popupNotify
+	16   Component(s)
+	152  Line(s) of event code
+	100  Unique line(s) of event code
 pageTest
 	14   Component(s)
 	14   Line(s) of event code
@@ -61,6 +61,6 @@ cardGrid
 
 Total
 	14   Page(s)
-	342  Component(s)
-	3105 Line(s) of event code
-	765  Unique line(s) of event code
+	343  Component(s)
+	3114 Line(s) of event code
+	769  Unique line(s) of event code
diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt
index 2e03cc75..7fa9f2c2 100644
--- a/HMI/n2t-out/popupNotify.txt
+++ b/HMI/n2t-out/popupNotify.txt
@@ -46,7 +46,14 @@ Variable (string) strCommand
         ID            : 8
         Scope         : local
         Text          : 
-        Max. Text Size: 500
+        Max. Text Size: 600
+    
+Variable (string) entn
+    Attributes
+        ID            : 15
+        Scope         : local
+        Text          : 
+        Max. Text Size: 30
     
 Text tSend
     Attributes
@@ -316,7 +323,7 @@ Button b2
     Events
         Touch Press Event
             //craft command
-            tSend.txt="event,buttonPress,D,D,D,1,notifyAction,yes"
+            tSend.txt="event,buttonPress,D,D,"+entn.txt+",1,notifyAction,yes"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -364,7 +371,7 @@ Button b1
     Events
         Touch Press Event
             //craft command
-            tSend.txt="event,buttonPress,D,D,D,1,notifyAction,no"
+            tSend.txt="event,buttonPress,D,D,"+entn.txt+",1,notifyAction,no"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -451,14 +458,24 @@ Timer tmSerial
                                     spstr strCommand.txt,tInstruction.txt,",",0
                                     if(tInstruction.txt=="entityUpdateDetail")
                                     {
+                                        // get entn
+                                        spstr strCommand.txt,entn.txt,",",1
                                         // get Heading
-                                        spstr strCommand.txt,tHeading.txt,",",1
+                                        spstr strCommand.txt,tHeading.txt,",",2
                                         // get b1
-                                        spstr strCommand.txt,b1.txt,",",2
+                                        spstr strCommand.txt,b1.txt,",",3
+                                        if(b1.txt!="")
+                                        {
+                                            vis b1,1
+                                        }
                                         // get b2
-                                        spstr strCommand.txt,b2.txt,",",3
+                                        spstr strCommand.txt,b2.txt,",",4
+                                        if(b2.txt!="")
+                                        {
+                                            vis b2,1
+                                        }
                                         // get tText
-                                        spstr strCommand.txt,tText.txt,",",4
+                                        spstr strCommand.txt,tText.txt,",",5
                                     }
                                     if(tInstruction.txt=="time")
                                     {