diff --git a/boards/beaglebone/ai-64/ch11.rst b/boards/beaglebone/ai-64/ch11.rst
index f3e2c46ce172e3b196fe57f1ed3fdfc3f6b5cfb6..da33b7d3654a44d3b81c0eff66334acd4db98144 100644
--- a/boards/beaglebone/ai-64/ch11.rst
+++ b/boards/beaglebone/ai-64/ch11.rst
@@ -1,4 +1,4 @@
-.. _support-information:
+.. _beaglebone-ai-64-support-information:
 
 Support Information
 ####################
diff --git a/boards/beaglebone/ai-64/index.rst b/boards/beaglebone/ai-64/index.rst
index 5ed36ecb825a2b28e40f63f42c5b12b99d3b822b..2ada5d10add415612bd67765ec2189287e6689af 100644
--- a/boards/beaglebone/ai-64/index.rst
+++ b/boards/beaglebone/ai-64/index.rst
@@ -11,25 +11,26 @@ are all that need to be added to start building performance-optimized embedded a
 expansion possibilities are enabled through familiar BeagleBone® cape headers, with hundreds of open-source 
 hardware examples and dozens of readily available embedded expansion options available off-the-shelf.
 
-.. admonition:: OSHWA Certification mark
+.. grid:: 2
 
-    .. figure:: images/OSHW_mark_US002120.*
-        :width: 200
-        :target: https://certification.oshwa.org/us002120.html
-        :alt: BeagleBone AI-64 OSHW Mark
+    .. grid-item::
+        :columns: 12 12 12 4
 
-.. note::
+        .. figure:: images/OSHW_mark_US002120.*
+            :width: 200
+            :target: https://certification.oshwa.org/us002120.html
+            :alt: BeagleBone AI-64 OSHW Mark
 
-    This work is licensed under a `Creative Commons Attribution-ShareAlike
-    4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
+    .. grid-item::
+        :columns: 12 12 12 8
 
-    Hardware design files can be found at https://git.beagleboard.org/beagleboard/beaglebone-ai-64
+        .. admonition:: License Terms
 
-.. tip::
-    Make sure to read and accept all the terms & condition provided in the :ref:`boards-terms-and-conditions` page. 
-    
-    Use of either the boards or the design materials constitutes agreement to the T&C including any 
-    modifications done to the hardware or software solutions provided by beagleboard.org foundation.
+            * This work is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
+            * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleboard/beaglebone-ai-64>`__
+            * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
+            * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglebone-ai-64>`__
+            * For export, emissions and other compliance, see :ref:`beaglebone-ai-64-support-information`
 
 .. toctree::
    :maxdepth: 1