diff --git a/vcm/config.json b/vcm/config.json
index 3d6599362648ea2f70bf1946f0eb1790c63331a4..cb7d06a5d8913ffd3e52815986451d89643df99d 100644
--- a/vcm/config.json
+++ b/vcm/config.json
@@ -463,6 +463,94 @@
             }
           ],
           "balloonHeader": "Balloon header"
+        },{
+          "template": [
+            "<div class='balloon' id='myBalloon'>",
+            "<div class='balloon-content'>",
+            "<h1 class='balloon-title'>Balloon header</h1>",
+            "<% for (var key in obj) { %>",
+            "<% if (obj[key] instanceof Object){%>",
+            "<% for (var key2 in obj[key]) { %>",
+            "<p class='balloon-text'><span class='balloon-street'> <strong> <%=key%>.<%=key2%> </strong> : <%=obj[key][key2]%></span><br></p>",
+            "<% } %>",
+            "<% } else{ %>",
+            "<p class='balloon-text'>",
+            "<span class='balloon-street'> <strong> <%=key%> </strong> : <%=obj[key]%></span><br>",
+            "</p>",
+            "<% } %>",
+            "<% } %>",
+            "</div>",
+            "<div class='balloon-close-col'>",
+            "<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
+            "</div>",
+            "<div class='dialog-image-balloon'></div>",
+            "<div class='balloon-left-edge'></div>",
+            "</div>"
+          ],
+          "layerTypes": [
+            null
+          ],
+          "layerNames": [
+            "Streetnight"
+          ],
+          "minTop": "balloonHeight + 30",
+          "minLeft": "70",
+          "allAvailable": true,
+          "properties": [
+            {
+              "title": "creationDate",
+              "name": "creationDate"
+            },
+            {
+              "title": "gml:name",
+              "name": "gml:name"
+            }
+          ],
+          "balloonHeader": "Balloon header"
+        },{
+          "template": [
+            "<div class='balloon' id='myBalloon'>",
+            "<div class='balloon-content'>",
+            "<h1 class='balloon-title'>Balloon header</h1>",
+            "<% for (var key in obj) { %>",
+            "<% if (obj[key] instanceof Object){%>",
+            "<% for (var key2 in obj[key]) { %>",
+            "<p class='balloon-text'><span class='balloon-street'> <strong> <%=key%>.<%=key2%> </strong> : <%=obj[key][key2]%></span><br></p>",
+            "<% } %>",
+            "<% } else{ %>",
+            "<p class='balloon-text'>",
+            "<span class='balloon-street'> <strong> <%=key%> </strong> : <%=obj[key]%></span><br>",
+            "</p>",
+            "<% } %>",
+            "<% } %>",
+            "</div>",
+            "<div class='balloon-close-col'>",
+            "<button class='close-balloon'><i class='fa fa-times fa-lg'></i></button>",
+            "</div>",
+            "<div class='dialog-image-balloon'></div>",
+            "<div class='balloon-left-edge'></div>",
+            "</div>"
+          ],
+          "layerTypes": [
+            null
+          ],
+          "layerNames": [
+            "Streetday"
+          ],
+          "minTop": "balloonHeight + 30",
+          "minLeft": "70",
+          "allAvailable": true,
+          "properties": [
+            {
+              "title": "creationDate",
+              "name": "creationDate"
+            },
+            {
+              "title": "gml:name",
+              "name": "gml:name"
+            }
+          ],
+          "balloonHeader": "Balloon header"
         },{
           "template": [
             "<div class='balloon' id='myBalloon'>",
@@ -646,7 +734,6 @@
         },{
           "template": [
             "<div class='balloon' style='width: 200px; background-color: #3C3C3C; color: #FFFFFF;' id='myBalloon'>",
-            "   <button class='infobtn' onclick='NordbahnhofText()'></button>",
             "   <h1 class='balloon-title' style='color: #FFFFFF;'>Nordbahnhof Planungskonzept</h1>",
             "   <div class='balloon-content' style='margin-right: 0px;'",
             "   </div>",
@@ -1181,7 +1268,25 @@
       "heightAboveGround": 0
     },{
       "name": "Streetday",
-      "url": "./datasource-data/accoustic/DE_a_ag1_Aggroad_Lden_3DTiles/tileset.json",
+      "url": "./datasource-data/accoustic/Lden/tileset.json",
+      "type": "vcs.vcm.layer.cesium.Buildings",
+      "datasourceId": "zECwoSwXppPMrqfbt",
+      "activeOnStartup": false,
+      "exclusive": false,
+      "allowPicking": true,
+      "screenSpaceError": 32,
+      "screenSpaceErrorMobile": 32,
+      "hiddenObjectIds": [],
+      "copyright": {
+        "provider": "",
+        "url": "",
+        "year": "",
+        "altitudeMode": "relativeToGround",
+        "heightAboveGround": 0
+      }
+    },{
+      "name": "Streetnight",
+      "url": "./datasource-data/accoustic/Lnight/tileset.json",
       "type": "vcs.vcm.layer.cesium.Buildings",
       "datasourceId": "zECwoSwXppPMrqfbt",
       "activeOnStartup": false,
@@ -1198,7 +1303,7 @@
         "heightAboveGround": 0
       }
     },
-    { "name": "Streetnight",
+    { "name": "Streetnight1",
       "url": "./datasource-data/accoustic/DE_a_ag1_Aggroad_Lnight.json",
       "type": "vcs.vcm.layer.GeoJSON",
       "datasourceId": "...",
diff --git a/vcm/css/menu.css b/vcm/css/menu.css
index 57799cd4309acb90471146a9ae05801aa693a597..70b4d63165524b15e27b94159f0ae11d06f4cc83 100644
--- a/vcm/css/menu.css
+++ b/vcm/css/menu.css
@@ -1,4 +1,4 @@
-#btn_StreetDay, #btn_RailDay{
+#btn_StreetDay, #btn_RailDay, #btn_AirDay, #btn_AllDay{
     background-color: #ffcc33; /* yellow */
     border: none;
     color: white;
@@ -12,13 +12,13 @@
     border-radius: 2px;
     box-shadow: 0 8px 16px 0 rgba(255,204,51,0.2), 0 6px 20px 0 rgba(0,0,0,0.19);
 }
-#btn_StreetDay:hover, #btn_RailDay:hover{
+#btn_StreetDay:hover, #btn_RailDay:hover, #btn_AirDay:hover, #btn_AllDay:hover{
     background-color: #af8a1c;
     box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19);
     cursor: pointer; 
 }
 
-#btn_StreetNight, #btn_RailNight{
+#btn_StreetNight, #btn_RailNight, #btn_AirNight, #btn_AllNight{
     background-color: #3583f8; /* yellow */
     border: none;
     color: white;
@@ -32,12 +32,12 @@
     border-radius: 2px;
     box-shadow: 0 8px 16px 0 #3583f833, 0 6px 20px 0 rgba(0,0,0,0.19);
 }
-#btn_StreetNight:hover, #btn_RailNight:hover{
+#btn_StreetNight:hover, #btn_RailNight:hover, #btn_AirNight:hover, #btn_AllNight:hover{
     background-color: #235fb9;
     box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19);
     cursor: pointer; 
 }
-#btn_StreetOff, #btn_RailOff{
+#btn_StreetOff, #btn_RailOff, #btn_AirOff, #btn_AllOff{
     background-color: #424242; /* yellow */
     border: none;
     color: white;
@@ -51,7 +51,7 @@
     border-radius: 2px;
     box-shadow: 0 8px 16px 0 #27272733, 0 6px 20px 0 rgba(0,0,0,0.19);
 }
-#btn_StreetOff:hover, #btn_RailOff:hover{
+#btn_StreetOff:hover, #btn_RailOff:hover, #btn_AirOff:hover, #btn_AllOff:hover{
     background-color: #161616;
     box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19);
     cursor: pointer; 
@@ -148,4 +148,7 @@
   
   .dropdown:hover .dropbtn {
     background-color: #414141;
+  }
+  .leftstuff{
+      float:left !important
   }
\ No newline at end of file
diff --git a/vcm/datasource-data/accoustic/Lden/data/data0.b3dm b/vcm/datasource-data/accoustic/Lden/data/data0.b3dm
new file mode 100644
index 0000000000000000000000000000000000000000..fc1b74a41e79808c50f81ca0aba0e665799e3577
Binary files /dev/null and b/vcm/datasource-data/accoustic/Lden/data/data0.b3dm differ
diff --git a/vcm/datasource-data/accoustic/Lden/tileset.json b/vcm/datasource-data/accoustic/Lden/tileset.json
new file mode 100644
index 0000000000000000000000000000000000000000..495737105c2596c977138e583edb076e141dfa8e
--- /dev/null
+++ b/vcm/datasource-data/accoustic/Lden/tileset.json
@@ -0,0 +1,64 @@
+{
+	"asset" : {
+		"version" : "0.0"
+	},
+	"properties" : {
+		"OBJECTID" : {
+			"minimum" : 1,
+			"maximum" : 2896
+		},
+		"DB_L_Rail" : {
+			"minimum" : 0,
+			"maximum" : 75
+		},
+		"DB_H_Rail" : {
+			"minimum" : 0,
+			"maximum" : 79
+		},
+		"DB_L_Air" : {
+			"minimum" : 0,
+			"maximum" : 75
+		},
+		"DB_H_Air" : {
+			"minimum" : 0,
+			"maximum" : 79
+		},
+		"DB_L_RD" : {
+			"minimum" : 0,
+			"maximum" : 75
+		},
+		"DB_H_RD" : {
+			"minimum" : 0,
+			"maximum" : 79
+		},
+		"Shape_Leng" : {
+			"minimum" : 1.43116412093,
+			"maximum" : 368809.45578
+		},
+		"Shape_Area" : {
+			"minimum" : 0.01794654989,
+			"maximum" : 17603711.8501
+		},
+		"DB_Low_LD" : {
+			"minimum" : 55,
+			"maximum" : 78
+		},
+		"DB_High_LD" : {
+			"minimum" : 59,
+			"maximum" : 82
+		}
+	},
+	"geometricError" : 23387.695875477744,
+	"root" : {
+		"boundingVolume" : {
+			"box" : [ 4158717.3166303122, 675499.5927418747, 4773191.6863782015, 18750.122031897306, 0, 0, 0, 26924.998041697894, 0, 0, 0, 15209.001041281037 ]
+		},
+		"refine" : "ADD",
+		"content" : {
+			"boundingVolume" : {
+				"box" : [ 4158717.3166303122, 675499.5927418747, 4773191.6863782015, 18750.122031897306, 0, 0, 0, 26924.998041697894, 0, 0, 0, 15209.001041281037 ]
+			},
+			"url" : "data/data0.b3dm"
+		}
+	}
+}
\ No newline at end of file
diff --git a/vcm/datasource-data/accoustic/Lnight/data/data0.b3dm b/vcm/datasource-data/accoustic/Lnight/data/data0.b3dm
new file mode 100644
index 0000000000000000000000000000000000000000..407c1b8ceea2fc82c912bdbab971ac3579da99d6
Binary files /dev/null and b/vcm/datasource-data/accoustic/Lnight/data/data0.b3dm differ
diff --git a/vcm/datasource-data/accoustic/Lnight/tileset.json b/vcm/datasource-data/accoustic/Lnight/tileset.json
new file mode 100644
index 0000000000000000000000000000000000000000..52f1092cae7cc8d8bfe0867da48f937c60da1b72
--- /dev/null
+++ b/vcm/datasource-data/accoustic/Lnight/tileset.json
@@ -0,0 +1,56 @@
+{
+	"asset" : {
+		"version" : "0.0"
+	},
+	"properties" : {
+		"OBJECTID" : {
+			"minimum" : 1,
+			"maximum" : 1747
+		},
+		"DB_L_Rail" : {
+			"minimum" : 0,
+			"maximum" : 70
+		},
+		"DB_H_Rail" : {
+			"minimum" : 0,
+			"maximum" : 79
+		},
+		"DB_L_Air" : {
+			"minimum" : 0,
+			"maximum" : 70
+		},
+		"DB_H_Air" : {
+			"minimum" : 0,
+			"maximum" : 79
+		},
+		"DB_L_RD" : {
+			"minimum" : 0,
+			"maximum" : 70
+		},
+		"DB_H_RD" : {
+			"minimum" : 0,
+			"maximum" : 79
+		},
+		"DB_Low_LN" : {
+			"minimum" : 50,
+			"maximum" : 70
+		},
+		"DB_High_HN" : {
+			"minimum" : 54,
+			"maximum" : 79
+		}
+	},
+	"geometricError" : 15825.33585660148,
+	"root" : {
+		"boundingVolume" : {
+			"box" : [ 4157975.4701979775, 673586.7671057489, 4773611.686461536, 17266.429167228285, 0, 0, 0, 23099.346769446158, 0, 0, 0, 14369.00087461248 ]
+		},
+		"refine" : "ADD",
+		"content" : {
+			"boundingVolume" : {
+				"box" : [ 4157975.4701979775, 673586.7671057489, 4773611.686461536, 17266.429167228285, 0, 0, 0, 23099.346769446158, 0, 0, 0, 14369.00087461248 ]
+			},
+			"url" : "data/data0.b3dm"
+		}
+	}
+}
\ No newline at end of file
diff --git a/vcm/index.html b/vcm/index.html
index cdf20570cbaeb1c7bbf738f0eff6065bdde6fa5c..3518d1564bd14249e89872f6ab33b129010783f5 100644
--- a/vcm/index.html
+++ b/vcm/index.html
@@ -167,7 +167,7 @@
           <div class="title-box vcm_copyright_headerTitle"></div>
             
                     <!-- Drop down menu starts here -->
-                    <div class="dropdown hidden" style="float: right; right:20px">
+                    <!-- <div class="dropdown hidden" style="float: right; right:20px">
                         
                         <i class="fa fa-bars" id="dropdownMenu" style="font-size:1.8rem;color: white !important; margin-top:1rem;"></i>
                             <div class="dropdown-content" style="width:20rem;">
@@ -189,19 +189,7 @@
                                         <button id ="btn_StreetNight" onclick="noisemap('Streetnight')">Night</button>
                                         <button id ="btn_StreetOff" onclick="noisemap('offS')">Off</button>
                                         
-                                        
-                                        <!-- <div class="switch-toggle switch-3 switch-candy">
-                                            <button id ="btn_StreetDay">Day</button>
-                                            <input id="on" name="state-d" type="radio" checked="" />
-                                            <label for="on" onclick="noisemap('Streetday')">Day</label>
-                                          
-                                            <input id="na" name="state-d" type="radio" />
-                                            <label for="na" onclick="noisemap('Streetnight')">Night</label>
-                                          
-                                            <input id="off" name="state-d" type="radio" checked="checked"  />
-                                            <label for="off" onclick="noisemap('offS')">OFF</label>
-                                          
-                                          </div><br> -->
+
                                           <a href="#">Bahn</a>
                                           <button id ="btn_RailDay" onclick="noisemap('Railday')">Day</button>
                                           <button id ="btn_RailNight" onclick="noisemap('Railnight')">Night</button>
