diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index 7da5ddf8..334bf342 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -11,7 +11,7 @@
         <relativePath>../pom.xml</relativePath>
         <version>5.0.4</version>
     </parent>
-    
+
     <properties>
         <org.springframework.version>5.3.14</org.springframework.version>
         <org.springframework.addons>5.3.5.RELEASE</org.springframework.addons>
diff --git a/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf b/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
index 81230068..cc4cc0c0 100644
--- a/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
+++ b/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
@@ -1,13 +1,16 @@
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 
 <c:if test="${requestScope['google.analytics.enabled']}">
-  <!-- Global site tag (gtag.js) - Google Analytics -->
-  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-2347723-1"></script>
-  <script>
-    window.dataLayer = window.dataLayer || [];
-    function gtag() { dataLayer.push(arguments); }
-    gtag('js', new Date());
-    gtag('config', );
-  </script>
+<!-- Google Analytics -->
+    <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-2347723-1', 'auto');
+    ga('send', 'pageview');
+    </script>
+    <!-- End Google Analytics -->
 </c:if>
 
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditorToolbar.jsf b/wise-webapp/src/main/webapp/jsp/mindmapEditorToolbar.jsf
deleted file mode 100644
index e2e4af0e..00000000
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditorToolbar.jsf
+++ /dev/null
@@ -1,95 +0,0 @@
-<%--@elvariable id="mindmap" type="com.wisemapping.model.Mindmap"--%>
-
-<div id="toolbar">
-    <div id="backToList">
-        <img src="../../images/editor/back-icon.svg" />
-    </div>
-    <c:if test="${!memoryPersistence}">
-        <div id="persist" class="buttonContainer">
-            <div id="save" class="buttonOn">
-                <img src="../../images/editor/save.svg"/>
-            </div>
-        </div>
-    </c:if>
-    <c:if test="${!readOnlyMode}">
-        <div id="edit" class="buttonContainer">
-            <div id="undoEdition" class="buttonOn">
-                <img src="../../images/editor/undo.svg"/>
-            </div>
-            <div id="redoEdition" class="buttonOn">
-                <img src="../../images/editor/redo.svg"/>
-            </div>
-        </div>
-        <div id="nodeStyle" class="buttonContainer">
-            <div id="addTopic" class="buttonOn">
-                <img src="../../images/editor/topic-add.svg"/>
-            </div>
-            <div id="deleteTopic" class="buttonOn">
-                <img src="../../images/editor/topic-delete.svg"/>
-            </div>
-            <div id="topicBorder" class="buttonExtOn">
-                <img src="../../images/editor/topic-border.svg"/>
-            </div>
-            <div id="topicColor" class="buttonExtOn">
-                <img src="../../images/editor/topic-color.svg"/>
-            </div>
-            <div id="topicShape" class="buttonExtOn">
-                <img src="../../images/editor/topic-shape.svg"/>
-            </div>
-        </div>
-        <div id="font" class="buttonContainer">
-            <div id="fontFamily" class="buttonOn">
-                <img src="../../images/editor/font-type.svg"/>
-            </div>
-            <div id="fontSize" class="buttonExtOn">
-                <img src="../../images/editor/font-size.svg"/>
-            </div>
-            <div id="fontBold" class="buttonOn">
-                <img src="../../images/editor/font-bold.svg"/>
-            </div>
-            <div id="fontItalic" class="buttonOn">
-                <img src="../../images/editor/font-italic.svg"/>
-            </div>
-            <div id="fontColor" class="buttonExtOn">
-                <img src="../../images/editor/font-color.svg"/>
-            </div>
-        </div>
-        <div id="nodeContent" class="buttonContainer">
-            <div id="topicIcon" class="buttonExtOn">
-                <img src="../../images/editor/topic-icon.svg"/>
-            </div>
-            <div id="topicNote" class="buttonOn" >
-                <img src="../../images/editor/topic-note.svg"/>
-            </div>
-            <div id="topicLink" class="buttonOn">
-                <img src="../../images/editor/topic-link.svg"/>
-            </div>
-            <div id="topicRelation" class="buttonOn">
-                <img src="../../images/editor/topic-relation.svg"/>
-            </div>
-        </div>
-        <div id="separator" class="buttonContainer"></div>
-    </c:if>
-    <c:if test="${!memoryPersistence}">
-        <div id="toolbarRight">
-            <div id="export" class="buttonOn">
-                <img src="../../images/editor/export.svg" />
-            </div>
-            <div id="publishIt" class="buttonOn">
-                <img src="../../images/editor/public.svg" />
-            </div>
-            <div id="history" class="buttonOn">
-                <img src="../../images/editor/history.svg" />
-            </div>
-            <div id="print" class="buttonOn">
-                <img src="../../images/editor/print.svg" />
-            </div>
-            <div id="account">
-                <img src="../../images/editor/account.svg"/>
-            </div>
-            <div id="share" class="actionButton">
-                <spring:message code="SHARE"/>
-            </div>
-        </div>
-    </c:if>
-</div>
\ No newline at end of file