diff --git a/docs/available-features/available-features.md b/docs/available-features/available-features.md
new file mode 100644
index 0000000000000000000000000000000000000000..124a174e13631fb974f21c60c4ab814541f0cc3d
--- /dev/null
+++ b/docs/available-features/available-features.md
@@ -0,0 +1,44 @@
+
+# Available features
+
+## Publish queryable layers using Mapserver and WMS GetFeatureInfo
+
+The map view allows you to click on a item and display the GetFeatureInfo result
+
+![](images/index/getfeatureinfo_mode_carto-2.jpg)
+
+Use the **Mapserver** mode to create WMS layers with an HTML query templates
+
+![](images/index/getfeatureinfo_admin_couche.jpg)
+
+## Publish queryable layers using vMap business objects
+
+WMS GetFeatureInfo requests are limited, to go further use the **vMap business objects** that allows you to edit and insert data using full customizable forms.
+
+![](images/index/mode_carto.png)
+
+A powerful graphic interface will help you create complex forms with more than 30 different types of fields, external datasources etc...
+
+![](images/index/bo_studio.jpg)
+
+## Snapping features when editing geometries
+
+Geographic **data quality** is essential, to avoid superpositions you can activate the snapping while creating or editing features.
+
+![](images/index/accrochage.gif)
+
+## Compare maps
+
+You can use the compare button to compare two different maps and make PDF prints of them.
+
+![](images/index/comparaison.gif)
+
+## Mobile mode
+
+vMap is also available for mobile devices using a simple browser
+
+You will be able to display, insert and edit data in the same way you do using your computer. A **GPS** connection is also available to draw features using your current position.
+
+| ![](images/index/mobile_measure.png) | ![](images/index/mobile_cadastre.png) | ![](images/index/mobile_saisie.png) |
+|:------------:|:-------------:|:-------------:|
+| Display data |  Query layers | Draw features |
diff --git a/docs/available-features/images/index/accrochage.gif b/docs/available-features/images/index/accrochage.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f7b04c85020ea9335dfcf9bbac29dca15b690b1f
Binary files /dev/null and b/docs/available-features/images/index/accrochage.gif differ
diff --git a/docs/available-features/images/index/bo_studio.jpg b/docs/available-features/images/index/bo_studio.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d7d1921487cec60af1efa43b36389fd47a52817c
Binary files /dev/null and b/docs/available-features/images/index/bo_studio.jpg differ
diff --git a/docs/available-features/images/index/comparaison.gif b/docs/available-features/images/index/comparaison.gif
new file mode 100644
index 0000000000000000000000000000000000000000..994abe5335cf4e0f319fc272493343ad6d4cdda2
Binary files /dev/null and b/docs/available-features/images/index/comparaison.gif differ
diff --git a/docs/available-features/images/index/getfeatureinfo_admin_couche.jpg b/docs/available-features/images/index/getfeatureinfo_admin_couche.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0c5cf20cf6ca6c2209c4239116650b1a3436fb95
Binary files /dev/null and b/docs/available-features/images/index/getfeatureinfo_admin_couche.jpg differ
diff --git a/docs/available-features/images/index/getfeatureinfo_mode_carto-2.jpg b/docs/available-features/images/index/getfeatureinfo_mode_carto-2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1463078c6f3f84baac2a08313005f5229d2f8950
Binary files /dev/null and b/docs/available-features/images/index/getfeatureinfo_mode_carto-2.jpg differ
diff --git a/docs/available-features/images/index/maintenance_page.jpg b/docs/available-features/images/index/maintenance_page.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..de8d98868b0806331cce97cf2e12307f0d9ee373
Binary files /dev/null and b/docs/available-features/images/index/maintenance_page.jpg differ
diff --git a/docs/available-features/images/index/mobile_cadastre.png b/docs/available-features/images/index/mobile_cadastre.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d8d4b1a64d52d86deb776ecfb1079a362f8ff1c
Binary files /dev/null and b/docs/available-features/images/index/mobile_cadastre.png differ
diff --git a/docs/available-features/images/index/mobile_measure.png b/docs/available-features/images/index/mobile_measure.png
new file mode 100644
index 0000000000000000000000000000000000000000..24c00c66dc2654be19777f5e9efaed3db8444afb
Binary files /dev/null and b/docs/available-features/images/index/mobile_measure.png differ
diff --git a/docs/available-features/images/index/mobile_saisie.png b/docs/available-features/images/index/mobile_saisie.png
new file mode 100644
index 0000000000000000000000000000000000000000..680a10ffb0c1f19b9ffb2fdf0bcf4a16fb0381e0
Binary files /dev/null and b/docs/available-features/images/index/mobile_saisie.png differ
diff --git a/docs/available-features/images/index/mode_carto-1.png b/docs/available-features/images/index/mode_carto-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4db0ffa35d82e6eeb4305066fdbe61853f4b03cf
Binary files /dev/null and b/docs/available-features/images/index/mode_carto-1.png differ
diff --git a/docs/available-features/images/index/vMap_Docker.png b/docs/available-features/images/index/vMap_Docker.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b7460151cb57eca4a439e89c572e8bd08aca10a
Binary files /dev/null and b/docs/available-features/images/index/vMap_Docker.png differ
diff --git a/docs/index.md b/docs/index.md
index b74d7cc334fa4631c470c3b6442eecaed84049e2..7ca439607482800b4b20b7cc9e03b781a1a6e96f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -6,59 +6,11 @@ vMap is able to manage business objects while using WMS producing server softwar
 
 ![](images/index/vMap_Docker.png)
 
