diff --git a/wise-webapp/src/main/webapp/css/header.less b/wise-webapp/src/main/webapp/css/header.less
index 67c32f59..c21896ba 100644
--- a/wise-webapp/src/main/webapp/css/header.less
+++ b/wise-webapp/src/main/webapp/css/header.less
@@ -90,17 +90,6 @@ div#headerNotifier {
 
 @import "toolbar.less";
 
-div#embFooter {
-    position: absolute;
-    height: 35px;
-    width: 100%;
-    bottom: 0;
-    left: 0;
-    border-top: 1px solid black;
-    background: #E5E5E5;
-    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
-}
-
 /* FIXME: duplicate in mindmapList
  ---------------------------- Scrollbar --------------------------------- */
 ::-webkit-scrollbar {
diff --git a/wise-webapp/src/main/webapp/css/embedded.less b/wise-webapp/src/main/webapp/css/viewonly.less
similarity index 84%
rename from wise-webapp/src/main/webapp/css/embedded.less
rename to wise-webapp/src/main/webapp/css/viewonly.less
index dc121126..5011b657 100644
--- a/wise-webapp/src/main/webapp/css/embedded.less
+++ b/wise-webapp/src/main/webapp/css/viewonly.less
@@ -27,14 +27,21 @@ div#footer {
 }
 
 div#footerLogo {
-    width: 114px;
-    height: 56px;
     position: absolute;
     display: list-item;
-    list-style-image: url(../../images/logo-xsmall.png);
+    list-style-image: url(../../images/pwrdby-white.svg);
     list-style-position: inside;
-    right: 10px;
-    top: -30px;
+    right: 5px;
+    top: 5px;
+}
+
+div#embFooter {
+    position: absolute;
+    height: 55px;
+    width: 100%;
+    bottom: 0;
+    left: 0;
+    background: rgb(249, 168, 38)
 }
 
 div#zoomIn {
@@ -69,9 +76,9 @@ div#zoomIn {
 
 div#mapDetails {
     float: right;
-    padding-top: 10px;
+    padding-top: 20px;
     margin-right: 130px;
-
+    font-size: 15px;
 }
 
 div#mapDetails .title {
@@ -98,7 +105,6 @@ div#infoPanel .textNode {
     background-color: #E0E5EF;
     height: 20px;
     width: 80px;
-    border: 3px #023BB9 solid;
     padding: 4px;
     cursor: move
 }
