diff --git a/hmi/dev/nspanel_eu_code/buttonpage04.txt b/hmi/dev/nspanel_eu_code/buttonpage04.txt
index f4c9577..7f5c3a0 100644
--- a/hmi/dev/nspanel_eu_code/buttonpage04.txt
+++ b/hmi/dev/nspanel_eu_code/buttonpage04.txt
@@ -802,15 +802,15 @@ TouchCap swipe
                 if(swipec>swipedx)
                 {
                     // Navigate back based on active status
-                    if(is_entitypage03==1)
+                    if(is_buttonpage03==1)
                     {
-                        page entitypage03
-                    }else if(is_entitypage02==1)
+                        page buttonpage03
+                    }else if(is_buttonpage02==1)
                     {
-                        page entitypage02
-                    }else if(is_entitypage01==1)
+                        page buttonpage02
+                    }else if(is_buttonpage01==1)
                     {
-                        page entitypage01
+                        page buttonpage01
                     }else
                     {
                         page home
@@ -830,14 +830,14 @@ TouchCap swipe
                 // From Up to Down
                 if(swipec>100)
                 {
-                    if(is_entitypage03==1&&is_entitypage02==1)
+                    if(is_buttonpage03==1&&is_buttonpage02==1)
                     {
-                        page entitypage02
-                    }else if(is_entitypage03==1||is_entitypage02==1)
+                        page buttonpage02
+                    }else if(is_buttonpage03==1||is_buttonpage02==1)
                     {
-                        if(is_entitypage01==1)
+                        if(is_buttonpage01==1)
                         {
-                            page entitypage01
+                            page buttonpage01
                         }else
                         {
                             page home
@@ -852,15 +852,15 @@ TouchCap swipe
                 if(swipec<-100)
                 {
                     // Navigate back up the sequence based on active status
-                    if(is_entitypage01==1)
+                    if(is_buttonpage01==1)
                     {
-                        page entitypage01
-                    }else if(is_entitypage02==1)
+                        page buttonpage01
+                    }else if(is_buttonpage02==1)
                     {
-                        page entitypage02
-                    }else if(is_entitypage03==1)
+                        page buttonpage02
+                    }else if(is_buttonpage03==1)
                     {
-                        page entitypage03
+                        page buttonpage03
                     }else
                     {
                         page home
diff --git a/hmi/dev/nspanel_eu_code/entitypage01.txt b/hmi/dev/nspanel_eu_code/entitypage01.txt
index 3944cd8..2285229 100644
--- a/hmi/dev/nspanel_eu_code/entitypage01.txt
+++ b/hmi/dev/nspanel_eu_code/entitypage01.txt
@@ -374,6 +374,10 @@ TouchCap swipe
             swipestore.en=1 // Start swipestore timer
         
         Touch Release Event
+            if(api==0)
+            {
+                page home
+            }
             swipestore.en=0
             // Touch has ended, x
             if(tch0==0)
@@ -425,7 +429,7 @@ TouchCap swipe
                     }
                 }
                 // Down to Up
-                swipec=0-swipedy
+                swipec2=0-swipedy
                 if(swipec<-100)
                 {
                     if(is_entitypage02==1) // Check if entitypage02 is active
diff --git a/hmi/dev/nspanel_eu_code/entitypage02.txt b/hmi/dev/nspanel_eu_code/entitypage02.txt
index acaea22..f2f9e31 100644
--- a/hmi/dev/nspanel_eu_code/entitypage02.txt
+++ b/hmi/dev/nspanel_eu_code/entitypage02.txt
@@ -374,6 +374,10 @@ TouchCap swipe
             swipestore.en=1 // Start swipestore timer
         
         Touch Release Event
+            if(api==0)
+            {
+                page home
+            }
             swipestore.en=0
             // Touch has ended, x
             if(tch0==0)
@@ -431,7 +435,7 @@ TouchCap swipe
                     }
                 }
                 // Down to Up
-                swipec=0-swipedy
+                swipec2=0-swipedy
                 if(swipec<-100)
                 {
                     if(is_entitypage03==1&&is_entitypage04==1)
diff --git a/hmi/dev/nspanel_eu_code/entitypage03.txt b/hmi/dev/nspanel_eu_code/entitypage03.txt
index 428e485..28798f2 100644
--- a/hmi/dev/nspanel_eu_code/entitypage03.txt
+++ b/hmi/dev/nspanel_eu_code/entitypage03.txt
@@ -374,6 +374,10 @@ TouchCap swipe
             swipestore.en=1 // Start swipestore timer
         
         Touch Release Event
+            if(api==0)
+            {
+                page home
+            }
             swipestore.en=0
             // Touch has ended, x
             if(tch0==0)
@@ -425,7 +429,7 @@ TouchCap swipe
                     }
                 }
                 // Down to Up