-# First steps
+# Table of Contents
+* [Presentation](presentation/presentation.md)
+* [Available features](available-features/available-features.md)
+* [First steps](first-steps/first-steps.md)
 
-When you first run the app you will get the page below, this is because you neet to make some configurations.
-
-![](first-steps/images/page-1.jpg)
-
-Follow [this procedure](first-steps/first-steps.md) to configure your app, activate catographical modules and get somethins like this:
-
-![](first-steps/images/page-7.jpg)
-
-# Available features
-
-## Publish queryable layers using Mapserver and WMS GetFeatureInfo
-
-The map view allows you to click on a item and display the GetFeatureInfo result
-
-![](images/index/getfeatureinfo_mode_carto-2.jpg)
-
-Use the **Mapserver** mode to create WMS layers with an HTML query templates
-
-![](images/index/getfeatureinfo_admin_couche.jpg)
-
-## Publish queryable layers using vMap business objects
-
-WMS GetFeatureInfo requests are limited, to go further use the **vMap business objects** that allows you to edit and insert data using full customizable forms.
-
-![](images/index/mode_carto.png)
-
-A powerful graphic interface will help you create complex forms with more than 30 different types of fields, external datasources etc...
-
-![](images/index/bo_studio.jpg)
-
-## Snapping features when editing geometries
-
-Geographic **data quality** is essential, to avoid superpositions you can activate the snapping while creating or editing features.
-
-![](images/index/accrochage.gif)
-
-## Compare maps
-
-You can use the compare button to compare two different maps and make PDF prints of them.
-
-![](images/index/comparaison.gif)
-
-## Mobile mode
-
-vMap is also available for mobile devices using a simple browser
-
-You will be able to display, insert and edit data in the same way you do using your computer. A **GPS** connection is also available to draw features using your current position.
-
-| ![](images/index/mobile_measure.png) | ![](images/index/mobile_cadastre.png) | ![](images/index/mobile_saisie.png) |
-|:------------:|:-------------:|:-------------:|
-| Display data |  Query layers | Draw features |
 
 # Usefull links
 
