diff --git a/Firmware/src/epd.c b/Firmware/src/epd.c
index e8186e4..ffad274 100755
--- a/Firmware/src/epd.c
+++ b/Firmware/src/epd.c
@@ -377,7 +377,8 @@ void epd_update(struct date_time _time, uint16_t battery_mv, int16_t temperature
     }
 }
 
-void epd_display_time_with_date(struct date_time _time, uint16_t battery_mv, int16_t temperature, uint8_t full_or_partial) {
+void epd_display_time_with_date(struct date_time _time, uint16_t battery_mv, int16_t temperature, uint8_t full_or_partial)
+{
     uint16_t battery_level;
 
     epd_clear();
@@ -389,54 +390,63 @@ void epd_display_time_with_date(struct date_time _time, uint16_t battery_mv, int
     battery_level = get_battery_level(battery_mv);
 
     sprintf(buff, "BLZ_%02X%02X%02X", mac_public[2], mac_public[1], mac_public[0]);
-    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16, 1, 17, (char *)buff, 1);
+    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16, 10, 17, (char *)buff, 1);
 
-    if (ble_get_connected()) {
-        sprintf(buff, "78%s", "234");
-    } else {
-        sprintf(buff, "78%s", "56");
+    if (ble_get_connected())
+    {
+        sprintf(buff, "%s", "234");
+    }
+    else
+    {
+        sprintf(buff, "%s", "56");
     }
 
-    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16_zh, 120, 21, (char *)buff, 1);
+    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16_zh, 128, 21, (char *)buff, 1);
 
-    obdRectangle(&obd, 252, 10, 255, 14, 1, 1);
-    obdRectangle(&obd, 255, 2, 295, 22, 1, 1);
+    obdRectangle(&obd, 212, 10, 215, 14, 1, 1);
+    obdRectangle(&obd, 215, 2, 249, 22, 1, 1);
 
     sprintf(buff, "%d", battery_level);
-    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16, 259, 18, (char *)buff, 0);
+    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16, 216, 18, (char *)buff, 0);
 
-    obdRectangle(&obd, 0, 25, 295, 27, 1, 1);
+    obdRectangle(&obd, 0, 25, 252, 27, 1, 1);
 
     sprintf(buff, "%02d:%02d", _time.tm_hour, _time.tm_min);
-    obdWriteStringCustom(&obd, (GFXfont *)&DSEG14_Classic_Mini_Regular_40, 35, 85, (char *)buff, 1);
+    obdWriteStringCustom(&obd, (GFXfont *)&DSEG14_Classic_Mini_Regular_40, 25, 85, (char *)buff, 1);
 
     sprintf(buff, "   %d'C", EPD_read_temp());
-    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16, 216, 50, (char *)buff, 1);
+    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16, 180, 50, (char *)buff, 1);
 
-    obdRectangle(&obd, 216, 60, 295, 62, 1, 1);
+    obdRectangle(&obd, 180, 60, 252, 62, 1, 1);
 
     sprintf(buff, " %dmV", battery_mv);
-    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16, 216, 84, (char *)buff, 1);
+    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16, 180, 84, (char *)buff, 1);
 
-    obdRectangle(&obd, 214, 27, 216, 99, 1, 1);
-    obdRectangle(&obd, 0, 97, 295, 99, 1, 1);
+    obdRectangle(&obd, 178, 27, 180, 99, 1, 1);
+    obdRectangle(&obd, 0, 97, 252, 99, 1, 1);
 
     sprintf(buff, "%d-%02d-%02d", _time.tm_year, _time.tm_month, _time.tm_day);
-    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16, 10, 120, (char *)buff, 1);
+    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16, 8, 118, (char *)buff, 1);
 
-    if (_time.tm_week == 7) {
+    if (_time.tm_week == 7)
+    {
         sprintf(buff, "9:%c", _time.tm_week + 0x20 + 6);
-    } else {
+    }
+    else
+    {
         sprintf(buff, "9:%c", _time.tm_week + 0x20);
     }
-    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16_zh, 120, 122, (char *)buff, 1);
+    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16_zh, 105, 122, (char *)buff, 1);
 
-    if (_time.tm_hour > 7 && _time.tm_hour < 20) {
+    if (_time.tm_hour > 7 && _time.tm_hour < 20)
+    {
         sprintf(buff, "%s", "EFGH");
-    } else {
+    }
+    else
+    {
         sprintf(buff, "%s", "ABCD");
     }
-    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16_zh, 200, 122, (char *)buff, 1);
+    obdWriteStringCustom(&obd, (GFXfont *)&Dialog_plain_16_zh, 170, 122, (char *)buff, 1);
 
     FixBuffer(epd_temp, epd_buffer, epd_width, epd_height);