diff --git a/wise-editor/src/main/webapp/css/editor.less b/wise-editor/src/main/webapp/css/editor.less
index 06ae9d8d..b59f0a7a 100644
--- a/wise-editor/src/main/webapp/css/editor.less
+++ b/wise-editor/src/main/webapp/css/editor.less
@@ -186,7 +186,7 @@ div.modalDialog .title
 }
 
 .exportModalDialog .content{
-    height:370px;
+    height:400px;
 }
 
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
index 57579f49..3267beb2 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
@@ -293,12 +293,17 @@ public class MindmapController extends BaseController {
 
     @RequestMapping(method = RequestMethod.POST, value = "/maps", consumes = {"application/freemind"})
     @ResponseStatus(value = HttpStatus.CREATED)
-    public void createMapFromFreemind(@RequestBody byte[] freemindXml, @RequestParam(required = true) String title, @RequestParam(required = false) String description, @NotNull HttpServletResponse response) throws IOException, WiseMappingException, ImporterException {
+    public void createMapFromFreemind(@RequestBody byte[] freemindXml, @RequestParam(required = true) String title, @RequestParam(required = false) String description, @NotNull HttpServletResponse response) throws IOException, WiseMappingException {
 
         // Convert map ...
-        final Importer importer = ImporterFactory.getInstance().getImporter(ImportFormat.FREEMIND);
-        final ByteArrayInputStream stream = new ByteArrayInputStream(freemindXml);
-        final MindMap mindMap = importer.importMap(title, "", stream);
+        final MindMap mindMap;
+        try {
+            final Importer importer = ImporterFactory.getInstance().getImporter(ImportFormat.FREEMIND);
+            final ByteArrayInputStream stream = new ByteArrayInputStream(freemindXml);
+            mindMap = importer.importMap(title, "", stream);
+        } catch (ImporterException e) {
+            throw buildValidationException("xml", "The selected file does not seems to be a valid Freemind or WiseMapping file. Contact support in case the problem persists.");
+        }
 
         // Save new map ...
         final User user = Utils.getUser();
diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
index 59f8b456..801b2e13 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
@@ -303,7 +303,7 @@ INSTALL_CFG_CLICK_HERE=To install Google Chrome Frame Plugin click here
 INVALID_EMAIL_ERROR = The e-mail was not verified
 BROWSER_NOT_SUPPOERTED= Current Browser is not supported.
 CHECK_BROWSERS= You can check supported browser at
-NO_PRODUCTION_DATABASE_CONFIGURED=Note: Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.5 instead. You can find more information how to configure MySQL
+NO_PRODUCTION_DATABASE_CONFIGURED=Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.5 instead. You can find more information how to configure MySQL
 IMPORT=Import
 
 EMBEDDED_MAP_SIZE=* Note: You can change embedded map size modifying 'height' and 'width' style properties. You can also adjust the zoom factor modifying 'zoom' parameter from the URL.
diff --git a/wise-webapp/src/main/webapp/js/mymaps.js b/wise-webapp/src/main/webapp/js/mymaps.js
index 6ab1a2b8..96969e25 100644
--- a/wise-webapp/src/main/webapp/js/mymaps.js
+++ b/wise-webapp/src/main/webapp/js/mymaps.js
@@ -252,10 +252,10 @@ function updateStarred(spanElem) {
 
 function callbackOnTableInit() {
     // Register starred events ...
-    console.log($('#mindmapListTable .starredOff, #mindmapListTable .starredOn'));
     $('#mindmapListTable .starredOff, #mindmapListTable .starredOn').click(function() {
         updateStarred(this);
     });
+    updateStatusToolbar();
 }
 
 $(function() {
diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp
index 2af164bc..6a3d0168 100644
--- a/wise-webapp/src/main/webapp/jsp/login.jsp
+++ b/wise-webapp/src/main/webapp/jsp/login.jsp
@@ -68,9 +68,8 @@
 </div>
 
 <c:if test="${isHsql== 'true'}">
-    <div style="padding:10px;background-color: #E0EFFF; border-radius: 5px 5px 5px 5px;border-style:solid;border-color:gray">
-        <img src="../images/info.png" style="margin:0 4px" alt="info">
-        <spring:message code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a
+    <div class="alert alert-info">
+       <span class="label label-important">Warning</span> <spring:message code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a
             href="http://www.wisemapping.org/documentation/configu">here</a>.
     </div>
 </c:if>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
index 90078b38..50d4473c 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
@@ -3,11 +3,6 @@
 <p class="alert alert-info">
     <spring:message code="EXPORT_DETAILS"/>
 </p>
-
-<p id="exportInfo">
-    <span class="label label-important">Warning</span> <spring:message code="EXPORT_FORMAT_RESTRICTIONS"/>
-</p>
-
 <div>
     <form method="GET" class="form-horizontal" action="service/maps/${mindmap.id}"
           enctype="application/x-www-form-urlencoded" id="dialogMainForm">
@@ -51,6 +46,12 @@
 </div>
 
 
+<p id="exportInfo">
+    <span class="label label-important">Warning</span> <spring:message code="EXPORT_FORMAT_RESTRICTIONS"/>
+</p>
+
+
+
 <script type="text/javascript">
 
     // No way to obtain map svg. Hide panels..
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp b/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp
index 4d56fb81..1c4abaeb 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapImport.jsp
@@ -9,7 +9,7 @@
         <fieldset>
             <div class="control-group">
                 <label for="mapFile" class="control-label"><spring:message code="MIND_FILE"/>: </label>
-                <input type="file" name="mapFile" id="mapFile" required="required" class="control"/>
+                <input type="file" name="file" id="mapFile" required="required" class="control"/>
             </div>
             <div class="control-group">
                 <label for="title" class="control-label"><spring:message code="NAME"/>: </label>
@@ -30,11 +30,6 @@
 
 
 <script type="text/javascript">
-
-    // @Todo: Pending: report errors, manage corrupted mapsmanage case,escape url parameters, import with same title tries to save in post XML, explanation.
-
-    $('#messagePanel').hide();
-
     // Save status on click ...
     var contentType = null;
     var fileContent = null;