diff --git a/ades-office-control-panel.yaml b/ades-office-control-panel.yaml
index fb3db29..511fd30 100644
--- a/ades-office-control-panel.yaml
+++ b/ades-office-control-panel.yaml
@@ -495,33 +495,54 @@ lvgl:
             y: 45
             width: 220
             height: 220
+            items:
+              pressed:
+                bg_color: 0xFFFF00
             rows:
               - buttons:
                   - id: navAdesOffice
                     text: "Ade's Office"
-                    on_press:
+                    control:
+                      checkable: true
+                    on_value:
                       then:
-                        - lvgl.page.show:
-                            id: ades_office_page
-                            animation: FADE_IN
-                            time: 300ms
+                        - if:
+                            condition:
+                              lambda: 'return x == 1;'
+                            then:
+                              - lvgl.page.show:
+                                  id: ades_office_page
+                                  animation: FADE_IN
+                                  time: 300ms
                   - id: navGroundFloor
                     text: "Ground Floor"
-                    on_press:
+                    control:
+                      checkable: true
+                    on_value:
                       then:
-                        - lvgl.page.show:
-                            id: ground_floor_page
-                            animation: FADE_IN
-                            time: 300ms
+                        - if:
+                            condition:
+                              lambda: 'return x == 1;'
+                            then:
+                              - lvgl.page.show:
+                                  id: ground_floor_page
+                                  animation: FADE_IN
+                                  time: 300ms
               - buttons:
                   - id: nav3dPrinter
                     text: "3D Printer"
-                    on_press:
+                    control:
+                      checkable: true
+                    on_value:
                       then:
-                        - lvgl.page.show:
-                            id: printer_status
-                            animation: FADE_IN
-                            time: 300ms
+                        - if:
+                            condition:
+                              lambda: 'return x == 1;'
+                            then:
+                              - lvgl.page.show:
+                                  id: printer_status
+                                  animation: FADE_IN
+                                  time: 300ms
     - id: ades_office_page
       widgets:
         - obj: