diff --git a/octoprint_CalibrationTools/templates/macros.jinja2 b/octoprint_CalibrationTools/templates/macros.jinja2
index 5d9e7b8..766ebb1 100644
--- a/octoprint_CalibrationTools/templates/macros.jinja2
+++ b/octoprint_CalibrationTools/templates/macros.jinja2
@@ -14,7 +14,9 @@
 {% macro quote(content, cite, class) %}
 <blockquote>
     <p class="{{ class }}">{{ _(content) }}</p>
+    {% if cite %}
     <small>{{ cite }}</small>
+    {%endif %}
 </blockquote>
 {% endmacro %}
 
diff --git a/octoprint_CalibrationTools/templates/tabs/tab-doc.jinja2 b/octoprint_CalibrationTools/templates/tabs/tab-doc.jinja2
index 871f4d3..da9fa03 100644
--- a/octoprint_CalibrationTools/templates/tabs/tab-doc.jinja2
+++ b/octoprint_CalibrationTools/templates/tabs/tab-doc.jinja2
@@ -1,4 +1,3 @@
+{% import "macros.jinja2" as snipped %}
 
-    Something in documentation tab...
-
-    <strong data-bind="text: gettext('test')"></strong>
\ No newline at end of file
+{{ snipped.quote("For using this plugin, I strongly recommending you to read <a href='https://teachingtechyt.github.io/calibration.html#pid' target='_blank'>teachingtechyt.github.io</a>","", "text-warning") }}
\ 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 02419f9..60cb3d0 100644
--- a/octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2
+++ b/octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2
@@ -1,6 +1,15 @@
 {% import "macros.jinja2" as snipped %}
 
-{{ snipped.subSection("Test parameters", true) }}
+{{ snipped.subSection("Process description", true) }}
+{{ snipped.quote("
+This calibration is best done with the extruder detached from the hot end, so no restriction is present on the movement. If it is convenient, you can partially disassemble the printer so the output of the extruder is
+open and the filament exits in free air. If this is inconvenient, the process below aims to minimize restrictions by extruding very slowly and with a slightly higher temperature. The results from this should still be
+reliable.
+", "
+<a href='https://teachingtechyt.github.io/calibration.html#esteps' target='_blank'>For more information about how to use this visit teachingtechyt.github.io</a>
+", "text-warning") }}
+
+{{ snipped.subSection("Test parameters") }}
 
 <!-- M104 S210 command  -->
 <div class="row-fluid">
@@ -99,14 +108,4 @@
             Save the new value
         </button>
     </div>
-</div>
-
-
-{{ snipped.subSection("Process description") }}
-{{ snipped.quote("
-This calibration is best done with the extruder detached from the hot end, so no restriction is present on the movement. If it is convenient, you can partially disassemble the printer so the output of the extruder is
-open and the filament exits in free air. If this is inconvenient, the process below aims to minimize restrictions by extruding very slowly and with a slightly higher temperature. The results from this should still be
-reliable.
-", "
-<a href='https://teachingtechyt.github.io/calibration.html#esteps' target='_blank'>teachingtechyt.github.io</a>
-", "text-warning") }}
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2 b/octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2
index 6a4b8dd..8dc7adf 100644
--- a/octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2
+++ b/octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2
@@ -1,6 +1,11 @@
 {% import "macros.jinja2" as snipped %}
 
-{{ snipped.subSection("Current PID values", true) }}
+{{ snipped.subSection("Note", true) }}
+{{ snipped.quote("It is recommended to run the tuning with conditions as close to printing as possible. This means filament loaded and the part cooling fan set to your normal speed. It is not essential, but you may
+prefer to start this process with the hot end at room temperature.",
+"<a href='https://teachingtechyt.github.io/calibration.html#pid' target='_blank'>For more information about how to use this visit teachingtechyt.github.io</a>", "text-warning") }}
+
+{{ snipped.subSection("Current PID values") }}
 <div class="row-fluid">
     <div class="span5">
         <label for="hotEndPid" class="pull-right" style="margin-top: 5px;" title="Current hot-end PID">
@@ -140,9 +145,4 @@
             Start bed PID auto-tunning
         </button>
     </div>
-</div>
-
-{{ snipped.subSection("Note") }}
-{{ snipped.quote("It is recommended to run the tuning with conditions as close to printing as possible. This means filament loaded and the part cooling fan set to your normal speed. It is not essential, but you may
-prefer to start this process with the hot end at room temperature.",
-"<a href='https://teachingtechyt.github.io/calibration.html#pid' target='_blank'>teachingtechyt.github.io</a>", "text-warning") }}
\ No newline at end of file
+</div>
\ No newline at end of file