diff --git a/geoportal-service/docs/index.rst b/geoportal-service/docs/index.rst
index 14fedf6..f323f3a 100644
--- a/geoportal-service/docs/index.rst
+++ b/geoportal-service/docs/index.rst
@@ -8,9 +8,9 @@
 ###############
 gCube CMS Suite
 ###############
-.. note:: gCube CMS Suite is a gCube Application. Check out more about 'gCube'_.
+.. note:: gCube CMS Suite is a gCube Application. Check out more about `gCube`_.
 
-**gCube CMS Suite** is a distributed full stack application for publication management of complex space-temporal documents called **Projects** in a gCube Hybrid e-infrastructure (see `wiki`_).
+**gCube CMS Suite** is a distributed full stack application for publication management of complex space-temporal documents called **Projects** in a gCube based infrastructure (see `wiki`_).
 
 The **gCube CMS Suite** is a gCube Application designed to manage the publication lifecycle of complex space-temporal documents called Projects, supporting their materialisation and Indexing in different platforms (Databases, Catalogues, OGC Services) while maximising reusability.
 It can manage the entire lifecycle of Projects, from their creation to access including :
@@ -81,6 +81,5 @@ Contents of this guide :
    project
    lifecycle
    plugins
-   ucd
    quickstart
    example
\ No newline at end of file
diff --git a/geoportal-service/docs/lifecycle.rst b/geoportal-service/docs/lifecycle.rst
index 5be7469..2b6b0e5 100644
--- a/geoportal-service/docs/lifecycle.rst
+++ b/geoportal-service/docs/lifecycle.rst
@@ -38,7 +38,8 @@ The suite comes with a pre-built set of implemented lifecycles with their STEPS,
 .. figure:: _static/imgs/2phase_lc.png
    :alt: 2 - PHASES Lifecycle
 
-TBD : steps phases, involved events
+..
+   TODO : steps phases, involved events
 
 ====================
 3 - Phases Lifecycle
@@ -46,8 +47,8 @@ TBD : steps phases, involved events
 .. figure:: _static/imgs/3phase_lc.png
    :alt: 3 - PHASES Lifecycle
 
-
-TBD : steps phases, involved events
+..
+   TODO : steps phases, involved events
 
 *****************
 Operation on documents
diff --git a/geoportal-service/docs/plugins.rst b/geoportal-service/docs/plugins.rst
index c26fcd5..d9db705 100644
--- a/geoportal-service/docs/plugins.rst
+++ b/geoportal-service/docs/plugins.rst
@@ -13,18 +13,8 @@ Plugins
 ******************
 Lifecycle Managers
 ******************
-These plugins enable the execution of workflows, triggering all other involved plugins.
+These plugins enable the execution of workflows, triggering all other involved plugins. Check the section :doc:`lifecycle`.
 
-==================
-2 PHASE Lifecycle plugin
-==================
-
-
-
-==================
-3 PHASE Lifecycle plugin
-==================
-3 phase
 
 *********************
 Manifestation Plugins
@@ -35,12 +25,13 @@ Side effects vary depending on involved logic and engines.
 ==================
 Default SDI Materializer
 ==================
-default
+This plugin creates a layer in the infrastructure's SDI based on registered FileSets in the Project.
 
-==================
-Image previewer
-==================
-default
+..
+	==================
+	Image previewer
+	==================
+	default
 
 
 *********************
@@ -53,8 +44,7 @@ Side effects vary depending on involved logic.
 ==================
 Centroids Plugin
 ==================
-default
-
+This plugin creates a geometry (POINT) representing the centroid of the Project in a gCube SDI Layer of all elements of the collection.
 
 
 *****
@@ -65,9 +55,9 @@ These plugins are designed in order to facilitate users to produce / consume pro
 ==================
 Data Entry & management
 ==================
-default
+Check source at `data_entry`_.
 
 ==================
 Projects explorer
 ==================
-default
\ No newline at end of file
+Check source at `data_view`_.
\ No newline at end of file
diff --git a/geoportal-service/docs/quickstart.rst b/geoportal-service/docs/quickstart.rst
index 278b3a0..712f654 100644
--- a/geoportal-service/docs/quickstart.rst
+++ b/geoportal-service/docs/quickstart.rst
@@ -1,7 +1,7 @@
 .. _quickstart:
 
 
-.. _swagger: ../docs/
+.. _swagger: ../api-docs/ui/index.html
 
 ##########
 Quickstart
@@ -29,7 +29,7 @@ Common guides
 
 
 
-Use case specifics
-==================
-
-- MOSI : initialization of MOSI use case, extract from gpkg, publication test (:doc:`_notebooks/gna/MOSI.ipynb`)
+..
+	Use case specifics
+	==================
+	TODO
diff --git a/geoportal-service/docs/ucd.rst b/geoportal-service/docs/ucd.rst
index 6a49f34..9726b13 100644
--- a/geoportal-service/docs/ucd.rst
+++ b/geoportal-service/docs/ucd.rst
@@ -4,4 +4,4 @@
 Use Case Descriptors (UCD)
 ###############
 
-TBD
\ No newline at end of file
+TODO
\ No newline at end of file