diff --git a/css/dashboard.css b/css/dashboard.css
index c95b12ca..fe559494 100644
--- a/css/dashboard.css
+++ b/css/dashboard.css
@@ -93,7 +93,7 @@
     padding: 8px;
     border-radius: var(--border-radius-large);
     box-shadow: 2px 2px 5px var(--color-background-darker);
-    background-color: var(--color-primary-light);
+    background-color: #FFFFFF;
     margin: 10px;
     display: inline-block;
     vertical-align: top;
diff --git a/css/style.css b/css/style.css
index 459b7023..29888177 100644
--- a/css/style.css
+++ b/css/style.css
@@ -244,6 +244,7 @@ content: inherit;
     background: linear-gradient(to right, #1A366C, #F1F1F1);
     /*margin-top: 20px;*/
     margin-left: 30px;
+    margin-top: 10px;
     display: block;
 }
 
@@ -681,7 +682,7 @@ div.dt-container .dt-paging .dt-paging-button {
 }
 
 .infoBox {
-    background-color: var(--color-background-dark);
+    background-color: #FFFFFF;
     padding: 5px;
     box-shadow: 2px 2px 5px var(--color-background-darker);
     border-radius: var(--border-radius-large);
diff --git a/js/app.js b/js/app.js
index 33d69731..4b68af4d 100644
--- a/js/app.js
+++ b/js/app.js
@@ -87,6 +87,7 @@ OCA.Analytics = Object.assign({}, OCA.Analytics, {
 OCA.Analytics.Core = {
     init: function () {
         if (document.getElementById('sharingToken').value !== '') {
+            document.getElementById('byAnalytics').classList.toggle('analyticsFullscreen');
             OCA.Analytics.Backend.getData();
             return;
         }
diff --git a/js/dashboard.js b/js/dashboard.js
index cf82dd22..cf555853 100644
--- a/js/dashboard.js
+++ b/js/dashboard.js
@@ -10,7 +10,12 @@
 'use strict';
 
 document.addEventListener('DOMContentLoaded', function () {
-    //OCA.Analytics.Dashboard.init();
+    if (typeof OCA.Dashboard === 'object') {
+        OCA.Dashboard.register('analytics', (el) => {
+            el.innerHTML = '<ul id="ulAnalytics"></ul>';
+            OCA.Analytics.Dashboard.getFavorites();
+        });
+    }
 })
 
 OCA.Analytics = Object.assign({}, OCA.Analytics, {
@@ -39,16 +44,9 @@ OCA.Analytics = Object.assign({}, OCA.Analytics, {
  */
 OCA.Analytics.Dashboard = {
     init: function () {
-        if (typeof OCA.Dashboard === 'object') {
-            OCA.Dashboard.register('analytics', (el) => {
-                el.innerHTML = '<ul id="ulAnalytics"></ul>';
-                OCA.Analytics.Dashboard.getFavorites();
-            });
-        } else if (typeof OCA.Analytics.Navigation === 'object') {
-            // show favorites when the Analytics app itself is loaded
-            if (decodeURI(location.hash).length === 0) {
-                OCA.Analytics.Dashboard.getFavorites();
-            }
+        // show favorites when the Analytics app itself is loaded
+        if (decodeURI(location.hash).length === 0) {
+            OCA.Analytics.Dashboard.getFavorites();
         }
     },
 
diff --git a/js/navigation.js b/js/navigation.js
index 0a09bdeb..8a54e029 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -487,8 +487,10 @@ OCA.Analytics.Navigation = {
     },
 
     handleOverviewButton: function (evt) {
-        evt.preventDefault();
-        history.pushState(null, '', evt.target.href);
+        if (evt) {
+            evt.preventDefault();
+            history.pushState(null, '', evt.target.href);
+        }
 
         OCA.Analytics.Sidebar?.close?.();
         if (document.querySelector('#navigationDatasets .active')) {
@@ -496,9 +498,10 @@ OCA.Analytics.Navigation = {
         }
         OCA.Analytics.Visualization.hideElement('analytics-content');
         OCA.Analytics.Visualization.showElement('analytics-intro');
-        document.getElementById('ulAnalytics').innerHTML = '';
-        OCA.Analytics.Dashboard?.init?.();
-        OCA.Analytics.Panorama?.Dashboard?.init?.();
+        // Do not reload DB all the time as it is already in the background
+        //document.getElementById('ulAnalytics').innerHTML = '';
+        //OCA.Analytics.Dashboard?.init?.();
+        //OCA.Analytics.Panorama?.Dashboard?.init?.();
     },
 
     handleNavigationClicked: function (evt) {
diff --git a/js/panorama.js b/js/panorama.js
index 055b7492..6e2863fd 100644
--- a/js/panorama.js
+++ b/js/panorama.js
@@ -125,29 +125,6 @@ OCA.Analytics.Panorama = {
                 '</div>' +
                 '</div>'
         },
-        {
-            id: 3, name: '2-2', layout: '<div class="flex-container">' +
-                '<div class="panoramaSubHeaderRow"><div class="panoramaSubHeader editable"></div></div>' +
-                '<div class="flex-row" style="height: 50%;">' +
-                '<div class="flex-item"></div><div class="flex-item"></div>' +
-                '</div>' +
-                '<div class="flex-row" style="height: 50%;">' +
-                '<div class="flex-item"></div><div class="flex-item"></div>' +
-                '</div>' +
-                '</div>'
-        },
-        {
-            id: 4, name: '4-2', layout: '<div class="flex-container">' +
-                '<div class="panoramaSubHeaderRow"><div class="panoramaSubHeader editable"></div></div>' +
-                '<div class="flex-row" style="height: 50%;">' +
-                '<div class="flex-item"></div><div class="flex-item"></div>' +
-                '<div class="flex-item"></div><div class="flex-item"></div>' +
-                '</div>' +
-                '<div class="flex-row" style="height: 50%;">' +
-                '<div class="flex-item"></div><div class="flex-item"></div>' +
-                '</div>' +
-                '</div>'
-        },
     ],
 
     init: function () {
@@ -1197,7 +1174,8 @@ OCA.Analytics.Dashboard = {
                     for (let panorama of JSON.parse(xhr.response)) {
                         let story = OCA.Analytics.Panorama.stories.find(x => parseInt(x.id) === parseInt(panorama));
 
-                        let li = '<li id="analyticsWidgetItem' + panorama + '" class="analyticsWidgetItem">' + story.name + '</li>';
+                        let li = '<li id="analyticsWidgetItem' + panorama + '" class="analyticsWidgetItem" style="height: 50px;text-align: center;">';
+                        li += '<a href="' + OC.generateUrl('apps/analytics/pa/' + parseInt(panorama)) + '">' + story.name + '</a></li>';
                         document.getElementById('ulAnalytics').insertAdjacentHTML('beforeend', li);
 
                     }
diff --git a/js/sidebar.js b/js/sidebar.js
index bb382f7d..422d799e 100644
--- a/js/sidebar.js
+++ b/js/sidebar.js
@@ -205,7 +205,9 @@ OCA.Analytics.Sidebar.Report = {
                     data['type'] = parseInt(data['type']);
 
                     // Chart.js v4.4.3 changed from xAxes to x. In case the user has old chart options, they need to be corrected
-                    data['chartoptions'] = data['chartoptions'].replace(/xAxes/g, 'x')
+                    if (data['chartoptions']) {
+                        data['chartoptions'] = data['chartoptions'].replace(/xAxes/g, 'x');
+                    }
 
                     // clone the DOM template
                     table = document.importNode(document.getElementById('templateReport').content, true);
@@ -622,8 +624,13 @@ OCA.Analytics.Sidebar.Report = {
 
                 // store possibly changed values into the temporary variable as this is used in getData
                 // without this, the new options would only be active after a full reload
-                OCA.Analytics.currentReportData.options.chartoptions = JSON.parse(document.getElementById('sidebarReportChartOptions').value);
-                OCA.Analytics.currentReportData.options.dataoptions = JSON.parse(document.getElementById('sidebarReportDataOptions').value);
+                let chartOptions = document.getElementById('sidebarReportChartOptions').value;
+                let dataOptions = document.getElementById('sidebarReportDataOptions').value;
+
+                if (OCA.Analytics?.currentReportData?.options) {
+                    OCA.Analytics.currentReportData.options.chartoptions = chartOptions ? JSON.parse(chartOptions) : null;
+                    OCA.Analytics.currentReportData.options.dataoptions = dataOptions ? JSON.parse(dataOptions) : null;
+                }
 
                 if (OCA.Analytics.Sidebar.Report.metadataChanged === true) {
                     OCA.Analytics.Sidebar.Report.metadataChanged = false;
diff --git a/js/userGuidance.js b/js/userGuidance.js
index 4014ca8d..73e5592e 100644
--- a/js/userGuidance.js
+++ b/js/userGuidance.js
@@ -39,8 +39,10 @@ OCA.Analytics.Wizard = {
 
     show: function () {
         OCA.Analytics.Wizard.currentSlide = 0;
-        let wizard = document.importNode(document.getElementById('wizardDialog').content, true);
-        document.body.appendChild(wizard);
+        if (!document.getElementById('analyticsWizard')) {
+            let wizard = document.importNode(document.getElementById('wizardDialog').content, true);
+            document.body.appendChild(wizard);
+        }
         document.getElementById('wizardNext').addEventListener('click', OCA.Analytics.Wizard.next);
         document.getElementById('wizardPrevious').addEventListener('click', OCA.Analytics.Wizard.previous);
         document.getElementById('wizardClose').addEventListener('click', OCA.Analytics.Wizard.cancel);
diff --git a/js/visualization.js b/js/visualization.js
index 68c09c02..92221051 100644
--- a/js/visualization.js
+++ b/js/visualization.js
@@ -477,6 +477,7 @@ OCA.Analytics.Visualization = {
             chartOptions.circumference = 180;
             chartOptions.rotation = -90;
             chartOptions.plugins.datalabels.display = true;
+            chartOptions.plugins.datalabels.color = '#FFFFFF';
         }
 
         // the user can add/overwrite chart options
diff --git a/templates/main_panorama.php b/templates/main_panorama.php
index f756aaf6..19ff0c75 100644
--- a/templates/main_panorama.php
+++ b/templates/main_panorama.php
@@ -13,7 +13,7 @@
 Util::addStyle('analytics', '3rdParty/datatables.min');
 Util::addStyle('files_sharing', 'icons');
 Util::addStyle('analytics', 'print');
-Util::addScript('analytics', 'panorama');
+Util::addStyle('analytics', 'dashboard');
 Util::addScript('analytics', 'visualization');
 Util::addScript('analytics', 'navigation');
 Util::addScript('analytics', 'sidebar');
@@ -27,6 +27,7 @@
 Util::addScript('analytics', 'userGuidance');
 Util::addScript('analytics', '3rdParty/jspdf.umd.min');
 Util::addScript('analytics', '3rdParty/html2canvas.min');
+Util::addScript('analytics', 'panorama');
 ?>
 
 <div id="app-navigation">
diff --git a/templates/part.content.php b/templates/part.content.php
index b976269a..4f75571f 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -26,7 +26,7 @@
     <div id="noDataContainer" hidden>
         <?php p($l->t('No data found')); ?>
     </div>
-    <div style="margin-bottom: 45px"></div>
+    <div style="margin-bottom: 65px"></div>
     <div id="byAnalytics" class="byAnalytics" style="display: none;">
         <img id="byAnalyticsImg" style="width: 33px; margin-right: 7px;margin-left: 10px;" src="<?php echo \OC::$server->getURLGenerator()->imagePath('analytics', 'app-color.svg') ?>">
         <span style="font-size: 12px; line-height: 14px;">created with<br>Analytics</span>
diff --git a/templates/part.content_panorama.php b/templates/part.content_panorama.php
index dd183fc8..1bbfc8f8 100644
--- a/templates/part.content_panorama.php
+++ b/templates/part.content_panorama.php
@@ -95,6 +95,16 @@
         border-radius: 5px;
     }
 
+    .flex-item-tall {
+        flex-grow: 2;
+        position: relative;
+        margin: 15px;
+        padding: 15px;
+        position: relative;
+        background-color: #FFFF;
+        border-radius: 5px;
+    }
+
     .textContainer {
         flex-direction: column;
         display: flex;
diff --git a/templates/part.templates.php b/templates/part.templates.php
index 98caf231..a45756d4 100644
--- a/templates/part.templates.php
+++ b/templates/part.templates.php
@@ -119,9 +119,7 @@ class="sidebarPointer"><?php p($l->t('Visualization')); ?></h3>
         </div>
         <div style="display: table-row;">
             <div style="display: table-cell;  width: 100%; vertical-align: middle;"><?php p($l->t('Chart options')); ?></div>
-            <div style="display: table-cell;"><textarea id="sidebarReportChartOptions"
-                                                        placeholder="<?php p($l->t('Advanced')); ?>"
-                                                        class="sidebarInput" row="1"></textarea>
+            <div style="display: table-cell;"><textarea id="sidebarReportChartOptions" class="sidebarInput" row="1"></textarea>
             </div>
             <div style="display: table-cell; vertical-align: middle;">
                 <a target="_blank" rel="noreferrer noopener" title="<?php p($l->t('Open documentation')); ?>"
@@ -131,9 +129,7 @@ class="sidebarInput" row="1"></textarea>
         </div>
         <div style="display: table-row;">
             <div style="display: table-cell; width: 100%; vertical-align: middle;"><?php p($l->t('Data options')); ?></div>
-            <div style="display: table-cell;"><textarea id="sidebarReportDataOptions"
-                                                        placeholder="<?php p($l->t('Advanced')); ?>"
-                                                        class="sidebarInput" row="1"></textarea>
+            <div style="display: table-cell;"><textarea id="sidebarReportDataOptions" class="sidebarInput" row="1"></textarea>
             </div>
             <div style="display: table-cell; vertical-align: middle;">
                 <a target="_blank" rel="noreferrer noopener" title="<?php p($l->t('Open documentation')); ?>"
diff --git a/templates/wizard.php b/templates/wizard.php
index 6e788a82..23bf468a 100644
--- a/templates/wizard.php
+++ b/templates/wizard.php
@@ -9,8 +9,7 @@
 ?>
 <template id="wizardDialog">
     <div class="modal-mask" id="analyticsWizard"
-         style="touch-action: pan-y; user-select: none; -webkit-user-drag: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);"
-         hidden>
+         style="touch-action: pan-y; user-select: none; -webkit-user-drag: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0);">
         <div class="modal-wrapper modal-wrapper--normal" style="">
             <a class="prev" id="wizardPrevious">
                 <svg fill="currentColor" width="40" height="40" viewBox="0 0 24 24" class="material-design-icon__svg">
diff --git a/tests/Selenium NC Analytics.side b/tests/Selenium NC Analytics.side
index c42efc78..c3a32ccb 100644
--- a/tests/Selenium NC Analytics.side	
+++ b/tests/Selenium NC Analytics.side	
@@ -2,7 +2,7 @@
   "id": "dd2c11cd-d3fe-44b3-ab98-89561d3916e8",
   "version": "2.0",
   "name": "Analytics Test",
-  "url": "http://localhost:8027/",
+  "url": "http://localhost:8130/",
   "tests": [{
     "id": "76aecb95-a688-4add-ab2b-db736fcede58",
     "name": "71 Datasource: Git",
@@ -10,7 +10,7 @@
       "id": "18faf15c-39e7-4b1a-92b9-140e4f45b558",
       "comment": "",
       "command": "open",
-      "target": "/apps/analytics/#/r/",
+      "target": "/apps/analytics/",
       "targets": [],
       "value": ""
     }, {
@@ -440,7 +440,7 @@
       "id": "bf9a3511-30fd-4530-baec-d9c053a3f07f",
       "comment": "",
       "command": "open",
-      "target": "/apps/analytics/#/r/",
+      "target": "/apps/analytics",
       "targets": [],
       "value": ""
     }, {
@@ -699,7 +699,7 @@
       "id": "97c8062b-b66e-48b8-8992-3ea46bed0f5a",
       "comment": "",
       "command": "open",
-      "target": "/apps/analytics/#",
+      "target": "/apps/analytics",
       "targets": [],
       "value": ""
     }, {
@@ -1232,7 +1232,7 @@
       "id": "c96ba0f1-5166-4c36-a5ad-6b47d67fc4a1",
       "comment": "",
       "command": "open",
-      "target": "/apps/analytics/#",
+      "target": "/apps/analytics",
       "targets": [],
       "value": ""
     }, {
@@ -1504,7 +1504,7 @@
       "id": "c0594c62-c044-4aef-bb55-5fb60f0a1708",
       "comment": "Advance Settings via URL",
       "command": "open",
-      "target": "/apps/analytics/a/",
+      "target": "/apps/analytics/d",
       "targets": [],
       "value": ""
     }, {
@@ -1562,7 +1562,7 @@
       "command": "select",
       "target": "id=datasourceSelect",
       "targets": [],
-      "value": "label=Local file: csv"
+      "value": "label=Local: csv"
     }, {
       "id": "621bd20c-3366-4627-8ebb-ad723910cfa5",
       "comment": "",
@@ -1973,7 +1973,7 @@
       "id": "5c342d81-e827-4902-a452-a464c510a23e",
       "comment": "Advance Settings via URL",
       "command": "open",
-      "target": "/apps/analytics/a/",
+      "target": "/apps/analytics/d",
       "targets": [],
       "value": ""
     }, {
@@ -2044,7 +2044,7 @@
       "command": "select",
       "target": "id=datasourceSelect",
       "targets": [],
-      "value": "label=JSON"
+      "value": "label=External: JSON"
     }, {
       "id": "032e70f1-b55a-4b6c-8200-d113317be2e6",
       "comment": "",
@@ -2234,7 +2234,7 @@
       "id": "03b743a2-6a88-4074-860a-761ae40b8996",
       "comment": "",
       "command": "open",
-      "target": "/apps/analytics/#",
+      "target": "/apps/analytics",
       "targets": [],
       "value": ""
     }, {
@@ -2582,7 +2582,7 @@
       "id": "e78dd293-0f55-423f-ad79-74285b348462",
       "comment": "",
       "command": "open",
-      "target": "/apps/analytics/#/r/",
+      "target": "/apps/analytics",
       "targets": [],
       "value": ""
     }, {
@@ -3007,7 +3007,7 @@
       "id": "d1caead3-9976-4e71-91f6-a42aec05bdaf",
       "comment": "Advance Settings via URL",
       "command": "open",
-      "target": "/apps/analytics/a/",
+      "target": "/apps/analytics/d",
       "targets": [],
       "value": ""
     }, {
@@ -3078,7 +3078,7 @@
       "command": "select",
       "target": "id=datasourceSelect",
       "targets": [],
-      "value": "label=External file: csv"
+      "value": "label=External: csv"
     }, {
       "id": "aa5d07ec-a9a8-47c5-ac36-bddb68b47336",
       "comment": "",
@@ -3671,7 +3671,7 @@
       "id": "62056ec5-eb5b-4a9f-bbf0-c372c4ac35aa",
       "comment": "",
       "command": "open",
-      "target": "/apps/analytics/#/r/",
+      "target": "/apps/analytics",
       "targets": [],
       "value": ""
     }, {
@@ -3867,7 +3867,7 @@
       "id": "c28ee94e-dbd3-44d7-ab7b-3c7d2de79801",
       "comment": "",
       "command": "open",
-      "target": "/apps/analytics/#",
+      "target": "/apps/analytics",
       "targets": [],
       "value": ""
     }, {
@@ -4569,7 +4569,7 @@
       "id": "8895e100-6b9c-4624-8b60-b0d8dfdd5c7a",
       "comment": "",
       "command": "open",
-      "target": "/apps/analytics/#/r/",
+      "target": "/apps/analytics",
       "targets": [],
       "value": ""
     }, {
@@ -4837,7 +4837,7 @@
       "id": "a054ffbd-a407-42e9-885b-df4573260c98",
       "comment": "Advance Settings via URL",
       "command": "open",
-      "target": "/apps/analytics/a/",
+      "target": "/apps/analytics/d",
       "targets": [],
       "value": ""
     }, {
@@ -5688,7 +5688,7 @@
     "timeout": 300,
     "tests": ["4d10c523-64cc-4d59-9afc-d6ac6d0fc4ec", "233490f0-b006-487b-9750-3071f90ac644", "5b2b0dbd-aaf1-467f-bcd4-db2eed694ef7"]
   }],
-  "urls": ["https://nc17/", "https://nc18/", "https://nc19/", "https://nc20/", "https://nc21/", "https://nc22/", "https://nc23/", "https://nc23/nextcloud", "https://nc24/", "https://nc25/", "http://localhost:8080//", "http://localhost:8080/", "http://localhost:8081/", "http://localhost:8085/", "http://localhost:8027/", "http://localhost:8028/"],
+  "urls": ["https://nc17/", "https://nc18/", "https://nc19/", "https://nc20/", "https://nc21/", "https://nc22/", "https://nc23/", "https://nc23/nextcloud", "https://nc24/", "https://nc25/", "http://localhost:8080//", "http://localhost:8080/", "http://localhost:8081/", "http://localhost:8085/", "http://localhost:8027/", "http://localhost:8028/", "http://localhost:8130/"],
   "plugins": [{
     "id": "fbnkflkahhlmhdgkddaafgnnokifobik",
     "name": "Applitools",