diff --git a/octoprint_CalibrationTools/PIDAutoTune.py b/octoprint_CalibrationTools/PIDAutoTune.py
index 694bd02..f7a895d 100644
--- a/octoprint_CalibrationTools/PIDAutoTune.py
+++ b/octoprint_CalibrationTools/PIDAutoTune.py
@@ -13,7 +13,9 @@ class API(octoprint.plugin.SimpleApiPlugin):
 
     @staticmethod
     def apiCommands():
-        return {CMD_PID_SAVE : []}
+        return {
+            CMD_PID_SAVE : ["fanSpeed", "noCycles" "hotEndIndex", "targetTemp"]
+            }
 
     def apiGateWay(self, command, data):
         self._logger.debug("DIPGateway")
diff --git a/octoprint_CalibrationTools/static/css/style.css b/octoprint_CalibrationTools/static/css/style.css
index f000823..b8cf168 100644
--- a/octoprint_CalibrationTools/static/css/style.css
+++ b/octoprint_CalibrationTools/static/css/style.css
@@ -14,8 +14,9 @@
   border-radius: 4px;
 }
 
-#tab_plugin_CalibrationTools .tab-content, #tab_plugin_CalibrationTools .tab-content > .tab-pane {
-    border: none;
+#tab_plugin_CalibrationTools .tab-content,
+#tab_plugin_CalibrationTools .tab-content > .tab-pane {
+  border: none;
 }
 
 #tab_plugin_CalibrationTools ul.nav li:first-child > a {
@@ -40,16 +41,20 @@
   margin-bottom: 10px;
 }
 
-#tab_plugin_CalibrationTools .icon a, #tab_plugin_CalibrationTools .icon a i {
-    vertical-align: middle;
-    cursor: pointer;
+#tab_plugin_CalibrationTools .icon a,
+#tab_plugin_CalibrationTools .icon a i {
+  vertical-align: middle;
+  cursor: pointer;
 }
 
 #tab_plugin_CalibrationTools input:disabled {
-    cursor: text;
+  cursor: text;
 }
 