diff --git a/wise-webapp/src/main/webapp/images/editor/ajax-loader.gif b/wise-webapp/src/main/webapp/images/editor/ajax-loader.gif
deleted file mode 100644
index 92153b08..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/ajax-loader.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/alert-sign.png b/wise-webapp/src/main/webapp/images/editor/alert-sign.png
deleted file mode 100644
index 8d3e5df0..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/alert-sign.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/btn-bg-hover.png b/wise-webapp/src/main/webapp/images/editor/btn-bg-hover.png
deleted file mode 100644
index ee07c4c2..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/btn-bg-hover.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/btn-bg-normal.png b/wise-webapp/src/main/webapp/images/editor/btn-bg-normal.png
deleted file mode 100644
index 50b333be..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/btn-bg-normal.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/btne-bg-hover.png b/wise-webapp/src/main/webapp/images/editor/btne-bg-hover.png
deleted file mode 100644
index 5ea2e15b..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/btne-bg-hover.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/btne-bg-normal.png b/wise-webapp/src/main/webapp/images/editor/btne-bg-normal.png
deleted file mode 100644
index 378476a9..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/btne-bg-normal.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/btne-bg-selected.png b/wise-webapp/src/main/webapp/images/editor/btne-bg-selected.png
deleted file mode 100644
index 32194e81..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/btne-bg-selected.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/discard.png b/wise-webapp/src/main/webapp/images/editor/discard.png
deleted file mode 100644
index 63cec6ed..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/discard.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/editortoolbar.png b/wise-webapp/src/main/webapp/images/editor/editortoolbar.png
deleted file mode 100644
index 1dc5c8e6..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/editortoolbar.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/export.png b/wise-webapp/src/main/webapp/images/editor/export.png
deleted file mode 100644
index e8463255..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/export.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/favicon.ico b/wise-webapp/src/main/webapp/images/editor/favicon.ico
deleted file mode 100644
index f25eeaf4..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/favicon.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/font-bold.png b/wise-webapp/src/main/webapp/images/editor/font-bold.png
deleted file mode 100644
index 15cfbc16..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/font-bold.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/font-color.png b/wise-webapp/src/main/webapp/images/editor/font-color.png
deleted file mode 100644
index 1c2761df..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/font-color.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/font-italic.png b/wise-webapp/src/main/webapp/images/editor/font-italic.png
deleted file mode 100644
index 59e79cf0..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/font-italic.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/font-size.png b/wise-webapp/src/main/webapp/images/editor/font-size.png
deleted file mode 100644
index 8fa9500f..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/font-size.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/font-type.png b/wise-webapp/src/main/webapp/images/editor/font-type.png
deleted file mode 100644
index 7b9ba609..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/font-type.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/history.png b/wise-webapp/src/main/webapp/images/editor/history.png
deleted file mode 100644
index fa33bab4..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/history.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/links.png b/wise-webapp/src/main/webapp/images/editor/links.png
deleted file mode 100644
index dd3b830f..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/links.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/logo-135x135.png b/wise-webapp/src/main/webapp/images/editor/logo-135x135.png
deleted file mode 100644
index 8805e2ba..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/logo-135x135.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/logo-head-only.png b/wise-webapp/src/main/webapp/images/editor/logo-head-only.png
deleted file mode 100644
index 70372f61..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/logo-head-only.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/logo-medium.png b/wise-webapp/src/main/webapp/images/editor/logo-medium.png
deleted file mode 100644
index fca901db..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/logo-medium.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/logo-small.png b/wise-webapp/src/main/webapp/images/editor/logo-small.png
deleted file mode 100644
index 107b817b..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/logo-small.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/logo-xsmall.png b/wise-webapp/src/main/webapp/images/editor/logo-xsmall.png
deleted file mode 100644
index 98ee18df..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/logo-xsmall.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/notes.png b/wise-webapp/src/main/webapp/images/editor/notes.png
deleted file mode 100644
index bf438b1d..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/notes.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/print.png b/wise-webapp/src/main/webapp/images/editor/print.png
deleted file mode 100644
index 6c3788ba..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/print.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/public.png b/wise-webapp/src/main/webapp/images/editor/public.png
deleted file mode 100644
index eba5b64f..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/public.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/redo.png b/wise-webapp/src/main/webapp/images/editor/redo.png
deleted file mode 100644
index d904c0c4..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/redo.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/save.png b/wise-webapp/src/main/webapp/images/editor/save.png
deleted file mode 100644
index 174c6d6e..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/save.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/shape-circle.png b/wise-webapp/src/main/webapp/images/editor/shape-circle.png
deleted file mode 100644
index cae3eead..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/shape-circle.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/shape-line.png b/wise-webapp/src/main/webapp/images/editor/shape-line.png
deleted file mode 100644
index 89f5a5bc..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/shape-line.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/shape-rectangle-round.png b/wise-webapp/src/main/webapp/images/editor/shape-rectangle-round.png
deleted file mode 100644
index c34e767c..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/shape-rectangle-round.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/shape-rectangle.png b/wise-webapp/src/main/webapp/images/editor/shape-rectangle.png
deleted file mode 100644
index 9f05ac23..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/shape-rectangle.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/share.png b/wise-webapp/src/main/webapp/images/editor/share.png
deleted file mode 100644
index c2aa4494..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/share.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/tag.png b/wise-webapp/src/main/webapp/images/editor/tag.png
deleted file mode 100644
index d595a8ba..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/tag.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/topic-add.png b/wise-webapp/src/main/webapp/images/editor/topic-add.png
deleted file mode 100644
index 3d572e72..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/topic-add.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/topic-border.png b/wise-webapp/src/main/webapp/images/editor/topic-border.png
deleted file mode 100644
index e0617e7c..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/topic-border.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/topic-color.png b/wise-webapp/src/main/webapp/images/editor/topic-color.png
deleted file mode 100644
index b923d89a..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/topic-color.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/topic-delete.png b/wise-webapp/src/main/webapp/images/editor/topic-delete.png
deleted file mode 100644
index 1499e58e..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/topic-delete.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/topic-icon.png b/wise-webapp/src/main/webapp/images/editor/topic-icon.png
deleted file mode 100644
index 1bb8c98d..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/topic-icon.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/topic-link.png b/wise-webapp/src/main/webapp/images/editor/topic-link.png
deleted file mode 100644
index e5a05326..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/topic-link.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/topic-note.png b/wise-webapp/src/main/webapp/images/editor/topic-note.png
deleted file mode 100644
index 5c9aeaae..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/topic-note.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/topic-relation.png b/wise-webapp/src/main/webapp/images/editor/topic-relation.png
deleted file mode 100644
index 3f8ebcfa..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/topic-relation.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/topic-shape.png b/wise-webapp/src/main/webapp/images/editor/topic-shape.png
deleted file mode 100644
index 8937ca9b..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/topic-shape.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/undo.png b/wise-webapp/src/main/webapp/images/editor/undo.png
deleted file mode 100644
index 5133b949..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/undo.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/zoom-in.png b/wise-webapp/src/main/webapp/images/editor/zoom-in.png
deleted file mode 100644
index 008cfc49..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/zoom-in.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/editor/zoom-out.png b/wise-webapp/src/main/webapp/images/editor/zoom-out.png
deleted file mode 100644
index 158563a2..00000000
Binary files a/wise-webapp/src/main/webapp/images/editor/zoom-out.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/pwrdby-white.svg b/wise-webapp/src/main/webapp/images/pwrdby-white.svg
new file mode 100644
index 00000000..cf8d9c3a
--- /dev/null
+++ b/wise-webapp/src/main/webapp/images/pwrdby-white.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="-0.761 -13.867 82.373 46.449" width="82.373px" height="46.449px" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#fff" d="M7.668 9.403C7.4 10.43 7.11 11.45 6.8 12.463c-.296 1.014-.612 2.034-.948 3.06h-2.34c-.243-.567-.505-1.242-.788-2.026-.282-.784-.578-1.635-.888-2.553-.296-.933-.605-1.912-.928-2.939C.598 6.965.296 5.918 0 4.864h3.168c.108.486.222 1.02.343 1.6.135.568.27 1.156.404 1.764.148.608.296 1.223.444 1.844.161.608.323 1.196.484 1.763.175-.594.343-1.202.505-1.824.174-.621.336-1.23.484-1.824.161-.608.31-1.188.444-1.742.148-.568.276-1.095.383-1.581h2.18c.107.486.228 1.013.363 1.58l.424 1.743c.148.595.302 1.203.464 1.824.161.622.33 1.23.504 1.824.162-.567.323-1.155.485-1.763.16-.621.309-1.236.443-1.844.148-.608.283-1.196.404-1.763.134-.581.256-1.115.363-1.601h3.128c-.296 1.054-.605 2.1-.928 3.141-.31 1.027-.619 2.006-.929 2.939-.295.918-.591 1.77-.887 2.553-.283.784-.545 1.46-.787 2.027H9.545c-.336-1.027-.666-2.047-.989-3.06-.323-1.014-.619-2.034-.888-3.06zM20.042 15.524h-3.007V4.864h3.007v10.66zm.282-13.74c0 .553-.181.992-.545 1.317-.35.31-.766.466-1.25.466-.485 0-.909-.156-1.272-.466-.35-.325-.525-.764-.525-1.318s.175-.986.525-1.297C17.62.162 18.044 0 18.528 0c.485 0 .902.162 1.251.486.364.311.545.743.545 1.297zM25.915 13.355c.552 0 .942-.054 1.17-.162.23-.108.344-.317.344-.628 0-.243-.148-.453-.444-.628-.296-.19-.747-.399-1.352-.629-.471-.175-.902-.358-1.292-.547-.377-.189-.7-.412-.968-.668-.27-.27-.478-.588-.626-.953-.148-.365-.222-.804-.222-1.317 0-1 .37-1.79 1.11-2.371.74-.581 1.755-.872 3.047-.872.646 0 1.265.06 1.857.183.591.108 1.062.23 1.412.364l-.525 2.351c-.35-.121-.733-.23-1.15-.324-.403-.095-.86-.142-1.372-.142-.942 0-1.413.263-1.413.79 0 .122.02.23.061.325.04.094.121.189.242.283.121.081.283.176.484.284.216.095.485.203.808.324.659.244 1.204.487 1.634.73.43.23.767.486 1.01.77.255.27.43.574.524.912.107.338.161.73.161 1.175 0 1.054-.397 1.851-1.19 2.392-.78.54-1.89.81-3.33.81-.942 0-1.729-.08-2.361-.243-.619-.162-1.05-.297-1.291-.405l.504-2.452c.511.202 1.036.365 1.574.486.538.108 1.07.162 1.594.162zM32.158 10.275c0-.946.141-1.77.423-2.473.296-.716.68-1.31 1.15-1.783.472-.473 1.01-.83 1.615-1.074.619-.243 1.251-.365 1.897-.365 1.507 0 2.697.466 3.572 1.398.874.92 1.311 2.277 1.311 4.074 0 .176-.006.372-.02.588-.013.202-.027.385-.04.547h-6.82c.066.621.356 1.115.867 1.48.511.364 1.197.546 2.058.546.552 0 1.09-.047 1.614-.141.539-.108.976-.237 1.312-.385l.404 2.452c-.162.08-.377.162-.646.243-.269.081-.572.149-.908.203-.323.067-.673.121-1.05.162-.376.04-.753.06-1.13.06-.955 0-1.789-.141-2.502-.425-.7-.284-1.284-.669-1.755-1.155-.458-.5-.8-1.088-1.03-1.763-.215-.676-.322-1.405-.322-2.19zM39.22 9.12c-.014-.257-.061-.507-.142-.75-.067-.243-.181-.46-.343-.649-.148-.189-.343-.344-.585-.466-.229-.121-.518-.182-.868-.182-.336 0-.625.06-.867.182-.243.108-.444.257-.606.446-.161.19-.289.412-.383.669-.08.243-.142.493-.182.75h3.976zM7.043 22.536c0-.973-.128-1.662-.384-2.067-.242-.406-.666-.608-1.271-.608-.188 0-.384.013-.585.04-.202.014-.397.034-.586.061v8.228H1.211V17.895c.255-.068.551-.135.888-.203.35-.08.713-.148 1.09-.202.39-.068.786-.115 1.19-.142.404-.04.8-.061 1.19-.061.767 0 1.386.101 1.857.304.484.189.881.419 1.19.689.431-.31.922-.554 1.474-.73.565-.175 1.083-.263 1.553-.263.848 0 1.54.122 2.079.365.552.23.989.56 1.312.993.322.432.544.945.666 1.54.12.594.181 1.256.181 1.986v6.019h-3.007v-5.654c0-.973-.127-1.662-.383-2.067-.242-.406-.666-.608-1.271-.608-.162 0-.39.04-.686.121-.283.081-.518.183-.707.304.095.311.155.642.182.993.027.338.04.703.04 1.095v5.816H7.043v-5.654zM22.668 26.082c.296 0 .578-.006.847-.02.27-.013.484-.034.646-.06v-2.29c-.121-.028-.303-.055-.545-.082-.242-.027-.464-.04-.666-.04-.282 0-.552.02-.807.06-.242.027-.457.088-.646.183-.188.094-.336.223-.444.385-.107.162-.161.365-.161.608 0 .473.155.804.464.993.323.175.76.263 1.312.263zm-.243-8.836c.888 0 1.628.102 2.22.304.592.203 1.063.494 1.413.872.363.378.619.837.767 1.378.148.54.222 1.142.222 1.803v6.283c-.431.095-1.03.203-1.797.324-.766.135-1.695.203-2.784.203-.686 0-1.312-.06-1.877-.183-.551-.121-1.029-.317-1.433-.587-.403-.284-.713-.649-.928-1.095-.215-.445-.323-.993-.323-1.641 0-.622.121-1.148.363-1.58.256-.433.592-.778 1.01-1.034.417-.257.894-.44 1.432-.548.538-.121 1.097-.182 1.675-.182.39 0 .733.02 1.03.06.309.028.558.068.746.122v-.283c0-.514-.155-.926-.464-1.236-.31-.311-.848-.467-1.615-.467-.51 0-1.015.04-1.513.122-.498.067-.928.169-1.292.304l-.383-2.432c.175-.054.39-.108.646-.162.269-.068.558-.122.867-.162.31-.054.633-.095.97-.122.349-.04.699-.06 1.048-.06zM36.566 22.941c0-.932-.209-1.675-.626-2.23-.417-.567-1.036-.85-1.856-.85-.27 0-.518.013-.747.04-.229.014-.417.034-.565.061v5.452c.188.121.43.223.727.303.309.082.618.122.928.122 1.426 0 2.139-.966 2.139-2.898zm3.067-.081c0 .824-.1 1.574-.303 2.25-.201.675-.497 1.256-.887 1.742-.39.487-.875.865-1.453 1.135-.579.27-1.245.406-1.998.406-.417 0-.807-.04-1.17-.122-.364-.081-.714-.196-1.05-.345v4.013h-3.007V17.895c.27-.081.579-.155.929-.223.35-.081.713-.149 1.09-.203.39-.054.78-.094 1.17-.121.403-.04.787-.061 1.15-.061.874 0 1.655.135 2.34.405.687.257 1.265.628 1.736 1.115.471.473.828 1.054 1.07 1.743.255.689.383 1.459.383 2.31zM48.744 22.941c0-.932-.208-1.675-.625-2.23-.417-.567-1.036-.85-1.857-.85-.269 0-.518.013-.746.04-.229.014-.417.034-.565.061v5.452c.188.121.43.223.726.303.31.082.619.122.928.122 1.426 0 2.14-.966 2.14-2.898zm3.068-.081c0 .824-.101 1.574-.303 2.25-.202.675-.498 1.256-.888 1.742-.39.487-.874.865-1.453 1.135-.578.27-1.244.406-1.998.406-.417 0-.807-.04-1.17-.122-.363-.081-.713-.196-1.05-.345v4.013h-3.006V17.895c.269-.081.578-.155.928-.223.35-.081.713-.149 1.09-.203.39-.054.78-.094 1.17-.121.404-.04.787-.061 1.15-.061.875 0 1.655.135 2.341.405.686.257 1.265.628 1.736 1.115.47.473.827 1.054 1.07 1.743.255.689.383 1.459.383 2.31zM57.13 28.19h-3.008V17.53h3.007v10.66zm.282-13.74c0 .554-.182.993-.545 1.317-.35.31-.767.466-1.251.466-.484 0-.908-.155-1.272-.466-.35-.324-.524-.763-.524-1.317 0-.554.175-.987.524-1.297.364-.325.788-.487 1.272-.487s.901.162 1.25.487c.364.31.546.743.546 1.297zM59.956 17.895c.51-.149 1.17-.284 1.977-.405.807-.136 1.655-.203 2.543-.203.901 0 1.648.122 2.24.365.605.23 1.083.56 1.432.993.35.432.6.945.747 1.54.148.594.222 1.256.222 1.986v6.019H66.11v-5.654c0-.973-.127-1.662-.383-2.067-.256-.406-.733-.608-1.433-.608-.215 0-.444.013-.686.04-.242.014-.457.034-.646.061v8.228h-3.006V17.895zM74.401 22.515c0 1.69.68 2.534 2.038 2.534.31 0 .6-.04.868-.122.27-.08.498-.175.686-.284V19.82c-.148-.027-.323-.047-.524-.06-.202-.028-.438-.041-.707-.041-.793 0-1.385.263-1.775.79-.39.527-.586 1.196-.586 2.006zM81 26.852c0 1.743-.444 3.034-1.332 3.871-.874.851-2.233 1.277-4.076 1.277-.646 0-1.291-.06-1.937-.182-.646-.109-1.245-.257-1.796-.446l.524-2.534c.471.19.962.338 1.474.446.524.108 1.116.163 1.775.163.861 0 1.467-.19 1.816-.568.364-.378.545-.865.545-1.46v-.384c-.323.148-.659.263-1.009.344-.336.068-.706.102-1.11.102-1.466 0-2.59-.433-3.37-1.297-.78-.879-1.17-2.101-1.17-3.669 0-.783.121-1.492.363-2.127.242-.649.592-1.203 1.05-1.662.47-.46 1.042-.81 1.715-1.054.672-.257 1.433-.385 2.28-.385.363 0 .733.02 1.11.06.39.028.774.068 1.15.122.377.054.733.122 1.07.203.35.067.659.142.928.223v8.957z"/>
+  <path d="M 4.133 -2.578 L 0.553 -2.578 L 0.553 -3.438 L 1.673 -3.628 L 1.673 -11.468 L 0.553 -11.658 L 0.553 -12.528 L 1.673 -12.528 L 5.133 -12.528 C 5.84 -12.528 6.446 -12.405 6.953 -12.158 C 7.453 -11.911 7.833 -11.565 8.093 -11.118 C 8.36 -10.671 8.493 -10.148 8.493 -9.548 C 8.493 -8.948 8.36 -8.425 8.093 -7.978 C 7.833 -7.531 7.453 -7.185 6.953 -6.938 C 6.446 -6.691 5.84 -6.568 5.133 -6.568 L 3.013 -6.568 L 3.013 -3.628 L 4.133 -3.438 L 4.133 -2.578 Z M 3.013 -11.468 L 3.013 -7.618 L 5.133 -7.618 C 5.806 -7.618 6.31 -7.801 6.643 -8.168 C 6.976 -8.528 7.143 -8.985 7.143 -9.538 C 7.143 -10.091 6.976 -10.551 6.643 -10.918 C 6.31 -11.285 5.806 -11.468 5.133 -11.468 L 3.013 -11.468 ZM 12.582 -2.438 C 11.895 -2.438 11.305 -2.598 10.812 -2.918 C 10.318 -3.238 9.938 -3.681 9.672 -4.248 C 9.398 -4.815 9.262 -5.465 9.262 -6.198 L 9.262 -6.348 C 9.262 -7.075 9.398 -7.721 9.672 -8.288 C 9.938 -8.855 10.318 -9.301 10.812 -9.628 C 11.305 -9.948 11.888 -10.108 12.562 -10.108 C 13.248 -10.108 13.838 -9.948 14.332 -9.628 C 14.825 -9.301 15.208 -8.855 15.482 -8.288 C 15.748 -7.728 15.882 -7.081 15.882 -6.348 L 15.882 -6.198 C 15.882 -5.465 15.748 -4.811 15.482 -4.238 C 15.208 -3.671 14.828 -3.228 14.342 -2.908 C 13.848 -2.595 13.262 -2.438 12.582 -2.438 Z M 12.582 -3.488 C 13.008 -3.488 13.368 -3.605 13.662 -3.838 C 13.948 -4.071 14.165 -4.395 14.312 -4.808 C 14.458 -5.215 14.532 -5.678 14.532 -6.198 L 14.532 -6.348 C 14.532 -6.868 14.458 -7.331 14.312 -7.738 C 14.165 -8.145 13.945 -8.465 13.652 -8.698 C 13.358 -8.931 12.995 -9.048 12.562 -9.048 C 12.135 -9.048 11.775 -8.931 11.482 -8.698 C 11.195 -8.465 10.978 -8.145 10.832 -7.738 C 10.685 -7.331 10.612 -6.868 10.612 -6.348 L 10.612 -6.198 C 10.612 -5.678 10.685 -5.215 10.832 -4.808 C 10.978 -4.395 11.198 -4.071 11.492 -3.838 C 11.785 -3.605 12.148 -3.488 12.582 -3.488 ZM 20.431 -2.578 L 19.271 -2.578 L 17.321 -9.008 L 16.501 -9.108 L 16.501 -9.978 L 19.551 -9.978 L 19.551 -9.108 L 18.641 -8.958 L 19.661 -5.268 L 19.891 -4.398 L 19.931 -4.398 L 20.231 -5.268 L 21.841 -9.978 L 22.981 -9.978 L 24.511 -5.288 L 24.841 -4.248 L 24.881 -4.248 L 25.201 -5.288 L 26.231 -8.958 L 25.301 -9.108 L 25.301 -9.978 L 28.291 -9.978 L 28.291 -9.108 L 27.471 -8.988 L 25.551 -2.578 L 24.271 -2.578 L 22.781 -7.018 L 22.421 -8.208 L 22.381 -8.208 L 22.031 -7.018 L 20.431 -2.578 ZM 32.345 -2.438 C 31.658 -2.438 31.061 -2.591 30.555 -2.898 C 30.048 -3.211 29.658 -3.648 29.385 -4.208 C 29.111 -4.761 28.975 -5.401 28.975 -6.128 L 28.975 -6.438 C 28.975 -7.138 29.118 -7.765 29.405 -8.318 C 29.691 -8.871 30.078 -9.308 30.565 -9.628 C 31.045 -9.948 31.568 -10.108 32.135 -10.108 C 32.801 -10.108 33.358 -9.971 33.805 -9.698 C 34.258 -9.425 34.598 -9.041 34.825 -8.548 C 35.051 -8.055 35.165 -7.471 35.165 -6.798 L 35.165 -5.958 L 30.365 -5.958 L 30.345 -5.928 C 30.351 -5.455 30.435 -5.035 30.595 -4.668 C 30.755 -4.301 30.981 -4.011 31.275 -3.798 C 31.568 -3.591 31.925 -3.488 32.345 -3.488 C 32.798 -3.488 33.198 -3.551 33.545 -3.678 C 33.885 -3.811 34.181 -3.991 34.435 -4.218 L 34.955 -3.348 C 34.695 -3.088 34.345 -2.871 33.905 -2.698 C 33.471 -2.525 32.951 -2.438 32.345 -2.438 Z M 30.395 -7.048 L 30.405 -7.018 L 33.815 -7.018 L 33.815 -7.188 C 33.815 -7.548 33.751 -7.868 33.625 -8.148 C 33.505 -8.428 33.318 -8.648 33.065 -8.808 C 32.818 -8.968 32.508 -9.048 32.135 -9.048 C 31.835 -9.048 31.561 -8.961 31.315 -8.788 C 31.068 -8.615 30.865 -8.378 30.705 -8.078 C 30.545 -7.771 30.441 -7.428 30.395 -7.048 ZM 39.773 -2.578 L 36.193 -2.578 L 36.193 -3.438 L 37.313 -3.628 L 37.313 -8.918 L 36.193 -9.108 L 36.193 -9.978 L 38.513 -9.978 L 38.633 -9.028 L 38.643 -8.898 C 38.85 -9.278 39.11 -9.575 39.423 -9.788 C 39.73 -10.001 40.08 -10.108 40.473 -10.108 C 40.613 -10.108 40.76 -10.098 40.913 -10.078 C 41.06 -10.051 41.163 -10.025 41.223 -9.998 L 41.053 -8.748 L 40.113 -8.808 C 39.76 -8.828 39.46 -8.745 39.213 -8.558 C 38.973 -8.378 38.786 -8.131 38.653 -7.818 L 38.653 -3.628 L 39.773 -3.438 L 39.773 -2.578 ZM 45.284 -2.438 C 44.597 -2.438 44 -2.591 43.494 -2.898 C 42.987 -3.211 42.597 -3.648 42.324 -4.208 C 42.05 -4.761 41.914 -5.401 41.914 -6.128 L 41.914 -6.438 C 41.914 -7.138 42.057 -7.765 42.344 -8.318 C 42.63 -8.871 43.017 -9.308 43.504 -9.628 C 43.984 -9.948 44.507 -10.108 45.074 -10.108 C 45.74 -10.108 46.297 -9.971 46.744 -9.698 C 47.197 -9.425 47.537 -9.041 47.764 -8.548 C 47.99 -8.055 48.104 -7.471 48.104 -6.798 L 48.104 -5.958 L 43.304 -5.958 L 43.284 -5.928 C 43.29 -5.455 43.374 -5.035 43.534 -4.668 C 43.694 -4.301 43.92 -4.011 44.214 -3.798 C 44.507 -3.591 44.864 -3.488 45.284 -3.488 C 45.737 -3.488 46.137 -3.551 46.484 -3.678 C 46.824 -3.811 47.12 -3.991 47.374 -4.218 L 47.894 -3.348 C 47.634 -3.088 47.284 -2.871 46.844 -2.698 C 46.41 -2.525 45.89 -2.438 45.284 -2.438 Z M 43.334 -7.048 L 43.344 -7.018 L 46.754 -7.018 L 46.754 -7.188 C 46.754 -7.548 46.69 -7.868 46.564 -8.148 C 46.444 -8.428 46.257 -8.648 46.004 -8.808 C 45.757 -8.968 45.447 -9.048 45.074 -9.048 C 44.774 -9.048 44.5 -8.961 44.254 -8.788 C 44.007 -8.615 43.804 -8.378 43.644 -8.078 C 43.484 -7.771 43.38 -7.428 43.334 -7.048 ZM 52.326 -2.438 C 51.726 -2.438 51.209 -2.585 50.776 -2.878 C 50.349 -3.178 50.022 -3.595 49.796 -4.128 C 49.562 -4.661 49.446 -5.285 49.446 -5.998 L 49.446 -6.138 C 49.446 -6.931 49.562 -7.628 49.796 -8.228 C 50.022 -8.821 50.352 -9.285 50.786 -9.618 C 51.219 -9.945 51.736 -10.108 52.336 -10.108 C 52.776 -10.108 53.162 -10.028 53.496 -9.868 C 53.836 -9.708 54.122 -9.475 54.356 -9.168 L 54.356 -12.178 L 53.246 -12.378 L 53.246 -13.238 L 54.356 -13.238 L 55.706 -13.238 L 55.706 -3.628 L 56.816 -3.438 L 56.816 -2.578 L 54.536 -2.578 L 54.426 -3.458 C 54.186 -3.125 53.889 -2.871 53.536 -2.698 C 53.189 -2.525 52.786 -2.438 52.326 -2.438 Z M 52.666 -3.528 C 53.066 -3.528 53.402 -3.618 53.676 -3.798 C 53.949 -3.985 54.176 -4.245 54.356 -4.578 L 54.356 -8.008 C 54.182 -8.315 53.956 -8.561 53.676 -8.748 C 53.402 -8.928 53.072 -9.018 52.686 -9.018 C 52.252 -9.018 51.899 -8.895 51.626 -8.648 C 51.346 -8.408 51.136 -8.071 50.996 -7.638 C 50.862 -7.211 50.796 -6.711 50.796 -6.138 L 50.796 -5.998 C 50.796 -5.251 50.949 -4.655 51.256 -4.208 C 51.562 -3.755 52.032 -3.528 52.666 -3.528 ZM 65.16 -2.438 C 64.673 -2.438 64.253 -2.528 63.9 -2.708 C 63.547 -2.895 63.25 -3.168 63.01 -3.528 L 62.89 -2.578 L 61.72 -2.578 L 61.72 -12.178 L 60.61 -12.378 L 60.61 -13.238 L 63.07 -13.238 L 63.07 -9.098 C 63.303 -9.425 63.593 -9.675 63.94 -9.848 C 64.28 -10.021 64.68 -10.108 65.14 -10.108 C 65.753 -10.108 66.273 -9.945 66.7 -9.618 C 67.133 -9.285 67.467 -8.821 67.7 -8.228 C 67.927 -7.628 68.04 -6.931 68.04 -6.138 L 68.04 -5.998 C 68.04 -5.285 67.927 -4.661 67.7 -4.128 C 67.467 -3.595 67.133 -3.178 66.7 -2.878 C 66.273 -2.585 65.76 -2.438 65.16 -2.438 Z M 64.81 -3.528 C 65.443 -3.528 65.917 -3.755 66.23 -4.208 C 66.537 -4.655 66.69 -5.251 66.69 -5.998 L 66.69 -6.138 C 66.69 -6.711 66.62 -7.211 66.48 -7.638 C 66.347 -8.071 66.14 -8.408 65.86 -8.648 C 65.58 -8.895 65.227 -9.018 64.8 -9.018 C 64.387 -9.018 64.037 -8.918 63.75 -8.718 C 63.463 -8.518 63.237 -8.248 63.07 -7.908 L 63.07 -4.638 C 63.237 -4.298 63.467 -4.028 63.76 -3.828 C 64.047 -3.628 64.397 -3.528 64.81 -3.528 ZM 70.519 0.412 C 70.419 0.412 70.283 0.399 70.109 0.372 C 69.943 0.345 69.813 0.322 69.719 0.302 L 69.859 -0.758 C 69.939 -0.751 70.046 -0.745 70.179 -0.738 C 70.319 -0.731 70.413 -0.728 70.459 -0.728 C 70.746 -0.728 70.979 -0.838 71.159 -1.058 C 71.339 -1.271 71.506 -1.568 71.659 -1.948 L 71.989 -2.728 L 69.369 -8.998 L 68.569 -9.108 L 68.569 -9.978 L 71.679 -9.978 L 71.679 -9.108 L 70.779 -8.968 L 72.219 -5.268 L 72.569 -4.308 L 72.609 -4.308 L 74.319 -8.968 L 73.379 -9.108 L 73.379 -9.978 L 76.419 -9.978 L 76.419 -9.108 L 75.659 -8.998 L 72.739 -1.448 C 72.606 -1.088 72.443 -0.768 72.249 -0.488 C 72.056 -0.208 71.819 0.012 71.539 0.172 C 71.259 0.332 70.919 0.412 70.519 0.412 Z" transform="matrix(1, 0, 0, 1, 0, 0)" style="fill: rgb(255, 255, 255); white-space: pre;"/>
+</svg>
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/jsp/commonPageHeader.jsf b/wise-webapp/src/main/webapp/jsp/commonPageHeader.jsf
new file mode 100644
index 00000000..5b2ab9d7
--- /dev/null
+++ b/wise-webapp/src/main/webapp/jsp/commonPageHeader.jsf
@@ -0,0 +1,23 @@
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="theme-color" content="#000000" />
+
+    <meta name="author" content="WiseMapping">
+    <meta name="publisher" content="WiseMapping">
+    <meta name="keywords"
+          content="mindmap,mind map,mind maps,mindmaps,ideas,brainstorming,organize,thoughts,structure,collaboration,free,fast,simple,online,tool,knowledge,share,sharing,publish">
+    <meta name="description"
+          content="WiseMapping is a free, fast and simple online mind mapping editor for individuals and business. Sign up to start organizing and sharing your ideas and thoughts.">
+
+    <meta property="og:title" content="WiseMapping"/>
+    <meta property="og:type" content="website"/>
+    <meta property="og:url" content="http://www.wisemapping.com"/>
+    <meta property="og:image" content="http://www.wisemapping.com/images/logo.png"/>
+    <meta property="og:site_name" content="WiseMapping.com"/>
+
+    <link rel="icon" href="../../images/favicon.ico" type="image/x-icon"/>
+    <link rel="apple-touch-icon" href="../../favicon.png" />
+    <link rel="shortcut icon" href="../../images/favicon.ico" type="image/x-icon"/>
+
+    <link rel="manifest" href="../../manifest.json" />
diff --git a/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf b/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
index ed6f93f8..f3f232f0 100644
--- a/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
+++ b/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
@@ -3,8 +3,4 @@
 <c:if test="${requestScope['google.analytics.enabled']}">
 
 