@@ -212,18 +200,7 @@
                                         <button id ="btn_NoiseSensOff" onclick="noisesens('off')">Off</button><br>
                                         <a><strong>Noise Sensors (historisch):</strong></a>
                                         <button id ="btn_NoiseSensOpen" onclick="NoiseText();">Open</button>
-                                        <!-- <div class="switch-toggle switch-3 switch-candy">
 
-                                            <input id="onR" name="state-d" type="radio" checked="" />
-                                            <label for="onR" onclick="noisemap('Railday')">Day</label>
-                                          
-                                            <input id="naR" name="state-d" type="radio" />
-                                            <label for="naR" onclick="noisemap('Railnight')">Night</label>
-                                          
-                                            <input id="offR" name="state-d" type="radio" checked="checked"  />
-                                            <label for="offR" onclick="noisemap('offR')">OFF</label>
-                                          
-                                          </div> -->
                                     </div>
 
                                 <button class="accordion">Mobility</button>
@@ -231,72 +208,61 @@
                                         <a href="#" onclick="" >Bauarbeiten</a>
                                         <button class = "btn_on" onclick="getAccidents('CONSTRUCTION')">On</button>
                                         <button class = "btn_off" onclick="deleteAccidents('CONSTRUCTION')">Off</button>
-                                        
 
-                                        <!-- <div class="switch-toggle switch-3 switch-candy">
-
-                                            <input id="acc-on" name="state-d" type="radio" checked="" />
-                                            <label for="on" onclick="getAccidents('CONSTRUCTION')">ON</label>
-                                          
-                                            <input id="acc-off" name="state-d" type="radio" checked="true"/>
-                                            <label for="na" onclick="deleteAccidents('CONSTRUCTION')">OFF</label>
-                                                                                    
-                                          </div><br> -->
                                           <a href="#" onclick="" >Straßenschließungen</a>
                                           <button class = "btn_on" onclick="getAccidents('ROAD_CLOSURE')">On</button>
                                           <button class = "btn_off" onclick="deleteAccidents('ROAD_CLOSURE')">Off</button>
-                                          
-                                        <!-- <div class="switch-toggle switch-3 switch-candy">
 
-                                            <input id="road-on" name="state-d" type="radio" checked="" />
-                                            <label for="on" onclick="getAccidents('ROAD_CLOSURE')">ON</label>
-                                          
-                                            <input id="road-off" name="state-d" type="radio" checked="true"/>
-                                            <label for="na" onclick="deleteAccidents('ROAD_CLOSURE')">OFF</label>
-                                                                                    
-                                          </div> -->
                                           <a href="#">Verkehrsflow</a>
                                           <button class = "btn_on" onclick="drawFlow()">On</button>
                                           <button class = "btn_off" onclick="deleteFlow()">Off</button>
                                           
-                                          <!-- <div class="switch-toggle switch-3 switch-candy">
+                            
 
-                                            <input id="flow-on" name="state-d" type="radio" checked="" />
-                                            <label for="on" onclick="drawFlow()">ON</label>
-                                          
-                                            <input id="flow-off" name="state-d" type="radio" checked="true"/>
-                                            <label for="na" onclick="deleteFlow()">OFF</label>
-                                                                                    
-                                          </div> -->
                                     </div>
-                                    <button class="accordion" onclick="Navigationshow();getPosition();" >Navigation</button>
-                                    <button class="accordion" onclick="simstadtget();" >SimStadt</button>
-                                    <!-- <button class="accordion" onclick="NoiseText();" >STA Noise</button> -->
-                                    <!-- <div class="sub-menu">
-                                        <a href="#" onclick="Navigationshow();getPosition();" >Car</a>
-                                        <div class="switch-toggle switch-3 switch-candy">
+                                     <button class="accordion" onclick=";getPosition();" >Navigation</button> Navigationshow()
+                                    <div class="sub-menu"></div>
 
-                                            <input id="acc-on" name="state-d" type="radio" checked="" />
-                                            <label for="on" onclick="drawnavcar()">ON</label>
-                                          
-                                            <input id="acc-off" name="state-d" type="radio" checked="true"/>
-                                            <label for="na" onclick="">OFF</label><br><br>
-                                                                                                                                
-                                          </div><br>
+                                        <h1 class="sticky" id="headNordB">Navigationsrechner</h1>
+                                        <p class="contentOne">Bitte wählen Sie einen Start und Endpunkt für ihre Route aus.</p>
+   
+                                         <div style="width:34em;">
+                                        <button class="btn_standard" style="width:10em;height:2em;" onclick="getStart('Start');">Startpunkt</button>
+                                        <input style="width:12em;height:2em;" type="text" id="Spunktlat" name="Spunktlat">
+                                        <input style="width:12em;height:2em;" type="text" id="Spunktlon" name="Spunktlon"><br><br>
                                         
-                                    </div> -->
+                                        <button class="btn_standard" style="width:10em;height:2em;" onclick="getStart('End');">Endpunkt</button>
+                                        <input style="width:12em;height:2em;" type="text" id="Epunktlat" name="Epunktlat">
+                                        <input style="width:12em;height:2em;" type="text" id="Epunktlon" name="Epunktlon"><br><br>
+
+                                        <button class="btn_standard" id="buttonCar" style="width:13em;height:2em;" onclick="setRouteCar();">Route berechnen (Auto)</button>
+                                        <button class="btn_standard" id="buttonPub" style="width:13em;height:2em;" onclick="setRoutePublic();">Route berechnen (Öffis)<div id="loaderPub" style="display:none;" class="loader"></div></button>
+                                        <button class="btn_standard" style="width:8em;height:2em;" onclick="deletenav();">Route löschen</button><br><br>
+                                        <p class="contentOne">Duration with Car</p>
+                                        <input type="text" id="Routeduration" name="Duration"><br>
+                                        <p class="contentOne">Duration with Public</p>
+                                        <input type="text" id="RoutedurationPub" name="Duration">
+                                        <br>
+                                        <div id="PubRouteShow" style="margin-top:1em;">
+
+  
+                                    </div>
+                                    </div>
+                                    </div>
+                                    <button class="accordion" onclick="simstadtget();" >SimStadt</button>
+  
                             </div>
                             <div id = "loadermain" class="loader" style="margin-right: 40px; margin-top: 40px; margin-left: -50px;
                             margin-top: -40px;
                             height: 40px;
                             width: 40px;
                             position: absolute;"></div>
-                      </div>
+                      </div> -->
                     <!-- Drop down menu ends here -->            
            <div class="tool-box" style="cursor:pointer"></div> 
       </div>
   </header>
-  <div id="story-frame" class="startscreen vcm-map-top">
+  <div id="story-frame" class="startscreen vcm-map-top loadingpointer">
       <!-- Content Start Screen -->
       <div class="balloon teaser-balloon" id="balloon-startscreen">
           <div class="balloon-content">
@@ -315,11 +281,15 @@
       <!-- Content Tour -->
       <div id="tour-frame" style="display: none; overflow-y: scroll;">
           <div class="tour-top-navi"  style="z-index:99">
