diff --git a/UI/MATE_272_480.HMI b/UI/MATE_272_480.HMI
index ba64a24..3167f64 100644
Binary files a/UI/MATE_272_480.HMI and b/UI/MATE_272_480.HMI differ
diff --git a/UI/MATE_272_480.tft b/UI/MATE_272_480.tft
index ef5c2f9..5c91ade 100644
Binary files a/UI/MATE_272_480.tft and b/UI/MATE_272_480.tft differ
diff --git a/config/gcode_macro.cfg b/config/gcode_macro.cfg
index 37872d2..d10bf0f 100644
--- a/config/gcode_macro.cfg
+++ b/config/gcode_macro.cfg
@@ -163,12 +163,10 @@ gcode:
     {% set hotendtemp = params.HOTEND|int %}
     {% set chambertemp = params.CHAMBER|default(0)|int %}
     set_zoffset
-    {% if chambertemp == 0 %}
-        M106 P3 S255
-    {% endif %}
+
     M104 S0
     M140 S{bedtemp}    
-    M141 S{chambertemp}
+#    M141 S{chambertemp}
     G28    
     CLEAR_NOZZLE HOTEND={hotendtemp}
 
@@ -178,10 +176,13 @@ gcode:
     G0 Z50 F600
     G0 X0 Y0  F6000
     
-    M191 S{chambertemp}
-    M109 S{hotendtemp}
-    M204 S10000
 
+    M109 S{hotendtemp}
+    M141 S{chambertemp}    
+    M204 S10000
+    {% if chambertemp == 0 %}
+        M106 P3 S255
+    {% endif %}
     ENABLE_ALL_SENSOR
     save_last_file
 
@@ -661,7 +662,7 @@ gcode:
     G92 E0
     G1  E-90 F800
     M400
-    M118 Unload finish
+    M118 Filament unloaded
 
 [gcode_macro M604]
 description: load filament
@@ -670,7 +671,7 @@ gcode:
     M83
     G1 E80 F400
     M400
-    M118 Load finish
+    M118 Filament loaded
 
 [output_pin sound]
 pin: gpio8
diff --git a/config/printer.cfg b/config/printer.cfg
index 72f7c03..33e3086 100644
--- a/config/printer.cfg
+++ b/config/printer.cfg
@@ -445,6 +445,8 @@ probe_points:
 
 [idle_timeout]
 timeout: 43200
+gcode:
+    PRINT_END
 
 [pause_resume]