diff --git a/factcast-site/documentation-docsy/content/en/UI/Setup/_index.md b/factcast-site/documentation-docsy/content/en/UI/Setup/_index.md
index 3c72b307b..5e3542a5e 100755
--- a/factcast-site/documentation-docsy/content/en/UI/Setup/_index.md
+++ b/factcast-site/documentation-docsy/content/en/UI/Setup/_index.md
@@ -7,6 +7,6 @@ weight: 10
 
 This section will walk you through the many options of how to setup and operate FactCast-Server-UI.
 
-First, decide for a [deployment-option](deployment-options.md) and configure the [necessary Vaadin property](properties.md).
+First, decide for a [deployment-option](deployment-options) and configure the [necessary Vaadin property](properties).
 
-Also there are several options regarding [Security](security.md).
+Also there are several options regarding [Security](security).
diff --git a/factcast-site/documentation-docsy/content/en/UI/Setup/deployment-options.md b/factcast-site/documentation-docsy/content/en/UI/Setup/deployment-options.md
index 4ae979030..96e798e18 100644
--- a/factcast-site/documentation-docsy/content/en/UI/Setup/deployment-options.md
+++ b/factcast-site/documentation-docsy/content/en/UI/Setup/deployment-options.md
@@ -1,7 +1,7 @@
 ---
 title: "Deployment Options"
 type: docs
-weight: 900
+weight: 10
 description: Options for deploying the FactCast server-ui.
 ---
 
@@ -35,5 +35,5 @@ accordingly.
 
 ### Security
 
-The UI uses spring-security. Some helpful settings are documented [here](../Setup/security).
+The UI uses spring-security. Some helpful settings are documented [here](../security).
 If security is disabled you can log in with any username and `security_disabled` as password.
diff --git a/factcast-site/documentation-docsy/content/en/UI/Setup/plugins.md b/factcast-site/documentation-docsy/content/en/UI/Setup/plugins.md
index d0f9343c3..fe65f0b9a 100644
--- a/factcast-site/documentation-docsy/content/en/UI/Setup/plugins.md
+++ b/factcast-site/documentation-docsy/content/en/UI/Setup/plugins.md
@@ -1,7 +1,7 @@
 ---
 title: "Plugins"
 type: docs
-weight: 200
+weight: 500
 description: Plugins to enrich visual representation of data
 ---
 
@@ -32,4 +32,4 @@ queryable Map<UserId, UserName>, and use this data to annotate the `UserName` to
 
 Take a look at `HeaderMetaTimestampToDatePlugin` as an example of the simplest Plugin possible. It just turns
 the `meta_.ts` attribute of the fact header into a human readable DateTime.
-![header-meta-timestamp-to-date-plugin.png](header-meta-timestamp-to-date-plugin.png)
+![header-meta-timestamp-to-date-plugin.png](../header-meta-timestamp-to-date-plugin.png)
diff --git a/factcast-site/documentation-docsy/content/en/UI/Setup/security.md b/factcast-site/documentation-docsy/content/en/UI/Setup/security.md
index 86235840d..1caa547a5 100755
--- a/factcast-site/documentation-docsy/content/en/UI/Setup/security.md
+++ b/factcast-site/documentation-docsy/content/en/UI/Setup/security.md
@@ -1,7 +1,7 @@
 ---
 title: "Security"
 type: docs
-weight: 100
+weight: 300
 ---
 
 ## Authentication & Authorization
diff --git a/factcast-site/documentation-docsy/content/en/UI/_index.md b/factcast-site/documentation-docsy/content/en/UI/_index.md
index d66767d18..f710a7173 100755
--- a/factcast-site/documentation-docsy/content/en/UI/_index.md
+++ b/factcast-site/documentation-docsy/content/en/UI/_index.md
@@ -13,4 +13,4 @@ conveniently query for facts, without requiring knowledge of a query language or
 
 ![FactCast-Server UI](./ui.png)
 
-Learn [here](Setup) how to set it up in your environment.
+Learn [here](setup) how to set it up in your environment.