diff --git a/docs/index.md b/docs/index.md
index 09761bfcac27ff62a05e1fdfeafa8b6a3556e3ef..7723811d1afde189c05374b8ab1c5d079321b13b 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,8 +1,8 @@
 # Stream TV Project
 
-Stream TV is a project developed at [Darmstadt University of Applied Sciences (h_da)](https://h-da.de) for the [User-Centric Software Development](https://obs.fbi.h-da.de/mhb/modul.php?nr=30.7317&pdf=PDF) hands-on training. In the course the students develop an Android app that remote controls the Stream TV Server.
+Stream TV is a project developed at Darmstadt University of Applied Sciences [h-da.de](https://h-da.de) for the User-Centric Software Development hands-on training. In the course the students develop an Android app that remote controls the Stream TV Server.
 
-This server displays (in the browser on the student's laptop / computer) streams of the popular [Twitch.tv](https://twitch.tv) livestream platform.
+This server displays streams of the popular [Twitch.tv](https://twitch.tv) livestream platform on the student's target device (laptop, desktop, tv, smart device, etc.).
 The apps can request the server via a simple HTTP API to query the Twitch API for content and to change the state of the display (e.g. control playback).
 
 The project is intended as an direct successor to the [TV Server](https://lernen.h-da.de/course/view.php?id=6802) which displays static still frames of german TV channels.
@@ -13,23 +13,20 @@ The goal was to
 
 - **Differentiate app designs and diversify stereotypes:** The legacy TV Server only has one endpoint to *discover* content. By providing 7 distinct endpoints to the Twitch API students can differentiate themselves in their project, stereotypes and design. Of course that doesn't mean all endpoints must be used.
 
-- **Improve usefulness:** The apps for the legacy TV Server are completely useless after the course. We hope that our project is actually useful and might still be relevant after the course.
+- **Improve usefulness:** The apps for the legacy TV Server are pretty much useless after the course. We hope that our project might still be relevant after the course.
 
 ## Documentation layout
 
-- **[Project](index.md)** _What you are reading right now_  
-  How the project is structured and a bit about Twitch.
+- **Project**  
+  _What you are reading right now_ and [Changelog](changelog.md).
 
-- **[Server](server/index.md)**  
-  Getting started with the Stream TV Server, the very important [Reference](server/reference.md) and additional information.
+- **Server**  
+  [Download and Run](server/index.md), [Options](server/options.md), [Quickstart](server/quickstart.md), [Reference](server/reference.md) and [Java integration](server/streamtv-java.md).
 
-- **[Remote](remote/index.md)**  
-  Resources to get you started on requesting the server from your Android app.
-
-- **[About](about/index.md)**  
-  Meta-documentation and miscellany.
+- **About**  
+  [Contributing info (code layout, build and deploy instructions etc.)](about/contributing.md), [License](about/license.md), [Twitch resources](about/twitch-resources.md) and [Miscellany](about/miscellany.md).
 
 
 !!! info
-    For the hands-on training not every page of this documentation is important. E.g. the [About](about/index.md) chapter is mostly for internal purposes and curious readers.
+    For the hands-on training not every page of this documentation is important. The _About_ chapter is mostly for internal purposes and curious readers.
     
\ No newline at end of file