diff --git a/web/assets/scss/main.scss b/web/assets/scss/main.scss
index 0067257182faae13930d12bd423ec08057ca117c..501506f84e545bc81e53bd64ad279dfae654ba89 100644
--- a/web/assets/scss/main.scss
+++ b/web/assets/scss/main.scss
@@ -113,6 +113,18 @@ p, ul, pre {
   }
 }
 
+/* -- Table of contents -- */
+#TableOfContents {
+  @apply .text-sm;
+  ul:first-child {
+    @apply .list-reset;
+  }
+}
+#TableOfContents>ul:first-child>li>ul>li>a {
+  @apply .font-bold;
+  @apply .tracking-wide;
+}
+
 /* -- OS selector -- */
 .os-div {
   @apply .-ml-4;
diff --git a/web/config.toml b/web/config.toml
index 49f16a4fc8a8dc627c94a843b2dbc0aea16acec3..3e4c3f301e6c31c0e43064bb4a0fa1dd93c42e8c 100644
--- a/web/config.toml
+++ b/web/config.toml
@@ -103,10 +103,18 @@ staticDir = ["dist", "static"]
   weight = 9
 
 # Quickstart sidebar top-level categories
-[[menu.quickstart]]
+[[menu.userguide]]
   name = "Basics"
   identifier = "basics"
   weight = 1
+[[menu.userguide]]
+  name = "Post Processing"
+  identifier = "post-processing"
+  weight = 2
+[[menu.userguide]]
+  name = "Troubleshooting"
+  identifier = "troubleshooting"
+  weight = 99
 
 # Tools sidebar top-level categories
 [[menu.tools]]
diff --git a/web/content/docs/_index.pandoc b/web/content/docs/_index.pandoc
index 266a00f0e862b10de0aea806dc73923b438e0d8d..ab6f2a66b3d4e61503119225cb444ed339c83343 100644
--- a/web/content/docs/_index.pandoc
+++ b/web/content/docs/_index.pandoc
@@ -2,8 +2,8 @@
 title = "Documentation"
 
 [[sections]]
-name = "Quickstart"
-url = "/docs/quickstart"
+name = "User Guide"
+url = "/docs/userguide"
 text = "Download, install and run an OGS benchmark in 5 minutes! No development setup required."
 
 [[sections]]
diff --git a/web/content/docs/devguide/advanced/working-on-envinf1.pandoc b/web/content/docs/devguide/advanced/working-on-envinf1.pandoc
index 275d6e3760e1e9a115a1a67cac65b5e3292c0288..953bac47b8ad2ec1b0fc2ce52b4d9ccb29b42224 100644
--- a/web/content/docs/devguide/advanced/working-on-envinf1.pandoc
+++ b/web/content/docs/devguide/advanced/working-on-envinf1.pandoc
@@ -57,20 +57,3 @@ $ module load ninja/1.4.0-1_gcc_4.8.1_CentOS6
 $ module load cmake/3.1.3-1
 $ module load gcc/6.2.0-1
 ```
-
-## Use ParaView
-
-On `envinf1` start ParaView-server with e.g. 4 cores:
-
-```bash
-module load paraview/5.0.0-egl
-mpirun -np 4 pvserver
-```
-
-This starts the server on port 11111. If another user has already started the server you need to start your server on another port with e.g.:
-
-```bash
-mpirun -np 4 pvserver --server-port=11112
-```
-
-On your local PC start ParaView (you have to use the same version, 5.0.0 in this case). And connect to the server on `envinf1.eve.ufz.de:11111` (or specify another port here).
diff --git a/web/content/docs/quickstart/basics/envinf1.pandoc b/web/content/docs/userguide/basics/envinf1.pandoc
similarity index 97%
rename from web/content/docs/quickstart/basics/envinf1.pandoc
rename to web/content/docs/userguide/basics/envinf1.pandoc
index b1755ac468993947d63d4969447bc0203f318fc1..5fb65eb19ae608b2b23aaa19157358083456c128 100644
--- a/web/content/docs/quickstart/basics/envinf1.pandoc
+++ b/web/content/docs/userguide/basics/envinf1.pandoc
@@ -5,7 +5,7 @@ author = "Lars Bilke"
 weight = 2
 
 [menu]
-  [menu.quickstart]
+  [menu.userguide]
     parent = "basics"
 +++
 
diff --git a/web/content/docs/quickstart/basics/introduction.pandoc b/web/content/docs/userguide/basics/introduction.pandoc
similarity index 96%
rename from web/content/docs/quickstart/basics/introduction.pandoc
rename to web/content/docs/userguide/basics/introduction.pandoc
index e90552a202ff3c908a41af4f492eb76fb9c636ad..cd398c7098e35c99c474260d375ee027a1c624ba 100644
--- a/web/content/docs/quickstart/basics/introduction.pandoc
+++ b/web/content/docs/userguide/basics/introduction.pandoc
@@ -4,11 +4,12 @@ title = "Introduction"
 author = "Lars Bilke"
 weight = 1
 
-aliases = [ "/docs/quickstart/",
+aliases = [ "/docs/userguide/",
+            "/docs/quickstart/",
             "/docs/quickstart/basics/quickstart" ] # Redirect for Hydrology III tutorial
 
 [menu]
-  [menu.quickstart]
+  [menu.userguide]
     parent = "basics"
 +++
 
diff --git a/web/content/docs/userguide/post-processing/paraview-on-envinf1.pandoc b/web/content/docs/userguide/post-processing/paraview-on-envinf1.pandoc
new file mode 100644
index 0000000000000000000000000000000000000000..6b444f684d5d5fda6c9c1505098c15d2dc55b0ba
--- /dev/null
+++ b/web/content/docs/userguide/post-processing/paraview-on-envinf1.pandoc
@@ -0,0 +1,32 @@
++++
+date = "2018-11-14T14:00:13+01`:00"
+title = "ParaView on envinf1"
+author = "Lars Bilke"
+weight = 1
+
+[menu]
+  [menu.userguide]
+    parent = "post-processing"
++++
+
+Connect to a frontend node and start `pvserver`:
+
+```bash
+ssh envinf1.eve.ufz.de -L 11111:envinf1.eve.ufz.de:11111
+# OR: ssh frontend2.eve.ufz.de -L 11111:frontend2.eve.ufz.de:11111
+# frontend2 has a NVidia K80 vs a K20 in envinf1
+ml use /global/apps/modulefiles
+ml paraview/egl/5.6.0-1
+pvserver
+```
+
+On your local machine:
+
+* [Install ParaView 5.6.0](https://www.paraview.org/download/)
+* Connect to server
+  * Add Server
+    * Host: `localhost`
+    * Port: `11111`
+* Under `Settings / Render View` set `Remote Render Threshold` to a small value (e.g. 1) to ensure remote rendering
+
+The port tunneling with ssh is required as these ports are blocked from the firewall. If port `11111` is already in use by another user just try a different port, e.g. `11112`: `pvserver -sp=11112`. Do not forget to tunnel this port with SSH too!
diff --git a/web/content/docs/userguide/troubleshooting/index.md b/web/content/docs/userguide/troubleshooting/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..4686c8595c3a24789e3e59adad0509e18897d4ae
--- /dev/null
+++ b/web/content/docs/userguide/troubleshooting/index.md
@@ -0,0 +1,41 @@
++++
+date = "2018-11-14T11:00:13+01`:00"
+title = "Troubleshooting"
+author = "Lars Bilke"
+weight = 99
+toc = true
+
+[menu]
+  [menu.userguide]
+    parent = "troubleshooting"
++++
+
+## Data Explorer
+
+### XSDError: Loaded schema file is invalid
+
+<i class="fas fa-exclamation-triangle"></i> Error message:
+
+```bash
+Error XSDError in http://www.opengeosys.org/images/xsd/OpenGeoSysCND.xsd, at line 1, column 1: Start tag expected.
+Error XSDError in file:///../bc/well.cnd, at line 5, column 195: Loaded schema file is invalid.
+XMLInterface::isValid() - XML File is invalid (in reference to schema ./OpenGeoSysCND.xsd).
+Error XSDError in http://www.opengeosys.org/images/xsd/OpenGeoSysCND.xsd, at line 1, column 1: Start tag expected.
+```
+
+This error may also apply to file conversion tools (e.g. `OGSFileConverter`).
+
+<i class="fas fa-arrow-right"></i> Solution:
+
+Open the affected file (e.g. `well.cnd` in this case) and remove the following parameter of the XML root element:
+
+```xml
+xsi:noNamespaceSchemaLocation="http://www.opengeosys.org/images/xsd/OpenGeoSysXXX.xsd"
+```
+
+where `XXX` can be `CND`, `GLI`, `PRJ` or `STN` depending on the file type.
+
+<details>
+    <summary>Background info:</summary>
+    The XSD files may be downloaded from a web location. We changed the protocol of our web site to `https://` but due to some weird behaviour of the Qt XML validation code it tries to download the file (even if it is available locally) and does not respect the URL redirection to `https://` of the web server. Simply removing the part solves the problem. The XML is still validated! Newer OGS versions do not write that parameter into files anymore, see https://github.com/ufz/ogs/pull/2198.
+</details>
diff --git a/web/layouts/docs/single.html b/web/layouts/docs/single.html
index 12e1d8ce0478fb163ffe2094ad5b027fcd5c23cb..79812107ac028f8165bf27b87f3bd6fbf3a4bd98 100644
--- a/web/layouts/docs/single.html
+++ b/web/layouts/docs/single.html
@@ -7,7 +7,7 @@
       <a href="/docs/">Docs</a> / <span class="text-orange">
       {{ if eq $subsection "devguide"}}Developer Guide{{ end }}
       {{ if eq $subsection "benchmarks"}}Benchmarks{{ end }}
-      {{ if eq $subsection "quickstart"}}Quickstart{{ end }}
+      {{ if eq $subsection "userguide"}}User Guide{{ end }}
       {{ if eq $subsection "tools"}}Tools{{ end }}
       </span>
     </div>
@@ -26,7 +26,7 @@
   </nav>
   <div class="w-3/4 ml-4">
     <h1>{{ .Title }}</h1>
-    {{ if or (eq $subsection "devguide") (eq $subsection "quickstart") }}
+    {{ if or (eq $subsection "devguide") (eq $subsection "userguide") }}
     <div class="invisible mb-4" id="os-selector">Select OS:
       <a class="btn mx-1" id="btn-win"><i class="fab fa-windows"></i> Windows</a>
       <a class="btn mx-1" id="btn-linux"><i class="fab fa-linux"></i> Linux</a>
@@ -35,6 +35,11 @@
     {{ end }}
 
     <div class="section-docs">
+      {{ if eq .Params.toc true }}
+        <h2>Table of contents</h2>
+        {{.TableOfContents}}
+        <hr>
+      {{ end }}
       {{ .Content }}
     </div>
 
diff --git a/web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.content b/web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.content
index 5e541574558ce46d6583c070446e432f61835832..06d8bac021a17dade868c72673e41737472c045e 100644
--- a/web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.content
+++ b/web/resources/_gen/assets/scss/scss/main.scss_fb23c2453b1d1395eb4b9e3814032563.content
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f49a726114b7b3f039c98e50613faf8a6c34f5b00a990631d268a8acfdd80eb6
-size 411842
+oid sha256:f3e488cfd9f78194344f3f1c8596b971c6018331f1d8614c20a55a50992948fa
+size 412087