diff --git a/plugins/API/templates/glossary.twig b/plugins/API/templates/glossary.twig
index fc593742c9e8a91d3ea191b0ffe5c2b4e722a798..d7fd2d1de9e2c57c2b187920315c9716483eca00 100644
--- a/plugins/API/templates/glossary.twig
+++ b/plugins/API/templates/glossary.twig
@@ -3,41 +3,43 @@
 {% set title %}{{ 'API_Glossary'|translate }}{% endset %}
 
 {% block content %}
-    <h2 piwik-enriched-headline>{{ title }}</h2>
+    <div piwik-content-intro>
 
-    {{ 'API_LearnAboutCommonlyUsedTerms'|translate(
-                '<a href="#metrics">'~ 'General_Metrics'|translate ~ '</a>',
-                '<a href="#reports">' ~ 'General_Reports'|translate ~ '</a>')|raw
-    }}
+        <h2>{{ title|e('html_attr') }}</h2>
+        <p>
+            {{ 'API_LearnAboutCommonlyUsedTerms'|translate(
+                        '<a href="#metrics">'~ 'General_Metrics'|translate ~ '</a>',
+                        '<a href="#reports">' ~ 'General_Reports'|translate ~ '</a>')|raw
+            }}
 
-    <!-- {{ metrics|length }} metrics, {{ reports|length }} reports -->
+            <!-- {{ metrics|length }} metrics, {{ reports|length }} reports -->
+        </p>
+    </div>
 
     <a id="metrics"></a>
-    <h2>{{ 'General_Metrics'|translate }}</h2>
-    <table>
-    {% for metric in metrics %}
-        <tr>
-            <td>
-                <h3>{{ metric.name }}</h3>
-            </td>
-            <td>
-                {{ metric.documentation|raw }}
-
-                <br/><span style="color: #bbb;">{{ metric.id }} (API)</span>
-            </td>
-        </tr>
-    {% endfor %}
-    </table>
+    <div piwik-content-block content-title="{{ 'General_Metrics'|translate|e('html_attr') }}">
+        <table>
+        {% for metric in metrics %}
+            <tr>
+                <td>
+                    <h3>{{ metric.name }}</h3>
+                </td>
+                <td>
+                    {{ metric.documentation|raw }}
+
+                    <br/><span style="color: #bbb;">{{ metric.id }} (API)</span>
+                </td>
+            </tr>
+        {% endfor %}
+        </table>
+    </div>
 
     <a id="reports"></a>
-    <h2>{{ 'General_Reports'|translate }}</h2>
-
-
-    {% for report in reports %}
-        <h3>{{ report.name }}</h3>
-        <p>{{ report.documentation|raw }}</p>
-    {% endfor %}
-
-
+    <div piwik-content-block content-title="{{ 'General_Reports'|translate|e('html_attr') }}">
+        {% for report in reports %}
+            <h3>{{ report.name }}</h3>
+            <p>{{ report.documentation|raw }}</p>
+        {% endfor %}
+    </div>
 
 {% endblock %}
\ No newline at end of file