-             <a href="#" onclick="Introshow()" id = "testing" class=" top-nav buttonset one btn_home"><i class="fa fa-home"></i> Zurück zum Intro</a>
-             <a href="#" onclick="showtourSpecific('menu')" id = "testing" class=" top-nav buttonset one btn_home"><i class="fa fa-code-fork"></i> Böckingerstraße</a>
-             <a href="#" onclick="NordbahnhofText()" id = "testing" class=" top-nav buttonset one btn_home"><i class="fa fa-code-fork"></i> Nordbahnhof</a>
-             <a href="#" onclick="NoiseText()" id = "testing" class=" top-nav buttonset one btn_home"><i class="fa fa-code-fork"></i> Akkustik Projekt</a>
-             <a href="#" onclick="Expert()" id = "testing" style="float:right;margin-right:2em;" class=" top-nav buttonset one btn_home"><i class="fa fa-lock"></i> Experten Modus</a>
+             <a href="#" onclick="Introshow()" id = "btn_intro" class=" top-nav buttonset one btn_home"><i class="fa fa-home"></i></a>
+             <a href="#" onclick="showtourSpecific('main')" id = "btn_bock" class=" top-nav buttonset one btn_home"><i class="fa fa-code-fork"></i> Böckingerstraße</a>
+             <a href="#" onclick="NordbahnhofText()" id = "btn_nord" class=" top-nav buttonset one btn_home"><i class="fa fa-code-fork"></i> Nordbahnhof</a>
+             <a href="#" onclick="NoiseText()" id = "btn_acous" class=" top-nav buttonset one btn_home"><i class="fa fa-code-fork"></i> Akkustik Projekt</a>
+             <a href="#" onclick="Expert()" id = "btn_expert"  class=" top-nav buttonset one btn_home"><i id="icon_lock" class="fa fa-lock"></i> Experten Modus</a>
+             <!-- style="float:right;margin-right:2em;" -->
+
+
+
              <!-- <a href="#energiefahrrad" class="top-nav buttonset one"><i class="fa fa-bicycle"></i> Projekt 2</a>
              <a href="#wea" class="top-nav buttonset one"><i class="fa fa-bolt"></i> Projekt 3</a>
              <a href="#projects" id="back" class="top-nav buttonset one"><i class="fa fa-bolt"></i> Back to Projekt View 3</a> -->
@@ -358,7 +328,7 @@
               </div>
           <button class="accordion">Energy</button>
               <div class="sub-menu">
-                  <a href="#" onclick="EnergiekonzeptFunction('nothing')">Stöckach</a>
+                  <a href="#" onclick="EnergiekonzeptFunction('nothing')">Stöckach</a><br>
 
                   <a href="#" onclick="nordbahnview()">Nordbahnhof</a>
               </div>
@@ -369,24 +339,19 @@
                   <button id ="btn_StreetDay" onclick="noisemap('Streetday')">Day</button>
                   <button id ="btn_StreetNight" onclick="noisemap('Streetnight')">Night</button>
                   <button id ="btn_StreetOff" onclick="noisemap('offS')">Off</button><br>
-                  
-                  
-                  <!-- <div class="switch-toggle switch-3 switch-candy">
-                      <button id ="btn_StreetDay">Day</button>
-                      <input id="on" name="state-d" type="radio" checked="" />
-                      <label for="on" onclick="noisemap('Streetday')">Day</label>
-                    
-                      <input id="na" name="state-d" type="radio" />
-                      <label for="na" onclick="noisemap('Streetnight')">Night</label>
-                    
-                      <input id="off" name="state-d" type="radio" checked="checked"  />
-                      <label for="off" onclick="noisemap('offS')">OFF</label>
-                    
-                    </div><br> -->
+ 
                     <a href="#">Bahn</a><br>
                     <button id ="btn_RailDay" onclick="noisemap('Railday')">Day</button>
                     <button id ="btn_RailNight" onclick="noisemap('Railnight')">Night</button>
                     <button id ="btn_RailOff" onclick="noisemap('offR')">Off</button>
+                    <br><a href="#">Flughafen</a><br>
+                    <button id ="btn_AirDay" onclick="noisemap('Airday')">Day</button>
+                    <button id ="btn_AirNight" onclick="noisemap('Airnight')">Night</button>
+                    <button id ="btn_AirOff" onclick="noisemap('offAir')">Off</button>
+                    <br><a href="#">Kombiniert</a><br>
+                    <button id ="btn_AllDay" onclick="noisemap('Allday')">Day</button>
+                    <button id ="btn_AllNight" onclick="noisemap('Allnight')">Night</button>
+                    <button id ="btn_AllOff" onclick="noisemap('offAll')">Off</button>
                     <br><br>
                   <a><strong>Noise Sensors (Live):</strong></a><br>
                   <button id ="btn_NoiseSensOn" onclick="noisesens('on')">On</button>
@@ -450,7 +415,38 @@
                                                               
                     </div> -->
               </div>
-              <button class="accordion" onclick="Navigationshow();getPosition();" >Navigation</button>
+              <button class="accordion" onclick="getPosition();" >Navigation</button>
+              <div class="sub-menu">
+
+              <h1 class="sticky" style="background: dimgray" id="headNordB">Navigationsrechner</h1>
+              <p class="contentOne">Bitte wählen Sie einen Start und Endpunkt für ihre Route aus.</p>
+               <!-- <button onclick="setRouteCar();">TestPunkt</button> -->
+               <div style="width:34em;">
+              <button class="btn_standard" style="width:10em;height:2em;" onclick="getStart('Start');">Startpunkt</button>
+              <input style="width:12em;height:2em;" type="text" id="Spunktlat" name="Spunktlat">
+              <input style="width:12em;height:2em;" type="text" id="Spunktlon" name="Spunktlon"><br><br>
+              
+              <button class="btn_standard" style="width:10em;height:2em;" onclick="getStart('End');">Endpunkt</button>
+              <input style="width:12em;height:2em;" type="text" id="Epunktlat" name="Epunktlat">
+              <input style="width:12em;height:2em;" type="text" id="Epunktlon" name="Epunktlon"><br><br>
+              <!-- <select>
+                  <option>mit Parkplatz</option>
+                  <option>ohne Parkplatz</option>
+                </select> -->
+              <button class="btn_standard" id="buttonCar" style="width:13em;height:2em;" onclick="setRouteCar();">Route berechnen (Auto)</button>
+              <button class="btn_standard" id="buttonPub" style="width:13em;height:2em;" onclick="setRoutePublic();">Route berechnen (Öffis)<div id="loaderPub" style="display:none;" class="loader"></div></button>
+              <button class="btn_standard" style="width:8em;height:2em;" onclick="deletenav();">Route löschen</button><br><br>
+              <p class="contentOne">Duration with Car</p>
+              <input type="text" id="Routeduration" name="Duration"><br>
+              <p class="contentOne">Duration with Public</p>
+              <input type="text" id="RoutedurationPub" name="Duration">
+              <br>
+              <div id="PubRouteShow" style="margin-top:1em;">
+              <!-- <a>Startpunkt</a>
+              <div class="walkingshape"></div>
+              <a>Endpunkt</a> -->
+                </div>
+                        </div></div>
               <button class="accordion" onclick="simstadtget();" >SimStadt</button>
               <!-- <button class="accordion" onclick="NoiseText();" >STA Noise</button> -->
               <!-- <div class="sub-menu">
@@ -534,8 +530,8 @@
             ======================================================================================================= -->
         <div id="projektOne" class="SideInfo" style="display:none;">
 
