diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
index 26587af82..fc09f180c 100644
--- a/DRAFT_CHANGELOG.md
+++ b/DRAFT_CHANGELOG.md
@@ -1,6 +1,6 @@
 # Extension Geoportail OpenLayers, version 3.0.3
 
-**12/09/2019 : version 3.0.3**
+**24/09/2019 : version 3.0.3**
 > Release Extension Geoportail OpenLayers
 
 ## Summary
@@ -20,7 +20,6 @@
 
 * [Fixed]
 
-    - Ajout de contraintes sur le mode Draggable sur les fenêtres des extensions
     - [dev-workflow] correctifs sur les fichiers Webpack
 
 * [Security]
@@ -30,7 +29,7 @@
 
 # Extension Geoportail Itowns, version 2.2.3
 
-**12/09/2019**
+**24/09/2019**
 > Release Extension Geoportail Itowns
 
 ## Summary
@@ -51,7 +50,7 @@
 
 # Extension Geoportail Leaflet, version 2.1.3
 
-**12/09/2019**
+**24/09/2019**
 > Release Extension Geoportail Leaflet
 
 ## Summary
@@ -67,4 +66,4 @@
 * [Fixed]
 
     - [dev-workflow] correctifs sur les fichiers Webpack
-    - **TODO** [#243](https://github.com/IGNF/geoportal-extensions/issues/243) - gestion de l'import CSS du plugin 'leaflet-draw' en mode module ES6 sous Angular
+    - [#243](https://github.com/IGNF/geoportal-extensions/issues/243) - gestion de l'import CSS du plugin 'leaflet-draw' en mode module ES6 sous Angular
diff --git a/build/scripts/release/geoportal-extensions-itowns-2.2.3.tgz b/build/scripts/release/geoportal-extensions-itowns-2.2.3.tgz
index 5469115f2..f0955757d 100644
Binary files a/build/scripts/release/geoportal-extensions-itowns-2.2.3.tgz and b/build/scripts/release/geoportal-extensions-itowns-2.2.3.tgz differ
diff --git a/build/scripts/release/geoportal-extensions-leaflet-2.1.3.tgz b/build/scripts/release/geoportal-extensions-leaflet-2.1.3.tgz
index 7d438ab3f..b2a1b7b57 100644
Binary files a/build/scripts/release/geoportal-extensions-leaflet-2.1.3.tgz and b/build/scripts/release/geoportal-extensions-leaflet-2.1.3.tgz differ
diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.0.3.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.0.3.tgz
index 7271624c1..93f79a55c 100644
Binary files a/build/scripts/release/geoportal-extensions-openlayers-3.0.3.tgz and b/build/scripts/release/geoportal-extensions-openlayers-3.0.3.tgz differ
diff --git a/build/scripts/release/package-itowns.json b/build/scripts/release/package-itowns.json
index 2d57c0a02..34a3278d8 100644
--- a/build/scripts/release/package-itowns.json
+++ b/build/scripts/release/package-itowns.json
@@ -1,45 +1,45 @@
 {
-   "files" : [
-      "dist/",
-      "src/",
-      "LICENCE.md",
-      "README.md",
-      "package.json"
-   ],
+   "date" : "24/09/2019",
+   "repository" : {
+      "url" : "https://github.com/IGNF/geoportal-extensions.git",
+      "type" : "git"
+   },
    "dependencies" : {
-      "loglevel" : "~1.6.1",
       "three" : "~0.107.0",
-      "proj4" : "2.5.0",
+      "three.meshline" : "~1.2.0",
+      "loglevel" : "~1.6.1",
       "itowns" : "2.13.1",
+      "geoportal-access-lib" : "^2.1.5",
+      "proj4" : "2.5.0",
       "xmldom" : "^0.1.27",
-      "three.meshline" : "~1.2.0",
       "request" : "^2.83.0",
-      "sortablejs" : "1.8.4",
-      "geoportal-access-lib" : "2.1.4"
+      "sortablejs" : "1.8.4"
    },
    "scripts" : {},
-   "description" : "French Geoportal Extensions for iTowns",
-   "repository" : {
-      "url" : "https://github.com/IGNF/geoportal-extensions.git",
-      "type" : "git"
-   },
-   "date" : "12/09/2019",
-   "version" : "2.2.3",
+   "main" : "dist/GpPluginItowns-src.js",
+   "author" : "IGNF",
    "bundleDependencies" : [],
-   "bugs" : {},
    "devDependencies" : {},
+   "peerDependencies" : {},
+   "files" : [
+      "dist/",
+      "src/",
+      "LICENCE.md",
+      "README.md",
+      "package.json"
+   ],
    "keywords" : [
       "geoportail",
       "plugin",
       "javascript",
       "Itowns"
    ],
-   "peerDependencies" : {},
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
+   "directories" : {},
+   "version" : "2.2.3",
+   "description" : "French Geoportal Extensions for iTowns",
    "module" : "src/Itowns/index.js",
-   "main" : "dist/GpPluginItowns-src.js",
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
    "name" : "geoportal-extensions-itowns",
-   "license" : "CECILL-B",
-   "author" : "IGNF",
-   "directories" : {}
+   "bugs" : {},
+   "license" : "CECILL-B"
 }
diff --git a/build/scripts/release/package-leaflet.json b/build/scripts/release/package-leaflet.json
index 103dc11c0..c5a154def 100644
--- a/build/scripts/release/package-leaflet.json
+++ b/build/scripts/release/package-leaflet.json
@@ -1,28 +1,27 @@
 {
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-leaflet.html",
+   "author" : "IGNF",
    "directories" : {},
    "version" : "2.1.3",
+   "peerDependencies" : {},
+   "bundleDependencies" : [],
+   "date" : "24/09/2019",
    "license" : "CECILL-B",
-   "scripts" : {},
-   "dependencies" : {
-      "leaflet" : "1.3.1",
-      "geoportal-access-lib" : "2.1.5",
-      "proj4" : "2.5.0",
-      "leaflet-draw" : "1.0.2",
-      "loglevel" : "~1.6.1",
-      "sortablejs" : "1.8.4",
-      "proj4leaflet" : "~1.0.2"
-   },
-   "author" : "IGNF",
+   "files" : [
+      "dist/",
+      "src/",
+      "LICENCE.md",
+      "README.md",
+      "package.json"
+   ],
+   "description" : "French Geoportal Extension for Leaflet",
+   "bugs" : {},
    "module" : "src/Leaflet/index.js",
+   "devDependencies" : {},
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-leaflet.html",
    "repository" : {
       "url" : "https://github.com/IGNF/geoportal-extensions.git",
       "type" : "git"
    },
-   "main" : "dist/GpPluginLeaflet-src.js",
-   "date" : "12/09/2019",
-   "name" : "geoportal-extensions-leaflet",
-   "bugs" : {},
    "keywords" : [
       "geoportail",
       "plugin",
@@ -30,15 +29,16 @@
       "leaflet",
       "publish"
    ],
-   "files" : [
-      "dist/",
-      "src/",
-      "LICENCE.md",
-      "README.md",
-      "package.json"
-   ],
-   "description" : "French Geoportal Extension for Leaflet",
-   "bundleDependencies" : [],
-   "devDependencies" : {},
-   "peerDependencies" : {}
+   "name" : "geoportal-extensions-leaflet",
+   "scripts" : {},
+   "main" : "dist/GpPluginLeaflet-src.js",
+   "dependencies" : {
+      "geoportal-access-lib" : "^2.1.5",
+      "proj4" : "2.5.0",
+      "leaflet-draw" : "1.0.2",
+      "loglevel" : "~1.6.1",
+      "leaflet" : "1.3.1",
+      "sortablejs" : "1.8.4",
+      "proj4leaflet" : "~1.0.2"
+   }
 }
diff --git a/build/scripts/release/package-openlayers.json b/build/scripts/release/package-openlayers.json
index 5df75ca58..f890107f8 100644
--- a/build/scripts/release/package-openlayers.json
+++ b/build/scripts/release/package-openlayers.json
@@ -1,11 +1,4 @@
 {
-   "repository" : {
-      "type" : "git",
-      "url" : "https://github.com/IGNF/geoportal-extensions.git"
-   },
-   "bugs" : {},
-   "author" : "IGNF",
-   "main" : "dist/GpPluginOpenLayers-src.js",
    "files" : [
       "dist/",
       "src/",
@@ -13,10 +6,7 @@
       "README.md",
       "package.json"
    ],
-   "name" : "geoportal-extensions-openlayers",
-   "description" : "French Geoportal Extensions for OpenLayers",
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
-   "bundleDependencies" : [],
+   "bugs" : {},
    "keywords" : [
       "geoportail",
       "plugin",
@@ -24,22 +14,32 @@
       "OpenLayers"
    ],
    "scripts" : {},
+   "directories" : {},
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
+   "license" : "CECILL-B",
+   "module" : "src/OpenLayers/index.js",
+   "date" : "24/09/2019",
+   "peerDependencies" : {},
+   "author" : "IGNF",
+   "name" : "geoportal-extensions-openlayers",
+   "description" : "French Geoportal Extensions for OpenLayers",
+   "repository" : {
+      "type" : "git",
+      "url" : "https://github.com/IGNF/geoportal-extensions.git"
+   },
+   "version" : "3.0.3",
+   "devDependencies" : {},
+   "main" : "dist/GpPluginOpenLayers-src.js",
+   "bundleDependencies" : [],
    "dependencies" : {
-      "ol" : "^5.3.0",
+      "geoportal-access-lib" : "^2.1.5",
       "xmldom" : "^0.1.27",
       "sortablejs" : "1.8.4",
-      "request" : "^2.83.0",
-      "geoportal-access-lib" : "2.1.5",
       "ol-mapbox-style" : "^4.2.1",
-      "loglevel" : "~1.6.1",
+      "request" : "^2.83.0",
+      "proj4" : "2.5.0",
       "eventbusjs" : "^0.2.0",
-      "proj4" : "2.5.0"
-   },
-   "directories" : {},
-   "license" : "CECILL-B",
-   "peerDependencies" : {},
-   "devDependencies" : {},
-   "module" : "src/OpenLayers/index.js",
-   "version" : "3.0.3",
-   "date" : "12/09/2019"
+      "ol" : "^5.3.0",
+      "loglevel" : "~1.6.1"
+   }
 }
diff --git a/build/webpack/webpack.config.leaflet.js b/build/webpack/webpack.config.leaflet.js
index 9e9fe5a91..b504af7a5 100644
--- a/build/webpack/webpack.config.leaflet.js
+++ b/build/webpack/webpack.config.leaflet.js
@@ -215,13 +215,12 @@ module.exports = (env, argv) => {
             /** REPLACEMENT DE VALEURS */
             new ReplaceWebpackPlugin(
                 [
-                    // {
-                    //     partten : /__GPLEAFLETEXTVERSION__/g,
-                    //     /** replacement de la clef __VERSION__ par la version du package */
-                    //     replacement : function () {
-                    //         return pkg.leafletExtVersion;
-                    //     }
-                    // },
+                    {
+                        partten : /__COMPILATION__/g,
+                        replacement : function () {
+                            return true;
+                        }
+                    },
                     {
                         partten : /__DATE__/g,
                         /** replacement de la clef __DATE__ par la date du build */
diff --git a/package.json b/package.json
index cf42cfbc6..429825038 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "geoportal-extensions",
   "description": "French Geoportal Extensions for OpenLayers, Leaflet and iTowns libraries",
   "version": "2.2.3",
-  "date": "12/09/2019",
+  "date": "24/09/2019",
   "leafletExtName": "French Geoportal Extension for Leaflet",
   "leafletExtVersion": "2.1.3",
   "olExtName": "French Geoportal Extension for OpenLayers",
@@ -72,7 +72,7 @@
   "homepage": "https://github.com/IGNF/geoportal-extensions#readme",
   "dependencies": {
     "eventbusjs": "^0.2.0",
-    "geoportal-access-lib": "2.1.5",
+    "geoportal-access-lib": "^2.1.5",
     "itowns": "2.13.1",
     "leaflet": "1.3.1",
     "leaflet-draw": "1.0.2",
diff --git a/src/Common/Controls/DrawingDOM.js b/src/Common/Controls/DrawingDOM.js
index 61db4dd45..4345aeab6 100644
--- a/src/Common/Controls/DrawingDOM.js
+++ b/src/Common/Controls/DrawingDOM.js
@@ -140,9 +140,10 @@ var DrawingDOM = {
 
     /**
      * Creates drawing tools section.
+     *
+     * @returns {DOMElement} DOM element
      */
     _createDrawingToolsSections : function () {
-
         var tools = [];
 
         this.dtOptions = {};
diff --git a/src/Common/Controls/MousePositionDOM.js b/src/Common/Controls/MousePositionDOM.js
index d4bcfafd5..52d233b6c 100644
--- a/src/Common/Controls/MousePositionDOM.js
+++ b/src/Common/Controls/MousePositionDOM.js
@@ -94,18 +94,10 @@ var MousePositionDOM = {
 
     /**
      * mouse position panel
-     * @param {Boolean} [displayAltitude=true] - specifies if the altitude panel must be displayed
-     * @param {Boolean} [displayCoordinates=true] - specifies if the coordinates panel must be displayed
-     * @param {Boolean} [editCoordinates=false] - specifies if the coordinates edition is allowed
-     * @param {Boolean} [currentProjectionUnits] - specifies if the current projection units
-     *
-     * FIXME
-     * don't call this._createMousePositionSettingsElement
      *
      * @returns {DOMElement} DOM element
      */
-    _createMousePositionPanelElement : function (displayAltitude, displayCoordinates, editCoordinates, currentProjectionUnits) {
-
+    _createMousePositionPanelElement : function () {
         var panel = document.createElement("div");
         panel.id = this._addUID("GPmousePositionPanel");
         panel.className = "GPpanel";
@@ -188,7 +180,7 @@ var MousePositionDOM = {
         displayAltitude = (typeof displayAltitude === "undefined") ? true : displayAltitude;
         displayCoordinates = (typeof displayCoordinates === "undefined") ? true : displayCoordinates;
         editCoordinates = (typeof editCoordinates === "undefined") ? false : editCoordinates;
-        
+
         var container = document.createElement("div");
         container.id = this._addUID("GPmousePositionBasicPanel");
 
diff --git a/src/Common/Utils/Draggable.js b/src/Common/Utils/Draggable.js
index 5dba0e516..61920f09e 100644
--- a/src/Common/Utils/Draggable.js
+++ b/src/Common/Utils/Draggable.js
@@ -15,20 +15,19 @@ var Draggable = {
     *   // CSS :
     *       // #element { position: absolute; }
     *   // HTML :
-    *       // <div id="element">
-    *       //   <div id="header">
-    *       //     <div/>
-    *       //     <div/>
-    *       //     <div/>
-    *       //   <div/>
-    *       // <div/>
+    *       // <div id="container">
+    *       //   <div id="element">
+    *       //     <div id="header"/>
+    *       //      <div/> ...
+    *       //     </div>
+    *       //   </div>
+    *       // </div>
     *   // JS :
     *       var element = document.getElementById("element");
-    *       var header  = document.getElementById("header");
     *       Draggable.dragElement(element, header, container);
     */
     dragElement : function (element, header, container) {
-        var offsetX, offsetY, constraints;
+        var offsetX, offsetY;
 
         var isDragReady = false;
 
@@ -38,26 +37,21 @@ var Draggable = {
         };
 
         if (header) {
-            header.onmousedown = dragMouseDown;
+            header.addEventListener("mousedown", dragMouseDown, true);
         } else {
-            element.onmousedown = dragMouseDown;
+            element.addEventListener("mousedown", dragMouseDown, true);
         }
 
-        if (!container) {
-            constraints = {
-                width : document.body.clientWidth,
-                height : document.body.clientHeight,
-                top : document.body.offsetTop,
-                left : document.body.offsetLeft
-            };
-        } else {
-            constraints = {
-                width : container.clientWidth,
-                height : container.clientHeight,
-                top : container.offsetTop,
-                left : container.offsetLeft
-            };
-        }
+        // TODO mettre en place les contraintes
+        // var constraints = {};
+        // if (container) {
+        //     constraints = {
+        //         width : container.clientWidth,
+        //         height : container.clientHeight,
+        //         top : container.offsetTop,
+        //         left : container.offsetLeft
+        //     };
+        // }
 
         function dragMouseDown (e) {
             e = e || window.event;
@@ -65,54 +59,53 @@ var Draggable = {
 
             isDragReady = true;
 
-            // get the mouse cursor position at startup:
-            dragoffset.x = e.clientX - element.offsetLeft;
-            dragoffset.y = e.clientY - element.offsetTop;
-            logger.trace("dragoffset", dragoffset.x, dragoffset.y);
+            // get the mouse cursor position at startup
+            e._pageX = e._pageX || e.clientX + (document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft);
+            e._pageY = e._pageY || e.clientY + (document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop);
+            dragoffset.x = e._pageX - element.offsetLeft;
+            dragoffset.y = e._pageY - element.offsetTop;
 
-            document.onmouseup = closeDragElement;
-            document.onmousemove = elementDrag;
+            document.addEventListener("mouseup", closeDragElement, true);
+            document.addEventListener("mousemove", elementDrag, true);
         }
 
         function closeDragElement () {
             /* stop moving when mouse button is released: */
             isDragReady = false;
-            document.onmouseup = null;
-            document.onmousemove = null;
+            document.removeEventListener("mouseup", closeDragElement, true);
+            document.removeEventListener("mousemove", elementDrag, true);
         }
 
         function elementDrag (e) {
             e = e || window.event;
-            e.preventDefault();
+            // e.preventDefault();
 
             // cf. https://jsfiddle.net/nbbg08mg/2/
             if (isDragReady) {
-                // calculate the new cursor position:
-                var parentLeft = container ? element.parentElement.offsetLeft : 0;
-                var parentTop = container ? element.parentElement.offsetTop : 0;
+                e._pageX = e._pageX || e.clientX + (document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft);
+                e._pageY = e._pageY || e.clientY + (document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop);
+
+                var parentLeft = element.parentElement.offsetLeft;
+                var parentTop = element.parentElement.offsetTop;
                 logger.trace("parent offset", parentLeft, parentTop);
 
                 // left/right constraint
-                if (e.clientX - dragoffset.x < -parentLeft) {
-                    logger.trace("minx", e.clientX - dragoffset.x);
-                    offsetX = -parentLeft;
-                } else if (e.clientX - dragoffset.x > constraints.width - constraints.left - element.clientWidth) {
-                    logger.trace("maxx:", e.clientX - dragoffset.x);
-                    offsetX = constraints.width - element.clientWidth - constraints.left;
+                if (e._pageX - dragoffset.x < 0 - parentLeft) {
+                    offsetX = 0 - parentLeft;
+                } else if (e._pageX - dragoffset.x + element.clientWidth > document.body.clientWidth) {
+                    offsetX = document.body.clientWidth - element.clientWidth;
                 } else {
-                    offsetX = e.clientX - dragoffset.x;
+                    offsetX = e._pageX - dragoffset.x;
                 }
                 logger.trace("left/right constraint", offsetX);
 
                 // top/bottom constraint
-                if (e.clientY - dragoffset.y < -parentTop) {
-                    logger.trace("miny:", e.clientY - dragoffset.y);
-                    offsetY = -parentTop;
-                } else if (e.clientY - dragoffset.y > constraints.height - constraints.top - element.clientHeight) {
-                    logger.trace("maxy:", e.clientY - dragoffset.y);
-                    offsetY = constraints.height - element.clientHeight - constraints.top;
+                if (e._pageY - dragoffset.y < 0 - parentTop) {
+                    offsetY = 0 - parentTop;
+                } else if (e._pageY - dragoffset.y + element.clientHeight > document.body.clientHeight) {
+                    offsetY = document.body.clientHeight - element.clientHeight;
                 } else {
-                    offsetY = e.clientY - dragoffset.y;
+                    offsetY = e._pageY - dragoffset.y;
                 }
                 logger.trace("top/bottom constraint", offsetY);
 
diff --git a/src/Leaflet/Layers/WMS.js b/src/Leaflet/Layers/WMS.js
index 3be74f7bf..eaf4937f7 100644
--- a/src/Leaflet/Layers/WMS.js
+++ b/src/Leaflet/Layers/WMS.js
@@ -15,7 +15,7 @@ var logger = Logger.getLogger("wms");
 
 /**
  * @namespace
- * @alias L.geoportalLayer.WMS
+ * @alias L.geoportalLayers.WMS
  * @classdesc
  *
  * Leaflet Layer Class for Geoportal or INSPIRE WMS Layers.
diff --git a/src/Leaflet/Layers/WMTS.js b/src/Leaflet/Layers/WMTS.js
index 2add0bf8d..32570c846 100644
--- a/src/Leaflet/Layers/WMTS.js
+++ b/src/Leaflet/Layers/WMTS.js
@@ -14,7 +14,7 @@ var logger = Logger.getLogger("wmts");
 
 /**
  * @namespace
- * @alias L.geoportalLayer.WMTS
+ * @alias L.geoportalLayers.WMTS
  * @classdesc
  *
  * Leaflet Layer Class for Geoportal WMTS Layers.
diff --git a/src/Leaflet/Styles.js b/src/Leaflet/Styles.js
index 95fdeadd6..ebd725cfa 100644
--- a/src/Leaflet/Styles.js
+++ b/src/Leaflet/Styles.js
@@ -1,3 +1,5 @@
+// en module ES6, on n'a pas besoin de ces CSS..., on utile le CSS géneré avec WebPack,
+// l'utilisation de ces imports est utile lors de la compilation du bundle
 import "./CSS/GPgeneralWidgetLeaflet.css";
 
 import "./CSS/Controls/ElevationPath/GPelevationPathLeaflet.css";
@@ -9,5 +11,7 @@ import "./CSS/Controls/ReverseGeocoding/GPreverseGeocodingLeaflet.css";
 import "./CSS/Controls/Route/GProuteLeaflet.css";
 import "./CSS/Controls/SearchEngine/GPsearchEngineLeaflet.css";
 
-// FIXME how to do with plugin leaflet-draw !?
-import "../../node_modules/leaflet-draw/dist/leaflet.draw-src.css";
+// plugin leaflet-draw !
+if ("__COMPILATION__".match(/true/)) {
+    require("../../node_modules/leaflet-draw/dist/leaflet.draw-src.css");
+}
diff --git a/src/Leaflet/index.js b/src/Leaflet/index.js
index 1c983bf9c..672005e16 100644
--- a/src/Leaflet/index.js
+++ b/src/Leaflet/index.js
@@ -43,6 +43,8 @@ import "./Styles";
 import Controls from "./Controls/Controls";
 import ElevationPath from "./Controls/ElevationPath";
 import Layers from "./Layers/Layers";
+// import WMTS from "./Layers/WMTS";
+// import WMS from "./Layers/WMS";
 
 import CRS from "./CRS/CRS";
 
@@ -101,6 +103,9 @@ export { default as MathUtils } from "../Common/Utils/MathUtils";
 
 // creation du namespace pour les extensions leaflet
 L.geoportalLayer = Layers; // WMS et WMTS
+// L.geoportalLayers = {};
+// L.geoportalLayers.WMTS = WMTS;
+// L.geoportalLayers.WMS = WMS;
 L.geoportalControl = Controls; // IsoChrone, SearchEngine, ...
 
 L.geoportalControl.ElevationPath.DISPLAY_PROFILE_LIB_D3 = ElevationPath.DISPLAY_PROFILE_LIB_D3;
diff --git a/src/OpenLayers/CSS/Controls/MousePosition/GPmousePositionOpenLayers.css b/src/OpenLayers/CSS/Controls/MousePosition/GPmousePositionOpenLayers.css
index 21667094c..a95370537 100644
--- a/src/OpenLayers/CSS/Controls/MousePosition/GPmousePositionOpenLayers.css
+++ b/src/OpenLayers/CSS/Controls/MousePosition/GPmousePositionOpenLayers.css
@@ -15,7 +15,9 @@ span[id^=GPshowMousePositionOpen] {
 
 div[id^=GPmousePositionPanel-] {
     /* on desactive le mode draggable de la fenêtre : */
-    /* position: absolute;  */
+    position: absolute;
+    left: 10px;
+    top: calc(-8px + -118px); /* FIXME !?*/
 }
 
 div[id^=GPmousePositionPanelClose]  {
diff --git a/src/OpenLayers/Controls/Measures/MeasureArea.js b/src/OpenLayers/Controls/Measures/MeasureArea.js
index 9b38011b9..d8bf70322 100644
--- a/src/OpenLayers/Controls/Measures/MeasureArea.js
+++ b/src/OpenLayers/Controls/Measures/MeasureArea.js
@@ -259,8 +259,6 @@ var MeasureArea = (function (Control) {
     MeasureArea.prototype.format = function (polygon) {
         logger.trace("call MeasureArea::format()");
 
-        var map = this.getMap();
-
         var measure;
         if (this.options.geodesic) {
             var geom = polygon.clone();
diff --git a/src/OpenLayers/Controls/MousePosition.js b/src/OpenLayers/Controls/MousePosition.js
index d566492ef..3d9ff7248 100644
--- a/src/OpenLayers/Controls/MousePosition.js
+++ b/src/OpenLayers/Controls/MousePosition.js
@@ -497,7 +497,7 @@ var MousePosition = (function (Control) {
         this.options.draggable = (options.draggable !== undefined) ? options.draggable : false;
         /** {Boolean} specify if MousePosition control is draggable (true) or not (false) */
         this.draggable = this.options.draggable;
-        
+
         // position marker
         this._markerOverlay = null;
         this._markerUrl = null;
diff --git a/src/OpenLayers/Controls/ReverseGeocode.js b/src/OpenLayers/Controls/ReverseGeocode.js
index 6f0508066..c5ede949e 100644
--- a/src/OpenLayers/Controls/ReverseGeocode.js
+++ b/src/OpenLayers/Controls/ReverseGeocode.js
@@ -169,7 +169,6 @@ var ReverseGeocode = (function (Control) {
                     map.getTargetElement()
                 );
             }
-
         } else {
             var _map = this.getMap();
             // on remet à zéro = on efface les géométries + interactions + valeurs stockées
diff --git a/src/OpenLayers/Controls/Route.js b/src/OpenLayers/Controls/Route.js
index 014f03320..a171135f5 100644
--- a/src/OpenLayers/Controls/Route.js
+++ b/src/OpenLayers/Controls/Route.js
@@ -190,7 +190,6 @@ var Route = (function (Control) {
                     map.getTargetElement()
                 );
             }
-
         }
 
         // on appelle la méthode setMap originale d'OpenLayers
diff --git a/test/spec/Common/Controls/test-common-controls-drawingdom.js b/test/spec/Common/Controls/test-common-controls-drawingdom.js
index c5acc7251..7286af842 100644
--- a/test/spec/Common/Controls/test-common-controls-drawingdom.js
+++ b/test/spec/Common/Controls/test-common-controls-drawingdom.js
@@ -57,11 +57,19 @@ describe("-- Test Drawing DOM --", function () {
         expect(DrawingDOM._createShowDrawingPictoElement().outerHTML).to.be.equal('<label id="GPshowDrawingPicto" class="GPshowAdvancedToolPicto" for="GPshowDrawing" title="Annoter la carte"><span id="GPshowDrawingOpen" class="GPshowAdvancedToolOpen"></span></label>');
     });
     it('_createDrawingPanelElement', function () {
-        expect(DrawingDOM._createDrawingPanelElement().outerHTML).to.be.equal('<div id="GPdrawingPanel" class="GPpanel"><div class="GPpanelHeader"><div class="GPpanelTitle">Annoter la carte</div><div id="GPdrawingPanelClose" class="GPpanelClose" title="Fermer le panneau"></div></div><div class="drawing-tool-section"><p class="drawing-tool-section-title">Outils de création</p><ul class="drawing-tools-flex-display"><li class="drawing-tool" id="drawing-tool-point" title="Placer des points"></li><li class="drawing-tool" id="drawing-tool-polygon" title="Dessiner des polygones"></li></ul></div><div class="drawing-tool-section"><p class="drawing-tool-section-title">Outils d\'édition</p><ul class="drawing-tools-flex-display"><li class="drawing-tool" id="drawing-tool-remove" title="Supprimer des objets"></li></ul></div><div class="drawing-tool-section drawing-tools-flex-display"><button title="Exporter en KML" class="tool-form-submit drawing-button" id="drawing-export" type="button">Exporter</button></div></div>');
+        expect(DrawingDOM._createDrawingPanelElement().outerHTML).to.be.equal('<div id="GPdrawingPanel" class="GPpanel"></div>');
     });
     it('_createDrawingPanelHeaderElement', function () {
         expect(DrawingDOM._createDrawingPanelHeaderElement().outerHTML).to.be.equal('<div class="GPpanelHeader"><div class="GPpanelTitle">Annoter la carte</div><div id="GPdrawingPanelClose" class="GPpanelClose" title="Fermer le panneau"></div></div>');
     });
+    it('_createDrawingToolsSections', function () {
+        var container = document.createElement("div");
+        var tools = DrawingDOM._createDrawingToolsSections();
+        for (var i = 0; i < tools.length; i++) {
+            container.appendChild(tools[i]);
+        }
+        expect(container.outerHTML).to.be.equal('<div><div class="drawing-tool-section"><p class="drawing-tool-section-title">Outils de création</p><ul class="drawing-tools-flex-display"><li class="drawing-tool" id="drawing-tool-point" title="Placer des points"></li><li class="drawing-tool" id="drawing-tool-polygon" title="Dessiner des polygones"></li></ul></div><div class="drawing-tool-section"><p class="drawing-tool-section-title">Outils d\'édition</p><ul class="drawing-tools-flex-display"><li class="drawing-tool" id="drawing-tool-remove" title="Supprimer des objets"></li></ul></div><div class="drawing-tool-section drawing-tools-flex-display"><button title="Exporter en KML" class="tool-form-submit drawing-button" id="drawing-export" type="button">Exporter</button></div></div>');
+    });
     it('_createDrawingToolSection', function () {
         var sectionLabel = "Outils de création", panelType = "draw";
         expect(DrawingDOM._createDrawingToolSection(sectionLabel, panelType).outerHTML).to.be.equal('<div class="drawing-tool-section"><p class="drawing-tool-section-title">Outils de création</p><ul class="drawing-tools-flex-display"><li class="drawing-tool" id="drawing-tool-point" title="Placer des points"></li><li class="drawing-tool" id="drawing-tool-polygon" title="Dessiner des polygones"></li></ul></div>');
diff --git a/test/spec/openlayers/Controls/test_ol-controls-drawing.js b/test/spec/openlayers/Controls/test_ol-controls-drawing.js
index ad96ee14d..dc5bd7f29 100644
--- a/test/spec/openlayers/Controls/test_ol-controls-drawing.js
+++ b/test/spec/openlayers/Controls/test_ol-controls-drawing.js
@@ -45,7 +45,7 @@ describe("-- Test Plugin OpenLayers Drawing --", function () {
         div = null;
     });
 
-    it('I should add a control Isochron into map (with default parameters)', function () {
+    it('I should add a control Drawing into map (with default parameters)', function () {
 
         var drawing = new Drawing();
 
@@ -65,7 +65,7 @@ describe("-- Test Plugin OpenLayers Drawing --", function () {
         expect(map.getTargetElement().querySelector("div[id^=\"GPdrawing\"]")).to.be.ok;
 
     });
-    it('I should remove a control Isochron into map (with default parameters)', function () {
+    it('I should remove a control Drawing into map (with default parameters)', function () {
 
         var drawing = new Drawing();