diff --git a/buildout.cfg b/buildout.cfg
index 898169b471169b4f4db5448cf662f0446e577125..4cae45ed81513a1ad8467c1d7eefa9621f32b5ff 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -29,6 +29,8 @@ recipe = syseggrecipe
 eggs = alabaster
        babel
        backports.shutil-get-terminal-size
+       click
+       click-plugins
        colorlog
        coverage
        cycler
diff --git a/doc/admin/index.rst b/doc/admin/index.rst
index 37b4b043eb6ab78e78f4717cafa77f2a84f2665a..c8b16c0979efb7d95d651237dc8841cebd68b728 100644
--- a/doc/admin/index.rst
+++ b/doc/admin/index.rst
@@ -21,9 +21,11 @@
 .. with the BEAT platform. If not, see http://www.gnu.org/licenses/.          ..
 
 
-########################
+.. _beat_web_admin:
+
+=========================
 BEAT Administrator Guide
-########################
+=========================
 
 BEAT stands for "Biometrics Evaluation And Testing". It is a EC-FP7 sponsored
 project to build a web-based, biometry-independent platform for Biometrics
diff --git a/doc/api/index.rst b/doc/api/index.rst
index dafffb55b5e29b81be075bd54970e9d28b1cdcea..b6fbda88c2a24b2e3afeb177801d9360e114c423 100644
--- a/doc/api/index.rst
+++ b/doc/api/index.rst
@@ -21,6 +21,8 @@
 .. with the BEAT platform. If not, see http://www.gnu.org/licenses/.          ..
 
 
+.. _beat_web_api:
+
 ==============
  BEAT Web API
 ==============
diff --git a/doc/user/index.rst b/doc/user/index.rst
index 3c4a55ae42e6d82e8901f8eab9d49b20b50e002b..2115f23af0fccb9f1d32efa53e7c252275c36dfb 100644
--- a/doc/user/index.rst
+++ b/doc/user/index.rst
@@ -21,6 +21,8 @@
 .. with the BEAT platform. If not, see http://www.gnu.org/licenses/.          ..
 
 
+.. _beat_web_user:
+
 ==========================
  BEAT Platform User Guide
 ==========================