-            <h1 class="sticky" id="headOne">Böckinger Straße</h1>
-            
+            <h1  id="headOne">Böckinger Straße</h1> 
+            <!-- class="sticky" -->
             <p class="contentOne">Die Reduzierung des privaten Wohnraums bedingt auch das Zusammenleben
                 im Quartier. Wohnfunktionen werden wieder in den öffentlichen Raum
                 und die Gemeinschaft verlagert und im Sinne von urbanen Gemeingütern
@@ -704,6 +700,31 @@
                 Was fehlt noch? Welche bauliche Intervention kann die Bildung von urban
                 commons unterstützen? Und was bleibt am Ende zurück?</p>
 
+            <button id="btn_umfrage_bock" class="accordion">Umfrage</button>
+              <div class="sub-menu" style="background-color:white;">
+                  <a href="#" onclick="" >Umfrage:</a><br>
+                  <iframe style="width: 95%; height:35em;margin-left:1em;margin-right:1em;border: none;" src="https://umfrage.smartvillages.online/limesurvey/index.php/351963?lang=de-informal"></iframe>
+            
+                  <p id="umfrage_bock" class="contentOne">Die Reduzierung des privaten Wohnraums bedingt auch das Zusammenleben
+                      im Quartier. Wohnfunktionen werden wieder in den öffentlichen Raum
+                      und die Gemeinschaft verlagert und im Sinne von urbanen Gemeingütern
+                      genutzt. Die Funktionsweise solcher Gemeingüter beruht dabei hauptsächlich
+                      auf drei Grundelementen: der Ressource, einer Gruppe, die die Ressource
+                      gemeinsam nutzt und den Regeln, die diese Gruppe zur Nutzung
+                      festlegt. Aber wie kann man solche Gemeingüter in einem sich neu
+                      entwickelnden Quartier implementieren?</p>
+                  <p class="contentOne">In einem Realexperiment werden Konzepte und Ideen in Verknüpfung mit
+                      lokalen Akteuren erarbeitet und ausprobiert. <br>
+                      Der Garten des Imanuel Grözinger Hauses dient dabei als Ausgangspunkt. Drei Teams - Kommunikation,
+                      Programm und Bau - führen Interviews, erarbeiten ein Programm
+                      und eine bauliche Intervention vor Ort. Den Abschluss bildet ein Aktionstag
+                      gemeinsam mit Bewohnern und Nachbarn.</p><br>
+                      <p class="contentOne">Folgen Sie uns auf Instagram! Fotos und Videos führen Sie durch unsere
+                      gesamte Woche in der Böckinger Straße.</p><br>
+                      <p>@les_stuttgart</p>
+                      <p>#ibasummerschool2019 #howtocommons #experiment</p>
+              </div>
+              <div></div>
         </div>
 
         <div id="UmfrageOne" class="SideInfo" style="display:none;">
@@ -872,8 +893,13 @@
         <div id="NoiseInfo" class="SideInfo" style="display:none;">
             <!-- <h1 class="sticky" id="headNoise">Lärmdaten</h1>
             <br> -->
-            <h2>Historical Noise Data</h2>
+            <h2>Lärmdaten aus Stuttgart</h2>
             <br>
+            <h4>Kombinierte Lärmkarten (Auto, Bahn, Flughafen)</h4><br>
+            <button id ="btn_RailDay" onclick="noisemap2('day')">Day</button>
+            <button id ="btn_RailNight" onclick="noisemap2('night')">Night</button>
+            <button id ="btn_RailOff" onclick="noisemap2('off')">Off</button><br><br>
+            <h4>Lärmsensoren aus dem Luftdaten.info Projekt</h4><br>
             <div id="loadingHistNoise"></div>
             <label for="cars">Sensor wählen:</label>
                 <select class="dropbtn" style="border-radius: 3px; height: 3em; box-shadow: 0 8px 16px 0 #27272733, 0 6px 20px 0 rgba(0,0,0,0.19);" name="sensor" id="sensors">
@@ -906,7 +932,7 @@
         <!-- ======================================================================================================================================================================== -->
         <!-- Navigation -->
         <div id="Navigation" class="SideInfo" style="display:none;">
-            <h1 class="sticky" id="headNordB">Navigationsberechner</h1>
+            <h1 class="sticky" id="headNordB">Navigationsrechner</h1>
             <p class="contentOne">Bitte wählen Sie einen Start und Endpunkt für ihre Route aus.</p>
              <!-- <button onclick="setRouteCar();">TestPunkt</button> -->
              <div style="width:34em;">
