diff --git a/wiki-rtd/docs/wiki_rd_versions/version_0.8b/0.8.0b.md b/wiki-rtd/docs/wiki_rd_versions/version_0.8b/0.8.0b.md
index 3363f2e..0d398ef 100644
--- a/wiki-rtd/docs/wiki_rd_versions/version_0.8b/0.8.0b.md
+++ b/wiki-rtd/docs/wiki_rd_versions/version_0.8b/0.8.0b.md
@@ -405,12 +405,13 @@ But later changed our minds as we would have even more input configs to maintain
 
 <img src="../../../wiki_images/controllers/xiaomi-controller.png" width="180"> <img src="../../../wiki_images/controllers/8bitdo-pro2.png" width="180">
 
-[The Generic - Standard](../../wiki_controllers/generic/standard/generic-standard.md)
 
 This layout encompasses the vast majority of third party controllers that have all the buttons of a modern controller. They are registered as Generic in Steam Input.
 
 **Layout Name:**
 
+**Information:** [The Generic - Standard](../../wiki_controllers/generic/standard/generic-standard.md)
+
 **Hotkeys:** [Generic - Standard Hotkeys](../../wiki_controllers/generic/standard/generic-standard-hotkeys.md)
 
 
@@ -419,10 +420,10 @@ This layout encompasses the vast majority of third party controllers that have a
 
 <img src="../../../wiki_images/controllers/switch-pro.png" width="150">
 
-https://retrodeck.readthedocs.io/en/latest/wiki_controllers/nintendo/switch-pro/
-
 **Layout Name:**
 
+**Information:**
+
 **Hotkeys:** [Switch Pro - Hotkeys](../../wiki_controllers/nintendo/nintendo-hotkeys.md)
 
 
@@ -432,6 +433,8 @@ https://retrodeck.readthedocs.io/en/latest/wiki_controllers/nintendo/switch-pro/
 
 **Layout Name:**
 
+**Information:**
+
 **Hotkeys:** [Steam Controller - Hotkeys](../../wiki_controllers/steam/steam-controller-gordon.md)
 
 Extra features for the Steam Controller:
@@ -446,11 +449,12 @@ It switches the Right Touchpad between Permanent Mouse or Right Joystick with th
 
 <img src="../../../wiki_images/controllers/ps3-dualshock3.png" width="150">
 
-https://retrodeck.readthedocs.io/en/latest/wiki_controllers/playstation/playstation-hotkeys/
 
 **Layout Name:**
 
-**Hotkeys:**
+**Information:**
+
+**Hotkeys:** [PlayStation - Hotkeys](../../wiki_controllers/playstation/playstation-hotkeys.md)
 
 Extra features in the layout:
 
@@ -458,13 +462,12 @@ Extra features in the layout:
 
 <img src="../../../wiki_images/controllers/ps4-dualshock4.png" width="150">
 
-https://retrodeck.readthedocs.io/en/latest/wiki_controllers/playstation/dualshock-4/
-https://retrodeck.readthedocs.io/en/latest/wiki_controllers/playstation/playstation-hotkeys/
-
-
 **Layout Name:**
 
-**Hotkeys:**
+**Information:**
+
+**Hotkeys:** [PlayStation - Hotkeys](../../wiki_controllers/playstation/playstation-hotkeys.md)
+
 
 **Extra features for the DualShock 4:**
 
@@ -478,13 +481,11 @@ Feature: Right click on the left side of the touchpad.
 
 <img src="../../../wiki_images/controllers/ps5-dualsense.png" width="150">
 
-https://retrodeck.readthedocs.io/en/latest/wiki_controllers/playstation/dualsense/
-
-https://retrodeck.readthedocs.io/en/latest/wiki_controllers/playstation/playstation-hotkeys/
-
 **Layout Name:**
 
-**Hotkeys:**
+**Information:**
+
+**Hotkeys:** [PlayStation - Hotkeys](../../wiki_controllers/playstation/playstation-hotkeys.md)
 
 **Extra features for the DualSense:**
 
@@ -498,23 +499,23 @@ Feature: Right click on the left side of the touchpad.
 
 <img src="../../../wiki_images/controllers/xbox-360.png" width="150">
 
-https://retrodeck.readthedocs.io/en/latest/wiki_controllers/xbox/xbox-360/
-https://retrodeck.readthedocs.io/en/latest/wiki_controllers/xbox/xbox-hotkeys/
 
 **Layout Name:**
 
-**Hotkeys:**
+**Information:**
+
+**Hotkeys:** [Xbox - Hotkeys](../../wiki_controllers/xbox/xbox-hotkeys.md)
 
 ### Xbox Wireless Controller
 
 <img src="../../../wiki_images/controllers/xbox-wireless.png" width="150">
 
-https://retrodeck.readthedocs.io/en/latest/wiki_controllers/xbox/xbox-wireless/
-https://retrodeck.readthedocs.io/en/latest/wiki_controllers/xbox/xbox-hotkeys/
 
 **Layout Name:**
 
-**Hotkeys:**
+**Information:**
+
+**Hotkeys:** [Xbox - Hotkeys](../../wiki_controllers/xbox/xbox-hotkeys.md)
 
 
 ## Framework / Configurator