diff --git a/.gitignore b/.gitignore
index f06235c46..174a26d0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 dist
+src
diff --git a/index.html.gz b/index.html.gz
index f716b7d61..a6ffabffe 100644
Binary files a/index.html.gz and b/index.html.gz differ
diff --git a/languages/de/index.html.gz b/languages/de/index.html.gz
index 89671ac2a..fffff4fb3 100644
Binary files a/languages/de/index.html.gz and b/languages/de/index.html.gz differ
diff --git a/languages/en/index.html.gz b/languages/en/index.html.gz
index a308f5e95..30a0f21bb 100644
Binary files a/languages/en/index.html.gz and b/languages/en/index.html.gz differ
diff --git a/languages/es/index.html.gz b/languages/es/index.html.gz
index 6f49856fd..ff5051c7a 100644
Binary files a/languages/es/index.html.gz and b/languages/es/index.html.gz differ
diff --git a/languages/fr/index.html.gz b/languages/fr/index.html.gz
index 35966033b..e6a1636e3 100644
Binary files a/languages/fr/index.html.gz and b/languages/fr/index.html.gz differ
diff --git a/languages/it/index.html.gz b/languages/it/index.html.gz
index 81ba9dee7..537739317 100644
Binary files a/languages/it/index.html.gz and b/languages/it/index.html.gz differ
diff --git a/languages/multi/index.html.gz b/languages/multi/index.html.gz
index f716b7d61..a6ffabffe 100644
Binary files a/languages/multi/index.html.gz and b/languages/multi/index.html.gz differ
diff --git a/languages/pl/index.html.gz b/languages/pl/index.html.gz
index 37d195048..7145e8695 100644
Binary files a/languages/pl/index.html.gz and b/languages/pl/index.html.gz differ
diff --git a/languages/ptbr/index.html.gz b/languages/ptbr/index.html.gz
index dd94331aa..5c9235494 100644
Binary files a/languages/ptbr/index.html.gz and b/languages/ptbr/index.html.gz differ
diff --git a/languages/ru/index.html.gz b/languages/ru/index.html.gz
index 7769d8ea7..e723fe527 100644
Binary files a/languages/ru/index.html.gz and b/languages/ru/index.html.gz differ
diff --git a/languages/uk/index.html.gz b/languages/uk/index.html.gz
index 21af1501b..10574d6b6 100644
Binary files a/languages/uk/index.html.gz and b/languages/uk/index.html.gz differ
diff --git a/languages/zh_CN/index.html.gz b/languages/zh_CN/index.html.gz
index 7832e172f..f790a5f0b 100644
Binary files a/languages/zh_CN/index.html.gz and b/languages/zh_CN/index.html.gz differ
diff --git a/package-lock.json b/package-lock.json
index d26cf1592..2c8fc0d17 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -579,6 +579,16 @@
       "integrity": "sha512-bHhs98rj/7i/RZpCSJ3uk55pLXOItjIrh2sRQZSM6OoktScX+LxJzvlU+FELp9j3TdcddTmmYArLSGptCTwjuw==",
       "dev": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1039,9 +1049,9 @@
       }
     },
     "convert-source-map": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
       "dev": true,
       "requires": {
         "safe-buffer": "~5.1.1"
@@ -1256,9 +1266,9 @@
       }
     },
     "dom-walk": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
-      "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg="
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
     },
     "domelementtype": {
       "version": "1.3.1",
@@ -1410,14 +1420,14 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.51",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz",
-      "integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==",
+      "version": "0.10.53",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
+      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
       "dev": true,
       "requires": {
         "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.1",
-        "next-tick": "^1.0.0"
+        "es6-symbol": "~3.1.3",
+        "next-tick": "~1.0.0"
       }
     },
     "es6-iterator": {
@@ -1432,13 +1442,13 @@
       }
     },
     "es6-symbol": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz",
-      "integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
+      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
       "dev": true,
       "requires": {
         "d": "^1.0.1",
-        "es5-ext": "^0.10.51"
+        "ext": "^1.1.2"
       }
     },
     "es6-weak-map": {
@@ -1509,6 +1519,23 @@
         "homedir-polyfill": "^1.0.1"
       }
     },
+    "ext": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
+      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
+      "dev": true,
+      "requires": {
+        "type": "^2.0.0"
+      },
+      "dependencies": {
+        "type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
+          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
+          "dev": true
+        }
+      }
+    },
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -1636,6 +1663,13 @@
         "reusify": "^1.0.4"
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "filesize": {
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.1.6.tgz",
@@ -1860,14 +1894,15 @@
       "dev": true
     },
     "fsevents": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
-      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+      "version": "1.2.12",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz",
+      "integrity": "sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==",
       "dev": true,
       "optional": true,
       "requires": {
+        "bindings": "^1.5.0",
         "nan": "^2.12.1",
-        "node-pre-gyp": "^0.12.0"
+        "node-pre-gyp": "*"
       },
       "dependencies": {
         "abbrev": {
@@ -1912,7 +1947,7 @@
           }
         },
         "chownr": {
-          "version": "1.1.1",
+          "version": "1.1.4",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -1939,7 +1974,7 @@
           "optional": true
         },
         "debug": {
-          "version": "4.1.1",
+          "version": "3.2.6",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -1966,12 +2001,12 @@
           "optional": true
         },
         "fs-minipass": {
-          "version": "1.2.5",
+          "version": "1.2.7",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "^2.6.0"
           }
         },
         "fs.realpath": {
@@ -1997,7 +2032,7 @@
           }
         },
         "glob": {
-          "version": "7.1.3",
+          "version": "7.1.6",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -2026,7 +2061,7 @@
           }
         },
         "ignore-walk": {
-          "version": "3.0.1",
+          "version": "3.0.3",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -2045,7 +2080,7 @@
           }
         },
         "inherits": {
-          "version": "2.0.3",
+          "version": "2.0.4",
           "bundled": true,
           "dev": true
         },
@@ -2078,12 +2113,12 @@
           }
         },
         "minimist": {
-          "version": "0.0.8",
+          "version": "1.2.5",
           "bundled": true,
           "dev": true
         },
         "minipass": {
-          "version": "2.3.5",
+          "version": "2.9.0",
           "bundled": true,
           "dev": true,
           "requires": {
@@ -2092,41 +2127,41 @@
           }
         },
         "minizlib": {
-          "version": "1.2.1",
+          "version": "1.3.3",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "^2.9.0"
           }
         },
         "mkdirp": {
-          "version": "0.5.1",
+          "version": "0.5.3",
           "bundled": true,
           "dev": true,
           "requires": {
-            "minimist": "0.0.8"
+            "minimist": "^1.2.5"
           }
         },
         "ms": {
-          "version": "2.1.1",
+          "version": "2.1.2",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "needle": {
-          "version": "2.3.0",
+          "version": "2.3.3",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "debug": "^4.1.0",
+            "debug": "^3.2.6",
             "iconv-lite": "^0.4.4",
             "sax": "^1.2.4"
           }
         },
         "node-pre-gyp": {
-          "version": "0.12.0",
+          "version": "0.14.0",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -2140,11 +2175,11 @@
             "rc": "^1.2.7",
             "rimraf": "^2.6.1",
             "semver": "^5.3.0",
-            "tar": "^4"
+            "tar": "^4.4.2"
           }
         },
         "nopt": {
-          "version": "4.0.1",
+          "version": "4.0.3",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -2154,19 +2189,28 @@
           }
         },
         "npm-bundled": {
-          "version": "1.0.6",
+          "version": "1.1.1",
           "bundled": true,
           "dev": true,
-          "optional": true
+          "optional": true,
+          "requires": {
+            "npm-normalize-package-bin": "^1.0.1"
+          }
+        },
+        "npm-normalize-package-bin": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
         },
         "npm-packlist": {
-          "version": "1.4.1",
+          "version": "1.4.8",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
             "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
+            "npm-bundled": "^1.0.1",
+            "npm-normalize-package-bin": "^1.0.1"
           }
         },
         "npmlog": {
@@ -2229,7 +2273,7 @@
           "optional": true
         },
         "process-nextick-args": {
-          "version": "2.0.0",
+          "version": "2.0.1",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -2244,18 +2288,10 @@
             "ini": "~1.3.0",
             "minimist": "^1.2.0",
             "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
           }
         },
         "readable-stream": {
-          "version": "2.3.6",
+          "version": "2.3.7",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -2270,7 +2306,7 @@
           }
         },
         "rimraf": {
-          "version": "2.6.3",
+          "version": "2.7.1",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -2296,7 +2332,7 @@
           "optional": true
         },
         "semver": {
-          "version": "5.7.0",
+          "version": "5.7.1",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -2347,18 +2383,18 @@
           "optional": true
         },
         "tar": {
-          "version": "4.4.8",
+          "version": "4.4.13",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
             "chownr": "^1.1.1",
             "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.4",
-            "minizlib": "^1.1.1",
+            "minipass": "^2.8.6",
+            "minizlib": "^1.2.1",
             "mkdirp": "^0.5.0",
             "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
+            "yallist": "^3.0.3"
           }
         },
         "util-deprecate": {
@@ -2382,7 +2418,7 @@
           "dev": true
         },
         "yallist": {
-          "version": "3.0.3",
+          "version": "3.1.1",
           "bundled": true,
           "dev": true
         }