-
+#tab_plugin_CalibrationTools input[type='number'].input-mini {
+  text-align: left;
+  max-width: 40px;
+}
 /*
 
 
diff --git a/octoprint_CalibrationTools/templates/macros.jinja2 b/octoprint_CalibrationTools/templates/macros.jinja2
index eece5b2..f7f75f0 100644
--- a/octoprint_CalibrationTools/templates/macros.jinja2
+++ b/octoprint_CalibrationTools/templates/macros.jinja2
@@ -56,4 +56,11 @@
         </div>
     </div>
 </div>
+{% endmacro %}
+
+{% macro linkToMarlin(command, title) %}
+
+<span class="add-on" title="{{ title }}">
+    <a target="_blank" href="https://marlinfw.org/docs/gcode/{{command}}.html"><i class="fas fa-info-circle"></i></a>
+</span>
 {% endmacro %}
\ No newline at end of file
diff --git a/octoprint_CalibrationTools/templates/tabs/tab-content.jinja2 b/octoprint_CalibrationTools/templates/tabs/tab-content.jinja2
index 245d6be..9b7c593 100644
--- a/octoprint_CalibrationTools/templates/tabs/tab-content.jinja2
+++ b/octoprint_CalibrationTools/templates/tabs/tab-content.jinja2
@@ -1,4 +1,3 @@
-
 <div class="tab-content">
     <div id="calibration_documentation" class="tab-pane active">
         {% include "tabs/tab-doc.jinja2" %}
@@ -10,6 +9,6 @@
         {% include "tabs/tab-esteps.jinja2" %}
     </div>
     <div id="calibration_pid" visible="false" class="tab-pane">
-        {% include "tabs/tab-pind.jinja2" %}
+        {% include "tabs/tab-pid.jinja2" %}
     </div>
 </div>
\ No newline at end of file
diff --git a/octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2 b/octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2
index 7f86f89..9314848 100644
--- a/octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2
+++ b/octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2
@@ -11,6 +11,7 @@
     </div>
     <div class="span6">
         <div class="input-prepend input-append">
+            {{ snipped.linkToMarlin("M104", "Marlin website") }}
             <span class="add-on" title="Command to preheat the tool before testing">M104&nbsp;&nbsp;&nbsp;S</span>
             <input type="number" id="temperature" class="input-mini" step="1" min="0" max="280"
                 title="The temperature used to extrude in testing (&#186;C)&#013;Is better to be a bit higher then usual for reducing the nuzzle pressure" data-bind="value: $root.testParam.extrudeTemp">
@@ -26,6 +27,7 @@
     </div>
     <div class="span6">
         <div class="input-prepend input-append">
+            {{ snipped.linkToMarlin("G000-G001", "Marlin website") }}
             <span class="add-on" title="Command to extrude filament for testing">G1&nbsp;&nbsp;&nbsp;E</span>
             <input type="number" id="extrusionLenSpeed" class="input-mini" step="1" min="50" title="The length of filament to be extruded in testing (in millimeters)" data-bind="value: $root.testParam.extrudeLength">
             <span class="add-on" title="Command to extrude filament for testing">&nbsp;&nbsp;&nbsp;F</span>
@@ -80,7 +82,9 @@
     </div>
     <div class="span6">
         <div class="input-prepend input-append">
+            {{ snipped.linkToMarlin("M92", "Marlin website") }}
             <span class="add-on" title="Command to change number of steps/mm for E axe" data-bind="text: $root.results.newStepsDisplay"></span>
+            {{ snipped.linkToMarlin("M500", "Marlin website") }}
             <span class="add-on" title="Command for saving steps in EEPROM">M500</span>
         </div>
     </div>
diff --git a/octoprint_CalibrationTools/templates/tabs/tab-pind.jinja2 b/octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2
similarity index 67%
rename from octoprint_CalibrationTools/templates/tabs/tab-pind.jinja2
rename to octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2
index f6500dc..93c00b2 100644
--- a/octoprint_CalibrationTools/templates/tabs/tab-pind.jinja2
+++ b/octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2
@@ -5,38 +5,42 @@ Current bed temperature: <span data-bind="text: bedCurrentTemp"></span>&#176; Be
 
 
 <div class="row-fluid">
-    <div class="span6">
+    <div class="span5">
         <label for="fanSpeed" class="pull-right" style="margin-top: 5px;" title="x">
             Turn fan to max
         </label>
     </div>
-    <div class="span6">
+    <div class="span7">
         <div class="input-prepend input-append">
+            {{ snipped.linkToMarlin("M106", "Marlin website") }}
             <span class="add-on" title="Command for turning the fan to 100%">M106&nbsp;&nbsp;&nbsp;S</span>
             <input type="number" id="fanSpeed" title="Command for turning the fan to 100%" class="input-mini" step="1" min="0" max="255" data-bind="value: $root.pid.fanSpeed">
         </div>
     </div>
 </div>
 <div class="row-fluid">
-    <div class="span6">
-        <label for="tunningPIDTool" class="pull-right" style="margin-top: 5px;" title="x">
+    <div class="span5">
+        <label for="tunningPIDNoCycles" class="pull-right" style="margin-top: 5px;" title="x">
             Tuning PID
         </label>
     </div>
-    <div class="span6">
+    <div class="span7">
         <div class="input-prepend input-append">
-            <span class="add-on" title="Command for triggering tool PID tunning">M303&nbsp;&nbsp;&nbsp;E</span>
-            <input type="number" id="tunningPIDTool" class="input-mini" step="1" min="0" title="Tool number 0 for first hot end" data-bind="value: $root.pid.hotendNo">
-            <span class="add-on" title="">S</span>
-            <input type="number" id="tunningPIDToolTemp" class="input-mini" step="1" min="100" max="280" title="Temperature for tunning" data-bind="value: $root.pid.tunningTemp">
-            <span class="add-on" title="">U1</span>
+            {{ snipped.linkToMarlin("M303", "Marlin website") }}
+            <span class="add-on" title="Command for triggering tool PID tunning">M303&nbsp;&nbsp;&nbsp;C</span>
+            <input type="number" id="tunningPIDNoCycles" class="input-mini" step="1" min="0" title="Tool number 0 for first hot end" data-bind="value: $root.pid.noCycles">
+            <span class="add-on" title="">&nbsp;&nbsp;&nbsp;E</span>
+            <input type="number" id="tunningPIDTool" class="input-mini" step="1" min="0" title="Hotend index 0 for first hot end" data-bind="value: $root.pid.hotEndIndex">
+            <span class="add-on" title="">&nbsp;&nbsp;&nbsp;S</span>
+            <input type="number" id="tunningPIDToolTemp" class="input-mini" step="1" min="100" max="280" title="Target temperature" data-bind="value: $root.pid.targetTemp">
+            <span class="add-on" title="">&nbsp;&nbsp;&nbsp;U1</span>
         </div>
     </div>
 </div>
 
 <div class="row-fluid" style="margin-bottom: 5px;">
-    <div class="span6"></div>
-    <div class="span6">
+    <div class="span5"></div>
+    <div class="span7">
         <button class="btn btn-success" data-bind="click: $root.pidHotEndTune, enable: $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
             title="This will trigger PID auto tuning (M106 Sx; M303 Ex Sx U1; M501)">
             <i class="fas fa-play" style="color:false" data-color="false"></i>&nbsp&nbsp