diff --git a/vcm/js/noise.js b/vcm/js/noise.js
index f058d1f2f085244464e4944a4d49b68a48e93bfd..c71af129407881d8d17e48bb8b34645c24c32d39 100644
--- a/vcm/js/noise.js
+++ b/vcm/js/noise.js
@@ -54,57 +54,337 @@ function getNoiseData(sensorid) {
 }
 
 function noisemap(areatime){
-
+    
     var StreetD = false;
     var StreetN = false;
     var RailD = false;
     var RailN = false;
+    var day = false;
+    var night = false;
+    var Air = false;
+    var All = false;
+
+  
    if (areatime == "offS"){
     StreetD = false;
     StreetN = false;
    } else if (areatime == "offR") {
     RailD = false;
     RailN = false;
+   } else if (areatime == "offAir"){
+    Air = false;
+   } else if (areatime == "Airday"){
+     Air = true;
+     day = true;
+     night = false;
+   } else if (areatime == "Airnight"){
+    Air = true;
+    day = false;
+    night = true;
+   } else if (areatime == "offAll"){
+    All = false;
+   } else if (areatime == "Allday"){
+     All = true;
+     day = true;
+     night = false;
+   } else if (areatime == "Allnight"){
+    All = true;
+    day = false;
+    night = true;
    } else if (areatime == "Streetday") {
     StreetD = true;
     StreetN = false;
     RailD = false;
     RailN = false;
+    day= true;
+    night = false;
    } else if (areatime == "Streetnight") {
     StreetD = false;
     StreetN = true;
     RailD = false;
     RailN = false;
+    night = true;
+    day = false;
    } else if (areatime == "Railday") {
     StreetD = false;
     StreetN = false;
     RailD = true;
     RailN = false;
+    day = true;
+    night = false;
    } else if (areatime == "Railnight") {
     StreetD = false;
     StreetN = false;
     RailD = false;
     RailN = true;
+    night = true;
+    day = false;
    }
 
     var layerStreetD = ["Streetday"]
     var layerStreetN = ["Streetnight"]
-    var layerRailD = ["Railday"]
-    var layerRailN = ["Railnight"]
+
     var layers = framework.getLayers();
 
     for (var i = 0; i< layers.length; i++) {
       var layer = layers[i];
       if(layerStreetD.indexOf(layer.name) >= 0){
-        layer.activate(StreetD);
+        layer.activate(day);
       } else if (layerStreetN.indexOf(layer.name) >= 0){
-        layer.activate(StreetN);
-      } else if (layerRailD.indexOf(layer.name) >= 0){
-        layer.activate(RailD);
-      } else if (layerRailN.indexOf(layer.name) >= 0){
-        layer.activate(RailN);
+        layer.activate(night);
       }
     }
+
+
+    var layernameStuttgartTotal = ["Streetday"]
+    var layernameStuttgartTotal2 = ["Streetnight"]
+    var layerIndexStuttgartTotal
+    if (StreetD == true || StreetN == true){
+      // layernameStuttgartTotal = ["Streetday"]
+    } else if (RailD == true || RailN ==  true){
+      // layernameStuttgartTotal = ["Streetnight"]
+    };
+
+    var frameworkSTU = vcs.vcm.Framework.getInstance();
+    var layersSTU = frameworkSTU.getLayers();
+    for (var i = 0; i< layersSTU.length; i++) {
+      var layerst = layersSTU[i];
+      console.log(i)
+      if (day == true){
+        if(layernameStuttgartTotal.indexOf(layerst.name) >= 0) {
+        layerIndexStuttgartTotal = i
+      }  
+      } else if (night == true){
+        if(layernameStuttgartTotal2.indexOf(layerst.name) >= 0) {
+          layerIndexStuttgartTotal = i
+        } 
+      }
+      }
+  
+    var layerSTU = layersSTU[layerIndexStuttgartTotal];
+    if(typeof layerSTU == 'undefined') {
+
+        return;}
+    var tilesetSTU = layerSTU.cesium3DTileset;
+    
+    var timeout = setInterval(function() {
+      console.log(layerSTU.active)
+      if(layerSTU.active) {
+        if (StreetD == true || StreetN == true){
+          tilesetSTU.style = new Cesium.Cesium3DTileStyle({
+            color: {
+              conditions: [
+                ["${DB_H_RD} > 80","color('#1A5784')"],
+                ["${DB_H_RD} > 79","color('#3481B8')"],
+                ["${DB_H_RD} > 70","color('#992572')"],
+                ["${DB_H_RD} > 65","color('#8D1D2C')"],
+                ["${DB_H_RD} > 60","color('#C1121C')"],
+                ["${DB_H_RD} > 55","color('#FA842B')"],
+                ["${DB_H_RD} > 50","color('#AF8A54')"],
+                ["${DB_H_RD} > 45","color('#EAF044')"],
+                ["${DB_H_RD} > 40","color('#026A52')"],
+                ["${DB_H_RD} > 35","color('#48A43F')"],
+                ["${DB_H_RD} <= 35","color('#B7D9B1','0')"]//,
+                 //["${DB_High_LD} === 35","color('#B7D9B1','1')"]//,
+                // ["true", "color('#FFFFFF')"],
+              ],
+            },
+          });
+        } else if (RailD == true || RailN ==  true){
+          tilesetSTU.style = new Cesium.Cesium3DTileStyle({
+            color: {
+              conditions: [
+                ["${DB_H_Rail} > 80","color('#1A5784')"],
+                ["${DB_H_Rail} > 79","color('#3481B8')"],
+                ["${DB_H_Rail} > 70","color('#992572')"],
+                ["${DB_H_Rail} > 65","color('#8D1D2C')"],
+                ["${DB_H_Rail} > 60","color('#C1121C')"],
+                ["${DB_H_Rail} > 55","color('#FA842B')"],
+                ["${DB_H_Rail} > 50","color('#AF8A54')"],
+                ["${DB_H_Rail} > 45","color('#EAF044')"],
+                ["${DB_H_Rail} > 40","color('#026A52')"],
+                ["${DB_H_Rail} > 35","color('#48A43F')"],
+                ["${DB_H_Rail} <= 35","color('#B7D9B1','0')"]//,
+                 //["${DB_High_LD} === 35","color('#B7D9B1','1')"]//,
+                // ["true", "color('#FFFFFF')"],
+              ],
+            },
+          });
+        } else if (Air == true){
+          tilesetSTU.style = new Cesium.Cesium3DTileStyle({
+            color: {
+              conditions: [
+                ["${DB_H_Air} > 80","color('#1A5784')"],
+                ["${DB_H_Air} > 79","color('#3481B8')"],
+                ["${DB_H_Air} > 70","color('#992572')"],
+                ["${DB_H_Air} > 65","color('#8D1D2C')"],
+                ["${DB_H_Air} > 60","color('#C1121C')"],
+                ["${DB_H_Air} > 55","color('#FA842B')"],
+                ["${DB_H_Air} > 50","color('#AF8A54')"],
+                ["${DB_H_Air} > 45","color('#EAF044')"],
+                ["${DB_H_Air} > 40","color('#026A52')"],
+                ["${DB_H_Air} > 35","color('#48A43F')"],
+                ["${DB_H_Air} <= 35","color('#B7D9B1','0')"]//,
+                 //["${DB_High_LD} === 35","color('#B7D9B1','1')"]//,
+                // ["true", "color('#FFFFFF')"],
+              ],
+            },
+          });
+        } else if (All == true & day == true){
+          tilesetSTU.style = new Cesium.Cesium3DTileStyle({
+            color: {
+              conditions: [
+                ["${DB_High_LD} > 80","color('#1A5784')"],
+                ["${DB_High_LD} > 79","color('#3481B8')"],
+                ["${DB_High_LD} > 70","color('#992572')"],
+                ["${DB_High_LD} > 65","color('#8D1D2C')"],
+                ["${DB_High_LD} > 60","color('#C1121C')"],
+                ["${DB_High_LD} > 55","color('#FA842B')"],
+                ["${DB_High_LD} > 50","color('#AF8A54')"],
+                ["${DB_High_LD} > 45","color('#EAF044')"],
+                ["${DB_High_LD} > 40","color('#026A52')"],
+                ["${DB_High_LD} > 35","color('#48A43F')"],
+                ["${DB_High_LD} <= 35","color('#B7D9B1','0')"]//,
+                 //["${DB_High_LD} === 35","color('#B7D9B1','1')"]//,
+                // ["true", "color('#FFFFFF')"],
+              ],
+            },
+          });
+        }else if (All == true & night == true){
+          tilesetSTU.style = new Cesium.Cesium3DTileStyle({
+            color: {
+              conditions: [
+                ["${DB_High_HN} > 80","color('#1A5784')"],
+                ["${DB_High_HN} > 79","color('#3481B8')"],
+                ["${DB_High_HN} > 70","color('#992572')"],
+                ["${DB_High_HN} > 65","color('#8D1D2C')"],
+                ["${DB_High_HN} > 60","color('#C1121C')"],
+                ["${DB_High_HN} > 55","color('#FA842B')"],
+                ["${DB_High_HN} > 50","color('#AF8A54')"],
+                ["${DB_High_HN} > 45","color('#EAF044')"],
+                ["${DB_High_HN} > 40","color('#026A52')"],
+                ["${DB_High_HN} > 35","color('#48A43F')"],
+                ["${DB_High_HN} <= 35","color('#B7D9B1','0')"]//,
+                 //["${DB_High_LD} === 35","color('#B7D9B1','1')"]//,
+                // ["true", "color('#FFFFFF')"],
+              ],
+            },
+          });
+        }
+        console.log("")
+        
+
+        clearInterval(timeout); 
+      } 
+  }, 1000);
+
+
+
+
+}
+
+
+
+function noisemap2(areatime){
+
+  
+ if (areatime == "day"){
+  noisemap("Streetday")
+  var layerIndexStuttgartTotal
+
+  var layernameStuttgartTotal = ["Streetday"]
+
+  var frameworkSTU = vcs.vcm.Framework.getInstance();
+  var layersSTU = frameworkSTU.getLayers();
+  for (var i = 0; i< layersSTU.length; i++) {
+    var layerst = layersSTU[i];
+    if(layernameStuttgartTotal.indexOf(layerst.name) >= 0) {
+      layerIndexStuttgartTotal = i
+  }}
+
+  var layerSTU = layersSTU[layerIndexStuttgartTotal];
+  var tilesetSTU = layerSTU.cesium3DTileset;
+  
+  var timeout = setInterval(function() {
+    console.log(layerSTU.active)
+    if(layerSTU.active) {
+      console.log("")
+      tilesetSTU.style = new Cesium.Cesium3DTileStyle({
+        color: {
+          conditions: [
+            ["${DB_High_LD} > 80","color('#1A5784')"],
+            ["${DB_High_LD} > 79","color('#3481B8')"],
+            ["${DB_High_LD} > 70","color('#992572')"],
+            ["${DB_High_LD} > 65","color('#8D1D2C')"],
+            ["${DB_High_LD} > 60","color('#C1121C')"],
+            ["${DB_High_LD} > 55","color('#FA842B')"],
+            ["${DB_High_LD} > 50","color('#AF8A54')"],
+            ["${DB_High_LD} > 45","color('#EAF044')"],
+            ["${DB_High_LD} > 40","color('#026A52')"],
+            ["${DB_High_LD} > 35","color('#48A43F')"],
+            ["${DB_High_LD} <= 35","color('#B7D9B1')"]//,
+             //["${DB_High_LD} === 35","color('#B7D9B1','1')"]//,
+            // ["true", "color('#FFFFFF')"],
+          ],
+        },
+      });
+
+      clearInterval(timeout); 
+    } 
+}, 1000);
+
+ } else if (areatime == "night") {
+  noisemap("Streetnight")
+
+  var layerIndexStuttgartTotal
+
+  var layernameStuttgartTotal = ["Streetnight"]
+
+  var frameworkSTU = vcs.vcm.Framework.getInstance();
+  var layersSTU = frameworkSTU.getLayers();
+  for (var i = 0; i< layersSTU.length; i++) {
+    var layerst = layersSTU[i];
+    if(layernameStuttgartTotal.indexOf(layerst.name) >= 0) {
+      layerIndexStuttgartTotal = i
+  }}
+
+  var layerSTU = layersSTU[layerIndexStuttgartTotal];
+  var tilesetSTU = layerSTU.cesium3DTileset;
+  
+  var timeout = setInterval(function() {
+    console.log(layerSTU.active)
+    if(layerSTU.active) {
+      console.log("")
+      tilesetSTU.style = new Cesium.Cesium3DTileStyle({
+        color: {
+          conditions: [
+            ["${DB_High_HN} > 80","color('#1A5784')"],
+            ["${DB_High_HN} > 79","color('#3481B8')"],
+            ["${DB_High_HN} > 70","color('#992572')"],
+            ["${DB_High_HN} > 65","color('#8D1D2C')"],
+            ["${DB_High_HN} > 60","color('#C1121C')"],
+            ["${DB_High_HN} > 55","color('#FA842B')"],
+            ["${DB_High_HN} > 50","color('#AF8A54')"],
+            ["${DB_High_HN} > 45","color('#EAF044')"],
+            ["${DB_High_HN} > 40","color('#026A52')"],
+            ["${DB_High_HN} > 35","color('#48A43F')"],
+            ["${DB_High_HN} <= 35","color('#B7D9B1')"]//,
+             //["${DB_High_LD} === 35","color('#B7D9B1','1')"]//,
+            // ["true", "color('#FFFFFF')"],
+          ],
+        },
+      });
+
+      clearInterval(timeout); 
+    } 
+}, 1000);
+ } else if (areatime == "off"){
+  noisemap("offS")
+
+
+ }
+
+
 }
 
 function noisesens(status){
diff --git a/vcm/templates/cus_Menu.js b/vcm/templates/cus_Menu.js
index a915ab808cc9db72e596988741dd6b666e4752ca..9b2c9d9f5e6c8ffd9ba02a1d91f9dfb2d02f5e1a 100644
--- a/vcm/templates/cus_Menu.js
+++ b/vcm/templates/cus_Menu.js
@@ -15,6 +15,16 @@ var acc = document.getElementsByClassName("accordion");
 function nordbahnview(){
   var viewp = vcs.vcm.Framework.getInstance().viewpoints.NordBView
   vcs.vcm.Framework.getInstance().getActiveMap().gotoViewPoint(viewp);
+
+  document.getElementById("UmfrageOne").style.display = "none";
+  document.getElementById("NordbahnhofInfo").style.display = "block";
+  document.getElementById("Navigation").style.display = "none";
+  document.getElementById("projektOne").style.display = "none";
+  document.getElementById("Energiekonzept").style.display = "none";
+  document.getElementById("IntroProj").style.display = "none";
+  document.getElementById("Expertenmodus").style.display = "block";
+  showgraph();
+  
 }
 
 var expstate = false;
diff --git a/vcm/templates/custom.css b/vcm/templates/custom.css
index abfdc8833f8530454b580f56311c0f1b705ebeab..82ed1722f73948a1f23d94d93a4bd4061a901a28 100644
--- a/vcm/templates/custom.css
+++ b/vcm/templates/custom.css
@@ -246,8 +246,8 @@
 } */
 
 h1.sticky {
-  position: -webkit-sticky;
-  position: sticky;
+  /* position: -webkit-sticky;
+  position: sticky; */
   height:35px;
   top: 30px;
   font-size: 20px;
diff --git a/vcm/templates/custom.js b/vcm/templates/custom.js
index 4fd49c3fa12878ea19bf61f99d78852234247b08..3b25933f4e356897bb7cc27719dae1c79a6b9934 100644
--- a/vcm/templates/custom.js
+++ b/vcm/templates/custom.js
@@ -57,6 +57,13 @@ var layerfix04 = ["WMS layer"]
 function showtourSpecific(specify) {
     if (specify == 'menu'){
       vcs.vcm.Framework.getInstance().getActiveMap().gotoViewPoint(vcs.vcm.Framework.getInstance().viewpoints.Böckingerstraße)
+      document.getElementById("Expertenmodus").style.display = "block";
+    } else if (specify == 'main'){
+      vcs.vcm.Framework.getInstance().getActiveMap().gotoViewPoint(vcs.vcm.Framework.getInstance().viewpoints.Böckingerstraße)
+      document.getElementById("Expertenmodus").style.display = "none";
+      var element = document.getElementById("icon_lock");
+      element.classList.add("fa-lock");
+      element.classList.remove("fa-unlock");
     }
     // var oldstuff = document.getElementById("old")
     // var para = document.createElement("P");
@@ -68,7 +75,7 @@ function showtourSpecific(specify) {
     document.getElementById("Navigation").style.display = "none";
     document.getElementById("projektOne").style.display = "block";
     document.getElementById("IntroProj").style.display = "none";
-    document.getElementById("Expertenmodus").style.display = "none";
+    
     showTour();
 
 
@@ -110,8 +117,11 @@ function showtourSpecific(specify) {
     }
     unhighlightStuff();
     noisemap('offS')
-    expstate = true;
+    // expstate = true;
     onoff()
+
+
+    document.getElementById('headOne').scrollIntoView({ left: 0, block: 'start', behavior: 'smooth' });
 }
 
 
@@ -161,7 +171,7 @@ function EnergiekonzeptFunction(content){
     document.getElementById("projektOne").style.display = "none";
     document.getElementById("Energiekonzept").style.display = "block";
     document.getElementById("IntroProj").style.display = "none";
-    document.getElementById("Expertenmodus").style.display = "none";
+    document.getElementById("Expertenmodus").style.display = "block";
     showTour();
 
     if (content =="main"){
@@ -261,16 +271,19 @@ function highlightFeatures(content){
 
 function Questionnaire() {
 
-  document.getElementById("projektOne").style.display = "none";
-  document.getElementById("Energiekonzept").style.display = "none";
-  document.getElementById("NordbahnhofInfo").style.display = "none";
-  document.getElementById("NoiseInfo").style.display = "none";
-  document.getElementById("Navigation").style.display = "none";
-  document.getElementById("UmfrageOne").style.display = "block";
-  document.getElementById("IntroProj").style.display = "none";
-  document.getElementById("Expertenmodus").style.display = "none";
+  // document.getElementById("projektOne").style.display = "none";
+  // document.getElementById("Energiekonzept").style.display = "none";
+  // document.getElementById("NordbahnhofInfo").style.display = "none";
+  // document.getElementById("NoiseInfo").style.display = "none";
+  // document.getElementById("Navigation").style.display = "none";
+  // document.getElementById("UmfrageOne").style.display = "block";
+  // document.getElementById("IntroProj").style.display = "none";
+  // document.getElementById("Expertenmodus").style.display = "none";
   showTour();
+  document.getElementById("btn_umfrage_bock").click();
+  document.getElementById('umfrage_bock').scrollIntoView({ left: 0, block: 'start', behavior: 'smooth' });
 
+  
 }
 
 
@@ -285,6 +298,22 @@ function goHome(){
 }
 
 function Introshow(){
+
+  var comp = document.getElementsByClassName("compass");
+comp[0].classList.add("leftstuff");
+
+var comp1 = document.getElementsByClassName("control-box-container");
+comp1[0].classList.add("leftstuff");
+
+var comp2 = document.getElementsByClassName("shadow-control-box-wrap");
+comp2[0].classList.add("leftstuff");
+
+var comp3 = document.getElementById("widget-box");
+comp3.classList.add("leftstuff");
+
+
+
+
   document.getElementById("projektOne").style.display = "none";
   document.getElementById("Energiekonzept").style.display = "none"; 
   document.getElementById("UmfrageOne").style.display = "none";
@@ -322,6 +351,10 @@ function Introshow(){
   // document.getElementById("tour-frame").style.display = "block";
   expstate = true;
   onoff()
+
+  var element = document.getElementById("icon_lock");
+  element.classList.add("fa-lock");
+  element.classList.remove("fa-unlock");
 }
 
 function Navigationshow() {
@@ -382,6 +415,10 @@ function NordbahnhofText() {
   unhighlightStuff();
   expstate = true;
   onoff()
+
+  var element = document.getElementById("icon_lock");
+  element.classList.add("fa-lock");
+  element.classList.remove("fa-unlock");
 }
 
 
@@ -431,10 +468,85 @@ function NoiseText() {
   noisemap('Streetday')
   unhighlightStuff();
   // HistNoiseData("49368"); 
+  var element = document.getElementById("icon_lock");
+  element.classList.add("fa-lock");
+  element.classList.remove("fa-unlock");
 
   expstate = true;
   onoff()
-}
+
+
+  var layerIndexStuttgartTotal
+
+  var layernameStuttgartTotal = ["Streetday"]
+
+  var frameworkSTU = vcs.vcm.Framework.getInstance();
+  var layersSTU = frameworkSTU.getLayers();
+  for (var i = 0; i< layersSTU.length; i++) {
+    var layerst = layersSTU[i];
+    if(layernameStuttgartTotal.indexOf(layerst.name) >= 0) {
+      layerIndexStuttgartTotal = i
+  }}
+
+  var layerSTU = layersSTU[layerIndexStuttgartTotal];
+  var tilesetSTU = layerSTU.cesium3DTileset;
+  
+  var timeout = setInterval(function() {
+    console.log(layerSTU.active)
+    if(layerSTU.active) {
+      console.log("")
+      tilesetSTU.style = new Cesium.Cesium3DTileStyle({
+        color: {
+          conditions: [
+            ["${DB_High_LD} > 80","color('#1A5784')"],
+            ["${DB_High_LD} > 79","color('#3481B8')"],
+            ["${DB_High_LD} > 70","color('#992572')"],
+            ["${DB_High_LD} > 65","color('#8D1D2C')"],
+            ["${DB_High_LD} > 60","color('#C1121C')"],
+            ["${DB_High_LD} > 55","color('#FA842B')"],
+            ["${DB_High_LD} > 50","color('#AF8A54')"],
+            ["${DB_High_LD} > 45","color('#EAF044')"],
+            ["${DB_High_LD} > 40","color('#026A52')"],
+            ["${DB_High_LD} > 35","color('#48A43F')"],
+            ["${DB_High_LD} <= 35","color('#B7D9B1')"]//,
+             //["${DB_High_LD} === 35","color('#B7D9B1','1')"]//,
+            // ["true", "color('#FFFFFF')"],
+          ],
+        },
+      });
+
+      clearInterval(timeout); 
+    } 
+}, 1000);
+  // if( layerSTU.active ) {
+  //   tilesetSTU.style = new Cesium.Cesium3DTileStyle({
+  //     color: {
+  //       conditions: [
+  //         ["${DB_High_LD} > 80","color('#1A5784')"],
+  //         ["${DB_High_LD} > 79","color('#3481B8')"],
+  //         ["${DB_High_LD} > 70","color('#992572')"],
+  //         ["${DB_High_LD} > 65","color('#8D1D2C')"],
+  //         ["${DB_High_LD} > 60","color('#C1121C')"],
+  //         ["${DB_High_LD} > 55","color('#FA842B')"],
+  //         ["${DB_High_LD} > 50","color('#AF8A54')"],
+  //         ["${DB_High_LD} > 45","color('#EAF044')"],
+  //         ["${DB_High_LD} > 40","color('#026A52')"],
+  //         ["${DB_High_LD} > 35","color('#48A43F')"],
+  //         ["${DB_High_LD} <= 35","color('#B7D9B1')"]//,
+  //          //["${DB_High_LD} === 35","color('#B7D9B1','1')"]//,
+  //         // ["true", "color('#FFFFFF')"],
+  //       ],
+  //     },
+  //   });
+
+  // }
+
+
+
+
+};
+
+
 
 function Expert() {
   document.getElementById("projektOne").style.display = "none";
@@ -460,6 +572,7 @@ function Expert() {
   var layer07 = ["LocationTwo"]
   var layer08 = ["LocationOne"]
   var layer09 = ["Questionnaire"]
+  var layer10 = ["ProjektOne"]
 
   var framework = vcs.vcm.Framework.getInstance();
   var layers = framework.getLayers();
@@ -484,6 +597,8 @@ function Expert() {
       layer.activate(true);
     } else if (layer09.indexOf(layer.name) >= 0){
       layer.activate(true);
+    } else if (layer10.indexOf(layer.name) >= 0){
+      layer.activate(true);
     } else if (layerfix.indexOf(layer.name) >= 0){
       layer.activate(true);
     } else if (layerfix01.indexOf(layer.name) >= 0){
@@ -499,6 +614,10 @@ function Expert() {
     }
   }
 
+  var element = document.getElementById("icon_lock");
+  element.classList.remove("fa-lock");
+  element.classList.add("fa-unlock");
+
   unhighlightStuff();
   // HistNoiseData("49368"); 
 }
diff --git a/vcm/templates/newDevBahn.js b/vcm/templates/newDevBahn.js
index 6be1ec31dbd182c4a4523a2f2e8dc41a9f26f8c6..4707979d82aa927a1c5b0045605b13296835a147 100644
--- a/vcm/templates/newDevBahn.js
+++ b/vcm/templates/newDevBahn.js
@@ -4,6 +4,7 @@ var heatdemVal03 = 300
 var heatdemVal04 = 400
 
 function removebuildings() {
+
   var layerIndexStuttgartTotal
   var layerIndexStuttgartBahnhof
   var layernameStuttgartTotal = ["StuttgartLocal"]