-      ga('create', '${requestScope['google.analytics.account']}', 'wisemapping.com');
-      ga('send', 'pageview');
-
-    </script>
 </c:if>
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
index 245ea9a2..f3ab87bc 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -16,8 +16,7 @@
     <title><spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/></title>
     <link rel="stylesheet/less" type="text/css" href="../../css/editor.less"/>
     <script type='text/javascript' src="../../js/less.js"/></script>
-    <link rel="icon" href="../../images/favicon.ico" type="image/x-icon"/>
-    <link rel="shortcut icon" href="../../images/favicon.ico" type="image/x-icon"/>
+    <%@ include file="/jsp/commonPageHeader.jsf" %>
 
     <script type="text/javascript">
         var mapId = '${mindmap.id}';
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
index 83a58ae5..bcdcb5b6 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
@@ -7,13 +7,12 @@
 <html>
 <head>
     <base href="${requestScope['site.baseurl']}/static/mindplot/">
-    <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
+    <title><spring:message code="SITE.TITLE"/> | Edit ${mindmap.title} </title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title><spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/></title>
-    <link rel="stylesheet/less" type="text/css" href="../../css/embedded.less"/>
+    <link rel="stylesheet/less" type="text/css" href="../../css/viewonly.less"/>
     <script type='text/javascript' src="../../js/less.js"/></script>
