diff --git a/css/base.css b/css/base.css
index 6a3d701..a7a04b2 100644
--- a/css/base.css
+++ b/css/base.css
@@ -1334,6 +1334,13 @@ button i {
   font-size: 1.4rem;
 }
 
+.no-select {
+  user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+}
+
 /* MAIN */
 
 main {
diff --git a/css/dashboard.css b/css/dashboard.css
index 0455922..cefab96 100644
--- a/css/dashboard.css
+++ b/css/dashboard.css
@@ -1,3 +1,7 @@
+.dashboard-grapetree {
+  overflow-x: hidden;
+}
+
 .dashboard-grapetree header .tool-label {
   margin-right: 0.5rem;
   font-size: 1.3rem;
@@ -129,33 +133,47 @@
   position: absolute;
   top: 0;
   left: 0;
-  display: none;
-  opacity: 0;
+  width: 0;
   -webkit-transition: opacity 0.3s ease;
   transition: opacity 0.3s ease;
 }
 
+.dashboard-grapetree .settings > * {
+  display: none;
+  opacity: 0;
+}
+
+.dashboard-grapetree .settings .card.dragging,
+.dashboard-grapetree .settings .card.dragged {
+  display: block;
+  opacity: 1;
+}
+
 .dashboard-grapetree.dashboard-grapetree-s-m-mt-l .settings,
 .dashboard-grapetree.dashboard-grapetree-s-mt-l .settings,
 .dashboard-grapetree.dashboard-grapetree-s-m-l .settings,
-.dashboard-grapetree.dashboard-grapetree-s-l .settings,
-.dashboard-grapetree.dashboard-grapetree-s .settings {
+.dashboard-grapetree.dashboard-grapetree-s-l .settings {
   width: 20%;
+}
+
+.dashboard-grapetree.dashboard-grapetree-s-m-mt-l .settings > *,
+.dashboard-grapetree.dashboard-grapetree-s-mt-l .settings > *,
+.dashboard-grapetree.dashboard-grapetree-s-m-l .settings > *,
+.dashboard-grapetree.dashboard-grapetree-s-l .settings > * {
   display: block;
   opacity: 1;
 }
 
-@media (min-width: 1220px) {
+@media (min-width: 1980px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt-l .settings,
   .dashboard-grapetree.dashboard-grapetree-s-mt-l .settings,
   .dashboard-grapetree.dashboard-grapetree-s-m-l .settings,
-  .dashboard-grapetree.dashboard-grapetree-s-l .settings,
-  .dashboard-grapetree.dashboard-grapetree-s .settings {
-    width: 33.332%;
+  .dashboard-grapetree.dashboard-grapetree-s-l .settings {
+    width: 15%;
   }
 }
 
-@media (min-width: 2400px) {
+/* @media (min-width: 2400px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt-l .settings,
   .dashboard-grapetree.dashboard-grapetree-s-mt-l .settings,
   .dashboard-grapetree.dashboard-grapetree-s-m-l .settings,
@@ -163,42 +181,39 @@
   .dashboard-grapetree.dashboard-grapetree-s .settings {
     width: 25%;
   }
-}
+} */
 
 .dashboard-grapetree.dashboard-grapetree-s-m-mt .settings,
 .dashboard-grapetree.dashboard-grapetree-s-mt .settings,
-.dashboard-grapetree.dashboard-grapetree-s-m .settings {
+.dashboard-grapetree.dashboard-grapetree-s-m .settings,
+.dashboard-grapetree.dashboard-grapetree-s .settings {
   width: 25%;
+}
+
+.dashboard-grapetree.dashboard-grapetree-s-m-mt .settings > *,
+.dashboard-grapetree.dashboard-grapetree-s-mt .settings > *,
+.dashboard-grapetree.dashboard-grapetree-s-m .settings > *,
+.dashboard-grapetree.dashboard-grapetree-s .settings > * {
   display: block;
   opacity: 1;
 }
 
-@media (min-width: 1220px) {
+@media (min-width: 1980px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt .settings,
   .dashboard-grapetree.dashboard-grapetree-s-mt .settings,
-  .dashboard-grapetree.dashboard-grapetree-s-m .settings {
-    width: 33.332%;
+  .dashboard-grapetree.dashboard-grapetree-s-m .settings,
+  .dashboard-grapetree.dashboard-grapetree-s .settings {
+    width: 15%;
   }
 }
 
-@media (min-width: 2400px) {
+/* @media (min-width: 2400px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt .settings,
   .dashboard-grapetree.dashboard-grapetree-s-mt .settings,
   .dashboard-grapetree.dashboard-grapetree-s-m .settings {
     width: 25%;
   }
-}
-
-.dashboard-grapetree .settings .six.columns {
-  width: 100%;
-  margin: 0;
-}
-
-@media (min-width: 1220px) {
-  .dashboard-grapetree .settings .six.columns {
-    width: 50%;
-  }
-}
+} */
 
 .dashboard-grapetree .tree {
   position: absolute;
@@ -230,21 +245,17 @@
   width: 80%;
 }
 
-@media (min-width: 1220px) {
+@media (min-width: 1980px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt-l .tree,
   .dashboard-grapetree.dashboard-grapetree-s-mt-l .tree,
   .dashboard-grapetree.dashboard-grapetree-s-m-l .tree,
-  .dashboard-grapetree.dashboard-grapetree-s-l .tree,
-  .dashboard-grapetree.dashboard-grapetree-s .tree {
-    left: 33.332%;
-    width: 49.998%;
-  }
-  .dashboard-grapetree.dashboard-grapetree-s .tree {
-    width: 66.668%;
+  .dashboard-grapetree.dashboard-grapetree-s-l .tree {
+    left: 15%;
+    width: 70%;
   }
 }
 
-@media (min-width: 2400px) {
+/* @media (min-width: 2400px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt-l .tree,
   .dashboard-grapetree.dashboard-grapetree-s-mt-l .tree,
   .dashboard-grapetree.dashboard-grapetree-s-m-l .tree,
@@ -256,6 +267,11 @@
   .dashboard-grapetree.dashboard-grapetree-s .tree {
     width: 75%;
   }
+} */
+
+.dashboard-grapetree.dashboard-grapetree-s .tree {
+  left: 25%;
+  width: 75%
 }
 
 .dashboard-grapetree.dashboard-grapetree-s-m-mt .tree,
@@ -266,23 +282,24 @@
   bottom: 50%;
 }
 
-@media (min-width: 1220px) {
+@media (min-width: 1980px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt .tree,
   .dashboard-grapetree.dashboard-grapetree-s-mt .tree,
-  .dashboard-grapetree.dashboard-grapetree-s-m .tree {
-    left: 33.332%;
-    width: 66.668%;
+  .dashboard-grapetree.dashboard-grapetree-s-m .tree,
+  .dashboard-grapetree.dashboard-grapetree-s .tree {
+    left: 15%;
+    width: 85%;
   }
 }
 
-@media (min-width: 2400px) {
+/* @media (min-width: 2400px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt .tree,
   .dashboard-grapetree.dashboard-grapetree-s-mt .tree,
   .dashboard-grapetree.dashboard-grapetree-s-m .tree {
     left: 25%;
     width: 75%;
   }
-}
+} */
 
 .dashboard-grapetree.dashboard-grapetree-m-mt-l .tree,
 .dashboard-grapetree.dashboard-grapetree-mt-l .tree,
@@ -329,6 +346,31 @@
   }
 }
 
+
+.dashboard-grapetree.dashboard-grapetree-s-m-mt-l .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-s-mt-l .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-s-m-l .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-s-l .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-s .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-s-m-mt .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-s-mt .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-s-m .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-s .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-m-mt-l .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-mt-l .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-m-l .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-l .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-m-mt .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-mt .tree.tree-expanded,
+.dashboard-grapetree.dashboard-grapetree-m .tree.tree-expanded {
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: auto;
+  z-index: 9999;
+}
+
 .dashboard-grapetree .tree-container {
   display: flex;
   justify-content: center;
@@ -402,7 +444,8 @@
 
 .dashboard-grapetree #graph-div .ui-draggable:first-child {
   opacity: 0;
-  z-index: -1;
+  z-index: -999;
+  visibility: hidden;
 }
 
 .dashboard-grapetree #graph-div .ui-draggable-handle[style] {
@@ -616,18 +659,18 @@
   width: 60%;
 }
 
-@media (min-width: 1220px) {
+@media (min-width: 1980px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt-l .map {
-    left: 33.332%;
-    width: 24.999%;
+    left: 15%;
+    width: 35%;
   }
   .dashboard-grapetree.dashboard-grapetree-s-m-l .map {
-    left: 33.332%;
-    width: 49.998%;
+    left: 15%;
+    width: 70%;
   }
 }
 
-@media (min-width: 2400px) {
+/* @media (min-width: 2400px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt-l .map {
     left: 25%;
     width: 29.165%;
@@ -636,7 +679,7 @@
     left: 25%;
     width: 58.33%;
   }
-}
+} */
 
 .dashboard-grapetree.dashboard-grapetree-s-m-mt .map,
 .dashboard-grapetree.dashboard-grapetree-s-m .map {
@@ -652,18 +695,18 @@
   width: 75%;
 }
 
-@media (min-width: 1220px) {
+@media (min-width: 1980px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt .map {
-    left: 33.332%;
-    width: 33.334%;
+    left: 15%;
+    width: calc(85% / 2);
   }
   .dashboard-grapetree.dashboard-grapetree-s-m .map {
-    left: 33.332%;
-    width: 66.668%;
+    left: 15%;
+    width: 85%;
   }
 }
 
-@media (min-width: 2400px) {
+/* @media (min-width: 2400px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt .map {
     left: 25%;
     width: 37.5%;
@@ -672,7 +715,7 @@
     left: 25%;
     width: 75%;
   }
-}
+} */
 
 .dashboard-grapetree.dashboard-grapetree-m-mt-l .map,
 .dashboard-grapetree.dashboard-grapetree-m-l .map {
@@ -723,6 +766,22 @@
   }
 }
 
+.dashboard-grapetree.dashboard-grapetree-s-m-mt-l .map.map-expanded,
+.dashboard-grapetree.dashboard-grapetree-s-m-l .map.map-expanded,
+.dashboard-grapetree.dashboard-grapetree-s-m-mt .map.map-expanded,
+.dashboard-grapetree.dashboard-grapetree-s-m .map.map-expanded,
+.dashboard-grapetree.dashboard-grapetree-m-mt-l .map.map-expanded,
+.dashboard-grapetree.dashboard-grapetree-m-l .map.map-expanded,
+.dashboard-grapetree.dashboard-grapetree-m-mt .map.map-expanded,
+.dashboard-grapetree.dashboard-grapetree-m .map.map-expanded {
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: auto;
+  z-index: 9999;
+}
+
 .dashboard-grapetree .map-container {
   display: flex;
   justify-content: center;
@@ -767,7 +826,7 @@
 }
 
 .dashboard-grapetree .map-container.map-initialized .card-context-tools {
-  display: block;
+  display: flex;
 }
 
 .dashboard-grapetree .map-container .card-context-trigger i {
@@ -817,18 +876,18 @@
   width: 60%;
 }
 
-@media (min-width: 1220px) {
+@media (min-width: 1980px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt-l .metadata {
-    left: 58.331%;
-    width: 24.999%;
+    left: calc(15% + 35%);
+    width: 35%;
   }
   .dashboard-grapetree.dashboard-grapetree-s-mt-l .metadata {
-    left: 33.332%;
-    width: 49.998%;
+    left: 15%;
+    width: 70%;
   }
 }
 
-@media (min-width: 2400px) {
+/* @media (min-width: 2400px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt-l .metadata {
     left: 54.165%;
     width: 29.165%;
@@ -837,7 +896,7 @@
     left: 25%;
     width: 58.33%;
   }
-}
+} */
 
 .dashboard-grapetree.dashboard-grapetree-s-m-mt .metadata,
 .dashboard-grapetree.dashboard-grapetree-s-mt .metadata {
@@ -854,18 +913,18 @@
   width: 75%;
 }
 
-@media (min-width: 1220px) {
+@media (min-width: 1980px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt .metadata {
-    left: 66.666%;
-    width: 33.334%;
+    left: calc(15% + (85% / 2));
+    width: calc(85% / 2);
   }
   .dashboard-grapetree.dashboard-grapetree-s-mt .metadata {
-    left: 33.332%;
-    width: 66.668%;
+    left: 15%;
+    width: 85%;
   }
 }
 
-@media (min-width: 2400px) {
+/* @media (min-width: 2400px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt .metadata {
     left: 62.5%;
     width: 37.5%;
@@ -874,7 +933,7 @@
     left: 25%;
     width: 75%;
   }
-}
+} */
 
 .dashboard-grapetree.dashboard-grapetree-m-mt-l .metadata,
 .dashboard-grapetree.dashboard-grapetree-mt-l .metadata {
@@ -937,6 +996,7 @@
   top: 0;
   left: 0;
   right: 0;
+  bottom: 0;
   width: auto;
   z-index: 9999;
 }
@@ -1055,12 +1115,12 @@
   opacity: 1;
 }
 
-@media (min-width: 1220px) {
+@media (min-width: 1980px) {
   .dashboard-grapetree.dashboard-grapetree-s-m-mt-l .legend,
   .dashboard-grapetree.dashboard-grapetree-s-mt-l .legend,
   .dashboard-grapetree.dashboard-grapetree-s-m-l .legend,
   .dashboard-grapetree.dashboard-grapetree-s-l .legend {
-    left: 83.33%;
+    left: 85%;
   }
 }
 
@@ -1271,7 +1331,7 @@
 .dashboard-grapetree .card-context-tools {
   font-size: 1.4rem;
   right: 1.3rem;
-  z-index: 99;
+  z-index: 3;
 }
 
 .dashboard-grapetree .card-context-tools {
@@ -1293,7 +1353,17 @@
 }
 
 .dashboard-grapetree .card-expandable .card-context-tools {
-  top: 4.2rem;
+  top: auto;
+  right: 3.2rem;
+  display: flex;
+}
+
+.dashboard-grapetree .card-expandable.expanded .card-context-tools {
+  display: flex;
+}
+
+.dashboard-grapetree .card-expandable .card-context-tools > div {
+  margin-left: 0.5rem;
 }
 
 .dashboard-grapetree .card-context-trigger {
@@ -1838,4 +1908,255 @@
   cursor: pointer;
   text-decoration: none;
   padding-left: 0.3rem;
+}
+
+/* SEARCH ENGINE */
+
+.dashboard-grapetree .search-highlight {
+  position: relative;
+  padding-left: 1.2rem !important;
+  color: var(--red) !important;
+}
+.dashboard-grapetree .search-highlight::before {
+  content: '';
+  position: absolute;
+  left: 0;
+  width: 0.8rem;
+  height: 0.8rem;
+  border-radius: 50%;
+  background-color: var(--red);
+  -webkit-transition: all 0.3s ease;
+  transition: all 0.3s ease;
+  top: 0.6rem;
+  -webkit-animation: pulse 1s infinite;
+  animation: pulse 1s infinite;
+}
+
+@-webkit-keyframes pulse {
+  0% {
+    -webkit-transform: scale(0.9);
+    transform: scale(0.9);
+  }
+  50% {
+    -webkit-transform: scale(1.2);
+    transform: scale(1.2);
+  }
+  100% {
+    -webkit-transform: scale(0.9);
+    transform: scale(0.9);
+  }
+}
+
+@keyframes pulse {
+  0% {
+    -webkit-transform: scale(0.9);
+    transform: scale(0.9);
+  }
+  50% {
+    -webkit-transform: scale(1.2);
+    transform: scale(1.2);
+  }
+  100% {
+    -webkit-transform: scale(0.9);
+    transform: scale(0.9);
+  }
+}
+
+.dashboard-grapetree .search-engine::before {
+  content: "";
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  backdrop-filter: blur(0.2rem);
+  opacity: 0;
+  z-index: -1;
+  visibility: hidden;
+  -webkit-transition: opacity 0.3s ease;
+  transition: opacity 0.3s ease;
+}
+
+.dashboard-grapetree.show-search-engine .search-engine::before {
+  opacity: 1;
+  z-index: 1000;
+  visibility: visible;
+}
+
+.dashboard-grapetree .search-engine::after {
+  content: "";
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: var(--secondary-ultra-light);
+  opacity: 0;
+  z-index: -1;
+  visibility: hidden;
+  -webkit-transition: opacity 0.3s ease;
+  transition: opacity 0.3s ease;
+}
+
+.dashboard-grapetree.show-search-engine .search-engine::after {
+  opacity: 0.8;
+  z-index: 1001;
+  visibility: visible;
+}
+
+.dashboard-grapetree .search-engine {
+  position: fixed;
+  z-index: -1;
+  visibility: hidden;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.dashboard-grapetree.show-search-engine .search-engine {
+  z-index: 9997;
+  visibility: visible;
+}
+
+.dashboard-grapetree .search-engine-contents {
+  position: absolute;
+  z-index: 9998;
+  width: 32rem;
+  border-radius: 2.4rem;
+  padding: 2.1rem 2.1rem;
+  padding-top: 3.4rem;
+  padding-bottom: 3.4rem;
+  background-color: var(--white);
+  top: 1rem;
+  right: 1rem;
+  max-height: calc(100vh - 9.8rem);
+  overflow-y: auto;
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+  opacity: 0;
+  -webkit-transform: translateX(calc(100% + 1rem));
+  transform: translateX(calc(100% + 1rem));
+  -webkit-box-shadow: 0px 0px 34px 0px rgba(0,0,0,0.08);
+  box-shadow: 0px 0px 34px 0px rgba(0,0,0,0.08);
+  -webkit-transition: all 0s ease 0s;
+  transition: all 0s ease 0s;
+}
+
+.dashboard-grapetree.show-search-engine .search-engine-contents {
+  opacity: 1;
+  -webkit-transform: translateX(0);
+  transform: translateX(0);
+  -webkit-transition: opacity 0.3s ease 0.3s, transform 0.3s ease 0.3s;
+  transition: opacity 0.3s ease 0.3s, transform 0.3s ease 0.3s;
+}
+
+.dashboard-grapetree .search-engine-close {
+  /*PLEASE NOTE: modal close container should include the iconic <i> tag in html*/
+  position: fixed;
+  opacity: 0;
+  right: 2.1rem;
+  top: 2.1rem;
+  cursor: pointer;
+  z-index: 9999;
+  color: var(--text);
+  -webkit-transition: opacity 0s ease;
+  transition: opacity 0s ease;
+}
+
+.dashboard-grapetree.show-search-engine .search-engine-close {
+  opacity: 1;
+  -webkit-transition: opacity 0.3s ease 0.6s;
+  transition: opacity 0.3s ease 0.6s;
+}
+
+.dashboard-grapetree  .search-result {
+  margin-top: 3.4rem;
+}
+
+.dashboard-grapetree  .search-result-title {
+  font-size: 1.4rem;
+  line-height: 1.4rem;
+  margin-bottom: 0.5rem;
+  padding-bottom: 1.3rem;
+  border-bottom: 0.1rem solid var(--secondary-light);
+}
+
+.dashboard-grapetree .search-results .select-box, .dashboard-grapetree .search-results .input-box, .dashboard-grapetree .search-results .search-box, .search-results .dashboard-grapetree .tip-box, .dashboard-grapetree .search-results .list-box, .dashboard-grapetree .search-results .button-box, .dashboard-grapetree .search-results .slider-box, .dashboard-grapetree .search-results .tools {
+  padding-top: 0.8rem;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.dashboard-grapetree .search-results  a.search-action {
+  color: var(--main);
+  font-size: 1.3rem;
+  cursor: pointer;
+  text-decoration: none;
+  padding-left: 0.3rem;
+}
+
+/* DRAGGABLE */
+
+.dashboard-grapetree .draggable {
+  cursor: grab;
+}
+
+.dashboard-grapetree .draggable .reset-draggable {
+  display: none;
+}
+
+.dashboard-grapetree .draggable.dragged .reset-draggable {
+  display: block;
+}
+
+.dashboard-grapetree .dragging {
+  cursor: grabbing;
+  -webkit-transition: all 0s linear;
+  transition: all 0s linear;
+}
+
+.dashboard-grapetree .dragging,
+.dashboard-grapetree .dragged{
+  width: 15%;
+  min-width: 32rem;
+}
+
+.dashboard-grapetree .target.drag-over {
+  position: relative;
+}
+
+.dashboard-grapetree .target .target-area {
+  padding-top: 8rem;
+  padding-bottom: 8rem;
+  opacity: 0.5;
+  border-radius: 2.4rem;
+  border: dashed 0.1rem var(--main);
+  background-color: var(--secondary-ultra-light);
+  text-align: center;
+  width: 100%;
+  font-size: 1.5rem;
+  line-height: 1;
+  display: none;
+}
+
+.dashboard-grapetree .settings.target .target-area {
+  margin-left: 1rem;
+  margin-bottom: 1rem;
+  width: calc(100% - 1rem);
+}
+
+.dashboard-grapetree .target.drag-over .target-area,
+.dashboard-grapetree .target.target-empty .target-area {
+  display: block;
+}
+
+.dashboard-grapetree .settings.target.drag-over .target-area,
+.dashboard-grapetree .settings.target.target-empty .target-area {
+  display: none;
+}
+
+.dashboard-grapetree .settings.settings-on.target.drag-over .target-area,
+.dashboard-grapetree .settings.settings-on.target.target-empty .target-area {
+  display: block;
 }
\ No newline at end of file
diff --git a/index.html b/index.html
index 4c8fcca..e39da21 100644
--- a/index.html
+++ b/index.html
@@ -37,6 +37,11 @@
         <!-- here custom contents for header, you can define them in themes/theme-name/html/header.html -->
       </div>
       <div class="toolbar">
+        <div class="tool tool-search">
+          <div class="tool-trigger">
+            <i class="iconic iconic-search"></i>
+          </div>
+        </div>
         <div class="tool tool-lang">
           <div class="tool-label"></div>
           <div class="tool-trigger">
@@ -44,7 +49,7 @@
           </div>
         </div><!-- language trigger -->
         <div class="tool">
-          <div class="tool-trigger tool-trigger-aside" onclick="gtiz_layout.showFooter()">
+          <div class="tool-trigger tool-trigger-footer" onclick="gtiz_layout.showFooter()">
             <i class="iconic iconic-information toogle-trigger-img toogle-trigger-img-help"></i>
             <i class="iconic iconic-close-circle toogle-trigger-img toogle-trigger-img-close hidden"></i>
           </div>
@@ -62,108 +67,101 @@
     </section>
 
     <section class="main dashboard-viewport dashboard-grapetree-viewport">
-      <div class="settings">
-        <div class="container container-full">
-          <div class="row">
-            <div class="six columns">
+      <div class="settings target">
+        <div class="target-area">
+          <div class="target-tip">
+            <i class="iconic iconic-picture-in-picture"></i>
+          </div>
+        </div>
+        <div class="card card-expandable card-settings card-node-style draggable" data-type="node-style">
+          <div class="card-expand-trigger">
+            <i class="iconic iconic-plus-circle not-draggable"></i>
+            <i class="iconic iconic-minus-circle not-draggable"></i>
+          </div>
+          <div class="card-context-tools">
+            <div class="card-info-trigger">
+              <i class="iconic iconic-help-circle not-draggable"></i>
+            </div>
+            <div class="card-close-trigger reset-draggable">
+              <i class="iconic iconic-close-circle not-draggable"></i>
+            </div>
+          </div>
+          <h3 class="card-title"><span data-i18n-key="node_style">Node style</span></h3>
+          <div class="card-form"></div>
+          <div class="card-message"></div>
+        </div><!-- card -->
 
-              <div class="card card-expandable card-settings card-tree-layout" data-type="tree-layout">
-                <div class="card-expand-trigger">
-                  <i class="iconic iconic-plus-circle"></i>
-                  <i class="iconic iconic-minus-circle"></i>
-                </div>
-                <div class="card-context-tools">
-                  <div class="card-info-trigger">
-                    <i class="iconic iconic-help-circle"></i>
-                  </div>
-                </div>
-                <h3 class="card-title"><span data-i18n-key="tree_layout">Tree layout</span></h3>
-                <div class="card-form"></div>
-                <div class="card-message"></div>
-              </div><!-- card -->
-  
-              <div class="card card-expandable card-settings card-node-style" data-type="node-style">
-                <div class="card-expand-trigger">
-                  <i class="iconic iconic-plus-circle"></i>
-                  <i class="iconic iconic-minus-circle"></i>
-                </div>
-                <div class="card-context-tools">
-                  <div class="card-info-trigger">
-                    <i class="iconic iconic-help-circle"></i>
-                  </div>
-                </div>
-                <h3 class="card-title"><span data-i18n-key="node_style">Node style</span></h3>
-                <div class="card-form"></div>
-                <div class="card-message"></div>
-              </div><!-- card -->
-  
-              <div class="card card-expandable card-settings card-node-size" data-type="node-size">
-                <div class="card-expand-trigger">
-                  <i class="iconic iconic-plus-circle"></i>
-                  <i class="iconic iconic-minus-circle"></i>
-                </div>
-                <div class="card-context-tools">
-                  <div class="card-info-trigger">
-                    <i class="iconic iconic-help-circle"></i>
-                  </div>
-                </div>
-                <h3 class="card-title"><span data-i18n-key="node_size">Node size</span></h3>
-                <div class="card-form"></div>
-                <div class="card-message"></div>
-              </div><!-- card -->
-  
-            </div><!-- columns -->
-  
-            <div class="six columns">
-  
-              <div class="card card-expandable card-settings card-branch-style" data-type="branch-style">
-                <div class="card-expand-trigger">
-                  <i class="iconic iconic-plus-circle"></i>
-                  <i class="iconic iconic-minus-circle"></i>
-                </div>
-                <div class="card-context-tools">
-                  <div class="card-info-trigger">
-                    <i class="iconic iconic-help-circle"></i>
-                  </div>
-                </div>
-                <h3 class="card-title"><span data-i18n-key="branch_style">Branch style</span></h3>
-                <div class="card-form"></div>
-                <div class="card-message"></div>
-              </div><!-- card -->
-  
-              <div class="card card-expandable card-settings card-branch-cutoffs" data-type="branch-cutoffs">
-                <div class="card-expand-trigger">
-                  <i class="iconic iconic-plus-circle"></i>
-                  <i class="iconic iconic-minus-circle"></i>
-                </div>
-                <div class="card-context-tools">
-                  <div class="card-info-trigger">
-                    <i class="iconic iconic-help-circle"></i>
-                  </div>
-                </div>
-                <h3 class="card-title"><span data-i18n-key="branch_cutoffs">Branch cutoffs</span></h3>
-                <div class="card-form"></div>
-                <div class="card-message"></div>
-              </div><!-- card -->
+        <div class="card card-expandable card-settings card-node-size draggable" data-type="node-size">
+          <div class="card-expand-trigger">
+            <i class="iconic iconic-plus-circle not-draggable"></i>
+            <i class="iconic iconic-minus-circle not-draggable"></i>
+          </div>
+          <div class="card-context-tools">
+            <div class="card-info-trigger">
+              <i class="iconic iconic-help-circle not-draggable"></i>
+            </div>
+            <div class="card-close-trigger reset-draggable">
+              <i class="iconic iconic-close-circle not-draggable"></i>
+            </div>
+          </div>
+          <h3 class="card-title"><span data-i18n-key="node_size">Node size</span></h3>
+          <div class="card-form"></div>
+          <div class="card-message"></div>
+        </div><!-- card -->
 
-              <div class="card card-expandable card-settings card-rendering" data-type="rendering">
-                <div class="card-expand-trigger">
-                  <i class="iconic iconic-plus-circle"></i>
-                  <i class="iconic iconic-minus-circle"></i>
-                </div>
-                <div class="card-context-tools">
-                  <div class="card-info-trigger">
-                    <i class="iconic iconic-help-circle"></i>
-                  </div>
-                </div>
-                <h3 class="card-title"><span data-i18n-key="rendering">Rendering</span></h3>
-                <div class="card-form"></div>
-                <div class="card-message"></div>
-              </div><!-- card -->
-              
-            </div><!-- columns -->
+        <div class="card card-expandable card-settings card-branch-style draggable" data-type="branch-style">
+          <div class="card-expand-trigger">
+            <i class="iconic iconic-plus-circle not-draggable"></i>
+            <i class="iconic iconic-minus-circle not-draggable"></i>
           </div>
-        </div>
+          <div class="card-context-tools">
+            <div class="card-info-trigger">
+              <i class="iconic iconic-help-circle not-draggable"></i>
+            </div>
+            <div class="card-close-trigger reset-draggable">
+              <i class="iconic iconic-close-circle not-draggable"></i>
+            </div>
+          </div>
+          <h3 class="card-title"><span data-i18n-key="branch_style">Branch style</span></h3>
+          <div class="card-form"></div>
+          <div class="card-message"></div>
+        </div><!-- card -->
+
+        <div class="card card-expandable card-settings card-branch-cutoffs draggable" data-type="branch-cutoffs">
+          <div class="card-expand-trigger">
+            <i class="iconic iconic-plus-circle not-draggable"></i>
+            <i class="iconic iconic-minus-circle not-draggable"></i>
+          </div>
+          <div class="card-context-tools">
+            <div class="card-info-trigger">
+              <i class="iconic iconic-help-circle not-draggable"></i>
+            </div>
+            <div class="card-close-trigger reset-draggable">
+              <i class="iconic iconic-close-circle not-draggable"></i>
+            </div>
+          </div>
+          <h3 class="card-title"><span data-i18n-key="branch_cutoffs">Branch cutoffs</span></h3>
+          <div class="card-form"></div>
+          <div class="card-message"></div>
+        </div><!-- card -->
+
+        <div class="card card-expandable card-settings card-rendering draggable" data-type="rendering">
+          <div class="card-expand-trigger">
+            <i class="iconic iconic-plus-circle not-draggable"></i>
+            <i class="iconic iconic-minus-circle not-draggable"></i>
+          </div>
+          <div class="card-context-tools">
+            <div class="card-info-trigger">
+              <i class="iconic iconic-help-circle not-draggable"></i>
+            </div>
+            <div class="card-close-trigger reset-draggable">
+              <i class="iconic iconic-close-circle not-draggable"></i>
+            </div>
+          </div>
+          <h3 class="card-title"><span data-i18n-key="rendering">Rendering</span></h3>
+          <div class="card-form"></div>
+          <div class="card-message"></div>
+        </div><!-- card -->
       </div>
       <div class="tree">
         <div class="tree-container card-component card-tree">
@@ -171,6 +169,9 @@ <h3 class="card-title"><span data-i18n-key="rendering">Rendering</span></h3>
             <div class="card-context-trigger card-context-menu-trigger" data-menu-component="tree" data-menu-type="zooms">
               <span data-i18n-key="available_zooms"></span> <i class="iconic iconic-zoom-in"></i>
             </div>
+            <div class="card-context-trigger card-context-expand-trigger" data-component="tree">
+              <i class="iconic iconic-maximize"></i>
+            </div>
             <div class="card-context-trigger card-context-menu-trigger" data-menu-component="tree" data-menu-type="tree">
               <i class="iconic iconic-dots-vertical"></i>
             </div>
@@ -205,6 +206,9 @@ <h4>
       <div class="map">
         <div id="map-div" class="map-container card-component card-map">
           <div class="card-context-tools">
+            <div class="card-context-trigger card-context-expand-trigger" data-component="map">
+              <i class="iconic iconic-maximize"></i>
+            </div>
             <div class="card-context-trigger card-context-menu-trigger" data-menu-component="map" data-menu-type="map">
               <i class="iconic iconic-dots-vertical"></i>
             </div>
@@ -271,6 +275,19 @@ <h3 class="card-title" data-i18n-key="legend">Legend</h3>
     </div>
   </section>
 
+  <section class="search-engine">
+    <div class="search-engine-close"><i class="iconic iconic-close-circle"></i></div>
+    <div class="search-engine-contents">
+      <div class="search-engine-header">
+        <div class="search-box">
+          <div class="form-label">Search a function</div>
+          <input id="search-functions" type="search" placeholder="Keyword..." autocomplete="off">
+        </div>
+      </div>
+      <div class="search-engine-body"></div>
+    </div>
+  </section>
+
   <footer>
     <div class="footer-contents">
       <div class="footer-close" onclick="gtiz_layout.showFooter()"><i class="iconic iconic-close-circle"></i></div>
@@ -280,7 +297,7 @@ <h3 class="card-title" data-i18n-key="legend">Legend</h3>
       <div class="footer-info">
         <div class="info">
           <p><span data-i18n-key="cookies_notice">Questa applicazione non utilizza cookies.</span></p>
-          <p><span data-i18n-key="last_updated_on">Last updated on</span> <span class="last-update-date">2024-06-03</span></p>
+          <p><span data-i18n-key="last_updated_on">Last updated on</span> <span class="last-update-date">__LAST_UPDATE__</span></p>
           <p class="copyright">&copy; <span class="copyright-year"></span> IZSAM 'G. Caporale'</p>
         </div>
       </div>
@@ -318,7 +335,9 @@ <h3 class="card-title" data-i18n-key="legend">Legend</h3>
   <script src="js/video.js"></script>
   <script src="js/help.js"></script>
   <script src="js/map.js"></script>
+  <script src="js/drag.js"></script>
   <script src="js/zooms.js"></script>
+  <script src="js/search.js"></script>
   <script src="js/app.js"></script>
 </body>
 </html>
diff --git a/js/context.js b/js/context.js
index 94f4604..e6eada7 100644
--- a/js/context.js
+++ b/js/context.js
@@ -324,6 +324,7 @@ gtiz_context.closeContextMenu = function(type, card) {
     card.style.removeProperty('z-index');
     let container = card.parentNode;
     if (type == 'tree' || type == 'zooms') {
+      container.style.removeProperty('right');
       container.style.removeProperty('z-index');
       container.style.removeProperty('width');
     }
@@ -331,6 +332,7 @@ gtiz_context.closeContextMenu = function(type, card) {
       container.style.cssText = '';
     }
     if (type == 'map') {
+      container.style.removeProperty('right');
       container.style.removeProperty('transform');
       container.style.removeProperty('z-index');
       container.style.removeProperty('width');
@@ -416,19 +418,25 @@ gtiz_context.showMenu = function(type, component, trigger) {
     let top = y;
     let translate_value = -(width + margin)/10 + 'rem';
     if (type == 'tree' || type == 'zooms') {
-      if (!cls_controller.includes('-l')) {
-        width = 320;
-        translate_value = 0;
-        if (gtiz_context.body.classList.contains('dashboard-grapetree-m') || gtiz_context.body.classList.contains('dashboard-grapetree-mt') || gtiz_context.body.classList.contains('dashboard-grapetree-m-mt')) {
-          left = x + card.offsetWidth + margin;
+      if (!parent_cls.includes('expanded')) {
+        if (!cls_controller.includes('-l')) {
+          width = 320;
+          translate_value = 0;
+          if (gtiz_context.body.classList.contains('dashboard-grapetree-m') || gtiz_context.body.classList.contains('dashboard-grapetree-mt') || gtiz_context.body.classList.contains('dashboard-grapetree-m-mt')) {
+            left = x + card.offsetWidth + margin;
+          } else {
+            left = x + card.offsetWidth + margin - width;
+          }
         } else {
-          left = x + card.offsetWidth + margin - width;
+          let legend_width = document.querySelector('.card-legend').offsetWidth;
+          width = legend_width;
+          translate_value = 0;
+          left = x + card.offsetWidth + margin;
         }
       } else {
-        let legend_width = document.querySelector('.card-legend').offsetWidth;
-        width = legend_width;
-        translate_value = 0;
-        left = x + card.offsetWidth + margin;
+        width = 320;
+        translate_value = width;
+        left = x + card.offsetWidth + margin - width;
       }
     }
     if (type == 'metadata') {
@@ -450,15 +458,21 @@ gtiz_context.showMenu = function(type, component, trigger) {
       }
     }
     if (type == 'map') {
-      if (!cls_controller.includes('-l')) {
+      if (!parent_cls.includes('expanded')) {
+        if (!cls_controller.includes('-l')) {
+          width = 320;
+          translate_value = 0;
+          left = x + card.offsetWidth + margin - width;
+        } else {
+          let legend_width = document.querySelector('.card-legend').offsetWidth;
+          width = legend_width;
+          translate_value = 0;
+          left = x + card.offsetWidth + margin;
+        }
+      } else {
         width = 320;
-        translate_value = 0;
+        translate_value = width;
         left = x + card.offsetWidth + margin - width;
-      } else {
-        let legend_width = document.querySelector('.card-legend').offsetWidth;
-        width = legend_width;
-        translate_value = 0;
-        left = x + card.offsetWidth + margin;
       }
     }
 
@@ -489,10 +503,14 @@ gtiz_context.showMenu = function(type, component, trigger) {
     if (component == 'tree') {
       let tree_container = document.querySelector('.tree');
       tree_container.style.zIndex = 9999;
-      if (!cls_controller.includes('-l') && !gtiz_context.body.classList.contains('dashboard-grapetree-m') && !gtiz_context.body.classList.contains('dashboard-grapetree-mt') && !gtiz_context.body.classList.contains('dashboard-grapetree-m-mt')) {
-        // card.style.width = (card.offsetWidth - width)/10 + 'rem';
-        tree_container.style.width = 'auto';
-        tree_container.style.right = (margin/2 + width)/10 + 'rem';
+      if (parent_cls.includes('expanded')) {
+        parent.style.right = (margin/2 + width)/10 + 'rem';
+      } else {
+        if (!cls_controller.includes('-l') && !gtiz_context.body.classList.contains('dashboard-grapetree-m') && !gtiz_context.body.classList.contains('dashboard-grapetree-mt') && !gtiz_context.body.classList.contains('dashboard-grapetree-m-mt')) {
+          // card.style.width = (card.offsetWidth - width)/10 + 'rem';
+          tree_container.style.width = 'auto';
+          tree_container.style.right = (margin/2 + width)/10 + 'rem';
+        }
       }
     }
     if (component == 'metadata') {
@@ -510,9 +528,13 @@ gtiz_context.showMenu = function(type, component, trigger) {
     if (component == 'map') {
       let map_container = document.querySelector('.map');
       map_container.style.zIndex = 9999;
-      if (!cls_controller.includes('-l')) {
-        // card.style.width = (card.offsetWidth - width)/10 + 'rem';
-        map_container.style.transform = 'translateX(-' + (width/10) + 'rem)';
+      if (parent_cls.includes('expanded')) {
+        parent.style.right = (margin/2 + width)/10 + 'rem';
+      } else {
+        if (!cls_controller.includes('-l')) {
+          // card.style.width = (card.offsetWidth - width)/10 + 'rem';
+          map_container.style.transform = 'translateX(-' + (width/10) + 'rem)';
+        }
       }
     }
 
diff --git a/js/drag.js b/js/drag.js
new file mode 100644
index 0000000..3ed768f
--- /dev/null
+++ b/js/drag.js
@@ -0,0 +1,139 @@
+let gtiz_drag = {};
+
+gtiz_drag.start_mouse_x = 0;
+gtiz_drag.start_mouse_y = 0;
+gtiz_drag.start_offset_left = 0;
+gtiz_drag.start_offset_top = 0;
+gtiz_drag.relative_x = 0;
+gtiz_drag.relative_y = 0;
+
+// DOM elements
+gtiz_drag.body = document.querySelector('body');
+gtiz_drag.main_section = document.querySelector('section.main');
+gtiz_drag.draggables = document.querySelectorAll('.draggable');
+gtiz_drag.target = document.querySelector('.target');
+gtiz_drag.target_area = document.querySelector('.target-area');
+
+/**
+ * Checks if a target element is empty. An element is considered empty if it has no draggable elements that are not dragged, or if it has one draggable element that is currently being dragged.
+ *
+ * @param {Element} target - The target element to check.
+ * @return {boolean} True if the target element is empty, false otherwise.
+ */
+gtiz_drag.isEmpty = function(target) {
+  const draggable = target.querySelectorAll('.draggable:not(.dragged)');
+  return draggable.length === 0 || (draggable.length === 1 && draggable[0].classList.contains('dragging'));
+};
+
+/**
+ * Checks if a draggable element is over a target element. This is determined by comparing the bounding rectangles of the two elements.
+ *
+ * @param {Element} draggable - The draggable element.
+ * @param {Element} target - The target element.
+ * @return {boolean} True if the draggable element is over the target element, false otherwise.
+ */
+gtiz_drag.isOver = function(draggable, target) {
+  let draggableRect = draggable.getBoundingClientRect();
+  let targetRect = target.getBoundingClientRect();
+
+  return !(draggableRect.right < targetRect.left || 
+           draggableRect.left > targetRect.right || 
+           draggableRect.bottom < targetRect.top || 
+           draggableRect.top > targetRect.bottom);
+}
+
+/**
+ * Moves a draggable element to a specified position. The position is specified by the pageX and pageY parameters, which represent the X and Y coordinates of the mouse pointer. The draggable element's style.left and style.top properties are updated to move the element to the new position.
+ *
+ * @param {Element} draggable - The draggable element.
+ * @param {number} pageX - The X coordinate of the mouse pointer.
+ * @param {number} pageY - The Y coordinate of the mouse pointer.
+ */
+gtiz_drag.moveAt = function(draggable, pageX, pageY) {
+  draggable.style.left = pageX - gtiz_drag.relative_x + 'px';
+  draggable.style.top = pageY - gtiz_drag.relative_y + 'px';
+}
+
+/**
+ * Handles the mousemove event for a draggable element. This function moves the draggable element, checks if it's over the target element, and updates the target element's classes accordingly.
+ *
+ * @param {Element} draggable - The draggable element.
+ * @param {Event} event - The mousemove event.
+ */
+gtiz_drag.onMouseMove = function(draggable, event) {
+  draggable.classList.add('dragging');
+  draggable.classList.remove('dragged');
+  draggable.style.position = 'absolute';
+  draggable.style.zIndex = 1000;
+  gtiz_drag.moveAt(draggable, event.pageX, event.pageY);
+  if (gtiz_drag.isOver(draggable, gtiz_drag.target)) {
+    gtiz_drag.target.classList.add('drag-over');
+  } else {
+    gtiz_drag.target.classList.remove('drag-over');
+  }
+  if (gtiz_drag.isEmpty(gtiz_drag.target)) {
+    gtiz_drag.target.classList.add('target-empty');
+  }
+}
+
+/**
+ * This code sets up drag and drop functionality for a set of elements.
+ *
+ * @param {Array} gtiz_drag.draggables - The array of elements that can be dragged.
+ */
+gtiz_drag.draggables.forEach(draggable => {
+  let onMouseMove = function(event) {
+    gtiz_drag.body.classList.add('no-select');
+    gtiz_drag.onMouseMove(draggable, event);
+  };
+  let onMouseUp = function(event) {
+    gtiz_drag.body.classList.remove('no-select');
+    if (gtiz_drag.isOver(draggable, gtiz_drag.target) || gtiz_drag.isOver(draggable, gtiz_drag.target_area)) {
+      draggable.classList.remove('dragging');
+      draggable.classList.remove('dragged');
+      draggable.setAttribute('style', '');
+      gtiz_drag.target.classList.remove('drag-over');
+    } else {
+      draggable.classList.remove('dragging');
+      draggable.classList.add('dragged');
+      let reset = draggable.querySelector('.reset-draggable');
+      if (reset) {
+        reset.addEventListener('click', function() {
+          draggable.classList.remove('dragged');
+          draggable.setAttribute('style', '');
+          if (gtiz_drag.isEmpty(gtiz_drag.target)) {
+            gtiz_drag.target.classList.add('target-empty');
+          } else {
+            gtiz_drag.target.classList.remove('target-empty');
+          }
+          gtiz_layout.setViewHeight(300);
+        });
+      }
+    }
+    if (gtiz_drag.isEmpty(gtiz_drag.target)) {
+      gtiz_drag.target.classList.add('target-empty');
+    } else {
+      gtiz_drag.target.classList.remove('target-empty');
+    }
+    gtiz_layout.setViewHeight(300);
+    document.removeEventListener('mousemove', onMouseMove);
+    document.removeEventListener('mouseup', onMouseUp);
+  };
+  draggable.onmousedown = function(event) {
+    if (event.target.classList.contains('not-draggable')) {
+      return;
+    }
+    // get marign left and right of the element
+    let style = window.getComputedStyle(draggable);
+    let marginLeft = parseInt(style.marginLeft);
+    let marginRight = parseInt(style.marginRight);
+    gtiz_drag.start_offset_left = draggable.getBoundingClientRect().left - marginLeft - marginRight;
+    gtiz_drag.start_offset_top = draggable.offsetTop;
+    gtiz_drag.start_x = event.pageX;
+    gtiz_drag.start_y = event.pageY;
+    gtiz_drag.relative_x = event.pageX - gtiz_drag.start_offset_left;
+    gtiz_drag.relative_y = event.pageY - gtiz_drag.start_offset_top;
+    document.addEventListener('mousemove', onMouseMove);
+    document.addEventListener('mouseup', onMouseUp);
+  };  
+});
\ No newline at end of file
diff --git a/js/i18n/en.js b/js/i18n/en.js
index b913a46..8a41886 100644
--- a/js/i18n/en.js
+++ b/js/i18n/en.js
@@ -58,7 +58,7 @@ gtiz_languages.en = {
   "fetch_error" : "Fetch request failed.",
   "font_size" : "Font size",
   "footer_disclaimer" : "This project is part of the European Joint Programme One Health EJP. This project has received funding from the European Union’s Horizon 2020 research and innovation programme under Grant Agreement No 773830.",
-  "for_branches_longer_than" : "For branches longer than:",
+  "for_branches_longer_than" : "Cut off branches longer than",
   "forbidden_net_geojson_alert" : "It seems that you do not have permission to access the GeoJson indicated in the URL. Please try logging in to <a href='{0}' target='_blank'>{1}</a> and refresh the page.",
   "forbidden_net_metadata_alert" : "It seems that you do not have permission to access Metadata indicated in the URL. Please try logging in to <a href='{0}' target='_blank'>{1}</a> and refresh the page.",
   "forbidden_net_tree_alert" : "It seems that you do not have permission to access the Tree indicated in the URL. Please try logging in to <a href='{0}' target='_blank'>{1}</a> and refresh the page.",
diff --git a/js/i18n/it.js b/js/i18n/it.js
index 16c9c01..eaa3a37 100644
--- a/js/i18n/it.js
+++ b/js/i18n/it.js
@@ -32,7 +32,7 @@ gtiz_languages.it = {
   "data_category": "Categoria dati",
   "define_a_default_value": "Definisci un valore di default",
   "define_a_value_for_selected": "Definisci un valore per i selezionati",
-  "define_a_value_for_unselected": "Definisci un valore per i <non selezionati",
+  "define_a_value_for_unselected": "Definisci un valore per i non selezionati",
   "define_column": "Definisci colonna",
   "define_for_selected": "Definisci per selezionati",
   "define_for_unselected": "Definisci per non selezionati",
@@ -58,7 +58,7 @@ gtiz_languages.it = {
   "fetch_error" : "La richiesta di caricamento del file non è riuscita.",
   "font_size" : "Dimensione carattere",
   "footer_disclaimer" : "Questo progetto fa parte dell'European Joint Programme One Health EJP. Il progetto ha ricevuto finanziamenti dal programma di ricerca e innovazione Horizon 2020 dell'Unione Europea nell'ambito del Grant Agreement No 773830.",
-  "for_branches_longer_than" : "Per collegamenti più lunghi di:",
+  "for_branches_longer_than" : "Taglia collegamenti più lunghi di",
   "forbidden_net_geojson_alert" : "Sembra che tu non abbia i permessi per accedere al GeoJson indicato nella URL. Prova a fare la login su <a href='{0}' target='_blank'>{1}</a> ed aggiorna la pagina.",
   "forbidden_net_metadata_alert" : "Sembra che tu non abbia i permessi per accedere ai Metadati indicati nella URL. Prova a fare la login su <a href='{0}' target='_blank'>{1}</a> ed aggiorna la pagina.",
   "forbidden_net_tree_alert" : "Sembra che tu non abbia i permessi per accedere al Tree indicato nella URL. Prova a fare la login su <a href='{0}' target='_blank'>{1}</a> ed aggiorna la pagina.",
diff --git a/js/languages.js b/js/languages.js
index d66ac53..6cb42de 100644
--- a/js/languages.js
+++ b/js/languages.js
@@ -63,7 +63,7 @@ gtiz_languages.en = {
   "fetch_error" : "Fetch request failed.",
   "font_size" : "Font size",
   "footer_disclaimer" : "This project is part of the European Joint Programme One Health EJP. This project has received funding from the European Union’s Horizon 2020 research and innovation programme under Grant Agreement No 773830.",
-  "for_branches_longer_than" : "For branches longer than:",
+  "for_branches_longer_than" : "Cut off branches longer than",
   "forbidden_net_geojson_alert" : "It seems that you do not have permission to access the GeoJson indicated in the URL. Please try logging in to <a href='{0}' target='_blank'>{1}</a> and refresh the page.",
   "forbidden_net_metadata_alert" : "It seems that you do not have permission to access Metadata indicated in the URL. Please try logging in to <a href='{0}' target='_blank'>{1}</a> and refresh the page.",
   "forbidden_net_tree_alert" : "It seems that you do not have permission to access the Tree indicated in the URL. Please try logging in to <a href='{0}' target='_blank'>{1}</a> and refresh the page.",
@@ -293,7 +293,7 @@ gtiz_languages.it = {
   "data_category": "Categoria dati",
   "define_a_default_value": "Definisci un valore di default",
   "define_a_value_for_selected": "Definisci un valore per i selezionati",
-  "define_a_value_for_unselected": "Definisci un valore per i <non selezionati",
+  "define_a_value_for_unselected": "Definisci un valore per i non selezionati",
   "define_column": "Definisci colonna",
   "define_for_selected": "Definisci per selezionati",
   "define_for_unselected": "Definisci per non selezionati",
@@ -319,7 +319,7 @@ gtiz_languages.it = {
   "fetch_error" : "La richiesta di caricamento del file non è riuscita.",
   "font_size" : "Dimensione carattere",
   "footer_disclaimer" : "Questo progetto fa parte dell'European Joint Programme One Health EJP. Il progetto ha ricevuto finanziamenti dal programma di ricerca e innovazione Horizon 2020 dell'Unione Europea nell'ambito del Grant Agreement No 773830.",
-  "for_branches_longer_than" : "Per collegamenti più lunghi di:",
+  "for_branches_longer_than" : "Taglia collegamenti più lunghi di",
   "forbidden_net_geojson_alert" : "Sembra che tu non abbia i permessi per accedere al GeoJson indicato nella URL. Prova a fare la login su <a href='{0}' target='_blank'>{1}</a> ed aggiorna la pagina.",
   "forbidden_net_metadata_alert" : "Sembra che tu non abbia i permessi per accedere ai Metadati indicati nella URL. Prova a fare la login su <a href='{0}' target='_blank'>{1}</a> ed aggiorna la pagina.",
   "forbidden_net_tree_alert" : "Sembra che tu non abbia i permessi per accedere al Tree indicato nella URL. Prova a fare la login su <a href='{0}' target='_blank'>{1}</a> ed aggiorna la pagina.",
diff --git a/js/layout.js b/js/layout.js
index 1c07ed0..207a143 100644
--- a/js/layout.js
+++ b/js/layout.js
@@ -182,6 +182,17 @@ gtiz_layout.expandComponent = function(component, trigger) {
   } else {
     trigger.innerHTML = '<i class="iconic iconic-maximize"></i>';
   }
+
+  if (component == 'map') {
+    if (gtiz_map.initialized) {
+      gtiz_map.init();
+      gtiz_layout.resizeMap();
+    }
+  }
+  if (component == 'tree') {
+    gtiz_layout.resizeTree();
+  }
+
 }
 
 /**
@@ -372,6 +383,8 @@ gtiz_layout.setView = function(obj) {
     gtiz_layout.body.setAttribute('class', 'show-notifier dashboard dashboard-grapetree');
   } else if (gtiz_layout.body.classList.contains('show-modal')) {
     gtiz_layout.body.setAttribute('class', 'show-modal dashboard dashboard-grapetree');
+  } else if (gtiz_layout.body.classList.contains('show-search-engine')) {
+    gtiz_layout.body.setAttribute('class', 'show-search-engine dashboard dashboard-grapetree');
   } else {
     gtiz_layout.body.setAttribute('class', 'dashboard dashboard-grapetree');
   }
@@ -406,8 +419,12 @@ gtiz_layout.setView = function(obj) {
     gtiz_layout.setLegendHeight();
   }
   if (gtiz_layout.settings == 'on') {
+    gtiz_layout.settings_node.classList.add('settings-on');
     gtiz_settings.init();
   }
+  if (gtiz_layout.settings == 'off') {
+    gtiz_layout.settings_node.classList.remove('settings-on');
+  }
   if (gtiz_layout.map == 'on' && gtiz_map.initialized) {
     gtiz_map.init();
     gtiz_layout.resizeMap();
diff --git a/js/legend.js b/js/legend.js
index b31987a..1ca10c9 100644
--- a/js/legend.js
+++ b/js/legend.js
@@ -186,7 +186,7 @@ gtiz_legend.context_menu = [{
     let category = gtiz_tree.tree.display_category;
     gtiz_legend.changeGroupOrder(value, category, true);
   }
-}, , {
+}, {
   type : 'select',
   id : 'legend-menu-color-scheme',
   label : () => {
diff --git a/js/search.js b/js/search.js
new file mode 100644
index 0000000..9fc4168
--- /dev/null
+++ b/js/search.js
@@ -0,0 +1,387 @@
+let gtiz_search = {};
+
+gtiz_search.tree = [...gtiz_tree.context_menu];
+gtiz_search.tree.forEach(item => {
+  item.hierarchy = 'tree';
+  item.category = 'tree';
+});
+gtiz_search.rendering = gtiz_settings.cfg.find(item => item.card === 'rendering').menu;
+gtiz_search.rendering.forEach(item => {
+  item.hierarchy = 'settings/rendering';
+  item.category = 'rendering';
+});
+gtiz_search.node_style = gtiz_settings.cfg.find(item => item.card === 'node-style').menu;
+gtiz_search.node_style.forEach(item => {
+  item.hierarchy = 'settings/node-style';
+  item.category = 'node-style';
+});
+gtiz_search.node_size = gtiz_settings.cfg.find(item => item.card === 'node-size').menu;
+gtiz_search.node_size.forEach(item => {
+  item.hierarchy = 'settings/node-size';
+  item.category = 'node-size';
+});
+gtiz_search.branch_style = gtiz_settings.cfg.find(item => item.card === 'branch-style').menu;
+gtiz_search.branch_style.forEach(item => {
+  item.hierarchy = 'settings/branch-style';
+  item.category = 'branch-style';
+});
+gtiz_search.branch_cutoffs = gtiz_settings.cfg.find(item => item.card === 'branch-cutoffs').menu;
+gtiz_search.branch_cutoffs.forEach(item => {
+  item.hierarchy = 'settings/branch-cutoffs';
+  item.category = 'branch-cutoffs';
+});
+gtiz_search.legend = [...gtiz_legend.context_menu];
+gtiz_search.legend.forEach(item => {
+  item.hierarchy = 'legend';
+  item.category = 'legend';
+});
+gtiz_search.map = [...gtiz_map.context_menu];
+gtiz_search.map.forEach(item => {
+  item.hierarchy = 'map';
+  item.category = 'map';
+});
+gtiz_search.metadata = [...gtiz_metadata.context_menu];
+gtiz_search.metadata.forEach(item => {
+  item.hierarchy = 'metadata';
+  item.category = 'metadata';
+});
+
+gtiz_search.obj = [...gtiz_search.tree, ...gtiz_search.rendering, ...gtiz_search.node_style, ...gtiz_search.node_size, ...gtiz_search.branch_style, ...gtiz_search.branch_cutoffs, ...gtiz_search.legend, ...gtiz_search.map, ...gtiz_search.metadata];
+
+gtiz_search.engine_node = document.querySelector('.search-engine');
+gtiz_search.trigger = document.querySelector('.tool-search');
+gtiz_search.input = document.getElementById('search-functions');
+gtiz_search.engine_close = document.querySelector('.search-engine-close');
+
+/**
+ * Function node to highlight after search
+ * 
+ * @param {DOM Node} node 
+ */
+gtiz_search.highlight = function(node) {
+  node.classList.add('search-highlight');
+  setTimeout(function() {
+    node.classList.remove('search-highlight');
+  }, 4000);
+};
+
+/**
+ * Function to find the node and highlight it
+ * 
+ * @param {*} item 
+ */
+gtiz_search.findFunction = function(item) {
+  if (item.hierarchy.includes('settings')) {
+    gtiz_settings.cfg.forEach(card => {
+      if (card.card === item.category) {
+        card.expanded = true;
+      } else {
+        card.expanded = false;
+      }
+    });
+    let toggle = document.querySelector('.toggle-box[data-view="settings"]');
+    let cards = document.querySelectorAll('.settings .card-expandable');
+    let card = document.querySelector('.card-' + item.category);
+    if (toggle) {
+      // check if toggle has data-selection attribute set to off
+      let selection = toggle.getAttribute('data-selection');
+      if (selection === 'off') {
+        toggle.click();
+      } else {
+        cards.forEach(card => {
+          if (card.classList.contains('expanded')) {
+            let trigger = card.querySelector('.card-expand-trigger');
+            trigger.click();
+          }
+        });
+        if (card) {
+          let trigger = card.querySelector('.card-expand-trigger');
+          trigger.click();
+        }
+      }
+      if (card) {
+        let nodes = card.querySelectorAll('*');
+        nodes.forEach(node => {
+          if ((node.children.length === 0 || node.children[0].nodeName.toLocaleLowerCase() === 'i') && node.innerHTML.includes(item.label)) {
+            gtiz_search.highlight(node);
+          }
+        });
+      }
+    }
+  } else {
+    let toggle = document.querySelector('.toggle-box[data-view="' + item.category + '"]');
+    let trigger = document.querySelector('[data-menu-type="' + item.category + '"]');
+    if (toggle) {
+      // check if toggle has data-selection attribute set to off
+      let selection = toggle.getAttribute('data-selection');
+      if (selection === 'off') {
+        toggle.click();
+      }
+    }
+    if (trigger) {
+      trigger.click();
+      let menu = document.querySelector('.context-menu-' + item.category);
+      if (menu) {
+        let nodes = menu.querySelectorAll('*');
+        nodes.forEach(node => {
+          if ((node.children.length === 0 || node.children[0].nodeName.toLocaleLowerCase() === 'i') && node.innerHTML.includes(item.label)) {
+            gtiz_search.highlight(node);
+          }
+        });
+      }
+    }
+  }
+};
+
+/**
+ * Get menu items from the object
+ * 
+ * @param {Oject} obj 
+ * @returns 
+ */
+gtiz_search.getMenu = function(obj) {
+  let menu = [];
+  obj.forEach(item => {
+    if (item.type !== 'separator') {
+      if (item.type === 'toggle') {
+        item.options.forEach(option => {
+          if (!option.label) {
+            return;
+          }
+          let obj = {
+            hierarchy : item.hierarchy ? item.hierarchy : undefined,
+            category : item.category ? item.category : undefined,
+            id : item.id ? item.id : undefined,
+            label : typeof option.label === 'function' ? option.label() : option.label,
+            icon : option.icon ? option.icon : undefined
+          };
+          if (!menu.some(menuItem => menuItem.label === obj.label)) {
+            menu.push(obj);
+          }
+        });
+      } else if (item.type === 'select') {
+        if (!item.label) {
+          return;
+        }
+        let obj = {
+          hierarchy : item.hierarchy ? item.hierarchy : undefined,
+          category : item.category ? item.category : undefined,
+          id : item.id ? item.id : undefined,
+          label : typeof item.label === 'function' ? item.label() : item.label,
+          icon : 'iconic-cursor'
+        };
+        menu.push(obj);
+      } else if (item.type === 'number') {
+        if (!item.label) {
+          return;
+        }
+        let obj = {
+          hierarchy : item.hierarchy ? item.hierarchy : undefined,
+          category : item.category ? item.category : undefined,
+          id : item.id ? item.id : undefined,
+          label : typeof item.label === 'function' ? item.label() : item.label,
+          icon : 'iconic-keyboard'
+        };
+        menu.push(obj);
+      } else if (item.type === 'search') {
+        if (!item.label) {
+          return;
+        }
+        let obj = {
+          hierarchy : item.hierarchy ? item.hierarchy : undefined,
+          category : item.category ? item.category : undefined,
+          id : item.id ? item.id : undefined,
+          label : typeof item.label === 'function' ? item.label() : item.label,
+          icon : 'iconic-search'
+        };
+        menu.push(obj);
+      } else if (item.type === 'radio') {
+        item.options.forEach(option => {
+          if (!option.label) {
+            return;
+          }
+          let obj = {
+            hierarchy : item.hierarchy ? item.hierarchy : undefined,
+            category : item.category ? item.category : undefined,
+            id : item.id ? item.id : undefined,
+            label : typeof option.label === 'function' ? option.label() : option.label,
+            icon : 'iconic-check-circle'
+          };
+          menu.push(obj);
+        });
+      } else {
+        if (!item.label) {
+          return;
+        }
+        let obj = {
+          hierarchy : item.hierarchy ? item.hierarchy : 'Other',
+          category : item.category ? item.category : 'Other',
+          id : item.id ? item.id : undefined,
+          label : typeof item.label === 'function' ? item.label() : item.label,
+          icon : item.icon ? item.icon : 'iconic-cursor'
+        };
+        menu.push(obj);
+      }
+    }
+  });
+  return menu;
+};
+
+/**
+ * Build the search engine UI
+ * 
+ * @param {Object} menu 
+ */
+gtiz_search.buildUi = function(menu) {
+  let container = document.querySelector('.search-engine-body');
+  let results = container.querySelector('.search-results');
+  if (results) {
+    results.innerHTML = '';
+  } else {
+    results = document.createElement('div');
+    results.classList.add('search-results');
+    container.append(results);
+  }
+  menu.forEach((item, index) => {
+    let result = results.querySelector('.search-result-' + item.category);
+    if (!result) {
+      result = document.createElement('div');
+      result.setAttribute('class', 'search-result search-result-' + item.category);
+      results.append(result);
+    }
+    let title = results.querySelector('.search-result-title-' + item.category);
+    if (!title) {
+      title = document.createElement('h3');
+      title.setAttribute('class', 'search-result-title search-result-title-' + item.category);
+      result.append(title);
+      switch (item.category) {
+        case 'tree':
+          title.innerHTML = gtiz_locales.current.tree_tools;
+          break;
+        case 'rendering':
+            title.innerHTML = gtiz_locales.current.rendering;
+            break;
+        case 'node-style':
+          title.innerHTML = gtiz_locales.current.node_style;
+          break;
+        case 'node-size':
+          title.innerHTML = gtiz_locales.current.node_size;
+          break;
+        case 'branch-style':
+          title.innerHTML = gtiz_locales.current.branch_style;
+          break;
+        case 'branch-cutoffs':
+          title.innerHTML = gtiz_locales.current.branch_cutoffs;
+          break;
+        case 'legend':
+          title.innerHTML = gtiz_locales.current.legend_tools;
+          break;
+        case 'map':
+          title.innerHTML = gtiz_locales.current.map_tools;
+          break;
+        case 'metadata':
+          title.innerHTML = gtiz_locales.current.metadata_tools;
+          break;
+      }
+    }
+    let form = results.querySelector('.search-result-form-' + item.category);
+    if (!form) {
+      form = document.createElement('div');
+      form.setAttribute('class', 'search-result-form search-result-form-' + item.category);
+      result.append(form);
+    }
+    let button_box = document.createElement('div');
+    button_box.setAttribute('class', 'button-box');
+    form.append(button_box);
+    let button = document.createElement('a');
+    button.setAttribute('class', 'search-action');
+    let icon = item.icon ? item.icon : 'iconic-arrow-right';
+    button.innerHTML = '<i class="iconic ' + icon + '"></i> ' + item.label;
+    button.addEventListener('click', function(e) {
+      gtiz_search.findFunction(item);
+      gtiz_search.toggleSearchEngine();
+    });
+    button_box.append(button);
+  });
+  container.append(results);
+};
+
+/**
+ * Toggle search engine
+ * 
+ */
+gtiz_search.toggleSearchEngine = function() {
+  let body = document.querySelector('body');
+  body.classList.toggle('show-search-engine');
+  if (body.classList.contains('show-search-engine')) {
+    setTimeout(function() {
+      gtiz_search.input.focus();
+    }, 600);
+    let menu = gtiz_search.getMenu(gtiz_search.obj);
+    gtiz_search.buildUi(menu);
+  } else {
+    gtiz_search.input.value = '';
+    let results = document.querySelector('.search-results');
+    if (results) {
+      results.remove();
+    }
+  }
+};
+
+gtiz_search.input.addEventListener('input', function(e) {
+  let parent = e.target.closest('.search-engine-body');
+  let keyword = e.target.value.toLowerCase();
+  if (keyword.length >= 3) {
+    let matching_keys = Object.entries(gtiz_locales.current).filter(function([key, value]) {
+      if (typeof value === 'string') {
+        let target = value.toLowerCase();
+        return target.includes(keyword);
+      }
+    }).map(([key, value]) => value);
+
+    let is_label_present = gtiz_search.obj.filter(item => {
+      if (item.type === 'toggle') {
+        if (item.options && item.options.length > 0) {
+          let labels = [];
+          item.options.forEach(option => {
+            if (typeof option.label === 'function') {
+              labels.push(option.label());
+            } else {
+              labels.push(option.label);
+            }
+          });
+          return labels.some(label => matching_keys.includes(label));
+        }
+      } else if (item.type === 'separator') {
+        return false;
+      } else {
+        if (item.label) {
+          if (typeof item.label === 'function') {
+            return matching_keys.includes(item.label());
+          } else {
+            return matching_keys.includes(item.label);
+          } 
+        }
+      }
+    });
+    let menu = gtiz_search.getMenu(is_label_present);
+    gtiz_search.buildUi(menu);
+  } else {
+    let menu = gtiz_search.getMenu(gtiz_search.obj);
+    gtiz_search.buildUi(menu);
+  }
+});
+
+gtiz_search.engine_node.addEventListener('click', function(e) {
+  if (e.target == gtiz_search.engine_node) {
+    gtiz_search.toggleSearchEngine();
+  }
+});
+
+gtiz_search.engine_close.addEventListener('click', function() {
+  gtiz_search.toggleSearchEngine();
+});
+
+gtiz_search.trigger.addEventListener('click', function() {
+  gtiz_search.toggleSearchEngine();
+});
\ No newline at end of file
diff --git a/js/settings.js b/js/settings.js
index 82047ce..6ae7f5a 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -1,32 +1,6 @@
 let gtiz_settings = {};
 
 gtiz_settings.cfg = [{
-  card: 'tree-layout',
-  expanded: true,
-  visible: true,
-  menu: [{
-    type : 'abutton',
-    label : gtiz_locales.current.centre_tree,
-    icon : 'iconic-target',
-    function : () => {
-      gtiz_tree.treeCenter();
-    }
-  }, {
-    type : 'abutton',
-    label : gtiz_locales.current.static_redraw,
-    icon : 'iconic-edit',
-    function : () => {
-      gtiz_tree.treeStaticRedraw();
-    }
-  }, {
-    type : 'abutton',
-    label : gtiz_locales.current.original_tree,
-    icon : 'iconic-monitor',
-    function : () => {
-      gtiz_tree.originalTree();
-    }
-  }]
-}, {
   card: 'node-style',
   expanded: true,
   visible: true,
@@ -53,14 +27,14 @@ gtiz_settings.cfg = [{
     type : 'toggle',
     id : 'tree-show-node-labels',
     options : [{
-        label : gtiz_locales.current.show_labels,
+      label : gtiz_locales.current.show_labels,
+      value : 'shown',
+      icon : 'iconic-eye'
+    }, {
+        label : gtiz_locales.current.hide_labels,
         value : 'hidden',
         icon : 'iconic-eye-off'
-      }, {
-        label : gtiz_locales.current.hide_labels,
-        value : 'shown',
-        icon : 'iconic-eye'
-    }],
+      }],
     selected : () => {
       return  gtiz_tree.show_node_labels;
     },
@@ -124,13 +98,13 @@ gtiz_settings.cfg = [{
     type : 'toggle',
     id : 'tree-show-individual-segments',
     options : [{
-        label : gtiz_locales.current.individual_segments,
-        value : 'hidden',
-        icon : 'iconic-eye-off'
-      }, {
         label : gtiz_locales.current.individual_segments,
         value : 'shown',
         icon : 'iconic-eye'
+    }, {
+      label : gtiz_locales.current.individual_segments,
+      value : 'hidden',
+      icon : 'iconic-eye-off'
     }],
     selected : () => {
       return  gtiz_tree.individual_segments;
@@ -141,7 +115,7 @@ gtiz_settings.cfg = [{
   }]
 }, {
   card : 'node-size',
-  expanded : true,
+  expanded : false,
   visible : true,
   menu : [{
     type : 'slider',
@@ -188,19 +162,19 @@ gtiz_settings.cfg = [{
   },]
 }, {
   card : 'branch-style',
-  expanded : true,
+  expanded : false,
   visible : true,
   menu : [{
     type : 'toggle',
     id : 'tree-show-branch-labels',
     options : [{
-        label : gtiz_locales.current.show_labels,
-        value : 'hidden',
-        icon : 'iconic-eye-off'
-      }, {
-        label : gtiz_locales.current.hide_labels,
-        value : 'shown',
-        icon : 'iconic-eye'
+      label : gtiz_locales.current.show_labels,
+      value : 'shown',
+      icon : 'iconic-eye'
+    }, {
+      label : gtiz_locales.current.hide_labels,
+      value : 'hidden',
+      icon : 'iconic-eye-off'
     }],
     selected : () => {
       return  gtiz_tree.show_branch_labels;
@@ -283,13 +257,13 @@ gtiz_settings.cfg = [{
     type : 'toggle',
     id : 'tree-branch-toggle-log-scale',
     options : [{
-        label : gtiz_locales.current.log_scale,
-        value : 'not-active',
-        icon : 'iconic-ban'
-      }, {
-        label : gtiz_locales.current.log_scale,
-        value : 'active',
-        icon : 'iconic-check-circle'
+      label : gtiz_locales.current.log_scale,
+      value : 'active',
+      icon : 'iconic-check-circle'
+    }, {
+      label : gtiz_locales.current.log_scale,
+      value : 'not-active',
+      icon : 'iconic-ban'
     }],
     selected : () => {
       return  gtiz_tree.branch_log_scale;
@@ -300,7 +274,7 @@ gtiz_settings.cfg = [{
   }]
 }, {
   card: 'branch-cutoffs',
-  expanded : true,
+  expanded : false,
   visible : true,
   menu : [{
     type : 'number',
@@ -345,7 +319,7 @@ gtiz_settings.cfg = [{
   }]
 }, {
   card: 'rendering',
-  expanded: true,
+  expanded: false,
   visible: true,
   menu: [{
     type : 'toggle',
@@ -516,9 +490,9 @@ gtiz_settings.exp_triggers.forEach(function (item) {
   item.addEventListener('click', gtiz_settings.expandCard, false);
 });
 
-gtiz_settings.card_titles.forEach(function (item) {
+/* gtiz_settings.card_titles.forEach(function (item) {
   item.addEventListener('click', gtiz_settings.expandCard, false);
-});
+}); */
 
 gtiz_settings.buildForm = function(form, menu) {
   if (form && menu) {
@@ -654,7 +628,7 @@ gtiz_settings.buildForm = function(form, menu) {
         let bar = document.createElement('div');
         bar.setAttribute('class', 'slider-bar');
         let handler = document.createElement('div');
-        handler.setAttribute('class', 'slider-handler');
+        handler.setAttribute('class', 'slider-handler not-draggable');
         if (item.tolerance) {
           handler.setAttribute('data-tolerance', item.tolerance);
         }
diff --git a/js/tree.js b/js/tree.js
index e0f2389..7bf09b2 100644
--- a/js/tree.js
+++ b/js/tree.js
@@ -876,10 +876,8 @@ gtiz_tree.treeLoaded = function(tree) {
         }
         // tree.clearSelection();
       }
-      if (gtiz_tree.change_counter > 1) {
-        if (gtiz_map.geojson != '' && gtiz_layout.map == 'on') {
-          gtiz_map.defineMarkers();
-        }
+      if (gtiz_map.geojson != '' && gtiz_layout.map == 'on') {
+        gtiz_map.defineMarkers();
       }
       gtiz_tree.change_counter++;
     }
@@ -1507,7 +1505,9 @@ gtiz_tree.context_menu = [{
   type : 'separator'
 }, {
   type : 'abutton',
-  label : gtiz_locales.current.save_spread,
+  label : () => {
+    return gtiz_locales.current.save_spread
+  },
   icon : 'iconic-folder',
   function : () => {
     let mode = 'save';
@@ -1515,7 +1515,9 @@ gtiz_tree.context_menu = [{
   }
 }, {
   type : 'abutton',
-  label : gtiz_locales.current.load_spread,
+  label : () => {
+    return gtiz_locales.current.load_spread
+  },
   icon : 'iconic-file-plus',
   function : () => {
     let mode = 'load';
diff --git a/themes/cohesive/css/vars.css b/themes/cohesive/css/vars.css
index b149511..c3d665b 100644
--- a/themes/cohesive/css/vars.css
+++ b/themes/cohesive/css/vars.css
@@ -17,6 +17,7 @@
   --white: #ffffff;
   --red: #F83E5A;
   --red-dark: #DE3750;
+  --highlight: #eeff00;
   --font-family: 'Open Sans', sans-serif;
 }
 
diff --git a/themes/default/css/vars.css b/themes/default/css/vars.css
index 8f7e1aa..38d42ee 100644
--- a/themes/default/css/vars.css
+++ b/themes/default/css/vars.css
@@ -17,6 +17,7 @@
   --white: #ffffff;
   --red: #F83E5A;
   --red-dark: #DE3750;
+  --highlight: #eeff00;
   --font-family: 'Titillium', sans-serif;
 }
 
diff --git a/themes/genpat/css/vars.css b/themes/genpat/css/vars.css
index 8f7e1aa..38d42ee 100644
--- a/themes/genpat/css/vars.css
+++ b/themes/genpat/css/vars.css
@@ -17,6 +17,7 @@
   --white: #ffffff;
   --red: #F83E5A;
   --red-dark: #DE3750;
+  --highlight: #eeff00;
   --font-family: 'Titillium', sans-serif;
 }