diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 201f49b..79f94e6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,5 @@
-v1.0.238: Added Automatic Probing (Find Endmill diameter automatically), Fix cosmetic bug in editing JS Macros. Fixed issues/enhancements #92, #127, #128, #129, #130, #131, #132, #134, #135
-v1.0.237: Fixed Pause Bug
-v1.0.236: Fixed Pause bug
+v1.0.238: Added Automatic Probing (Find Endmill diameter automatically), Fix cosmetic bug in editing JS Macros. Fixed issues/enhancements #92, #108, #127, #128, #129, #130, #131, #132, #134, #135
+v1.0.236/7: Fixed Pause bug
 v1.0.235: Improved Serial Buffer check
 v1.0.234: Added check for USB Selective Suspend to Troubleshooting tab, improved simulation of arcs, Fixed right-click menu in Gcode Editor
 v1.0.233: Cleanup code
diff --git a/app/index.html b/app/index.html
index d56778f..bbd3643 100644
--- a/app/index.html
+++ b/app/index.html
@@ -454,7 +454,7 @@
                           <button class="button light jogbtn" style="width: 42px;"><i class="fas fa-caret-down fg-openbuilds"></i></button>
                           <ul class="d-menu context drop-shadow drop-right" data-role="dropdown">
                             <li><a href="#" onclick="sendGcode( 'G0 X0')"><span class="fas fa-chart-line fg-red icon"></span>Goto X0 (Work Coord) (G0 X0)</a></li>
-                            <li id="gotoXzeroMpos"><a href="#" onclick="sendGcode( 'G53 G0 X0')"><span class="fas fa-chart-line fg-red icon"></span>Goto X0 (Machine Coord) (G53 G0 X0)</a></li>
+                            <li id="gotoXzeroMpos"><a href="#"><span class="fas fa-chart-line fg-red icon"></span>Goto X<span class="PullOffMPos">0</span> (Machine Coord) (G53 G0 X0)</a></li>
                             <li class="divider"></li>
                             <li class="needsXYZProbe"><a href="#" onclick="openProbeXDialog()"><span class="fas fa-podcast fa-rotate-180 fg-red icon"></span>Probe X-Zero Wizard <span class="badge inline bg-red fg-white">New!</span></a></li>
                             <li class="needsXYZProbe"><a href="#" onclick="openProbeDialog()"><span class="fas fa-podcast fa-rotate-180 fg-red icon"></span>Probe XYZ-Zero Wizard <span class="badge inline bg-red fg-white">New!</span></a></li>
@@ -489,7 +489,7 @@
                           <button class="button light jogbtn" style="width: 42px;"><i class="fas fa-caret-down fg-openbuilds"></i></button>
                           <ul class="d-menu context drop-shadow drop-right" data-role="dropdown">
                             <li><a href="#" onclick="sendGcode( 'G0 Y0')"><span class="fas fa-chart-line fg-green icon"></span>Goto Y0 (Work Coord) (G0 Y0)</a></li>
-                            <li id="gotoYzeroMpos"><a href="#" onclick="sendGcode( 'G53 G0 Y0')"><span class="fas fa-chart-line fg-green icon"></span>Goto Y0 (Machine Coord) (G53 G0 Y0)</a></li>
+                            <li id="gotoYzeroMpos"><a href="#"><span class="fas fa-chart-line fg-green icon"></span>Goto Y<span class="PullOffMPos">0</span> (Machine Coord) (G53 G0 Y0)</a></li>
                             <li class="divider"></li>
                             <li class="needsXYZProbe"><a href="#" onclick="openProbeYDialog()"><span class="fas fa-podcast fa-rotate-180 fg-green icon"></span>Probe Y-Zero Wizard <span class="badge inline bg-red fg-white">New!</span></a></li>
                             <li class="needsXYZProbe"><a href="#" onclick="openProbeDialog()"><span class="fas fa-podcast fa-rotate-180 fg-green icon"></span>Probe XYZ-Zero Wizard <span class="badge inline bg-red fg-white">New!</span></a></li>
@@ -524,7 +524,7 @@
                           <button class="button light jogbtn" style="width: 42px;"><i class="fas fa-caret-down fg-openbuilds"></i></button>
                           <ul class="d-menu context drop-shadow drop-right" data-role="dropdown">
                             <li><a href="#" onclick="sendGcode( 'G0 Z0')"><span class="fas fa-chart-line fg-blue icon"></span>Goto Z0 (Work Coord) (G0 Z0)</a></li>
-                            <li id="gotoZzeroMpos"><a href="#" onclick="sendGcode( 'G53 G0 Z0')"><span class="fas fa-chart-line fg-blue icon"></span>Goto Z0 (Machine Coord) (G53 G0 Z0)</a></li>
+                            <li id="gotoZzeroMpos"><a href="#"><span class="fas fa-chart-line fg-blue icon"></span>Goto Z<span class="PullOffMPos">0</span> (Machine Coord) (G53 G0 Z0)</a></li>
                             <li class="divider"></li>
                             <!-- <li><a href="#" onclick="z0probe()()"><span class="fas fa-podcast fa-rotate-180 fg-blue icon"></span>Probe Z-Zero Wizard</a></li> -->
                             <li><a href="#" onclick="openProbeZDialog()"><span class="fas fa-podcast fa-rotate-180 fg-blue icon"></span>Probe Z-Zero Wizard <span class="badge inline bg-red fg-white">New!</span></a></li>
@@ -558,8 +558,19 @@
                             </span>
                           </button>
                           <ul class="d-menu context drop-shadow" data-role="dropdown">
-                            <li id="gotozeroWPos"><a href="#"><span class="fas fa-chart-line fg-openbuilds icon"></span>GOTO X0Y0Z0 (Work Coord) (G0 Z5, G0 X0 Y0, G0 Z0) (Retract Z to Work Coord Z5)</a></li>
-                            <li id="gotozeroMPos"><a href="#"><span class="fas fa-chart-line fg-openbuilds icon"></span>GOTO X0Y0Z0 (Machine Coord) (G53 G0 Z0, G0 X0 Y0, G0 Z0) (Retract Z to Machine Coord Z0)</a></li>
+                            <li id="gotozeroWPos">
+                              <a href="#"><span class="fas fa-chart-line fg-openbuilds icon"></span>GOTOZERO (Work Coord) (G0 Z5, G0 X0 Y0, G0 Z0) (Retract Z to Work Coord Z5)
+                              </a>
+                            </li>
+                            <li id="gotozeroZmPosXYwPos">
+                              <a href="#"><span class="fas fa-chart-line fg-openbuilds icon"></span>GOTOZERO (Z Machine Coord, XY Work Coord) (G53 G0 Z<span class="PullOffMPos">0</span>, G0 X0 Y0, G0 Z0) (Retract Z to
+                                Machine Coord)
+                              </a>
+                            </li>
+                            <li id="gotozeroMPos">
+                              <a href="#"><span class="fas fa-chart-line fg-openbuilds icon"></span>GOTOZERO (Machine Coord) (G53 G0 Z<span class="PullOffMPos">0</span>, G53 G0 X<span class="PullOffMPos">0</span> Y<span class="PullOffMPos">0</span>)
+                              </a>
+                            </li>
                           </ul>
                         </div>
                       </td>
diff --git a/app/js/grblsettings.js b/app/js/grblsettings.js
index a7305d8..5391104 100644
--- a/app/js/grblsettings.js
+++ b/app/js/grblsettings.js
@@ -70,6 +70,7 @@ function grblSettings(data) {
     $('#gotoXzeroMpos').removeClass('disabled')
     $('#gotoYzeroMpos').removeClass('disabled')
     $('#gotoZzeroMpos').removeClass('disabled')
+    $('.PullOffMPos').html("-" + grblParams['$27'])
   } else {
     $('#gotozeroMPos').addClass('disabled')
     $('#homeBtn').attr('disabled', true)
diff --git a/app/js/jog.js b/app/js/jog.js
index 9b3c65f..e36c419 100644
--- a/app/js/jog.js
+++ b/app/js/jog.js
@@ -307,12 +307,53 @@ $(document).ready(function() {
     sendGcode('G0 Z0');
   });
 
-  $('#gotozeroMPos').on('click', function(ev) {
-    sendGcode('G53 G0 Z0');
+  $('#gotoXzeroMpos').on('click', function(ev) {
+    if (grblParams['$22'] == 1) {
+      sendGcode('G53 G0 X-' + grblParams["$27"]);
+    } else {
+      sendGcode('G53 G0 X0');
+    }
+  });
+
+  $('#gotoYzeroMpos').on('click', function(ev) {
+    if (grblParams['$22'] == 1) {
+      sendGcode('G53 G0 Y-' + grblParams["$27"]);
+    } else {
+      sendGcode('G53 G0 Y0');
+    }
+  });
+
+  $('#gotoZzeroMpos').on('click', function(ev) {
+    if (grblParams['$22'] == 1) {
+      sendGcode('G53 G0 Z-' + grblParams["$27"]);
+    } else {
+      sendGcode('G53 G0 Z0');
+    }
+  });
+
+  $('#gotozeroZmPosXYwPos').on('click', function(ev) {
+    if (grblParams['$22'] == 1) {
+      sendGcode('G53 G0 Z-' + grblParams["$27"]);
+    } else {
+      sendGcode('G53 G0 Z0');
+    }
     sendGcode('G0 X0 Y0');
     sendGcode('G0 Z0');
   });
 
+  $('#gotozeroMPos').on('click', function(ev) {
+    if (grblParams['$22'] == 1) {
+      sendGcode('G53 G0 Z-' + grblParams["$27"]);
+      sendGcode('G53 G0 X-' + grblParams["$27"] + ' Y-' + grblParams["$27"]);
+    } else {
+      sendGcode('G53 G0 Z0');
+      sendGcode('G53 G0 X0 Y0');
+    }
+
+
+  });
+
+
   // $('.xM').on('click', function(ev) {
   //   if (!allowContinuousJog) {
   //     var dir = 'X-';