diff --git a/UI/Img.ts b/UI/Img.ts
index 7a89820ce9..23e399d6f9 100644
--- a/UI/Img.ts
+++ b/UI/Img.ts
@@ -23,5 +23,34 @@ export class Img {
 <path d="M20 2L2 20M20 20L2 2" stroke="#003B8B" stroke-width="4"/>
 </svg>  `
 
+    
+    static ornament = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
+        "<svg\n" +
+        "   xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n" +
+        "   xmlns:cc=\"http://creativecommons.org/ns#\"\n" +
+        "   xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n" +
+        "   xmlns:svg=\"http://www.w3.org/2000/svg\"\n" +
+        "   xmlns=\"http://www.w3.org/2000/svg\"\n" +
+        "   id=\"svg10\"\n" +
+        "   version=\"1.1\"\n" +
+        "   viewBox=\"0 0 205 205\"\n" +
+        "   style=\"shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd\"\n" +
+        "   height=\"205mm\"\n" +
+        "   width=\"205mm\"\n" +
+        "   xml:space=\"preserve\"><metadata\n" +
+        "   id=\"metadata14\"><rdf:RDF><cc:Work\n" +
+        "       rdf:about=\"\"><dc:format>image/svg+xml</dc:format><dc:type\n" +
+        "         rdf:resource=\"http://purl.org/dc/dcmitype/StillImage\" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>\n" +
+        " <g\n" +
+        "   id=\"Layer_x0020_1\">\n" +
+        "  <metadata\n" +
+        "   id=\"CorelCorpID_0Corel-Layer\" />\n" +
+        "  <path\n" +
+        "   id=\"path7\"\n" +
+        "   d=\"M17.9291 17.9451c0.4499,5.336 1.7681,10.4146 3.9215,15.2043 2.1537,4.7894 4.8538,7.2002 8.0684,7.2002 2.5714,0 4.918,-1.1895 7.1037,-3.6322 2.1537,-2.4108 3.2464,-4.6933 3.2464,-6.8148 0,-3.15 -2.3463,-5.7859 -7.0714,-7.9074 -4.6933,-2.1534 -9.8042,-3.5034 -15.2686,-4.0501zm-15.4291 -15.461l0 200.032 10.8327 0 32.0154 -19.2218c-5.0145,-10.3505 -7.5217,-21.9224 -7.5217,-34.7478 0,-8.5825 2.0251,-16.972 6.0429,-25.1365 4.0179,-8.1648 9.4504,-15.0434 16.297,-20.6364 6.8467,-5.5931 14.4971,-9.2256 22.9831,-10.9291l0 1.1249c0.0642,3.986 0.2571,6.9112 0.5464,8.8717 0.3215,1.9287 0.8356,4.1789 1.5106,6.6861 0.675,2.5072 1.2217,4.9822 1.6075,7.393 0.3534,2.4108 0.5463,5.5612 0.5463,9.4503 0,4.404 -0.7715,8.2932 -2.3467,11.7006 -1.5748,3.3751 -3.6321,5.9788 -6.1393,7.811 -2.5073,1.8322 -4.9503,2.7323 -7.3611,2.7323 -2.5073,0 -4.8535,-1.0288 -7.0396,-3.0539 -2.2179,-2.057 -3.3106,-4.7571 -3.3106,-8.1644 0,-3.568 1.4465,-7.5217 4.3072,-11.797 2.8607,-4.3072 5.9465,-7.65 9.2252,-10.0608 -4.4678,0.1928 -8.5824,1.4464 -12.3433,3.7927 -3.7286,2.3144 -6.7502,5.336 -9.0001,9.0327 -2.2824,3.6963 -3.4073,7.5217 -3.4073,11.4754 0,5.7214 1.9609,10.8004 5.8823,15.204 3.9214,4.4359 8.7753,6.6538 14.5612,6.6538 4.5965,0 8.6467,-1.3178 12.1505,-3.9214 3.5357,-2.6037 6.2039,-6.0752 8.068,-10.4792 1.8645,-4.4036 2.7646,-9.1611 2.7646,-14.3038 3.9537,7.3929 8.8072,12.2468 14.5613,14.5931 5.7536,2.3143 11.0896,3.4715 16.0718,3.4715 4.5001,0 9.5791,-1.1572 15.2363,-3.4715 -13.3718,-2.5714 -23.6258,-6.975 -30.7941,-13.1467 -7.136,-6.1716 -11.8289,-12.5684 -14.0791,-19.158 -2.2179,-6.5893 -3.407,-12.8574 -3.5357,-18.7398l0 -4.6287c31.0834,0 49.6625,16.1361 55.77,48.4089 2.3144,-6.0111 3.4716,-11.122 3.4716,-15.2685 0,-5.4967 -1.2859,-11.0575 -3.9219,-16.6186 -2.6036,-5.5608 -7.3607,-10.2537 -14.2719,-14.0791 6.4932,0 11.8934,-1.1891 16.2006,-3.6321 4.3394,-2.4108 7.5539,-5.368 9.6113,-8.8395 2.0892,-3.4716 3.1177,-6.879 3.1177,-10.2218 0,-5.2073 -2.057,-9.9648 -6.2035,-14.2401 -4.1466,-4.3071 -9.2256,-6.4609 -15.1721,-6.4609 -6.5251,0 -12.2469,2.5395 -17.1972,7.5862 -4.918,5.0464 -7.4894,10.7681 -7.6823,17.1968 2.6037,-3.4715 5.9788,-6.5892 10.1254,-9.3858 4.1788,-2.7965 8.068,-4.1788 11.636,-4.1788 3.3432,0 6.0433,1.1249 8.1003,3.3428 2.0896,2.218 3.1181,4.661 3.1181,7.297 0,2.5714 -0.9002,5.0463 -2.6679,7.4571 -1.8003,2.4431 -4.2753,4.404 -7.3933,5.8824 -3.15,1.511 -6.718,2.2825 -10.7359,2.2825 -3.4074,0 -6.3003,-0.1929 -8.7111,-0.5145 -2.4431,-0.3534 -5.368,-0.9001 -8.8718,-1.6716 -3.4715,-0.7392 -6.3322,-1.2855 -8.5502,-1.5748 -2.2502,-0.3216 -5.1754,-0.4821 -8.8076,-0.4821 1.6717,-8.5506 5.3361,-16.2652 10.961,-23.176 5.6254,-6.8789 12.5043,-12.311 20.6687,-16.2647 8.1645,-3.9538 16.4899,-5.9469 25.0401,-5.9469 6.7825,0 12.9542,0.6431 18.5472,1.9286 5.5931,1.2859 10.9933,3.2145 16.2006,5.7859l19.2864 -32.2083 0 -10.8322 -200 0zm10.8327 10.8322l175.603 0 -11.7648 22.0511c-2.5072,-0.9325 -5.4647,-1.8322 -8.8398,-2.636 -3.3751,-0.8037 -6.8144,-1.4464 -10.3182,-1.9286 -3.4716,-0.4822 -6.7822,-0.7073 -9.9325,-0.7073 -5.8178,0 -12.6326,1.093 -20.4113,3.2787 -2.4108,0.7714 -4.7894,1.6716 -7.1683,2.7001 -2.3785,1.0288 -4.082,1.7358 -5.1428,2.0573 -1.0288,0.3535 -2.186,0.5145 -3.5038,0.5145 -3.7931,0 -7.4253,-1.7358 -10.9932,-5.2074 -3.5358,-3.5038 -6.043,-7.811 -7.4895,-12.9541 -2.2502,1.3177 -3.986,3.0858 -5.2396,5.2715 -1.2536,2.186 -1.8963,4.3075 -1.8963,6.3003 0,2.7001 1.4464,5.4966 4.3394,8.3896 2.893,2.893 6.8786,4.5965 12.054,5.0786 -4.8539,2.4754 -8.5506,4.404 -11.1542,5.8182 -2.6037,1.4142 -4.6606,2.5072 -6.1071,3.3429 -1.4788,0.8037 -3.054,1.6074 -4.7252,2.3789 -1.6393,0.8033 -4.1466,1.9286 -7.4575,3.3751 2.4108,-5.4325 3.6002,-11.6683 3.6002,-18.7724 0,-4.6929 -0.8679,-8.8717 -2.6359,-12.4716 -1.7681,-3.6002 -4.1143,-6.3645 -7.0395,-8.2612 -2.9253,-1.8641 -5.9466,-2.7966 -9.0324,-2.7966 -3.4396,0 -6.3645,1.1895 -8.7753,3.568 -2.3789,2.3789 -3.6003,5.1109 -3.6003,8.1967 0,4.0183 1.4143,7.6182 4.2431,10.8327l3.8572 -4.0502c-1.4464,-2.5072 -2.1537,-4.7893 -2.1537,-6.7825 0,-1.2536 0.3857,-2.1856 1.1571,-2.7642 0.8038,-0.6109 1.5752,-0.9002 2.3144,-0.9002 2.4108,0 4.8862,1.8322 7.4898,5.4966 2.6037,3.6645 3.9215,8.5183 3.9215,14.5613 0,4.8216 -0.9002,10.7039 -2.7324,17.6151 -7.0395,1.7677 -12.8574,2.6356 -17.5184,2.6356 -4.3394,0 -8.0038,-0.6105 -11.0574,-1.8322 -3.0539,-1.2214 -5.3037,-2.732 -6.7825,-4.4678 -1.4787,-1.768 -2.2179,-3.4396 -2.2179,-5.0144 0,-0.8679 0.2893,-1.6716 0.8356,-2.4108 0.5786,-0.7073 1.511,-1.0608 2.8288,-1.0608 2.2821,0 4.5,0.675 6.718,2.057l3.8572 -3.8573c-3.2786,-2.8284 -6.975,-4.243 -11.1215,-4.243 -3.0217,0 -5.6254,1.2859 -7.8756,3.8254 -2.2179,2.5391 -3.3428,5.593 -3.3428,9.161 0,5.1751 2.4431,9.4504 7.2966,12.9219 4.8861,3.4393 10.9932,5.1751 18.322,5.1751 5.7218,0 11.2507,-1.2214 16.5863,-3.6644 -3.7285,8.3895 -8.7107,18.2256 -14.9788,29.444 -0.4503,-4.9503 -2.1215,-8.904 -4.9826,-11.8934 -2.8929,-2.9894 -5.6895,-4.4682 -8.3896,-4.4682 -2.0892,0 -4.1784,0.6432 -6.2999,1.9287 -2.1538,1.2859 -3.9219,3.0216 -5.2719,5.2073 5.1432,1.5752 9.4503,4.2111 12.9541,7.8755 3.4716,3.6645 5.2074,7.1679 5.2074,10.5111 0,3.6963 -0.3216,6.5251 -1.0285,8.4538 -0.675,1.9609 -1.7358,4.2753 -3.1181,6.9754 -1.3823,2.7 -2.4431,5.593 -3.2145,8.7107 -0.7392,3.1181 -1.1249,7.2005 -1.1249,12.2792 0,4.4681 0.4821,9.3216 1.4787,14.5289 0.9643,5.2074 2.2179,10.0612 3.7286,14.5935l-21.9542 11.7647 0 -175.731zm56.1553 56.1557c11.0255,-4.8538 22.5332,-10.9291 34.4585,-18.2898 -11.122,9.0324 -17.7758,19.9614 -20.0579,32.7546 -12.6967,2.1538 -23.6258,8.8395 -32.8191,20.0579 3.4715,-5.5289 6.7183,-11.0897 9.7396,-16.6827 2.9894,-5.6254 5.8824,-11.5719 8.6789,-17.84zm35.3905 35.487c0.7396,7.7787 3.568,14.0149 8.4542,18.7401 4.918,4.6929 10.8322,7.2001 17.8076,7.5217 -0.3216,-7.1682 -2.8288,-13.1793 -7.5217,-18.0328 -4.7252,-4.8539 -10.961,-7.6181 -18.7401,-8.229z\"\n" +
+        "   style=\"fill:#1F1A17;stroke:#1F1A17;stroke-width:0.0762\" />\n" +
+        " </g>\n" +
+        "</svg>"
+    
 }
 
diff --git a/UI/WelcomeMessage.ts b/UI/WelcomeMessage.ts
index ca6e13fc7d..1f1529e13a 100644
--- a/UI/WelcomeMessage.ts
+++ b/UI/WelcomeMessage.ts
@@ -31,7 +31,8 @@ export class WelcomeMessage extends UIElement {
         }
 
         this.description = fromLayout((layout) => layout.welcomeMessage);
-        this.plzLogIn = fromLayout((layout) => layout.gettingStartedPlzLogin.onClick(()=> State.state.osmConnection.AttemptLogin()));
+        this.plzLogIn = fromLayout((layout) => layout.gettingStartedPlzLogin);
+        this.plzLogIn.onClick(()=> State.state.osmConnection.AttemptLogin());
         this.welcomeBack = fromLayout((layout) => layout.welcomeBackMessage);
         this.tail = fromLayout((layout) => layout.welcomeTail);
     }
diff --git a/index.html b/index.html
index fb8c848caf..170217e0da 100644
--- a/index.html
+++ b/index.html
@@ -28,7 +28,7 @@
 </div>
 
 <div id="messagesboxmobilewrapper">
-    <div style="position: absolute; left: 1em; top: 1em; z-index: 1">
+    <div id="decoration" style="position: absolute; left: 1em; top: 1em; z-index: 1">
         <!-- A nice decoration while loading or on errors -->
         <svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="15em" height="15em"
              style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
diff --git a/index.ts b/index.ts
index 2dd7a9da5d..8f60b98f75 100644
--- a/index.ts
+++ b/index.ts
@@ -16,6 +16,8 @@ import {State} from "./State";
 import {CustomLayout} from "./Logic/CustomLayers";
 import {TagRenderingOptions} from "./Customizations/TagRenderingOptions";
 import {TagRendering} from "./Customizations/TagRendering";
+import {Img} from "./UI/Img";
+import Combine from "./UI/Base/Combine";
 
 
 // --------------------- Special actions based on the parameters -----------------
@@ -76,15 +78,17 @@ TagRendering.injectFunction();
 State.state = new State(layoutToUse);
 InitUiElements.InitBaseMap();
 
+new FixedUiElement("").AttachTo("decoration"); // Remove the decoration
+
 function setupAllLayerElements() {
 
-// ------------- Setup the layers -------------------------------
+    // ------------- Setup the layers -------------------------------
 
     InitUiElements.InitLayers();
     InitUiElements.InitLayerSelection();
 
 
-// ------------------ Setup various other UI elements ------------
+    // ------------------ Setup various other UI elements ------------
 
 
     InitUiElements.OnlyIf(State.state.featureSwitchAddNew, () => {
@@ -171,5 +175,5 @@ if ((window != window.top && !State.state.featureSwitchWelcomeMessage) || State.
 new GeoLocationHandler().AttachTo("geolocate-button");
 
 
-State.state.locationControl.ping()
+// State.state.locationControl.ping()