diff --git a/boards/index.rst b/boards/index.rst
index 1d54279c6c222e3b68aa01c5adc52dad72182090..5798c86365a12be95fa921097d65ec8d7ba6ab1d 100644
--- a/boards/index.rst
+++ b/boards/index.rst
@@ -40,7 +40,6 @@ started.
    :maxdepth: 1
    :hidden:
 
-   /boards/beaglev/fire/index
    /boards/beaglebone/index
    /boards/beaglebone/black/index
    /boards/beaglebone/blue/index
@@ -48,6 +47,7 @@ started.
    /boards/beaglebone/ai-64/index
    /boards/pocketbeagle/original/index
    /boards/beaglev/ahead/index
+   /boards/beaglev/fire/index
    /boards/capes/index
    /boards/beagleconnect/index
    /boards/beagleboard/index
diff --git a/index.rst b/index.rst
index 45335dbeb1d255001a5f7d16a775d0e485d9bdfe..04cc6c6e8c0b1bdb9454cf371c359cfb9327d5e9 100644
--- a/index.rst
+++ b/index.rst
@@ -56,46 +56,53 @@ from source using appropriate design tools.
    :gutter: 4
 
    .. grid-item-card::
-      :link: beaglev-fire-home
+      :link: beagleplay-home
       :link-type: ref
 
-      **BeagleV® Fire**
+      **BeaglePlay®**
       ^^^
 
-      Awesome board with RISC-V and FPGA in a BeagleBone form-factor
-      with PCIe over M.2 and SYZYGY high-speed connector!
+      .. image:: boards/beagleplay/images/product-pictures/45front.*
+         :align: center
+      +++
 
+      A 64-bit ARM computer designed to simplify physical world interactions
+      to the connected world.
 
    .. grid-item-card::
-      :link: beaglev-fire-home
+      :link: beagleconnect_freedom_home
       :link-type: ref
 
-      **BeagleV® Fire**
+      **BeagleConnectâ„¢ Freedom**
       ^^^
 
-      Awesome board with RISC-V and FPGA in a BeagleBone form-factor
-      with PCIe over M.2 and SYZYGY high-speed connector!
+      .. image:: boards/beagleconnect/freedom/media/product-pictures/front1.*
+         :align: center
+      +++
 
+      BeagleConnectâ„¢ Freedom is based on a `TI Arm Cortex-M4 wireless-enabled microcontroller <https://www.ti.com/product/CC1352P7>`_ 
+      and is the first available BeagleConnectâ„¢ solution.
 
    .. grid-item-card::
-      :link: beagleplay-home
+      :link: bbai64-home
       :link-type: ref
 
-      **BeaglePlay®**
+      **BeagleBone® AI-64**
       ^^^
 
-      .. image:: boards/beagleplay/images/product-pictures/45front.*
+      .. image:: boards/images/beaglebone-ai-64-400x.*
          :align: center
       +++
 
-      A 64-bit ARM computer designed to simplify physical world interactions
-      to the connected world.
+      A complete 64-bit AI and Machine Learning System with the convenience
+      and expandability of the BeagleBone® platform with the peripherals on
+      board to get started right away learning and building applications.
 
    .. grid-item-card::
       :link: beaglev-ahead-home
       :link-type: ref
 
-      **BeagleV® Ahead**
+      **BeagleV®-Ahead**
       ^^^
 
       .. image:: boards/beaglev/ahead/media/product-pictures/45front.*
@@ -105,20 +112,14 @@ from source using appropriate design tools.
       Quad core RISC-V SBC in the form factor of BeagleBone Black.
 
    .. grid-item-card::
-      :link: bbai64-home
+      :link: beaglev-fire-home
       :link-type: ref
 
-      **BeagleBone® AI-64**
+      **BeagleV® Fire**
       ^^^
 
-      .. image:: boards/images/beaglebone-ai-64-400x.*
-         :align: center
-      +++
-
-      A complete 64-bit AI and Machine Learning System with the convenience
-      and expandability of the BeagleBone® platform with the peripherals on
-      board to get started right away learning and building applications.
-
+      Awesome board with RISC-V and FPGA in a BeagleBone form-factor
+      with PCIe over M.2 and SYZYGY high-speed connector!
 
    .. grid-item-card::
       :link: beagleboneblack-home
@@ -136,20 +137,6 @@ from source using appropriate design tools.
       credit card sized with over a decade of support, software and 
       materials behind it making it ready for any application.
 
-   .. grid-item-card::
-      :link: beagleconnect_freedom_home
-      :link-type: ref
-
-      **BeagleConnectâ„¢ Freedom**
-      ^^^
-
-      .. image:: boards/beagleconnect/freedom/media/product-pictures/front1.*
-         :align: center
-      +++
-
-      BeagleConnectâ„¢ Freedom is based on a `TI Arm Cortex-M4 wireless-enabled microcontroller <https://www.ti.com/product/CC1352P7>`_ 
-      and is the first available BeagleConnectâ„¢ solution.
-
    .. grid-item-card:: 
       :link: beagleboneblack-home
       :link-type: ref
@@ -213,7 +200,7 @@ from source using appropriate design tools.
       :link: beaglebone-blue-home
       :link-type: ref
 
-      BeagleBone® Blue
+      **BeagleBone® Blue**
       ^^^
 
       .. image:: boards/images/beaglebone-blue-400x279.png
@@ -381,13 +368,13 @@ Capes
    :caption: Boards
    
    /boards/beagleplay/index
-   /boards/beaglev/fire/index
    /boards/beaglebone/ai-64/index
    /boards/beaglebone/ai/index
    /boards/beaglebone/black/index
    /boards/beaglebone/blue/index
    /boards/beaglebone/index
    /boards/beaglev/ahead/index
+   /boards/beaglev/fire/index
    /boards/capes/index
    /boards/pocketbeagle/original/index
    /boards/beagleconnect/freedom/index