diff --git a/etc/doxygen/pages/Overview.md b/etc/doxygen/pages/Overview.md
index dfe0300de3d30e916868d75dda542962358e9f07..427e270c221a737fb5aa455a8e27033a0368fb10 100644
--- a/etc/doxygen/pages/Overview.md
+++ b/etc/doxygen/pages/Overview.md
@@ -63,6 +63,13 @@ RobotAPI also provides a GUI-plugin for robot visualization.
 \par
 \link RobotAPI-GuiPlugins Read more \endlink
 
+\par RobotUnit
+\subpage RobotUnit
+
+
+\par GamepadUnit
+\subpage GamepadUnit
+
 
 \defgroup RobotAPI RobotAPI
 \copydoc RobotAPI-Overview
diff --git a/etc/doxygen/pages/armem/how_to_create_a_new_core_segment_or_memory_server.md b/etc/doxygen/pages/armem/how_to_create_a_new_core_segment_or_memory_server.md
index 2f20e03502ca19ff7ebbf279688e211379a018d0..6c1fa08fc6e0bc83c124389e74eecff72179018d 100644
--- a/etc/doxygen/pages/armem/how_to_create_a_new_core_segment_or_memory_server.md
+++ b/etc/doxygen/pages/armem/how_to_create_a_new_core_segment_or_memory_server.md
@@ -4,7 +4,7 @@
 \ref tutorials_120_memory_server_and_client_cpp
 
 \todo 
-Merge the information from here into the tutorial
+Merge the information from here into \ref tutorials_120_memory_server_and_client_cpp
 
 In order to make a new type of data available in the memory system, you first need to create an ARON XML file. Please refer to [Aron/CodeGeneration](Aron/CodeGeneration) if you want to know how to do so.
 
diff --git a/etc/doxygen/pages/armem/memory_system.md b/etc/doxygen/pages/armem/memory_system.md
index 79246d64e4117df639155dea22d0ccb90012ec53..e516fa69c80d034daa4c4077fb7818068eaffd44 100644
--- a/etc/doxygen/pages/armem/memory_system.md
+++ b/etc/doxygen/pages/armem/memory_system.md
@@ -1,7 +1,9 @@
-# Memory System  {#memory_system}
+# ArmarX Memory System  {#memory_system}
 
 \tableofcontents
 
+@see
+- \ref tutorials_120_memory_server_and_client_cpp
 - \subpage memory_system-how_to_create_a_new_core_segment_or_memory_server
 
 ## Introduction to the Memory System {#memory_system-introduction}
diff --git a/source/RobotAPI/components/units/RobotUnit/README.md b/source/RobotAPI/components/units/RobotUnit/README.md
index 5533e6588b3a89ac7d0d45b9dc4ed6ebaba323c9..f08be8ab3fb312b6e69d09457cc24a96f6475e3d 100644
--- a/source/RobotAPI/components/units/RobotUnit/README.md
+++ b/source/RobotAPI/components/units/RobotUnit/README.md
@@ -1,4 +1,5 @@
-# RobotUnit
+# RobotUnit  {#RobotUnit}
+
 The RobotUnit can be used for real-time control.
 The central principle is that all controllers are executed synchronously.
 The controllers are arranged in a 2-layer architecture.
diff --git a/source/RobotAPI/drivers/GamepadUnit/README.md b/source/RobotAPI/drivers/GamepadUnit/README.md
index f987b05e9a80bc59741e77b07502516f7de3d842..5def39e88a135d938e9bcbcac27bbf553285ebd2 100644
--- a/source/RobotAPI/drivers/GamepadUnit/README.md
+++ b/source/RobotAPI/drivers/GamepadUnit/README.md
@@ -1,4 +1,4 @@
-# GamepadUnit
+# GamepadUnit  {#GamepadUnit}
 
 This component is used to control the robot with a gamepad.