diff --git a/src/main/asciidoc/docs/testng_listeners.adoc b/src/main/asciidoc/docs/testng_listeners.adoc
index 07149d6..f53b56b 100644
--- a/src/main/asciidoc/docs/testng_listeners.adoc
+++ b/src/main/asciidoc/docs/testng_listeners.adoc
@@ -2,80 +2,72 @@
 
 There are several interfaces that allow you to modify TestNG's behavior. These interfaces are broadly called "TestNG Listeners". Here are a few listeners:
 
-==== IAlterSuiteListener
+==== Listener list
 
-Refer xref:altering_suites.adoc[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/IAlterSuiteListener.html[here]
+|===
+|Listener name |User Documentation |API Documentation
 
-==== IAnnotationTransformer
+|IAlterSuiteListener
+|xref:altering_suites.adoc[docs]
+|{javadocs-base-url}/org/testng/IAlterSuiteListener.html[javadocs]
 
-Refer xref:annotation_transformers.adoc[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/IAnnotationTransformer.html[here]
+|IAnnotationTransformer
+|xref:annotation_transformers.adoc[docs]
+|{javadocs-base-url}/org/testng/IAnnotationTransformer.html[javadocs]
 
-==== IConfigurationListener
+|IConfigurationListener
+|xref:method_invocations.adoc#_listening_to_configuration_invocations[docs]
+|{javadocs-base-url}/org/testng/IConfigurationListener.html[javadocs]
 
-Refer xref:method_invocations.adoc#_listening_to_configuration_invocations[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/IConfigurationListener.html[here]
+|IDataProviderListener
+|xref:method_invocations.adoc#_listening_to_data_provider_invocations[docs]
+|{javadocs-base-url}/org/testng/IDataProviderListener.html[javadocs]
 
-==== IDataProviderListener
+|IExecutionListener
+|xref:method_invocations.adoc#_listening_to_testng_lifecycle_events[docs]
+|{javadocs-base-url}/org/testng/IExecutionListener.html[javadocs]
 
-Refer xref:method_invocations.adoc#_listening_to_data_provider_invocations[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/IDataProviderListener.html[here]
+|IExecutionVisualiser
+|xref:execution_visualiser.adoc[docs]
+|{javadocs-base-url}/org/testng/IExecutionVisualiser.html[javadocs]
 
-==== IExecutionListener
+|IHookable
+|xref:ihookable.adoc[docs]
+|{javadocs-base-url}/org/testng/IHookable.html[javadocs]
 
-Refer xref:method_invocations.adoc#_listening_to_testng_lifecycle_events[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/IExecutionListener.html[here]
+|IConfigurable
+|xref:iconfigurable.adoc[docs]
+|{javadocs-base-url}/org/testng/IConfigurable.html[javadocs]
 
-==== IExecutionVisualiser
+|IInvokedMethodListener
+|xref:method_invocations.adoc#_listening_to_method_invocations[docs]
+|{javadocs-base-url}/org/testng/IInvokedMethodListener.html[javadocs]
 
-Refer xref:execution_visualiser.adoc[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/IExecutionVisualiser.html[here]
+|IClassListener
+|xref:method_invocations.adoc#_listening_to_class_level_invocations[docs]
+|{javadocs-base-url}/org/testng/IClassListener.html[javadocs]
 
-==== IHookable
+|IMethodInterceptor
+|xref:method_interceptors.adoc#_method_interceptors[docs]
+|{javadocs-base-url}/org/testng/IMethodInterceptor.html[javadocs]
 
-Refer xref:ihookable.adoc[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/IHookable.html[here]
+|IDataProviderInterceptor
+|xref:method_interceptors.adoc#_interceptors_for_data_providers[docs].
+|{javadocs-base-url}/org/testng/IDataProviderInterceptor.html[javadocs]
 
-==== IConfigurable
+|IReporter
+|xref:logging_and_results.adoc#_logging_reporters[docs]
+|{javadocs-base-url}/org/testng/IReporter.html[javadocs]
 
-Refer xref:iconfigurable.adoc[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/IConfigurable.html[here]
+|ISuiteListener
+|xref:method_invocations.adoc#_listening_to_suite_level_invocations[docs]
+|{javadocs-base-url}/org/testng/ISuiteListener.html[javadocs]
 
-==== IInvokedMethodListener
+|ITestListener
+|xref:logging_and_results.adoc#_logging_listeners[docs]
+|{javadocs-base-url}/org/testng/ITestListener.html[javadocs]
 
-Refer xref:method_invocations.adoc#_listening_to_method_invocations[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/IInvokedMethodListener.html[here]
-
-==== IClassListener
-
-Refer xref:method_invocations.adoc#_listening_to_class_level_invocations[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/IClassListener.html[here]
-
-==== IMethodInterceptor
-
-Refer xref:method_interceptors.adoc#_method_interceptors[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/IMethodInterceptor.html[here]
-
-==== IDataProviderInterceptor
-
-Refer xref:method_interceptors.adoc#_interceptors_for_data_providers[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/IDataProviderInterceptor.html[here]
-
-==== IReporter
-
-Refer xref:logging_and_results.adoc#_logging_reporters[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/IReporter.html[here]
-
-==== ISuiteListener
-
-Refer xref:method_invocations.adoc#_listening_to_suite_level_invocations[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/ISuiteListener.html[here]
-
-==== ITestListener
-
-Refer xref:logging_and_results.adoc#_logging_listeners[here] to learn more.
-Javadocs are available {javadocs-base-url}/org/testng/ITestListener.html[here]
+|===
 
 ==== Specifying listeners with testng.xml or in Java