-    <link rel="icon" href="../../images/favicon.ico" type="image/x-icon"/>
-    <link rel="shortcut icon" href="../../images/favicon.ico" type="image/x-icon"/>
+
+    <%@ include file="/jsp/commonPageHeader.jsf" %>
 
    <script type="text/javascript">
           var mapId = '${mindmap.id}';
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
index d1b8784b..55b519d6 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
@@ -7,14 +7,13 @@
 
 <html>
 <head>
-    <base href="${requestScope['site.baseurl']}/static/mindplot/">
-    <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title><spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/></title>
-    <link rel="stylesheet/less" type="text/css" href="../../css/embedded.less"/>
+    <base href="${requestScope['site.baseurl']}/static/mindplot/">
+    <title><spring:message code="SITE.TITLE"/> | ${mindmap.title} </title>
+    <link rel="stylesheet/less" type="text/css" href="../../css/viewonly.less"/>
     <script type='text/javascript' src="../../js/less.js"/></script>
-    <link rel="icon" href="../../images/favicon.ico" type="image/x-icon"/>
-    <link rel="shortcut icon" href="../../images/favicon.ico" type="image/x-icon"/>
+
+    <%@ include file="/jsp/commonPageHeader.jsf" %>
 
    <script type="text/javascript">
           var mapId = '${mindmap.id}';
