diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 50db7388c045810f0a2a09c7bb940bce81f4f4a0..ad09be84f21c964658a6de142832d8f14a4ad8ad 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -13,8 +13,9 @@
 	"forwardPorts": [3000],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "pip3 install --user -r requirements.txt",
+	"postCreateCommand": "sudo apt-get update && sudo apt-get install -y graphviz && pip3 install --user -r requirements.txt",
 
+	"postStartCommand": "mkdocs serve -a localhost:3000 --dirtyreload",
 	// Configure tool-specific properties.
 	// "customizations": {},
 
diff --git a/.pages b/.pages
index 08377bfb9488ce783f1ab35c8f84cb8dea23d1df..4a2c54007418e8c9a98848693c64795e26329332 100644
--- a/.pages
+++ b/.pages
@@ -1,8 +1,6 @@
 nav:
     - README.md
-    - SRVX1.md
-    - SRVX8.md
-    - Jet-Cluster.md
+    - Servers
     - VSC.md
     - ECMWF.md
     - TeachingHub.md
diff --git a/Getting Started.md b/Getting Started.md
new file mode 100644
index 0000000000000000000000000000000000000000..98d5842fa2310a0c3d916cd649a374622b85f7be
--- /dev/null
+++ b/Getting Started.md	
@@ -0,0 +1,16 @@
+# Getting Started @IMGW
+
+Welcome to the Department of Meteorology and Geophysics @ University of Vienna.
+
+Tasks to complete for newcomers:
+ - [ ] Get a server account
+ - [ ] Change your Password via [IPA (web)]() or [login (ssh)]() to a secure Password. Preferably use a password manager. [Tips]()
+ - [ ] Install a SSH-Client (Windows), e.g. 
+ - [ ] Optional setup ssh-key
+ - [ ] Familiarize yourself with the environment
+
+## Environment
+
+
+## Summary of Computing Resources
+
diff --git a/Latex/README.md b/Latex/README.md
index 9079dcf057fd8b1e5cfdbdf29839f06bd617328b..e97aa1077e86c7e44f2f97972d2df3b034028582 100644
--- a/Latex/README.md
+++ b/Latex/README.md
@@ -3,6 +3,7 @@
 *LaTeX (/ˈlɑːtɛx/ LAH-tekh or /ˈleɪtɛx/ LAY-tekh, often stylized as $`\LaTeX`$) is a software system for **document preparation**. When writing, **the writer uses plain text as opposed to the formatted text** found in "What You See Is What You Get" word processors like Microsoft Word, LibreOffice Writer and Apple Pages. The writer uses **markup tagging conventions to define the general structure of a document** (such as article, book, and letter), to stylise text throughout a document (such as bold and italics), and to add citations and cross-references. **A TeX distribution such as TeX Live** or MiKTeX is used to **produce an output file** (such as **PDF** or DVI) suitable for printing or digital distribution.* @[Wiki](https://en.wikipedia.org/wiki/LaTeX)
 
 What you need to get started:
+
 1. A latex distribution, e.g. texlive or Miktex
     * Or a online latex service, e.g. [Overleaf](www.overleaf.de), [latex4technics](https://www.latex4technics.com)
 2. An Editor, e.g. TexStudio or Texshop, ...
diff --git a/Misc/Shells.md b/Misc/Shells.md
new file mode 100644
index 0000000000000000000000000000000000000000..850cab5c62ce6871949a632691cb75ea313298c2
--- /dev/null
+++ b/Misc/Shells.md
@@ -0,0 +1,12 @@
+# User Shells
+
+
+## Limits
+It is possible to address resource limits in a user shell, which makes sure that programs do not run 
+
+Check what resource limits you have:
+`ulimit -a`
+
+
+
+## Virtual terminals
diff --git a/Misc/Slurm.md b/Misc/Slurm.md
index e8271f41f1cecb7132babffd0b16e39ea430d060..d63706b75064b2efeb7d6bbd7da89c674b3a92cf 100644
--- a/Misc/Slurm.md
+++ b/Misc/Slurm.md
@@ -4,6 +4,9 @@ We use SLURM (https://slurm.schedmd.com/overview.html ) as a workload manager to
 
 *Important: You can only access a node via SSH when you have a SLURM allocation of that node.*
 
+Other resources:
+- [Slurm Tutorial]()
+
 ## Basics
 
 
@@ -19,6 +22,7 @@ Tools:
 - `queueinfo`
 - `watchjob`
 
+
 ```bash
 # Get information on your job
 jobinfo
diff --git a/README.md b/README.md
index f1330cac8949dc7115ca3b7e5311138e5fbb33f6..69e2eaaaf87c7d41b2f6d5a81c44b8935dcfbee6 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,9 @@ Missing solutions are very welcome.
 
 Locations:
 
-- Staff + Students [SRVX1](SRVX1.md)
-- Staff + Remote Desktop [SRVX8](SRVX8.md)
-- Staff + Remote Desktop + Jupyterhub [Jet Cluster](Jet-Cluster.md)
+- Staff + Students [SRVX1](Servers/SRVX1.md)
+- Staff + Remote Desktop [SRVX8](Servers/SRVX8.md)
+- Staff + Remote Desktop + Jupyterhub [Jet Cluster](Servers/JET.md)
 - Staff + Students, Jupyterhub called [TeachingHub](TeachingHub.md)
 - Staff [Vienna Scientific Cluster (VSC)](VSC.md)
     - [VSC Training](https://vsc.ac.at/training)
diff --git a/Jet-Cluster.md b/Servers/JET.md
similarity index 99%
rename from Jet-Cluster.md
rename to Servers/JET.md
index 3b1c0377b79eeb7e5357d0f54b5f0ae44f7f10b3..f10d083529a55b9c123adbea5aa37cbf1ae4d519 100644
--- a/Jet-Cluster.md
+++ b/Servers/JET.md
@@ -28,7 +28,7 @@ Node Setup:
  - 2x Login Nodes
  - 7x Compute Nodes
 
-![GPFS](./mkdocs/img/GPFS-jet.png)
+![GPFS](../mkdocs/img/GPFS-jet.png)
 
 
 | Name | Value |
diff --git a/Servers/README.md b/Servers/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..d4614644089c690924ff7635f2c5267bd43f379b
--- /dev/null
+++ b/Servers/README.md
@@ -0,0 +1,22 @@
+# Servers 
+
+The Department of Meteorology and Geophysics maintains currently the following computing resources:
+
+- Teaching and Service Hub (SRVX1)
+- Remote Desktop (SRVX8)
+- Computing Cluster (JET)
+
+|
+<img src="../mkdocs/img/chip.png" width="50px">
+
+
+```graphviz dot attack_plan.png
+digraph Servers {
+    srvx1 [image="../mkdocs/img/chip.png"]
+    users -> srvx1
+}
+```
+
+
+# Containers & Services
+
diff --git a/SRVX1.md b/Servers/SRVX1.md
similarity index 98%
rename from SRVX1.md
rename to Servers/SRVX1.md
index 3c23c82ecffeb9246545f0733d45b0b86541557d..b0d831b66538ba44d515e3f5e6110e56d27291f6 100644
--- a/SRVX1.md
+++ b/Servers/SRVX1.md
@@ -46,8 +46,8 @@ Currently running:
 - TeachingHub (Jupyterhub)
 - Webdata - File hosting
 - YoPass - Password Sharing
-- iLibrarian - Paper Management (development)
-- Filetransfer.sh - File sharing service (development)
+- iLibrarian - Paper Management
+- Filetransfer.sh - File sharing service
 
 
 ## Jupyterhub
@@ -153,6 +153,7 @@ These are scripts in a common directory. Feel free to copy or edit as you like.
 Currently there is the possibility to run [singularity](https://singularity.hpcng.org/) containers on all our Servers. This is really similar to docker, but much more secure for multi-user servers. Almost every docker container can be converted into a singularity container. Some of the build recipes use docker.
 
 There are a number of prepared containers but more can be added. If you have a wish or an existing container useful for others please share. 
+
 ```yaml
 containers:
  - root: /home/swd/containers
diff --git a/SRVX8.md b/Servers/SRVX8.md
similarity index 100%
rename from SRVX8.md
rename to Servers/SRVX8.md
diff --git a/Servers/Services.md b/Servers/Services.md
new file mode 100644
index 0000000000000000000000000000000000000000..fac1d0c4fc2f49494c0a731a85adb594c468e09d
--- /dev/null
+++ b/Servers/Services.md
@@ -0,0 +1,24 @@
+# Services
+
+
+Information on available services:
+
+- [TeachingHub (Jupyterhub)]()
+- [Webdata - File hosting]()
+- [YoPass - Password Sharing]()
+- [iLibrarian - Paper Management]()
+- [Filetransfer.sh - File sharing service]()
+- [Uptime - Monitoring]()
+- [Gitlab Runner - Gitlab CI]()
+- 
+
+
+## TeachingHub
+
+## Webdata
+
+## YoPass
+
+## iLibrarian
+
+## Filetransfer
\ No newline at end of file
diff --git a/VSC.md b/VSC.md
index 8842acbc1111ebd11e79466b87391d7530e69270..dc8ac3721b386b6715f66087f9d383407c1ba574 100644
--- a/VSC.md
+++ b/VSC.md
@@ -22,7 +22,7 @@ $ ssh user@vsc4.vsc.ac.at
 $ ssh user@vsc3.vsc.ac.at (old does not work anymore)
 ```
 
-Please follow some connection instruction on the [wiki](https://wiki.vsc.ac.at) which is similar to all other servers (e.g. [SRVX1](SRVX1.md)).
+Please follow some connection instruction on the [wiki](https://wiki.vsc.ac.at) which is similar to all other servers (e.g. [SRVX1](Servers/SRVX1.md)).
 The VSC is only available from within the UNINET (VPN, ...). Authentication requires a mobile phone.
 
 We have private nodes at our disposal and in order for you to use these you need to specify the correct account in the jobs you submit to the queueing system (SLURM). The correct information will be given to you in the registration email. 
diff --git a/mkdocs.yml b/mkdocs.yml
index a23ecac169227f690ad24618cca83040b9216a18..1b74e6b9cc8ca87f7e395e0edb6e385024929d0a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -20,7 +20,7 @@ theme:
   features:
     - navigation.indexes 
     - navigation.top
-  logo: mkdocs/img/mkdocs.png
+  logo: mkdocs/img/logo_img2_color.png
   favicon: mkdocs/img/favicon.ico
   custom_dir: mkdocs/overrides
 plugins:
@@ -62,3 +62,7 @@ markdown_extensions:
   - pymdownx.tasklist
   - pymdownx.details
   - pymdownx.emoji
+  - mkdocs_graphviz
+
+#extra_javascript:
+#  - https://cdn.jsdelivr.net/gh/rod2ik/cdn@main/mkdocs/javascripts/mkdocs-graphviz.js
\ No newline at end of file
diff --git a/mkdocs/img/chip.png b/mkdocs/img/chip.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf0c1b9d2fcf3d609e719a056539158c6d1d78da
Binary files /dev/null and b/mkdocs/img/chip.png differ
diff --git a/requirements.txt b/requirements.txt
index 56c1de5afe4186f25f700103c9a0cfcdcaa80997..922d01ca98993b9840a61227166b421efd81c113 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,4 +8,5 @@ mkdocs-awesome-pages-plugin
 mkdocs-git-revision-date-localized-plugin
 mkdocs-jupyter
 mkdocs-same-dir
-mkdocs-exclude
\ No newline at end of file
+mkdocs-exclude
+mkdocs-graphviz
\ No newline at end of file