@@ -4731,9 +4767,9 @@
       "dev": true
     },
     "nan": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+      "version": "2.14.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
       "dev": true,
       "optional": true
     },
@@ -5805,12 +5841,12 @@
       "dev": true
     },
     "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "dev": true,
       "requires": {
-        "atob": "^2.1.1",
+        "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
         "source-map-url": "^0.4.0",
diff --git a/package.json b/package.json
index 1caedb1db..3f19fd7e0 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "del": "latest",
     "deprecated": "latest",
     "fs": "latest",
-    "gulp": "^4.0.2",
+    "gulp": "latest",
     "gulp-bytediff": "latest",
     "gulp-cdnizer": "latest",
     "gulp-clean-css": "latest",
@@ -28,6 +28,6 @@
   "author": "Luc LEBOSSE",
   "license": "(ISC OR GPL-3.0)",
   "dependencies": {
-    "global": "^4.3.2"
+    "global": "latest"
   }
 }
diff --git a/www/index.html b/www/index.html
index ccdb571c4..cbc13b306 100644
--- a/www/index.html
+++ b/www/index.html
@@ -10,7 +10,7 @@
         var target_firmware = "";
     </script>
     <script>
-        var web_ui_version = "2.1b59";
+        var web_ui_version = "2.1b60";
     </script>
     <script>
         var direct_sd = false;
