diff --git a/package/base.yaml b/package/base.yaml
index b77a5db..b9e90b8 100644
--- a/package/base.yaml
+++ b/package/base.yaml
@@ -92,26 +92,25 @@ time:
   - platform: homeassistant
     id: datetime
 
-# number:
-#   ## Creates a number entity in Home Assistant
-#   #  It sets the menu of the Button Plus
-#   - platform: template
-#     name: "Menu Selector"
-#     id: menuselector
-#     optimistic: true
-#     min_value: 0   # keep at 0
-#     max_value: 10  # Maximum number of menu items. You can change this
-#     step: 1
-#     on_value:
-#       then:
-#         - lambda: |-
-#             if(id(menuselector).state >= id(nr_of_pages)) {
-#               id(actual_page) = id(nr_of_pages)-1;
-#             } else {
-#               id(actual_page) = id(menuselector).state;
-#             }
+number:
+  ## Creates a number entity in Home Assistant
+  #  It sets the menu of the Button Plus
+  - platform: template
+    name: "Menu Selector"
+    id: menuselector
+    optimistic: true
+    min_value: 0   # keep at 0
+    max_value: !lambda 'return id(nr_of_pages) - 1;'
+    on_value:
+      then:
+        - lambda: |-
+            if(id(menuselector).state >= id(nr_of_pages)) {
+              id(actual_page) = id(nr_of_pages)-1;
+            } else {
+              id(actual_page) = id(menuselector).state;
+            }
 #         # Refresh the screen
-#         - script.execute: update_page
+#         - script.execute: update_page <<< this ends in an loop...
         
 script:
 ######################
@@ -143,8 +142,8 @@ script:
       - text_sensor.template.publish:
           id: active_page_name_ha
           state: !lambda 'return id(active_page_name);'
-      # - number.set:
-      #     id: menuselector
-      #     value: !lambda 'return id(actual_page);'
+      - number.set:
+          id: menuselector
+          value: !lambda 'return id(actual_page);'
       - script.execute: update_all