diff --git a/documentation/operator-guide/Makefile b/documentation/operator-guide/Makefile
index 4316687b77278535b6bce7fd4822ed5099ab8cc9..115276079038a54fd7b649c3dbf384333981ec59 100644
--- a/documentation/operator-guide/Makefile
+++ b/documentation/operator-guide/Makefile
@@ -16,7 +16,7 @@ help:
 .PHONY: help Makefile
 
 html-watch:
-	@$(SPHINXAUTOBUILD) "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXAUTOBUILD) -i "$(BUILDDIR)/*" "$(SOURCEDIR)" "$(BUILDDIR)/html" $(SPHINXOPTS) $(O)
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
diff --git a/documentation/operator-guide/conf.py b/documentation/operator-guide/conf.py
index f02924ead89e024197a7fbb6556b7f2a60ee2fd6..c4839a6c6d62719bd824cee3e225baab8e05d895 100644
--- a/documentation/operator-guide/conf.py
+++ b/documentation/operator-guide/conf.py
@@ -17,7 +17,7 @@
 
 # -- Project information -----------------------------------------------------
 
-project = u'View Server - Operations Guide'
+project = u'View Server - Operator Guide'
 copyright = u'2019, 2020, EOX IT Services GmbH'
 author = u'EOX IT Services GmbH'
 
@@ -52,6 +52,8 @@ html_theme = 'alabaster'
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
+html_favicon = 'images/favicon.ico'
+
 numfig = True
 numfig_format = {
     'figure': 'Figure %s',
@@ -63,8 +65,8 @@ numfig_secnum_depth = 2
 
 latex_documents = [(
     'index',
-    'View-Server.tex',
-    u'View Server - Usage Guide',
+    'View-Server_-_Operator-Guide.tex',
+    u'View Server - Operator Guide',
     u'EOX IT Services GmbH',
     'manual',
     True
diff --git a/documentation/operator-guide/images/favicon.ico b/documentation/operator-guide/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..b4d1efa50d197e85eb86c8d60c53db49393b3254
Binary files /dev/null and b/documentation/operator-guide/images/favicon.ico differ
diff --git a/documentation/operator-guide/index.rst b/documentation/operator-guide/index.rst
index 9ab9492b92565619a7186eb8dea102a4705208b5..de28ce8296596d10709c666cbe822c3ba2d0e961 100644
--- a/documentation/operator-guide/index.rst
+++ b/documentation/operator-guide/index.rst
@@ -1,14 +1,14 @@
 .. _contents:
 
-View Server - Operations Guide
-==============================
+View Server - Operator Guide
+============================
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 3
 
    intro
 
-   operations-guide
+   operator-guide
 
 ..
    Indices and tables
diff --git a/documentation/operator-guide/operator-guide.rst b/documentation/operator-guide/operator-guide.rst
index e735a9c880dbf99ed64e08b2a1d3df6c88e257ff..961097770870012db9a7dada38ffe3779cc4f9ad 100644
--- a/documentation/operator-guide/operator-guide.rst
+++ b/documentation/operator-guide/operator-guide.rst
@@ -1,9 +1,11 @@
-# Operations Guide
+Operator Guide
+==============
 
 TODO
 
 
-## Admin
+Admin
+-----
 
 * https://vhr18.pdas.prism.eox.at/admin
 * https://emg.pdas.prism.eox.at/admin