diff --git a/source/_feedback.html.md.erb b/source/_feedback.html.md.erb
index e5e94022..e0d5f232 100644
--- a/source/_feedback.html.md.erb
+++ b/source/_feedback.html.md.erb
@@ -10,4 +10,4 @@ We are interested in your suggestions to improve the DataCite Metadata Schema, i
 
 <a href="/contribute.html" class="btn">More info</a>
 
-For questions, please contact support@datacite.org.
+For questions, please contact [support@datacite.org](mailto:support@datacite.org).
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 26ad6a93..a4876a36 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -78,11 +78,6 @@
       .navbar-default .navbar-nav>li>a:not(.btn) {
         color: #34495e;
       }
-      .navbar-default .navbar-nav>li>a:not(.btn):focus,
-      .navbar-default .navbar-nav>li>a:not(.btn):hover,
-      .footer a:hover, .footer a:focus  {
-        color: #0071b2;
-      }
       h2, h3, h4, p, li {
         color: #34495e;
       }
@@ -98,9 +93,22 @@
       a { 
         color: #0071b2;
       }
-      p > a { 
+      p > a, h4 > a, li > a {
         text-decoration: underline;
       }
+      .nav li > a,
+      .footer li > a { 
+        text-decoration: none;
+      }
+      p > a:hover,
+      p > a:focus,
+      h4 > a:hover,
+      h4 > a:focus,
+      li > a:hover,
+      li > a:focus {
+        color: #0071b2;
+        text-decoration: none;
+      }
       .btn {
         color: #34495e;
         border-color: #34495e;
@@ -117,6 +125,11 @@
       .footer h4 {
         color: #a3acb2;
       }
+      .navbar-default .navbar-nav>li>a:not(.btn):focus,
+      .navbar-default .navbar-nav>li>a:not(.btn):hover,
+      .footer a:hover, .footer a:focus  {
+        color: #0071b2;
+      }
     </style>
 
 
diff --git a/source/meta/kernel-4.0/index.html.md b/source/meta/kernel-4.0/index.html.md
index 8918034d..ff04898f 100644
--- a/source/meta/kernel-4.0/index.html.md
+++ b/source/meta/kernel-4.0/index.html.md
@@ -8,12 +8,12 @@ documentation_url: /meta/kernel-4.0/doc/DataCite-MetadataKernel_v4.0.pdf
 ---
 
 ## Documentation
-DataCite Metadata Working Group. (2016). DataCite Metadata Schema Documentation for the Publication and Citation of Research Data. Version 4.0. DataCite e.V. http://doi.org/10.5438/0012
+DataCite Metadata Working Group. (2016). DataCite Metadata Schema Documentation for the Publication and Citation of Research Data. Version 4.0. DataCite e.V. [https://doi.org/10.5438/0012](https://doi.org/10.5438/0012)
 
 <a href="doc/DataCite-MetadataKernel_v4.0.pdf" class="btn">Download PDF</a>
 
 ## Schema
-DataCite Metadata Working Group. (2016). DataCite Metadata Schema for the Publication and Citation of Research Data. Version 4.0. DataCite e.V. http://doi.org/10.5438/0013
+DataCite Metadata Working Group. (2016). DataCite Metadata Schema for the Publication and Citation of Research Data. Version 4.0. DataCite e.V. [https://doi.org/10.5438/0013](https://doi.org/10.5438/0013)
 
 <a href="metadata.xsd" class="btn">View XSD</a>
 
diff --git a/source/meta/kernel-4.1/index.html.md b/source/meta/kernel-4.1/index.html.md
index 7aca87c9..fe846475 100644
--- a/source/meta/kernel-4.1/index.html.md
+++ b/source/meta/kernel-4.1/index.html.md
@@ -8,12 +8,12 @@ documentation_url: /meta/kernel-4.0/doc/DataCite-MetadataKernel_v4.0.pdf
 ---
 
 ## Documentation
-DataCite Metadata Working Group. (2017). DataCite Metadata Schema Documentation for the Publication and Citation of Research Data. Version 4.1. DataCite e.V. http://doi.org/10.5438/0014.
+DataCite Metadata Working Group. (2017). DataCite Metadata Schema Documentation for the Publication and Citation of Research Data. Version 4.1. DataCite e.V. [https://doi.org/10.5438/0014](https://doi.org/10.5438/0014).
 
 <a href="doc/DataCite-MetadataKernel_v4.1.pdf" class="btn">Download PDF</a>
 
 ## Schema
-DataCite Metadata Working Group. (2017). DataCite Metadata Schema for the Publication and Citation of Research Data. Version 4.1. DataCite e.V. http://doi.org/10.5438/0015
+DataCite Metadata Working Group. (2017). DataCite Metadata Schema for the Publication and Citation of Research Data. Version 4.1. DataCite e.V. [https://doi.org/10.5438/0015](https://doi.org/10.5438/0015)
 
 <a href="metadata.xsd" class="btn">View XSD</a>
 
diff --git a/source/meta/kernel-4.2/index.html.md b/source/meta/kernel-4.2/index.html.md
index 2c5e0525..722d4bf5 100644
--- a/source/meta/kernel-4.2/index.html.md
+++ b/source/meta/kernel-4.2/index.html.md
@@ -8,12 +8,12 @@ documentation_url: /meta/kernel-4.2/doc/DataCite-MetadataKernel_v4.2.pdf
 ---
 
 ## Documentation
-DataCite Metadata Working Group. (2019). DataCite Metadata Schema Documentation for the Publication and Citation of Research Data. Version 4.2. DataCite e.V. https://doi.org/10.5438/bmjt-bx77
+DataCite Metadata Working Group. (2019). DataCite Metadata Schema Documentation for the Publication and Citation of Research Data. Version 4.2. DataCite e.V. [https://doi.org/10.5438/bmjt-bx77](https://doi.org/10.5438/bmjt-bx77)
 
 <a href="doc/DataCite-MetadataKernel_v4.2.pdf" class="btn">Download PDF</a>
 
 ## Schema
-DataCite Metadata Working Group. (2019). DataCite Metadata Schema for the Publication and Citation of Research Data. Version 4.2. DataCite e.V. http://doi.org/10.5438/rv0g-av03
+DataCite Metadata Working Group. (2019). DataCite Metadata Schema for the Publication and Citation of Research Data. Version 4.2. DataCite e.V. [https://doi.org/10.5438/rv0g-av03](https://doi.org/10.5438/rv0g-av03)
 
 <a href="metadata.xsd" class="btn">View XSD</a>
 
diff --git a/source/meta/kernel-4.3/index.html.md b/source/meta/kernel-4.3/index.html.md
index 46f17ef6..f833c5d4 100644
--- a/source/meta/kernel-4.3/index.html.md
+++ b/source/meta/kernel-4.3/index.html.md
@@ -8,13 +8,13 @@ documentation_url: /meta/kernel-4.3/doc/DataCite-MetadataKernel_v4.3.pdf
 ---
 
 ## Documentation
-DataCite Metadata Working Group. (2019). DataCite Metadata Schema Documentation for the Publication and Citation of Research Data. Version 4.3. DataCite e.V. https://doi.org/10.14454/7xq3-zf69
+DataCite Metadata Working Group. (2019). DataCite Metadata Schema Documentation for the Publication and Citation of Research Data. Version 4.3. DataCite e.V. [https://doi.org/10.14454/7xq3-zf69](https://doi.org/10.14454/7xq3-zf69)
 
 <a href="doc/DataCite-MetadataKernel_v4.3.pdf" class="btn">Download PDF</a>
 
 
 ## Schema
-DataCite Metadata Working Group. (2019). DataCite Metadata Schema for the Publication and Citation of Research Data. Version 4.3. DataCite e.V. https://doi.org/10.14454/f2wp-s162
+DataCite Metadata Working Group. (2019). DataCite Metadata Schema for the Publication and Citation of Research Data. Version 4.3. DataCite e.V. [https://doi.org/10.14454/f2wp-s162](https://doi.org/10.14454/f2wp-s162)
 
 <a href="metadata.xsd" class="btn">View XSD</a>
 
diff --git a/source/meta/kernel-4.4/index.html.md b/source/meta/kernel-4.4/index.html.md
index 25887cfc..9cd2e448 100644
--- a/source/meta/kernel-4.4/index.html.md
+++ b/source/meta/kernel-4.4/index.html.md
@@ -8,7 +8,7 @@ documentation_url: /meta/kernel-4.4/doc/DataCite-MetadataKernel_v4.4.pdf
 ---
 
 ## Documentation
-DataCite Metadata Working Group. (2021). DataCite Metadata Schema Documentation for the Publication and Citation of Research Data and Other Research Outputs. Version 4.4. DataCite e.V. https://doi.org/10.14454/3w3z-sa82
+DataCite Metadata Working Group. (2021). DataCite Metadata Schema Documentation for the Publication and Citation of Research Data and Other Research Outputs. Version 4.4. DataCite e.V. [https://doi.org/10.14454/3w3z-sa82](https://doi.org/10.14454/3w3z-sa82)
 
 <a href="doc/DataCite-MetadataKernel_v4.4.pdf" class="btn">Download PDF</a>
 
@@ -17,7 +17,7 @@ On the occasion of the release of v4.4 of the DataCite Metadata Schema its Metad
 <a href="doc/DataCite_DublinCore_Mapping.pdf" class="btn">Download PDF</a>
 
 ## Schema
-DataCite Metadata Working Group. (2021). DataCite Metadata Schema for the Publication and Citation of Research Data and Other Research Outputs. Version 4.4. DataCite e.V. https://doi.org/10.14454/fxws-0523
+DataCite Metadata Working Group. (2021). DataCite Metadata Schema for the Publication and Citation of Research Data and Other Research Outputs. Version 4.4. DataCite e.V. [https://doi.org/10.14454/fxws-0523](https://doi.org/10.14454/fxws-0523)
 
 <a href="metadata.xsd" class="btn">View XSD</a>
 
diff --git a/source/meta/kernel-4.5/index.html.md b/source/meta/kernel-4.5/index.html.md
index 730092d0..49b9387a 100644
--- a/source/meta/kernel-4.5/index.html.md
+++ b/source/meta/kernel-4.5/index.html.md
@@ -8,14 +8,14 @@ documentation_url: https://datacite-metadata-schema.readthedocs.io/en/4.5/
 ---
 
 ## Documentation
-DataCite Metadata Working Group. (2024). DataCite Metadata Schema Documentation for the Publication and Citation of Research Data and Other Research Outputs. Version 4.5. DataCite e.V. https://doi.org/10.14454/g8e5-6293
+DataCite Metadata Working Group. (2024). DataCite Metadata Schema Documentation for the Publication and Citation of Research Data and Other Research Outputs. Version 4.5. DataCite e.V. [https://doi.org/10.14454/g8e5-6293](https://doi.org/10.14454/g8e5-6293)
 
 <div class="text-center"><a href="https://datacite-metadata-schema.readthedocs.io/en/4.5/" class="btn">Access documentation</a></div>
 <br>
 <div class="text-center"><a href="https://datacite-metadata-schema.readthedocs.io/_/downloads/en/4.5/pdf/" class="btn">Download PDF</a></div>
 
 ## Schema
-DataCite Metadata Working Group. (2024). DataCite Metadata Schema for the Publication and Citation of Research Data and Other Research Outputs. Version 4.5. DataCite e.V. https://doi.org/10.14454/znvd-6q68
+DataCite Metadata Working Group. (2024). DataCite Metadata Schema for the Publication and Citation of Research Data and Other Research Outputs. Version 4.5. DataCite e.V. [https://doi.org/10.14454/znvd-6q68](https://doi.org/10.14454/znvd-6q68)
 
 <div class="text-center"><a href="metadata.xsd" class="btn">View XSD</a></div>
 
diff --git a/source/meta/kernel-4/index.html.md b/source/meta/kernel-4/index.html.md
index 730092d0..49b9387a 100644
--- a/source/meta/kernel-4/index.html.md
+++ b/source/meta/kernel-4/index.html.md
@@ -8,14 +8,14 @@ documentation_url: https://datacite-metadata-schema.readthedocs.io/en/4.5/
 ---
 
 ## Documentation
-DataCite Metadata Working Group. (2024). DataCite Metadata Schema Documentation for the Publication and Citation of Research Data and Other Research Outputs. Version 4.5. DataCite e.V. https://doi.org/10.14454/g8e5-6293
+DataCite Metadata Working Group. (2024). DataCite Metadata Schema Documentation for the Publication and Citation of Research Data and Other Research Outputs. Version 4.5. DataCite e.V. [https://doi.org/10.14454/g8e5-6293](https://doi.org/10.14454/g8e5-6293)
 
 <div class="text-center"><a href="https://datacite-metadata-schema.readthedocs.io/en/4.5/" class="btn">Access documentation</a></div>
 <br>
 <div class="text-center"><a href="https://datacite-metadata-schema.readthedocs.io/_/downloads/en/4.5/pdf/" class="btn">Download PDF</a></div>
 
 ## Schema
-DataCite Metadata Working Group. (2024). DataCite Metadata Schema for the Publication and Citation of Research Data and Other Research Outputs. Version 4.5. DataCite e.V. https://doi.org/10.14454/znvd-6q68
+DataCite Metadata Working Group. (2024). DataCite Metadata Schema for the Publication and Citation of Research Data and Other Research Outputs. Version 4.5. DataCite e.V. [https://doi.org/10.14454/znvd-6q68](https://doi.org/10.14454/znvd-6q68)
 
 <div class="text-center"><a href="metadata.xsd" class="btn">View XSD</a></div>