diff --git a/wise-webapp/src/main/webapp/jsp/reactInclude.jsp b/wise-webapp/src/main/webapp/jsp/reactInclude.jsp
index 85b7b6f0..6cf7190f 100644
--- a/wise-webapp/src/main/webapp/jsp/reactInclude.jsp
+++ b/wise-webapp/src/main/webapp/jsp/reactInclude.jsp
@@ -6,15 +6,11 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta charset="utf-8" />
     <base href="${requestScope['site.baseurl']}/static/webapp/">
-    <link rel="icon" href="favicon.ico" />
     <link rel="preconnect" href="https://fonts.gstatic.com" />
     <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@100;200;300;400;600&display=swap" rel="stylesheet" />
 
-    <meta name="viewport" content="width=device-width" />
-    <meta name="theme-color" content="#000000" />
-    <meta name="description" content="WiseMapping" />
-    <link rel="apple-touch-icon" href="favicon.png" />
-    <link rel="manifest" href="manifest.json" />
+    <%@ include file="/jsp/commonPageHeader.jsf" %>
+
     <title>Loading | WiseMapping</title>
 
     <script>
diff --git a/wise-webapp/src/main/webapp/jsp/template.jsp b/wise-webapp/src/main/webapp/jsp/template.jsp
index ddf14d8e..046fd3be 100644
--- a/wise-webapp/src/main/webapp/jsp/template.jsp
+++ b/wise-webapp/src/main/webapp/jsp/template.jsp
@@ -10,22 +10,8 @@
 
 <html>
 <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <base href="${requestScope['site.baseurl']}/">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="author" content="WiseMapping">
