diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 6566e6820..c3cedf91f 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -704,8 +704,8 @@ void lcd_commands()
 		{
 			lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
 			enquecommand_P(PSTR("G1 Z0.250 F7200.000"));
-			enquecommand_P(PSTR("G1 X50.0 E80.0  F1000.0"));
-			enquecommand_P(PSTR("G1 X160.0 E20.0  F1000.0"));
+			enquecommand_P(PSTR("G1 X50.0 E80.0 F1000.0"));
+			enquecommand_P(PSTR("G1 X160.0 E20.0 F1000.0"));
 			enquecommand_P(PSTR("G1 Z0.200 F7200.000"));
 			enquecommand_P(PSTR("G1 X220.0 E13 F1000.0"));
 			enquecommand_P(PSTR("G1 X240.0 E0 F1000.0"));
@@ -764,7 +764,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 X50 Y");
@@ -774,7 +774,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 			}
@@ -793,7 +793,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 X50 Y");
@@ -803,7 +803,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 			}
@@ -822,7 +822,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 X50 Y");
@@ -832,7 +832,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 			}
@@ -851,7 +851,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 X50 Y");
@@ -861,7 +861,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 			}
@@ -872,7 +872,7 @@ void lcd_commands()
 		if (lcd_commands_step == 3 && !blocks_queued() && cmd_buffer_empty())
 		{
 			lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
-			enquecommand_P(PSTR("G1 E - 0.07500 F2100.00000"));
+			enquecommand_P(PSTR("G1 E-0.07500 F2100.00000"));
 			enquecommand_P(PSTR("G4 S0"));
 			enquecommand_P(PSTR("G1 E-4 F2100.00000"));
 			enquecommand_P(PSTR("G1 Z0.5 F7200.000"));
@@ -903,7 +903,7 @@ void lcd_commands()
 			enquecommand_P(PSTR("G1 X50 Y1 E-5.0000"));
 			enquecommand_P(PSTR("G1 F2400"));
 			enquecommand_P(PSTR("G1 X0 Y1 E5.0000"));
-			enquecommand_P(PSTR("G1 X50 Y1 E - 5.0000"));
+			enquecommand_P(PSTR("G1 X50 Y1 E-5.0000"));
 			enquecommand_P(PSTR("G1 F2400"));
 			enquecommand_P(PSTR("G1 X0 Y1 E5.0000"));
 			enquecommand_P(PSTR("G1 X50 Y1 E-3.0000"));
@@ -963,13 +963,13 @@ void lcd_commands()
 			
 			lcd_implementation_clear();
 			lcd_goto_menu(lcd_babystep_z, 0, false);			
-			enquecommand_P(PSTR("G1 X60.0 E9.0  F1000.0")); //intro line
-			enquecommand_P(PSTR("G1 X100.0 E12.5  F1000.0")); //intro line			
+			enquecommand_P(PSTR("G1 X60.0 E9.0 F1000.0")); //intro line
+			enquecommand_P(PSTR("G1 X100.0 E12.5 F1000.0")); //intro line			
 			enquecommand_P(PSTR("G92 E0.0"));
 			enquecommand_P(PSTR("G21")); //set units to millimeters
 			enquecommand_P(PSTR("G90")); //use absolute coordinates
 			enquecommand_P(PSTR("M83")); //use relative distances for extrusion
-			enquecommand_P(PSTR("G1 E - 1.50000 F2100.00000"));
+			enquecommand_P(PSTR("G1 E-1.50000 F2100.00000"));
 			enquecommand_P(PSTR("G1 Z0.150 F7200.000"));
 			enquecommand_P(PSTR("M204 S1000")); //set acceleration
 			enquecommand_P(PSTR("G1 F4000"));
@@ -1034,7 +1034,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 X50 Y");
@@ -1044,7 +1044,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 			}
@@ -1063,7 +1063,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 X50 Y");
@@ -1073,7 +1073,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 			}
@@ -1092,7 +1092,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 X50 Y");
@@ -1102,7 +1102,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 			}
@@ -1121,7 +1121,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 X50 Y");
@@ -1131,7 +1131,7 @@ void lcd_commands()
 				enquecommand(cmd1);
 				strcpy(cmd1, "G1 Y");
 				strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
-				strcat(cmd1, "E ");
+				strcat(cmd1, " E");
 				strcat(cmd1, ftostr43(extr_short_segment));
 				enquecommand(cmd1);
 			}
@@ -1142,7 +1142,7 @@ void lcd_commands()
 		if (lcd_commands_step == 2 && !blocks_queued() && cmd_buffer_empty())
 		{
 			lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
-			enquecommand_P(PSTR("G1 E - 0.07500 F2100.00000"));
+			enquecommand_P(PSTR("G1 E-0.07500 F2100.00000"));
 			enquecommand_P(PSTR("M107")); //turn off printer fan
 			enquecommand_P(PSTR("M104 S0")); // turn off temperature
 			enquecommand_P(PSTR("M140 S0")); // turn off heatbed