diff --git a/mindplot/src/main/javascript/ScreenManager.js b/mindplot/src/main/javascript/ScreenManager.js
index 5b7d943a..010de117 100644
--- a/mindplot/src/main/javascript/ScreenManager.js
+++ b/mindplot/src/main/javascript/ScreenManager.js
@@ -43,14 +43,16 @@ mindplot.ScreenManager = new Class({
         if (event == 'click')
             this._clickEvents.push(listener);
         else
-            $(this._divContainer).addEvent(event, listener);
+           this._divContainer.addEvent(event, listener);
     },
 
     removeEvent : function(event, listener) {
-        if (event == 'click')
+        if (event == 'click') {
             this._clickEvents.remove(listener);
-        else
-            $(this._divContainer).removeEvent(event, listener);
+        }
+        else{
+            this._divContainer.removeEvent(event, listener);
+        }
     },
 
     fireEvent : function(type, event) {
@@ -60,7 +62,7 @@ mindplot.ScreenManager = new Class({
             });
         }
         else {
-            $(this._divContainer).fireEvent(type, event);
+            this._divContainer.fireEvent(type, event);
         }
     },
 
diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties
index c7c6813e..e67d4c18 100644
--- a/wise-webapp/src/main/resources/messages_en.properties
+++ b/wise-webapp/src/main/resources/messages_en.properties
@@ -246,7 +246,7 @@ LICENSE=License
 WELCOME_TO_WISEMAPPING=Welcome to WiseMapping
 WELCOME_DETAILS=WiseMapping will enable you to create and read your mind maps everywhere. With WiseMapping you can: <ul><li>Embed mind map it in web pages and blogs</li><li>Link mind map and documents</li><li>Share your maps with friend and colleagues</li><li>Export your maps SVG,PNG,JPG and FreeMind</li></ul>.
 DIRECT_LINK_EXPLANATION=Copy and paste the link below to share your map with colleagues
-TEMPORAL_PASSWORD_SENT=Your temporal password has been sent.
+TEMPORAL_PASSWORD_SENT=Your temporal password has been sent
 TEMPORAL_PASSWORD_SENT_DETAILS=We've sent you an email that will allow you to reset your password. Please check your email now.
 TEMPORAL_PASSWORD_SENT_SUPPORT=If you have any problem receiving the email, contact us to  <a href\="mailto\:support@wisemapping.com">support@wisemapping.com </a>
 
diff --git a/wise-webapp/src/main/resources/messages_es.properties b/wise-webapp/src/main/resources/messages_es.properties
index 9b3adaae..6edc4269 100644
--- a/wise-webapp/src/main/resources/messages_es.properties
+++ b/wise-webapp/src/main/resources/messages_es.properties
@@ -245,9 +245,9 @@ LICENSE=Licencia
 WELCOME_TO_WISEMAPPING=Bienvenido a WiseMapping
 WELCOME_DETAILS=WiseMapping te permite crear y leer tus mapas mentales en cualquier lugar. Con WiseMapping tu puedes: <ul><li>Embeber tus mapas en páginas o blogs</li><li>Crear vinculos a documentos</li><li>Compartir tus mapas mentales con amigos y colegas</li><li>Exportar tus mapas a SVG,PNG,JPG and FreeMind</li></ul>.
 DIRECT_LINK_EXPLANATION=Copie y pegue el este enlace para compartir su mapa mental con amigos y colegas
-TEMPORAL_PASSWORD_SENT_SUPPORT=Si tienes algun problema o no reciviste el mail, contactanos a <a href\="mailto\:support@wisemapping.com">support@wisemapping.com</a>    \
+TEMPORAL_PASSWORD_SENT_SUPPORT=Si tienes algun problema o no reciviste el mail, contactanos a <a href\="mailto\:support@wisemapping.com">support@wisemapping.com</a>
 TEMPORAL_PASSWORD_SENT_DETAILS=Se te ha enviado un mail con los detalles para cambiar to password. Revisa tu correo ahora.
-TEMPORAL_PASSWORD_SENT=Tu contraseña temporal ha sido enviada.
+TEMPORAL_PASSWORD_SENT=Tu contraseña temporal ha sido enviada