-    <meta name="publisher" content="WiseMapping Open Source">
-    <meta name="keywords"
-          content="mindmap,mind map,mind maps,mindmaps,ideas,brainstorming,organize,thoughts,structure,collaboration,free,fast,simple,online,tool,knowledge,share,sharing,publish">
-    <meta name="description"
-          content="WiseMapping is a free, fast and simple online mind mapping editor for individuals and business. Sign up to start organizing and sharing your ideas and thoughts.">
-    <meta property="og:title" content="WiseMapping"/>
-    <meta property="og:type" content="website"/>
-    <meta property="og:url" content="http://www.wisemapping.com"/>
-    <meta property="og:image" content="http://www.wisemapping.com/images/logo.png"/>
-    <meta property="og:site_name" content="WiseMapping.com"/>
-    <link rel="icon" href="favicon.ico?v=2" />
-
     <title>
         <spring:message code="SITE.TITLE"/>-
         <c:choose>
@@ -37,15 +23,8 @@
             </c:otherwise>
         </c:choose>
     </title>
+    <%@ include file="/jsp/commonPageHeader.jsf" %>
     <link rel="stylesheet" type="text/css" href="css/pageTemplate.css"/>
-
-    <link rel="icon" href="images/favicon.ico" type="image/x-icon"/>
-    <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon"/>
-    <script type="text/javascript" language="javascript" src="js/jquery.js"></script>
-
-    <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.min.js"></script>
-    <script src="js/less.js" type="text/javascript"></script>
-    <script src='https://www.google.com/recaptcha/api.js'></script>
 </head>
 <body>
 
