diff --git a/package/base.yaml b/package/base.yaml
index e3ab51c..1497b23 100644
--- a/package/base.yaml
+++ b/package/base.yaml
@@ -107,14 +107,10 @@ number:
     step: 1
     on_value:
       then:
-        # - lambda: |-
-        #     if(id(menu_selector).state >= $nr_of_pages) {
-        #       id(actual_page) = $nr_of_pages-1;
-        #     } else {
-        #       id(actual_page) = id(menu_selector).state;
-        #     }
-#         # Refresh the screen
-        - script.execute: update_all # @balk77 update_page results in a loop, moved update_all to here, now test
+        - script.execute: update_all
+        - global.set:
+            id: actual_page
+            value: !lambda 'return x'
         
 script:
 ######################
@@ -122,25 +118,29 @@ script:
 ######################
   - id: next_page
     then: 
-      - lambda: |-
-          id(actual_page) = id(actual_page) + 1;
-          if(id(actual_page) >= $nr_of_pages) {
-            id(actual_page) = 0;
-          }
+      - number.increment:
+          id: menu_selector
+      # - lambda: |-
+      #     id(actual_page) = id(actual_page) + 1;
+      #     if(id(actual_page) >= $nr_of_pages) {
+      #       id(actual_page) = 0;
+      #     }
       # - number.set:
       #     id: menu_selector
       #     value: !lambda 'return float(id(actual_page));'
       - script.execute: update_all     
   - id: prev_page
     then: 
-      - lambda: |-
-          id(actual_page) = id(actual_page) - 1;
-          if(id(actual_page) < 0) {
-            id(actual_page) = $nr_of_pages - 1;
-          }
-      # - number.set:
-      #     id: menu_selector
-      #     value: !lambda 'return float(id(actual_page));'
+      - number.decrement:
+          id: menu_selector
+      # - lambda: |-
+      #     id(actual_page) = id(actual_page) - 1;
+      #     if(id(actual_page) < 0) {
+      #       id(actual_page) = $nr_of_pages - 1;
+      #     }
+      # # - number.set:
+      # #     id: menu_selector
+      # #     value: !lambda 'return float(id(actual_page));'
       - script.execute: update_all
   # - id: update_page
   #   then: