diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt
index 3eb07475..a1def98a 100644
--- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt
@@ -1015,7 +1015,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardAlarm,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt
index f8ad8bad..774d72ba 100644
--- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt
@@ -1056,7 +1056,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardEntities,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt
index 6e87d739..5e6ceb20 100644
--- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt
@@ -858,7 +858,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardGrid,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt
index 72d3bb1f..c76d7ded 100644
--- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt
@@ -829,7 +829,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardMedia,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/landscape/n2t-out-visual/cardPower.txt b/HMI/US/landscape/n2t-out-visual/cardPower.txt
index 1faf3a85..a01c3b4f 100644
--- a/HMI/US/landscape/n2t-out-visual/cardPower.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardPower.txt
@@ -802,7 +802,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardPower,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt
index f02da680..94af1989 100644
--- a/HMI/US/landscape/n2t-out-visual/cardQR.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt
@@ -339,7 +339,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardQR,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt
index f1c44ff8..8fdde314 100644
--- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt
+++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt
@@ -635,7 +635,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardThermo,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
index 2aaed3c5..aeb9283d 100644
--- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
+++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
@@ -6,18 +6,18 @@ pageIcons
 	7    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
+cardQR
+	32   Component(s)
+	421  Line(s) of event code
+	242  Unique line(s) of event code
 popupNotify
 	19   Component(s)
 	253  Line(s) of event code
 	164  Unique line(s) of event code
-cardMedia
-	34   Component(s)
-	406  Line(s) of event code
-	216  Unique line(s) of event code
-cardPower
-	43   Component(s)
-	435  Line(s) of event code
-	297  Unique line(s) of event code
+cardAlarm
+	40   Component(s)
+	439  Line(s) of event code
+	261  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	172  Line(s) of event code
@@ -34,34 +34,26 @@ pageTest
 	14   Component(s)
 	14   Line(s) of event code
 	14   Unique line(s) of event code
-cardQR
-	32   Component(s)
-	421  Line(s) of event code
-	242  Unique line(s) of event code
 popupLight
 	28   Component(s)
 	404  Line(s) of event code
 	223  Unique line(s) of event code
-cardThermo
-	53   Component(s)
-	608  Line(s) of event code
-	316  Unique line(s) of event code
-cardAlarm
-	40   Component(s)
-	439  Line(s) of event code
-	261  Unique line(s) of event code
-cardEntities
-	65   Component(s)
-	1165 Line(s) of event code
-	530  Unique line(s) of event code
-popupThermo
-	44   Component(s)
-	515  Line(s) of event code
-	272  Unique line(s) of event code
 cardGrid
 	42   Component(s)
 	490  Line(s) of event code
 	286  Unique line(s) of event code
+cardPower
+	43   Component(s)
+	435  Line(s) of event code
+	297  Unique line(s) of event code
+cardMedia
+	34   Component(s)
+	406  Line(s) of event code
+	216  Unique line(s) of event code
+popupThermo
+	44   Component(s)
+	515  Line(s) of event code
+	272  Unique line(s) of event code
 screensaver
 	45   Component(s)
 	389  Line(s) of event code
@@ -70,6 +62,14 @@ popupInSel
 	34   Component(s)
 	529  Line(s) of event code
 	257  Unique line(s) of event code
+cardThermo
+	53   Component(s)
+	608  Line(s) of event code
+	316  Unique line(s) of event code
+cardEntities
+	65   Component(s)
+	1165 Line(s) of event code
+	530  Unique line(s) of event code
 
 Total
 	17   Page(s)
diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt
index 2ecbfcd8..8f1a4c48 100644
--- a/HMI/US/landscape/n2t-out/cardAlarm.txt
+++ b/HMI/US/landscape/n2t-out/cardAlarm.txt
@@ -483,7 +483,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardAlarm,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt
index 126a32ad..cc5569a8 100644
--- a/HMI/US/landscape/n2t-out/cardEntities.txt
+++ b/HMI/US/landscape/n2t-out/cardEntities.txt
@@ -534,7 +534,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardEntities,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt
index ed39cfd5..7121a1ec 100644
--- a/HMI/US/landscape/n2t-out/cardGrid.txt
+++ b/HMI/US/landscape/n2t-out/cardGrid.txt
@@ -472,7 +472,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardGrid,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt
index 01368924..695b3247 100644
--- a/HMI/US/landscape/n2t-out/cardMedia.txt
+++ b/HMI/US/landscape/n2t-out/cardMedia.txt
@@ -448,7 +448,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardMedia,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/landscape/n2t-out/cardPower.txt b/HMI/US/landscape/n2t-out/cardPower.txt
index e01a63c2..705d64f4 100644
--- a/HMI/US/landscape/n2t-out/cardPower.txt
+++ b/HMI/US/landscape/n2t-out/cardPower.txt
@@ -347,7 +347,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardPower,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt
index 674d6422..87bf1223 100644
--- a/HMI/US/landscape/n2t-out/cardQR.txt
+++ b/HMI/US/landscape/n2t-out/cardQR.txt
@@ -188,7 +188,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardQR,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt
index 40da416f..3072eea8 100644
--- a/HMI/US/landscape/n2t-out/cardThermo.txt
+++ b/HMI/US/landscape/n2t-out/cardThermo.txt
@@ -295,7 +295,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardThermo,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt
index 524a0641..b4e78a21 100644
--- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt
@@ -1015,7 +1015,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardAlarm,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt
index 6b0e1941..bca2fd71 100644
--- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt
@@ -1260,7 +1260,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardEntities,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt
index 3e27b3b5..3029ca01 100644
--- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt
@@ -858,7 +858,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardGrid,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt
index 62bb0795..d81a7ec2 100644
--- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt
@@ -829,7 +829,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardMedia,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/portrait/n2t-out-visual/cardPower.txt b/HMI/US/portrait/n2t-out-visual/cardPower.txt
index cf1cfc99..8aa4597a 100644
--- a/HMI/US/portrait/n2t-out-visual/cardPower.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardPower.txt
@@ -802,7 +802,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardPower,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt
index e2a2d311..f9298eac 100644
--- a/HMI/US/portrait/n2t-out-visual/cardQR.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt
@@ -339,7 +339,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardQR,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt
index 6a2a37e7..b854bbbd 100644
--- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt
+++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt
@@ -635,7 +635,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardThermo,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
index 9ee075f7..3e061b0a 100644
--- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
+++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
@@ -10,14 +10,14 @@ pageTest
 	14   Component(s)
 	14   Line(s) of event code
 	14   Unique line(s) of event code
-cardQR
-	32   Component(s)
-	421  Line(s) of event code
-	242  Unique line(s) of event code
-cardAlarm
-	40   Component(s)
-	439  Line(s) of event code
-	261  Unique line(s) of event code
+cardMedia
+	34   Component(s)
+	406  Line(s) of event code
+	216  Unique line(s) of event code
+cardGrid
+	42   Component(s)
+	490  Line(s) of event code
+	286  Unique line(s) of event code
 popupShutter
 	25   Component(s)
 	394  Line(s) of event code
@@ -34,18 +34,14 @@ popupInSel
 	34   Component(s)
 	529  Line(s) of event code
 	257  Unique line(s) of event code
-cardPower
-	43   Component(s)
-	435  Line(s) of event code
-	297  Unique line(s) of event code
+cardQR
+	32   Component(s)
+	421  Line(s) of event code
+	242  Unique line(s) of event code
 popupNotify
 	19   Component(s)
 	253  Line(s) of event code
 	164  Unique line(s) of event code
-cardMedia
-	34   Component(s)
-	406  Line(s) of event code
-	216  Unique line(s) of event code
 popupLight
 	28   Component(s)
 	404  Line(s) of event code
@@ -54,18 +50,22 @@ popupFan
 	27   Component(s)
 	347  Line(s) of event code
 	202  Unique line(s) of event code
-cardGrid
-	42   Component(s)
-	490  Line(s) of event code
-	286  Unique line(s) of event code
-cardThermo
-	53   Component(s)
-	608  Line(s) of event code
-	316  Unique line(s) of event code
+cardPower
+	43   Component(s)
+	435  Line(s) of event code
+	297  Unique line(s) of event code
 screensaver
 	45   Component(s)
 	389  Line(s) of event code
 	288  Unique line(s) of event code
+cardAlarm
+	40   Component(s)
+	439  Line(s) of event code
+	261  Unique line(s) of event code
+cardThermo
+	53   Component(s)
+	608  Line(s) of event code
+	316  Unique line(s) of event code
 cardEntities
 	77   Component(s)
 	1391 Line(s) of event code
diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt
index 2ecbfcd8..8f1a4c48 100644
--- a/HMI/US/portrait/n2t-out/cardAlarm.txt
+++ b/HMI/US/portrait/n2t-out/cardAlarm.txt
@@ -483,7 +483,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardAlarm,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt
index 6916d4ea..3164d71c 100644
--- a/HMI/US/portrait/n2t-out/cardEntities.txt
+++ b/HMI/US/portrait/n2t-out/cardEntities.txt
@@ -638,7 +638,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardEntities,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt
index ed39cfd5..7121a1ec 100644
--- a/HMI/US/portrait/n2t-out/cardGrid.txt
+++ b/HMI/US/portrait/n2t-out/cardGrid.txt
@@ -472,7 +472,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardGrid,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt
index 01368924..695b3247 100644
--- a/HMI/US/portrait/n2t-out/cardMedia.txt
+++ b/HMI/US/portrait/n2t-out/cardMedia.txt
@@ -448,7 +448,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardMedia,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/portrait/n2t-out/cardPower.txt b/HMI/US/portrait/n2t-out/cardPower.txt
index e01a63c2..705d64f4 100644
--- a/HMI/US/portrait/n2t-out/cardPower.txt
+++ b/HMI/US/portrait/n2t-out/cardPower.txt
@@ -347,7 +347,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardPower,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt
index 674d6422..87bf1223 100644
--- a/HMI/US/portrait/n2t-out/cardQR.txt
+++ b/HMI/US/portrait/n2t-out/cardQR.txt
@@ -188,7 +188,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardQR,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt
index 40da416f..3072eea8 100644
--- a/HMI/US/portrait/n2t-out/cardThermo.txt
+++ b/HMI/US/portrait/n2t-out/cardThermo.txt
@@ -295,7 +295,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardThermo,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt
index 3e1f7f31..cfe5c8a6 100644
--- a/HMI/n2t-out-visual/cardAlarm.txt
+++ b/HMI/n2t-out-visual/cardAlarm.txt
@@ -1015,7 +1015,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardAlarm,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt
index 16685c67..d9e43e60 100644
--- a/HMI/n2t-out-visual/cardEntities.txt
+++ b/HMI/n2t-out-visual/cardEntities.txt
@@ -1056,7 +1056,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardEntities,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt
index 1ecb0e57..40a068c7 100644
--- a/HMI/n2t-out-visual/cardGrid.txt
+++ b/HMI/n2t-out-visual/cardGrid.txt
@@ -858,7 +858,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardGrid,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt
index c547a9bf..22cbf4c9 100644
--- a/HMI/n2t-out-visual/cardMedia.txt
+++ b/HMI/n2t-out-visual/cardMedia.txt
@@ -829,7 +829,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardMedia,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out-visual/cardPower.txt b/HMI/n2t-out-visual/cardPower.txt
index df234c4b..b412a471 100644
--- a/HMI/n2t-out-visual/cardPower.txt
+++ b/HMI/n2t-out-visual/cardPower.txt
@@ -802,7 +802,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardPower,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt
index ecaf40b8..fdc390d4 100644
--- a/HMI/n2t-out-visual/cardQR.txt
+++ b/HMI/n2t-out-visual/cardQR.txt
@@ -339,7 +339,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardQR,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt
index 34be8bbe..1d68e5bf 100644
--- a/HMI/n2t-out-visual/cardThermo.txt
+++ b/HMI/n2t-out-visual/cardThermo.txt
@@ -635,7 +635,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardThermo,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt
index b81c7989..e104cddc 100644
--- a/HMI/n2t-out-visual/nspanel_Stats.txt
+++ b/HMI/n2t-out-visual/nspanel_Stats.txt
@@ -6,10 +6,6 @@ pageIcons
 	7    Component(s)
 	0    Line(s) of event code
 	0    Unique line(s) of event code
-pageTest
-	20   Component(s)
-	65   Line(s) of event code
-	62   Unique line(s) of event code
 popupShutter
 	25   Component(s)
 	394  Line(s) of event code
@@ -26,22 +22,26 @@ popupNotify
 	19   Component(s)
 	253  Line(s) of event code
 	164  Unique line(s) of event code
+pageTest
+	21   Component(s)
+	66   Line(s) of event code
+	63   Unique line(s) of event code
 cardQR
 	32   Component(s)
 	421  Line(s) of event code
 	242  Unique line(s) of event code
-cardEntities
-	65   Component(s)
-	1165 Line(s) of event code
-	530  Unique line(s) of event code
 cardGrid
 	42   Component(s)
 	490  Line(s) of event code
 	286  Unique line(s) of event code
-cardPower
-	43   Component(s)
-	435  Line(s) of event code
-	297  Unique line(s) of event code
+cardThermo
+	53   Component(s)
+	608  Line(s) of event code
+	316  Unique line(s) of event code
+cardMedia
+	34   Component(s)
+	406  Line(s) of event code
+	216  Unique line(s) of event code
 popupFan
 	27   Component(s)
 	347  Line(s) of event code
@@ -50,14 +50,10 @@ screensaver
 	45   Component(s)
 	389  Line(s) of event code
 	288  Unique line(s) of event code
-cardMedia
-	34   Component(s)
-	406  Line(s) of event code
-	216  Unique line(s) of event code
-cardAlarm
-	40   Component(s)
-	439  Line(s) of event code
-	261  Unique line(s) of event code
+cardPower
+	43   Component(s)
+	435  Line(s) of event code
+	297  Unique line(s) of event code
 popupThermo
 	44   Component(s)
 	515  Line(s) of event code