diff --git a/docs/presentation/images/12.png b/docs/presentation/images/12.png
new file mode 100644
index 0000000000000000000000000000000000000000..97202404bf20c62d3dc417f08aa3469b1edb1ddb
Binary files /dev/null and b/docs/presentation/images/12.png differ
diff --git a/docs/presentation/images/13.png b/docs/presentation/images/13.png
new file mode 100644
index 0000000000000000000000000000000000000000..931cfe68f354b6a0d15b506306d44e35a1a71d44
Binary files /dev/null and b/docs/presentation/images/13.png differ
diff --git a/docs/presentation/images/14.gif b/docs/presentation/images/14.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f5eef7ad923ea6661be866864bffdf608f330aa6
Binary files /dev/null and b/docs/presentation/images/14.gif differ
diff --git a/docs/presentation/images/bo_accrochage.gif b/docs/presentation/images/bo_accrochage.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bfa156244492632dc351f4c797c093157e66e5f1
Binary files /dev/null and b/docs/presentation/images/bo_accrochage.gif differ
diff --git a/docs/presentation/images/bo_forms.gif b/docs/presentation/images/bo_forms.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9a9b02e33efd8aac40c531cc3db3908c8df08718
Binary files /dev/null and b/docs/presentation/images/bo_forms.gif differ
diff --git a/docs/presentation/images/bo_studio.gif b/docs/presentation/images/bo_studio.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3d660158d5d13f4620f04d35ee40bd61d0afdb9d
Binary files /dev/null and b/docs/presentation/images/bo_studio.gif differ
diff --git a/docs/presentation/images/carto_services.gif b/docs/presentation/images/carto_services.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cafeb4c4ab93b21c3dcdedace30f3450946bb141
Binary files /dev/null and b/docs/presentation/images/carto_services.gif differ
diff --git a/docs/presentation/images/layer_filter.gif b/docs/presentation/images/layer_filter.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ca998164c7b769e365710776c6158270fdef82fb
Binary files /dev/null and b/docs/presentation/images/layer_filter.gif differ
diff --git a/docs/presentation/images/logos/Angular.png b/docs/presentation/images/logos/Angular.png
new file mode 100644
index 0000000000000000000000000000000000000000..68c3644a307650eb58aeee8c5a770139f89a815f
Binary files /dev/null and b/docs/presentation/images/logos/Angular.png differ
diff --git a/docs/presentation/images/logos/GitLab.png b/docs/presentation/images/logos/GitLab.png
new file mode 100644
index 0000000000000000000000000000000000000000..e624589b6318c0f14dcdeb381ad00131da5a3174
Binary files /dev/null and b/docs/presentation/images/logos/GitLab.png differ
diff --git a/docs/presentation/images/logos/MapServer.png b/docs/presentation/images/logos/MapServer.png
new file mode 100644
index 0000000000000000000000000000000000000000..c945587b08856c60a5b5cafef9e8f5613e69c392
Binary files /dev/null and b/docs/presentation/images/logos/MapServer.png differ
diff --git a/docs/presentation/images/logos/apache.png b/docs/presentation/images/logos/apache.png
new file mode 100644
index 0000000000000000000000000000000000000000..5648fab3d4bab775412d1a626f24662e0e2ec4a8
Binary files /dev/null and b/docs/presentation/images/logos/apache.png differ
diff --git a/docs/presentation/images/logos/aws.png b/docs/presentation/images/logos/aws.png
new file mode 100644
index 0000000000000000000000000000000000000000..76ad587552523c00c3655515babd7e66943a5b9b
Binary files /dev/null and b/docs/presentation/images/logos/aws.png differ
diff --git a/docs/presentation/images/logos/bootstrap.png b/docs/presentation/images/logos/bootstrap.png
new file mode 100644
index 0000000000000000000000000000000000000000..35e2bff02ebfbb8c47630c07dce8afadde81578b
Binary files /dev/null and b/docs/presentation/images/logos/bootstrap.png differ
diff --git a/docs/presentation/images/logos/debian.png b/docs/presentation/images/logos/debian.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9db0d1b05def6563b9c20db05732c21a7a19858
Binary files /dev/null and b/docs/presentation/images/logos/debian.png differ
diff --git a/docs/presentation/images/logos/docker.png b/docs/presentation/images/logos/docker.png
new file mode 100644
index 0000000000000000000000000000000000000000..283a0249b8d7aeb6d3079ca25036e51d68c962d4
Binary files /dev/null and b/docs/presentation/images/logos/docker.png differ
diff --git a/docs/presentation/images/logos/ls.png b/docs/presentation/images/logos/ls.png
new file mode 100644
index 0000000000000000000000000000000000000000..98082e9b4bb31fd3b48173ad64e374d5d101da5b
Binary files /dev/null and b/docs/presentation/images/logos/ls.png differ
diff --git a/docs/presentation/images/logos/ol.png b/docs/presentation/images/logos/ol.png
new file mode 100644
index 0000000000000000000000000000000000000000..860560bc02ba61ad462c18397675abbb8d4298fc
Binary files /dev/null and b/docs/presentation/images/logos/ol.png differ
diff --git a/docs/presentation/images/logos/osm.png b/docs/presentation/images/logos/osm.png
new file mode 100644
index 0000000000000000000000000000000000000000..96ff2f770b04cd3fcb79c8e71c5ecac882c09015
Binary files /dev/null and b/docs/presentation/images/logos/osm.png differ
diff --git a/docs/presentation/images/logos/postgres.png b/docs/presentation/images/logos/postgres.png
new file mode 100644
index 0000000000000000000000000000000000000000..cae968f6ff77f7481ac986bd7d5a6d7f41193547
Binary files /dev/null and b/docs/presentation/images/logos/postgres.png differ
diff --git a/docs/presentation/images/logos/ubuntu.png b/docs/presentation/images/logos/ubuntu.png
new file mode 100644
index 0000000000000000000000000000000000000000..72a2f22b6b0780cb8a5801b0e8ed1567ae5fd95b
Binary files /dev/null and b/docs/presentation/images/logos/ubuntu.png differ
diff --git a/docs/presentation/images/logos/windows.png b/docs/presentation/images/logos/windows.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f0a27ae8962f3434a6c7bb2546608ec0a55d6e4
Binary files /dev/null and b/docs/presentation/images/logos/windows.png differ
diff --git a/docs/presentation/images/mapserver.gif b/docs/presentation/images/mapserver.gif
new file mode 100644
index 0000000000000000000000000000000000000000..35d339738563cf9ed8c7f4ae23395a0018c75e20
Binary files /dev/null and b/docs/presentation/images/mapserver.gif differ
diff --git a/docs/presentation/images/private_wms_1.jpg b/docs/presentation/images/private_wms_1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4bb1c727f2d0a7ea1c851541b39d7a2f2a0b1d32
Binary files /dev/null and b/docs/presentation/images/private_wms_1.jpg differ
diff --git a/docs/presentation/images/private_wms_2.jpg b/docs/presentation/images/private_wms_2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..89aaae4396160f95cacf6b2e1e6948fb432e088e
Binary files /dev/null and b/docs/presentation/images/private_wms_2.jpg differ
diff --git a/docs/presentation/images/query_bo.jpg b/docs/presentation/images/query_bo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0e3b74dbfa37b3807ca679181c7e2270f417a3a8
Binary files /dev/null and b/docs/presentation/images/query_bo.jpg differ
diff --git a/docs/presentation/images/query_getfeatureinfo.jpg b/docs/presentation/images/query_getfeatureinfo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e12d0a4f2a063860ad521c90c15985026ea7fc59
Binary files /dev/null and b/docs/presentation/images/query_getfeatureinfo.jpg differ
diff --git a/docs/presentation/images/vmap.gif b/docs/presentation/images/vmap.gif
new file mode 100644
index 0000000000000000000000000000000000000000..692ca00a60f4170e017ef836077e3bab97ad67f3
Binary files /dev/null and b/docs/presentation/images/vmap.gif differ
diff --git a/docs/presentation/presentation.md b/docs/presentation/presentation.md
new file mode 100644
index 0000000000000000000000000000000000000000..a5e747ed4c0d6636806cca13e4078e33be758019
--- /dev/null
+++ b/docs/presentation/presentation.md
@@ -0,0 +1,166 @@
+
+# vMap
+
+vMap is a WebGIS OpenSource software, based on most known and powerfull technologies :
+
+* **PostgreSQL/PostGIS**
+* **Apache**
+* **MapServer**
+* **OpenLayers 3**
+* AngularJS
+* Bootstrap
+* LessCSS
+* etc.
+
+It is a WEB on premise program witch indicates each person who want to use it can install it on it's own server.
+
+![](./images/vmap.gif)
+
+
+## 1. Using as a WebMapping software
+
+As a WebMapping software vMap contains the basic features
+
+#### User authentification
+
+Using PostgreSQL, LDAP or even Active Directory, the admin can handle rights management, user groups etc.
+
+#### Using external cartographical services
+
+The first role of each WebMapping software is to use external data to create maps, on vMap the user can use the following formats to create layers, reorder them and create maps.
+
+* WMS, WMTS, TMS, XYZ, Bing, GPX, GeoJSON, KML, TopoJSON, etc.
+
+![](./images/carto_services.gif)
+
+
+## 2. Creating WMS services with MapServer
+
+Using external data is great but using your own data is always better, vMap incorporates a MapServer module witch allows you to create layers based on PostgreSQL conections.
+
+To create layers an interactive form allows you to chose a table and create the layer style using MapServer MapFile style.
+
+### 2.1. Public WMS services
+
+The fist way to do it is using a public PostgreSQL connection to create layers, then everyone could see your data on vMap an even on others cartographical softwares (QGIS, Leaflet etc..)
+
+![](./images/mapserver.gif)
+
+### 2.2. Private WMS services
+
+When using confidential data, public services should not be the good way. To handle it vMap proposes you to use privates WMS services.
+
+The good thing aboud this feature is that not only the layer will be access protected, the layer is also filtered by the users PostgreSQL rights.
+
+As you can see on the example below two users on the same layer see different data.
+
+**User 1**
+
+![](./images/private_wms_1.jpg)
+
+**User 2**
+
+![](./images/private_wms_2.jpg)
+
+
+### 2.3. Filtrable layers
+
+An other good thing aboud using MapServer module layers is the filter feature, using the **studio** (witch is exposed on the nexts chapters) the administrator can create filter forms on the interesting layers.
+
+The when the user is uning the map he can easily filter the viewed data.
+
+![](./images/layer_filter.gif)
+
+## 3. Query data
+
+There is two ways to query yous data, the first (the normalized) is to use the WMS GetFeatureInfo protocol.
+This method uses a HTML output format and allows the user to see the data on a table.
+
+![](./images/query_getfeatureinfo.jpg)
+
+To use more advanced features like editing, formamating, export etc. you can use the second way : a proper format called **business objects**
+
+![](./images/query_bo.jpg)
+
+
+## 4. Business objects
+
+Business objects avec very advanced on proposes a lot more features than GetFeatureInfo.
+
+### 4.1. Customizable forms
+
+Those are the forms for update, display or insert data, they are fully customizable and allows the following.
+
+* 30+ attributes types
+* External data
+* 1 to many relation tables
+* Tabs
+* Customizable JavaScript
+
+![](./images/bo_forms.gif)
+
+
+### 4.2. Studio
+
+Creating complex forms without being a developper is on of the most important goals of vMap, to do this it incorporates a powerfull studio that allows you to add and manage your forms fields.
+
+![](./images/bo_studio.gif)
+
+### 4.3. Other features
+
+Business objects have a lot more features
+
+* Attribute selection
+* Data export (JSON, CSV, MS-Excel)
+* PDF/.doc reports
+* Real time data
+
+![](./images/bo_accrochage.gif)
+
+
+## 5. Smartphone mode
+
+vMap is also available for mobile devices using a simple browser
+
+You will be able to display, insert and edit data in the same way you do using your computer. A **GPS** connection is also available to draw features using your current position.
+
+| ![](../images/index/mobile_measure.png) | ![](../images/index/mobile_cadastre.png) | ![](../images/index/mobile_saisie.png) |
+|:------------:|:-------------:|:-------------:|
+| Display data |  Query layers | Draw features |
+
+
+## 6. Contribution
+
+As an OpenSource project everyone can contribute to the project event without developping skills.
+
+#### Creating Maps (store)
+
+vMap has import/export features that allows you to exchange your maps, data, symology, forms, reports etc. with other users.
+
+To do that go to https://vstore.veremes.net/store/
+
+
+#### Core developping
+
+To contribute on the developping a GitLab project is opened https://gitlab.veremes.net/open-source/vmap
+
+
+## 7. Install
+
+#### Try it
+
+A demo server is available on https://demovmap.veremes.net where you can try all the user features, for administration features you will have to install it.
+
+#### Docker
+
+The most easy way to install vMap is using Docker, vMap is available on docker hub https://hub.docker.com/r/veremes/vmap where you will find an installation documentation.
+
+#### AWS Marketplace
+
+With an AWS account you will be able to create an EC2 using the marketplace vMap AMI.
+
+#### Manual
+
+Or you can install it mannulaly on Debian, Ubuntu or even Windows
+
+https://www.veremes.com/produits/vmap (french)
diff --git a/mkdocs.yml b/mkdocs.yml
index d0983cf91061f5cc592803a84d93969ee2189579..3fdd0b1100ec822c7772c72c322b5a454f5bf0ef 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -11,6 +11,8 @@ theme:
 
 nav:
     - Home: index.md
+    - Presentation: presentation/presentation.md
+    - Available features: available-features/available-features.md
     - First Steps: first-steps/first-steps.md
 
 markdown_extensions:
@@ -20,4 +22,4 @@ markdown_extensions:
     # - def_list
     # - mdx_gh_links:
     #     user: mkdocs
-    #     repo: mkdocs
\ No newline at end of file
+    #     repo: mkdocs