-                swipec=0-swipedy
+                swipec2=0-swipedy
                 if(swipec<-100)
                 {
                     if(is_entitypage04==1)
diff --git a/hmi/dev/nspanel_eu_code/entitypage04.txt b/hmi/dev/nspanel_eu_code/entitypage04.txt
index d40e216..2a33fe9 100644
--- a/hmi/dev/nspanel_eu_code/entitypage04.txt
+++ b/hmi/dev/nspanel_eu_code/entitypage04.txt
@@ -374,6 +374,10 @@ TouchCap swipe
             swipestore.en=1 // Start swipestore timer
         
         Touch Release Event
+            if(api==0)
+            {
+                page home
+            }
             swipestore.en=0
             // Touch has ended, x
             if(tch0==0)
@@ -429,7 +433,7 @@ TouchCap swipe
                     }
                 }
                 // Down to Up
-                swipec=0-swipedy
+                swipec2=0-swipedy
                 if(swipec<-100)
                 {
                     // Navigate back up the sequence based on active status
diff --git a/hmi/dev/nspanel_us_code/entitypage01.txt b/hmi/dev/nspanel_us_code/entitypage01.txt
index 3944cd8..2285229 100644
--- a/hmi/dev/nspanel_us_code/entitypage01.txt
+++ b/hmi/dev/nspanel_us_code/entitypage01.txt
@@ -374,6 +374,10 @@ TouchCap swipe
             swipestore.en=1 // Start swipestore timer
         
         Touch Release Event
+            if(api==0)
+            {
+                page home
+            }
             swipestore.en=0
             // Touch has ended, x
             if(tch0==0)
@@ -425,7 +429,7 @@ TouchCap swipe
                     }
                 }
                 // Down to Up
-                swipec=0-swipedy
+                swipec2=0-swipedy
                 if(swipec<-100)
                 {
                     if(is_entitypage02==1) // Check if entitypage02 is active
diff --git a/hmi/dev/nspanel_us_code/entitypage02.txt b/hmi/dev/nspanel_us_code/entitypage02.txt
index acaea22..f2f9e31 100644
--- a/hmi/dev/nspanel_us_code/entitypage02.txt
+++ b/hmi/dev/nspanel_us_code/entitypage02.txt
@@ -374,6 +374,10 @@ TouchCap swipe
             swipestore.en=1 // Start swipestore timer
         
         Touch Release Event
+            if(api==0)
+            {
+                page home
+            }
             swipestore.en=0
             // Touch has ended, x
             if(tch0==0)
@@ -431,7 +435,7 @@ TouchCap swipe
                     }
                 }
                 // Down to Up
-                swipec=0-swipedy
+                swipec2=0-swipedy
                 if(swipec<-100)
                 {
                     if(is_entitypage03==1&&is_entitypage04==1)
diff --git a/hmi/dev/nspanel_us_code/entitypage03.txt b/hmi/dev/nspanel_us_code/entitypage03.txt
index f2a403d..f2e3c17 100644
--- a/hmi/dev/nspanel_us_code/entitypage03.txt
+++ b/hmi/dev/nspanel_us_code/entitypage03.txt
@@ -374,6 +374,10 @@ TouchCap swipe
             swipestore.en=1 // Start swipestore timer
         
         Touch Release Event
+            if(api==0)
+            {
+                page home
+            }
             swipestore.en=0
             // Touch has ended, x
             if(tch0==0)
@@ -425,7 +429,7 @@ TouchCap swipe
                     }
                 }
                 // Down to Up
-                swipec=0-swipedy
+                swipec2=0-swipedy
                 if(swipec<-100)
                 {
                     if(is_entitypage04==1)
diff --git a/hmi/dev/nspanel_us_code/entitypage04.txt b/hmi/dev/nspanel_us_code/entitypage04.txt
index d40e216..2a33fe9 100644
--- a/hmi/dev/nspanel_us_code/entitypage04.txt
+++ b/hmi/dev/nspanel_us_code/entitypage04.txt
@@ -374,6 +374,10 @@ TouchCap swipe
             swipestore.en=1 // Start swipestore timer
         
         Touch Release Event
+            if(api==0)
+            {
+                page home
+            }
             swipestore.en=0
             // Touch has ended, x
             if(tch0==0)
@@ -429,7 +433,7 @@ TouchCap swipe
                     }
                 }
                 // Down to Up
-                swipec=0-swipedy
+                swipec2=0-swipedy
                 if(swipec<-100)
                 {
                     // Navigate back up the sequence based on active status
diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI
index 2df9485..bc7ff12 100644
Binary files a/hmi/nspanel_eu.HMI and b/hmi/nspanel_eu.HMI differ
diff --git a/hmi/nspanel_eu.tft b/hmi/nspanel_eu.tft
index b80e8d0..0909be7 100644
Binary files a/hmi/nspanel_eu.tft and b/hmi/nspanel_eu.tft differ
diff --git a/hmi/nspanel_us.HMI b/hmi/nspanel_us.HMI
index 95fd045..8e7a02b 100644
Binary files a/hmi/nspanel_us.HMI and b/hmi/nspanel_us.HMI differ
diff --git a/hmi/nspanel_us.tft b/hmi/nspanel_us.tft
index 0bc7c17..6fb615e 100644
Binary files a/hmi/nspanel_us.tft and b/hmi/nspanel_us.tft differ