diff --git a/doc/index.txt b/doc/index.txt
index c76749e3c..8c2a31665 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -9,7 +9,7 @@ This documentation section contains documentation for both users and developers.
 
 The user manual containing the full reference for using Lumiera :
 
- * link:manual.html[User Manual]  _(planned)_
+ * link:user/manual.html[User Manual]  _(planned)_
 
 === Developer
 Informations about the structure of Lumiera, they give an overview on the main components of the application :
@@ -23,6 +23,4 @@ Programming-oriented details about the functional layers of Lumiera as well as a
 === Presentation documents
 Documents that you can use as you wish to present or promote Lumiera :
 
- * link:white-papers-presentations.html[Whitepapers and Presentations]
-
-
+ * link:media/index.html[Whitepapers and Presentations]
diff --git a/doc/user/index.txt b/doc/user/index.txt
index 8c98e2814..a98e41367 100644
--- a/doc/user/index.txt
+++ b/doc/user/index.txt
@@ -5,7 +5,7 @@ User Documentation
 
  * link:manual.html[We need to write a user manual....]
  * The following document might become an introductory overview: +
-   link:outerSpace/lumiera_from_outer_space.html[Lumiera from Outer Space]
+   link:outerSpace/lumiera_from_outer_space.html[Lumiera (as seen) from Outer Space]
  * link:outerSpace/Glossary.html[Glossary of common terms]
 
 [icon="warning.png"]