diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index 2010dc2..e67f754 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -788,11 +788,11 @@ blueprint:
             selector: *color-selector
 
     ##### Button pages #####
-      ##### Button page - Labels #####
+      ##### Button page 01 #####
         ##### PLACEHOLDER ######################################################################
-          placeholder17:
+          placeholder07:
             name: ' '
-            description: '# ✅ BUTTON PAGES LABELS ✅'
+            description: '# ✅ BUTTON PAGE 01 ✅'
             default: ' '
             selector: *placeholder-selector
         ##### PLACEHOLDER ######################################################################
@@ -805,41 +805,6 @@ blueprint:
             default: []
             selector:
               text: {}
-          button_page02_label:
-            name: Button page 02 name - LABEL (Optional)
-            description: >
-              *ButtonPage02*
-
-              *Label which should be displayed*
-            default: []
-            selector:
-              text: {}
-          button_page03_label:
-            name: Button page 03 name - LABEL (Optional)
-            description: >
-              *ButtonPage03*
-
-              *Label which should be displayed*
-            default: []
-            selector:
-              text: {}
-          button_page04_label:
-            name: Button page 04 name - LABEL (Optional)
-            description: >
-              *ButtonPage04*
-
-              *Label which should be displayed*
-            default: []
-            selector:
-              text: {}
-      ##### Button page 01 #####
-        ##### PLACEHOLDER ######################################################################
-          placeholder07:
-            name: ' '
-            description: '# ✅ BUTTON PAGE 01 ✅'
-            default: ' '
-            selector: *placeholder-selector
-        ##### PLACEHOLDER ######################################################################
           entity01:
             name: Button 01 - ENTITY (Optional)
             description: >
@@ -1199,6 +1164,15 @@ blueprint:
             default: ' '
             selector: *placeholder-selector
         ##### PLACEHOLDER ######################################################################
+          button_page02_label:
+            name: Button page 02 name - LABEL (Optional)
+            description: >
+              *ButtonPage02*
+
+              *Label which should be displayed*
+            default: []
+            selector:
+              text: {}
           entity09:
             name: Button 09 - ENTITY (Optional)
             description: >
@@ -1543,6 +1517,15 @@ blueprint:
             default: ' '
             selector: *placeholder-selector
         ##### PLACEHOLDER ######################################################################
+          button_page03_label:
+            name: Button page 03 name - LABEL (Optional)
+            description: >
+              *ButtonPage03*
+
+              *Label which should be displayed*
+            default: []
+            selector:
+              text: {}
           entity17:
             name: Button 17 - ENTITY (Optional)
             description: >
@@ -1887,6 +1870,15 @@ blueprint:
             default: ' '
             selector: *placeholder-selector
         ##### PLACEHOLDER ######################################################################
+          button_page04_label:
+            name: Button page 04 name - LABEL (Optional)
+            description: >
+              *ButtonPage04*
+
+              *Label which should be displayed*
+            default: []
+            selector:
+              text: {}
           entity25:
             name: Button 25 - ENTITY (Optional)
             description: >
@@ -2258,7 +2250,7 @@ blueprint:
               *Icon color which should be displayed (default color is set)*
             default: [200, 204, 200] #52857 Grey super light
             selector: *color-selector
-      ##### Entity pages - Labels #####
+      ##### Entity page 01 - Entities #####
         ##### PLACEHOLDER ######################################################################
           placeholder12:
             name: ' '
@@ -2275,34 +2267,6 @@ blueprint:
             default: []
             selector:
               text: {}
-          entity_page02_label:
-            name: Entity page 02 name - LABEL (Optional)
-            description: >
-              *EntityPage02*
-
-              *Label which should be displayed*
-            default: []
-            selector:
-              text: {}
-          entity_page03_label:
-            name: Entity page 03 name - LABEL (Optional)
-            description: >
-              *EntityPage03*
-
-              *Label which should be displayed*
-            default: []
-            selector:
-              text: {}
-          entity_page04_label:
-            name: Entity page 04 name - LABEL (Optional)
-            description: >
-              *EntityPage04*
-
-              *Label which should be displayed*
-            default: []
-            selector:
-              text: {}
-      ##### Entity page 01 - Entities #####
           entities_entity01:
             name: Entity 01 - ENTITY (Optional)
             description: >
@@ -2519,6 +2483,15 @@ blueprint:
             default: ' '
             selector: *placeholder-selector
         ##### PLACEHOLDER ######################################################################
+          entity_page02_label:
+            name: Entity page 02 name - LABEL (Optional)
+            description: >
+              *EntityPage02*
+
+              *Label which should be displayed*
+            default: []
+            selector:
+              text: {}
           entities_entity09:
             name: Entity 09 - ENTITY (Optional)
             description: >
@@ -2735,6 +2708,15 @@ blueprint:
             default: ' '
             selector: *placeholder-selector
         ##### PLACEHOLDER ######################################################################
+          entity_page03_label:
+            name: Entity page 03 name - LABEL (Optional)
+            description: >
+              *EntityPage03*
+
+              *Label which should be displayed*
+            default: []
+            selector:
+              text: {}
           entities_entity17:
             name: Entity 17 - ENTITY (Optional)
             description: >
@@ -2951,6 +2933,15 @@ blueprint:
             default: ' '
             selector: *placeholder-selector
         ##### PLACEHOLDER ######################################################################
+          entity_page04_label:
+            name: Entity page 04 name - LABEL (Optional)
+            description: >
+              *EntityPage04*
+
+              *Label which should be displayed*
+            default: []
+            selector:
+              text: {}
           entities_entity25:
             name: Entity 25 - ENTITY (Optional)
             description: >