@@ -66,13 +62,17 @@ popupInSel
 	34   Component(s)
 	529  Line(s) of event code
 	257  Unique line(s) of event code
-cardThermo
-	53   Component(s)
-	608  Line(s) of event code
-	316  Unique line(s) of event code
+cardAlarm
+	40   Component(s)
+	439  Line(s) of event code
+	261  Unique line(s) of event code
+cardEntities
+	65   Component(s)
+	1165 Line(s) of event code
+	530  Unique line(s) of event code
 
 Total
 	17   Page(s)
-	577  Component(s)
-	7045 Line(s) of event code
+	578  Component(s)
+	7046 Line(s) of event code
 	1816 Unique line(s) of event code
diff --git a/HMI/n2t-out-visual/pageTest.txt b/HMI/n2t-out-visual/pageTest.txt
index f4087216..2412a653 100644
--- a/HMI/n2t-out-visual/pageTest.txt
+++ b/HMI/n2t-out-visual/pageTest.txt
@@ -272,6 +272,42 @@ Button b12
         Touch Press Event
             page cardPower
         
+Button b13
+    Attributes
+        ID                                  : 20
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        Opacity                             : 127
+        x coordinate                        : 129
+        y coordinate                        : 216
+        Width                               : 100
+        Height                              : 50
+        Effect                              : load
+        Effect Priority                     : 0
+        Effect Time                         : 300
+        Fill                                : solid color
+        Style                               : 3D auto
+        Font ID                             : 1
+        Back. Color                         : 50712
+        Back. Picture ID (Pressed)          : 65535
+        Back. Color (Pressed)               : 1024
+        Font Color (Unpressed)              : 0
+        Font Color (Pressed)                : 65535
+        Horizontal Alignment                : center
+        Vertical Alignment                  : center
+        State                               : unpressed
+        Text                                : insel
+        Max. Text Size                      : 10
+        Word wrap                           : disabled
+        Horizontal Spacing                  : 0
+        Vertical Spacing                    : 0
+    
+    Events
+        Touch Press Event
+            page popupInSel
+        
 Button b2
     Attributes
         ID                                  : 13
diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt
index 2ecbfcd8..8f1a4c48 100644
--- a/HMI/n2t-out/cardAlarm.txt
+++ b/HMI/n2t-out/cardAlarm.txt
@@ -483,7 +483,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardAlarm,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt
index 126a32ad..cc5569a8 100644
--- a/HMI/n2t-out/cardEntities.txt
+++ b/HMI/n2t-out/cardEntities.txt
@@ -534,7 +534,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardEntities,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt
index ed39cfd5..7121a1ec 100644
--- a/HMI/n2t-out/cardGrid.txt
+++ b/HMI/n2t-out/cardGrid.txt
@@ -472,7 +472,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardGrid,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt
index 01368924..695b3247 100644
--- a/HMI/n2t-out/cardMedia.txt
+++ b/HMI/n2t-out/cardMedia.txt
@@ -448,7 +448,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardMedia,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out/cardPower.txt b/HMI/n2t-out/cardPower.txt
index e01a63c2..705d64f4 100644
--- a/HMI/n2t-out/cardPower.txt
+++ b/HMI/n2t-out/cardPower.txt
@@ -347,7 +347,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardPower,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt
index 674d6422..87bf1223 100644
--- a/HMI/n2t-out/cardQR.txt
+++ b/HMI/n2t-out/cardQR.txt
@@ -188,7 +188,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardQR,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt
index 40da416f..3072eea8 100644
--- a/HMI/n2t-out/cardThermo.txt
+++ b/HMI/n2t-out/cardThermo.txt
@@ -295,7 +295,7 @@ Button bNext
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,cardThermo,"
-            if(bPrev.txt=="")
+            if(bNext.txt=="")
             {
                 tSend.txt+="bHome"
             }else
diff --git a/HMI/n2t-out/pageTest.txt b/HMI/n2t-out/pageTest.txt
index 123fdf25..e0700a85 100644
--- a/HMI/n2t-out/pageTest.txt
+++ b/HMI/n2t-out/pageTest.txt
@@ -121,6 +121,20 @@ Button b12
         Touch Press Event
             page cardPower
         
+Button b13
+    Attributes
+        Scope                               : local
+        Dragging                            : 0
+        Disable release event after dragging: 0
+        Send Component ID                   : disabled
+        State                               : unpressed
+        Text                                : insel
+        Max. Text Size                      : 10
+    
+    Events
+        Touch Press Event
+            page popupInSel
+        
 Button b2
     Attributes
         Scope                               : local