Correct some formatting and link errors. Improved readability. Improved consistency

Signed-off-by: Ed Bratt <ed.bratt@oracle.com>
diff --git a/docs/website/src/main/resources/certifications/EE-9.1-GlassFish-6.1-RC1.md b/docs/website/src/main/resources/certifications/EE-9.1-GlassFish-6.1-RC1.md
index cd8e8e6..874a410 100644
--- a/docs/website/src/main/resources/certifications/EE-9.1-GlassFish-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/EE-9.1-GlassFish-6.1-RC1.md
@@ -2,132 +2,132 @@
 
 Eclipse GlassFish is a Compatible Implementation of a number of Jakarta EE Specifications. For each specification we are required by the [Eclipse Foundation Technology Compatibility Kit License](https://www.eclipse.org/legal/tck.php) to publish a summary of the TCK results.
 
-## Jakarta Platform
+## Jakarta EE Platform TCK Results
 
-* [Jakarta Platform 9.1](./jakarta-platform/9.1/TCK-Results-6.1-RC1)
+* [Jakarta EE Platform TCK 9.1](./jakarta-platform/9.1/TCK-Results-6.1-RC1)
 
-## Jakarta Platform, Web Profile
+## Jakarta EE Platform, Web Profile TCK Results
 
-* [Jakarta Platform, Web Profile 9.1](./jakarta-web-profile/9.1/TCK-Results-6.1-RC1)
+* [Jakarta EE Platform, Web Profile TCK 9.1](./jakarta-web-profile/9.1/TCK-Results-6.1-RC1)
 
 ## Jakarta EE 9 Component Specifications
 
-### Jakarta Annotations
+### Jakarta EE Annotations
 
-* [Jakarta Annotations 2.0](jakarta-annotations/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Annotations TCK 2.0 Results](jakarta-annotations/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta Authentication
+### Jakarta EE Authentication
 
-* [Jakarta Authentication 2.0](jakarta-authentication/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Authentication TCK 2.0 Results](jakarta-authentication/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta Authorization
+### Jakarta EE Authorization
 
-* [Jakarta Authorization 2.0](jakarta-authorization/1.6/TCK-Results-6.1-RC1)
+* [Jakarta EE Authorization TCK 2.0 Results](jakarta-authorization/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta Concurrency
+### Jakarta EE Concurrency
 
-* [Jakarta Concurrency 2.0](./jakarta-concurrency/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Concurrency TCK 2.0 Results](./jakarta-concurrency/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta Connectors
+### Jakarta EE Connectors
 
-* [Jakarta Connectors 2.0](./jakarta-connectors/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Connectors TCK 2.0 Results](./jakarta-connectors/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta Debugging Support for Other Languages
+### Jakarta EE Debugging Support for Other Languages
 
-* [Jakarta Debugging Support for Other Languages 2.0](./jakarta-debugging/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Debugging Support for Other Languages TCK 2.0](./jakarta-debugging/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta Deployment
+### Jakarta EE Deployment
 
 Pruned in 9.0
 
-### Jakarta Enterprise Beans
+### Jakarta EE Enterprise Beans
 
-* [Jakarta Enterprise Beans 4.0](./jakarta-enterprise-beans/4.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Enterprise Beans TCK 4.0 Results](./jakarta-enterprise-beans/4.0/TCK-Results-6.1-RC1)
 
-### Jakarta Enterprise Web Services
+### Jakarta EE Enterprise Web Services
 
-* [Jakarta Enterprise Web Services 2.0](./jakarta-enterprise-web-services/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Enterprise Web Services TCK 2.0 Results](./jakarta-enterprise-web-services/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta Expression Language
+### Jakarta EE Expression Language
 
-* [Jakarta Expression Language 4.0](./jakarta-expression-language/4.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Expression Language TCK 4.0 Results](./jakarta-expression-language/4.0/TCK-Results-6.1-RC1)
 
-### Jakarta Interceptors
+### Jakarta EE Interceptors
 
-* [Jakarta Interceptors 2.0](./jakarta-interceptors/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Interceptors TCK 2.0 Results](./jakarta-interceptors/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta JSON Binding
+### Jakarta EE JSON Binding
 
-* [Jakarta JSON Binding 2.0](certificatoins/jakarta-jsonb/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE JSON Binding TCK 2.0 Results](./jakarta-jsonb/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta JSON Processing
+### Jakarta EE JSON Processing
 
-* [Jakarta JSON Processing 2.0](./jakarta-jsonp/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE JSON Processing TCK 2.0 Results](./jakarta-jsonp/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta Managed Beans
+### Jakarta EE Managed Beans
 
-* [Jakarta Managed Beans 2.0](./jakarta-managed-beans/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Managed Beans TCK 2.0 Results](./jakarta-managed-beans/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta Management
+### Jakarta EE Management
 
 Pruned in 9.0
 
-### Jakarta Messaging
+### Jakarta EE Messaging
 
-* [Jakarta Messaging 3.0](./jakarta-messaging/3.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Messaging 3.0 TCK Results](./jakarta-messaging/3.0/TCK-Results-6.1-RC1)
 
-### Jakarta Persistence
+### Jakarta EE Persistence
 
-* [Jakarta Persistence 3.0](./jakarta-persistence/3.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Persistence 3.0 TCK Results](./jakarta-persistence/3.0/TCK-Results-6.1-RC1)
 
-## Jakarta RESTful Web Services
+## Jakarta EE RESTful Web Services
 
-* [Jakarta RESTful Web Services 3.0](./jakarta-rest/3.0/TCK-Results-6.1-RC1)
+* [Jakarta EE RESTful Web Services TCK 3.0 Results](./jakarta-rest/3.0/TCK-Results-6.1-RC1)
 
-### Jakarta Security
+### Jakarta EE Security
 
-* [Jakarta Security 2.0](./jakarta-security/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Security TCK 2.0 Results](./jakarta-security/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta Server Faces
+### Jakarta EE Server Faces
 
-* [Jakarta Server Faces 3.0](./jakarta-faces/3.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Server Faces TCK 3.0 Results](./jakarta-faces/3.0/TCK-Results-6.1-RC1)
 
-### Jakarta Server Pages
+### Jakarta EE Server Pages
 
-* [Jakarta Server Pages 3.0](./jakarta-pages/3.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Server Pages TCK 3.0 Results](./jakarta-pages/3.0/TCK-Results-6.1-RC1)
 
-### Jakarta Servlet
+### Jakarta EE Servlet
 
-* [Jakarta Servlet 5.0](./jakarta-servlet/5.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Servlet TCK 5.0 Results](./jakarta-servlet/5.0/TCK-Results-6.1-RC1)
 
-### Jakarta Standard Tag Library
+### Jakarta EE Standard Tag Library
 
-* [Jakarta Standard Tag Library 2.0](./jakarta-tags/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Standard Tag Library TCK 2.0 Results](./jakarta-tags/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta Transactions
+### Jakarta EE Transactions
 
-* [Jakarta Transactions 2.0](./jakarta-transactions/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Transactions 2.0 TCK Results](./jakarta-transactions/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta WebSocket
+### Jakarta EE WebSocket
 
-* [Jakarta WebSocket 2.0](./jakarta-websocket/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE WebSocket 2.0 TCK Results](./jakarta-websocket/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta Web Services Metadata
+### Jakarta EE Web Services Metadata
 
-* [Jakarta Web Services Metadata 2.0](./jakarta-ws-metadata/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE Web Services Metadata TCK 2.0 Results](./jakarta-ws-metadata/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta XML Binding
+### Jakarta EE XML Binding
 
-* [Jakarta XML Binding 3.0](./jakarta-xml-binding/3.0/TCK-Results-6.1-RC1)
+* [Jakarta EE XML Binding TCK 3.0 Results](./jakarta-xml-binding/3.0/TCK-Results-6.1-RC1)
 
-### Jakarta XML SOAP with Attachments
+### Jakarta EE XML SOAP with Attachments
 
-* [Jakarta XML SOAP with Attachments 2.0](./jakarta-xml-soap/2.0/TCK-Results-6.1-RC1)
+* [Jakarta EE XML SOAP with Attachments TCK 2.0 Results](./jakarta-xml-soap/2.0/TCK-Results-6.1-RC1)
 
-### Jakarta XML Registries
+### Jakarta EE XML Registries
 
 Pruned in 9.0
 
-### Jakarta XML Web Services
+### Jakarta EE XML Web Services
 
-* [jakarta XML Web Services 3.0](./jakarta-xml-web-services/3.0/TCK-Results-6.1-RC1)
+* [Jakarta EE XML Web Services TCK 3.0 Results](./jakarta-xml-web-services/3.0/TCK-Results-6.1-RC1)
diff --git a/docs/website/src/main/resources/certifications/jakarta-annotations/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-annotations/2.0/TCK-Results-6.1-RC1.md
index 9acd7e7..1ff8cbf 100644
--- a/docs/website/src/main/resources/certifications/jakarta-annotations/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-annotations/2.0/TCK-Results-6.1-RC1.md
@@ -24,9 +24,11 @@
   None
 
 - Java runtime used to run the implementation: <br/>
-	java version "11.0.7" 2020-04-14 LTS
-	Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-	Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   Linux Centos 7
diff --git a/docs/website/src/main/resources/certifications/jakarta-authentication/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-authentication/2.0/TCK-Results-6.1-RC1.md
index 53be1d0..e8a0d62 100644
--- a/docs/website/src/main/resources/certifications/jakarta-authentication/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-authentication/2.0/TCK-Results-6.1-RC1.md
@@ -25,14 +25,15 @@
   None
   
 - Java runtime used to run the implementation: <br/>
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   CentOS 7 Linux
 
-
 Test results:
 
 ```
diff --git a/docs/website/src/main/resources/certifications/jakarta-authorization/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-authorization/2.0/TCK-Results-6.1-RC1.md
index e7aff2f..bbc0a81 100644
--- a/docs/website/src/main/resources/certifications/jakarta-authorization/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-authorization/2.0/TCK-Results-6.1-RC1.md
@@ -25,14 +25,15 @@
   None
 
 - Java runtime used to run the implementation: <br/>
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   CentOS 7 Linux
 
-
 Test results:
 
 ```
diff --git a/docs/website/src/main/resources/certifications/jakarta-concurrency/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-concurrency/2.0/TCK-Results-6.1-RC1.md
index 01dd9ae..b43a4cb 100644
--- a/docs/website/src/main/resources/certifications/jakarta-concurrency/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-concurrency/2.0/TCK-Results-6.1-RC1.md
@@ -7,9 +7,6 @@
 
 # Jakarta EE Concurrency 2.0, Eclipse GlassFish 6.1 RC1, Certification Summary
 
-- Organization Name ("Organization") and, if applicable, URL: <br/>
-  Eclipse Foundation
-
 - Product Name, Version and download URL (if applicable): <br/>
   [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
 
@@ -27,11 +24,12 @@
   None
   
 - Java runtime used to run the implementation: <br/>
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
-  
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   CENTOS 7 Linux
   
diff --git a/docs/website/src/main/resources/certifications/jakarta-connectors/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-connectors/2.0/TCK-Results-6.1-RC1.md
index 0cc79fe..fb70ca6 100644
--- a/docs/website/src/main/resources/certifications/jakarta-connectors/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-connectors/2.0/TCK-Results-6.1-RC1.md
@@ -7,9 +7,6 @@
 
 # Jakarta EE Connector 2.0, Eclipse GlassFish 6.1 RC1, Certification Summary
 
-- Organization Name ("Organization") and, if applicable, URL: <br/>
-  Eclipse Foundation
-
 - Product Name, Version and download URL (if applicable): <br/>
 
   [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
@@ -28,9 +25,11 @@
   None
   
 - Java runtime used to run the implementation: <br/>
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   CentOS 7 Linux
diff --git a/docs/website/src/main/resources/certifications/jakarta-debugging/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-debugging/2.0/TCK-Results-6.1-RC1.md
index 730717c..5529dae 100644
--- a/docs/website/src/main/resources/certifications/jakarta-debugging/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-debugging/2.0/TCK-Results-6.1-RC1.md
@@ -26,9 +26,11 @@
   None
 
 - Java runtime used to run the implementation: <br/>
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   Linux Centos 7
diff --git a/docs/website/src/main/resources/certifications/jakarta-enterprise-beans/4.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-enterprise-beans/4.0/TCK-Results-6.1-RC1.md
index 6a8ecf3..d948ac8 100644
--- a/docs/website/src/main/resources/certifications/jakarta-enterprise-beans/4.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-enterprise-beans/4.0/TCK-Results-6.1-RC1.md
@@ -8,7 +8,7 @@
 # Jakarta Enterprise Beans 4.0, Eclipse GlassFish 6.1 RC1, Full Profile, Certification Summary
 
 - Product Name, Version and download URL (if applicable): <br/>
-  [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
+  [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)<br/>
   Includes Jakarta Enterprise Beans 4.0
 
 - Specification Name, Version and download URL: <br/>
@@ -19,17 +19,18 @@
   SHA-256: `2F634A52F0E994B31AAC7C2308854365417F042C956C2E6B05B088A12E9D8968`
 
 - Public URL of TCK Results Summary: <br/>
-  There is no stand-alone TCK for this specification. See Platform TCK for results.
+  There is no stand-alone TCK for this specification. Follow the Platform TCK Results link below.
   [TCK results summary](./TCK-Results-6.1-RC1)
 
 - Any Additional Specification Certification Requirements: <br/>
   None
 
 - Java runtime used to run the implementation: <br/>
-
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   Linux Centos 7
@@ -37,4 +38,4 @@
 
 Test results:
 
-[TCK results summary](https://eclipse-ee4j.github.io/glassfish/certifications/jakarta-platform/9.1/TCK-Results-6.1-RC1)
+[Platform TCK Results Summary](../../jakarta-platform/9.1/TCK-Results-6.1-RC1)
diff --git a/docs/website/src/main/resources/certifications/jakarta-enterprise-web-services/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-enterprise-web-services/2.0/TCK-Results-6.1-RC1.md
index eff89c9..dbb7487 100644
--- a/docs/website/src/main/resources/certifications/jakarta-enterprise-web-services/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-enterprise-web-services/2.0/TCK-Results-6.1-RC1.md
@@ -8,7 +8,7 @@
 # Jakarta EE Enterprise Web Services 2.0, Eclipse GlassFish 6.1-RC1, Certification Summary
 
 - Product Name, Version and download URL (if applicable):<br/>
-  [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
+  [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)<br/>
   This specification does not define an API. Jakarta EE Platform TCK verifies required behavior.
 
 - Specification Name, Version and download URL: <br/>
@@ -18,22 +18,22 @@
     [Jakarta EE Platform TCK 9.1](http://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/jakarta-jakartaeetck-9.1.0.zip), 
 	SHA-256: `2F634A52F0E994B31AAC7C2308854365417F042C956C2E6B05B088A12E9D8968
 `
-
 - Public URL of TCK Results Summary: <br/>
-  There is no stand-alone TCK for this specification. See Jakarta EE Platform TCK results.
+  There is no stand-alone TCK for this specification. See Jakarta EE Platform TCK results, below.
   [TCK results summary](./TCK-Results-6.1-RC1)
 
 - Any Additional Specification Certification Requirements: <br/>
   None
 
 - Java runtime used to run the implementation: <br/>
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
-  
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
-  Linux Centos 7, 
+  Linux Centos 7<br/>
   Apache Derby
 
 
diff --git a/docs/website/src/main/resources/certifications/jakarta-faces/3.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-faces/3.0/TCK-Results-6.1-RC1.md
index 8606937..21b848a 100644
--- a/docs/website/src/main/resources/certifications/jakarta-faces/3.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-faces/3.0/TCK-Results-6.1-RC1.md
@@ -8,7 +8,7 @@
 # Jakarta EE Server Faces 3.0, Eclipse GlassFish 6.1 RC1, Certification Summary
 
 - Product Name, Version and download URL (if applicable): <br/>
-  Eclipse GlasFish 6.1, provides Jakarta EE Faces 3.0
+  Eclipse GlasFish 6.1, provides Jakarta EE Faces 3.0<br/>
   [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
   
 - Specification Name, Version and download URL: <br/>
@@ -25,9 +25,11 @@
   None
   
 - Java runtime used to run the implementation: <br/>
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   CentOS 7 Linux
diff --git a/docs/website/src/main/resources/certifications/jakarta-interceptors/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-interceptors/2.0/TCK-Results-6.1-RC1.md
index 1ea5035..88d88dc 100644
--- a/docs/website/src/main/resources/certifications/jakarta-interceptors/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-interceptors/2.0/TCK-Results-6.1-RC1.md
@@ -8,7 +8,7 @@
 # Jakarta EE Interceptors 2.0, GlassFish 6.1 RC1, Certification Summary
 
 - Product Name, Version and download URL (if applicable): <br/>
-  [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
+  [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)<br/>
   Includes Interceptors 2.0
   
 - Specification Name, Version and download URL: <br/>
@@ -19,22 +19,22 @@
   SHA-256: `2F634A52F0E994B31AAC7C2308854365417F042C956C2E6B05B088A12E9D8968`
   
 - Public URL of TCK Results Summary: <br/>
-  There is no stand-alone TCK for this specification. See Full Platform CTS for results.
+  There is no stand-alone TCK for this specification. Follow Platform TCK results summary link below.
   [TCK results summary](./TCK-Results-6.1-RC1)
 
 - Any Additional Specification Certification Requirements: <br/>
   None
 
 - Java runtime used to run the implementation: <br/>
-
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   Linux Centos 7
 
-
 Test results:
 
-[TCK results summary](https://eclipse-ee4j.github.io/glassfish/certifications/jakarta-platform/9.1/TCK-Results-6.1-RC1)
+[Platform TCK Results Summary](../../jakarta-platform/9.1/TCK-Results-6.1-RC1)
diff --git a/docs/website/src/main/resources/certifications/jakarta-jsonb/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-jsonb/2.0/TCK-Results-6.1-RC1.md
index 4c16378..62b207e 100644
--- a/docs/website/src/main/resources/certifications/jakarta-jsonb/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-jsonb/2.0/TCK-Results-6.1-RC1.md
@@ -8,7 +8,7 @@
 # Jakarta EE JSON Binding 2.0, Eclipse GlassFish 6.1 RC1, Certification Summary
 
 - Product Name, Version and download URL (if applicable): <br/>
-  Eclipse GlasFish 6.1, provides Jakarta EE JSON Binding 2.0
+  Eclipse GlasFish 6.1, provides Jakarta EE JSON Binding 2.0<br/>
   [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
   
 - Specification Name, Version and download URL: <br/>
@@ -25,10 +25,11 @@
   None
   
 - Java runtime used to run the implementation: <br/>
-
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   CentOS 7 Linux
diff --git a/docs/website/src/main/resources/certifications/jakarta-jsonp/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-jsonp/2.0/TCK-Results-6.1-RC1.md
index 8ce346d..28d9cd3 100644
--- a/docs/website/src/main/resources/certifications/jakarta-jsonp/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-jsonp/2.0/TCK-Results-6.1-RC1.md
@@ -25,10 +25,11 @@
   None
   
 - Java runtime used to run the implementation: <br/>
-
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   CentOS 7 Linux
diff --git a/docs/website/src/main/resources/certifications/jakarta-managed-beans/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-managed-beans/2.0/TCK-Results-6.1-RC1.md
index fb15c39..6e5f5b6 100644
--- a/docs/website/src/main/resources/certifications/jakarta-managed-beans/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-managed-beans/2.0/TCK-Results-6.1-RC1.md
@@ -8,7 +8,7 @@
 # Jakarta Managed Beans 2.0, Eclipse GlassFish 6.1 RC1, Certification Summary
 
 - Product Name, Version and download URL (if applicable): <br/>
-  [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
+  [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)<br/>
   Includes Managed Beans 2.0
 
 - Specification Name, Version and download URL: <br/>
@@ -19,22 +19,22 @@
   SHA-256: `2F634A52F0E994B31AAC7C2308854365417F042C956C2E6B05B088A12E9D8968`
 
 - Public URL of TCK Results Summary: <br/>
-  There is no stand-alone TCK for this specification. See Platform TCK for results.
+  There is no stand-alone TCK for this specification. Follow Platform TCK results summary for details.<br/>
   [TCK results summary](./TCK-Results-6.1-RC1)
 
 - Any Additional Specification Certification Requirements: <br/>
   None
 
 - Java runtime used to run the implementation: <br/>
-
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   None
 
-
 Test results:
 
-[TCK results summary](https://eclipse-ee4j.github.io/glassfish/certifications/jakarta-platform/9.1/TCK-Results-6.1-RC1)
+[Platform TCK Results Summary](../../jakarta-platform/9.1/TCK-Results-6.1-RC1)
diff --git a/docs/website/src/main/resources/certifications/jakarta-messaging/3.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-messaging/3.0/TCK-Results-6.1-RC1.md
index 85f901c..ba50d2c 100644
--- a/docs/website/src/main/resources/certifications/jakarta-messaging/3.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-messaging/3.0/TCK-Results-6.1-RC1.md
@@ -8,8 +8,8 @@
 # Jakarta EE Messaging 3.0, Eclipse GlassFish 6.1 RC1, Certification Summary
 
 - Product Name, Version and download URL (if applicable): <br/>
-  Eclipse GlassFish 6.0, includes: Eclipse Open MQ 6.1, which provides Jakarta  EE Messaging API 3.0.0
-  [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
+  Eclipse GlassFish 6.0, includes: Eclipse Open MQ 6.1, which provides Jakarta  EE Messaging API 3.0.0<br/>
+  [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)<br/>
   For reference, use imqbrokerd command from GlassFish distribution: glassfish6/mq (bin).
 
 - Specification Name, Version and download URL: <br/>
@@ -22,14 +22,15 @@
 - Public URL of TCK Results Summary: <br/>
   [TCK results summary](./TCK-Results-6.1-RC1)
   
-
 - Any Additional Specification Certification Requirements: <br/>
   None
 
 - Java runtime used to run the implementation: <br/>
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   Linux Centos 7
diff --git a/docs/website/src/main/resources/certifications/jakarta-pages/3.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-pages/3.0/TCK-Results-6.1-RC1.md
index 7dbdfc6..9c5939f 100644
--- a/docs/website/src/main/resources/certifications/jakarta-pages/3.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-pages/3.0/TCK-Results-6.1-RC1.md
@@ -7,9 +7,6 @@
 
 # Jakarta EE Server Pages 3.0, Eclipse GlassFish 6.1 RC1 Certification Summary
 
-- Organization Name ("Organization") and, if applicable, URL: <br/>
-  Eclipse Foundation
-  
 - Product Name, Version and download URL (if applicable): <br/>
   [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
   
@@ -27,11 +24,12 @@
   None
   
 - Java runtime used to run the implementation: <br/>
-  
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
-  
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   Linux CentOS 7
   
diff --git a/docs/website/src/main/resources/certifications/jakarta-persistence/3.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-persistence/3.0/TCK-Results-6.1-RC1.md
index c578318..21abc0e 100644
--- a/docs/website/src/main/resources/certifications/jakarta-persistence/3.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-persistence/3.0/TCK-Results-6.1-RC1.md
@@ -20,15 +20,15 @@
 - Public URL of TCK Results Summary: <br/>
   [TCK results summary](./TCK-Results-6.1-RC1)
   
-
 - Any Additional Specification Certification Requirements: <br/>
   None
 
 - Java runtime used to run the implementation: <br/>
-
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   Linux Centos 7
diff --git a/docs/website/src/main/resources/certifications/jakarta-platform/9.1/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-platform/9.1/TCK-Results-6.1-RC1.md
index 6043339..d0c5709 100644
--- a/docs/website/src/main/resources/certifications/jakarta-platform/9.1/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-platform/9.1/TCK-Results-6.1-RC1.md
@@ -9,8 +9,8 @@
 # Jakarta EE Platform 9.1, Eclipse GlassFish 6.1, TCK Certification Summary
 
 - Product Name, Version and download URL (if applicable): <br/>
-  [Eclipse GlassFish 6.1](https://eclipse-ee4j.github.io/glassfish/download)
-  [glassfish-6.1.zip](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0.zip)
+  [Eclipse GlassFish 6.1](/glassfish/download)<br/>
+  [glassfish-6.1-RC1.zip](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
 
 - Specification Name, Version and download URL: <br/>
   [Jakarta EE Platform, 9.1](https://jakarta.ee/specifications/platform/9.1/)
@@ -28,12 +28,14 @@
   Jakarta Bean Validation 3.0 TCK <br/>
 
 - Java runtime used to run the implementation: <br/>
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
-  Apache Derby, 
+  Apache Derby, <br/>
   Linux, CentOS 7
 
 
@@ -586,7 +588,7 @@
 
 TCK Result Summary:
 ```
-+ /opt/jdk1.8.0_191/bin/java VerifySMAP /home/jenkins/agent/workspace/t-for-other-languages-tck_master/vi/glassfish6/glassfish/domains/domain1/generated/jsp/testclient/org/apache/jsp/Hello_jsp.class.smap
++ /opt/jdk-11.0.7/bin/java VerifySMAP /home/jenkins/agent/workspace/t-for-other-languages-tck_master/vi/glassfish6/glassfish/domains/domain1/generated/jsp/testclient/org/apache/jsp/Hello_jsp.class.smap
 ++ grep 'is a correctly formatted SMAP' smap.log
 ++ wc -l
 + output=1
diff --git a/docs/website/src/main/resources/certifications/jakarta-rest/3.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-rest/3.0/TCK-Results-6.1-RC1.md
index cd8b26b..1f7b613 100644
--- a/docs/website/src/main/resources/certifications/jakarta-rest/3.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-rest/3.0/TCK-Results-6.1-RC1.md
@@ -8,7 +8,8 @@
 # Jakarta EE RESTful Web Services 3.0, Eclipse GlassFish 6.1 RC1 Certification Summary
 
 - Product Name, Version and download URL (if applicable): <br/>
-  Jakarta EE RESTful Web Services 3.0 included in   [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
+  Jakarta EE RESTful Web Services 3.0 included in<br/>
+  [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
 
 - Specification Name, Version and download URL: <br/>
   [Jakarta RESTful Web Services 3.0](https://jakarta.ee/specifications/restful-ws/3.0/)
@@ -24,10 +25,11 @@
   None
 
 - Java runtime used to run the implementation: <br/>
-
-	java version "11.0.7" 2020-04-14 LTS
-	Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-	Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   CentOS Linux 7 (Core)
diff --git a/docs/website/src/main/resources/certifications/jakarta-security/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-security/2.0/TCK-Results-6.1-RC1.md
index 2bf3e78..b8b9028 100644
--- a/docs/website/src/main/resources/certifications/jakarta-security/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-security/2.0/TCK-Results-6.1-RC1.md
@@ -24,9 +24,11 @@
   None
 
 - Java runtime used to run the implementation: <br/>
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   Alpine Linux v3.12
diff --git a/docs/website/src/main/resources/certifications/jakarta-servlet/5.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-servlet/5.0/TCK-Results-6.1-RC1.md
index 5360ddc..eb2e139 100644
--- a/docs/website/src/main/resources/certifications/jakarta-servlet/5.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-servlet/5.0/TCK-Results-6.1-RC1.md
@@ -24,9 +24,11 @@
   None
 
 - Java runtime used to run the implementation: <br/>
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   Alpine Linux v3.12
diff --git a/docs/website/src/main/resources/certifications/jakarta-tags/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-tags/2.0/TCK-Results-6.1-RC1.md
index 0a0532c..3f37469 100644
--- a/docs/website/src/main/resources/certifications/jakarta-tags/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-tags/2.0/TCK-Results-6.1-RC1.md
@@ -26,9 +26,11 @@
   JDK 11 requires: java.locale.providers=COMPAT
 
 - Java runtime used to run the implementation: <br/>
-	java version "11.0.7" 2020-04-14 LTS
-	Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-	Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
 	OS name:         Linux
diff --git a/docs/website/src/main/resources/certifications/jakarta-transactions/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-transactions/2.0/TCK-Results-6.1-RC1.md
index c93f690..df6e408 100644
--- a/docs/website/src/main/resources/certifications/jakarta-transactions/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-transactions/2.0/TCK-Results-6.1-RC1.md
@@ -5,10 +5,6 @@
 
 # Jakarta EE Transactions, 2.0, Eclipse GlassFish 6.1 RC1, Certification Summary
 
-
-- Organization Name ("Organization") and, if applicable, URL <br/>
-  Eclipse Foundation
-  
 - Product Name, Version and download URL (if applicable) <br/>
   [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
   
@@ -26,10 +22,11 @@
   N/A
 
 - Java runtime used to run the implementation <br/>
-
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ... <br/>
   Linux CentOS 7
diff --git a/docs/website/src/main/resources/certifications/jakarta-web-profile/9.1/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-web-profile/9.1/TCK-Results-6.1-RC1.md
index 68ab2df..d1118e9 100644
--- a/docs/website/src/main/resources/certifications/jakarta-web-profile/9.1/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-web-profile/9.1/TCK-Results-6.1-RC1.md
@@ -9,7 +9,7 @@
 # Jakarta EE Platform Web Profile 9.1, Eclipse GlassFish 6.1 Web Profile, Certification Summary
 
 - Product Name, Version and download URL (if applicable): <br/>
-  [Eclipse GlassFish 6.1, Web Profile](https://eclipse-ee4j.github.io/glassfish/download)
+  [Eclipse GlassFish 6.1, Web Profile](/glassfish/download)<br/>
   [web-6.1.0-RC1.zip](https://download.eclipse.org/ee4j/glassfish/web-6.1.0-RC1.zip)
 
 - Specification Name, Version and download URL: <br/>
@@ -23,15 +23,14 @@
   [TCK results summary](TCK-Results-6.1-RC1)
 
 - Any Additional Specification Certification Requirements: <br/>
-  Jakarta Dependency Injection 2.0 TCK <br/>
-  Jakarta Contexts and Dependency Injection 3.0 TCK <br/>
-  Jakarta Bean Validation 3.0 TCK <br/>
+  None
 
 - Java runtime used to run the implementation: <br/>
-
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   Apache Derby, <br/>
diff --git a/docs/website/src/main/resources/certifications/jakarta-websocket/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-websocket/2.0/TCK-Results-6.1-RC1.md
index 5d22092..ab7f10d 100644
--- a/docs/website/src/main/resources/certifications/jakarta-websocket/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-websocket/2.0/TCK-Results-6.1-RC1.md
@@ -22,10 +22,11 @@
   None
 
 - Java runtime used to run the implementation: <br/>
-
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   Linux Centos 7
diff --git a/docs/website/src/main/resources/certifications/jakarta-ws-metadata/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-ws-metadata/2.0/TCK-Results-6.1-RC1.md
index 84934a3..479a01f 100644
--- a/docs/website/src/main/resources/certifications/jakarta-ws-metadata/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-ws-metadata/2.0/TCK-Results-6.1-RC1.md
@@ -8,7 +8,7 @@
 # Jakarta EE Web Service Metadata 2.0, Eclipse GlassFish 6.1 RC1, Certification Summary
 
 - Product Name, Version and download URL (if applicable): <br/>
-  [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
+  [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)<br/>
   Includes Jakarta EE Web Services Metadata 2.0
 
 - Specification Name, Version and download URL: <br/>
@@ -19,22 +19,22 @@
   SHA-256: `2F634A52F0E994B31AAC7C2308854365417F042C956C2E6B05B088A12E9D8968`
 
 - Public URL of TCK Results Summary: <br/>
-  There is no stand-alone TCK for this specification. See Full Platform CTS for results.
+  There is no stand-alone TCK for this specification. Follow the Platform TCK results summary link below for details.<br/>
   [TCK results summary](./TCK-Results-6.1-RC1)
 
 - Any Additional Specification Certification Requirements: <br/>
   None
 
 - Java runtime used to run the implementation: <br/>
-
-	java version "11.0.7" 2020-04-14 LTS
-	Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-	Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   Linux Centos 7
 
-
 Test results:
 
-[TCK results summary](https://eclipse-ee4j.github.io/glassfish/certifications/jakarta-platform/9.1/TCK-Results-6.1-RC1)
\ No newline at end of file
+[Platform TCK Results Summary](../../jakarta-platform/9.1/TCK-Results-6.1-RC1)
\ No newline at end of file
diff --git a/docs/website/src/main/resources/certifications/jakarta-xml-binding/3.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-xml-binding/3.0/TCK-Results-6.1-RC1.md
index 930cba3..3405a64 100644
--- a/docs/website/src/main/resources/certifications/jakarta-xml-binding/3.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-xml-binding/3.0/TCK-Results-6.1-RC1.md
@@ -23,10 +23,11 @@
   None
 
 - Java runtime used to run the implementation: <br/>
-
-	java version "11.0.7" 2020-04-14 LTS
-	Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-	Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   Linux Centos 7
diff --git a/docs/website/src/main/resources/certifications/jakarta-xml-soap/2.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-xml-soap/2.0/TCK-Results-6.1-RC1.md
index a801d1e..f3e90de 100644
--- a/docs/website/src/main/resources/certifications/jakarta-xml-soap/2.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-xml-soap/2.0/TCK-Results-6.1-RC1.md
@@ -7,9 +7,6 @@
 
 # Jakarta EE SOAP with Attachments 2.0, Eclipse GlassFish 6.1 RC1 Certification Summary
 
-- Organization Name ("Organization") and, if applicable, URL: <br/>
-  Eclipse Foundation
-  
 - Product Name, Version and download URL (if applicable): <br/>
   [Eclipse GlassFish 6.1 RC1](https://download.eclipse.org/ee4j/glassfish/glassfish-6.1.0-RC1.zip)
   
@@ -27,11 +24,12 @@
   None
   
 - Java runtime used to run the implementation: <br/>
-  
-  java version "11.0.7" 2020-04-14 LTS
-  Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-  Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
-  
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   Linux CentOS 7
   
diff --git a/docs/website/src/main/resources/certifications/jakarta-xml-web-services/3.0/TCK-Results-6.1-RC1.md b/docs/website/src/main/resources/certifications/jakarta-xml-web-services/3.0/TCK-Results-6.1-RC1.md
index 4e8bfaa..9276417 100644
--- a/docs/website/src/main/resources/certifications/jakarta-xml-web-services/3.0/TCK-Results-6.1-RC1.md
+++ b/docs/website/src/main/resources/certifications/jakarta-xml-web-services/3.0/TCK-Results-6.1-RC1.md
@@ -24,9 +24,11 @@
   None
 
 - Java runtime used to run the implementation: <br/>
-	java version "11.0.7" 2020-04-14 LTS
-	Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
-	Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
+java version "11.0.7" 2020-04-14 LTS
+Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS)
+Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode)
+```
 
 - Summary of the information for the certification environment, operating system, cloud, ...: <br/>
   CentOS Linux 7 (Core)
diff --git a/docs/website/src/main/resources/compatibility.md b/docs/website/src/main/resources/compatibility.md
index ce38894..44abd84 100644
--- a/docs/website/src/main/resources/compatibility.md
+++ b/docs/website/src/main/resources/compatibility.md
@@ -6,7 +6,7 @@
 
 ## Jakarta EE Platform, 9.1, Eclipse GlassFish 6.1 RC1
 
-* [Jakarta EE Platform 9.0](certifications/jakarta-platform/9.1/TCK-Results-6.1-RC1)
+* [Jakarta EE Platform 9.1](certifications/jakarta-platform/9.1/TCK-Results-6.1-RC1)
 * Includes results for
   * Jakarta Debugging support for Other Languages 2.0
   * Jakarta Dependency Injection 2.0
@@ -16,7 +16,7 @@
 
 ## Jakarta EE Platform Web Profile, 9.1, Eclipse GlassFish Web Procile 6.1 RC1
 
-* [Jakarta EE, Web Profile 9.0](certifications/jakarta-web-profile/9.1/TCK-Results-6.1-RC1)
+* [Jakarta EE, Web Profile 9.1](certifications/jakarta-web-profile/9.1/TCK-Results-6.1-RC1)
 * Includes results for
   * Jakarta Debugging support for Other Languages 2.0
   * Jakarta Dependency Injection 2.0
@@ -24,9 +24,9 @@
   * Jakarta Bean Validation 3.0
   * Jakarta XML Binding 3.0
   
- ## Jakarta EE 9.1, Eclipse GlassFish 6.1 Component Specification Certifications
+## Jakarta EE 9.1, Eclipse GlassFish 6.1 Component Specification Certifications
  
- See [9.1, Eclipse GlassFish 6.1 RC1 Certification Details](certifications/EE-9.1-GlassFish-6.1-RC1)
+See [Jakarta EE 9.1, Eclipse GlassFish 6.1 RC1 Certification Details](certifications/EE-9.1-GlassFish-6.1-RC1)
 
 ----