diff --git a/resources/library/interactivities/associer_images.wgt/index.html b/resources/library/interactivities/associer_images.wgt/index.html
index fa1525ce..0a545839 100644
--- a/resources/library/interactivities/associer_images.wgt/index.html
+++ b/resources/library/interactivities/associer_images.wgt/index.html
@@ -14,8 +14,10 @@
                     lang = sankore.locale().substr(0,2);    
                 } else 
                     lang = "en";
-                if(lang == "en")
+                if(lang == "en"){
+                    sankore.enableDropOnWidget(false);
                     start();
+                }
                 else{
                     returnStatus(lang);
                 }
diff --git a/resources/library/interactivities/associer_images.wgt/js/script.js b/resources/library/interactivities/associer_images.wgt/js/script.js
index 99058c9b..c850c3cb 100644
--- a/resources/library/interactivities/associer_images.wgt/js/script.js
+++ b/resources/library/interactivities/associer_images.wgt/js/script.js
@@ -2,7 +2,8 @@ var sankoreLang = {
     display: "Display", 
     edit: "Edit", 
     short_desc: "Select the number \"three\".", 
-    add: "Add new block"
+    add: "Add new block",
+    enter: "Enter your condition here ..."
 };
 
 //main function
@@ -22,15 +23,16 @@ function start(){
     else 
         showExample();
     //events
-    $("body").live("mouseout",function(){
-        if(event.target.tagName == "BODY")
-            if(window.sankore)
-                exportData();
-    })
+    if (window.widget) {
+        window.widget.onleave = function(){
+            exportData();
+        }
+    }
     
     $("#display, #edit").click(function(event){
         if(this.id == "display"){
             if(!$(this).hasClass("selected")){
+                sankore.enableDropOnWidget(false);
                 $(this).addClass("selected");
                 $("#display_img").removeClass("red_point").addClass("green_point");
                 $("#edit_img").removeClass("green_point").addClass("red_point");
@@ -131,6 +133,7 @@ function start(){
             }
         } else {            
             if(!$(this).hasClass("selected")){
+                sankore.enableDropOnWidget(true);
                 $(this).addClass("selected");
                 $("#edit_img").removeClass("red_point").addClass("green_point");
                 $("#display_img").removeClass("green_point").addClass("red_point");
@@ -567,7 +570,7 @@ function addContainer(){
     
     var close = $("<div class='close_cont'>").appendTo(container);
     var number = $("<div class='number_cont'>"+ ($(".cont").size() + 1) +"</div>").appendTo(sub_container);
-    var text = $("<div class='text_cont' contenteditable>Enter your condition here ... </div>").appendTo(sub_container);
+    var text = $("<div class='text_cont' contenteditable>" + sankoreLang.enter + "</div>").appendTo(sub_container);
     
     $("<input type='hidden' value='1*2*3*4*5*'/>").appendTo(imgs_container);
     var add_img = $("<div class='add_img'>").appendTo(imgs_container);
diff --git a/resources/library/interactivities/associer_images.wgt/locales/fr/index.html b/resources/library/interactivities/associer_images.wgt/locales/fr/index.html
index c5c54041..c7f3b073 100644
--- a/resources/library/interactivities/associer_images.wgt/locales/fr/index.html
+++ b/resources/library/interactivities/associer_images.wgt/locales/fr/index.html
@@ -9,10 +9,8 @@
         <script type="text/javascript" src="js/script.js"></script>
         <script type="text/javascript">
             $(document).ready(function(){
+                sankore.enableDropOnWidget(false);
                 start();
-                //here you can put your code
-                if(window.sankore)
-                    sankore.enableDropOnWidget();
             });
         </script>
     </head>
diff --git a/resources/library/interactivities/associer_images.wgt/locales/fr/js/script.js b/resources/library/interactivities/associer_images.wgt/locales/fr/js/script.js
index 94b34543..271ebd13 100644
--- a/resources/library/interactivities/associer_images.wgt/locales/fr/js/script.js
+++ b/resources/library/interactivities/associer_images.wgt/locales/fr/js/script.js
@@ -1,4 +1,10 @@
-var sankoreLang = {display: "D'affichage", edit: "Modifier", short_desc: "Sélectionner le numéro «trois».", add: "Nouveau bloc"};
+var sankoreLang = {
+    display: "D'affichage", 
+    edit: "Modifier", 
+    short_desc: "Sélectionner le numéro «trois».", 
+    add: "Nouveau bloc",
+    enter: "Entrez votre état ici ..."
+};
 
 //main function
 function start(){
@@ -17,15 +23,16 @@ function start(){
     else 
         showExample();
     //events
-    $("body").live("mouseout",function(){
-        if(event.target.tagName == "BODY")
-            if(window.sankore)
-                exportData();
-    })
+    if (window.widget) {
+        window.widget.onleave = function(){
+            exportData();
+        }
+    }
     
     $("#display, #edit").click(function(event){
         if(this.id == "display"){
             if(!$(this).hasClass("selected")){
+                sankore.enableDropOnWidget(false);
                 $(this).addClass("selected");
                 $("#display_img").removeClass("red_point").addClass("green_point");
                 $("#edit_img").removeClass("green_point").addClass("red_point");
@@ -126,6 +133,7 @@ function start(){
             }
         } else {            
             if(!$(this).hasClass("selected")){
+                sankore.enableDropOnWidget(true);
                 $(this).addClass("selected");
                 $("#edit_img").removeClass("red_point").addClass("green_point");
                 $("#display_img").removeClass("green_point").addClass("red_point");
@@ -562,7 +570,7 @@ function addContainer(){
     
     var close = $("<div class='close_cont'>").appendTo(container);
     var number = $("<div class='number_cont'>"+ ($(".cont").size() + 1) +"</div>").appendTo(sub_container);
-    var text = $("<div class='text_cont' contenteditable>Enter your condition here ... </div>").appendTo(sub_container);
+    var text = $("<div class='text_cont' contenteditable>" + sankoreLang.enter + "</div>").appendTo(sub_container);
     
     $("<input type='hidden' value='1*2*3*4*5*'/>").appendTo(imgs_container);
     var add_img = $("<div class='add_img'>").appendTo(imgs_container);
diff --git a/resources/library/interactivities/associer_images.wgt/locales/ru/index.html b/resources/library/interactivities/associer_images.wgt/locales/ru/index.html
index 1d40965b..8b39b00a 100644
--- a/resources/library/interactivities/associer_images.wgt/locales/ru/index.html
+++ b/resources/library/interactivities/associer_images.wgt/locales/ru/index.html
@@ -8,11 +8,9 @@
         <script type="text/javascript" src="../../js/jquery-ui-1.8.9.custom.min.js"></script>
         <script type="text/javascript" src="js/script.js"></script>
         <script type="text/javascript">
-            $(document).ready(function(){                
+            $(document).ready(function(){ 
+                sankore.enableDropOnWidget(false);
                 start();
-                //here you can put your code
-                if(window.sankore)
-                    sankore.enableDropOnWidget();
             });
         </script>
     </head>
diff --git a/resources/library/interactivities/associer_images.wgt/locales/ru/js/script.js b/resources/library/interactivities/associer_images.wgt/locales/ru/js/script.js
index 39a95966..028734c3 100644
--- a/resources/library/interactivities/associer_images.wgt/locales/ru/js/script.js
+++ b/resources/library/interactivities/associer_images.wgt/locales/ru/js/script.js
@@ -2,7 +2,8 @@ var sankoreLang = {
     display: "Показать", 
     edit: "Изменить", 
     short_desc: "Выберите число \"три\".", 
-    add: "Новый блок"
+    add: "Новый блок",
+    enter: "Введите условие ..."
 };
 
 //main function
@@ -22,15 +23,16 @@ function start(){
     else 
         showExample();
     //events
-    $("body").live("mouseout",function(){
-        if(event.target.tagName == "BODY")
-            if(window.sankore)
-                exportData();
-    })
+    if (window.widget) {
+        window.widget.onleave = function(){
+            exportData();
+        }
+    }
     
     $("#display, #edit").click(function(event){
         if(this.id == "display"){
             if(!$(this).hasClass("selected")){
+                sankore.enableDropOnWidget(false);
                 $(this).addClass("selected");
                 $("#display_img").removeClass("red_point").addClass("green_point");
                 $("#edit_img").removeClass("green_point").addClass("red_point");
@@ -131,6 +133,7 @@ function start(){
             }
         } else {            
             if(!$(this).hasClass("selected")){
+                sankore.enableDropOnWidget(true);
                 $(this).addClass("selected");
                 $("#edit_img").removeClass("red_point").addClass("green_point");
                 $("#display_img").removeClass("green_point").addClass("red_point");
@@ -567,7 +570,7 @@ function addContainer(){
     
     var close = $("<div class='close_cont'>").appendTo(container);
     var number = $("<div class='number_cont'>"+ ($(".cont").size() + 1) +"</div>").appendTo(sub_container);
-    var text = $("<div class='text_cont' contenteditable>Enter your condition here ... </div>").appendTo(sub_container);
+    var text = $("<div class='text_cont' contenteditable>" + sankoreLang.enter + "</div>").appendTo(sub_container);
     
     $("<input type='hidden' value='1*2*3*4*5*'/>").appendTo(imgs_container);
     var add_img = $("<div class='add_img'>").appendTo(imgs_container);