diff --git a/doc/development.rst b/doc/development.rst
index e9c77b481d69ed0039b0c1dfb96fbe85afad610e..98081cc2700ac19df55c9e2d0a6768049883ee07 100644
--- a/doc/development.rst
+++ b/doc/development.rst
@@ -1,13 +1,75 @@
-
+.. _beat-editor-development:
 =============
  Development
 =============
 
 This section is a compilation of notes and advice about how to develop the ``beat.editor`` project, aimed at those less familiar with web development but familiar with Python.
 
-Important Concepts
+Preparing the package for development
+=====================================
+
+The requirements for installing and preparing the ``beat.editor`` package for development are as following:  
+
+#. Linux or MacOS
+#. Working internet connection
+#. Useable Conda setup (see `Bob's documentation on it <https://www.idiap.ch/software/bob/docs/bob/bob/master/install.html>`_)
+#. Up-to-date Firefox and Chrome browsers (both need headless support, a relatively recent feature)
+#. Docker installed and available to the current user
+#. A relatively recent version of `NodeJS & NPM <http://nodejs.org/>`_.
+
+Installation Steps
 ------------------
 
+#. Clone the ``beat.editor`` repository: ::
+
+   $ git clone git@gitlab.idiap.ch:beat/beat.editor.git
+
+#. Clone the ``bob.admin`` repository, necessary for building a development Conda environment: ::
+
+   $ git clone git@gitlab.idiap.ch:bob/bob.admin.git
+
+#. Use ``bob.admin`` to create a development Conda environment named ``beatedit`` for Python 3.6: ::
+
+   $ conda activate base
+   $ conda install pyyaml # install a dependency that isn't fetched by default
+   $ cd beat.editor
+   $ ../bob.admin/conda/conda-bootstrap.py --overwrite --python=3.6 beatedit
+
+#. Activate the created environment and use the ``buildout`` command from ``bob.buildout`` in the new environment to generate the executables for ``beat.editor``: ::
+
+   $ conda activate beatedit
+   $ buildout
+
+#. Note for development mode: Add the line ``dependent-scripts = true`` then use the ``buildout`` command to ensure to generate all the executables in the ``bin/``
+   folder even ``beat`` for ``beat.editor``: ::
+
+   $ buildout
+
+#. In ``bin/`` you should several new executables for the project. The Python setup part is done.
+
+#. Go into the root folder for the Javascript and install the dependencies via NPM: ::
+
+   $ cd conda/js
+   $ npm install
+
+#. Test the JS to make sure everything is working properly: ::
+
+   $ npm test
+
+#. Assuming the tests pass, you can start the development webpack server: ::
+
+   $ npm start
+
+#. In a separate terminal tab/window, go back to the root of the ``beat.editor`` project and run the web server in development mode: ::
+
+   $ ./bin/beat editor serve --dev
+
+#. You should now be able to go ``localhost:9101`` in your browser to see the ``beat.editor`` web app, now served by the webpack dev server.
+
+
+Important Concepts
+==================
+
 Before developing for ``beat.editor``, you'll need to familiarize yourself with at least the following concepts/tools:
 
 * Flask & RESTful APIs
diff --git a/doc/index.rst b/doc/index.rst
index 053ffce0ca1ac7f34845fd1fb8ceb91b33f4846f..01943ff930885ed75f7fdc6378889517cfac3835 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -27,11 +27,13 @@
  Local Editor for BEAT Objects
 ===============================
 
+This package provides a web server to manage and edit BEAT objects locally. The users can make new objects or new versions of existing ones using the graphical interface provided by this server and the editor produces the correct JSON_ format for the corresponding objects. In case of new objects it also provides a Python template as well. This is the package used as the graphical interface in :ref:`tutorial`.
+
+In the following sections different parts of the graphical interface will be explained in details. The developers interested in developing this package can find the information in :ref:`beat-editor-development`.
+
 
 .. toctree::
 
-   install
-   user
    editor
    development
 
@@ -42,3 +44,7 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
+
+
+.. include:: links.rst
+