diff --git a/build/build.py b/build/build.py
index 662d9bb..7a7c060 100644
--- a/build/build.py
+++ b/build/build.py
@@ -38,7 +38,7 @@ class DwcNamespaceError(Exception):
 class DwcBuildReader():
 
     def __init__(self, dwc_build_file):
-        """Custom Reader switching between to raw Github or local file"""
+        """Custom Reader switching between raw Github or local file"""
         self.dwc_build_file = dwc_build_file
 
     def __enter__(self):
diff --git a/docs/_layouts/terms.tmpl b/docs/_layouts/terms.tmpl
index 869e5de..2dee6a3 100644
--- a/docs/_layouts/terms.tmpl
+++ b/docs/_layouts/terms.tmpl
@@ -10,28 +10,31 @@ This page provides a list of all currently recommended terms of the Darwin Core
 {% for class_group in class_groups %}
 
 ## {{ class_group.label }}
-    
+
 <div class="my-4">
     {% for term in class_group.terms %}
-    <a class="btn btn-sm btn-outline-secondary m-1" href="#{{ term.namespace}}:{{ term.label }}">{{ term.label }}</a>
+    <a class="btn btn-sm btn-outline-secondary m-1" href="#{{ term.namespace }}:{{ term.label }}">{{ term.label }}</a>
     {% endfor %}
 </div>
 
 {% if class_group.iri is not none %}
-{# The above will exclude the Record-level class_group #}
-<table class="table table-sm border mb-3">
+{# Class (the above will exclude the Record-level class_group) #}
+<table class="table table-sm table-bordered">
     <tbody>
         <tr class="table-primary"><th colspan="2">{{ class_group.label }}<span class="badge badge-primary float-right">Class</span></th></tr>
         <tr><td class="label">Identifier</td><td><a href="{{ class_group.iri }}">{{ class_group.iri }}</a></td></tr>
-        <tr><td class="label">Definition</td><td>{{class_group.definition}}</td></tr>
-        <tr><td class="label">Comments</td><td>{{class_group.comments}}</td></tr>
+        <tr><td class="label">Definition</td><td>{{ class_group.definition }}</td></tr>
+        <tr><td class="label">Comments</td><td>{{ class_group.comments }}</td></tr>
     </tbody>
 </table>
 {%endif %}
 
 {% for term in class_group.terms %}
-<a id="{{ term.namespace}}:{{ term.label }}" class="anchor"></a><a id="{{ term.label }}" class="anchor"></a>
-<table class="table table-sm border mb-3">
+{# Term #}
+<p class="invisible">
+    <a id="{{ term.namespace }}:{{ term.label }}"></a>{% if term.namespace != "dwciri" %}<a id="{{ term.label }}"></a>{% endif %}
+</p>
+<table class="table table-sm table-bordered">
     <tbody>
         <tr class="table-secondary"><th colspan="2">{{ term.label }}<span class="badge badge-secondary float-right">Property</span></th></tr>
         <tr><td class="label">Identifier</td><td><a href="{{ term.iri }}">{{ term.iri }}</a></td></tr>