@@ -57,33 +36,7 @@
                     <tiles:insertAttribute name="body"/>
                 </div>
             </div>
-            <div class="col-md-1" style="padding-top:25px">
-                <c:if test="${requestScope['google.ads.enabled']}">
-                    <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-                    <!-- Wise: Lateral Image (Small) -->
-                    <ins class="adsbygoogle"
-                         style="display:inline-block;width:120px;height:240px"
-                         data-ad-client="ca-pub-7564778578019285"
-                         data-ad-slot="6751959325"></ins>
-                    <script>
-                    (adsbygoogle = window.adsbygoogle || []).push({});
-                    </script>
-                </c:if>
-            </div>
         </div>
-        <c:if test="${requestScope['google.ads.enabled']}">
-              <div class="row" style="text-align: center;">
-                <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-                <!-- Wise: Pages Footer  (All pages) -->
-                <ins class="adsbygoogle"
-                     style="display:inline-block;width:728px;height:90px"
-                     data-ad-client="ca-pub-7564778578019285"
-                     data-ad-slot="3798492923"></ins>
-                <script>
-                (adsbygoogle = window.adsbygoogle || []).push({});
-                </script>
-           </div>
-        </c:if>
     </div>
 </div>
 </body>
diff --git a/wise-webapp/src/main/webapp/manifest.json b/wise-webapp/src/main/webapp/manifest.json
new file mode 100644
index 00000000..0de1f5db
--- /dev/null
+++ b/wise-webapp/src/main/webapp/manifest.json
@@ -0,0 +1,19 @@
+{
+  "short_name": "WiseMapping",
+  "name": "WiseMapping",
+  "icons": [{
+    "src": "favicon.ico",
+    "sizes": "64x64 32x32 24x24 16x16",
+    "type": "image/x-icon"
+  },
+    {
+      "src": "favicon.png",
+      "type": "image/png",
+      "sizes": "1024x1024"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
\ No newline at end of file