diff --git a/www/js/app.js b/www/js/app.js
index 77c2833c4..a8e53aa09 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -151,7 +151,7 @@ function startSocket() {
                 if ((bytes[i] == 10) || (bytes[i] == 13)) {
                     wsmsg += msg;
                     Monitor_output_Update(wsmsg);
-                    if ((target_firmware == "grbl-embedded") || (target_firmware == "marlin-embedded")) process_socket_response(wsmsg);
+                    process_socket_response(wsmsg);
                     //msg = wsmsg.replace("\n", "");
                     //wsmsg = msg.replace("\r", "");
                     console.log(wsmsg);
@@ -678,22 +678,31 @@ function process_socket_response(msg) {
             }
 
         }
-    }
-    if (target_firmware == "marlin-embedded") {
-        if (socket_is_settings && !(msg.startsWith("echo:Unknown command:") || msg.startsWith("echo:enqueueing"))) socket_response += msg+"\n";
-        if (!socket_is_settings && (msg.startsWith("  G21") || msg.startsWith("  G20") || msg.startsWith("echo:  G21") || msg.startsWith("echo:  G20"))) {
-            socket_is_settings = true;
-            socket_response = msg + "\n";
-            //to stop waiting for data
-            console.log("Got settings Start");
+    } else {
+        if (target_firmware == "marlin-embedded") {
+            if (socket_is_settings && !(msg.startsWith("echo:Unknown command:") || msg.startsWith("echo:enqueueing"))) socket_response += msg+"\n";
+            if (!socket_is_settings && (msg.startsWith("  G21") || msg.startsWith("  G20") || msg.startsWith("echo:  G21") || msg.startsWith("echo:  G20"))) {
+                socket_is_settings = true;
+                socket_response = msg + "\n";
+                //to stop waiting for data
+                console.log("Got settings Start");
+            }
         }
-        if (msg.startsWith("ok T:") || msg.startsWith(" T:")) {
+        if (msg.startsWith("ok T:") || msg.startsWith(" T:")|| msg.startsWith("T:")) {
             if (!graph_started)start_graph_output();
             process_Temperatures(msg);
         }
         if (msg.startsWith("X:")) {
             process_Position(msg);
         }
+        if (msg.startsWith("FR:")) {
+            process_feedRate(msg);
+        }
+        
+        if (msg.startsWith("echo:E") && (msg.indexOf("Flow:")!=-1)){
+            process_flowdRate(msg);
+        }
+        
         if (msg.startsWith("[esp3d]")) {
             process_Custom(msg); // handles custom messages sent via M118
         }
diff --git a/www/js/commands.js b/www/js/commands.js
index c0f5136a0..33da59f2d 100644
--- a/www/js/commands.js
+++ b/www/js/commands.js
@@ -119,7 +119,13 @@ function CustomCommand_OnKeyUp(event) {
 
 function SendCustomCommandSuccess(response) {
     if (response[response.length - 1] != '\n') Monitor_output_Update(response + "\n");
-    else Monitor_output_Update(response);
+    else {
+        Monitor_output_Update(response);
+    }
+    var tcmdres = response.split("\n");
+    for (var il = 0; il < tcmdres.length; il++){
+        process_socket_response(tcmdres[il]);
+    }
 }
 
 function SendCustomCommandFailed(error_code, response) {
diff --git a/www/js/extruders.js b/www/js/extruders.js
index 4560e9f9d..21651ac33 100644
--- a/www/js/extruders.js
+++ b/www/js/extruders.js
@@ -1,4 +1,6 @@
 var current_active_extruder = 'T0';
+var currentFR=""
+var currentFLR=""
 
 function Set_active_extruder() {
     current_active_extruder = "T" + document.getElementById('active_extruder').value;
@@ -6,7 +8,24 @@ function Set_active_extruder() {
 }
 
 function init_extruder_panel() {
+}
+
+function process_feedRate(msg){
+        var fr = msg.replace("FR:","")
+        document.getElementById('feedratecatched').innerHTML = fr;
+        if (currentFR==""){
+            document.getElementById('feedSelectedValue').value=parseInt(fr);
+            currentFR=fr;
+        }
+}
 
+function process_flowdRate(msg){
+        var flr = msg.substring(msg.indexOf("Flow:")+5)
+        document.getElementById('flowratecatched').innerHTML = flr;
+        if (currentFLR==""){
+            document.getElementById('flowSelectedValue').value=parseInt(flr);
+            currentFLR=flr
+        }
 }
 
 function on_extruder_length_Change() {
@@ -96,4 +115,4 @@ function extruder_handleKeyUp(event, target) {
         else if (target == 'Fan') fanSet_cmd();
     }
     return true;
-}
\ No newline at end of file
+}
diff --git a/www/js/temperatures.js b/www/js/temperatures.js
index 1a3688d4f..bb6294119 100644
--- a/www/js/temperatures.js
+++ b/www/js/temperatures.js
@@ -130,7 +130,6 @@ function get_Temperatures() {
 }
 
 function process_Temperatures(response) {
-    if (target_firmware != "marlin-embedded") Monitor_output_Update(response);
     var regex_temp = /(B|T(\d*)):\s*([+]?[0-9]*\.?[0-9]+)? (\/)([+]?[0-9]*\.?[0-9]+)?/gi;
     var result;
     var timedata = new Date().getTime();
diff --git a/www/sub/extruderpanel.html b/www/sub/extruderpanel.html
index a61ecbbfb..6668e3b33 100644
--- a/www/sub/extruderpanel.html
+++ b/www/sub/extruderpanel.html
@@ -68,7 +68,7 @@
             </li>
             <li class="list-group-item">
                 <div class="row">
-                    <div class="col-md-4"><span translate>Flow (50-300%)</span></div>
+                    <div class="col-md-4"><span translate>Flow (50-300%)</span>&nbsp;<span id="flowratecatched"></span></div>
                     <div class="col-md-8">
                         <div class="panel-flex-row">
                             <button onclick="flowInit_cmd()" class="btn btn-primary">
@@ -83,7 +83,7 @@
                                 <tr>
                                     <td>
                                         <div class="input-group">
-                                            <input class="form-control w5" type="number" min="50" max="300" id="flowSelectedValue" value=100 onkeyup="extruder_handleKeyUp(event, 'Flow')" />
+                                            <input class="form-control w5" type="number" min="50" max="300" id="flowSelectedValue" value="" onkeyup="extruder_handleKeyUp(event, 'Flow')" />
                                             <span class="input-group-addon hide_it"></span>
                                         </div>
                                     </td>
@@ -109,7 +109,7 @@
             </li>
             <li class="list-group-item">
                 <div class="row">
-                    <div class="col-md-4"><span translate>Feed (25-150%)</span></div>
+                    <div class="col-md-4"><span translate>Feed (25-150%)</span>&nbsp;<span id="feedratecatched"></span></div>
                     <div class="col-md-8">
                         <div class="panel-flex-row">
                             <button onclick="feedInit_cmd()" class="btn btn-primary">
@@ -124,7 +124,7 @@
                                 <tr>
                                     <td>
                                         <div class="input-group">
-                                            <input class="form-control w5" type="number" min="25" max="150" id="feedSelectedValue" value=100 onkeyup="extruder_handleKeyUp(event,'Feed')" />
+                                            <input class="form-control w5" type="number" min="25" max="150" id="feedSelectedValue" value="" onkeyup="extruder_handleKeyUp(event,'Feed')" />
                                             <span class="input-group-addon hide_it"></span>
                                         </div>
                                     </td>
@@ -242,4 +242,4 @@
             </table>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>