diff --git a/docs/source/basics/plotter.rst b/docs/source/basics/plotter.rst
index 9da5af3..4947b01 100644
--- a/docs/source/basics/plotter.rst
+++ b/docs/source/basics/plotter.rst
@@ -25,11 +25,15 @@ Objectives:
 Run the plotter
 ---------------
 
-Go to the plotter tutorial source::
+Go to the plotter tutorial source:
+
+.. code-block:: bash
 
     $ cd birdhouse-workshop/tutorials/01_plotter
 
-Try the plotter python module::
+Try the plotter python module:
+
+.. code-block:: bash
 
     $ python plotter.py
     Traceback (most recent call last):
@@ -37,7 +41,9 @@ Try the plotter python module::
       import matplotlib.pylab as plt
     ModuleNotFoundError: No module named 'matplotlib'
 
-Oops, something is missing ... please install the ``matplotlib`` package via conda::
+Oops, something is missing ... please install the ``matplotlib`` package via conda:
+
+.. code-block:: bash
 
     # Let's see what is available
     $ conda search -c conda-forge matplotlib
@@ -49,25 +55,33 @@ Conda will show you a list of packages, which are going to be installed.
 Have a look at this list and answer with ``y`` or just press ``enter``.
 
 We should check now the ``plotter.py`` source code.
-Open the ``plotter.py`` in your favorite editor, some people like ``vim``::
+Open the ``plotter.py`` in your favorite editor, some people like ``vim``:
+
+.. code-block:: bash
 
     $ vim plotter.py
 
 Besides ``matplotlib`` there is another ``import`` for ``netCDF4``.
-Let us install it::
+Let us install it:
+
+.. code-block:: bash
 
     # same procedure as above ...
     $ conda search -c conda-forge netcdf4
     $ conda install -c conda-forge netcdf4
 
-So, we should now be ready to run the plotter::
+So, we should now be ready to run the plotter:
+
+.. code-block:: bash
 
     $ python plotter.py
     Plotting ../data/air.mon.ltm.nc ...
     Plot written to plot.png
 
 A plot was generated. Open it in your favorite image viewer.
-On Ubuntu/LinuxMint you can try *Eye of Gnome*::
+On Ubuntu/LinuxMint you can try *Eye of Gnome*:
+
+.. code-block:: bash
 
     $ eog plot.png
 
@@ -87,7 +101,9 @@ Open the ``plotter.py`` and implement the following features:
 
 You will need an additional Python package, ``cartopy``, which you can install with conda.
 This package is available on the conda-forge channel.
-You need to provide an option with the conda channel::
+You need to provide an option with the conda channel:
+
+.. code-block:: bash
 
     $ conda install -c conda-forge mypackage
 
diff --git a/docs/source/pywps/installation.rst b/docs/source/pywps/installation.rst
index 8a129cb..4882bc5 100644
--- a/docs/source/pywps/installation.rst
+++ b/docs/source/pywps/installation.rst
@@ -54,9 +54,14 @@ Start the service by running the following command:
 
 .. code-block:: bash
 
+    # change to workshop root folder
+    $ cd birdhouse-workshop/
+    # start demo service
     $ python demo/demo.py
 
-If everything went well you should have a console output as follows::
+If everything went well you should have a console output as follows:
+
+.. code-block:: bash
 
   Configuration file(s) ['demo/default.cfg'] loaded
   starting WPS service on http://localhost:5000/wps
diff --git a/docs/source/quick.rst b/docs/source/quick.rst
index 8c47faa..0bc7618 100644
--- a/docs/source/quick.rst
+++ b/docs/source/quick.rst
@@ -23,6 +23,7 @@ Basics:
 
 PyWPS:
 
-5. :ref:`pywps_installation`
-6. :ref:`pywps_process`
-7. :ref:`pywps_clients`
+5. :ref:`pywps_intro`
+6. :ref:`pywps_installation`
+7. :ref:`pywps_process`
+8. :ref:`pywps_clients`