diff --git a/platformio.ini b/platformio.ini
index 2ad267e..8bd5bc5 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,6 +14,6 @@ board = wt32-eth01
 framework = arduino
 lib_deps = siwats/ESPMegaPROR3@^2.4.3
 monitor_speed = 115200
-build_flags = -DCORE_DEBUG_LEVEL=0
+build_flags = -DCORE_DEBUG_LEVEL=5
 monitor_port = COM36
 upload_port = COM36
\ No newline at end of file
diff --git a/src/display.cpp b/src/display.cpp
index 1b68308..0a5623a 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -150,6 +150,7 @@ void CUDDisplay::begin(cud_display_cards_t cards)
         this->ac_temp_upper_bound.setIntValue(DEFAULT_TEMP_UPPER_BOUND);
     }
 
+
     // Initialize the display
     ESP_LOGV("CUD Display", "Initializing display");
     this->display_init();
@@ -507,40 +508,41 @@ void CUDDisplay::handle_bound_change(char *value)
 
 void CUDDisplay::handle_aqi_change(char *value)
 {
+    ESP_LOGV("CUD Display", "AQI Changed: %s", value);
     // Update the AQI value on the display
-    float aqi = atof(value);
+    uint8_t aqi = atoi(value);
     this->takeSerialMutex();
-    this->displayAdapter->printf("%s.txt=%d", LCD_DASHBOARD_ELEMENT_NAME_AQI_TEXT, (int)aqi);
+    this->displayAdapter->printf("%s.txt=\"%03d\"", LCD_DASHBOARD_ELEMENT_NAME_AQI_TEXT, (int)aqi);
     this->sendStopBytes();
     // Update the AQI picture on the display
     if (aqi <= 50)
     {
-        this->displayAdapter->printf("%s.pic=%d", LCD_DASHBOARD_ELEMENT_NAME_AQI_TEXT, LCD_DASHBOARD_PIC_AQI_GOOD);
+        this->displayAdapter->printf("%s.pic=%d", LCD_DASHBOARD_ELEMENT_NAME_AQI_PICTURE, LCD_DASHBOARD_PIC_AQI_GOOD);
         this->sendStopBytes();
     }
     else if (aqi <= 100)
     {
-        this->displayAdapter->printf("%s.pic=%d", LCD_DASHBOARD_ELEMENT_NAME_AQI_TEXT, LCD_DASHBOARD_PIC_AQI_MODERATE);
+        this->displayAdapter->printf("%s.pic=%d", LCD_DASHBOARD_ELEMENT_NAME_AQI_PICTURE, LCD_DASHBOARD_PIC_AQI_MODERATE);
         this->sendStopBytes();
     }
     else if (aqi <= 150)
     {
-        this->displayAdapter->printf("%s.pic=%d", LCD_DASHBOARD_ELEMENT_NAME_AQI_TEXT, LCD_DASHBOARD_PIC_AQI_UNHEALTHY_FOR_SENSITIVE_GROUPS);
+        this->displayAdapter->printf("%s.pic=%d", LCD_DASHBOARD_ELEMENT_NAME_AQI_PICTURE, LCD_DASHBOARD_PIC_AQI_UNHEALTHY_FOR_SENSITIVE_GROUPS);
         this->sendStopBytes();
     }
     else if (aqi <= 200)
     {
-        this->displayAdapter->printf("%s.pic=%d", LCD_DASHBOARD_ELEMENT_NAME_AQI_TEXT, LCD_DASHBOARD_PIC_AQI_UNHEALTHY);
+        this->displayAdapter->printf("%s.pic=%d", LCD_DASHBOARD_ELEMENT_NAME_AQI_PICTURE, LCD_DASHBOARD_PIC_AQI_UNHEALTHY);
         this->sendStopBytes();
     }
     else if (aqi <= 300)
     {
-        this->displayAdapter->printf("%s.pic=%d", LCD_DASHBOARD_ELEMENT_NAME_AQI_TEXT, LCD_DASHBOARD_PIC_AQI_VERY_UNHEALTHY);
+        this->displayAdapter->printf("%s.pic=%d", LCD_DASHBOARD_ELEMENT_NAME_AQI_PICTURE, LCD_DASHBOARD_PIC_AQI_VERY_UNHEALTHY);
         this->sendStopBytes();
     }
     else
     {
-        this->displayAdapter->printf("%s.pic=%d", LCD_DASHBOARD_ELEMENT_NAME_AQI_TEXT, LCD_DASHBOARD_PIC_AQI_HAZARDOUS);
+        this->displayAdapter->printf("%s.pic=%d", LCD_DASHBOARD_ELEMENT_NAME_AQI_PICTURE, LCD_DASHBOARD_PIC_AQI_HAZARDOUS);
         this->sendStopBytes();
     }
     this->giveSerialMutex();