diff --git a/ades-office-control-panel.yaml b/ades-office-control-panel.yaml
index f9e248b..c3d0812 100644
--- a/ades-office-control-panel.yaml
+++ b/ades-office-control-panel.yaml
@@ -238,13 +238,21 @@ text_sensor:
   - platform: homeassistant
     entity_id: sensor.k2plus_c06b_working_layer
     id: printer_working_layer
-    on_value: 
+    on_value:
       then:
         - lvgl.label.update:
             id: lbl_3dprinter_layer
-            text:
-              format: "Layer: %s"
-              args: [x.c_str()]
+            text: !lambda |-
+              return "Layer: " + x + " of " + id(printer_total_layers).state;
+  - platform: homeassistant
+    entity_id: sensor.k2plus_c06b_total_layers
+    id: printer_total_layers
+    on_value:
+      then:
+        - lvgl.label.update:
+            id: lbl_3dprinter_layer
+            text: !lambda |-
+              return "Layer: " + id(printer_working_layer).state + " of " + x;
   - platform: homeassistant
     entity_id: sensor.k2plus_c06b_print_time_left
     id: printer_print_time_left