diff --git a/aio/tools/transforms/templates/cli/cli-container.template.html b/aio/tools/transforms/templates/cli/cli-container.template.html
index b9bf21596a..654ba52903 100644
--- a/aio/tools/transforms/templates/cli/cli-container.template.html
+++ b/aio/tools/transforms/templates/cli/cli-container.template.html
@@ -1,3 +1,6 @@
+{% extends 'content.template.html' -%}
+
+{% block content %}
 <div class="content">
 {$ doc.description | marked $}
 </div>
@@ -20,4 +23,5 @@
   </tr>
 {% endfor %}
 </tbody>
-</table>
\ No newline at end of file
+</table>
+{% endblock %}
diff --git a/aio/tools/transforms/templates/content.template.html b/aio/tools/transforms/templates/content.template.html
index b610eb43e1..58d0baf52d 100644
--- a/aio/tools/transforms/templates/content.template.html
+++ b/aio/tools/transforms/templates/content.template.html
@@ -2,11 +2,13 @@
 
 {% set relativePath = doc.fileInfo.relativePath %}
 {% if doc.title %}{$ ('# ' + doc.title.trim()) | marked $}{% endif %}
-{% if 'guide/' in relativePath or 'tutorial/' in relativePath or 'docs.md' in relativePath %}
+{% if '/' in relativePath or 'docs.md' in relativePath %}
   <div class="github-links">
     {$ github.githubEditLink(doc, versionInfo) $}
   </div>
 {% endif %}
+{% block content %}
 <div class="content">
 {$ doc.description | marked $}
 </div>
+{% endblock %}
\ No newline at end of file