diff --git a/js/navigation.js b/js/navigation.js
index fae64429..e09919c2 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -127,10 +127,19 @@ OCA.Analytics.Navigation = {
     },
 
     buildIntroRow: function () {
+        let text;
+        if (OCA.Analytics.isAdvanced) {
+            text = t('analytics', 'No dataset yet');
+        } else if (OCA.Analytics.isPanorama) {
+            text = t('analytics', 'No panorama yet');
+        } else {
+            text = t('analytics', 'No report yet');
+        }
+
         let li = document.createElement('li');
         li.innerHTML = '<div class="infoBox" style="margin-top: 50px;">' +
             '<img src="' + OC.imagePath('analytics', 'infoReport') + '" alt="info">\n' +
-            '<div class="infoBoxHeader">' + t('analytics', 'No reports yet') + '</div>\n';
+            '<div class="infoBoxHeader">' + text + '</div>\n';
         li.addEventListener('click', OCA.Analytics.Navigation.handleNewButton);
         return li;
     },
diff --git a/js/panorama.js b/js/panorama.js
index dbbe3e64..c67e18ca 100644
--- a/js/panorama.js
+++ b/js/panorama.js
@@ -694,7 +694,9 @@ OCA.Analytics.Panorama = {
             OCA.Analytics.Panorama.currentPanorama.pages[currentPage].layout = selectedLayout.layout;
             OCA.Analytics.Panorama.getPanorama(currentPage);
             OCA.Analytics.Panorama.addAllOverlays();
-            OCA.Analytics.Panorama.addEditableTextBoxes();
+            //OCA.Analytics.Panorama.addEditableTextBoxes();
+            OCA.Analytics.Panorama.editMode = false;
+            OCA.Analytics.Panorama.handleEditButton();
         });
 
         hoverBox.appendChild(dropdown);
@@ -729,8 +731,9 @@ OCA.Analytics.Panorama = {
                 let currentPage = OCA.Analytics.Panorama.currentPage;
                 OCA.Analytics.Panorama.currentPanorama.pages[currentPage].layout = selectedLayout.layout;
                 OCA.Analytics.Panorama.getPanorama(currentPage);
-                OCA.Analytics.Panorama.addAllOverlays();
-                OCA.Analytics.Panorama.addEditableTextBoxes();
+                //OCA.Analytics.Panorama.addEditableTextBoxes();
+                OCA.Analytics.Panorama.editMode = false;
+                OCA.Analytics.Panorama.handleEditButton();
             });
 
             // Add the layout preview
@@ -747,7 +750,7 @@ OCA.Analytics.Panorama = {
 
             grid.appendChild(cell);
         });
-        },
+    },
 
     removeLayoutSelctor: function () {
         //document.getElementById('layoutSelector').remove();
diff --git a/templates/part.content_panorama.php b/templates/part.content_panorama.php
index cbe6f3e0..17e2fb26 100644
--- a/templates/part.content_panorama.php
+++ b/templates/part.content_panorama.php
@@ -326,6 +326,7 @@
 </style>
 <div id="analytics-content" class="container" style="width:100%;" hidden>
     <div class="panoramaHeaderRow"><div id="panoramaHeader" class="panoramaHeader editable"></div></div>
+
     <div id="editMenuContainer" class="editMenuContainer" style="display:none;">
         <div class="editMenu" id="editMenu">
             <div class="menu-item" data-modal="modal1">Report</div>
@@ -336,45 +337,42 @@
         </div>
     </div>
 
-    <!-- Modals for the menu -->
-    <div id="modal1" class="modal">
-        <!-- Modal content -->
-        <div class="modal-content">
-            <span class="close">&times;</span>
-            <h2>Choose a report</h2><br>
-            <div id="reportSelectorContainer"></div>
+    <!-- Modals for the edit menu -->
+    <div>
+        <div id="modal1" class="modal">
+            <div class="modal-content">
+                <span class="close">&times;</span>
+                <h2>Choose a report</h2><br>
+                <div id="reportSelectorContainer"></div>
+            </div>
         </div>
-    </div>
-    <div id="modal2" class="modal">
-        <!-- Modal content -->
-        <div class="modal-content">
-            <span class="close">&times;</span>
-            <h2>Enter a free text</h2><br>
-            <textarea id="textInput" rows="8" cols="50" style="width: 100%;"></textarea>
-            <br>
-            <span class="userGuidance">Markup can be used here</span>
-            <br><br>
-            <button type="button" id="textInputButton">save</button>
+        <div id="modal2" class="modal">
+            <div class="modal-content">
+                <span class="close">&times;</span>
+                <h2>Enter a free text</h2><br>
+                <textarea id="textInput" rows="8" cols="50" style="width: 100%;"></textarea>
+                <br>
+                <span class="userGuidance">Markup can be used here</span>
+                <br><br>
+                <button type="button" id="textInputButton">save</button>
+            </div>
         </div>
-    </div>
-    <div id="modal3" class="modal">
-        <!-- Modal content -->
-        <div class="modal-content">
-            <span class="close">&times;</span>
-            <h2>Platzhalter für Später</h2>
+        <div id="modal3" class="modal">
+            <div class="modal-content">
+                <span class="close">&times;</span>
+                <h2>Platzhalter für Später</h2>
+            </div>
         </div>
-    </div>
-    <div id="modal4" class="modal">
-        <!-- Modal content -->
-        <div class="modal-content">
-            <span class="close">&times;</span>
-            <h2>Choose a picture</h2><br>
-            <span class="userGuidance">Select a picture from Nextcloud</span>
-            <br><br>
-            <button type="button" id="pictureInputButton">Choose</button>
+        <div id="modal4" class="modal">
+            <div class="modal-content">
+                <span class="close">&times;</span>
+                <h2>Choose a picture</h2><br>
+                <span class="userGuidance">Select a picture from Nextcloud</span>
+                <br><br>
+                <button type="button" id="pictureInputButton">Choose</button>
+            </div>
         </div>
     </div>
-    <!-- Modals -->
 
     <div id="optionBtnContainer" class="edit">
         <span class="nav-item" id="optionBtn">...</span>