diff --git a/boards/beaglebone/blue/index.rst b/boards/beaglebone/blue/index.rst
index 21e004a3b263a5b73696f7a194d826c33fb2e24a..972b22b9915d2f09e2f958a9c78282bb7160e73c 100644
--- a/boards/beaglebone/blue/index.rst
+++ b/boards/beaglebone/blue/index.rst
@@ -15,29 +15,25 @@ robotics by `UCSD Flow Control and Coordinated Robotics Lab <http://robotics.ucs
 `WowWee <http://www.wowwee.com/mip/>`_, `National Instruments LabVIEW <http://www.ni.com/labview/>`_ 
 and of course the `BeagleBoard.org Foundation <https://beagleboard.org/about>`_.
 
-.. admonition:: OSHWA Certification mark
+.. grid:: 2
 
-    .. figure:: media/OSHW_mark_US000064.*
-        :width: 200
-        :target: https://certification.oshwa.org/us000064.html
-        :alt: BeagleBone Blue OSHW Mark
+    .. grid-item::
+        :columns: 12 12 12 4
 
+        .. figure:: media/OSHW_mark_US000064.*
+            :width: 200
+            :target: https://certification.oshwa.org/us000064.html
+            :alt: BeagleBone Blue OSHW Mark
 
-.. note::
+    .. grid-item::
+        :columns: 12 12 12 8
 
-    This work is licensed under a `Creative Commons Attribution-ShareAlike
-    4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
-
-    Hardware design files can be found at https://git.beagleboard.org/beagleboard/beaglebone-blue
-
-
-.. 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.
+        .. admonition:: License Terms
 
+            * This documentation 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-blue>`__
+            * 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-blue>`__
 
 .. toctree::
    :maxdepth: 1